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

[kareila]

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/7a99b27e96a1]

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

Reformat theme files for consistency.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/colorside/themes-local.s2
• bin/upgrading/s2layers/modish/themes-local.s2
• bin/upgrading/s2layers/sundaymorning/themes.s2

--------------------------------------------------------------------------------
diff -r 7d34a88d6f37 -r 7a99b27e96a1 bin/upgrading/s2layers/colorside/themes-local.s2
--- a/bin/upgrading/s2layers/colorside/themes-local.s2	Fri Aug 13 07:53:04 2010 +0800
+++ b/bin/upgrading/s2layers/colorside/themes-local.s2	Tue Aug 17 14:11:29 2010 -0500
@@ -1,7 +1,7 @@
 #NEWLAYER: colorside/atom
-layerinfo "type" = "theme";
-layerinfo "name" = "ColorSide Atom";
-layerinfo "redist_uniq" = "colorside/atom";
+layerinfo type = "theme";
+layerinfo name = "Atom";
+layerinfo redist_uniq = "colorside/atom";
 layerinfo author_name = "branchandroot";
 
 set layout_resources = [ { "name" => "Stock.XCHNG", "url" => "http://www.sxc.hu" } ];
@@ -10,17 +10,17 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#000000";
+set color_page_background = "#fff";
+set color_page_border = "#333";
 set color_page_link = "#CC0202";
 set color_page_link_visited = "#A40101";
-set color_page_border = "#333333";
+set color_page_text = "#000";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#ffffff";
+set color_entry_title = "#fff";
 set color_entry_title_background = "#919191";
 
 ##===============================
@@ -28,25 +28,25 @@ set color_entry_title_background = "#919
 ##===============================
 
 set color_module_background = "#919191";
-set color_module_text = "#ffffff";
-set color_module_link = "#ffffff";
-set color_module_title = "#000000";
-set color_module_title_background = "#ffffff";
+set color_module_link = "#fff";
+set color_module_text = "#fff";
+set color_module_title = "#000";
+set color_module_title_background = "#fff";
 
 ##===============================
 ## Images
 ##===============================
 
-set image_background_header_url = "colorside/atom.jpg";
 set image_background_header_height = 250;
 set image_background_header_position = "top right";
 set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "colorside/atom.jpg";
 
 
 #NEWLAYER: colorside/fallleaves
-layerinfo "type" = "theme";
-layerinfo "name" = "ColorSide Fall Leaves";
-layerinfo "redist_uniq" = "colorside/fallleaves";
+layerinfo type = "theme";
+layerinfo name = "Fall Leaves";
+layerinfo redist_uniq = "colorside/fallleaves";
 layerinfo author_name = "branchandroot";
 
 set layout_resources = [ { "name" => "Stock.XCHNG", "url" => "http://www.sxc.hu" } ];
@@ -55,17 +55,17 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#000000";
+set color_page_background = "#fff";
+set color_page_border = "#EC7C0A";
 set color_page_link = "#FF4000";
 set color_page_link_visited = "#cc2000";
-set color_page_border = "#EC7C0A";
+set color_page_text = "#000";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#ffffff";
+set color_entry_title = "#fff";
 set color_entry_title_background = "#F9BB7D";
 
 ##===============================
@@ -73,25 +73,25 @@ set color_entry_title_background = "#F9B
 ##===============================
 
 set color_module_background = "#844609";
+set color_module_link = "#fff9ee";
 set color_module_text = "#fff9ee";
-set color_module_link = "#fff9ee";
-set color_module_title = "#000000";
-set color_module_title_background = "#ffffff";
+set color_module_title = "#000";
+set color_module_title_background = "#fff";
 
 ##===============================
 ## Images
 ##===============================
 
-set image_background_header_url = "colorside/fallleaves.jpg";
 set image_background_header_height = 250;
 set image_background_header_position = "top right";
 set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "colorside/fallleaves.jpg";
 
 
 #NEWLAYER: colorside/fish
-layerinfo "type" = "theme";
-layerinfo "name" = "ColorSide Fish";
-layerinfo "redist_uniq" = "colorside/fish";
+layerinfo type = "theme";
+layerinfo name = "Fish";
+layerinfo redist_uniq = "colorside/fish";
 layerinfo author_name = "branchandroot";
 
 set layout_resources = [ { "name" => "Stock.XCHNG", "url" => "http://www.sxc.hu" } ];
