diff --git a/commerce_ui.info b/commerce_ui.info
index 9bd5aca..a5abb06 100644
--- a/commerce_ui.info
+++ b/commerce_ui.info
@@ -3,3 +3,5 @@ description = Defines menu items common to the various Drupal Commerce UI module
 package = Commerce
 dependencies[] = commerce
 core = 7.x
+
+stylesheets[all][] = theme/commerce.admin.css
diff --git a/modules/cart/commerce_cart.module b/modules/cart/commerce_cart.module
index 9e22e46..ffd1892 100644
--- a/modules/cart/commerce_cart.module
+++ b/modules/cart/commerce_cart.module
@@ -483,7 +483,7 @@ function commerce_cart_block_view($delta) {
       // If there are one or more products in the cart...
       if (commerce_line_items_quantity($wrapper->commerce_line_items, commerce_product_line_item_types()) > 0) {
         // Theme the full cart block.
-        drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.css');
+        drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.theme.css');
 
         // Build the variables array to send to the cart block template.
         $variables = array(
@@ -1941,7 +1941,7 @@ function commerce_cart_add_to_cart_form_attributes_refresh($form, $form_state) {
         $element = array(
           '#markup' => theme($product_extra_field['theme'], $variables),
           '#attached' => array(
-            'css' => array(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product.css'),
+            'css' => array(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product.theme.css'),
           ),
           '#prefix' => '<div class="' . implode(' ', $classes) . '">',
           '#suffix' => '</div>',
diff --git a/modules/cart/includes/commerce_cart.checkout_pane.inc b/modules/cart/includes/commerce_cart.checkout_pane.inc
index 9c7334d..83ef76b 100644
--- a/modules/cart/includes/commerce_cart.checkout_pane.inc
+++ b/modules/cart/includes/commerce_cart.checkout_pane.inc
@@ -43,7 +43,7 @@ function commerce_cart_contents_pane_settings_form($checkout_pane) {
 function commerce_cart_contents_pane_checkout_form($form, &$form_state, $checkout_pane, $order) {
   $pane_form = array();
 
-  drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.theme.css');
 
   // Extract the View and display keys from the cart contents pane setting.
   list($view_id, $display_id) = explode('|', variable_get('commerce_cart_contents_pane_view', 'commerce_cart_summary|default'));
@@ -60,7 +60,7 @@ function commerce_cart_contents_pane_checkout_form($form, &$form_state, $checkou
  *   Review checkout pane.
  */
 function commerce_cart_contents_pane_review($form, $form_state, $checkout_pane, $order) {
-  drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.theme.css');
 
   // Extract the View and display keys from the cart contents pane setting.
   list($view_id, $display_id) = explode('|', variable_get('commerce_cart_contents_pane_view', 'commerce_cart_summary|default'));
diff --git a/modules/cart/includes/commerce_cart.pages.inc b/modules/cart/includes/commerce_cart.pages.inc
index d58f21a..23409b9 100644
--- a/modules/cart/includes/commerce_cart.pages.inc
+++ b/modules/cart/includes/commerce_cart.pages.inc
@@ -43,7 +43,7 @@ function commerce_cart_view() {
 
     // Only show the cart form if we found product line items.
     if (commerce_line_items_quantity($wrapper->commerce_line_items, commerce_product_line_item_types()) > 0) {
-      drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.css');
+      drupal_add_css(drupal_get_path('module', 'commerce_cart') . '/theme/commerce_cart.theme.css');
 
       // Add the form for editing the cart contents.
       $content = commerce_embed_view('commerce_cart_form', 'default', array($order->order_id), 'cart');
diff --git a/modules/cart/theme/commerce_cart.css b/modules/cart/theme/commerce_cart.css
deleted file mode 100644
index 4f158d5..0000000
--- a/modules/cart/theme/commerce_cart.css
+++ /dev/null
@@ -1,28 +0,0 @@
-
-.view-commerce-cart-block tr {
-  vertical-align: top;
-}
-
-.view-commerce-cart-block .views-field-quantity {
-  white-space: nowrap;
-}
-
-.view-commerce-cart-block td.price,
-.view-commerce-cart-form td.price,
-.view-commerce-cart-summary td.price {
-  white-space: nowrap;
-}
-
-.view-commerce-cart-form tr,
-.view-commerce-cart-summary tr {
-  vertical-align: top;
-}
-
-.commerce-order-handler-area-order-total .commerce-price-formatted-components {
-  width: 33%;
-  margin-left: auto;
-}
-
-.commerce-order-handler-area-order-total .commerce-price-formatted-components tr.component-type-commerce-price-formatted-amount {
-  font-weight: bold;
-}
diff --git a/modules/cart/theme/commerce_cart.theme.css b/modules/cart/theme/commerce_cart.theme.css
new file mode 100644
index 0000000..d1b34c2
--- /dev/null
+++ b/modules/cart/theme/commerce_cart.theme.css
@@ -0,0 +1,36 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Cart module.
+ */
+
+/**
+ * Theme the cart block and cart summary.
+ */
+.view-commerce-cart-block .views-field-quantity {
+ white-space: nowrap;
+}
+
+.commerce-order-handler-area-order-total .commerce-price-formatted-components {
+ width: 33%;
+ margin-left: auto;
+}
+
+.view-commerce-cart-block tr {
+  vertical-align: top;
+}
+
+.view-commerce-cart-block td.price,
+.view-commerce-cart-form td.price,
+.view-commerce-cart-summary td.price {
+  white-space: nowrap;
+}
+
+.view-commerce-cart-form tr,
+.view-commerce-cart-summary tr {
+  vertical-align: top;
+}
+
+.commerce-order-handler-area-order-total .commerce-price-formatted-components tr.component-type-commerce-price-formatted-amount {
+  font-weight: bold;
+}
diff --git a/modules/checkout/includes/commerce_checkout.admin.inc b/modules/checkout/includes/commerce_checkout.admin.inc
index 5b217ca..a8bf881 100644
--- a/modules/checkout/includes/commerce_checkout.admin.inc
+++ b/modules/checkout/includes/commerce_checkout.admin.inc
@@ -129,7 +129,7 @@ function commerce_checkout_builder_form_reset_submit($form, &$form_state) {
 function theme_commerce_checkout_builder_form($variables) {
   $form = $variables['form'];
 
-  drupal_add_css(drupal_get_path('module', 'commerce_checkout') .'/theme/commerce_checkout_admin.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_checkout') .'/theme/commerce_checkout.admin.css');
   drupal_add_js(drupal_get_path('module', 'commerce_checkout') .'/commerce_checkout_admin.js');
 
   // Build the full table header; Page and Weight will be hidden by tabledrag.
diff --git a/modules/checkout/includes/commerce_checkout.pages.inc b/modules/checkout/includes/commerce_checkout.pages.inc
index f7435f9..465ea9d 100644
--- a/modules/checkout/includes/commerce_checkout.pages.inc
+++ b/modules/checkout/includes/commerce_checkout.pages.inc
@@ -69,7 +69,8 @@ function commerce_checkout_router($order, $checkout_page = NULL) {
 function commerce_checkout_form($form, &$form_state, $order, $checkout_page) {
   global $user;
 
-  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_checkout') .'/theme/commerce_checkout.css';
+  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_checkout') .'/theme/commerce_checkout.base.css';
+  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_checkout') .'/theme/commerce_checkout.theme.css';
   $form['#attached']['js'][] = drupal_get_path('module', 'commerce_checkout') . '/commerce_checkout.js';
 
   $form_state['order'] = $order;
diff --git a/modules/checkout/theme/commerce_checkout.admin.css b/modules/checkout/theme/commerce_checkout.admin.css
new file mode 100644
index 0000000..d0aa21a
--- /dev/null
+++ b/modules/checkout/theme/commerce_checkout.admin.css
@@ -0,0 +1,27 @@
+
+/**
+ * @file
+ * Administration styles for the Commerce Checkout module.
+ *
+ * Optimized for the Seven administration theme.
+ */
+
+#panes td.page {
+  font-weight: bold;
+}
+
+#panes tr.page-header {
+  vertical-align: bottom;
+  font-weight: bold;
+  background-color: #FFF;
+}
+
+#panes tr.page-message {
+  font-weight: normal;
+  font-style: italic;
+  color: #999;
+}
+
+#panes tr.page-populated {
+  display: none;
+}
diff --git a/modules/checkout/theme/commerce_checkout.base.css b/modules/checkout/theme/commerce_checkout.base.css
new file mode 100644
index 0000000..fa25569
--- /dev/null
+++ b/modules/checkout/theme/commerce_checkout.base.css
@@ -0,0 +1,13 @@
+
+/**
+ * @file
+ * Generic base styles for the Commerce Checkout module.
+ *
+ * Handles styling needed by AJAX effects.
+ */
+
+.checkout-processing {
+  padding-right: 13px !important;
+  margin-right: 6px;
+  background: url(../images/status-active.gif) right center no-repeat;
+}
diff --git a/modules/checkout/theme/commerce_checkout.css b/modules/checkout/theme/commerce_checkout.css
deleted file mode 100644
index 26b6275..0000000
--- a/modules/checkout/theme/commerce_checkout.css
+++ /dev/null
@@ -1,49 +0,0 @@
-
-.checkout-buttons .checkout-cancel,
-.checkout-buttons .checkout-back {
-  border: 0;
-  background: none;
-  color: #0071B3;
-  padding: 4px 6px;
-}
-
-.checkout-buttons .checkout-cancel:focus,
-.checkout-buttons .checkout-back:focus,
-.checkout-buttons .checkout-cancel:hover,
-.checkout-buttons .checkout-back:hover {
-  background: none;
-  color: #018fe2;
-  text-decoration: underline;
-}
-
-table.checkout-review .pane-title td {
-  padding-left: 1em;
-  font-weight: bold;
-}
-
-table.checkout-review tr.pane-data {
-  vertical-align: top;
-}
-
-table.checkout-review .pane-data-key {
-  font-weight: bold;
-  text-align: right;
-  white-space: nowrap;
-  padding-left: 3em;
-  width: 50%;
-}
-
-table.checkout-review .pane-data-value {
-  padding-right: 3em;
-}
-
-table.checkout-review .pane-data-full {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-.checkout-processing {
-  padding-right: 13px !important;
-  margin-right: 6px;
-  background: url(../images/status-active.gif) right center no-repeat;
-}
diff --git a/modules/checkout/theme/commerce_checkout.theme.css b/modules/checkout/theme/commerce_checkout.theme.css
new file mode 100644
index 0000000..d251529
--- /dev/null
+++ b/modules/checkout/theme/commerce_checkout.theme.css
@@ -0,0 +1,54 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Checkout module.
+ */
+
+/**
+ * Make the cancel/back buttons appear as links.
+ */
+.checkout-buttons .checkout-cancel,
+.checkout-buttons .checkout-back {
+  border: 0;
+  background: none;
+  color: #0071B3;
+  padding: 4px 6px;
+}
+
+.checkout-buttons .checkout-cancel:focus,
+.checkout-buttons .checkout-back:focus,
+.checkout-buttons .checkout-cancel:hover,
+.checkout-buttons .checkout-back:hover {
+  background: none;
+  color: #018fe2;
+  text-decoration: underline;
+}
+
+/**
+ * Tweak review page layout.
+ */
+table.checkout-review .pane-title td {
+  padding-left: 1em;
+  font-weight: bold;
+}
+
+table.checkout-review tr.pane-data {
+  vertical-align: top;
+}
+
+table.checkout-review .pane-data-key {
+  font-weight: bold;
+  text-align: right;
+  white-space: nowrap;
+  padding-left: 3em;
+  width: 50%;
+}
+
+table.checkout-review .pane-data-value {
+  padding-right: 3em;
+}
+
+table.checkout-review .pane-data-full {
+  padding-left: 1em;
+  padding-right: 1em;
+}
diff --git a/modules/checkout/theme/commerce_checkout_admin.css b/modules/checkout/theme/commerce_checkout_admin.css
deleted file mode 100644
index 25066a2..0000000
--- a/modules/checkout/theme/commerce_checkout_admin.css
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#panes td.page {
-  font-weight: bold;
-}
-
-#panes tr.page-header {
-  vertical-align: bottom;
-  font-weight: bold;
-  background-color: #FFF;
-}
-
-#panes tr.page-message {
-  font-weight: normal;
-  font-style: italic;
-  color: #999;
-}
-
-#panes tr.page-populated {
-  display: none;
-}
diff --git a/modules/customer/includes/commerce_customer_ui.profile_types.inc b/modules/customer/includes/commerce_customer_ui.profile_types.inc
index 3c17ab5..5aea687 100644
--- a/modules/customer/includes/commerce_customer_ui.profile_types.inc
+++ b/modules/customer/includes/commerce_customer_ui.profile_types.inc
@@ -9,8 +9,6 @@
  * Menu callback: display an overview of available types.
  */
 function commerce_customer_ui_customer_profile_types_overview() {
-  drupal_add_css(drupal_get_path('module', 'commerce_customer_ui') . '/theme/commerce_customer_ui.profile_types.css');
-
   $header = array(
     t('Name'),
     t('Operations'),
diff --git a/modules/customer/theme/commerce_customer_ui.profile_types.css b/modules/customer/theme/commerce_customer_ui.profile_types.css
deleted file mode 100644
index de15d8d..0000000
--- a/modules/customer/theme/commerce_customer_ui.profile_types.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.links.operations {
-  text-transform: lowercase;
-}
diff --git a/modules/line_item/commerce_line_item.module b/modules/line_item/commerce_line_item.module
index b20570d..06adeac 100644
--- a/modules/line_item/commerce_line_item.module
+++ b/modules/line_item/commerce_line_item.module
@@ -117,7 +117,7 @@ function commerce_line_item_form_alter(&$form, &$form_state, $form_id) {
     return;
   }
 
-  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_line_item') . '/theme/commerce_line_item_views_form.css';
+  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_line_item') . '/theme/commerce_line_item.theme.css';
   $form['#attached']['js'][] = drupal_get_path('module', 'commerce_line_item') . '/commerce_line_item.js';
   $form['#submit'][] = 'commerce_line_item_line_item_views_form_submit';
 
@@ -220,7 +220,7 @@ function commerce_line_item_line_item_views_form_submit($form, &$form_state) {
  * Adds the necessary CSS for the line item summary template.
  */
 function template_preprocess_commerce_line_item_summary(&$variables) {
-  drupal_add_css(drupal_get_path('module', 'commerce_line_item') . '/theme/commerce_line_item_summary.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_line_item') . '/theme/commerce_line_item.theme.css');
 }
 
 /**
@@ -1101,7 +1101,7 @@ function commerce_line_item_manager_refresh($form, $form_state) {
  * Themes the line item manager widget form element.
  */
 function theme_commerce_line_item_manager($variables) {
-  drupal_add_css(drupal_get_path('module', 'commerce_line_item') . '/theme/commerce_line_item.manager.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_line_item') . '/theme/commerce_line_item.admin.css');
 
   $form = $variables['form'];
   $rows = array();
diff --git a/modules/line_item/includes/commerce_line_item_ui.types.inc b/modules/line_item/includes/commerce_line_item_ui.types.inc
index 93d6277..87f0e00 100644
--- a/modules/line_item/includes/commerce_line_item_ui.types.inc
+++ b/modules/line_item/includes/commerce_line_item_ui.types.inc
@@ -4,7 +4,7 @@
  * Menu callback: display an overview of available types.
  */
 function commerce_line_item_ui_types_overview() {
-  drupal_add_css(drupal_get_path('module', 'commerce_line_item_ui') .'/theme/commerce_line_item_ui.types.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_line_item') .'/theme/commerce_line_item.admin.css');
 
   $header = array(
     t('Name'),
diff --git a/modules/line_item/theme/commerce_line_item.admin.css b/modules/line_item/theme/commerce_line_item.admin.css
new file mode 100644
index 0000000..4b9bace
--- /dev/null
+++ b/modules/line_item/theme/commerce_line_item.admin.css
@@ -0,0 +1,31 @@
+
+/**
+ * @file
+ * Administration styles for the Commerce Line Item module.
+ *
+ * Optimized for the Seven administration theme.
+ */
+
+/**
+ * Theme the line item manager
+ */
+#line-item-manager caption {
+  font-size: 100%;
+  font-weight: bold;
+  padding-bottom: 5px;
+  text-align: left;
+  text-transform: uppercase;
+}
+
+.add-line-item .form-type-select {
+  float: left;
+  padding: 3px 10px 0 0;
+}
+
+#line-item-manager .form-submit {
+  float: left;
+}
+
+#line-item-manager .ajax-progress .message {
+  display:none;
+}
diff --git a/modules/line_item/theme/commerce_line_item.manager.css b/modules/line_item/theme/commerce_line_item.manager.css
deleted file mode 100644
index 5388542..0000000
--- a/modules/line_item/theme/commerce_line_item.manager.css
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#line-item-manager caption {
-  font-size: 100%;
-  font-weight: bold;
-  padding-bottom: 5px;
-  text-align: left;
-  text-transform: uppercase;
-}
-
-.add-line-item .form-type-select {
-  float: left;
-  padding: 3px 10px 0 0;
-}
-
-#line-item-manager .form-submit {
-  float: left;
-}
-
-#line-item-manager .ajax-progress .message {
-  display:none;
-}
diff --git a/modules/line_item/theme/commerce_line_item.theme.css b/modules/line_item/theme/commerce_line_item.theme.css
new file mode 100644
index 0000000..c76a880
--- /dev/null
+++ b/modules/line_item/theme/commerce_line_item.theme.css
@@ -0,0 +1,47 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Line Item module.
+ */
+
+/**
+ * Theme the line item summary.
+ */
+.line-item-summary {
+  text-align: right;
+  margin-bottom: 1em;
+}
+
+.line-item-summary .line-item-quantity {
+  float: left;
+}
+
+.line-item-summary .line-item-total-label {
+  font-weight: bold;
+}
+
+.line-item-summary .links {
+  margin-top: .5em;
+  clear: left;
+}
+
+.line-item-summary .links li.last {
+  padding-right: 0;
+}
+
+/**
+ * Theme the line item views form, used on the cart page.
+ */
+.commerce-line-item-views-form input.delete-line-item {
+  font-size: 0.8em;
+  padding: 1px 6px;
+}
+
+.commerce-line-item-views-form .cart-subtotal {
+  text-align: right;
+  font-size: 1.5em;
+}
+
+.commerce-line-item-views-form .commerce-line-item-actions {
+  text-align: right;
+}
diff --git a/modules/line_item/theme/commerce_line_item_summary.css b/modules/line_item/theme/commerce_line_item_summary.css
deleted file mode 100644
index 20bc38d..0000000
--- a/modules/line_item/theme/commerce_line_item_summary.css
+++ /dev/null
@@ -1,22 +0,0 @@
-
-.line-item-summary {
-  text-align: right;
-  margin-bottom: 1em;
-}
-
-.line-item-summary .line-item-quantity {
-  float: left;
-}
-
-.line-item-summary .line-item-total-label {
-  font-weight: bold;
-}
-
-.line-item-summary .links {
-  margin-top: .5em;
-  clear: left;
-}
-
-.line-item-summary .links li.last {
-  padding-right: 0;
-}
diff --git a/modules/line_item/theme/commerce_line_item_ui.types.css b/modules/line_item/theme/commerce_line_item_ui.types.css
deleted file mode 100644
index de15d8d..0000000
--- a/modules/line_item/theme/commerce_line_item_ui.types.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.links.operations {
-  text-transform: lowercase;
-}
diff --git a/modules/line_item/theme/commerce_line_item_views_form.css b/modules/line_item/theme/commerce_line_item_views_form.css
deleted file mode 100644
index 1694037..0000000
--- a/modules/line_item/theme/commerce_line_item_views_form.css
+++ /dev/null
@@ -1,14 +0,0 @@
-
-.commerce-line-item-views-form input.delete-line-item {
-  font-size: 0.8em;
-  padding: 1px 6px;
-}
-
-.commerce-line-item-views-form .cart-subtotal {
-  text-align: right;
-  font-size: 1.5em;
-}
-
-.commerce-line-item-views-form .commerce-line-item-actions {
-  text-align: right;
-}
diff --git a/modules/order/commerce_order_ui.module b/modules/order/commerce_order_ui.module
index 98f0ffb..137cfca 100644
--- a/modules/order/commerce_order_ui.module
+++ b/modules/order/commerce_order_ui.module
@@ -324,7 +324,7 @@ function commerce_order_ui_order_view($order, $view_mode = 'administrator', $bre
     commerce_order_ui_set_breadcrumb();
   }
 
-  drupal_add_css(drupal_get_path('module', 'commerce_order') . '/theme/commerce_order.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_order') . '/theme/commerce_order.theme.css');
 
   return entity_view('commerce_order', array($order->order_id => $order), $view_mode, NULL, TRUE);
 }
@@ -348,7 +348,7 @@ function commerce_order_ui_form_entity_translation_admin_form_alter(&$form, &$fo
  *   'order_number' (the default), 'order_id', or 'select'.
  */
 function commerce_order_ui_redirect_form($form, &$form_state, $redirect_page = 'admin', $identifier = 'order_number') {
-  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_order') . '/theme/commerce_order_views.css';
+  $form['#attached']['css'][] = drupal_get_path('module', 'commerce_order') . '/theme/commerce_order.admin.css';
 
   if ($identifier == 'select') {
     $form['identifier'] = array(
diff --git a/modules/order/includes/views/handlers/commerce_order_handler_field_order_operations.inc b/modules/order/includes/views/handlers/commerce_order_handler_field_order_operations.inc
index 0cd364b..b6b76e2 100644
--- a/modules/order/includes/views/handlers/commerce_order_handler_field_order_operations.inc
+++ b/modules/order/includes/views/handlers/commerce_order_handler_field_order_operations.inc
@@ -20,8 +20,6 @@ class commerce_order_handler_field_order_operations extends views_handler_field
     $links = menu_contextual_links('commerce-order', 'admin/commerce/orders', array($order_id));
 
     if (!empty($links)) {
-      drupal_add_css(drupal_get_path('module', 'commerce_order') . '/theme/commerce_order_views.css');
-
       return theme('links', array('links' => $links, 'attributes' => array('class' => array('links', 'inline', 'operations'))));
     }
   }
diff --git a/modules/order/theme/commerce_order.admin.css b/modules/order/theme/commerce_order.admin.css
new file mode 100644
index 0000000..658ee16
--- /dev/null
+++ b/modules/order/theme/commerce_order.admin.css
@@ -0,0 +1,19 @@
+
+/**
+ * @file
+ * Administration styles for the Commerce Order module.
+ *
+ * Optimized for the Seven administration theme.
+ */
+
+/**
+ * Order redirect form
+ */
+#commerce-order-ui-redirect-form .form-item {
+  float: left;
+  margin: 0 2em 0 0;
+}
+
+#commerce-order-ui-redirect-form .form-submit {
+  margin-top: 1.8em;
+}
diff --git a/modules/order/theme/commerce_order.css b/modules/order/theme/commerce_order.css
deleted file mode 100644
index d084e29..0000000
--- a/modules/order/theme/commerce_order.css
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.field-name-commerce-order-total .commerce-price-formatted-components {
-  width: 33%;
-  margin-left: auto;
-}
-
-.field-name-commerce-order-total .commerce-price-formatted-components tr.component-type-commerce-price-formatted-amount {
-  background-color: #D3E9F4;
-  font-weight: bold;
-}
diff --git a/modules/order/theme/commerce_order.theme.css b/modules/order/theme/commerce_order.theme.css
new file mode 100644
index 0000000..e29f6a2
--- /dev/null
+++ b/modules/order/theme/commerce_order.theme.css
@@ -0,0 +1,15 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Order module.
+ */
+
+.field-name-commerce-order-total .commerce-price-formatted-components {
+  width: 33%;
+  margin-left: auto;
+}
+
+.field-name-commerce-order-total .commerce-price-formatted-components tr.component-type-commerce-price-formatted-amount {
+  background-color: #D3E9F4;
+  font-weight: bold;
+}
diff --git a/modules/order/theme/commerce_order_views.css b/modules/order/theme/commerce_order_views.css
deleted file mode 100644
index 84f1932..0000000
--- a/modules/order/theme/commerce_order_views.css
+++ /dev/null
@@ -1,14 +0,0 @@
-
-.views-field-operations .links.operations {
-  text-transform: lowercase;
-  margin-left: 0;
-}
-
-#commerce-order-ui-redirect-form .form-item {
-  float: left;
-  margin: 0 2em 0 0;
-}
-
-#commerce-order-ui-redirect-form .form-submit {
-  margin-top: 1.8em;
-}
diff --git a/modules/payment/commerce_payment.module b/modules/payment/commerce_payment.module
index 9c7cafb..ac51a1d 100644
--- a/modules/payment/commerce_payment.module
+++ b/modules/payment/commerce_payment.module
@@ -231,7 +231,7 @@ function commerce_payment_theme() {
  * Adds the necessary CSS for the line item summary template.
  */
 function template_preprocess_commerce_payment_totals(&$variables) {
-  drupal_add_css(drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.admin.css');
 }
 
 /**
diff --git a/modules/payment/includes/commerce_payment.credit_card.inc b/modules/payment/includes/commerce_payment.credit_card.inc
index da97a43..f57f6dc 100644
--- a/modules/payment/includes/commerce_payment.credit_card.inc
+++ b/modules/payment/includes/commerce_payment.credit_card.inc
@@ -36,7 +36,7 @@ function commerce_payment_credit_card_form($fields = array(), $default = array()
   $form['credit_card'] = array(
     '#tree' => TRUE,
     '#attached' => array(
-      'css' => array(drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.credit_card.css'),
+      'css' => array(drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.theme.css'),
     ),
   );
 
diff --git a/modules/payment/includes/commerce_payment_transaction.controller.inc b/modules/payment/includes/commerce_payment_transaction.controller.inc
index 762958f..1538c52 100644
--- a/modules/payment/includes/commerce_payment_transaction.controller.inc
+++ b/modules/payment/includes/commerce_payment_transaction.controller.inc
@@ -190,7 +190,7 @@ class CommercePaymentTransactionEntityController extends DrupalCommerceEntityCon
     $content['transaction_table'] = array(
       '#attached' => array(
         'css' => array(
-          drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.css',
+          drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.admin.css',
         ),
       ),
       '#markup' => theme('table', array('rows' => $rows, 'attributes' => array('class' => array('payment-transaction')))),
diff --git a/modules/payment/includes/views/handlers/commerce_payment_handler_field_payment_transaction_operations.inc b/modules/payment/includes/views/handlers/commerce_payment_handler_field_payment_transaction_operations.inc
index c02e585..e83e0c1 100644
--- a/modules/payment/includes/views/handlers/commerce_payment_handler_field_payment_transaction_operations.inc
+++ b/modules/payment/includes/views/handlers/commerce_payment_handler_field_payment_transaction_operations.inc
@@ -23,8 +23,6 @@ class commerce_payment_handler_field_payment_transaction_operations extends view
     $links = menu_contextual_links('commerce-payment-transaction', 'admin/commerce/orders/' . $order_id . '/payment', array($transaction_id));
 
     if (!empty($links)) {
-      drupal_add_css(drupal_get_path('module', 'commerce_payment') . '/theme/commerce_payment.css');
-
       return theme('links', array('links' => $links, 'attributes' => array('class' => array('links', 'inline', 'operations'))));
     }
   }
diff --git a/modules/payment/theme/commerce_payment.admin.css b/modules/payment/theme/commerce_payment.admin.css
new file mode 100644
index 0000000..9c1e520
--- /dev/null
+++ b/modules/payment/theme/commerce_payment.admin.css
@@ -0,0 +1,54 @@
+
+/**
+ * @file
+ * Administration styles for the Commerce Payment module.
+ *
+ * Optimized for the Seven administration theme.
+ */
+
+/**
+ * Add styles for administrative payment transaction displays.
+ */
+.views-field-status img.pending {
+  position: relative;
+  top: 3px;
+}
+
+.payment-totals-table {
+  width: 33%;
+  float: right;
+}
+
+.payment-totals-table tr.order-balance {
+  background-color: #D3E9F4;
+  font-weight: bold;
+}
+
+.payment-totals-table .total,
+.payment-totals-table .balance {
+  text-align: right;
+}
+
+.add-payment .form-item-payment-method {
+  float: left;
+}
+.add-payment .form-submit {
+  float: left;
+  margin: 5px;
+}
+
+.add-payment .ajax-progress .message {
+  display:none;
+}
+
+.payment-terminal {
+  clear: right;
+}
+
+.payment-terminal-amount div {
+  display: inline;
+}
+
+table.payment-transaction td {
+  vertical-align: top;
+}
diff --git a/modules/payment/theme/commerce_payment.credit_card.css b/modules/payment/theme/commerce_payment.credit_card.css
deleted file mode 100644
index 275be09..0000000
--- a/modules/payment/theme/commerce_payment.credit_card.css
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/**
- * Add styles to credot card form elements.
- */
-.commerce-credit-card-start,
-.commerce-credit-card-expiration {
-  margin-bottom: 1em;
-}
-
-.commerce-credit-card-start .form-item,
-.commerce-credit-card-expiration .form-item {
-  display: inline;
-  margin-right: .25em;
-  margin-bottom: 1em;
-}
-
-.commerce-month-year-divider {
-  margin-right: 3px;
-}
diff --git a/modules/payment/theme/commerce_payment.css b/modules/payment/theme/commerce_payment.css
deleted file mode 100644
index 006ea53..0000000
--- a/modules/payment/theme/commerce_payment.css
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/**
- * Add styles for administrative payment transaction displays.
- */
-.views-field-status img.pending {
-  position: relative;
-  top: 3px;
-}
-
-.payment-totals-table {
-  width: 33%;
-  float: right;
-}
-
-.payment-totals-table tr.order-balance {
-  background-color: #D3E9F4;
-  font-weight: bold;
-}
-
-.payment-totals-table .total,
-.payment-totals-table .balance {
-  text-align: right;
-}
-
-.add-payment .form-item-payment-method {
-  float: left;
-}
-.add-payment .form-submit {
-  float: left;
-  margin: 5px;
-}
-
-.add-payment .ajax-progress .message {
-  display:none;
-}
-
-.views-field-operations .links.operations {
-  text-transform: lowercase;
-  margin-left: 0;
-}
-
-.payment-terminal {
-  clear: right;
-}
-
-.payment-terminal-amount div {
-  display: inline;
-}
-
-table.payment-transaction td {
-  vertical-align: top;
-}
diff --git a/modules/payment/theme/commerce_payment.theme.css b/modules/payment/theme/commerce_payment.theme.css
new file mode 100644
index 0000000..34c81a0
--- /dev/null
+++ b/modules/payment/theme/commerce_payment.theme.css
@@ -0,0 +1,24 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Payment module.
+ */
+
+/**
+ * Add styles to credit card form elements.
+ */
+.commerce-credit-card-start,
+.commerce-credit-card-expiration {
+  margin-bottom: 1em;
+}
+
+.commerce-credit-card-start .form-item,
+.commerce-credit-card-expiration .form-item {
+  display: inline;
+  margin-right: .25em;
+  margin-bottom: 1em;
+}
+
+.commerce-month-year-divider {
+  margin-right: 3px;
+}
diff --git a/modules/price/commerce_price.module b/modules/price/commerce_price.module
index a67e0de..6116a78 100644
--- a/modules/price/commerce_price.module
+++ b/modules/price/commerce_price.module
@@ -479,7 +479,7 @@ function commerce_price_field_formatter_view($entity_type, $entity, $field, $ins
  */
 function theme_commerce_price_formatted_components($variables) {
   // Add the CSS styling to the table.
-  drupal_add_css(drupal_get_path('module', 'commerce_price') . '/theme/commerce_price.css');
+  drupal_add_css(drupal_get_path('module', 'commerce_price') . '/theme/commerce_price.theme.css');
 
   // Build table rows out of the components.
   $rows = array();
@@ -584,7 +584,7 @@ function commerce_price_field_widget_form(&$form, &$form_state, $field, $instanc
   // Load the default currency for this instance.
   $default_currency = commerce_currency_load($default_currency_code);
 
-  $element['#attached']['css'][] = drupal_get_path('module', 'commerce_price') . '/theme/commerce_price.css';
+  $element['#attached']['css'][] = drupal_get_path('module', 'commerce_price') . '/theme/commerce_price.theme.css';
 
   // Build the form based on the type of price widget.
   switch ($instance['widget']['type']) {
diff --git a/modules/price/commerce_price.rules.inc b/modules/price/commerce_price.rules.inc
index 454f8ce..f97cdc7 100644
--- a/modules/price/commerce_price.rules.inc
+++ b/modules/price/commerce_price.rules.inc
@@ -61,7 +61,7 @@ class RulesDataUICommercePrice extends RulesDataUI implements RulesDataDirectInp
     // Load the default currency for this instance.
     $default_currency = commerce_currency_load($default_currency_code);
 
-    $form[$name]['#attached']['css'][] = drupal_get_path('module', 'commerce_price') . '/theme/commerce_price.css';
+    $form[$name]['#attached']['css'][] = drupal_get_path('module', 'commerce_price') . '/theme/commerce_price.theme.css';
 
     $form[$name]['amount'] = array(
       '#type' => 'textfield',
diff --git a/modules/price/theme/commerce_price.css b/modules/price/theme/commerce_price.css
deleted file mode 100644
index 24812a4..0000000
--- a/modules/price/theme/commerce_price.css
+++ /dev/null
@@ -1,13 +0,0 @@
-
-.commerce-price-full .form-item {
-  display: inline;
-  margin-right: 1em;
-}
-
-#edit-parameter-value .commerce-price-full {
-  margin: 1em 0;
-}
-
-.commerce-price-formatted-components .component-total {
-  text-align: right;
-}
diff --git a/modules/price/theme/commerce_price.theme.css b/modules/price/theme/commerce_price.theme.css
new file mode 100644
index 0000000..7e7b258
--- /dev/null
+++ b/modules/price/theme/commerce_price.theme.css
@@ -0,0 +1,18 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Price module.
+ */
+
+.commerce-price-full .form-item {
+  display: inline;
+  margin-right: 1em;
+}
+
+#edit-parameter-value .commerce-price-full {
+  margin: 1em 0;
+}
+
+.commerce-price-formatted-components .component-total {
+  text-align: right;
+}
diff --git a/modules/product/includes/commerce_product.controller.inc b/modules/product/includes/commerce_product.controller.inc
index 6de7f8e..dc1ec0a 100644
--- a/modules/product/includes/commerce_product.controller.inc
+++ b/modules/product/includes/commerce_product.controller.inc
@@ -150,7 +150,7 @@ class CommerceProductEntityController extends DrupalCommerceEntityController {
   public function buildContent($product, $view_mode = 'full', $langcode = NULL, $content = array()) {
     // Prepare a reusable array representing the CSS file to attach to the view.
     $attached = array(
-      'css' => array(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product.css'),
+      'css' => array(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product.theme.css'),
     );
 
     // Add the default fields inherent to the product entity.
diff --git a/modules/product/includes/commerce_product_ui.types.inc b/modules/product/includes/commerce_product_ui.types.inc
index a6c76d8..353558a 100644
--- a/modules/product/includes/commerce_product_ui.types.inc
+++ b/modules/product/includes/commerce_product_ui.types.inc
@@ -9,8 +9,6 @@
  * Menu callback: display an overview of available types.
  */
 function commerce_product_ui_types_overview() {
-  drupal_add_css(drupal_get_path('module', 'commerce_product_ui') . '/theme/commerce_product_ui.types.css');
-
   $header = array(
     t('Name'),
     t('Operations'),
diff --git a/modules/product/includes/views/handlers/commerce_product_handler_field_product_operations.inc b/modules/product/includes/views/handlers/commerce_product_handler_field_product_operations.inc
index 629d730..6af06f3 100644
--- a/modules/product/includes/views/handlers/commerce_product_handler_field_product_operations.inc
+++ b/modules/product/includes/views/handlers/commerce_product_handler_field_product_operations.inc
@@ -47,7 +47,6 @@ class commerce_product_handler_field_product_operations extends views_handler_fi
         }
       }
 
-      drupal_add_css(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product_views.css');
       return theme('links', array('links' => $links, 'attributes' => array('class' => array('links', 'inline', 'operations'))));
     }
   }
diff --git a/modules/product/theme/commerce_product.css b/modules/product/theme/commerce_product.css
deleted file mode 100644
index ed798a9..0000000
--- a/modules/product/theme/commerce_product.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-.commerce-product-sku-label,
-.commerce-product-title-label,
-.commerce-product-status-label {
-  display: inline;
-  font-weight: bold;
-}
diff --git a/modules/product/theme/commerce_product.theme.css b/modules/product/theme/commerce_product.theme.css
new file mode 100644
index 0000000..009d8f7
--- /dev/null
+++ b/modules/product/theme/commerce_product.theme.css
@@ -0,0 +1,12 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Product module.
+ */
+
+.commerce-product-sku-label,
+.commerce-product-title-label,
+.commerce-product-status-label {
+  display: inline;
+  font-weight: bold;
+}
diff --git a/modules/product/theme/commerce_product_ui.types.css b/modules/product/theme/commerce_product_ui.types.css
deleted file mode 100644
index de15d8d..0000000
--- a/modules/product/theme/commerce_product_ui.types.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.links.operations {
-  text-transform: lowercase;
-}
diff --git a/modules/product/theme/commerce_product_views.css b/modules/product/theme/commerce_product_views.css
deleted file mode 100644
index 8bbe170..0000000
--- a/modules/product/theme/commerce_product_views.css
+++ /dev/null
@@ -1,5 +0,0 @@
-
-.views-field-operations .links.operations {
-  text-transform: lowercase;
-  margin-left: 0;
-}
diff --git a/modules/product_reference/commerce_product_reference.module b/modules/product_reference/commerce_product_reference.module
index d33d4aa..4c0834c 100644
--- a/modules/product_reference/commerce_product_reference.module
+++ b/modules/product_reference/commerce_product_reference.module
@@ -351,7 +351,7 @@ function commerce_product_reference_entity_view($entity, $entity_type, $view_mod
             $entity->content['product:' . $product_extra_field_name] = array(
               '#markup' => theme($product_extra_field['theme'], $variables),
               '#attached' => array(
-                'css' => array(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product.css'),
+                'css' => array(drupal_get_path('module', 'commerce_product') . '/theme/commerce_product.theme.css'),
               ),
             );
 
diff --git a/modules/tax/commerce_tax.module b/modules/tax/commerce_tax.module
index b0008d2..8e9c6d5 100644
--- a/modules/tax/commerce_tax.module
+++ b/modules/tax/commerce_tax.module
@@ -400,7 +400,7 @@ function commerce_tax_field_attach_form($entity_type, $entity, &$form, &$form_st
               '#empty_value' => '',
               '#suffix' => '<div class="commerce-price-tax-included-clearfix"></div>',
               '#attached' => array(
-                'css' => array(drupal_get_path('module', 'commerce_tax') . '/theme/commerce_tax.css'),
+                'css' => array(drupal_get_path('module', 'commerce_tax') . '/theme/commerce_tax.theme.css'),
               ),
             );
           }
diff --git a/modules/tax/includes/commerce_tax_ui.admin.inc b/modules/tax/includes/commerce_tax_ui.admin.inc
index ec59049..c7f379a 100644
--- a/modules/tax/includes/commerce_tax_ui.admin.inc
+++ b/modules/tax/includes/commerce_tax_ui.admin.inc
@@ -10,8 +10,6 @@
  * Displays an overview of Tax UI defined tax rates.
  */
 function commerce_tax_ui_overview($type) {
-  drupal_add_css(drupal_get_path('module', 'commerce_tax_ui') . '/theme/commerce_tax_ui.css');
-
   // Load the items that will be represented in the overview table.
   if ($type == 'rates') {
     $items = commerce_tax_rates();
diff --git a/modules/tax/theme/commerce_tax.css b/modules/tax/theme/commerce_tax.css
deleted file mode 100644
index 7732ae0..0000000
--- a/modules/tax/theme/commerce_tax.css
+++ /dev/null
@@ -1,9 +0,0 @@
-
-.field-type-commerce-price .form-item {
-  float: left;
-  margin-right: 1em;
-}
-
-.commerce-price-tax-included-clearfix {
-  clear: left;
-}
diff --git a/modules/tax/theme/commerce_tax.theme.css b/modules/tax/theme/commerce_tax.theme.css
new file mode 100644
index 0000000..a759880
--- /dev/null
+++ b/modules/tax/theme/commerce_tax.theme.css
@@ -0,0 +1,14 @@
+
+/**
+ * @file
+ * Basic styling for the Commerce Tax module.
+ */
+
+.field-type-commerce-price .form-item {
+  float: left;
+  margin-right: 1em;
+}
+
+.commerce-price-tax-included-clearfix {
+  clear: left;
+}
diff --git a/modules/tax/theme/commerce_tax_ui.css b/modules/tax/theme/commerce_tax_ui.css
deleted file mode 100644
index de15d8d..0000000
--- a/modules/tax/theme/commerce_tax_ui.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.links.operations {
-  text-transform: lowercase;
-}
diff --git a/theme/commerce.admin.css b/theme/commerce.admin.css
new file mode 100644
index 0000000..811fe55
--- /dev/null
+++ b/theme/commerce.admin.css
@@ -0,0 +1,9 @@
+
+/**
+ * @file
+ * Administration styles for the Commerce module.
+ */
+
+.links.operations {
+  text-transform: lowercase;
+}