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

[fu]

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

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

Clean up code for Refried Tablet and Skittlish Dreams themes.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/refriedtablet/themes.s2
• bin/upgrading/s2layers/skittlishdreams/themes.s2

--------------------------------------------------------------------------------
diff -r e5e0d76a8428 -r 681da980bc8e bin/upgrading/s2layers/refriedtablet/themes.s2
--- a/bin/upgrading/s2layers/refriedtablet/themes.s2	Wed Sep 08 12:28:26 2010 +0800
+++ b/bin/upgrading/s2layers/refriedtablet/themes.s2	Wed Sep 08 13:17:16 2010 +0800
@@ -4,24 +4,36 @@ layerinfo redist_uniq = "refriedtablet/a
 layerinfo redist_uniq = "refriedtablet/autumnnight";
 layerinfo author_name = "zvi";
 
-set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
+##===============================
+## Page Colors
+##===============================
 
-set color_comment_title_background = "#e97021";
-set color_entry_background = "#000030";
-set color_entry_background_nsfw = "#e3394f";
-set color_entry_text = "#ffffff";
-set color_entry_text_nsfw = "#ffe6d2";
-set color_entry_title = "#e97021";
-set color_footer_background = "#c4c9cf";
-set color_footer_link = "#000030";
-set color_header_background = "#bd4511";
-set color_module_border = "#c4c9cf";
 set color_page_background = "#000030";
 set color_page_border = "#ffd4a6";
 set color_page_link = "#ffd4a6";
 set color_page_link_visited = "#c4c9cf";
 set color_page_text = "#c4c9cf";
 set color_page_title = "#8a9fb4";
+set color_header_background = "#bd4511";
+set color_footer_background = "#c4c9cf";
+set color_footer_link = "#000030";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000030";
+set color_entry_background_nsfw = "#e3394f";
+set color_entry_text = "#fff";
+set color_entry_text_nsfw = "#ffe6d2";
+set color_entry_title = "#e97021";
+set color_comment_title_background = "#e97021";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#c4c9cf";
 
 
 #NEWLAYER: refriedtablet/bluetuesday
@@ -32,37 +44,48 @@ layerinfo author_name = "forthwritten";
 
 set layout_authors = [ { "name" => "forthwritten", "type" => "user" } ];
 
-set color_page_border = "#666666";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_border = "#666";
 set color_page_link = "#67A995";
 set color_page_link_active = "#6EC5DB";
 set color_page_link_hover = "#6ec5db";
 set color_page_link_visited = "#3a72ad";
 set color_page_text = "#3A72AD";
+set color_page_title = "#000";
+set color_header_background = "#3A72AD";
+set color_footer_background = "#3a72ad";
+set color_footer_link = "#fff";
+set color_footer_link_visited = "#fff";
 
-set color_page_title = "#000000";
-set color_header_background = "#3A72AD";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_border = "#000000";
-set color_module_text = "#666666";
-set color_module_title = "#333333";
-set color_module_title_background = "#cccccc";
-
-set color_entry_background = "#ffffff";
-set color_entry_border = "#666666";
-set color_entry_text = "#333333";
-set color_entry_text_nsfw = "#cc3333";
-set color_entry_title = "#336699";
+set color_entry_background = "#fff";
+set color_entry_border = "#666";
+set color_entry_text = "#333";
+set color_entry_text_nsfw = "#c33";
+set color_entry_title = "#369";
 set color_comment_background_frozen = "#D7E4FF";
 set color_comment_background_screened = "#CAD2ED";
 
-set color_footer_background = "#3a72ad";
-set color_footer_link = "#ffffff";
-set color_footer_link_visited = "#ffffff";
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#000";
+set color_module_text = "#666";
+set color_module_title = "#333";
+set color_module_title_background = "#ccc";
 
 function Page::print_theme_stylesheet() {
-
     """
-    h2#pagetitle { color: $*color_page_title; }
+    h2#pagetitle {
+        color: $*color_page_title;
+        }
     """;
 }
 
@@ -73,25 +96,9 @@ layerinfo redist_uniq = "refriedtablet/c
 layerinfo redist_uniq = "refriedtablet/californiaroll";
 layerinfo author_name = "zvi";
 
-set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
-
-set color_comment_background_frozen = "#333333";
-set color_comment_background_screened = "#000000";
-set color_comment_text_frozen = "#f7f7f7";
-set color_comment_text_screened = "#ffffff";
-
-set color_entry_background_nsfw = "#ac020d";
-set color_entry_text_nsfw = "#d7c8a9";
-
-set color_entry_interaction_links = "#326105";
-set color_entry_title = "#326105";
-
-set color_footer_background = "#e5d4ba";
-set color_header_background = "#a0a348";
-
-set color_module_background = "#e7c655";
-set color_module_border = "#292701";
-set color_module_text = "#ec6e08";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#bdaf72";
 set color_page_border = "#28040e";
@@ -101,6 +108,29 @@ set color_page_link_visited = "#542303";
 set color_page_link_visited = "#542303";
 set color_page_text = "#142900";
 set color_page_title = "#112b22";
+set color_header_background = "#a0a348";
+set color_footer_background = "#e5d4ba";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background_nsfw = "#ac020d";
+set color_entry_interaction_links = "#326105";
+set color_entry_text_nsfw = "#d7c8a9";
+set color_entry_title = "#326105";
+set color_comment_background_frozen = "#333";
+set color_comment_background_screened = "#000";
+set color_comment_text_frozen = "#f7f7f7";
+set color_comment_text_screened = "#fff";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#e7c655";
+set color_module_border = "#292701";
+set color_module_text = "#ec6e08";
 
 
 #NEWLAYER: refriedtablet/cherryicing
@@ -109,25 +139,82 @@ layerinfo redist_uniq = "refriedtablet/c
 layerinfo redist_uniq = "refriedtablet/cherryicing";
 layerinfo author_name = "zvi";
 
-set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
+##===============================
+## Page Colors
+##===============================
 
