diff --git a/omega.info b/omega.info
index 1c50a9626fd16484b9b8924ac496f4b5018e81e4..4ba088426cad671a72d02f21a41d0eb70ac0e4db 100644
--- a/omega.info
+++ b/omega.info
@@ -5,13 +5,6 @@ core = 6.x
 engine = phptemplate
 screenshot = screenshot.png
 
-stylesheets[all][] = css/reset.css
-;stylesheets[all][] = css/960.css
-stylesheets[all][] = css/text.css
-stylesheets[all][] = css/regions.css
-stylesheets[all][] = css/defaults.css
-stylesheets[all][] = css/custom.css
-
 scripts[] = js/omega.js
 
 regions[sidebar_first] = sidebar first
@@ -50,6 +43,12 @@ features[] = secondary_links
 ; Set the default settings to be used in theme-settings.php
 
 ; Non-960gs default settings
+settings[reset_css] = 1
+settings[text_css] = 1
+settings[regions_css] = 1
+settings[defaults_css] = 1
+settings[custom_css] = 1
+
 settings[front_page_title_display] = title_slogan
 settings[page_title_display_custom] = ''
 settings[other_page_title_display] = ptitle_stitle
diff --git a/starterkit/omega_starterkit.info b/starterkit/omega_starterkit.info
index 677534dd516bb829e993daf903cb33a2b08306d7..334f6997c33abc5283cd1a8f1336f6303f4c9467 100755
--- a/starterkit/omega_starterkit.info
+++ b/starterkit/omega_starterkit.info
@@ -56,6 +56,11 @@ features[] = secondary_links
 ; ------- Set the default settings to be used in theme-settings.php
 
 ; ------- Non-960gs general settings
+settings[reset_css] = 1
+settings[text_css] = 1
+settings[regions_css] = 1
+settings[defaults_css] = 1
+settings[custom_css] = 1
 
 settings[front_page_title_display] = title_slogan
 settings[page_title_display_custom] = ''
diff --git a/template.php b/template.php
index f712bb8029be38a734a6656ccaa3dbd31c665676..c9444b21e629aaef82aae8a1ac660056e33d833d 100644
--- a/template.php
+++ b/template.php
@@ -46,6 +46,7 @@ function omega_preprocess(&$vars, $hook) {
  * The default functionality can be found in preprocess/preprocess-page.inc
  */
 function omega_preprocess_page(&$vars, $hook) {
+	// Prepare 960gs CSS. Fixed width is default, fluid is optional via theme-settings
   if(theme_get_setting('omega_fixed_fluid') == 'fluid') {
     $css_960 = drupal_get_path('theme', 'omega') .'/css/960-fluid.css';
   }
@@ -53,6 +54,24 @@ function omega_preprocess_page(&$vars, $hook) {
   	$css_960 = drupal_get_path('theme', 'omega') .'/css/960.css';
   }
   drupal_add_css($css_960, 'theme', 'all');
+  
+  // enable/disable optional CSS files
+  if (theme_get_setting('reset_css') == '1') {
+    drupal_add_css(drupal_get_path('theme', 'omega') .'/css/reset.css', 'theme', 'all');
+  }
+  if (theme_get_setting('text_css') == '1') {
+    drupal_add_css(drupal_get_path('theme', 'omega') .'/css/text.css', 'theme', 'all');
+  }
+  if (theme_get_setting('regions_css') == '1') {
+    drupal_add_css(drupal_get_path('theme', 'omega') .'/css/regions.css', 'theme', 'all');
+  }
+  if (theme_get_setting('defaults_css') == '1') {
+    drupal_add_css(drupal_get_path('theme', 'omega') .'/css/defaults.css', 'theme', 'all');
+  }
+  if (theme_get_setting('custom_css') == '1') {
+    drupal_add_css(drupal_get_path('theme', 'omega') .'/css/custom.css', 'theme', 'all');
+  }
+  // redeclare $styles
   $vars['styles'] = drupal_get_css();
 } // end preprocess_page
 function omega_preprocess_node(&$vars, $hook) {
diff --git a/theme-settings.php b/theme-settings.php
index f26340b0637b1425ff3c23639e60f37973bdaeed..4d17f49868d7d09dd69c1b0eb2be8f1fedeaafaa 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -58,7 +58,38 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
-    
+    $form['omega_container']['omega_general']['optional_css'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Optional CSS Files'),
+      '#description'   => t('Here, you may disable default theme CSS provided by the Omega base theme.'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+      $form['omega_container']['omega_general']['optional_css']['reset_css'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Enable reset.css'),
+        '#default_value' => $saved_settings['reset_css'],
+      );
+      $form['omega_container']['omega_general']['optional_css']['text_css'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Enable text.css'),
+        '#default_value' => $saved_settings['text_css'],
+      );
+      $form['omega_container']['omega_general']['optional_css']['regions_css'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Enable regions.css'),
+        '#default_value' => $saved_settings['regions_css'],
+      );
+      $form['omega_container']['omega_general']['optional_css']['defaults_css'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Enable defaults.css'),
+        '#default_value' => $saved_settings['defaults_css'],
+      );
+      $form['omega_container']['omega_general']['optional_css']['custom_css'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Enable custom.css'),
+        '#default_value' => $saved_settings['custom_css'],
+      );
     // Page titles
       $form['omega_container']['omega_general']['page_format_titles'] = array(
         '#type' => 'fieldset',