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

[kareila]

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

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

Reorder and reformat lines in theme files, for consistency.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/boxesandborders/themes.s2
• bin/upgrading/s2layers/brittle/themes.s2
• bin/upgrading/s2layers/modular/themes.s2
• bin/upgrading/s2layers/nouveauoleanders/themes.s2
• bin/upgrading/s2layers/tranquilityiii/themes.s2

--------------------------------------------------------------------------------
diff -r f666763b15e4 -r 909c7faa2251 bin/upgrading/s2layers/boxesandborders/themes.s2
--- a/bin/upgrading/s2layers/boxesandborders/themes.s2	Mon Aug 30 18:41:45 2010 +0800
+++ b/bin/upgrading/s2layers/boxesandborders/themes.s2	Mon Aug 30 14:19:12 2010 -0500
@@ -1,6 +1,6 @@
 #NEWLAYER: boxesandborders/bittersweet
-layerinfo "type" = "theme";
-layerinfo "name" = "Bittersweet";
+layerinfo type = "theme";
+layerinfo name = "Bittersweet";
 layerinfo redist_uniq = "boxesandborders/bittersweet";
 layerinfo author_name = "branchandroot";
 
@@ -11,13 +11,12 @@ set layout_resources = [ { "name" => "Pa
 ##===============================
 
 set color_page_background = "fff9e9";
-set color_page_text = "#000";
 set color_page_border = "#968D85";
 set color_page_link = "#B20C17";
 set color_page_link_active = "#009";
 set color_page_link_visited = "#920C07";
+set color_page_text = "#000";
 set color_page_title = "#62584F";
-
 set color_footer_background = "#62584F";
 set color_footer_link = "#e2d7c9";
 set color_footer_link_active = "#e2d7c9";
@@ -27,23 +26,23 @@ set color_footer_link_visited = "#e2d7c9
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#000"; 
 set color_entry_border = "#62584F";
+set color_entry_title = "#000";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#62584F";
 set color_module_title = "#000";
-set color_module_border = "#62584F";
 set color_calendar_module_emptyday_background = "#968D85";
 set color_calendar_module_hasday_background = "#62584F";
 set color_navigation_module_background = "#62584F";
 
 
 #NEWLAYER: boxesandborders/grass
-layerinfo "type" = "theme";
-layerinfo "name" = "Grass";
+layerinfo type = "theme";
+layerinfo name = "Grass";
 layerinfo redist_uniq = "boxesandborders/grass";
 layerinfo author_name = "branchandroot";
 
@@ -54,39 +53,38 @@ set layout_resources = [ { "name" => "Sp
 ##===============================
 
 set color_page_background = "fafffb";
-set color_page_text = "#000";
 set color_page_border = "#AEBAA6";
 set color_page_link = "#D25A2B";
 set color_page_link_active = "#c00";
 set color_page_link_visited = "#822A00";
+set color_page_text = "#000";
 set color_page_title = "#809A62";
-
 set color_footer_background = "#97AA84";
-set color_footer_link = "#ffffff";
-set color_footer_link_active = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+set color_footer_link = "#fff";
+set color_footer_link_active = "#fff";
+set color_footer_link_visited = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
+set color_entry_border = "#97AA84";
 set color_entry_title = "#000";
-set color_entry_border = "#97AA84";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#97AA84";
 set color_module_title = "#000";
-set color_module_border = "#97AA84";
 set color_calendar_module_emptyday_background = "#AEBAA6";
 set color_calendar_module_hasday_background = "#809A62";
 set color_navigation_module_background = "#97AA84";
 
 
 #NEWLAYER: boxesandborders/gray
-layerinfo "type" = "theme";
-layerinfo "name" = "Gray";
+layerinfo type = "theme";
+layerinfo name = "Gray";
 layerinfo redist_uniq = "boxesandborders/gray";
 layerinfo author_name = "branchandroot";
 
@@ -94,35 +92,34 @@ layerinfo author_name = "branchandroot";
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_text = "#222222";
-set color_page_border = "#cccccc";
-set color_page_link = "#6699cc";
-set color_page_link_active = "#444444";
-set color_page_link_visited = "#336699";
-set color_page_title = "#555555";
-
-set color_footer_background = "#555555";
-set color_footer_link = "#ffffff";
-set color_footer_link_hover = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+set color_page_background = "#fff";
+set color_page_border = "#ccc";
+set color_page_link = "#69c";
+set color_page_link_active = "#444";
+set color_page_link_visited = "#369";
+set color_page_text = "#222";
+set color_page_title = "#555";
+set color_footer_background = "#555";
+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_border = "#999999";
+set color_entry_border = "#999";
+set color_entry_title = "#222";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_title = "#222222";
-set color_module_border = "#999999";
-set color_calendar_module_emptyday_background = "#cccccc";
-set color_calendar_module_hasday_background = "#555555";
-set color_navigation_module_background = "#999999";
+set color_module_border = "#999";
+set color_module_title = "#222";
+set color_calendar_module_emptyday_background = "#ccc";
+set color_calendar_module_hasday_background = "#555";
+set color_navigation_module_background = "#999";
 
 
 #NEWLAYER: boxesandborders/lightondark
@@ -137,61 +134,59 @@ set layout_authors = [ { "name" => "cesy
 ## Page Colors
 ##===============================
 
-set color_page_background = "#000000";
-set color_page_border = "#0000cc";
-set color_page_text = "#ffffff";
-set color_page_link = "#ddddff";
-set color_page_link_active = "#ffcccc";
-set color_page_link_hover = "#ccffcc";
-set color_page_link_visited = "#ffffcc";
-
-set color_header_background = "#666666";
-set color_page_title = "#ffffff";
-
-set color_footer_background = "#666666";
-set color_footer_link = "#ddddff";
-set color_footer_link_active = "#ffcccc";
-set color_footer_link_hover = "#ccffcc";
-set color_footer_link_visited = "#ffffcc";
+set color_page_background = "#000";
+set color_page_border = "#00c";
+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 = "#000000";
-set color_entry_border = "#cccccc";
-set color_entry_title_background = "#000000";
-set color_entry_title = "#ffffff";
-set color_entry_text = "#ffffff";
-set color_entry_link = "#ddddff";
-set color_entry_link_hover = "#ccffcc";
-set color_entry_link_active = "#ffcccc";
-set color_entry_link_visited = "#ffffcc";
-set color_entry_interaction_links = "#ffffff";
-set color_comment_title_background = "#ffffff";
+set color_entry_background = "#000";
+set color_entry_border = "#ccc";
+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 = "#fff";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#000000";
-set color_module_border = "#0000ee";
-set color_module_title_background = "#666666";
-set color_module_title = "#ffffff";
-set color_module_text = "#ffffff";
-set color_module_link = "#ddddff";
-set color_module_link_active = "#ffcccc";
-set color_module_link_hover = "#ccffcc";
-set color_module_link_visited = "#ffffcc";
-set color_calendar_module_emptyday_background = "#666666";
-set color_calendar_module_hasday_background = "#ffffff";
-set color_navigation_module_background = "#666666";
+set color_module_background = "#000";
+set color_module_border = "#00e";
+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";
+set color_calendar_module_emptyday_background = "#666";
+set color_calendar_module_hasday_background = "#fff";
+set color_navigation_module_background = "#666";
 
 function Page::print_theme_stylesheet() {
     """
     .module td a:hover {
         color: $*color_module_border;
-        
+        }
     """;
 }
 
@@ -202,22 +197,21 @@ layerinfo redist_uniq = "boxesandborders
 layerinfo redist_uniq = "boxesandborders/nnwm2009";
 layerinfo author_name = "zvi";
 
-set layout_authors = [ { "name" => "zvi", "type" => "user" }];
+set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
-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_page_title = "#ef8229";
-
 set color_footer_background = "#ffefbd";
 set color_footer_link = "#ef8229";
 
@@ -226,16 +220,15 @@ set color_footer_link = "#ef8229";
 ##===============================
 
 set color_module_background = "#ffefbd";
-set color_module_text = "#000000";
+set color_module_text = "#000";
 set color_module_title = "#ef8229";
 set color_calendar_module_emptyday_background = "#842021";
 set color_calendar_module_hasday_background = "#ef8229";
-set color_navigation_module_background = "";
 
 
 #NEWLAYER: boxesandborders/onfire
-layerinfo "type" = "theme";
-layerinfo "name" = "On Fire";
+layerinfo type = "theme";
+layerinfo name = "On Fire";
 layerinfo redist_uniq = "boxesandborders/onfire";
 layerinfo author_name = "branchandroot";
 
@@ -246,39 +239,38 @@ set layout_resources = [ { "name" => "Be
 ##===============================
 
 set color_page_background = "#FFFcdf";
+set color_page_border = "#B64533";
+set color_page_link = "#66c";
+set color_page_link_active = "#6c9";
+set color_page_link_visited = "#339";
 set color_page_text = "#34302D";
-set color_page_border = "#B64533";
-set color_page_link = "#6666cc";
-set color_page_link_active = "#66cc99";
-set color_page_link_visited = "#333399";
 set color_page_title = "#D37843";
-
 set color_footer_background = "#B64533";
 set color_footer_link = "#FFFcd9";
-set color_footer_link_active = "#ffffff";
+set color_footer_link_active = "#fff";
 set color_footer_link_visited = "#FFFcd9";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
+set color_entry_border = "#D37843";
 set color_entry_title = "#34302D";
-set color_entry_border = "#D37843";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#B64533";
 set color_module_title = "#34302D";
-set color_module_border = "#B64533";
 set color_calendar_module_emptyday_background = "#B64533";
 set color_calendar_module_hasday_background = "#D37843";
 set color_navigation_module_background = "#D37843";
 
 
 #NEWLAYER: boxesandborders/pinkafterdark
-layerinfo "type" = "theme";
-layerinfo "name" = "Pink After Dark";
+layerinfo type = "theme";
+layerinfo name = "Pink After Dark";
 layerinfo redist_uniq = "boxesandborders/pinkafterdark";
 layerinfo author_name = "branchandroot";
 
@@ -289,13 +281,12 @@ set layout_resources = [ { "name" => "Sa
 ##===============================
 
 set color_page_background = "373026";
-set color_page_text = "#fff";
 set color_page_border = "#B48889";
 set color_page_link = "#F8E2B1";
 set color_page_link_active = "#009";
 set color_page_link_visited = "#d8c291";
+set color_page_text = "#fff";
 set color_page_title = "#D7B6AF";
-
 set color_footer_background = "#D29A89";
 set color_footer_link = "#000";
 set color_footer_link_active = "#000";
@@ -305,15 +296,15 @@ set color_footer_link_visited = "#000";
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff"; 
 set color_entry_border = "#D29A89";
+set color_entry_title = "#fff";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#D29A89";
 set color_module_title = "#fff";
-set color_module_border = "#D29A89";
 set color_calendar_module_emptyday_background = "#B48889";
 set color_calendar_module_hasday_background = "#D7B6AF";
 set color_navigation_module_background = "#D29A89";
@@ -364,8 +355,8 @@ set color_navigation_module_background =
 
 
 #NEWLAYER: boxesandborders/rainyday
-layerinfo "type" = "theme";
-layerinfo "name" = "Rainy Day";
+layerinfo type = "theme";
+layerinfo name = "Rainy Day";
 layerinfo redist_uniq = "boxesandborders/rainyday";
 layerinfo author_name = "branchandroot";
 
@@ -376,31 +367,30 @@ set layout_resources = [ { "name" => "Ev
 ##===============================
 
 set color_page_background = "fafcff";
-set color_page_text = "#000";
 set color_page_border = "#7C86A6";
 set color_page_link = "#933";
 set color_page_link_active = "#c33";
 set color_page_link_visited = "#600";
+set color_page_text = "#000";
 set color_page_title = "#353F4F";
-
 set color_footer_background = "#353F4F";
-set color_footer_link = "#ffffff";
-set color_footer_link_active = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+set color_footer_link = "#fff";
+set color_footer_link_active = "#fff";
+set color_footer_link_visited = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
+set color_entry_border = "#353F4F";
 set color_entry_title = "#000";
-set color_entry_border = "#353F4F";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_border = "#353F4F";
 set color_module_title = "#000";
-set color_module_border = "#353F4F";
 set color_calendar_module_emptyday_background = "#7C86A6";
 set color_calendar_module_hasday_background = "#353F4F";
 set color_navigation_module_background = "#353F4F";
diff -r f666763b15e4 -r 909c7faa2251 bin/upgrading/s2layers/brittle/themes.s2
--- a/bin/upgrading/s2layers/brittle/themes.s2	Mon Aug 30 18:41:45 2010 +0800
+++ b/bin/upgrading/s2layers/brittle/themes.s2	Mon Aug 30 14:19:12 2010 -0500
@@ -1,101 +1,120 @@
 #NEWLAYER: brittle/argyle
-layerinfo "type" = "theme";
-layerinfo "name" = "Argyle";
+layerinfo type = "theme";
+layerinfo name = "Argyle";
 layerinfo redist_uniq = "brittle/argyle";
 layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
-#PAGE COLOURS
+##===============================
+## Page Colors
+##===============================
+
 set color_page_link = "#5b7882";
 set color_page_link_hover = "#769CA9";
 set color_page_link_visited = "#3B4E55";
-set color_page_text = "#111111";
-
-## HEADER / FOOTER 
+set color_page_text = "#111";
 set color_footer_background = "#ecf1f2";
 set color_footer_link = "#5b7882";
 set color_footer_link_hover = "#769CA9";
 set color_footer_link_visited = "#3B4E55";
 
-## ENTRY COLOURS 
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#ecf1f2";
 set color_entry_link = "#5b7882";
 set color_entry_link_hover = "#769CA9";
 set color_entry_link_visited = "#3B4E55";
-set color_entry_text = "#111111";
+set color_entry_text = "#111";
 set color_entry_title = "#5b7882";
 
-## NAV MODULE 
+##===============================
+## Module Colors
+##===============================
+
 set color_navigation_module_background = "#cbdbe0";
 set color_navigation_module_link = "#435860";
 set color_navigation_module_link_hover = "#5b7882";
 set color_navigation_module_link_visited = "#253136";
 
-## BACKGROUND IMAGE 
+##===============================
+## Images
+##===============================
+
 set image_background_page_position = "top left";
 set image_background_page_repeat = "repeat";
 set image_background_page_url = "brittle/argyle.png";
 
+
 #NEWLAYER: brittle/barnhouse
-layerinfo "type" = "theme";
-layerinfo "name" = "Barnhouse";
+layerinfo type = "theme";
+layerinfo name = "Barnhouse";
 layerinfo redist_uniq = "brittle/barnhouse";
 layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
+##===============================
 ## Page Colors
+##===============================
 
 set color_page_background = "#bc3d26";
-set color_page_text = "#0e0e0e";
 set color_page_link = "#8f1600";
 set color_page_link_hover = "#672700";
 set color_page_link_visited = "#4C1C00";
-
-## Header and Footer Colors
-
+set color_page_text = "#0e0e0e";
 set color_footer_background = "#fc9180";
 set color_footer_link = "#8f1600";
 set color_footer_link_hover = "#672700";
 set color_footer_link_visited = "#4C1C00";
 
+##===============================
 ## Entry Colors
+##===============================
 
 set color_entry_background = "#fc9180";
-set color_entry_text = "#0e0e0e";
 set color_entry_link = "#8f1600";
 set color_entry_link_hover = "#672700";
 set color_entry_link_visited = "#4C1C00";
+set color_entry_text = "#0e0e0e";
 
+##===============================
 ## Module Colors
+##===============================
 
 set color_navigation_module_background = "#fc9180";
 set color_navigation_module_link = "#8f1600";
 set color_navigation_module_link_hover = "#672700";
 set color_navigation_module_link_visited = "#4C1C00";
 
+
 #NEWLAYER: brittle/buttercupyellow
-layerinfo "type" = "theme";
-layerinfo "name" = "Buttercup Yellow";
+layerinfo type = "theme";
+layerinfo name = "Buttercup Yellow";
 layerinfo redist_uniq = "brittle/buttercupyellow";
 layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
-## PAGE COLOURS
+##===============================
+## Page Colors
+##===============================
+
 set color_page_link = "#A33535";
 set color_page_link_hover = "#EE4D4D";
 set color_page_link_visited = "#672121";
 set color_page_text = "#151515";
-
-## HEADER/FOOTER COLOURS
 set color_footer_background = "#fff29b";
 set color_footer_link = "#A33535";
 set color_footer_link_hover = "#EE4D4D";
 set color_footer_link_visited = "#672121";
 
-## ENTRY COLOURS
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#fff29b";
 set color_entry_link = "#A33535";
 set color_entry_link_hover = "#EE4D4D";
@@ -103,38 +122,49 @@ set color_entry_text = "#151515";
 set color_entry_text = "#151515";
 set color_entry_title = "#151515";
 
-## NAV MODULE
+##===============================
+## Module Colors
+##===============================
+
 set color_navigation_module_background = "#ffe537";
 set color_navigation_module_link = "#A33535";
 set color_navigation_module_link_hover = "#EE4D4D";
 set color_navigation_module_link_visited = "#672121";
 
-## BACKGROUND IMAGE
+##===============================
+## Images
+##===============================
+
 set image_background_page_position = "top left";
 set image_background_page_repeat = "repeat";
 set image_background_page_url = "brittle/buttercupyellow.png";
 
+
 #NEWLAYER: brittle/certainfrogs
-layerinfo "type" = "theme";
-layerinfo "name" = "Certain Frogs";
+layerinfo type = "theme";
+layerinfo name = "Certain Frogs";
 layerinfo redist_uniq = "brittle/certainfrogs";
 layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
-## PAGE COLOURS 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_link = "#1693A5";
 set color_page_link_hover = "#02AAB0";
 set color_page_link_visited = "#0F6671";
 set color_page_text = "#0c0c0c";
-
-## HEADER / FOOTER 
 set color_footer_background = "#e1ffb3";
 set color_footer_link = "#1693A5";
 set color_footer_link_hover = "#02AAB0";
 set color_footer_link_visited = "#0F6671";
 
-## ENTRY COLOURS
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#e1ffb3";
 set color_entry_link = "#1693A5";
 set color_entry_link_hover = "#02AAB0";
@@ -142,38 +172,49 @@ set color_entry_text = "#0c0c0c";
 set color_entry_text = "#0c0c0c";
 set color_entry_title = "#0c0c0c";
 
-## NAV MODULE 
+##===============================
+## Module Colors
+##===============================
+
 set color_navigation_module_background = "#e1ffb3";
 set color_navigation_module_link = "#1693A5";
 set color_navigation_module_link_hover = "#02AAB0";
 set color_navigation_module_link_visited = "#0F6671";
 
-## BACKGROUND IMAGE
+##===============================
+## Images
+##===============================
+
 set image_background_page_position = "top left";
 set image_background_page_repeat = "repeat";
 set image_background_page_url = "brittle/certainfrogs.png";
 
+
 #NEWLAYER: brittle/chinesepink
-layerinfo "type" = "theme";
-layerinfo "name" = "Chinese Pink";
+layerinfo type = "theme";
+layerinfo name = "Chinese Pink";
 layerinfo redist_uniq = "brittle/chinesepink";
 layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
-## PAGE COLOURS
+##===============================
+## Page Colors
+##===============================
+
 set color_page_link = "#5f3c30";
 set color_page_link_hover = "#5f2b1b";
 set color_page_link_visited = "#7D4D3F";
 set color_page_text = "#090909";
-
-## HEADER/FOOTER COLOURS
 set color_footer_background = "#ff9858";
 set color_footer_link = "#5f3c30";
 set color_footer_link_hover = "#5f2b1b";
 set color_footer_link_visited = "#7D4D3F";
 
-## ENTRY COLOURS
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#ff9858";
 set color_entry_link = "#5f3c30";
 set color_entry_link_hover = "#5f2b1b";
@@ -181,40 +222,48 @@ set color_entry_text = "#090909";
 set color_entry_text = "#090909";
 set color_entry_title = "#090909";
 
-## NAV MODULE 
+##===============================
+## Module Colors
+##===============================
+
 set color_navigation_module_background = "#ff9150";
 set color_navigation_module_link = "#5f3c30";
 set color_navigation_module_link_hover = "#5f2b1b";
 set color_navigation_module_link_visited = "#7D4D3F";
 
-## BACKGROUND IMAGE
+##===============================
+## Images
+##===============================
+
 set image_background_page_position = "top left";
 set image_background_page_repeat = "repeat";
 set image_background_page_url = "brittle/chinesepink.png";
 
+
 #NEWLAYER: brittle/drab
-layerinfo "type" = "theme";
-layerinfo "name" = "Drab";
+layerinfo type = "theme";
+layerinfo name = "Drab";
 layerinfo redist_uniq = "brittle/drab";
 layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
-## Page Colours
+##===============================
+## Page Colors
+##===============================
 
-set color_page_text = "#202020";
 set color_page_link = "#722a2a";
 set color_page_link_hover = "#c34848";
 set color_page_link_visited = "#6e6d45";
-
-## Header/Footer Colours
-
+set color_page_text = "#202020";
 set color_footer_background = "#cfce82";
 set color_footer_link = "#722a2a";
 set color_footer_link_hover = "#c34848";
 set color_footer_link_visited = "#6e6d45";
 
-## Entry Colours
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#cfce82";
 set color_entry_link = "#722a2a";
@@ -223,18 +272,23 @@ set color_entry_text = "#202020";
 set color_entry_text = "#202020";
 set color_entry_title = "#202020";
 
-##Module Colours
+##===============================
+## Module Colors
+##===============================
 
 set color_navigation_module_background = "#cfce82";
 set color_navigation_module_link = "#722a2a";
 set color_navigation_module_link_hover = "#c34848";
 set color_navigation_module_link_visited = "#6e6d45";
 
-##Background Image
+##===============================
+## Images
+##===============================
 
 set image_background_page_position = "top left";
 set image_background_page_repeat = "repeat";
 set image_background_page_url = "brittle/drab.png";
+
 
 #NEWLAYER: brittle/nnwm2009
 layerinfo type = "theme";
@@ -244,16 +298,31 @@ layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_entry_text = "#ffffff";
-set color_entry_background = "#000000";
-set color_footer_background = "#ffefbd";
-set color_footer_link = "#ef8229";
-set color_navigation_module_background = "#ffefbd";
-set color_page_background = "#000000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
 set color_page_link = "#429ace";
 set color_page_link_hover = "#842021";
 set color_page_link_visited = "#ef4921";
-set color_page_text = "#ffffff";
+set color_page_text = "#fff";
+set color_footer_background = "#ffefbd";
+set color_footer_link = "#ef8229";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_entry_text = "#fff";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_navigation_module_background = "#ffefbd";
+
 
 #NEWLAYER: brittle/oldroses
 layerinfo type = "theme";
@@ -268,15 +337,10 @@ set layout_authors = [ { "name" => "danc
 ##===============================
 
 set color_page_background = "#E3D7DB";
-set color_page_text = "#000000";
 set color_page_link = "#64434B";
 set color_page_link_hover = "#B18698";
 set color_page_link_visited = "#64434B";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
+set color_page_text = "#000";
 set color_footer_background = "#E3D7DB";
 set color_footer_link = "#64434B";
 set color_footer_link_hover = "#B18698";
@@ -286,12 +350,12 @@ set color_footer_link_visited = "#64434B
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#64434B";
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
+set color_entry_background = "#fff";
 set color_entry_link = "#64434B";
 set color_entry_link_hover = "#B18698";
 set color_entry_link_visited = "#64434B";
+set color_entry_text = "#000";
+set color_entry_title = "#64434B";
 
 ##===============================
 ## Module Colors
@@ -302,6 +366,7 @@ set color_navigation_module_link_hover =
 set color_navigation_module_link_hover = "#B18698";
 set color_navigation_module_link_visited = "#E3D7DB";
 
+
 #NEWLAYER: brittle/rust
 layerinfo type = "theme";
 layerinfo name = "Rust";
@@ -310,22 +375,16 @@ layerinfo author_name = "renoir";
 
 set layout_authors = [ { "name" => "renoir", "type" => "user" } ];
 
-
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#ECE5CE";
-set color_page_text = "#7A7A7A";
 set color_page_link = "#5F8A92";
 set color_page_link_hover = "#ACC5C9";
 set color_page_link_visited = "#8DA8AD";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_footer_background = "#FFFFFF";
+set color_page_text = "#7A7A7A";
+set color_footer_background = "#fff";
 set color_footer_link = "#5F8A92";
 set color_footer_link_hover = "#ACC5C9";
 set color_footer_link_visited = "#8DA8AD";
@@ -334,12 +393,12 @@ set color_footer_link_visited = "#8DA8AD
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#939393";
-set color_entry_background = "#FFFFFF";
-set color_entry_text = "#7A7A7A";
+set color_entry_background = "#fff";
 set color_entry_link = "#5F8A92";
 set color_entry_link_hover = "#ACC5C9";
 set color_entry_link_visited = "#8DA8AD";
+set color_entry_text = "#7A7A7A";
+set color_entry_title = "#939393";
 
 ##===============================
 ## Module Colors
@@ -349,6 +408,7 @@ set color_navigation_module_link = "#ACC
 set color_navigation_module_link = "#ACC5C9";
 set color_navigation_module_link_hover = "#CBDADC";
 set color_navigation_module_link_visited = "#DBE6E7";
+
 
 #NEWLAYER: brittle/softblue
 layerinfo type = "theme";
@@ -363,15 +423,10 @@ set layout_authors = [ { "name" => "danc
 ##===============================
 
 set color_page_background = "#CDE6FA";
-set color_page_text = "#000811";
 set color_page_link = "#2d4253";
 set color_page_link_hover = "#91bad0";
 set color_page_link_visited = "#2d4253";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
+set color_page_text = "#000811";
 set color_footer_background = "#CDE6FA";
 set color_footer_link = "#2d4253";
 set color_footer_link_hover = "#91bad0";
@@ -381,12 +436,12 @@ set color_footer_link_visited = "#2d4253
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#2d4253";
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000811";
+set color_entry_background = "#fff";
 set color_entry_link = "#2d4253";
 set color_entry_link_hover = "#91bad0";
 set color_entry_link_visited = "#2d4253";
+set color_entry_text = "#000811";
+set color_entry_title = "#2d4253";
 
 ##===============================
 ## Module Colors
@@ -396,6 +451,7 @@ set color_navigation_module_link = "#CDE
 set color_navigation_module_link = "#CDE6FA";
 set color_navigation_module_link_hover = "#91bad0";
 set color_navigation_module_link_visited = "#CDE6FA";
+
 
 #NEWLAYER: brittle/softgreen
 layerinfo type = "theme";
@@ -410,15 +466,10 @@ set layout_authors = [ { "name" => "danc
 ##===============================
 
 set color_page_background = "#B0C9AF";
-set color_page_text = "#0C140B";
 set color_page_link = "#557254";
 set color_page_link_hover = "#83AA81";
 set color_page_link_visited = "#557254";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
+set color_page_text = "#0C140B";
 set color_footer_background = "#B0C9AF";
 set color_footer_link = "#557254";
 set color_footer_link_hover = "#83AA81";
@@ -428,12 +479,12 @@ set color_footer_link_visited = "#557254
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#557254";
-set color_entry_background = "#FFFFFF";
-set color_entry_text = "#0C140B";
+set color_entry_background = "#fff";
 set color_entry_link = "#557254";
 set color_entry_link_hover = "#83AA81";
 set color_entry_link_visited = "#557254";
+set color_entry_text = "#0C140B";
+set color_entry_title = "#557254";
 
 ##===============================
 ## Module Colors
diff -r f666763b15e4 -r 909c7faa2251 bin/upgrading/s2layers/modular/themes.s2
--- a/bin/upgrading/s2layers/modular/themes.s2	Mon Aug 30 18:41:45 2010 +0800
+++ b/bin/upgrading/s2layers/modular/themes.s2	Mon Aug 30 14:19:12 2010 -0500
@@ -1,26 +1,20 @@
 #NEWLAYER: modular/amberandgreen
 layerinfo type = "theme";
 layerinfo name = "Amber and Green";
+layerinfo redist_uniq = "modular/amberandgreen";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/amberandgreen";
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/amberandgreen-background.png";
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#000";
+set color_page_border = "#444";
+set color_page_link = "#ec3";
+set color_page_link_active = "#6cc";
+set color_page_link_visited = "#b90";
 set color_page_text = "#4c4";
-set color_page_link = "#ec3"; 
-set color_page_link_visited = "#b90";
-set color_page_link_active = "#6cc";
 set color_page_title = "#eee";
-set color_page_border = "#444";
 set color_header_background = "#333";
 set color_footer_background = "#333";
 
@@ -29,14 +23,9 @@ set color_footer_background = "#333";
 ##===============================
 
 set color_entry_background = "#111";
+set color_entry_border = "#444";
 set color_entry_title = "#eee";
 set color_entry_title_background = "#333";
-set color_entry_border = "#444";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#333";
 
 ##===============================
@@ -44,37 +33,36 @@ set color_comment_title_background = "#3
 ##===============================
 
 set color_module_background = "#111";
+set color_module_border = "#444";
 set color_module_title = "#eee";
 set color_module_title_background = "#333";
-set color_module_border = "#444";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/amberandgreen-background.png";
 
 
 #NEWLAYER: modular/bubblegum
 layerinfo type = "theme";
 layerinfo name = "Bubblegum";
+layerinfo redist_uniq = "modular/bubblegum";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/bubblegum";
-
-set layout_resources = [ { "name" => "Meow", "url" => "http://www.colourlovers.com/palette/164203/meow" } ];
 
 # Uses the palette "Meow" by pinkpanda0466 (http://www.colourlovers.com/palette/164203/meow)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/bubblegum-background.png";
+set layout_resources = [ { "name" => "Meow", "url" => "http://www.colourlovers.com/palette/164203/meow" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#FFEFE7";
+set color_page_border = "#bFaFa8";
+set color_page_link = "#E6A3A3";
+set color_page_link_active = "#6cc";
+set color_page_link_visited = "#D9B2B2";
 set color_page_text = "#252525";
-set color_page_link = "#E6A3A3"; 
-set color_page_link_visited = "#D9B2B2";
-set color_page_link_active = "#6cc";
-set color_page_border = "#bFaFa8";
 set color_header_background = "#FFEFE7";
 set color_footer_background = "#FFEFE7";
 
@@ -83,14 +71,9 @@ set color_footer_background = "#FFEFE7";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#bFaFa8";
 set color_entry_title = "#5F4F48";
 set color_entry_title_background = "#FFEFE7";
-set color_entry_border = "#bFaFa8";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#FFEFE7";
 
 ##===============================
@@ -98,38 +81,37 @@ set color_comment_title_background = "#F
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#bFaFa8";
 set color_module_title = "#5F4F48";
 set color_module_title_background = "#FFEFE7";
-set color_module_border = "#bFaFa8";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/bubblegum-background.png";
 
 
 #NEWLAYER: modular/coffeeandcream
 layerinfo type = "theme";
 layerinfo name = "Coffee and Cream";
+layerinfo redist_uniq = "modular/coffeeandcream";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/coffeeandcream";
-
-set layout_resources = [ { "name" => "Black & White Photos", "url" => "http://www.colourlovers.com/palette/912388/Black__White_Photos" } ];
 
 ## Uses the palette "Black & White Photos" by ladysuean (http://www.colourlovers.com/palette/912388/Black__White_Photos)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/coffeeandcream-background.png";
+set layout_resources = [ { "name" => "Black & White Photos", "url" => "http://www.colourlovers.com/palette/912388/Black__White_Photos" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#473F34";
+set color_page_border = "#282421";
+set color_page_link = "#79a3bB";
+set color_page_link_active = "#c66";
+set color_page_link_visited = "#406389";
 set color_page_text = "#282421";
-set color_page_link = "#79a3bB"; 
-set color_page_link_visited = "#406389";
-set color_page_link_active = "#c66";
 set color_page_title = "#fff";
-set color_page_border = "#282421";
 set color_header_background = "#DCCDB0";
 set color_footer_background = "#DCCDB0";
 set color_footer_link = "#fff";
@@ -139,14 +121,9 @@ set color_footer_link = "#fff";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#282421";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#DCCDB0";
-set color_entry_border = "#282421";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#DCCDB0";
 
 ##===============================
@@ -154,38 +131,37 @@ set color_comment_title_background = "#D
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#282421";
 set color_module_title = "#fff";
 set color_module_title_background = "#DCCDB0";
-set color_module_border = "#282421";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/coffeeandcream-background.png";
 
 
 #NEWLAYER: modular/distinctblue
 layerinfo type = "theme";
 layerinfo name = "Distinct Blue";
+layerinfo redist_uniq = "modular/distinctblue";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/distinctblue";
-
-set layout_resources = [ { "name" => "Blue Jupiter", "url" => "http://www.colourlovers.com/palette/965705/Blue_Jupiter" } ];
 
 ## Uses the palette "Blue Jupiter" by memomo (http://www.colourlovers.com/palette/965705/Blue_Jupiter)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/distinctblue-background.png";
+set layout_resources = [ { "name" => "Blue Jupiter", "url" => "http://www.colourlovers.com/palette/965705/Blue_Jupiter" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#473F34";
+set color_page_border = "#825C2F";
+set color_page_link = "#C7E7F4";
+set color_page_link_active = "#cc6";
+set color_page_link_visited = "#89B3CB";
 set color_page_text = "#fff";
-set color_page_link = "#C7E7F4"; 
-set color_page_link_visited = "#89B3CB";
-set color_page_link_active = "#cc6";
 set color_page_title = "#fff";
-set color_page_border = "#825C2F";
 set color_header_background = "#1F305C";
 set color_footer_background = "#1F305C";
 set color_footer_link = "#fff";
@@ -195,14 +171,9 @@ set color_footer_link = "#fff";
 ##===============================
 
 set color_entry_background = "#111";
+set color_entry_border = "#825C2F";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#1F305C";
-set color_entry_border = "#825C2F";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#1F305C";
 
 ##===============================
@@ -210,16 +181,22 @@ set color_comment_title_background = "#1
 ##===============================
 
 set color_module_background = "#111";
+set color_module_border = "#825C2F";
 set color_module_title = "#fff";
 set color_module_title_background = "#1F305C";
-set color_module_border = "#825C2F";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/distinctblue-background.png";
 
 
 #NEWLAYER: modular/freshprose
 layerinfo type = "theme";
 layerinfo name = "Fresh Prose";
+layerinfo redist_uniq = "modular/freshprose";
 layerinfo author_name = "timeasmymeasure";
-layerinfo redist_uniq = "modular/freshprose";
 
 set layout_authors = [ { "name" => "timeasmymeasure", "type" => "user" } ];
 
@@ -234,28 +211,23 @@ set color_page_link_hover = "#885b5a";
 set color_page_link_hover = "#885b5a";
 set color_page_link_visited = "#b68187";
 set color_page_text = "#705f50";
-set color_header_background = "#ffffff";
-set color_footer_background = "#ffffff";
+set color_header_background = "#fff";
+set color_footer_background = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
+set color_entry_background = "#fff";
 set color_entry_border = "#f6f7f2";
 set color_entry_title_background = "#f6f7f2";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#f6f7f2";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#ffffff";
+set color_module_background = "#fff";
 set color_module_border = "#f6f7f2";
 set color_module_title_background = "#f6f7f2";
 
@@ -263,30 +235,23 @@ set color_module_title_background = "#f6
 #NEWLAYER: modular/greensummer
 layerinfo type = "theme";
 layerinfo name = "Green Summer";
+layerinfo redist_uniq = "modular/greensummer";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/greensummer";
-
-set layout_resources = [ { "name" => "p r o l o g u e", "url" => "http://www.colourlovers.com/palette/964086/p_r_o_l_o_g_u_e_*" } ];
 
 ## Uses the palette "p r o l o g u e " by sugar! (http://www.colourlovers.com/palette/964086/p_r_o_l_o_g_u_e_*)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/greensummer-background.png";
+set layout_resources = [ { "name" => "p r o l o g u e", "url" => "http://www.colourlovers.com/palette/964086/p_r_o_l_o_g_u_e_*" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#473F34";
+set color_page_border = "#35372D";
+set color_page_link = "#D25A2B";
+set color_page_link_active = "#66c";
+set color_page_link_visited = "#a22A0B";
 set color_page_text = "#35372D";
-set color_page_link = "#D25A2B"; 
-set color_page_link_visited = "#a22A0B";
-set color_page_link_active = "#66c";
 set color_page_title = "#fff";
-set color_page_border = "#35372D";
 set color_header_background = "#869F78";
 set color_footer_background = "#869F78";
 set color_footer_link = "#fff";
@@ -296,14 +261,9 @@ set color_footer_link = "#fff";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#35372D";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#869F78";
-set color_entry_border = "#35372D";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#869F78";
 
 ##===============================
@@ -311,38 +271,37 @@ set color_comment_title_background = "#8
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#35372D";
 set color_module_title = "#fff";
 set color_module_title_background = "#869F78";
-set color_module_border = "#35372D";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/greensummer-background.png";
 
 
 #NEWLAYER: modular/irisatdusk
 layerinfo type = "theme";
 layerinfo name = "Iris at Dusk";
+layerinfo redist_uniq = "modular/irisatdusk";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/irisatdusk";
-
-set layout_resources = [ { "name" => "Plum Together", "url" => "http://www.colourlovers.com/palette/1015963/Plum_Together" } ];
 
 ## Uses the palette "Plum Together" by o2bqueen (http://www.colourlovers.com/palette/1015963/Plum_Together)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/irisatdusk-background.png";
+set layout_resources = [ { "name" => "Plum Together", "url" => "http://www.colourlovers.com/palette/1015963/Plum_Together" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#6B586E";
+set color_page_border = "#6B586E";
+set color_page_link = "#919e68";
+set color_page_link_active = "#c66";
+set color_page_link_visited = "#8b8f74";
 set color_page_text = "#000";
-set color_page_link = "#919e68"; 
-set color_page_link_visited = "#8b8f74";
-set color_page_link_active = "#c66";
 set color_page_title = "#fff";
-set color_page_border = "#6B586E";
 set color_header_background = "#b6a2b8";
 set color_footer_background = "#b6a2b8";
 set color_footer_link = "#fff";
@@ -352,14 +311,9 @@ set color_footer_link = "#fff";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#6B586E";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#b6a2b8";
-set color_entry_border = "#6B586E";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#b6a2b8";
 
 ##===============================
@@ -367,38 +321,37 @@ set color_comment_title_background = "#b
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#6B586E";
 set color_module_title = "#fff";
 set color_module_title_background = "#b6a2b8";
-set color_module_border = "#6B586E";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/irisatdusk-background.png";
 
 
 #NEWLAYER: modular/mediterraneanpeach
 layerinfo type = "theme";
 layerinfo name = "Mediterranean Peach";
+layerinfo redist_uniq = "modular/mediterraneanpeach";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/mediterraneanpeach";
-
-set layout_resources = [ { "name" => "Nantes", "url" => "http://www.colourlovers.com/palette/448043/nantes" } ];
 
 ## Uses the palette "nantes" by mimossito (http://www.colourlovers.com/palette/448043/nantes)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/mediterraneanpeach-background.png";
+set layout_resources = [ { "name" => "Nantes", "url" => "http://www.colourlovers.com/palette/448043/nantes" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#473F34";
+set color_page_border = "#2B1A1A";
+set color_page_link = "#E69B5E";
+set color_page_link_active = "#c66";
+set color_page_link_visited = "#EDB98E";
 set color_page_text = "#2B1A1A";
-set color_page_link = "#E69B5E"; 
-set color_page_link_visited = "#EDB98E";
-set color_page_link_active = "#c66";
 set color_page_title = "#fff";
-set color_page_border = "#2B1A1A";
 set color_header_background = "#486B82";
 set color_footer_background = "#486B82";
 set color_footer_link = "#fff";
@@ -408,14 +361,9 @@ set color_footer_link = "#fff";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#2B1A1A";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#486B82";
-set color_entry_border = "#2B1A1A";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#486B82";
 
 ##===============================
@@ -423,38 +371,37 @@ set color_comment_title_background = "#4
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#2B1A1A";
 set color_module_title = "#fff";
 set color_module_title_background = "#486B82";
-set color_module_border = "#2B1A1A";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/mediterraneanpeach-background.png";
 
 
 #NEWLAYER: modular/olivetree
 layerinfo type = "theme";
 layerinfo name = "Olive Tree";
+layerinfo redist_uniq = "modular/olivetree";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/olivetree";
-
-set layout_resources = [ { "name" => "I'm a fat tomato", "url" => "http://www.colourlovers.com/palette/912675/Im_a_fat_tomato" } ];
 
 ## Uses the palette "I'm a fat tomato" by BobWestbrook (http://www.colourlovers.com/palette/912675/Im_a_fat_tomato)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/olivetree-background.png";
+set layout_resources = [ { "name" => "I'm a fat tomato", "url" => "http://www.colourlovers.com/palette/912675/Im_a_fat_tomato" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#fff";
+set color_page_border = "#322D0D";
+set color_page_link = "#b70202";
+set color_page_link_active = "#33c";
+set color_page_link_visited = "#910D0D";
 set color_page_text = "#000";
-set color_page_link = "#b70202"; 
-set color_page_link_visited = "#910D0D";
-set color_page_link_active = "#33c";
 set color_page_title = "#fff";
-set color_page_border = "#322D0D";
 set color_header_background = "#524D2D";
 set color_footer_background = "#524D2D";
 set color_footer_link = "#fff";
@@ -464,14 +411,9 @@ set color_footer_link = "#fff";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#322D0D";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#524D2D";
-set color_entry_border = "#322D0D";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#524D2D";
 
 ##===============================
@@ -479,16 +421,22 @@ set color_comment_title_background = "#5
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#322D0D";
 set color_module_title = "#fff";
 set color_module_title_background = "#524D2D";
-set color_module_border = "#322D0D";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/olivetree-background.png";
 
 
 #NEWLAYER: modular/purplehaze
 layerinfo type = "theme";
 layerinfo name = "Purple Haze";
+layerinfo redist_uniq = "modular/purplehaze";
 layerinfo author_name = "timeasmymeasure";
-layerinfo redist_uniq = "modular/purplehaze";
 
 set layout_authors = [ { "name" => "timeasmymeasure", "type" => "user" } ];
 
@@ -496,70 +444,58 @@ set layout_authors = [ { "name" => "time
 ## Page Colors
 ##===============================
 
+set color_page_background = "#ededed";
+set color_page_border = "#ededed";
 set color_page_link = "#787878";
 set color_page_link_active = "#787878";
 set color_page_link_hover = "#989898";
 set color_page_link_visited = "#787878";
-set color_page_text = "#000000";
-set color_page_title = "#ffffff";
-set color_page_background = "#ededed";
-set color_page_border = "#ededed";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#b6a2b8";
 set color_footer_background = "#b6a2b8";
-set color_footer_link = "#ffffff";
-set color_header_background = "#b6a2b8";
+set color_footer_link = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
+set color_entry_background = "#fff";
 set color_entry_border = "#ededed";
-set color_entry_title = "#ffffff";
+set color_entry_title = "#fff";
 set color_entry_title_background = "#b6a2b8";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#b6a2b8";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#ffffff";
+set color_module_background = "#fff";
 set color_module_border = "#ededed";
-set color_module_title = "#ffffff";
+set color_module_title = "#fff";
 set color_module_title_background = "#b6a2b8";
 
 
 #NEWLAYER: modular/swiminthesea
 layerinfo type = "theme";
 layerinfo name = "Swim in the Sea";
+layerinfo redist_uniq = "modular/swiminthesea";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "modular/swiminthesea";
-
-set layout_resources = [ { "name" => "Tip My Hat", "url" => "http://www.colourlovers.com/palette/916462/Tip_My_Hat" } ];
 
 ## Uses the palette "Tip My Hat" by Highwireart (http://www.colourlovers.com/palette/916462/Tip_My_Hat)
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_page_url = "modular/swiminthesea-background.png";
+set layout_resources = [ { "name" => "Tip My Hat", "url" => "http://www.colourlovers.com/palette/916462/Tip_My_Hat" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#8Da7d8";
+set color_page_border = "#b1a897";
+set color_page_link = "#8Da7d8";
+set color_page_link_active = "#6c6";
+set color_page_link_visited = "#A5BEE7";
 set color_page_text = "#000";
-set color_page_link = "#8Da7d8"; 
-set color_page_link_visited = "#A5BEE7";
-set color_page_link_active = "#6c6";
 set color_page_title = "#1E1D19";
-set color_page_border = "#b1a897";
 set color_header_background = "#EFEEE9";
 set color_footer_background = "#EFEEE9";
 
@@ -568,14 +504,9 @@ set color_footer_background = "#EFEEE9";
 ##===============================
 
 set color_entry_background = "#fff";
+set color_entry_border = "#b1a897";
 set color_entry_title = "#1E1D19";
 set color_entry_title_background = "#EFEEE9";
-set color_entry_border = "#b1a897";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title_background = "#EFEEE9";
 
 ##===============================
@@ -583,6 +514,12 @@ set color_comment_title_background = "#E
 ##===============================
 
 set color_module_background = "#fff";
+set color_module_border = "#b1a897";
 set color_module_title = "#1E1D19";
 set color_module_title_background = "#EFEEE9";
-set color_module_border = "#b1a897";
+
+##===============================
+## Images
+##===============================
+
+set image_background_page_url = "modular/swiminthesea-background.png";
diff -r f666763b15e4 -r 909c7faa2251 bin/upgrading/s2layers/nouveauoleanders/themes.s2
--- a/bin/upgrading/s2layers/nouveauoleanders/themes.s2	Mon Aug 30 18:41:45 2010 +0800
+++ b/bin/upgrading/s2layers/nouveauoleanders/themes.s2	Mon Aug 30 14:19:12 2010 -0500
@@ -1,29 +1,26 @@
 #NEWLAYER: nouveauoleanders/dustyantique
-layerinfo "type" = "theme";
-layerinfo "name" = "Dusty Antique";
+layerinfo type = "theme";
+layerinfo name = "Dusty Antique";
+layerinfo redist_uniq = "nouveauoleanders/dustyantique";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/dustyantique";
 
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-#uses the "i'm home again" palette by dinsdale (http://www.colourlovers.com/palette/130396/im_home_again)
+# Uses the "i'm home again" palette by dinsdale (http://www.colourlovers.com/palette/130396/im_home_again)
+set layout_resources =
+    [
+        { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" },
+        { "name" => "I'm home again", "url" => "http://www.colourlovers.com/palette/130396/im_home_again" }
+    ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#7A7172";
+set color_page_link = "#E7CDCE";
+set color_page_link_active = "#fed";
+set color_page_link_visited = "#2B1A1A";
 set color_page_text = "#fff";
-set color_page_link = "#E7CDCE";
-set color_page_link_visited = "#2B1A1A";
-set color_page_link_hover = "";
-set color_page_link_active = "#fed";
 set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
 set color_header_background = "#2B1A1A";
 set color_footer_background = "#2B1A1A";
 set color_footer_link = "#fff";
@@ -41,82 +38,72 @@ set color_entry_title = "#fff";
 ##===============================
 
 set color_module_background = "#443738";
+set color_module_link = "#fff";
+set color_module_link_active = "#E7CDCE";
+set color_module_link_visited = "#ccc";
 set color_module_text = "#fff";
-set color_module_link = "#fff";
-set color_module_link_visited = "#ccc";
-set color_module_link_hover = "";
-set color_module_link_active = "#E7CDCE";
 set color_module_title = "#fff";
 set color_module_title_background = "#282421";
 
 
 #NEWLAYER: nouveauoleanders/huntergreen
-layerinfo "type" = "theme";
-layerinfo "name" = "Hunter Green";
+layerinfo type = "theme";
+layerinfo name = "Hunter Green";
+layerinfo redist_uniq = "nouveauoleanders/huntergreen";
 layerinfo author_name = "dancing_serpent";
-layerinfo redist_uniq = "nouveauoleanders/huntergreen";
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
-set color_page_background = "#ffffff";
-set color_page_link = "#006600";
+set color_page_background = "#fff";
+set color_page_link = "#060";
 set color_page_link_active = "#b2cc64";
 set color_page_link_hover = "#b2cc64";
-set color_page_link_visited = "#006600";
-set color_page_text = "#000000";
-set color_page_title = "#ffffff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#003300";
-set color_footer_background = "#003300";
-set color_footer_link = "#ffffff";
+set color_page_link_visited = "#060";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#030";
+set color_footer_background = "#030";
+set color_footer_link = "#fff";
 set color_footer_link_active = "#b2cc64";
 set color_footer_link_hover = "#b2cc64";
-set color_footer_link_visited = "#ffffff";
+set color_footer_link_visited = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
-set color_entry_border = "#000000";
-set color_entry_link = "#006600";
+set color_entry_background = "#fff";
+set color_entry_border = "#000";
+set color_entry_link = "#060";
 set color_entry_link_active = "#b2cc64";
 set color_entry_link_hover = "#b2cc64";
-set color_entry_link_visited = "#006600";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
+set color_entry_link_visited = "#060";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#006600";
-set color_module_link = "#ffffff";
+set color_module_background = "#060";
+set color_module_link = "#fff";
 set color_module_link_active = "#b2cc64";
 set color_module_link_hover = "#b2cc64";
-set color_module_link_visited = "#ffffff";
-set color_module_title = "#ffffff";
+set color_module_link_visited = "#fff";
+set color_module_title = "#fff";
 
 
 #NEWLAYER: nouveauoleanders/nightfall
-layerinfo "type" = "theme";
-layerinfo "name" = "Nightfall";
+layerinfo type = "theme";
+layerinfo name = "Nightfall";
+layerinfo redist_uniq = "nouveauoleanders/nightfall";
 layerinfo author_name = "dancing_serpent";
-layerinfo redist_uniq = "nouveauoleanders/nightfall";
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Page Colors
@@ -126,17 +113,12 @@ set color_page_border = "#293b3f";
 set color_page_border = "#293b3f";
 set color_page_link = "#a7581d";
 set color_page_link_visited = "#a7581d";
-set color_page_text = "#cc8833";
-set color_page_title = "#cc8833";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
+set color_page_text = "#c83";
+set color_page_title = "#c83";
+set color_header_background = "#000302";
 set color_footer_background = "#000302";
 set color_footer_link = "#a7581d";
 set color_footer_link_visited = "#a7581d";
-set color_header_background = "#000302";
 
 ##===============================
 ## Entry Colors
@@ -146,8 +128,8 @@ set color_entry_border = "#293b3f";
 set color_entry_border = "#293b3f";
 set color_entry_link = "#a7581d";
 set color_entry_link_visited = "#a7581d";
-set color_entry_text = "#cc8833";
-set color_entry_title = "#cc8833";
+set color_entry_text = "#c83";
+set color_entry_title = "#c83";
 
 ##===============================
 ## Module Colors
@@ -156,19 +138,17 @@ set color_module_background = "#192c3a";
 set color_module_background = "#192c3a";
 set color_module_link = "#a7581d";
 set color_module_link_visited = "#a7581d";
-set color_module_text = "#cc8833";
-set color_module_title = "#cc8833";
+set color_module_text = "#c83";
+set color_module_title = "#c83";
 
 
 #NEWLAYER: nouveauoleanders/palejewels
-layerinfo "type" = "theme";
-layerinfo "name" = "Pale Jewels";
+layerinfo type = "theme";
+layerinfo name = "Pale Jewels";
+layerinfo redist_uniq = "nouveauoleanders/palejewels";
 layerinfo author_name = "dancing_serpent";
-layerinfo redist_uniq = "nouveauoleanders/palejewels";
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Page Colors
@@ -176,21 +156,16 @@ set layout_resources = [ { "name" => "Op
 
 set color_page_background = "#e9faee";
 set color_page_link = "#886c9d";
-set color_page_link_active = "#ff9966";
-set color_page_link_hover = "#ff9966";
+set color_page_link_active = "#f96";
+set color_page_link_hover = "#f96";
 set color_page_link_visited = "#886c9d";
 set color_page_text = "#363636";
 set color_page_title = "#e9faee";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
 set color_header_background = "#363636";
 set color_footer_background = "#363636";
 set color_footer_link = "#ad5176";
-set color_footer_link_active = "#ff9966";
-set color_footer_link_hover = "#ff9966";
+set color_footer_link_active = "#f96";
+set color_footer_link_hover = "#f96";
 set color_footer_link_visited = "#ad5176";
 
 ##===============================
@@ -199,8 +174,8 @@ set color_footer_link_visited = "#ad5176
 
 set color_entry_background = "#e9faee";
 set color_entry_link = "#886c9d";
-set color_entry_link_active = "#ff9966";
-set color_entry_link_hover = "#ff9966";
+set color_entry_link_active = "#f96";
+set color_entry_link_hover = "#f96";
 set color_entry_link_visited = "#886c9d";
 set color_entry_text = "#363636";
 set color_entry_title = "#363636";
@@ -211,8 +186,8 @@ set color_entry_title = "#363636";
 
 set color_module_background = "#a3a68a";
 set color_module_link = "#ad5176";
-set color_module_link_active = "#ff9966";
-set color_module_link_hover = "#ff9966";
+set color_module_link_active = "#f96";
+set color_module_link_hover = "#f96";
 set color_module_link_visited = "#ad5176";
 set color_module_text = "#363636";
 set color_module_title = "#e9faee";
@@ -220,14 +195,12 @@ set color_module_title_background = "#36
 
 
 #NEWLAYER: nouveauoleanders/peridot
-layerinfo "type" = "theme";
-layerinfo "name" = "Peridot";
+layerinfo type = "theme";
+layerinfo name = "Peridot";
+layerinfo redist_uniq = "nouveauoleanders/peridot";
 layerinfo author_name = "dancing_serpent";
-layerinfo redist_uniq = "nouveauoleanders/peridot";
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Page Colors
@@ -238,15 +211,10 @@ set color_page_link_active = "#ff8e3c";
 set color_page_link_active = "#ff8e3c";
 set color_page_link_hover = "#ff8e3c";
 set color_page_link_visited = "#67792a";
-set color_page_text = "#000000";
+set color_page_text = "#000";
 set color_page_title = "#e5f3c7";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#000000";
-set color_footer_background = "#000000";
+set color_header_background = "#000";
+set color_footer_background = "#000";
 set color_footer_link = "#8ca53a";
 set color_footer_link_active = "#ff8e3c";
 set color_footer_link_hover = "#ff8e3c";
@@ -261,8 +229,8 @@ set color_entry_link_active = "#ff8e3c";
 set color_entry_link_active = "#ff8e3c";
 set color_entry_link_hover = "#ff8e3c";
 set color_entry_link_visited = "#67792a";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
 
 ##===============================
 ## Module Colors
@@ -273,37 +241,34 @@ set color_module_link_active = "#ff8e3c"
 set color_module_link_active = "#ff8e3c";
 set color_module_link_hover = "#ff8e3c";
 set color_module_link_visited = "#e5f3c7";
-set color_module_text = "#000000";
+set color_module_text = "#000";
 set color_module_title = "#e5f3c7";
-set color_module_title_background = "#000000";
+set color_module_title_background = "#000";
 
 
 #NEWLAYER: nouveauoleanders/piquant
-layerinfo "type" = "theme";
-layerinfo "name" = "Piquant";
+layerinfo type = "theme";
+layerinfo name = "Piquant";
+layerinfo redist_uniq = "nouveauoleanders/piquant";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/piquant";
 
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-#uses the "I'm a fat tomato" palette by BobWestbrook (http://www.colourlovers.com/palette/912675/Im_a_fat_tomato)
+# Uses the "I'm a fat tomato" palette by BobWestbrook (http://www.colourlovers.com/palette/912675/Im_a_fat_tomato)
+set layout_resources =
+    [
+        { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" },
+        { "name" => "I'm a fat tomato", "url" => "http://www.colourlovers.com/palette/912675/Im_a_fat_tomato" }
+    ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#9E9767";
+set color_page_link = "#eee";
+set color_page_link_active = "#c00";
+set color_page_link_visited = "#ddd";
 set color_page_text = "#fff";
-set color_page_link = "#eee";
-set color_page_link_visited = "#ddd";
-set color_page_link_hover = "";
-set color_page_link_active = "#c00";
 set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
 set color_header_background = "#3A0404";
 set color_footer_background = "#4A0404";
 set color_footer_link = "#fff";
@@ -321,41 +286,36 @@ set color_entry_title = "#fff";
 ##===============================
 
 set color_module_background = "#524D2D";
-set color_module_text = "#fff";
 set color_module_link = "#fff";
 set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "";
+set color_module_text = "#fff";
 set color_module_title = "#fff";
 set color_module_title_background = "#000";
 
 
 #NEWLAYER: nouveauoleanders/seaandsalt
-layerinfo "type" = "theme";
-layerinfo "name" = "Sea and Salt";
+layerinfo type = "theme";
+layerinfo name = "Sea and Salt";
+layerinfo redist_uniq = "nouveauoleanders/seaandsalt";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/seaandsalt";
 
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-#uses the "Oceanside Twilight" palette by BlueLou (http://www.colourlovers.com/palette/912345/Oceanside_Twilight)
+# Uses the "Oceanside Twilight" palette by BlueLou (http://www.colourlovers.com/palette/912345/Oceanside_Twilight)
+set layout_resources =
+    [
+        { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" },
+        { "name" => "Oceanside Twilight", "url" => "http://www.colourlovers.com/palette/912345/Oceanside_Twilight" }
+    ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#fff";
+set color_page_link = "#125468";
+set color_page_link_active = "#cc6";
+set color_page_link_visited = "#1A3148";
 set color_page_text = "#000";
-set color_page_link = "#125468";
-set color_page_link_visited = "#1A3148";
-set color_page_link_hover = "";
-set color_page_link_active = "#cc6";
 set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
 set color_header_background = "#1A3148";
 set color_footer_background = "#1A3148";
 set color_footer_link = "#fff";
@@ -373,39 +333,30 @@ set color_entry_title = "#000";
 ##===============================
 
 set color_module_background = "#125468";
+set color_module_link = "#eee";
+set color_module_link_active = "#ffd";
+set color_module_link_visited = "#ddd";
 set color_module_text = "#fff";
-set color_module_link = "#eee";
-set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "#ffd";
 set color_module_title = "#fff";
 set color_module_title_background = "#000";
 
 
 #NEWLAYER: nouveauoleanders/sienna
-layerinfo "type" = "theme";
-layerinfo "name" = "Sienna";
+layerinfo type = "theme";
+layerinfo name = "Sienna";
+layerinfo redist_uniq = "nouveauoleanders/sienna";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/sienna";
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#fff";
+set color_page_link = "#900";
+set color_page_link_active = "#f00";
+set color_page_link_visited = "#600";
 set color_page_text = "#000";
-set color_page_link = "#900";
-set color_page_link_visited = "#600";
-set color_page_link_hover = "";
-set color_page_link_active = "#f00";
 set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
 set color_header_background = "#000";
 set color_footer_background = "#000";
 set color_footer_link = "#fff";
@@ -423,24 +374,21 @@ set color_entry_title = "#000";
 ##===============================
 
 set color_module_background = "#7C7363";
+set color_module_link = "#fff";
+set color_module_link_active = "#900";
+set color_module_link_visited = "#ddd";
 set color_module_text = "#fff";
-set color_module_link = "#fff";
-set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "#900";
 set color_module_title = "#fff";
 set color_module_title_background = "#000";
 
 
 #NEWLAYER: nouveauoleanders/tearose
-layerinfo "type" = "theme";
-layerinfo "name" = "Tea Rose";
+layerinfo type = "theme";
+layerinfo name = "Tea Rose";
+layerinfo redist_uniq = "nouveauoleanders/tearose";
 layerinfo author_name = "dancing_serpent";
-layerinfo redist_uniq = "nouveauoleanders/tearose";
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Page Colors
@@ -451,15 +399,10 @@ set color_page_link_active = "#b18698";
 set color_page_link_active = "#b18698";
 set color_page_link_hover = "#b18698";
 set color_page_link_visited = "#64434b";
-set color_page_text = "#000000";
+set color_page_text = "#000";
 set color_page_title = "#e3d7db";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#000000";
-set color_footer_background = "#000000";
+set color_header_background = "#000";
+set color_footer_background = "#000";
 set color_footer_link = "#64434b";
 set color_footer_link_active = "#b18698";
 set color_footer_link_hover = "#b18698";
@@ -474,8 +417,8 @@ set color_entry_link_active = "#b18698";
 set color_entry_link_active = "#b18698";
 set color_entry_link_hover = "#b18698";
 set color_entry_link_visited = "#64434b";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
 
 ##===============================
 ## Module Colors
@@ -486,38 +429,35 @@ set color_module_link_active = "#b18698"
 set color_module_link_active = "#b18698";
 set color_module_link_hover = "#b18698";
 set color_module_link_visited = "#e3d7db";
-set color_module_text = "#000000";
+set color_module_text = "#000";
 set color_module_title = "#e3d7db";
-set color_module_title_background = "#000000";
+set color_module_title_background = "#000";
 
 
 #NEWLAYER: nouveauoleanders/wisteria
-layerinfo "type" = "theme";
-layerinfo "name" = "Wisteria";
+layerinfo type = "theme";
+layerinfo name = "Wisteria";
+layerinfo redist_uniq = "nouveauoleanders/wisteria";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/wisteria";
 
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-#uses the "Siren" palette by Faeleia (http://www.colourlovers.com/palette/912366/Siren)
+# Uses the "Siren" palette by Faeleia (http://www.colourlovers.com/palette/912366/Siren)
+set layout_resources =
+    [
+        { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" },
+        { "name" => "Siren", "url" => "http://www.colourlovers.com/palette/912366/Siren" }
+    ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#fff";
+set color_page_link = "#D7B55C";
+set color_page_link_active = "#c00";
+set color_page_link_visited = "#9F7DA1";
 set color_page_text = "#000";
-set color_page_link = "#D7B55C";
-set color_page_link_visited = "#9F7DA1";
-set color_page_link_hover = "";
-set color_page_link_active = "#c00";
 set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#4A3549";#293066
+set color_header_background = "#4A3549";
 set color_footer_background = "#4A3549";
 set color_footer_link = "#fff";
 set color_footer_link_visited = "#ddd";
@@ -534,11 +474,9 @@ set color_entry_title = "#000";
 ##===============================
 
 set color_module_background = "#856685";
+set color_module_link = "#eee";
+set color_module_link_active = "#D7B55C";
+set color_module_link_visited = "#ddd";
 set color_module_text = "#fff";
-set color_module_link = "#eee";
-set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "#D7B55C";
 set color_module_title = "#fff";
 set color_module_title_background = "#000";
-
diff -r f666763b15e4 -r 909c7faa2251 bin/upgrading/s2layers/tranquilityiii/themes.s2
--- a/bin/upgrading/s2layers/tranquilityiii/themes.s2	Mon Aug 30 18:41:45 2010 +0800
+++ b/bin/upgrading/s2layers/tranquilityiii/themes.s2	Mon Aug 30 14:19:12 2010 -0500
@@ -1,7 +1,7 @@
 #NEWLAYER: tranquilityiii/brick
-layerinfo "type" = "theme";
-layerinfo "name" = "Brick";
-layerinfo "redist_uniq" = "tranquilityiii/brick";
+layerinfo type = "theme";
+layerinfo name = "Brick";
+layerinfo redist_uniq = "tranquilityiii/brick";
 layerinfo author_name = "branchandroot";
 
 ##===============================
@@ -12,25 +12,22 @@ set color_page_link = "#6D2F34";
 set color_page_link = "#6D2F34";
 set color_page_link_visited = "#aD6F74";
 set color_page_title = "#fff";
-set color_header_background = "";
-set color_footer_background = "";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
+set color_entry_background = "#fff";
 set color_entry_border = "#aD6F74";
+set color_entry_text = "#000";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#";
-set color_module_text = "#fff";
 set color_module_link = "#eAdDc6";
 set color_module_link_visited = "#CABDA6";
+set color_module_text = "#fff";
 
 
 #NEWLAYER: tranquilityiii/clearmessages
@@ -89,43 +86,40 @@ layerinfo redist_uniq = "tranquilityiii/
 layerinfo redist_uniq = "tranquilityiii/freshblue";
 layerinfo author_name = "forthwritten";
 
-set layout_authors = [ { "name" => "forthwritten", "type" => "user" }];
+set layout_authors = [ { "name" => "forthwritten", "type" => "user" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
 set color_page_background = "#86aef9";
-set color_page_border = "#cccccc";
-set color_page_link = "#000000";
-set color_page_link_visited = "#000000";
+set color_page_border = "#ccc";
+set color_page_link = "#000";
+set color_page_link_active = "#83de19";
 set color_page_link_hover = "#dd20ff";
-set color_page_link_active = "#83de19";
-
+set color_page_link_visited = "#000";
+set color_page_title = "#000";
 set color_header_background = "#86aef9";
-set color_page_title = "#000000";
-
 set color_footer_background = "#86aef9";
 set color_footer_link = "#161616";
+set color_footer_link_active = "#374b7a";
+set color_footer_link_hover = "#374b7a";
 set color_footer_link_visited = "#161616";
-set color_footer_link_hover = "#374b7a";
-set color_footer_link_active = "#374b7a";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
+set color_entry_background = "#fff";
 set color_entry_border = "#374b7a";
-set color_entry_title_background = "#ffffff";
+set color_entry_interaction_links = "#333";
+set color_entry_link = "#374b7a";
+set color_entry_link_active = "#83de19";
+set color_entry_link_hover = "#dd20ff";
+set color_entry_link_visited = "#374b7a";
+set color_entry_text = "#333";
 set color_entry_title = "#374b7a";
-set color_entry_text = "#333333";
-set color_entry_link = "#374b7a";
-set color_entry_link_visited = "#374b7a";
-set color_entry_link_hover = "#dd20ff";
-set color_entry_link_active = "#83de19";
-set color_entry_interaction_links = "#333333";
-
+set color_entry_title_background = "#fff";
 set color_comment_title_background = "#74a3fd";
 
 ##===============================
@@ -134,13 +128,13 @@ set color_comment_title_background = "#7
 
 set color_module_background = "#74a3fd";
 set color_module_border = "#74a3fd";
+set color_module_link = "#080808";
+set color_module_link_active = "#83de19";
+set color_module_link_hover = "#dd20ff";
+set color_module_link_visited = "#080808";
+set color_module_text = "#000";
+set color_module_title = "#000";
 set color_module_title_background = "#74a3fd";
-set color_module_title = "#000000";
-set color_module_text = "#000000";
-set color_module_link = "#080808";
-set color_module_link_visited = "#080808";
-set color_module_link_hover = "#dd20ff";
-set color_module_link_active = "#83de19";
 
 
 #NEWLAYER: tranquilityiii/lightondark
@@ -149,76 +143,78 @@ layerinfo redist_uniq = "tranquilityiii/
 layerinfo redist_uniq = "tranquilityiii/lightondark";
 layerinfo author_name = "cesy";
 
-set layout_authors = [ { "name" => "cesy", "type" => "user" }];
+set layout_authors = [ { "name" => "cesy", "type" => "user" } ];
 
 ##===============================
 ## Page Colors
 ##===============================
 
-set color_page_background = "#666666";
-set color_page_border = "#666666";
-set color_page_text = "#ffffff";
-set color_page_link = "#ddddff";
-set color_page_link_active = "#ffcccc";
-set color_page_link_hover = "#ccffcc";
-set color_page_link_visited = "#ffffcc";
-
-set color_header_background = "#009900";
-set color_page_title = "#ffffff";
-
-set color_footer_background = "#000000";
-set color_footer_link = "#ddddff";
-set color_footer_link_active = "#ffcccc";
-set color_footer_link_hover = "#ccffcc";
-set color_footer_link_visited = "#ffffcc";
+set color_page_background = "#666";
+set color_page_border = "#666";
+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 = "#090";
+set color_footer_background = "#000";
+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 = "#000000";
-set color_entry_border = "#cccccc";
-set color_entry_text = "#ffffff";
-set color_entry_link = "#ddddff";
-set color_entry_link_active = "#ffcccc";
-set color_entry_link_hover = "#ccffcc";
-set color_entry_link_visited = "#ffffcc";
-set color_entry_interaction_links = "#ffffff";
-
-set color_entry_title_background = "#009900";
-set color_entry_title = "#ffffff";
-
-set color_comment_title_background = "#009900";
+set color_entry_background = "#000";
+set color_entry_border = "#ccc";
+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 = "#090";
+set color_comment_title_background = "#090";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#666666";
-set color_module_border = "#eeeeee";
-set color_module_text = "#ffffff";
-set color_module_link = "#ddddff";
-set color_module_link_active = "#ffcccc";
-set color_module_link_hover = "#ccffcc";
-set color_module_link_visited = "#ffffcc";
+set color_module_background = "#666";
+set color_module_border = "#eee";
+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_background = "#000000";
-set color_module_title = "#ffffff";
+function Page::print_theme_stylesheet() {
+    """
+    .entry-title, .module-header {
+        padding-left: .5em;
+        }
 
-function Page::print_theme_stylesheet() 
-{
+    .module-header {
+        margin-bottom: .2em;
+        }
 
-    """.entry-title, .module-header { padding-left: .5em; }
-    .module-header { margin-bottom: .2em; }
-    .comment-title { padding: .3em; }""";
-
+    .comment-title {
+        padding: .3em;
+        }
+    """;
 }
 
 
 #NEWLAYER: tranquilityiii/lilac
-layerinfo "type" = "theme";
-layerinfo "name" = "Lilac";
-layerinfo "redist_uniq" = "tranquilityiii/lilac";
+layerinfo type = "theme";
+layerinfo name = "Lilac";
+layerinfo redist_uniq = "tranquilityiii/lilac";
 layerinfo author_name = "branchandroot";
 
 ##===============================
@@ -229,25 +225,23 @@ set color_page_link = "#786079";
 set color_page_link = "#786079";
 set color_page_link_visited = "#b8a0b9";
 set color_page_title = "#fff";
-set color_header_background = "";
-set color_footer_background = "";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
+set color_entry_background = "#fff";
 set color_entry_border = "#b8a0b9";
+set color_entry_text = "#000";
 
 ##===============================
 ## Module Colors
 ##===============================
 
 set color_module_background = "#b8a0b9";
-set color_module_text = "#fff";
 set color_module_link = "#382039";
 set color_module_link_visited = "#584059";
+set color_module_text = "#fff";
 
 
 #NEWLAYER: tranquilityiii/marbleiii
@@ -255,7 +249,7 @@ layerinfo name = "Marble III";
 layerinfo name = "Marble III";
 layerinfo redist_uniq = "tranquilityiii/marbleiii";
 layerinfo author_name = "dancing_serpent";
- 
+
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
 
 ##===============================
@@ -270,7 +264,6 @@ set color_page_link_visited = "#233535";
 set color_page_link_visited = "#233535";
 set color_page_text = "#d2cdc7";
 set color_page_title = "#818a8f";
-
 set color_header_background = "#101413";
 set color_footer_background = "#101413";
 set color_footer_link = "#d2cdc7";
@@ -292,7 +285,6 @@ set color_entry_text = "#d2cdc7";
 set color_entry_text = "#d2cdc7";
 set color_entry_title = "#101413";
 set color_entry_title_background = "#5e6460";
-
 set color_comment_title_background = "#818a8f";
 
 ##===============================
@@ -331,45 +323,51 @@ set color_footer_background = "#456";
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
+set color_entry_background = "#fff";
 set color_entry_border = "#678";
+set color_entry_text = "#000";
 
 ##===============================
 ## Module Colors
 ##===============================
 
 set color_module_background = "#678";
-set color_module_text = "#eee";
 set color_module_link = "#012";
 set color_module_link_visited = "#234";
+set color_module_text = "#eee";
 
 
 #NEWLAYER: tranquilityiii/nnwm2009
-layerinfo "type" = "theme";
-layerinfo "name" = "NNWM 2009";
-layerinfo "redist_uniq" = "tranquilityiii/nnwm2009";
+layerinfo type = "theme";
+layerinfo name = "NNWM 2009";
+layerinfo redist_uniq = "tranquilityiii/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: tranquilityiii/olive
@@ -378,7 +376,7 @@ layerinfo redist_uniq = "tranquilityiii/
 layerinfo redist_uniq = "tranquilityiii/olive";
 layerinfo author_name = "dancing_serpent";
 
-set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" }];
+set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
 
 ##===============================
 ## Page Colors
@@ -386,53 +384,48 @@ set layout_authors = [ { "name" => "danc
 
 set color_page_background = "#666333";
 set color_page_border = "#666333";
-set color_page_text = "#000000";
-set color_page_link = "#cc6600";
-set color_page_link_active = "#cc6600";
-set color_page_link_hover = "#ff9933";
-set color_page_link_visited = "#cc6600";
-
-set color_header_background = "#cccc99";
-set color_page_title = "#000000";
-
-set color_footer_background = "#cccc99";
+set color_page_link = "#c60";
+set color_page_link_active = "#c60";
+set color_page_link_hover = "#f93";
+set color_page_link_visited = "#c60";
+set color_page_text = "#000";
+set color_page_title = "#000";
+set color_header_background = "#cc9";
+set color_footer_background = "#cc9";
 set color_footer_link = "#666333";
 set color_footer_link_active = "#666333";
-set color_footer_link_hover = "#999900";
+set color_footer_link_hover = "#990";
 set color_footer_link_visited = "#666333";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#ffffff";
-set color_entry_border = "#cc6600";
-set color_entry_text = "#000000";
+set color_entry_background = "#fff";
+set color_entry_border = "#c60";
+set color_entry_interaction_links = "#c60";
 set color_entry_link = "#666333";
 set color_entry_link_active = "#666333";
-set color_entry_link_hover = "#999900";
+set color_entry_link_hover = "#990";
 set color_entry_link_visited = "#666333";
-set color_entry_interaction_links = "#cc6600";
-
-set color_entry_title_background = "#cccc99";
-set color_entry_title = "#000000";
-
-set color_comment_title_background = "#cccc99";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
+set color_entry_title_background = "#cc9";
+set color_comment_title_background = "#cc9";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#cccc99";
-set color_module_border = "#cccc99";
-set color_module_text = "#000000";
+set color_module_background = "#cc9";
+set color_module_border = "#cc9";
 set color_module_link = "#666333";
 set color_module_link_active = "#666333";
-set color_module_link_hover = "#999900";
+set color_module_link_hover = "#990";
 set color_module_link_visited = "#666333";
-
-set color_module_title_background = "#cccc99";
-set color_module_title = "#000000";
+set color_module_text = "#000";
+set color_module_title = "#000";
+set color_module_title_background = "#cc9";
 
 
 #NEWLAYER: tranquilityiii/seadeep
@@ -474,10 +467,10 @@ set color_module_background = "#aadbc2";
 ##===============================
 
 set font_base = "Trebuchet MS, Arial";
+set font_entry_title = "Trebuchet MS, Arial";
 set font_journal_title = "Trebuchet MS";
 set font_journal_title_size = "2.5";
 set font_journal_title_units = "em";
-set font_entry_title = "Trebuchet MS, Arial";
 set font_module_heading = "Trebuchet MS, Arial";
 
 function Page::print_theme_stylesheet() {
@@ -499,7 +492,7 @@ layerinfo redist_uniq = "tranquilityiii/
 layerinfo redist_uniq = "tranquilityiii/shallows";
 layerinfo author_name = "dancing_serpent";
 
-set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" }];
+set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
 
 ##===============================
 ## Page Colors
@@ -507,15 +500,13 @@ set layout_authors = [ { "name" => "danc
 
 set color_page_background = "#556b80";
 set color_page_border = "#556b80";
-set color_page_text = "#000000";
 set color_page_link = "#0a566c";
 set color_page_link_active = "#0a566c";
 set color_page_link_hover = "#6ab1b2";
 set color_page_link_visited = "#0a566c";
-
-set color_page_title = "#000000";
+set color_page_text = "#000";
+set color_page_title = "#000";
 set color_header_background = "#6ab1b2";
-
 set color_footer_background = "#6ab1b2";
 set color_footer_link = "#effeff";
 set color_footer_link_active = "#effeff";
@@ -528,16 +519,14 @@ set color_footer_link_visited = "#effeff
 
 set color_entry_background = "#effeff";
 set color_entry_border = "#effeff";
-set color_entry_text = "#000000";
+set color_entry_interaction_links = "#0a566c";
 set color_entry_link = "#0a566c";
 set color_entry_link_active = "#0a566c";
 set color_entry_link_hover = "#6ab1b2";
 set color_entry_link_visited = "#0a566c";
-set color_entry_interaction_links = "#0a566c";
-
+set color_entry_text = "#000";
+set color_entry_title = "#000";
 set color_entry_title_background = "#effeff";
-set color_entry_title = "#000000";
-
 set color_comment_title_background = "#effeff";
 
 ##===============================
@@ -546,13 +535,12 @@ set color_comment_title_background = "#e
 
 set color_module_background = "#6ab1b2";
 set color_module_border = "#6ab1b2";
-set color_module_text = "#000000";
 set color_module_link = "#effeff";
 set color_module_link_active = "#effeff";
 set color_module_link_hover = "#0a566c";
 set color_module_link_visited = "#effeff";
-
-set color_module_title = "#000000";
+set color_module_text = "#000";
+set color_module_title = "#000";
 set color_module_title_background = "#6ab1b2";
 
 
@@ -628,37 +616,51 @@ layerinfo author_name = "dancing_serpent
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#0a440e";
+set color_page_border = "#f2fff2";
+set color_page_link = "#688052";
+set color_page_link_active = "#688052";
+set color_page_link_hover = "#6ab23b";
+set color_page_link_visited = "#688052";
+set color_page_text = "#0d1402";
+set color_page_title = "#0d1402";
+set color_header_background = "#b4cea1";
+set color_footer_background = "#f2fff2";
+set color_footer_link = "#688052";
+set color_footer_link_active = "#688052";
 set color_footer_link_hover = "#6ab23b";
-set color_page_link_active = "#688052";
-set color_page_link = "#688052";
+set color_footer_link_visited = "#688052";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#f2fff2";
+set color_entry_border = "#0a440e";
+set color_entry_interaction_links = "#688052";
+set color_entry_link = "#688052";
+set color_entry_link_active = "#688052";
+set color_entry_link_hover = "#6ab23b";
+set color_entry_link_visited = "#688052";
+set color_entry_text = "#0d1402";
+set color_entry_title = "#0d1402";
+set color_entry_title_background = "#f2fff2";
+set color_comment_title_background = "#f2fff2";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#b4cea1";
+set color_module_border = "#b4cea1";
+set color_module_link = "#f2fff2";
+set color_module_link_active = "#f2fff2";
 set color_module_link_hover = "#6ab23b";
-set color_module_background = "#b4cea1";
-set color_entry_border = "#0a440e";
-set color_entry_text = "#0d1402";
+set color_module_link_visited = "#f2fff2";
+set color_module_text = "#0d1402";
 set color_module_title = "#0d1402";
-set color_page_text = "#0d1402";
-set color_footer_background = "#f2fff2";
-set color_header_background = "#b4cea1";
-set color_page_border = "#f2fff2";
-set color_entry_interaction_links = "#688052";
-set color_comment_title_background = "#f2fff2";
-set color_page_background = "#0a440e";
 set color_module_title_background = "#b4cea1";
-set color_entry_link_hover = "#6ab23b";
-set color_page_title = "#0d1402";
-set color_footer_link_active = "#688052";
-set color_footer_link_visited = "#688052";
-set color_module_border = "#b4cea1";
-set color_entry_link = "#688052";
-set color_module_link = "#f2fff2";
-set color_entry_link_visited = "#688052";
-set color_module_link_visited = "#f2fff2";
-set color_entry_title = "#0d1402";
-set color_page_link_visited = "#688052";
-set color_entry_title_background = "#f2fff2";
-set color_page_link_hover = "#6ab23b";
-set color_entry_link_active = "#688052";
-set color_module_link_active = "#f2fff2";
-set color_module_text = "#0d1402";
-set color_entry_background = "#f2fff2";
-set color_footer_link = "#688052";
--------------------------------------------------------------------------------