-set color_comment_title_background = "#f7f7f7";
-set color_entry_background = "#f7f7f7";
-set color_entry_background_nsfw = "#855a65";
-set color_entry_border = "#397300";
-set color_entry_interaction_links = "#730000";
-set color_entry_text = "#000000";
-set color_entry_text_nsfw = "#f7f7f7";
-set color_entry_title = "#730000";
-set color_header_background = "#730000";
-set color_module_border = "#397300";
-set color_module_title = "#730000";
 set color_page_background = "#f7f7f7";
 set color_page_border = "#5a6584";
 set color_page_link = "#007373";
 set color_page_link_visited = "#390073";
 set color_page_text = "#a2a2a2";
 set color_page_title = "#f7f7f7";
+set color_header_background = "#730000";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#f7f7f7";
+set color_entry_background_nsfw = "#855a65";
+set color_entry_border = "#397300";
+set color_entry_interaction_links = "#730000";
+set color_entry_text = "#000";
+set color_entry_text_nsfw = "#f7f7f7";
+set color_entry_title = "#730000";
+set color_comment_title_background = "#f7f7f7";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#397300";
+set color_module_title = "#730000";
+
+
+#NEWLAYER: refriedtablet/refriedclassic
+layerinfo type = "theme";
+layerinfo name = "Classic";
+layerinfo redist_uniq = "refriedtablet/refriedclassic";
+layerinfo author_name = "zvi";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#fff";
+set color_page_border = "#666";
+set color_page_link = "#c63";
+set color_page_link_active = "#f96";
+set color_page_link_hover = "#39c";
+set color_page_link_visited = "#63c";
+set color_page_text = "#996";
+set color_page_title = "#666";
+set color_header_background = "#cc9";
+set color_footer_background = "#555";
+set color_footer_link = "#FFD4BD";
+set color_footer_link_visited = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background ="#fff";
+set color_entry_border = "#000";
+set color_entry_text = "#666";
+set color_entry_text_nsfw = "#c33";
+set color_entry_title = "#369";
+set color_comment_background_screened = "#ecf7ff";
+set color_comment_background_frozen = "#F5F5F5";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#000";
+set color_module_text = "#666";
+set color_module_title = "#333";
+set color_module_title_background = "#ccc";
 
 
 #NEWLAYER: refriedtablet/foliage
@@ -138,6 +225,10 @@ layerinfo author_name = "dancing_serpent
 
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#E2FFE4";
 set color_page_border = "#4B6B47";
 set color_page_link = "#0C4C0B";
@@ -145,19 +236,17 @@ set color_page_link_hover = "#6F914C";
 set color_page_link_hover = "#6F914C";
 set color_page_link_visited = "#0C4C0B";
 set color_page_text = "#2D1800";
+set color_page_title = "#E2FFE4";
+set color_header_background = "#6F914C";
+set color_footer_background = "#4B6B47";
+set color_footer_link = "#6F914C";
+set color_footer_link_active = "#0C4C0B";
+set color_footer_link_hover = "#0C4C0B";
+set color_footer_link_visited = "#6F914C";
 
-set color_header_background = "#6F914C";
-set color_page_title = "#E2FFE4";
-
-set color_module_background = "#E2FFE4";
-set color_module_border = "#4B6B47";
-set color_module_link = "#0C4C0B";
-set color_module_link_active = "#6F914C";
-set color_module_link_hover = "#6F914C";
-set color_module_link_visited = "#0C4C0B";
-set color_module_text = "#2D1800";
-set color_module_title = "#2D1800";
-set color_module_title_background = "#4B6B47";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#E2FFE4";
 set color_entry_border = "#4B6B47";
@@ -171,151 +260,77 @@ set color_entry_title_background = "#E2F
 set color_entry_title_background = "#E2FFE4";
 set color_comment_title_background = "#C4DEC5";
 
-set color_footer_background = "#4B6B47";
-set color_footer_link = "#6F914C";
-set color_footer_link_active = "#0C4C0B";
-set color_footer_link_hover = "#0C4C0B";
-set color_footer_link_visited = "#6F914C";
+##===============================
+## Module Colors
+##===============================
 
-
-#NEWLAYER: refriedtablet/refriedclassic
-layerinfo type = "theme";
-layerinfo name = "Refried Classic";
-layerinfo redist_uniq = "refriedtablet/refriedclassic";
-layerinfo author_name = "zvi";
-set layout_authors = [ { "name" => "Aaron B. Russell", "url" => "http://lostentropy.com/" }, { "name" => "zvi", "type" => "user" } ];
-
-set color_page_background = "#ffffff";
-
-set color_page_link = "#CC6633";
-set color_page_link_active = "#FF9966";
-set color_page_link_hover = "#3399CC";
-set color_page_link_visited = "#6633CC";
-
-set color_page_title = "#666666";
-set color_header_background = "#CCCC99";
-
-set color_module_title = "#333333";
-set color_module_title_background = "#CCCCCC";
-set color_module_border = "#000000";
-set color_module_text = "#666666";
-
-set color_entry_title = "#336699";
-set color_entry_text = "#666666";
-#also using for top of #header
-set color_entry_background ="#ffffff";
-set color_entry_text_nsfw = "#c33";
-set color_comment_background_screened = "#ecf7ff";
-set color_comment_background_frozen = "#F5F5F5";
-
-set color_footer_background = "#555555";
-set color_footer_link = "#FFD4BD";
-set color_footer_link_visited = "#ffffff";
-
-# border above #canvas
-set color_page_border = "#666666";
-
-# using for #header's bottom border, as well as the separation between comments
-set color_entry_border = "#000000";
-
-# using for h2#pagetitle's text color, will set entry and module colors separately
-set color_page_text = "#999966";
+set color_module_background = "#E2FFE4";
+set color_module_border = "#4B6B47";
+set color_module_link = "#0C4C0B";
+set color_module_link_active = "#6F914C";
+set color_module_link_hover = "#6F914C";
+set color_module_link_visited = "#0C4C0B";
+set color_module_text = "#2D1800";
+set color_module_title = "#2D1800";
+set color_module_title_background = "#4B6B47";
 
 
 #NEWLAYER: refriedtablet/refriedjewels
 layerinfo type = "theme";
