Index: drupal/sites/all/modules/contrib/ds/ds.module
===================================================================
--- drupal/sites/all/modules/contrib/ds/ds.module	(revision 440)
+++ drupal/sites/all/modules/contrib/ds/ds.module	(working copy)
@@ -203,13 +203,20 @@
         $object->content[$key]['#weight'] = $weight;
         $regions[$region][$key] = $weight;
 
+        // Default class.
+        $class = isset($field['properties']['css-class']) ? $field['properties']['css-class'] : 'field-'. strtr($key, '_', '-');
+        // Extra class from UI.
+        if (isset($field_settings[$key]['css-class']) && !empty($field_settings[$key]['css-class'])) {
+          $class .= ' '. $field_settings[$key]['css-class'];
+        }
+
         // Build field key.
         $ds_fields[$key] = array(
           'key' => $key,
           'title' => $field['title'],
           'labelformat' => (isset($field_settings[$key]['labelformat'])) ? $field_settings[$key]['labelformat'] : DS_DEFAULT_LABEL_FORMAT,
           'type' => isset($field['display_settings']) ? 'other' : 'ds',
-          'class' => isset($field['properties']['css-class']) ? $field['properties']['css-class'] : 'field-'. strtr($key, '_', '-'),
+          'class' => $class,
         );
 
         // Try to change the title if this is configured and label is not hidden.
Index: drupal/sites/all/modules/contrib/ds/includes/ds.display.inc
===================================================================
--- drupal/sites/all/modules/contrib/ds/includes/ds.display.inc	(revision 440)
+++ drupal/sites/all/modules/contrib/ds/includes/ds.display.inc	(working copy)
@@ -90,6 +90,22 @@
 }
 
 /**
+ * Menu callback, show styles form.
+ */
+function ds_styles(&$form_state) {
+  $form = array();
+
+  $form['ds_styles'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Field styles'),
+    '#default_value' => variable_get('ds_styles', ''),
+    '#description' => t('Configure styles which you can add to fields in the overview screen. Add multiple styles line per line and seperate class and friendly name by | eg: <em>class_name|Friendly name.</em>')
+  );
+
+  return system_settings_form($form);
+}
+
+/**
  * Menu callback; presents a listing of fields display settings for an object type.
  *
  * Form includes form widgets to select which fields appear for teaser, full node
@@ -201,6 +217,8 @@
     $form[$field][$build_mode]['format']['#default_value'] = $format;
     $form[$field][$build_mode]['format']['#access'] = (count($form[$field][$build_mode]['format']['#options']) == 0) ? FALSE : TRUE;
 
+    $form[$field][$build_mode]['css-class']['#default_value'] = ds_default_value($display_settings, $build_mode, 'fields', $field, 'css-class', '');
+
     $form[$field][$build_mode]['region']['#default_value'] = ds_default_value($display_settings, $build_mode, 'fields', $field, 'region', DS_DEFAULT_REGION);
   }
 }
@@ -250,6 +268,7 @@
       $display_settings[$build_mode]['fields'][$key]['weight'] = $form_state['values'][$key]['ds_weight'];
       $display_settings[$build_mode]['fields'][$key]['format'] = $form_state['values'][$key][$build_mode]['format'];
       $display_settings[$build_mode]['fields'][$key]['region'] = $form_state['values'][$key][$build_mode]['region'];
+      $display_settings[$build_mode]['fields'][$key]['css-class'] = $form_state['values'][$key][$build_mode]['css-class'];
       if (!empty($form_state['values'][$key][$build_mode]['label_value'])) {
         $display_settings[$build_mode]['fields'][$key]['label_value'] = $form_state['values'][$key][$build_mode]['label_value'];
       }
@@ -311,6 +330,21 @@
 }
 
 /**
+ * Return field classes.
+ */
+function ds_field_classes() {
+  $styles = array('' => t('None'));
+  $extra_styles = explode("\n", trim(variable_get('ds_styles', '')));
+  if (!empty($extra_styles)) {
+    foreach ($extra_styles as $key => $value) {
+      list($style_key, $style_name) = explode("|", $value);
+      $styles[$style_key] = $style_name;
+    }
+  }
+  return $styles;
+}
+
+/**
  * Function to load default form properties for a field in a context
  */
 function ds_field_default_form_properties($build_mode) {
@@ -328,6 +362,11 @@
       '#options' => array(),
       '#default_value' => DS_DEFAULT_FORMAT,
     ),
