diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 823e45e65..43bc840f1 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -273,30 +273,21 @@ else
 		// Theme default
 		
 		$e_js->themeCSS(THEME_STYLE, $css_default);
-		
-		/* Moved to class2 and defined as THEME_STYLE
-		if($e_pref->get('themecss') && file_exists(THEME.$e_pref->get('themecss')))
+
+		// Support for style.css - override theme default CSS
+		if(file_exists(THEME."style_custom.css"))
 		{
-			//echo "<link rel='stylesheet' href='".THEME_ABS."{$pref['themecss']}' type='text/css' media='{$css_default}' />\n";
-			$e_js->themeCSS($e_pref->get('themecss'), $css_default);
+			$e_js->themeCSS('style_custom.css',$css_default);
 		}
-		else
-		{
-		//	echo "<link rel='stylesheet' href='".THEME_ABS."style.css' type='text/css' media='{$css_default}' />\n";
-			$e_js->themeCSS('style.css', $css_default);
-		}
-		*/
+
 		// Support for print and handheld media - override theme default CSS
 		if(file_exists(THEME."style_mobile.css"))
 		{
-            //echo "<link rel='stylesheet' href='".THEME_ABS."style_mobile.css' type='text/css' media='handheld' />\n";
-			//$css_default = "screen";
 			$e_js->themeCSS('style_mobile.css', 'handheld');
 		}
+
 		if(file_exists(THEME."style_print.css"))
 		{
-            // echo "<link rel='stylesheet' href='".THEME_ABS."style_print.css' type='text/css' media='print' />\n";
-            // $css_default = "screen";
 			$e_js->themeCSS('style_print.css', 'print');
 		}
 	}