-layerinfo name = "Refried Jewels";
+layerinfo name = "Jewels";
 layerinfo redist_uniq = "refriedtablet/refriedjewels";
 layerinfo author_name = "dancing_serpent";
- 
+
 set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e9faee";
 set color_page_border = "#886c9d";
 set color_page_link = "#ad5176";
-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 = "#ad5176";
 set color_page_text = "#363636";
+set color_page_title = "#363636";
+set color_header_background = "#a3a68a";
+set color_footer_background = "#a3a68a";
+set color_footer_link = "#ad5176";
+set color_footer_link_active = "#f96";
+set color_footer_link_hover = "#f96";
+set color_footer_link_visited = "#ad5176";
 
-set color_header_background = "#a3a68a";
-set color_page_title = "#363636";
-
-set color_module_background = "#e9faee";
-set color_module_border = "#886c9d";
-set color_module_link = "#ad5176";
-set color_module_link_active = "#ff9966";
-set color_module_link_hover = "#ff9966";
-set color_module_link_visited = "#ad5176";
-set color_module_text = "#363636";
-set color_module_title = "#363636";
-set color_module_title_background = "#a3a68a";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#e9faee";
 set color_entry_border = "#886c9d";
 set color_entry_interaction_links = "#ad5176";
 set color_entry_link = "#ad5176";
-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 = "#ad5176";
 set color_entry_text = "#363636";
 set color_entry_title = "#363636";
 set color_entry_title_background = "#e9faee";
 set color_comment_title_background = "#a3a68a";
 
-set color_footer_background = "#a3a68a";
-set color_footer_link = "#ad5176";
-set color_footer_link_active = "#ff9966";
-set color_footer_link_hover = "#ff9966";
-set color_footer_link_visited = "#ad5176";
+##===============================
+## Module Colors
+##===============================
 
-
-#NEWLAYER: refriedtablet/refriedshallows
-layerinfo type = "theme";
-layerinfo name = "Refried Shallows";
-layerinfo redist_uniq = "refriedtablet/refriedshallows";
-layerinfo author_name = "dancing_serpent";
-
-set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
-
-set color_page_background = "#effeff";
-set color_page_border = "#556b80";
-set color_page_link = "#0a566c";
-set color_page_link_active = "#6ab1b2";
-set color_page_link_hover = "#6ab1b2";
-set color_page_link_visited = "#0a566c";
-set color_page_text = "#000000";
-
-set color_header_background = "#6ab1b2";
-set color_page_title = "#effeff";
-
-set color_module_background = "#effeff";
-set color_module_border = "#556b80";
-set color_module_link = "#0a566c";
-set color_module_link_active = "#6ab1b2";
-set color_module_link_hover = "#6ab1b2";
-set color_module_link_visited = "#0a566c";
-set color_module_text = "#000000";
-set color_module_title = "#000000";
-set color_module_title_background = "#556b80";
-
-set color_entry_background = "#effeff";
-set color_entry_border = "#556b80";
-set color_entry_interaction_links = "#0a566c";
-set color_entry_link = "#0a566c";
-set color_entry_link_active = "#6ab1b2";
-set color_entry_link_hover = "#6ab1b2";
-set color_entry_link_visited = "#0a566c";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
-set color_entry_title_background = "#effeff";
-set color_comment_title_background = "#b4cccf";
-
-set color_footer_background = "#556b80";
-set color_footer_link = "#b4cccf";
-set color_footer_link_active = "#0a566c";
-set color_footer_link_hover = "#0a566c";
-set color_footer_link_visited = "#b4cccf";
+set color_module_background = "#e9faee";
+set color_module_border = "#886c9d";
+set color_module_link = "#ad5176";
+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 = "#363636";
+set color_module_title_background = "#a3a68a";
 
 
 #NEWLAYER: refriedtablet/seeded
@@ -324,31 +339,39 @@ layerinfo redist_uniq = "refriedtablet/s
 layerinfo redist_uniq = "refriedtablet/seeded";
 layerinfo author_name = "zvi";
 
-set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
+##===============================
+## Page Colors
+##===============================
 
-################
-#Comment Colors
-################
+set color_page_background = "#f5f9c4";
+set color_page_border = "#054976";
+set color_page_link = "#6b8d38";
+set color_page_link_active = "#d3e217";
+set color_page_link_hover = "#781498";
+set color_page_link_visited = "#813357";
+set color_page_text = "#0b1e39";
+set color_page_title = "#08335b";
+set color_header_background = "#e3e6b5";
+set color_footer_background = "#e3e6b5";
 
-set color_comment_background_frozen = "#e3e6b5";
-set color_comment_background_screened = "#e3e6b5";
-set color_comment_text_frozen = "#888888";
-set color_comment_text_screened = "#888888";
-set color_comment_title_background = "#f5f9c4";
-
-################
-#Entry Colors
-################
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#f5f9c4";
 set color_entry_background_nsfw = "#d3e217";
 set color_entry_text = "#0b1e39";
-set color_entry_text_nsfw = "#000000";
+set color_entry_text_nsfw = "#000";
 set color_entry_title = "#054976";
+set color_comment_background_frozen = "#e3e6b5";
+set color_comment_background_screened = "#e3e6b5";
+set color_comment_text_frozen = "#888";
+set color_comment_text_screened = "#888";
+set color_comment_title_background = "#f5f9c4";
 
-################
-#Module Colors
-################
+##===============================
+## Module Colors
+##===============================
 
 set color_module_background = "#e3e6b5";
 set color_module_border = "#054976";
@@ -359,49 +382,88 @@ set color_module_title = "#e3e6b5";
 set color_module_title = "#e3e6b5";
 set color_module_title_background = "#054976";
 
