[dw-free] Cleaning: make all themes.s2 files look the same

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/c67e241e07e3]

http://bugs.dwscoalition.org/show_bug.cgi?id=2894

Reorder and reformat theme files for consistency.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/colorside/themes.s2
• bin/upgrading/s2layers/core2base/themes.s2
• bin/upgrading/s2layers/easyread/themes.s2
• bin/upgrading/s2layers/sitefeeds/themes.s2
• bin/upgrading/s2layers/zesty/themes.s2

--------------------------------------------------------------------------------
diff -r b559ece4948b -r c67e241e07e3 bin/upgrading/s2layers/colorside/themes.s2
--- a/bin/upgrading/s2layers/colorside/themes.s2	Tue Aug 24 22:46:31 2010 -0500
+++ b/bin/upgrading/s2layers/colorside/themes.s2	Wed Aug 25 09:58:17 2010 -0500
@@ -159,40 +159,55 @@ layerinfo author_name = "cesy";
 
 set layout_authors = [ { "name" => "cesy", "type" => "user" } ];
 
-set color_footer_link_hover = "#ccffcc";
-set color_page_link_active = "#ffcccc";
-set color_page_link = "#ddddff";
-set color_module_link_hover = "#ccffcc";
-set color_module_background = "#000000";
-set color_entry_border = "#ffffff";
-set color_entry_text = "#ffffff";
-set color_module_title = "#ffffff";
-set color_page_text = "#ffffff";
-set color_footer_background = "#666666";
-set color_header_background = "#666666";
-set color_page_border = "#999999";
-set color_entry_interaction_links = "#ffffff";
-set color_comment_title_background = "#000000";
-set color_page_background = "#000000";
-set color_module_title_background = "#666666";
-set color_entry_link_hover = "#ccffcc";
-set color_page_title = "#ffffff";
-set color_footer_link_active = "#ffcccc";
-set color_footer_link_visited = "#ffffcc";
-set color_module_border = "#ffffff";
-set color_entry_link = "#ddddff";
-set color_module_link = "#ddddff";
-set color_entry_link_visited = "#ffffcc";
-set color_module_link_visited = "#ffffcc";
-set color_entry_title = "#ffffff";
-set color_page_link_visited = "#ffffcc";
-set color_entry_title_background = "#000000";
-set color_page_link_hover = "#ccffcc";
-set color_entry_link_active = "#ffcccc";
-set color_module_link_active = "#ffcccc";
-set color_module_text = "#ffffff";
-set color_entry_background = "#000000";
-set color_footer_link = "#ddddff";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_border = "#999";
+set color_page_link = "#ddf";
+set color_page_link_active = "#fcc";
+set color_page_link_hover = "#cfc";
+set color_page_link_visited = "#ffc";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_header_background = "#666";
+set color_footer_background = "#666";
+set color_footer_link = "#ddf";
+set color_footer_link_active = "#fcc";
+set color_footer_link_hover = "#cfc";
+set color_footer_link_visited = "#ffc";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_entry_border = "#fff";
+set color_entry_interaction_links = "#fff";
+set color_entry_link = "#ddf";
+set color_entry_link_active = "#fcc";
+set color_entry_link_hover = "#cfc";
+set color_entry_link_visited = "#ffc";
+set color_entry_text = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#000";
+set color_comment_title_background = "#000";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#000";
+set color_module_border = "#fff";
+set color_module_link = "#ddf";
+set color_module_link_active = "#fcc";
+set color_module_link_hover = "#cfc";
+set color_module_link_visited = "#ffc";
+set color_module_text = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#666";
+
 
 #NEWLAYER: colorside/nnwm2009
 layerinfo type = "theme";
@@ -202,28 +217,37 @@ layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_footer_background = "#ffefbd";
-set color_footer_link = "#ef8229";
+##===============================
+## Page Colors
+##===============================
 