@@ -100,17 +100,17 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#000000";
+set color_page_background = "#fff";
+set color_page_border = "#8ABEE6";
 set color_page_link = "#8ABEE6";
 set color_page_link_visited = "#BCD2E9";
-set color_page_border = "#8ABEE6";
+set color_page_text = "#000";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#ffffff";
+set color_entry_title = "#fff";
 set color_entry_title_background = "#DD7D25";
 
 ##===============================
@@ -118,24 +118,24 @@ set color_entry_title_background = "#DD7
 ##===============================
 
 set color_module_background = "#DD7D25";
+set color_module_link = "#fff9ee";
 set color_module_text = "#fff9ee";
-set color_module_link = "#fff9ee";
-set color_module_title = "#000000";
-set color_module_title_background = "#ffffff";
+set color_module_title = "#000";
+set color_module_title_background = "#fff";
 
 ##===============================
 ## Images
 ##===============================
 
-set image_background_header_url = "colorside/tribalfish.jpg";
 set image_background_header_height = 250;
 set image_background_header_position = "top right";
 set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "colorside/tribalfish.jpg";
 
 
 #NEWLAYER: colorside/mandala
-layerinfo "type" = "theme";
-layerinfo "name" = "Mandala";
+layerinfo type = "theme";
+layerinfo name = "Mandala";
 layerinfo redist_uniq = "colorside/mandala";
 layerinfo author_name = "dancing_serpent";
 