-################
-#Page Colors
-################
+function Page::print_theme_stylesheet() {
+    """
+    .two-columns-left #tertiary .module, .two-columns-right #tertiary .module {
+        background-color: $*color_entry_background;
+        color: $*color_entry_text;
+        }
 
-set color_footer_background = "#e3e6b5";
-set color_header_background = "#e3e6b5";
-set color_page_background = "#f5f9c4";
-set color_page_border = "#054976";
-set color_page_link = "#6b8d38";
-set color_page_link_active = "#d3e217";
-set color_page_link_hover = "#781498";
-set color_page_link_visited = "#813357";
-set color_page_text = "#0b1e39";
-set color_page_title = "#08335b";
+    .two-columns-left #tertiary .module, .two-columns-right #tertiary .module a {
+        color: $*color_entry_link;
+        }
 
-function Page::print_theme_stylesheet() {
+    .two-columns-left #tertiary .module, .two-columns-right #tertiary .module a:hover {
+        color: $*color_entry_link_hover;
+        }
 
-"""
+    .two-columns-left #tertiary .module, .two-columns-right #tertiary .module a:active {
+        color: $*color_entry_link_active;
+        }
 
-.two-columns-left #tertiary .module, .two-columns-right #tertiary .module {
-    color: $*color_entry_text;
-    background-color: $*color_entry_background;
+    .two-columns-left #tertiary .module, .two-columns-right #tertiary .module a:visited {
+        color: $*color_entry_link_visited;
+        }
+    """;
 }
 
 
-.two-columns-left #tertiary .module, .two-columns-right #tertiary .module a {
-    color: $*color_entry_link;
-}
+#NEWLAYER: refriedtablet/refriedshallows
+layerinfo type = "theme";
+layerinfo name = "Shallows";
+layerinfo redist_uniq = "refriedtablet/refriedshallows";
+layerinfo author_name = "dancing_serpent";
 
-.two-columns-left #tertiary .module, .two-columns-right #tertiary .module a:hover {
-    color: $*color_entry_link_hover;
-}
+set layout_authors = [ { "name" => "dancing_serpent", "type" => "user" } ];
 
-.two-columns-left #tertiary .module, .two-columns-right #tertiary .module a:active {
-    color: $*color_entry_link_active;
-}
+##===============================
+## Page Colors
+##===============================
 
-.two-columns-left #tertiary .module, .two-columns-right #tertiary .module a:visited {
-    color: $*color_entry_link_visited;
-}
+set color_page_background = "#effeff";
+set color_page_border = "#556b80";
+set color_page_link = "#0a566c";
+set color_page_link_active = "#6ab1b2";
+set color_page_link_hover = "#6ab1b2";
+set color_page_link_visited = "#0a566c";
+set color_page_text = "#000";
+set color_page_title = "#effeff";
+set color_header_background = "#6ab1b2";
+set color_footer_background = "#556b80";
+set color_footer_link = "#b4cccf";
+set color_footer_link_active = "#0a566c";
+set color_footer_link_hover = "#0a566c";
+set color_footer_link_visited = "#b4cccf";
 
-""";
-}
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#effeff";
+set color_entry_border = "#556b80";
+set color_entry_interaction_links = "#0a566c";
+set color_entry_link = "#0a566c";
+set color_entry_link_active = "#6ab1b2";
+set color_entry_link_hover = "#6ab1b2";
+set color_entry_link_visited = "#0a566c";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
+set color_entry_title_background = "#effeff";
+set color_comment_title_background = "#b4cccf";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#effeff";
+set color_module_border = "#556b80";
+set color_module_link = "#0a566c";
+set color_module_link_active = "#6ab1b2";
+set color_module_link_hover = "#6ab1b2";
+set color_module_link_visited = "#0a566c";
+set color_module_text = "#000";
+set color_module_title = "#000";
+set color_module_title_background = "#556b80";
 
 
 #NEWLAYER: refriedtablet/teals
