diff --git a/core.css b/core.css
index 8c8e7df..44b55e8 100644
--- a/core.css
+++ b/core.css
@@ -46,6 +46,19 @@ div.status {
   background-color:#ecf8f4;
   }
 
+table tr.merge-down td {
+  border-bottom: 0;
+}
+
+table tr.merge-up td {
+  border-top: 0;
+}
+
+table td.status-description {
+  padding: 0 18px;
+  font-size: .88em;
+}
+
   div.error   { border-color:#ffd4d0; }
   div.warning { border-color:#ffe4b0; }
   div.status  { border-color:#dce8e4; }
@@ -260,7 +273,6 @@ table .item-list,
   color:#666;
   font-weight:bold;
   font-size:10px;
-  text-transform:uppercase;
   }
 
   .form-item label.option {
@@ -560,7 +572,6 @@ form .form-actions {
 .box-title {
   font-weight:normal;
   font-size:10px;
-  text-transform:uppercase;
 
   background:#eee;
   border:1px solid #ddd;
diff --git a/rubik.info b/rubik.info
index 08ca2b3..3533634 100644
--- a/rubik.info
+++ b/rubik.info
@@ -18,3 +18,5 @@ stylesheets[print][] = print.css
 ; Support shortcut module links
 settings[shortcut_module_link] = 1
 
+; By default side bar in forms is enabled
+settings[rubik_dont_use_sidebar_in_form] = 0
diff --git a/style.css b/style.css
index 9e35644..d6aeb5d 100644
--- a/style.css
+++ b/style.css
@@ -96,7 +96,6 @@ table th {
 #branding .breadcrumb {
   padding:0px;
   float:left;
-  text-transform:uppercase;
   font-weight:normal;
   }
 
diff --git a/template.php b/template.php
index 5683164..0a1617e 100644
--- a/template.php
+++ b/template.php
@@ -53,54 +53,56 @@ function rubik_theme() {
     'process functions' => array('template_process'),
   );
 
-  // Form layout: default (2 column).
-  $items['block_add_block_form'] =
-  $items['block_admin_configure'] =
-  $items['comment_form'] =
-  $items['contact_admin_edit'] =
-  $items['contact_mail_page'] =
-  $items['contact_mail_user'] =
-  $items['filter_admin_format_form'] =
-  $items['forum_form'] =
-  $items['locale_languages_edit_form'] =
-  $items['menu_edit_menu'] =
-  $items['menu_edit_item'] =
-  $items['node_type_form'] =
-  $items['path_admin_form'] =
-  $items['system_settings_form'] =
-  $items['system_themes_form'] =
-  $items['system_modules'] =
-  $items['system_actions_configure'] =
-  $items['taxonomy_form_term'] =
-  $items['taxonomy_form_vocabulary'] =
-  $items['user_profile_form'] =
-  $items['user_admin_access_add_form'] = array(
-    'render element' => 'form',
-    'path' => drupal_get_path('theme', 'rubik') .'/templates',
-    'template' => 'form-default',
-    'preprocess functions' => array(
-      'rubik_preprocess_form_buttons',
-    ),
-  );
+  if (!theme_get_setting('rubik_dont_use_sidebar_in_form')) {
+    // Form layout: default (2 column).
+    $items['block_add_block_form'] =
+    $items['block_admin_configure'] =
+    $items['comment_form'] =
+    $items['contact_admin_edit'] =
+    $items['contact_mail_page'] =
+    $items['contact_mail_user'] =
+    $items['filter_admin_format_form'] =
+    $items['forum_form'] =
+    $items['locale_languages_edit_form'] =
+    $items['menu_edit_menu'] =
+    $items['menu_edit_item'] =
+    $items['node_type_form'] =
+    $items['path_admin_form'] =
+    $items['system_settings_form'] =
+    $items['system_themes_form'] =
+    $items['system_modules'] =
+    $items['system_actions_configure'] =
+    $items['taxonomy_form_term'] =
+    $items['taxonomy_form_vocabulary'] =
+    $items['user_profile_form'] =
+    $items['user_admin_access_add_form'] = array(
+      'render element' => 'form',
+      'path' => drupal_get_path('theme', 'rubik') .'/templates',
+      'template' => 'form-default',
+      'preprocess functions' => array(
+        'rubik_preprocess_form_buttons',
+      ),
+    );
 
-  // These forms require additional massaging.
-  $items['confirm_form'] = array(
-    'render element' => 'form',
-    'path' => drupal_get_path('theme', 'rubik') .'/templates',
-    'template' => 'form-simple',
-    'preprocess functions' => array(
-      'rubik_preprocess_form_confirm'
-    ),
-  );
-  $items['node_form'] = array(
-    'render element' => 'form',
-    'path' => drupal_get_path('theme', 'rubik') .'/templates',
-    'template' => 'form-default',
-    'preprocess functions' => array(
-      'rubik_preprocess_form_buttons',
-      'rubik_preprocess_form_node',
-    ),
-  );
+    // These forms require additional massaging.
+    $items['confirm_form'] = array(
+      'render element' => 'form',
+      'path' => drupal_get_path('theme', 'rubik') .'/templates',
+      'template' => 'form-simple',
+      'preprocess functions' => array(
+        'rubik_preprocess_form_confirm'
+      ),
+    );
+    $items['node_form'] = array(
+      'render element' => 'form',
+      'path' => drupal_get_path('theme', 'rubik') .'/templates',
+      'template' => 'form-default',
+      'preprocess functions' => array(
+        'rubik_preprocess_form_buttons',
+        'rubik_preprocess_form_node',
+      ),
+    );
+  }
 
   return $items;
 }
diff --git a/theme-settings.php b/theme-settings.php
new file mode 100644
index 0000000..0244504
--- /dev/null
+++ b/theme-settings.php
@@ -0,0 +1,9 @@
+<?php
+
+function rubik_form_system_theme_settings_alter(&$form, $form_state) {
+  $form['rubik_dont_use_sidebar_in_form'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Disable side bar in forms'),
+    '#default_value' => theme_get_setting('rubik_dont_use_sidebar_in_form'),
+  );
+}