+    'css-class' => array(
+      '#type' => 'select',
+      '#options' => ds_field_classes(),
+      '#default_value' => '',
+    ),
     'region' => array(
       '#type' => 'select',
       '#options' => ds_regions(variable_get('ds_build_mode_'. $build_mode, 'all')),
@@ -361,6 +400,11 @@
         '#options' => array(),
         '#default_value' => DS_DEFAULT_FORMAT,
       ),
+      'css-class' => array(
+        '#type' => 'select',
+        '#options' => ds_field_classes(),
+        '#default_value' => '',
+      ),
       'region' => array(
         '#type' => 'select',
         '#options' => ds_regions(variable_get('ds_build_mode_'. $build_mode, 'all')),
Index: drupal/sites/all/modules/contrib/ds/includes/ds.registry.inc
===================================================================
--- drupal/sites/all/modules/contrib/ds/includes/ds.registry.inc	(revision 440)
+++ drupal/sites/all/modules/contrib/ds/includes/ds.registry.inc	(working copy)
@@ -83,6 +83,20 @@
     'file' => 'includes/ds.display.inc',
     'weight' => 2,
   );
+  $items['admin/ds/layout/overview'] = array(
+      'title' => 'Overview',
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'weight' => 0,
+  );
+  $items['admin/ds/layout/styles'] = array(
+    'title' => 'Styles',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('ds_styles'),
+    'access arguments' => array('access display suite'),
+    'file' => 'includes/ds.display.inc',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 1,
+  );
 
   foreach (module_implements('ds_api') as $module) {
     $api_info = ds_api_info($module);
Index: drupal/sites/all/modules/contrib/ds/theme/ds-display-overview-form.tpl.php
===================================================================
--- drupal/sites/all/modules/contrib/ds/theme/ds-display-overview-form.tpl.php	(revision 440)
+++ drupal/sites/all/modules/contrib/ds/theme/ds-display-overview-form.tpl.php	(working copy)
@@ -34,6 +34,7 @@
           <th><?php print t('Field'); ?></th>
           <th><?php print t('Label'); ?></th>
           <th><?php print t('Format'); ?></th>
+          <th><?php print t('Style'); ?></th>
           <th><?php print t('Region'); ?></th>
           <th><?php print t('Weight'); ?></th>
         </tr>
@@ -58,6 +59,7 @@
               <td class="ds-label"><span class="<?php print $row->label_class; ?>"><?php print $row->human_name; ?></span><span class="label-edit"><?php print $row->{$build_mode}->label_edit; ?></span><?php print $row->{$build_mode}->label_value; ?></td>
               <td><?php print $row->{$build_mode}->label; ?></td>
               <td><?php print $row->{$build_mode}->format; ?></td>
+              <td><?php print $row->{$build_mode}->class; ?></td>
               <td><?php print $row->{$build_mode}->region; ?></td>
               <td><?php print $row->ds_weight; ?></td>
             </tr>
Index: drupal/sites/all/modules/contrib/ds/theme/theme.inc
===================================================================
--- drupal/sites/all/modules/contrib/ds/theme/theme.inc	(revision 440)
+++ drupal/sites/all/modules/contrib/ds/theme/theme.inc	(working copy)
@@ -167,6 +167,7 @@
         $row->{$child}->label_edit = drupal_render($element[$child]['label_edit']);
         $row->{$child}->label_value = drupal_render($element[$child]['label_value']);
         $row->{$child}->format = drupal_render($element[$child]['format']);
+        $row->{$child}->class = drupal_render($element[$child]['css-class']);
         $row->{$child}->region = drupal_render($element[$child]['region']);
       }
       // Render the rest of the fields