@@ -412,18 +474,23 @@ layerinfo author_name = "edgeraven";
 
 set layout_authors = [ { "name" => "edgeraven", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#fdfdfd";
 set color_page_border = "#55e4ba";
 set color_page_link = "#3d79c0";
 set color_page_link_hover = "#f7a21b";
 set color_page_link_visited = "#0f417c";
-
 set color_page_title = "#fdfdfd";
 set color_header_background = "#097c5d";
+set color_footer_link = "#f7a21b";
+set color_footer_link_hover = "#f7a21b";
 
-set color_module_border = "#fdfdfd";
-set color_module_link_hover = "#f7a21b";
-set color_module_title = "#097c5d";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#fdfdfd";
 set color_entry_border = "#55e4ba";
@@ -435,13 +502,18 @@ set color_comment_text_screened = "#5656
 set color_comment_text_screened = "#565656";
 set color_comment_title_background = "#fdfdfd";
 
-set color_footer_link = "#f7a21b";
-set color_footer_link_hover = "#f7a21b";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_border = "#fdfdfd";
+set color_module_link_hover = "#f7a21b";
+set color_module_title = "#097c5d";
 
 function Page::print_theme_stylesheet() {
-
     """
-    h2#pagetitle { color: $*color_page_title; }
+    h2#pagetitle {
+        color: $*color_page_title;
+        }
     """;
 }
diff -r e5e0d76a8428 -r 681da980bc8e bin/upgrading/s2layers/skittlishdreams/themes.s2
--- a/bin/upgrading/s2layers/skittlishdreams/themes.s2	Wed Sep 08 12:28:26 2010 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/themes.s2	Wed Sep 08 13:17:16 2010 +0800
@@ -6,46 +6,68 @@ layerinfo author_name = "Sarken";
 
 set layout_authors = [ { "name" => "sarken", "type" => "user" } ];
 
-set image_background_page_url = " ";
-set image_background_header_url = "skittlishdreams/academy_bg.gif";
-set image_background_container_url = "skittlishdreams/academy_shaddow.gif";
-set image_background_footer_url = "skittlishdreams/academy_bgb.gif";
-set image_background_module_url = "skittlishdreams/academy_box.gif";
-set image_background_entry_url = "skittlishdreams/academy_edge.gif";
-set image_background_navigation_url = "skittlishdreams/academy_circle.gif";
+##===============================
+## Page Colors
+##===============================
 
-set image_background_header_height = 120;
+set color_page_background = "#063235";
+set color_page_border = "#f2f2f2";
+set color_page_details_text = "#bbb";
+set color_page_link = "#119aa3";
+set color_page_link_hover = "#aaa";
+set color_page_link_visited = "#b9a62a";
+set color_page_text = "#555";
+set color_page_title = "#fff";
+set color_header_background = "#cab72d";
+set color_footer_background = "#e1cc33";
+set color_footer_link = "#fff";
 
-set color_entry_metadata_text = "#bbbbbb";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_metadata_text = "#bbb";
 set color_entry_text = "#0d0d0d";
-set color_entry_background = "#ffffff";
 set color_entry_title = "#f2f2f2";
 set color_entry_title_border = "#063235";
 set color_entry_title_border_alt = "#063235";
 set color_entry_title_background = "#063235";
-set color_footer_background = "#e1cc33";
-set color_footer_link = "#ffffff";
-set color_header_background = "#cab72d";
+
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#f2f2f2";
+set color_module_link = "#444";
 set color_module_text = "#848484";
-set color_module_link = "#444444";
-set color_module_title = "#444444";
-set color_page_background = "#063235";
-set color_page_border = "#f2f2f2";
-set color_page_details_text = "#bbbbbb";
-set color_page_link = "#119aa3";
-set color_page_link_hover = "#aaaaaa";
-set color_page_link_visited = "#b9a62a";
-set color_page_text = "#555555";
-set color_page_title = "#ffffff";
+set color_module_title = "#444";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/academy_shaddow.gif";
+set image_background_entry_url = "skittlishdreams/academy_edge.gif";
+set image_background_footer_url = "skittlishdreams/academy_bgb.gif";
+set image_background_header_height = 120;
+set image_background_header_url = "skittlishdreams/academy_bg.gif";
+set image_background_module_url = "skittlishdreams/academy_box.gif";
+set image_background_navigation_url = "skittlishdreams/academy_circle.gif";
 
 function print_stylesheet () {
+    """
+    .entry-title, .entry-title a {
+        color: $*color_entry_title;
+        }
 
-"""
-.entry-title, .entry-title a { color: $*color_entry_title;}
-.entry .userpic a, .comment .userpic a, .entry, .comment, .text_noentries_day { border-color: $*color_header_background; }
-""";
+    .entry .userpic a, .comment .userpic a,
+    .entry, .comment, .text_noentries_day {
+        border-color: $*color_header_background;
+        }
+    """;
 }
+
 
 #NEWLAYER: skittlishdreams/blue
 layerinfo type = "theme";
@@ -53,45 +75,56 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/blue";
 layerinfo author_name = "Kaigou";
 
-## theme color: #0870C9
-
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/blue_box.gif";
-set image_background_entry_url = "skittlishdreams/blue_edge.gif";
-set image_background_navigation_url = "skittlishdreams/blue_circle.gif";
-
-set color_page_border = "#0870C9";
-set color_page_link = "#0870C9";
-set color_page_link_visited = "#0870C9";
-set color_module_background = "#0870C9";
-set color_entry_title = "#0870C9";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e3e3e3";
-
+set color_page_border = "#0870C9";
+set color_page_details_text = "#888";
+set color_page_link = "#0870C9";
+set color_page_link_hover = "#16E";
+set color_page_link_visited = "#0870C9";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#0870C9";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#0870C9";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/blue_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/blue_box.gif";
+set image_background_navigation_url = "skittlishdreams/blue_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
+
 
 #NEWLAYER: skittlishdreams/cyan
 layerinfo type = "theme";
@@ -99,45 +132,56 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/cyan";
 layerinfo author_name = "Kaigou";
 
-## theme color: #1088F7
-
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/cyan_box.gif";
-set image_background_entry_url = "skittlishdreams/cyan_edge.gif";
-set image_background_navigation_url = "skittlishdreams/cyan_circle.gif";
-
-set color_page_border = "#1088F7";
-set color_page_link = "#1088F7";
-set color_page_link_visited = "#1088F7";
-set color_module_background = "#1088F7";
-set color_entry_title = "#1088F7";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e3e3e3";
-
+set color_page_border = "#1088F7";
+set color_page_details_text = "#888";
+set color_page_link = "#1088F7";
+set color_page_link_hover = "#16E";
+set color_page_link_visited = "#1088F7";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#1088F7";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#1088F7";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/cyan_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/cyan_box.gif";
+set image_background_navigation_url = "skittlishdreams/cyan_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
+
 
 #NEWLAYER: skittlishdreams/desertcream
 layerinfo type = "theme";
@@ -147,44 +191,62 @@ layerinfo author_name = "Sarken";
 
 set layout_authors = [ { "name" => "sarken", "type" => "user" } ];
 
-set image_background_page_url = " ";
-set image_background_header_url = "skittlishdreams/desertcream_bg.gif";
-set image_background_container_url = "skittlishdreams/desertcream_shaddow.gif";
-set image_background_footer_url = "skittlishdreams/desertcream_bgb.gif";
-set image_background_module_url = "skittlishdreams/desertcream_box.gif";
-set image_background_entry_url = "skittlishdreams/desertcream_edge.gif";
-set image_background_navigation_url = "skittlishdreams/desertcream_circle.gif";
+##===============================
+## Page Colors
+##===============================
 
-set image_background_header_height = 120;
-
-set color_entry_metadata_text = "#BFBDB0";
-set color_entry_text = "#555555";
-set color_entry_background = "#ffffff";
-set color_entry_title = "#C7B560";
-set color_entry_title_border = "#eeeeee";
-set color_entry_title_border_alt = "#eeeeee";
-set color_footer_background = "#A7BD9B";
-set color_footer_link = "#efefef";
-set color_header_background = "#92A588";
-set color_module_background = "#BDD2B1";
-set color_module_text = "#777777";
-set color_module_link = "#ffffff";
-set color_module_title = "#ffffff";
 set color_page_background = "#EDEADA";
 set color_page_border = "#BDD2B1";
-set color_page_details_text = "#bbbbbb";
+set color_page_details_text = "#bbb";
 set color_page_link = "#8EB37A";
 set color_page_link_hover = "#C7B560";
 set color_page_link_visited = "#AD9625";
-set color_page_text = "#555555";
-set color_page_title = "#ffffff";
+set color_page_text = "#555";
+set color_page_title = "#fff";
+set color_header_background = "#92A588";
+set color_footer_background = "#A7BD9B";
+set color_footer_link = "#efefef";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_metadata_text = "#BFBDB0";
+set color_entry_text = "#555";
+set color_entry_title = "#C7B560";
+set color_entry_title_border = "#eee";
+set color_entry_title_border_alt = "#eee";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#BDD2B1";
+set color_module_link = "#fff";
+set color_module_text = "#777";
+set color_module_title = "#fff";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/desertcream_shaddow.gif";
+set image_background_entry_url = "skittlishdreams/desertcream_edge.gif";
+set image_background_footer_url = "skittlishdreams/desertcream_bgb.gif";
+set image_background_header_height = 120;
+set image_background_header_url = "skittlishdreams/desertcream_bg.gif";
+set image_background_module_url = "skittlishdreams/desertcream_box.gif";
+set image_background_navigation_url = "skittlishdreams/desertcream_circle.gif";
 
 function print_stylesheet () {
+    """
+    .entry-title, .entry-title a {
+        color: $*color_entry_title;
+        }
+    """;
+}
 
-"""
-.entry-title, .entry-title a { color: $*color_entry_title;}
-""";
-}
 
 #NEWLAYER: skittlishdreams/green
 layerinfo type = "theme";
@@ -192,45 +254,57 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/green";
 layerinfo author_name = "Kaigou";
 
-## theme color: #61AC00
-
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/green_box.gif";
-set image_background_entry_url = "skittlishdreams/green_edge.gif";
-set image_background_navigation_url = "skittlishdreams/green_circle.gif";
-
-set color_page_border = "#61AC00";
-set color_page_link = "#61AC00";
-set color_page_link_visited = "#61AC00";
-set color_module_background = "#61AC00";
-set color_entry_title = "#61AC00";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e3e3e3";
-
+set color_page_border = "#61AC00";
+set color_page_details_text = "#888";
+set color_page_link = "#61AC00";
+set color_page_link_hover = "#16E";
+set color_page_link_visited = "#61AC00";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#61AC00";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#61AC00";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/green_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/green_box.gif";
+set image_background_navigation_url = "skittlishdreams/green_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
+
 
 #NEWLAYER: skittlishdreams/inthebag
 layerinfo type = "theme";
@@ -240,46 +314,68 @@ layerinfo author_name = "Sarken";
 
 set layout_authors = [ { "name" => "sarken", "type" => "user" } ];
 
-set image_background_page_url = " ";
-set image_background_header_url = "skittlishdreams/inthebag_bg.gif";
-set image_background_container_url = "skittlishdreams/inthebag_shaddow.gif";
-set image_background_footer_url = "skittlishdreams/inthebag_bgb.gif";
-set image_background_module_url = "skittlishdreams/inthebag_box.gif";
-set image_background_entry_url = "skittlishdreams/inthebag_edge.gif";
-set image_background_navigation_url = "skittlishdreams/inthebag_circle.gif";
+##===============================
+## Page Colors
+##===============================
 
-set image_background_header_height = 120;
-
-set color_entry_metadata_text = "#88826E";
-set color_entry_text = "#222222";
-set color_entry_background = "#D6CCAD";
-set color_entry_title = "#5D9315";
-set color_entry_title_border = "#D6CCAD";
-set color_entry_title_border_alt = "#D6CCAD";
-set color_entry_title_background = "#D6CCAD";
-set color_footer_background = "#2E5962";
-set color_footer_link = "#ffffff";
-set color_header_background = "#417D8A";
-set color_module_background = "#69A618";
-set color_module_text = "#222222";
-set color_module_link = "#ffffff";
-set color_module_title = "#ffffff";
 set color_page_background = "#695E55";
 set color_page_border = "#69A618";
 set color_page_details_text = "#7F7967";
 set color_page_link = "#34707D";
 set color_page_link_hover = "#5D9315";
 set color_page_link_visited = "#695E55";
-set color_page_text = "#222222";
-set color_page_title = "#ffffff";
+set color_page_text = "#222";
+set color_page_title = "#fff";
+set color_header_background = "#417D8A";
+set color_footer_background = "#2E5962";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#D6CCAD";
+set color_entry_metadata_text = "#88826E";
+set color_entry_text = "#222";
+set color_entry_title = "#5D9315";
+set color_entry_title_border = "#D6CCAD";
+set color_entry_title_border_alt = "#D6CCAD";
+set color_entry_title_background = "#D6CCAD";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#69A618";
+set color_module_link = "#fff";
+set color_module_text = "#222";
+set color_module_title = "#fff";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/inthebag_shaddow.gif";
+set image_background_entry_url = "skittlishdreams/inthebag_edge.gif";
+set image_background_footer_url = "skittlishdreams/inthebag_bgb.gif";
+set image_background_header_height = 120;
+set image_background_header_url = "skittlishdreams/inthebag_bg.gif";
+set image_background_module_url = "skittlishdreams/inthebag_box.gif";
+set image_background_navigation_url = "skittlishdreams/inthebag_circle.gif";
 
 function print_stylesheet () {
+    """
+    .entry-title, .entry-title a {
+        color: $*color_entry_title;
+        }
 
-"""
-.entry-title, .entry-title a { color: $*color_entry_title;}
-.entry .userpic a, .comment .userpic a, .entry, .comment, .text_noentries_day { border-color: $*color_footer_background; }
-""";
+    .entry .userpic a, .comment .userpic a,
+    .entry, .comment, .text_noentries_day {
+        border-color: $*color_footer_background;
+        }
+    """;
 }
+
 
 #NEWLAYER: skittlishdreams/likesunshine
 layerinfo type = "theme";
@@ -289,44 +385,63 @@ layerinfo author_name = "Sarken";
 
 set layout_authors = [ { "name" => "sarken", "type" => "user" } ];
 
-set image_background_page_url = "skittlishdreams/likesunshine_page.gif";
-set image_background_header_url = "skittlishdreams/likesunshine_bg.gif";
-set image_background_container_url = "skittlishdreams/likesunshine_shaddow.gif";
-set image_background_footer_url = "skittlishdreams/likesunshine_bgb.gif";
-set image_background_module_url = "skittlishdreams/likesunshine_box.gif";
-set image_background_entry_url = "skittlishdreams/likesunshine_edge.gif";
-set image_background_navigation_url = "skittlishdreams/likesunshine_circle.gif";
+##===============================
+## Page Colors
+##===============================
 
-set image_background_header_height = 120;
-
-set color_entry_metadata_text = "#878499";
-set color_entry_text = "#555555";
-set color_entry_background = "#ffffff";
-set color_entry_title = "#6c6398";
-set color_entry_title_border = "#eeeeee";
-set color_entry_title_border_alt = "#eeeeee";
-set color_footer_background = "#99530f";
-set color_footer_link = "#efefef";
-set color_header_background = "#d17114";
-set color_module_background = "#f6d645";
-set color_module_text = "#A68A28";
-set color_module_link = "#ffffff";
-set color_module_title = "#ffffff";
 set color_page_background = "#e0e0e0";
 set color_page_border = "#f6d645";
-set color_page_details_text = "#aaaaaa";
+set color_page_details_text = "#aaa";
 set color_page_link = "#eabe25";
 set color_page_link_hover = "#6c6398";
 set color_page_link_visited = "#d17114";
-set color_page_text = "#555555";
-set color_page_title = "#ffffff";
+set color_page_text = "#555";
+set color_page_title = "#fff";
+set color_header_background = "#d17114";
+set color_footer_background = "#99530f";
+set color_footer_link = "#efefef";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_metadata_text = "#878499";
+set color_entry_text = "#555";
+set color_entry_title = "#6c6398";
+set color_entry_title_border = "#eee";
+set color_entry_title_border_alt = "#eee";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#f6d645";
+set color_module_link = "#fff";
+set color_module_text = "#A68A28";
+set color_module_title = "#fff";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/likesunshine_shaddow.gif";
+set image_background_entry_url = "skittlishdreams/likesunshine_edge.gif";
+set image_background_footer_url = "skittlishdreams/likesunshine_bgb.gif";
+set image_background_header_height = 120;
+set image_background_header_url = "skittlishdreams/likesunshine_bg.gif";
+set image_background_module_url = "skittlishdreams/likesunshine_box.gif";
+set image_background_navigation_url = "skittlishdreams/likesunshine_circle.gif";
+set image_background_page_url = "skittlishdreams/likesunshine_page.gif";
 
 function print_stylesheet () {
+    """
+    .entry-title, .entry-title a {
+        color: $*color_entry_title;
+        }
+    """;
+}
 
-"""
-.entry-title, .entry-title a { color: $*color_entry_title;}
-""";
-}
 
 #NEWLAYER: skittlishdreams/orange
 layerinfo type = "theme";