@@ -145,33 +145,33 @@ set layout_resources = [ { "name" => "Op
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
+set color_page_background = "#fff";
 set color_page_border = "#009f43";
 set color_page_link = "#0072b5";
 set color_page_link_active = "#0072b5";
 set color_page_link_hover = "#795c60";
 set color_page_link_visited = "#6c1913";
-set color_page_text = "#000000";
+set color_page_text = "#000";
 set color_page_title = "#0072b5";
-set color_footer_background = "#ffffff";
+set color_header_background = "#fff";
+set color_footer_background = "#fff";
 set color_footer_link = "#0072b5";
 set color_footer_link_active = "#0072b5";
 set color_footer_link_hover = "#795c60";
 set color_footer_link_visited = "#6c1913";
-set color_header_background = "#ffffff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
+set color_entry_background = "#fff";
 set color_entry_interaction_links = "#0072b5";
 set color_entry_link = "#0072b5";
 set color_entry_link_active = "#0072b5";
 set color_entry_link_hover = "#795c60";
 set color_entry_link_visited = "#6c1913";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
 set color_entry_title_background = "#f19c5b";
 set color_comment_title_background = "#f19c5b";
 
@@ -184,9 +184,9 @@ set color_module_link_active = "#6c1913"
 set color_module_link_active = "#6c1913";
 set color_module_link_hover = "#ffee36";
 set color_module_link_visited = "#0072b5";
-set color_module_text = "#000000";
-set color_module_title = "#000000";
-set color_module_title_background = "#ffffff";
+set color_module_text = "#000";
+set color_module_title = "#000";
+set color_module_title_background = "#fff";
 
 ##===============================
 ## Images
@@ -199,8 +199,8 @@ set image_background_header_url = "color
 
 
 #NEWLAYER: colorside/nadeshiko
-layerinfo "type" = "theme";
-layerinfo "name" = "Nadeshiko";
+layerinfo type = "theme";
+layerinfo name = "Nadeshiko";
 layerinfo redist_uniq = "colorside/nadeshiko";
 layerinfo author_name = "branchandroot";
 
@@ -210,17 +210,17 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#000000";
+set color_page_background = "#fff";
+set color_page_border = "#2D3366";
 set color_page_link = "#FA2B6D";
 set color_page_link_visited = "#FBAED5";
-set color_page_border = "#2D3366";
+set color_page_text = "#000";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#ffffff";
+set color_entry_title = "#fff";
 set color_entry_title_background = "#8092CA";
 
 ##===============================
@@ -228,25 +228,25 @@ set color_entry_title_background = "#809
 ##===============================
 
 set color_module_background = "#8092CA";
+set color_module_link = "#fff9ee";
 set color_module_text = "#fff9ee";
-set color_module_link = "#fff9ee";
-set color_module_title = "#000000";
-set color_module_title_background = "#ffffff";
+set color_module_title = "#000";
+set color_module_title_background = "#fff";
 
 ##===============================
 ## Images
 ##===============================
 
-set image_background_header_url = "colorside/nadeshiko.jpg";
 set image_background_header_height = 250;
 set image_background_header_position = "top right";
 set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "colorside/nadeshiko.jpg";
 
 
 #NEWLAYER: colorside/wintergreen
-layerinfo "type" = "theme";
-layerinfo "name" = "ColorSide Wintergreen";
-layerinfo "redist_uniq" = "colorside/wintergreen";
+layerinfo type = "theme";
+layerinfo name = "Wintergreen";
+layerinfo redist_uniq = "colorside/wintergreen";
 layerinfo author_name = "branchandroot";
 
 set layout_resources = [ { "name" => "Stock.XCHNG", "url" => "http://www.sxc.hu" } ];
@@ -255,17 +255,17 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#000000";
-set color_page_link = "#0000aa";
-set color_page_link_visited = "#9999cc";
+set color_page_background = "#fff";
 set color_page_border = "#5E6F45";
+set color_page_link = "#00a";
+set color_page_link_visited = "#99c";
+set color_page_text = "#000";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#ffffff";
+set color_entry_title = "#fff";
 set color_entry_title_background = "#9DC77C";
 
 ##===============================
@@ -273,17 +273,16 @@ set color_entry_title_background = "#9DC
 ##===============================
 
 set color_module_background = "#9DC77C";
+set color_module_link = "#fff9ee";
 set color_module_text = "#fff9ee";
-set color_module_link = "#fff9ee";
-set color_module_title = "#000000";
-set color_module_title_background = "#ffffff";
+set color_module_title = "#000";
+set color_module_title_background = "#fff";
 
 ##===============================
 ## Images
 ##===============================
 
-set image_background_header_url = "colorside/wintergreen.jpg";
 set image_background_header_height = 250;
 set image_background_header_position = "top right";
 set image_background_header_repeat = "no-repeat";
-
+set image_background_header_url = "colorside/wintergreen.jpg";
diff -r 7d34a88d6f37 -r 7a99b27e96a1 bin/upgrading/s2layers/modish/themes-local.s2
--- a/bin/upgrading/s2layers/modish/themes-local.s2	Fri Aug 13 07:53:04 2010 +0800
+++ b/bin/upgrading/s2layers/modish/themes-local.s2	Tue Aug 17 14:11:29 2010 -0500
@@ -1,6 +1,6 @@
 #NEWLAYER: modish/lotus
-layerinfo "type" = "theme";
-layerinfo "name" = "Lotus";
+layerinfo type = "theme";
+layerinfo name = "Lotus";
 layerinfo redist_uniq = "modish/lotus";
 layerinfo author_name = "branchandroot";
 
@@ -11,45 +11,44 @@ set layout_resources = [ { "name" => "St
 ##===============================
 
 set color_page_background = "#262512";
-set color_page_text = "#EDE8E2";
 set color_page_link = "#8E8D31";
 set color_page_link_active = "#57561E";
 set color_page_link_visited = "#737329";
-set color_page_title = "#ffffff";
-
+set color_page_text = "#EDE8E2";
+set color_page_title = "#fff";
 set color_header_background = "#737329";
 set color_footer_background = "#737329";
-set color_footer_link = "#ffffff";
-set color_footer_link_hover = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+set color_footer_link = "#fff";
+set color_footer_link_hover = "#fff";
+set color_footer_link_visited = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
+set color_entry_border = "#8E8D31";
 set color_entry_title = "#EDE8E2";
-set color_entry_title_background = "";
-set color_entry_border = "#8E8D31";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#8E8D31";
 set color_module_title = "#EDE8E2";
-set color_module_border = "#8E8D31";
 
-#=================
-# Images
-#=================
+##===============================
+## Images
+##===============================
 
+set image_background_header_height = 105;
+set image_background_header_position = "bottom right";
+set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "modish/lotus.jpg";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_position = "bottom right";
 
 
 #NEWLAYER: modish/scarlet
-layerinfo "type" = "theme";
-layerinfo "name" = "Modish Scarlet";
+layerinfo type = "theme";
+layerinfo name = "Scarlet";
 layerinfo redist_uniq = "modish/scarlet";
 layerinfo author_name = "branchandroot";
 
@@ -59,47 +58,45 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#222222";
+set color_page_background = "#fff";
 set color_page_link = "#B82015";
-set color_page_link_active = "#444444";
+set color_page_link_active = "#444";
 set color_page_link_visited = "#850B0D";
-set color_page_title = "#ffffff";
-
+set color_page_text = "#222";
+set color_page_title = "#fff";
 set color_header_background = "#B82015";
 set color_footer_background = "#B82015";
-set color_footer_link = "#ffffff";
-set color_footer_link_hover = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+set color_footer_link = "#fff";
+set color_footer_link_hover = "#fff";
+set color_footer_link_visited = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#222222";
-set color_entry_title_background = "";
 set color_entry_border = "#B82015";
+set color_entry_title = "#222";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_title = "#222222";
 set color_module_border = "#B82015";
+set color_module_title = "#222";
 
-#=================
-# Images
-#=================
+##===============================
+## Images
+##===============================
 
+set image_background_header_height = 100;
+set image_background_header_position = "bottom right";
+set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "modish/scarlet.jpg";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_position = "bottom right";
-set image_background_header_height = 100;
 
 
 #NEWLAYER: modish/teal
-layerinfo "type" = "theme";
-layerinfo "name" = "Teal";
+layerinfo type = "theme";
+layerinfo name = "Teal";
 layerinfo redist_uniq = "modish/teal";
 layerinfo author_name = "branchandroot";
 
@@ -109,56 +106,51 @@ set layout_resources = [ { "name" => "St
 ## Page Colors
 ##===============================
 
-set color_page_background = "#222222";
-set color_page_text = "#eeeeee";
+set color_page_background = "#222";
 set color_page_link = "#59a4c4";
 set color_page_link_active = "#155671";
 set color_page_link_visited = "#3984A4";
-set color_page_title = "#ffffff";
-
+set color_page_text = "#eee";
+set color_page_title = "#fff";
 set color_header_background = "#4f98b8";
 set color_footer_background = "#4f98b8";
-set color_footer_link = "#ffffff";
-set color_footer_link_hover = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+set color_footer_link = "#fff";
+set color_footer_link_hover = "#fff";
+set color_footer_link_visited = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
+set color_entry_border = "#3984A4";
 set color_entry_title = "#eee";
-set color_entry_title_background = "";
-set color_entry_border = "#3984A4";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#3984A4";
 set color_module_title = "#eee";
-set color_module_border = "#3984A4";
 
-#=================
-# Images
-#=================
+##===============================
+## Images
+##===============================
 
+set image_background_header_position = "top right";
+set image_background_header_repeat = "repeat-x";
 set image_background_header_url = "modish/bluestrip.jpg";
-set image_background_header_repeat = "repeat-x";
-set image_background_header_position = "top right";
 
-
-#to add second header background image
+# To add second header background image
 function Page::print_theme_stylesheet() {
-
     if ($*image_background_header_url == "modish/bluestrip.jpg") {
         print safe """
-            #header .inner { background: url('$*STATDIR/modish/whtleaves.jpg') top right no-repeat; 
-            margin-right: -200px; 
-            padding-right: 200px; 
+            #header .inner {
+            background: url('$*STATDIR/modish/whtleaves.jpg') top right no-repeat;
+            margin-right: -200px;
+            min-height: 75px;
+            padding-right: 200px;
             padding-top: 1px;
-            min-height: 75px; }
+            }
         """;
     }
-
 }
-
-
diff -r 7d34a88d6f37 -r 7a99b27e96a1 bin/upgrading/s2layers/sundaymorning/themes.s2
--- a/bin/upgrading/s2layers/sundaymorning/themes.s2	Fri Aug 13 07:53:04 2010 +0800
+++ b/bin/upgrading/s2layers/sundaymorning/themes.s2	Tue Aug 17 14:11:29 2010 -0500
@@ -5,44 +5,56 @@ layerinfo author_name = "Calla";
 layerinfo author_name = "Calla";
 
 set layout_resources = [ { "name" => "Tuts+", "url" => "http://vector.tutsplus.com/freebies/vectors/free-vector-decorative-ornament/" } ];
-set image_background_page_url = "sundaymorning/greensquiggle.png";
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e6f8e4";
-set color_page_text = "#666666";
 set color_page_link = "#538f4d";
 set color_page_link_hover = "#333";
-set color_page_link_visited = "#113311";
-
+set color_page_link_visited = "#131";
+set color_page_text = "#666";
 set color_page_title = "#333";
 set color_page_title_background = "#c4c4c4";
-set color_header_text = "#333";
 set color_header_background = "#fff";
 set color_header_hover = "#333";
 set color_header_hover_background = "#e7e7e7";
+set color_header_text = "#333";
 
-set color_module_text = "#333";
-set color_module_link = "#538f4d";
-set color_module_link_hover = "#333";
-set color_module_background = "#f7fcfe";
-set color_module_border = "#999";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_title = "#333";
-set color_module_title_background = "#e7e7e7";
-set color_module_title_border = "#999";
-
-set color_entry_text = "#333";
 set color_entry_background = "#fff";
 set color_entry_border = "#999";
-
+set color_entry_link = "#538f4d";
+set color_entry_link_hover = "#333";
+set color_entry_link_visited = "#131";
+set color_entry_text = "#333";
 set color_entry_title = "#333";
 set color_entry_title_background = "#c4c4c4";
 set color_entry_title_border = "#ddd";
 
-set color_entry_link = "#538f4d";
-set color_entry_link_hover = "#333";
-set color_entry_link_visited = "#113311";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_background = "#f7fcfe";
+set color_module_border = "#999";
+set color_module_link = "#538f4d";
+set color_module_link_hover = "#333";
+set color_module_text = "#333";
+set color_module_title = "#333";
+set color_module_title_background = "#e7e7e7";
+set color_module_title_border = "#999";
 set color_navigation_text = "#333000";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "sundaymorning/greensquiggle.png";
 
 
 #NEWLAYER: sundaymorning/greenswirls
@@ -52,44 +64,56 @@ layerinfo author_name = "Calla";
 layerinfo author_name = "Calla";
 
 set layout_resources = [ { "name" => "Beeex.net", "url" => "http://beeex.net/freebies/vectors/vector-swooshes-and-swirls" } ];
-set image_background_page_url = "sundaymorning/greenswirls.png";
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#fff";
-set color_page_text = "#666666";
 set color_page_link = "#599ea5";
 set color_page_link_hover = "#444";
 set color_page_link_visited = "#698e95";
-
+set color_page_text = "#666";
 set color_page_title = "#444";
 set color_page_title_background = "#b0e1e4";
-set color_header_text = "#444";
 set color_header_background = "#e0f1e1";
 set color_header_hover = "#444";
 set color_header_hover_background = "#dceff0";
+set color_header_text = "#444";
 
-set color_module_text = "#444";
-set color_module_link = "#599ea5";
-set color_module_link_hover = "#444";
-set color_module_background = "#f7fcfe";
-set color_module_border = "#999";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_title = "#444";
-set color_module_title_background = "#e0f1e1";
-set color_module_title_border = "#999";
-
-set color_entry_text = "#444";
 set color_entry_background = "#fff";
 set color_entry_border = "#999";
-
+set color_entry_link = "#599ea5";
+set color_entry_link_hover = "#444";
+set color_entry_link_visited = "#698e95";
+set color_entry_text = "#444";
 set color_entry_title = "#444";
 set color_entry_title_background = "#e0f1e1";
 set color_entry_title_border = "#ddd";
 
-set color_entry_link = "#599ea5";
-set color_entry_link_hover = "#444";
-set color_entry_link_visited = "#698e95";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_background = "#f7fcfe";
+set color_module_border = "#999";
+set color_module_link = "#599ea5";
+set color_module_link_hover = "#444";
+set color_module_text = "#444";
+set color_module_title = "#444";
+set color_module_title_background = "#e0f1e1";
+set color_module_title_border = "#999";
 set color_navigation_text = "#444000";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "sundaymorning/greenswirls.png";
 
 
 #NEWLAYER: sundaymorning/lightondark
@@ -101,47 +125,62 @@ set layout_authors = [ { "name" => "cesy
 set layout_authors = [ { "name" => "cesy", "type" => "user" }];
 set layout_resources = [ { "name" => "Tuts+", "url" => "http://vector.tutsplus.com/freebies/vectors/free-vector-decorative-ornament/" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+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_page_title_background = "#000";
+set color_header_background = "#666";
+set color_header_hover = "#cfc";
+set color_header_hover_background = "#060";
+set color_header_text = "#ccc";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_entry_border = "#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_entry_title_border = "#fff";
+
+##===============================
+## 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 = "#000";
+set color_module_title_border = "#fff";
+set color_navigation_background = "#000";
+set color_navigation_border = "#fff";
+set color_navigation_text = "#fff";
+
+##===============================
+## Images
+##===============================
+
 set image_background_page_url = "sundaymorning/whitesquiggle.png";
 
-set color_page_background = "#000000";
-set color_page_title_background = "#000000";
-set color_page_title = "#ffffff";
-set color_page_text = "#ffffff";
-set color_page_link = "#ddddff";
-set color_page_link_hover = "#ccffcc";
-set color_page_link_visited = "#ffffcc";
-set color_page_link_active = "#ffcccc";
-
-set color_header_background = "#666666";
-set color_header_text = "#cccccc";
-set color_header_hover_background = "#006600";
-set color_header_hover = "#ccffcc";
-
-set color_navigation_background = "#000000";
-set color_navigation_border = "#ffffff";
-set color_navigation_text = "#ffffff";
-
-set color_entry_background = "#000000";
-set color_entry_border = "#ffffff";
-set color_entry_title_background = "#000000";
-set color_entry_title_border = "#ffffff";
-set color_entry_title = "#ffffff";
-set color_entry_text = "#ffffff";
-set color_entry_link = "#ddddff";
-set color_entry_link_visited = "#ffffcc";
-set color_entry_link_hover = "#ccffcc";
-set color_entry_link_active = "#ffcccc";
-
-set color_module_background = "#000000";
-set color_module_border = "#ffffff";
-set color_module_title_background = "#000000";
-set color_module_title_border = "#ffffff";
-set color_module_title = "#ffffff";
-set color_module_text = "#ffffff";
-set color_module_link = "#ddddff";
-set color_module_link_visited = "#ffffcc";
-set color_module_link_hover = "#ccffcc";
-set color_module_link_active = "#ffcccc";
 
 #NEWLAYER: sundaymorning/nnwm2009
 layerinfo type = "theme";
@@ -151,23 +190,29 @@ 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: sundaymorning/pinkswirls
@@ -177,44 +222,56 @@ layerinfo author_name = "Calla";
 layerinfo author_name = "Calla";
 
 set layout_resources = [ { "name" => "Beeex.net", "url" => "http://beeex.net/freebies/vectors/vector-swooshes-and-swirls" } ];
-set image_background_page_url = "sundaymorning/pinkswirls.png";
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e8eef1";
-set color_page_text = "#666666";
 set color_page_link = "#db127a";
 set color_page_link_hover = "#444";
 set color_page_link_visited = "#bb528a";
-
-set color_page_title = "#ffffff";
+set color_page_text = "#666";
+set color_page_title = "#fff";
 set color_page_title_background = "#f2a5cd";
-set color_header_text = "#444";
 set color_header_background = "#f7fcfe";
 set color_header_hover = "#444";
 set color_header_hover_background = "#f0eaed";
+set color_header_text = "#444";
 
-set color_module_text = "#444";
-set color_module_link = "#e0197e";
-set color_module_link_hover = "#444";
-set color_module_background = "#f7fcfe";
-set color_module_border = "#999";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_title = "#444";
-set color_module_title_background = "#f0eaed";
-set color_module_title_border = "#999";
-
-set color_entry_text = "#444";
 set color_entry_background = "#f7fcfe";
 set color_entry_border = "#999";
-
+set color_entry_link = "#db127a";
+set color_entry_link_hover = "#444";
+set color_entry_link_visited = "#bb528a";
+set color_entry_text = "#444";
 set color_entry_title = "#444";
 set color_entry_title_background = "#f0eaed";
 set color_entry_title_border = "#ddd";
 
-set color_entry_link = "#db127a";
-set color_entry_link_hover = "#444";
-set color_entry_link_visited = "#bb528a";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_background = "#f7fcfe";
+set color_module_border = "#999";
+set color_module_link = "#e0197e";
+set color_module_link_hover = "#444";
+set color_module_text = "#444";
+set color_module_title = "#444";
+set color_module_title_background = "#f0eaed";
+set color_module_title_border = "#999";
 set color_navigation_text = "#444000";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "sundaymorning/pinkswirls.png";
 
 
 #NEWLAYER: sundaymorning/purpleswirls
@@ -224,44 +281,56 @@ layerinfo author_name = "Calla";
 layerinfo author_name = "Calla";
 
 set layout_resources = [ { "name" => "Beeex.net", "url" => "http://beeex.net/freebies/vectors/vector-swooshes-and-swirls" } ];
-set image_background_page_url = "sundaymorning/purpleswirls.png";
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#fff";
-set color_page_text = "#666666";
 set color_page_link = "#9675a7";
 set color_page_link_hover = "#444";
 set color_page_link_visited = "#8685b7";
-
+set color_page_text = "#666";
 set color_page_title = "#eee";
 set color_page_title_background = "#673e7b";
-set color_header_text = "#444";
 set color_header_background = "#f7ebf4";
 set color_header_hover = "#444";
 set color_header_hover_background = "#e0d8e4";
+set color_header_text = "#444";
 
-set color_module_text = "#444";
-set color_module_link = "#9675a7";
-set color_module_link_hover = "#444";
-set color_module_background = "#f7fcfe";
-set color_module_border = "#999";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_title = "#444";
-set color_module_title_background = "#f7ebf4";
-set color_module_title_border = "#999";
-
-set color_entry_text = "#666";
 set color_entry_background = "#f7fcfe";
 set color_entry_border = "#999";
-
+set color_entry_link = "#9675a7";
+set color_entry_link_hover = "#444";
+set color_entry_link_visited = "#8685b7";
+set color_entry_text = "#666";
 set color_entry_title = "#444";
 set color_entry_title_background = "#e0d8e4";
 set color_entry_title_border = "#ddd";
 
-set color_entry_link = "#9675a7";
-set color_entry_link_hover = "#444";
-set color_entry_link_visited = "#8685b7";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_background = "#f7fcfe";
+set color_module_border = "#999";
+set color_module_link = "#9675a7";
+set color_module_link_hover = "#444";
+set color_module_text = "#444";
+set color_module_title = "#444";
+set color_module_title_background = "#f7ebf4";
+set color_module_title_border = "#999";
 set color_navigation_text = "#444000";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "sundaymorning/purpleswirls.png";
 
 
 #NEWLAYER: sundaymorning/redcontrast
@@ -272,40 +341,48 @@ layerinfo author_name = "ambrya";
 
 set layout_authors = [ { "name" => "ambrya", "type" => "user" }];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#5a0000";
-set color_page_text = "#82fa64";
 set color_page_link = "#fff499";
 set color_page_link_active = "#e2b586";
 set color_page_link_hover = "#e2b586";
 set color_page_link_visited = "#fff499";
-
+set color_page_text = "#82fa64";
 set color_page_title = "#82fa64";
-set color_header_text = "#82fa64";
 set color_header_hover = "#5a0000";
 set color_header_hover_background = "#82fa64";
+set color_header_text = "#82fa64";
 
-set color_module_text = "#c3ffb1";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#3c0000";
+set color_entry_border = "#82fa64";
+set color_entry_link = "#82fa64";
+set color_entry_link_active = "#c3ffb1";
+set color_entry_link_hover = "#c3ffb1";
+set color_entry_link_visited = "#82fa64";
+set color_entry_text = "#b7ff78";
+set color_entry_title_background = "#5a0000";
+set color_entry_title_border = "#82fa64";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#3c0000";
+set color_module_border = "#82fa64";
 set color_module_link = "#e2b586";
 set color_module_link_active = "#fff499";
 set color_module_link_hover = "#fff499";
 set color_module_link_visited = "#e2b586";
-set color_module_background = "#3c0000";
-set color_module_border = "#82fa64";
-
+set color_module_text = "#c3ffb1";
 set color_module_title_background = "#5a0000";
 set color_module_title_border = "#1a4918";
-
-set color_entry_text = "#b7ff78";
-set color_entry_background = "#3c0000";
-set color_entry_border = "#82fa64";
-
-set color_entry_title_background = "#5a0000";
-set color_entry_title_border = "#82fa64";
-
-set color_entry_link = "#82fa64";
-set color_entry_link_active = "#c3ffb1";
-set color_entry_link_hover = "#c3ffb1";
-set color_entry_link_visited = "#82fa64";
 
 
 #NEWLAYER: sundaymorning/redsquiggle
@@ -315,44 +392,56 @@ layerinfo author_name = "Calla";
 layerinfo author_name = "Calla";
 
 set layout_resources = [ { "name" => "Tuts+", "url" => "http://vector.tutsplus.com/freebies/vectors/free-vector-decorative-ornament/" } ];
-set image_background_page_url = "sundaymorning/redsquiggle.png";
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#ffeeed";
-set color_page_text = "#666666";
 set color_page_link = "#8e2f2d";
 set color_page_link_hover = "#333";
 set color_page_link_visited = "#6e3f3d";
-
+set color_page_text = "#666";
 set color_page_title = "#eee";
 set color_page_title_background = "#8e2f2d";
-set color_header_text = "#333";
 set color_header_background = "#fff";
 set color_header_hover = "#333";
 set color_header_hover_background = "#e5d4d4";
+set color_header_text = "#333";
 
-set color_module_text = "#333";
-set color_module_link = "#8e2f2d";
-set color_module_link_hover = "#333";
-set color_module_background = "#f7fcfe";
-set color_module_border = "#999";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_title = "#333";
-set color_module_title_background = "#e5d4d4";
-set color_module_title_border = "#999";
-
-set color_entry_text = "#333";
 set color_entry_background = "#fff";
 set color_entry_border = "#999";
-
+set color_entry_link = "#8e2f2d";
+set color_entry_link_hover = "#333";
+set color_entry_link_visited = "#6e3f3d";
+set color_entry_text = "#333";
 set color_entry_title = "#333";
 set color_entry_title_background = "#e5d4d4";
 set color_entry_title_border = "#ddd";
 
-set color_entry_link = "#8e2f2d";
-set color_entry_link_hover = "#333";
-set color_entry_link_visited = "#6e3f3d";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_background = "#f7fcfe";
+set color_module_border = "#999";
+set color_module_link = "#8e2f2d";
+set color_module_link_hover = "#333";
+set color_module_text = "#333";
+set color_module_title = "#333";
+set color_module_title_background = "#e5d4d4";
+set color_module_title_border = "#999";
 set color_navigation_text = "#333000";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "sundaymorning/redsquiggle.png";
 
 
 #NEWLAYER: sundaymorning/yellowsquiggle
@@ -362,42 +451,53 @@ layerinfo author_name = "Calla";
 layerinfo author_name = "Calla";
 
 set layout_resources = [ { "name" => "Tuts+", "url" => "http://vector.tutsplus.com/freebies/vectors/free-vector-decorative-ornament/" } ];
-set image_background_page_url = "sundaymorning/yellowsquiggle.png";
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#f5f8e4";
-set color_page_text = "#666666";
 set color_page_link = "#998a8e";
 set color_page_link_hover = "#333";
 set color_page_link_visited = "#797a7e";
-
+set color_page_text = "#666";
 set color_page_title = "#333";
 set color_page_title_background = "#ccc6be";
-set color_header_text = "#333";
 set color_header_background = "#fff";
 set color_header_hover = "#333";
 set color_header_hover_background = "#e6dfd6";
+set color_header_text = "#333";
 
-set color_module_text = "#333";
-set color_module_link = "#998a8e";
-set color_module_link_hover = "#333";
-set color_module_background = "#f7fcfe";
-set color_module_border = "#999";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_title = "#333";
-set color_module_title_background = "#cbc5bd";
-set color_module_title_border = "#999";
-
-set color_entry_text = "#333";
 set color_entry_background = "#fff";
 set color_entry_border = "#999";
-
+set color_entry_link = "#998a8e";
+set color_entry_link_hover = "#333";
+set color_entry_link_visited = "#797a7e";
+set color_entry_text = "#333";
 set color_entry_title = "#333";
 set color_entry_title_background = "#cbc5bd";
 set color_entry_title_border = "#ddd";
 
-set color_entry_link = "#998a8e";
-set color_entry_link_hover = "#333";
-set color_entry_link_visited = "#797a7e";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_background = "#f7fcfe";
+set color_module_border = "#999";
+set color_module_link = "#998a8e";
+set color_module_link_hover = "#333";
+set color_module_text = "#333";
+set color_module_title = "#333";
+set color_module_title_background = "#cbc5bd";
+set color_module_title_border = "#999";
 set color_navigation_text = "#333000";
 
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "sundaymorning/yellowsquiggle.png";
--------------------------------------------------------------------------------