-set color_header_background = "#ffefbd";
-
-set color_module_background = "#ffefbd";
-set color_module_text="#000000";
-set color_module_title = "#ef8229";
-
-set color_page_background = "#000000";
+set color_page_background = "#000";
 set color_page_border = "#842021";
 set color_page_link = "#429ace";
 set color_page_link_active = "#A5CF39";
 set color_page_link_hover = "#842021";
 set color_page_link_visited = "#ef4921";
-set color_page_text = "#ffffff";
+set color_page_text = "#fff";
 set color_page_title = "#ef8229";
+set color_header_background = "#ffefbd";
+set color_footer_background = "#ffefbd";
+set color_footer_link = "#ef8229";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#ffefbd";
+set color_module_text="#000";
+set color_module_title = "#ef8229";
 
 function Page::print_theme_stylesheet () {
-"""
-#title, #pagetitle { padding-left: 5px; }
-""" ;}
+    """
+    #title, #pagetitle {
+        padding-left: 5px;
+        }
+    """;
+}
 
 
 #NEWLAYER: colorside/scatteredfields
@@ -238,7 +262,7 @@ set layout_authors = [ { "name" => "time
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
+set color_page_background = "#fff";
 set color_page_border = "#d8d8a8";
 set color_page_link = "#d92300";
 set color_page_link_active = "#d92300";
diff -r b559ece4948b -r c67e241e07e3 bin/upgrading/s2layers/core2base/themes.s2
--- a/bin/upgrading/s2layers/core2base/themes.s2	Tue Aug 24 22:46:31 2010 -0500
+++ b/bin/upgrading/s2layers/core2base/themes.s2	Wed Aug 25 09:58:17 2010 -0500
@@ -4,96 +4,137 @@ layerinfo redist_uniq = "core2base/dazzl
 layerinfo redist_uniq = "core2base/dazzle";
 layerinfo author_name = "zvi";
 
-set layout_authors = [ { "name" => "zvi", "type" => "user" }];
+set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_entry_background = "#ffffff";  
-set color_entry_interaction_links = "#ff00d9";
-set color_entry_link_active = "#00ff15";
-set color_entry_link = "#ff00d9";
-set color_entry_link_hover = "#00ff15";
-set color_entry_link_visited = "#ff4d00"; 
-set color_entry_text = "#000000"; 
-set color_footer_background = "#ff00d9"; 
-set color_footer_link = "#000000";
-set color_footer_link_active = "#00ff15"; 
-set color_footer_link_hover = "#00ff15";  
-set color_footer_link_visited = "#ffe436";
-set color_header_background = "#ff00d9";
-set color_module_background = "#ff00d9"; 
-set color_module_link = "#000000";
-set color_module_link_active = "#00ff15"; 
-set color_module_link_hover = "#00eeff";
-set color_module_link_visited = "#ffe436";
-set color_module_text = "#ffffff";
-set color_page_background = "#00eeff";  
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#0ef";
 set color_page_border = "#ff00d9";
+set color_page_link = "#ff00d9";
 set color_page_link_active = "#00ff15";
-set color_page_link = "#ff00d9";
 set color_page_link_hover = "#00ff15";
 set color_page_link_visited = "#ff4d00";
-set color_page_text = "#000000";
-set color_page_title = "#00eeff";
-   
+set color_page_text = "#000";
+set color_page_title = "#0ef";
+set color_header_background = "#ff00d9";
+set color_footer_background = "#ff00d9";
+set color_footer_link = "#000";
+set color_footer_link_active = "#00ff15";
+set color_footer_link_hover = "#00ff15";
+set color_footer_link_visited = "#ffe436";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_interaction_links = "#ff00d9";
+set color_entry_link = "#ff00d9";
+set color_entry_link_active = "#00ff15";
+set color_entry_link_hover = "#00ff15";
+set color_entry_link_visited = "#ff4d00";
+set color_entry_text = "#000";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#ff00d9";
+set color_module_link = "#000";
+set color_module_link_active = "#00ff15";
+set color_module_link_hover = "#0ef";
+set color_module_link_visited = "#ffe436";
+set color_module_text = "#fff";
+
 function Page::print_theme_stylesheet () {
-""" 
-.entry .inner, .module { padding: 0.5em; }
-""";
+    """
+    .entry .inner, .module { padding: .5em; }
+    """;
 }
+
 
 #NEWLAYER: core2base/kelis
 layerinfo type = "theme";
 layerinfo name = "Kelis";
 layerinfo redist_uniq = "core2base/kelis";
+layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#f8f1e0";
+set color_page_border = "#bc926b";
+set color_page_link = "#107d8d";
 set color_page_link_active = "#e62617";
-set color_page_background = "#f8f1e0";
-set color_page_link = "#107d8d";
+set color_page_link_hover = "#e62617";
+set color_page_link_visited = "#e6a417";
+set color_page_text = "#825e3d";
 set color_page_title = "#f8f1e0";
+set color_header_background = "#bc926b";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#cfffcd";
+set color_entry_border = "#bc926b";
+set color_entry_link_visited = "#e67a17";
+
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#acd8df";
 set color_module_border = "#bc926b";
-set color_entry_border = "#bc926b";
-set color_page_text = "#825e3d";
-set color_entry_link_visited = "#e67a17";
 set color_module_link_visited = "#e67a17";
-set color_page_link_visited = "#e6a417";
-set color_header_background = "#bc926b";
-set color_page_border = "#bc926b";
-set color_page_link_hover = "#e62617";
-set color_entry_background = "#cfffcd";
 
 function Page::print_theme_stylesheet () {
-"""
-.entry .inner, .module { padding: 0.5em; }
-""";
+    """
+    .entry .inner, .module { padding: .5em; }
+    """;
 }
 
+
 #NEWLAYER: core2base/muted
-layerinfo type = "theme"; 
-layerinfo name = "Muted"; 
+layerinfo type = "theme";
+layerinfo name = "Muted";
 layerinfo redist_uniq = "core2base/muted";
+layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_footer_background = "#AEB2C9";
-set color_footer_link = "#f7f7f7";
-set color_header_background = "#AEB2C9";
-set color_module_border = "#AEB2C9";
-set color_module_title = "#AEB2C9";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#f7f7f7";
 set color_page_border = "#AEB2C9";
+set color_page_link = "#6E6366";
 set color_page_link_active = "#AEB2C9";
-set color_page_link = "#6E6366";
 set color_page_link_hover = "#AEB2C9";
 set color_page_link_visited = "#AB7876";
 set color_page_text = "#303239";
 set color_page_title = "#f7f7f7";
+set color_header_background = "#AEB2C9";
+set color_footer_background = "#AEB2C9";
+set color_footer_link = "#f7f7f7";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#AEB2C9";
+set color_module_title = "#AEB2C9";
 
 function Page::print_theme_stylesheet () {
-"""
-.entry .inner, .module { padding: 0.5em; }
-""";
+    """
+    .entry .inner, .module { padding: .5em; }
+    """;
 }
 
 
@@ -101,65 +142,89 @@ layerinfo type = "theme";
 layerinfo type = "theme";
 layerinfo name = "NNWM 2009";
 layerinfo redist_uniq = "core2base/nnwm2009";
+layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_footer_background = "#ffefbd";
-set color_footer_link = "#ef8229";
+##===============================
+## Page Colors
+##===============================
 
-set color_header_background = "#ffefbd";
-
-set color_module_background = "#ffefbd";
-set color_module_text="#000000";
-set color_module_title = "#ef8229";
-
-set color_page_background = "#000000";
+set color_page_background = "#000";
 set color_page_border = "#842021";
 set color_page_link = "#429ace";
 set color_page_link_active = "#A5CF39";
 set color_page_link_hover = "#842021";
 set color_page_link_visited = "#ef4921";
-set color_page_text = "#ffffff";
+set color_page_text = "#fff";
 set color_page_title = "#ef8229";
+set color_header_background = "#ffefbd";
+set color_footer_background = "#ffefbd";
+set color_footer_link = "#ef8229";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#ffefbd";
+set color_module_text="#000";
+set color_module_title = "#ef8229";
+
 
 #NEWLAYER: core2base/shanice
 layerinfo type = "theme";
 layerinfo name = "Shanice";
 layerinfo redist_uniq = "core2base/shanice";
+layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_footer_background = "#ffffff";
-set color_header_background = "#ab3e5b";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#ecf081";
-set color_page_link = "#000000";
+set color_page_link = "#000";
 set color_page_link_active = "#b3cc57";
 set color_page_link_hover = "#FFBE40";
 set color_page_link_visited = "#ef746f";
 set color_page_text = "#ab3e5b";
-set color_page_title = "#ffffff";
+set color_page_title = "#fff";
+set color_header_background = "#ab3e5b";
+set color_footer_background = "#fff";
+
 
 #NEWLAYER: core2base/tabac
-layerinfo type = "theme";   
-layerinfo name = "Tabac"; 
+layerinfo type = "theme";
+layerinfo name = "Tabac";
 layerinfo redist_uniq = "core2base/tabac";
+layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_header_background = "#4a0812";
-set color_module_background = "#4a0812";
-set color_module_border = "#4A0812";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#2b1c13";
+set color_page_link = "#e8ac46";
 set color_page_link_active = "#6f61b8";
-set color_page_link = "#e8ac46";
 set color_page_link_hover = "#E84681";
 set color_page_link_visited = "#50af9c";
 set color_page_text = "#f2f1ed";
+set color_header_background = "#4a0812";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#4a0812";
+set color_module_border = "#4A0812";
+
 
 #NEWLAYER: core2base/testing
 layerinfo type = "theme";
-layerinfo name = "Tabula Rasa Plain";
+layerinfo name = "Plain";
 layerinfo redist_uniq = "core2base/testing";
 
 ## Plain Tabula Rasa, with only the most basic CSS applied
-
diff -r b559ece4948b -r c67e241e07e3 bin/upgrading/s2layers/easyread/themes.s2
--- a/bin/upgrading/s2layers/easyread/themes.s2	Tue Aug 24 22:46:31 2010 -0500
+++ b/bin/upgrading/s2layers/easyread/themes.s2	Wed Aug 25 09:58:17 2010 -0500
@@ -1,172 +1,261 @@
 #NEWLAYER: easyread/clovers
-layerinfo "type" = "theme";
-layerinfo "name" = "Clovers!";
+layerinfo type = "theme";
+layerinfo name = "Clovers!";
 layerinfo redist_uniq = "easyread/clovers";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#FFD700";
+set color_page_link = "#FF8C00";
+set color_page_link_active = "#FFD700";
 set color_page_link_visited = "#6B8E23";
-set color_page_link_active = "#FFD700";
-set color_page_background = "#FFD700";
+set color_page_title = "#FF8C00";
 set color_header_background = "#6B8E23";
-set color_page_link = "#FF8C00";
-set color_page_title = "#FF8C00";
-set color_entry_text = "#000000";
-set color_entry_background = "#ffffff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_text = "#000";
+set color_entry_background = "#fff";
 
 
 #NEWLAYER: easyread/green
-layerinfo "type" = "theme";
-layerinfo "name" = "Green";
+layerinfo type = "theme";
+layerinfo name = "Green";
 layerinfo redist_uniq = "easyread/green";
 layerinfo author_name = "Ricky Buchanan";
 layerinfo author_email = "ricky@notdoneliving.net";
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#bdedc3";
-set color_page_text = "#000000";
 set color_page_link = "#0b5606";
 set color_page_link_active = "#f8100f";
 set color_page_link_visited = "#062f03";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#117f09";
+
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#bdedc3";
-set color_entry_text = "#000000";
-set color_header_background = "#117f09";
-set color_page_title = "#fff";
+set color_entry_text = "#000";
 
 
 #NEWLAYER: easyread/hcblack
-layerinfo "type" = "theme";
-layerinfo "name" = "High Contrast Black";
+layerinfo type = "theme";
+layerinfo name = "High Contrast Black";
 layerinfo redist_uniq = "easyread/hcblack";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_page_link_visited = "#FF00FF";
-set color_page_link_active = "#ff0000";
-set color_page_background = "#000000";
-set color_header_background = "#000000";
-set color_page_link = "#ffff00";
-set color_page_title = "#ffffff";
-set color_entry_text = "#ffffff";
-set color_page_text = "#ffffff";
-set color_entry_background = "#000000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_link = "#ff0";
+set color_page_link_active = "#f00";
+set color_page_link_visited = "#f0f";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_header_background = "#000";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_entry_text = "#fff";
 
 
 #NEWLAYER: easyread/hcblackandyellow
-layerinfo "type" = "theme";
-layerinfo "name" = "High Contrast Black and Yellow";
+layerinfo type = "theme";
+layerinfo name = "High Contrast Black and Yellow";
 layerinfo redist_uniq = "easyread/hcblackandyellow";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_page_link_visited = "#aaff00";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_link = "#D280FF";
 set color_page_link_active = "#fffbe6";
-set color_page_background = "#000000";
-set color_header_background = "#000000";
-set color_page_link = "#D280FF";
-set color_page_title = "#ffff00";
-set color_entry_text = "#ffff00";
-set color_page_text = "#ffff00";
-set color_entry_background = "#000000";
+set color_page_link_visited = "#af0";
+set color_page_text = "#ff0";
+set color_page_title = "#ff0";
+set color_header_background = "#000";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_entry_text = "#ff0";
 
 
 #NEWLAYER: easyread/hcblueyellow
-layerinfo "type" = "theme";
-layerinfo "name" = "High Contrast Blue and Yellow";
+layerinfo type = "theme";
+layerinfo name = "High Contrast Blue and Yellow";
 layerinfo redist_uniq = "easyread/hcblueyellow";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#3D00FF";
-set color_page_link_active = "#FFAA00";
-set color_page_link = "#ffffff";
-set color_entry_text = "#FFFF00";
-set color_page_text = "#FFFF00";
-set color_page_link_visited = "#FFFF00";
+set color_page_link = "#fff";
+set color_page_link_active = "#fa0";
+set color_page_link_visited = "#ff0";
+set color_page_text = "#ff0";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_text = "#ff0";
 
 
 #NEWLAYER: easyread/hcwhite
-layerinfo "type" = "theme";
-layerinfo "name" = "High Contrast White";
+layerinfo type = "theme";
+layerinfo name = "High Contrast White";
 layerinfo redist_uniq = "easyread/hcwhite";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_page_link_visited = "#FF0000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#fff";
+set color_page_link = "#00f";
 set color_page_link_active = "#800080";
-set color_page_background = "#ffffff";
-set color_header_background = "#ffffff";
-set color_page_link = "#0000FF";
-set color_page_title = "#000000";
-set color_entry_text = "#000000";
-set color_page_text = "#000000";
-set color_entry_background = "#ffffff";
+set color_page_link_visited = "#f00";
+set color_page_text = "#000";
+set color_page_title = "#000";
+set color_header_background = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_text = "#000";
 
 
 #NEWLAYER: easyread/lcorange
-layerinfo "type" = "theme";
-layerinfo "name" = "Low Contrast Orange";
+layerinfo type = "theme";
+layerinfo name = "Low Contrast Orange";
 layerinfo redist_uniq = "easyread/lcorange";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#d19152";
+set color_page_link = "#ff8f1f";
+set color_page_link_active = "#000";
 set color_page_link_visited = "#357381";
-set color_page_link_active = "#000000";
-set color_page_background = "#d19152";
+set color_page_text = "#ffefa6";
+set color_page_title = "#ffefa6";
 set color_header_background = "#d19152";
-set color_page_link = "#ff8f1f";
-set color_page_title = "#ffefa6";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#ffefa6";
 set color_entry_text = "#d19152";
-set color_page_text = "#ffefa6";
-set color_entry_background = "#ffefa6";
 
 
-#NEWLAYER: easyread/nnwm2009    
-layerinfo "type" = "theme"; 
-layerinfo "name" = "NNWM 2009";
+#NEWLAYER: easyread/nnwm2009
+layerinfo type = "theme";
+layerinfo name = "NNWM 2009";
 layerinfo redist_uniq = "easyread/nnwm2009";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_border = "#842021";
+set color_page_link = "#429ace";
+set color_page_link_active = "#A5CF39";
+set color_page_link_hover = "#842021";
+set color_page_link_visited = "#ef4921";
+set color_page_text = "#fff";
+set color_page_title = "#ef8229";
+set color_header_background = "#ffefbd";
 set color_footer_background = "#ffefbd";
 set color_footer_link = "#ef8229";
 
-set color_header_background = "#ffefbd";
+##===============================
+## Module Colors
+##===============================
 
-set color_module_background = "#ffefbd"; 
-set color_module_text="#000000";
+set color_module_background = "#ffefbd";
+set color_module_text="#000";
 set color_module_title = "#ef8229";
 
-set color_page_background = "#000000";
-set color_page_border = "#842021";
-set color_page_link = "#429ace";
-set color_page_link_active = "#A5CF39";
-set color_page_link_hover = "#842021";  
-set color_page_link_visited = "#ef4921";
-set color_page_text = "#ffffff"; 
-set color_page_title = "#ef8229";
+function print_stylesheet () {
+    """
+    #tertiary {
+        color: $*color_module_text;
+        background-color: $*color_module_background;
+        }
 
-function print_stylesheet () {
-"""
-#tertiary { color: $*color_module_text;
-    background-color: $*color_module_background; }
-.module-header { color $*color_module_title; }
-"""
-;}
+    .module-header { color $*color_module_title; }
+    """;
+    }
 
 
 #NEWLAYER: easyread/toros
-layerinfo "type" = "theme";
-layerinfo "name" = "Toros!";
+layerinfo type = "theme";
+layerinfo name = "Toros!";
 layerinfo redist_uniq = "easyread/toros";
 layerinfo author_name = "zvi";
+
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_page_link_visited = "#000000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_link = "#f00";
 set color_page_link_active = "#FF7400";
-set color_page_background = "#000000";
-set color_header_background = "#ff0000";
-set color_page_link = "#ff0000";
-set color_page_title = "#000000";
-set color_entry_text = "#000000";
-set color_page_text = "#ffffff";
-set color_entry_background = "#ffffff";
+set color_page_link_visited = "#000";
+set color_page_text = "#fff";
+set color_page_title = "#000";
+set color_header_background = "#f00";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_text = "#000";
diff -r b559ece4948b -r c67e241e07e3 bin/upgrading/s2layers/sitefeeds/themes.s2
--- a/bin/upgrading/s2layers/sitefeeds/themes.s2	Tue Aug 24 22:46:31 2010 -0500
+++ b/bin/upgrading/s2layers/sitefeeds/themes.s2	Wed Aug 25 09:58:17 2010 -0500
@@ -3,8 +3,17 @@ layerinfo name = "Default Theme";
 layerinfo name = "Default Theme";
 layerinfo redist_uniq = "sitefeeds/default";
 
-set color_entry_background = "#ffffff";
-set color_entry_border = "#000000";
-set color_entry_title = "#ffffff";
-set color_entry_title_background = "#000000";
-set color_page_background = "#cccccc";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#ccc";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_border = "#000";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#000";
diff -r b559ece4948b -r c67e241e07e3 bin/upgrading/s2layers/zesty/themes.s2
--- a/bin/upgrading/s2layers/zesty/themes.s2	Tue Aug 24 22:46:31 2010 -0500
+++ b/bin/upgrading/s2layers/zesty/themes.s2	Wed Aug 25 09:58:17 2010 -0500
@@ -1,5 +1,4 @@
 #NEWLAYER: zesty/white
 layerinfo type = "theme";
-layerinfo name = "Zesty White";
+layerinfo name = "White";
 layerinfo redist_uniq = "zesty/white";
-
--------------------------------------------------------------------------------