@@ -334,45 +449,56 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/orange";
 layerinfo author_name = "Kaigou";
 
-## theme color: #F79910
- 
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/orange_box.gif";
-set image_background_entry_url = "skittlishdreams/orange_edge.gif";
-set image_background_navigation_url = "skittlishdreams/orange_circle.gif";
-
-set color_page_border = "#F79910";
-set color_page_link = "#F79910";
-set color_page_link_visited = "#F79910";
-set color_module_background = "#F79910";
-set color_entry_title = "#F79910";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e3e3e3";
-
+set color_page_border = "#F79910";
+set color_page_details_text = "#888";
+set color_page_link = "#F79910";
+set color_page_link_hover = "#16E";
+set color_page_link_visited = "#F79910";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#F79910";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#F79910";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/orange_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/orange_box.gif";
+set image_background_navigation_url = "skittlishdreams/orange_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
+
 
 #NEWLAYER: skittlishdreams/pink
 layerinfo type = "theme";
@@ -380,45 +506,56 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/pink";
 layerinfo author_name = "Kaigou";
 
-## theme color: #F122BE
-
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/pink_box.gif";
-set image_background_entry_url = "skittlishdreams/pink_edge.gif";
-set image_background_navigation_url = "skittlishdreams/pink_circle.gif";
-
-set color_page_border = "#F122BE";
-set color_page_link = "#F122BE";
-set color_page_link_visited = "#F122BE";
-set color_module_background = "#F122BE";
-set color_entry_title = "#F122BE";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e3e3e3";
-
+set color_page_border = "#F122BE";
+set color_page_details_text = "#888";
+set color_page_link = "#F122BE";
+set color_page_link_hover = "#16E";
+set color_page_link_visited = "#F122BE";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#F122BE";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#F122BE";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/pink_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/pink_box.gif";
+set image_background_navigation_url = "skittlishdreams/pink_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
+
 
 #NEWLAYER: skittlishdreams/red
 layerinfo type = "theme";
