diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index f98df80..564a8a4 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2396,6 +2396,10 @@ function template_preprocess_region(&$variables) {
 function template_preprocess_field(&$variables, $hook) {
   $element = $variables['element'];
 
+  if($element['#items']->getFieldDefinition()->getCardinality() != "1"){
+    $variables['multiple'] = TRUE;
+  }
+  
   // There's some overhead in calling check_plain() so only call it if the label
   // variable is being displayed. Otherwise, set it to NULL to avoid PHP
   // warnings if a theme implementation accesses the variable even when it's
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
index dd6d13e..0bd1721 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
@@ -340,7 +340,7 @@ function testNodeDisplay() {
         $output = '1';
       }
 
-      $elements = $this->xpath('//div[text()="' . $output . '"]');
+      $elements = $this->xpath('//div[text()=:output]', array(':output' => $output));
       $this->assertEqual(count($elements), 1, 'Correct options found.');
     }
   }
diff --git a/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig
index a0d527a..3d9f16a 100644
--- a/core/modules/system/templates/field.html.twig
+++ b/core/modules/system/templates/field.html.twig
@@ -29,13 +29,41 @@
  * @ingroup themeable
  */
 #}
-<div{{ attributes }}>
-  {% if not label_hidden %}
-    <div class="field-label"{{ title_attributes }}>{{ label }}:&nbsp;</div>
+{% if multiple %}
+  {# field is a multiple value #}
+  {% if label_hidden %}
+    <div class="field-multiple field-items" {{ content_attributes }}>
+      {% for delta, item in items %}
+        <div class="field-content"{{ item_attributes[delta] }}>{{ item }}</div>
+      {% endfor %}
+      </div>
+    </div>
+
+  {% else %}
+  {# if the field is a multiple values with the labels #}
+    <div class="field-multiple">
+      <div class="field-label"{{ title_attributes }}>{{ label }}</div>
+      <div class="field-items"{{ content_attributes }}>
+        {% for delta, item in items %}
+          <div class="field-content"{{ item_attributes[delta] }}>{{ item }}</div>
+        {% endfor %}
+      </div>
+    </div>
   {% endif %}
-  <div class="field-items"{{ content_attributes }}>
-    {% for delta, item in items %}
-      <div class="field-item"{{ item_attributes[delta] }}>{{ item }}</div>
-    {% endfor %}
-  </div>
-</div>
+  {# end of multiples  #}
+{% else %}
+  {# single value #}
+  {% for delta, item in items %}
+    {% if label_hidden %}
+      {# single value no label#}
+      <div class="field-single field-content {{ attributes.class }}"{{ attributes }}{{ content_attributes }}{{ item_attributes[delta] }}>{{ item }}</div>
+    {% else %}
+      {# single value with label#}
+      <div class="field-single {{ attributes.class }}"{{ attributes }}>
+        <div class="field-label"{{ title_attributes }}>{{ label }}</div>
+        <div class="field-content" {{ content_attributes }} {{ item_attributes[delta] }}>WTF {{ item }}</div>
+      </div>
+    {% endif %}
+  {% endfor %}
+  {# end single value #}
+{% endif %}