diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index a04dd51..7defd49 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -6,7 +6,6 @@
  */
 
 use Drupal\Core\Template\RenderWrapper;
-use Drupal\Core\Template\Attribute;
 
 /**
  * Implements hook_library_info().
@@ -271,120 +270,3 @@ function seven_form_node_form_alter(&$form, &$form_state) {
   $form['revision_information']['#type'] = 'container';
   $form['revision_information']['#group'] = 'meta';
 }
-
-/**
- * Implements theme_form_element().
- *
- * Adds an error class to the form description if an error exists.
- */
-function seven_form_element($variables) {
-  $element = &$variables['element'];
-
-  // This function is invoked as theme wrapper, but the rendered form element
-  // may not necessarily have been processed by form_builder().
-  $element += array(
-    '#title_display' => 'before',
-  );
-
-  // Take over any #wrapper_attributes defined by the element.
-  // @todo Temporary hack for #type 'item'.
-  // @see http://drupal.org/node/1829202
-  if (isset($element['#wrapper_attributes'])) {
-    $attributes = $element['#wrapper_attributes'];
-  }
-  // Add element #id for #type 'item'.
-  if (isset($element['#markup']) && !empty($element['#id'])) {
-    $attributes['id'] = $element['#id'];
-  }
-  // Add element's #type and #name as class to aid with JS/CSS selectors.
-  $attributes['class'][] = 'form-item';
-  if (!empty($element['#type'])) {
-    $attributes['class'][] = 'form-type-' . strtr($element['#type'], '_', '-');
-  }
-  if (!empty($element['#name'])) {
-    $attributes['class'][] = 'form-item-' . strtr($element['#name'], array(' ' => '-', '_' => '-', '[' => '-', ']' => ''));
-  }
-  // Add a class for disabled elements to facilitate cross-browser styling.
-  if (!empty($element['#attributes']['disabled'])) {
-    $attributes['class'][] = 'form-disabled';
-  }
-  $output = '<div' . new Attribute($attributes) . '>' . "\n";
-
-  // If #title is not set, we don't display any label or required marker.
-  if (!isset($element['#title'])) {
-    $element['#title_display'] = 'none';
-  }
-  $prefix = isset($element['#field_prefix']) ? '<span class="field-prefix">' . $element['#field_prefix'] . '</span> ' : '';
-  $suffix = isset($element['#field_suffix']) ? ' <span class="field-suffix">' . $element['#field_suffix'] . '</span>' : '';
-
-  switch ($element['#title_display']) {
-    case 'before':
-    case 'invisible':
-      $output .= ' ' . theme('form_element_label', $variables);
-      $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
-      break;
-
-    case 'after':
-      $output .= ' ' . $prefix . $element['#children'] . $suffix;
-      $output .= ' ' . theme('form_element_label', $variables) . "\n";
-      break;
-
-    case 'none':
-    case 'attribute':
-      // Output no label and no required marker, only the children.
-      $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
-      break;
-  }
-
-  if (!empty($element['#description'])) {
-    $attributes = array('class' => array('description'));
-    if (!empty($element['#id'])) {
-      $attributes['id'] = $element['#id'] . '--description';
-    }
-    if (isset($element['#parents']) && form_get_error($element) !== NULL && !empty($element['#validated'])) {
-      $attributes['class'][] = 'error';
-    }
-    $output .= '<div' . new Attribute($attributes) . '>' . $element['#description'] . "</div>\n";
-  }
-
-  $output .= "</div>\n";
-
-  return $output;
-}
-
-/**
- * Implements theme_form_element_label().
- *
- * Adds an error class to the form label if an error exists.
- */
-function seven_form_element_label($variables) {
-  $element = $variables['element'];
-  // If title and required marker are both empty, output no label.
-  if ((!isset($element['#title']) || $element['#title'] === '') && empty($element['#required'])) {
-    return '';
-  }
-
-  // If the element is required, a required marker is appended to the label.
-  $required = !empty($element['#required']) ? theme('form_required_marker', array('element' => $element)) : '';
-
-  $title = filter_xss_admin($element['#title']);
-
-  $attributes = array();
-  // Style the label as class option to display inline with the element.
-  if ($element['#title_display'] == 'after') {
-    $attributes['class'][] = 'option';
-  }
-  // Show label only to screen readers to avoid disruption in visual flows.
-  elseif ($element['#title_display'] == 'invisible') {
-    $attributes['class'][] = 'visually-hidden';
-  }
-  if (isset($element['#parents']) && form_get_error($element) !== NULL && !empty($element['#validated'])) {
-    $attributes['class'][] = 'error';
-  }
-
-  if (!empty($element['#id'])) {
-    $attributes['for'] = $element['#id'];
-  }
-
-  return '<label' . new Attribute($attributes) . '>' . t('!title!required', array('!title' => $title, '!required' > $required)) . '</label>';
-}
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index be918a1..edc8821 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -770,7 +770,7 @@ label.error {
 }
 .form-required {
   font-weight: bold;
-  color: #666;
+  color: #e62600;
   font-size: 1.1em;
   padding-left: 2px;
 }
@@ -1637,7 +1637,6 @@ details.fieldset-no-legend {
   }
 
   .layout-node-form {
-    overflow: hidden;
     position: relative;
   }
   /**