@@ -426,45 +563,56 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/red";
 layerinfo author_name = "Kaigou";
 
-## theme color: #C90808
-
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/red_box.gif";
-set image_background_entry_url = "skittlishdreams/red_edge.gif";
-set image_background_navigation_url = "skittlishdreams/red_circle.gif";
-
-set color_page_border = "#C90808";
-set color_page_link = "#C90808";
-set color_page_link_visited = "#C90808";
-set color_module_background = "#C90808";
-set color_entry_title = "#C90808";
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#e3e3e3";
-
+set color_page_border = "#C90808";
+set color_page_details_text = "#888";
+set color_page_link = "#C90808";
+set color_page_link_hover = "#16E";
+set color_page_link_visited = "#C90808";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#C90808";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#C90808";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/red_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/red_box.gif";
+set image_background_navigation_url = "skittlishdreams/red_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
+
 
 #NEWLAYER: skittlishdreams/snowcherries
 layerinfo type = "theme";
@@ -474,46 +622,68 @@ layerinfo author_name = "Sarken";
 
 set layout_authors = [ { "name" => "sarken", "type" => "user" } ];
 
-set image_background_page_url = " ";
-set image_background_header_url = "skittlishdreams/snowcherries_bg.gif";
-set image_background_container_url = "skittlishdreams/snowcherries_shaddow.gif";
-set image_background_footer_url = "skittlishdreams/snowcherries_bgb.gif";
-set image_background_module_url = "skittlishdreams/snowcherries_box.gif";
-set image_background_entry_url = "skittlishdreams/snowcherries_edge.gif";
-set image_background_navigation_url = "skittlishdreams/snowcherries_circle.gif";
+##===============================
+## Page Colors
+##===============================
 
-set image_background_header_height = 120;
-
-set color_entry_metadata_text = "#575F5D";
-set color_entry_text = "#333333";
-set color_entry_background = "#81877B";
-set color_entry_title = "#2E353F";
-set color_entry_title_border = "#81877B";
-set color_entry_title_border_alt = "#81877B";
-set color_entry_title_background = "#81877B";
-set color_footer_background = "#a61216";
-set color_footer_link = "#ffffff";
-set color_header_background = "#DB181C";
-set color_module_background = "#5A6360";
-set color_module_text = "#222222";
-set color_module_link = "#ffffff";
-set color_module_title = "#ffffff";
 set color_page_background = "#2E353F";
 set color_page_border = "#5A6360";
 set color_page_details_text = "#49504E";
 set color_page_link = "#910004";
 set color_page_link_hover = "#C4D7D2";
 set color_page_link_visited = "#0E3870";
-set color_page_text = "#222222";
-set color_page_title = "#ffffff";
+set color_page_text = "#222";
+set color_page_title = "#fff";
+set color_header_background = "#DB181C";
+set color_footer_background = "#a61216";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#81877B";
+set color_entry_metadata_text = "#575F5D";
+set color_entry_text = "#333";
+set color_entry_title = "#2E353F";
+set color_entry_title_border = "#81877B";
+set color_entry_title_border_alt = "#81877B";
+set color_entry_title_background = "#81877B";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#5A6360";
+set color_module_text = "#222";
+set color_module_link = "#fff";
+set color_module_title = "#fff";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/snowcherries_shaddow.gif";
+set image_background_entry_url = "skittlishdreams/snowcherries_edge.gif";
+set image_background_footer_url = "skittlishdreams/snowcherries_bgb.gif";
+set image_background_header_height = 120;
+set image_background_header_url = "skittlishdreams/snowcherries_bg.gif";
+set image_background_module_url = "skittlishdreams/snowcherries_box.gif";
+set image_background_navigation_url = "skittlishdreams/snowcherries_circle.gif";
 
 function print_stylesheet () {
+    """
+    .entry-title, .entry-title a {
+        color: $*color_entry_title;
+        }
 
-"""
-.entry-title, .entry-title a { color: $*color_entry_title;}
-.entry .userpic a, .comment .userpic a, .entry, .comment, .text_noentries_day { border-color: $*color_page_details_text; }
-""";
+    .entry .userpic a, .comment .userpic a,
+    .entry, .comment, .text_noentries_day {
+        border-color: $*color_page_details_text;
+        }
+    """;
 }
+
 
 #NEWLAYER: skittlishdreams/violet
 layerinfo type = "theme";
@@ -521,42 +691,52 @@ layerinfo redist_uniq = "skittlishdreams
 layerinfo redist_uniq = "skittlishdreams/violet";
 layerinfo author_name = "Kaigou";
 
-## theme color: #AE3BD4
+##===============================
+## Page Colors
+##===============================
 
-set image_background_page_url = "skittlishdreams/bg.gif";
-set image_background_header_url = "skittlishdreams/header_bg.gif";
-set image_background_container_url = "skittlishdreams/left_bg.gif";
-set image_background_footer_url = "skittlishdreams/footer_bg.gif";
-set image_background_module_url = "skittlishdreams/violet_box.gif";
-set image_background_entry_url = "skittlishdreams/violet_edge.gif";
-set image_background_navigation_url = "skittlishdreams/violet_circle.gif";
-
+set color_page_background = "#e3e3e3";
 set color_page_border = "#AE3BD4";
+set color_page_details_text = "#888";
 set color_page_link = "#AE3BD4";
 set color_page_link_visited = "#AE3BD4";
-set color_module_background = "#AE3BD4";
-set color_entry_title = "#AE3BD4";
-
-set color_page_background = "#e3e3e3";
-
+set color_page_link_hover = "#16E";
+set color_page_text = "#666";
+set color_page_title = "#ddd";
 set color_header_background = "#1C1C1C";
 set color_footer_background = "#1C1C1C";
 set color_footer_link = "#bababa";
 set color_footer_link_hover = "#fff";
 
-set color_page_text = "#666666";
-set color_page_title = "#ddd";
-set color_page_details_text = "#888888";
-
-set color_page_link_hover = "#16E";
-
-set color_module_text = "#DDD";
-set color_module_link = "#FFF";
-set color_module_title = "#FFF";
+##===============================
+## Entry Colors
+##===============================
 
 set color_entry_background = "#FFF";
+set color_entry_metadata_text = "#811";
 set color_entry_text = "#444";
+set color_entry_title = "#AE3BD4";
 set color_entry_title_background = "#FFF";
 set color_entry_title_border = "#EEE";
 set color_entry_title_border_alt = "#DDD";
-set color_entry_metadata_text = "#881111";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#AE3BD4";
+set color_module_link = "#FFF";
+set color_module_text = "#DDD";
+set color_module_title = "#FFF";
+
+##===============================
+## Images
+##===============================
+
+set image_background_container_url = "skittlishdreams/left_bg.gif";
+set image_background_entry_url = "skittlishdreams/violet_edge.gif";
+set image_background_footer_url = "skittlishdreams/footer_bg.gif";
+set image_background_header_url = "skittlishdreams/header_bg.gif";
+set image_background_module_url = "skittlishdreams/violet_box.gif";
+set image_background_navigation_url = "skittlishdreams/violet_circle.gif";
+set image_background_page_url = "skittlishdreams/bg.gif";
--------------------------------------------------------------------------------