kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-09-26 04:55 pm

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

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

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

Reorder and reformat lines in Negatives theme file.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/negatives/themes.s2
--------------------------------------------------------------------------------
diff -r b1a871ecefac -r 0fbdbabc26ca bin/upgrading/s2layers/negatives/themes.s2
--- a/bin/upgrading/s2layers/negatives/themes.s2	Sun Sep 26 09:05:05 2010 -0500
+++ b/bin/upgrading/s2layers/negatives/themes.s2	Sun Sep 26 11:55:39 2010 -0500
@@ -4,34 +4,47 @@ layerinfo redist_uniq = "negatives/autum
 layerinfo redist_uniq = "negatives/autumn";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#9e2d00";
-set color_page_text = "#160131";
+set color_page_link = "#160131";
 set color_page_link_active = "#9e2d00";
-set color_page_link = "#160131";
 set color_page_link_hover = "#6ac49e";
 set color_page_link_visited = "#006c3e";
+set color_page_text = "#160131";
 
-set color_entry_interaction_links_active = "#d89175";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#d8cf75";
 set color_entry_border = "#1A4231";
 set color_entry_interaction_links = "#d8cf75";
+set color_entry_interaction_links_active = "#d89175";
+set color_entry_interaction_links_hover = "#6ac49e";
 set color_entry_interaction_links_visited = "#936fc4";
+set color_entry_link = "#491500";
+set color_entry_link_active = "#9e2d00";
 set color_entry_link_hover = "#6ac49e";
-set color_entry_link = "#491500";
 set color_entry_link_visited = "#613625";
-set color_entry_interaction_links_hover = "#6ac49e";
-set color_entry_link_active = "#9e2d00";
-set color_entry_background = "#d8cf75";
 
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#9E2D00";
+set color_module_border = "#160131";
+set color_module_link = "#000";
+set color_module_link_active = "#9e2d00";
 set color_module_link_hover = "#6ac49e";
-set color_module_background = "#9E2D00";
+set color_module_link_visited = "#fff";
+set color_module_text = "#9e900";
 set color_module_title = "#9e9000";
-set color_module_link = "#000000";
-set color_module_link_active = "#9e2d00";
-set color_module_text = "#9e900";
-set color_module_border = "#160131";
-set color_module_link_visited = "#ffffff";
+
 
 #NEWLAYER: negatives/azure
 layerinfo type = "theme";
@@ -39,36 +52,43 @@ layerinfo redist_uniq = "negatives/azure
 layerinfo redist_uniq = "negatives/azure";
 layerinfo author_name = "daven";
 
-set theme_authors = [ { "name" => "daven", "type" => "user" }];
+set theme_authors = [ { "name" => "daven", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#343370";
-set color_page_text = "#ffffff";
 set color_page_link = "#af5250";
+set color_page_link_active = "#773837";
 set color_page_link_hover = "#C88988";
-set color_page_link_active = "#773837";
 set color_page_link_visited = "#773837";
+set color_page_text = "#fff";
 
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
-set color_entry_border = "#000000";
-set color_entry_interaction_links = "#ffffff";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_border = "#000";
+set color_entry_interaction_links = "#fff";
+set color_entry_text = "#000";
+
+##===============================
+## Module Colors
+##===============================
 
 set color_module_background = "#343370";
-set color_module_text = "#cccccc";
-set color_module_border = "#aaaaaa";
-set color_module_title = "#cccccc";
-set color_module_link = "#cccccc";
-set color_module_link_active = "#ffffff";
-set color_module_link_hover = "#ffffff";
-set color_module_link_visited = "#cccccc";
+set color_module_border = "#aaa";
+set color_module_link = "#ccc";
+set color_module_link_active = "#fff";
+set color_module_link_hover = "#fff";
+set color_module_link_visited = "#ccc";
+set color_module_text = "#ccc";
+set color_module_title = "#ccc";
 
-function Page::print_theme_stylesheet()
-{
-"""
-
-/* Page
-***************************************************************************/
-
+function Page::print_theme_stylesheet() {
+    """
     * {
         font-size: 100%;
         }
@@ -78,9 +98,9 @@ function Page::print_theme_stylesheet()
         }
 
     a {
-        text-decoration: none;
         font-weight: bold;
         outline: none;
+        text-decoration: none;
         }
 
     a:hover {
@@ -95,19 +115,32 @@ function Page::print_theme_stylesheet()
         background-color: #BDCEE0;
         }
 
-    .two-columns-right #primary {left: 0%; width: 79%;}
-    .two-columns-right #secondary {left: 0%; width: 15%; float: right; }
+    .two-columns #primary {
+        left: 0%;
+        width: 79%;
+        }
 
-    .two-columns-left #primary {left: 0%; width: 79%; float: right; }
-    .two-columns-left #secondary {left: 0%; width: 15%; float: left; }
+    .two-columns-left #primary {
+        float: right;
+        }
 
+    .two-columns #secondary {
+        left: 0%;
+        width: 15%;
+        }
 
-/* Entries
-***************************************************************************/
+    .two-columns-right #secondary {
+        float: right;
+        text-align: right;
+        }
+
+    .two-columns-left #secondary {
+        float: left;
+        }
 
     .datetime {
+        font-style: italic;
         margin-bottom: 10px;
-        font-style:italic;
         }
 
     .entry-title {
@@ -115,9 +148,9 @@ function Page::print_theme_stylesheet()
         }
 
     .subject, .subject a, .subject a:visited, .subject a:hover, .subject a:active {
-        font-weight: bold;
         font-size: 1.1em;
         font-variant: small-caps;
+        font-weight: bold;
         }
 
     .comment-poster .anonymous {
@@ -130,21 +163,13 @@ function Page::print_theme_stylesheet()
         font-variant: small-caps;
         }
 
-
-/* Modules
-***************************************************************************/
-
-    .two-columns-right #secondary {
-        text-align: right;
-        }
-
     #secondary a:hover, #secondary a:active {
-        padding-bottom: 0px;
+        padding-bottom: 0;
         }
 
     #secondary .module-header {
+        font-size: 1.1em;
         letter-spacing: 0;
-        font-size: 1.1em;
         }
 
     .two-columns-left #secondary .module-header {
@@ -152,8 +177,8 @@ function Page::print_theme_stylesheet()
         }
 
     .module-section-two {
+        border-bottom: 5px double $*color_module_border;
         border-top: 0 !important;
-        border-bottom: 5px double $*color_module_border;
         }
 
     .module {
@@ -161,8 +186,8 @@ function Page::print_theme_stylesheet()
         }
 
     .module a, .module a:visited {
+        color: $*color_module_link;
         padding: 3px 0;
-        color: $*color_module_link;
         }
 
     .module a:hover {
@@ -189,67 +214,74 @@ function Page::print_theme_stylesheet()
         }
 
     .module-calendar {
-        margin: 0px 200px 0px 10%;
+        margin: 0 200px 0 10%;
         }
-
-/* Footer
-***************************************************************************/
 
     #footer {
         text-align: center;
         }
+    """;
+}
 
-""";
-
-}
 
 #NEWLAYER: negatives/black
 layerinfo type = "theme";
-layerinfo name = "Negatives Black";
+layerinfo name = "Black";
 layerinfo redist_uniq = "negatives/black";
+layerinfo author_name = "phoenix";
 
-set color_page_background = "#000000";
-set color_page_text = "#ffffff";
-set color_page_link = "#cccccc";
-set color_page_link_hover = "#ffffff";
-set color_page_link_active = "#666666";
-set color_page_link_visited = "#aaaaaa";
+##===============================
+## Page Colors
+##===============================
 
-set color_header_background = "#000000";
-set color_header_link = "#cccccc";
-set color_header_link_hover = "#ffffff";
-set color_header_link_active = "#666666";
-set color_header_link_visited = "#aaaaaa";
+set color_page_background = "#000";
+set color_page_link = "#ccc";
+set color_page_link_active = "#666";
+set color_page_link_hover = "#fff";
+set color_page_link_visited = "#aaa";
+set color_page_text = "#fff";
+set color_header_background = "#000";
+set color_header_link = "#ccc";
+set color_header_link_active = "#666";
+set color_header_link_hover = "#fff";
+set color_header_link_visited = "#aaa";
+set color_footer_background = "#000";
+set color_footer_link = "#ccc";
+set color_footer_link_active = "#666";
+set color_footer_link_hover = "#fff";
+set color_footer_link_visited = "#aaa";
 
-set color_footer_background = "#000000";
-set color_footer_link = "#cccccc";
-set color_footer_link_hover = "#ffffff";
-set color_footer_link_active = "#666666";
-set color_footer_link_visited = "#aaaaaa";
+##===============================
+## Entry Colors
+##===============================
 
-set color_entry_link = "#666666";
-set color_entry_link_hover = "#bbbbbb";
-set color_entry_link_active = "#ffffff";
-set color_entry_link_visited = "#000000";
-set color_entry_border = "#000000";
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
+set color_entry_background = "#fff";
+set color_entry_border = "#000";
+set color_entry_interaction_links = "#aaa";
+set color_entry_interaction_links_active = "#444";
+set color_entry_interaction_links_background = "#000";
+set color_entry_interaction_links_hover = "#fff";
+set color_entry_interaction_links_visited = "#777";
+set color_entry_link = "#666";
+set color_entry_link_active = "#fff";
+set color_entry_link_hover = "#bbb";
+set color_entry_link_visited = "#000";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
 
-set color_module_background = "#000000";
-set color_module_text = "#cccccc";
-set color_module_border = "#aaaaaa";
-set color_module_title = "#dddddd";
-set color_module_link = "#aaaaaa";
-set color_module_link_active = "#444444";
-set color_module_link_hover = "#ffffff";
-set color_module_link_visited = "#777777";
+##===============================
+## Module Colors
+##===============================
 
-set color_entry_interaction_links_background = "#000000";
-set color_entry_interaction_links = "#aaaaaa";
-set color_entry_interaction_links_hover = "#ffffff";
-set color_entry_interaction_links_active = "#444444";
-set color_entry_interaction_links_visited = "#777777";
+set color_module_background = "#000";
+set color_module_border = "#aaa";
+set color_module_link = "#aaa";
+set color_module_link_active = "#444";
+set color_module_link_hover = "#fff";
+set color_module_link_visited = "#777";
+set color_module_text = "#ccc";
+set color_module_title = "#ddd";
+
 
 #NEWLAYER: negatives/blastedsands
 layerinfo type = "theme";
@@ -259,51 +291,58 @@ layerinfo author_name = "zvi";
 
 set theme_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_page_text = "#996633";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#dcc6b0";
-
 set color_page_link = "#728135";
+set color_page_link_active = "#8B0000";
 set color_page_link_hover = "#e39307";
-set color_page_link_active = "#8B0000";
 set color_page_link_visited = "#8B0000";
-
+set color_page_text = "#963";
 set color_header_background = "#dcc6b0";
 set color_header_link = "#728135";
+set color_header_link_active = "#8B0000";
 set color_header_link_hover = "#e39307";
-set color_header_link_active = "#8B0000";
 set color_header_link_visited = "#8B0000";
-
 set color_footer_background = "#dcc6b0";
 set color_footer_link = "#728135";
+set color_footer_link_active = "#8B0000";
 set color_footer_link_hover = "#e39307";
-set color_footer_link_active = "#8B0000";
 set color_footer_link_visited = "#8B0000";
 
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#FAFAD2";
+set color_entry_border = "#963";
+set color_entry_interaction_links = "#963";
+set color_entry_interaction_links_active = "#8B0000";
+set color_entry_interaction_links_background = "#dcc6b0";
+set color_entry_interaction_links_hover = "#e39307";
+set color_entry_interaction_links_visited = "#8B0000";
+set color_entry_link = "#963";
+set color_entry_link_active = "#8B0000";
+set color_entry_link_hover = "#e39307";
+set color_entry_link_visited = "#8B0000";
 set color_entry_text = "#646329";
-set color_entry_border = "#996633";
-set color_entry_background = "#FAFAD2";
 set color_entry_title = "#728135";
 
-set color_entry_link = "#996633";
-set color_entry_link_hover = "#e39307";
-set color_entry_link_active = "#8B0000";
-set color_entry_link_visited = "#8B0000";
+##===============================
+## Module Colors
+##===============================
 
-set color_entry_interaction_links_background = "#dcc6b0";
-set color_entry_interaction_links = "#996633";
-set color_entry_interaction_links_hover = "#e39307";
-set color_entry_interaction_links_active = "#8B0000";
-set color_entry_interaction_links_visited = "#8B0000";
-
+set color_module_background = "#fefde0";
+set color_module_border = "#963";
+set color_module_link = "#963";
+set color_module_link_active = "#8B0000";
+set color_module_link_hover = "#e39307";
+set color_module_link_visited = "#8B0000";
 set color_module_text = "#728135";
-set color_module_border = "#996633";
-set color_module_background = "#fefde0";
 set color_module_title = "#728135";
 
-set color_module_link = "#996633";
-set color_module_link_hover = "#e39307";
-set color_module_link_active = "#8B0000";
-set color_module_link_visited = "#8B0000";
 
 #NEWLAYER: negatives/bridalbouquet
 layerinfo type = "theme";
@@ -311,34 +350,47 @@ layerinfo redist_uniq = "negatives/brida
 layerinfo redist_uniq = "negatives/bridalbouquet";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#ffe1c0";
-set color_page_text = "#000000";
+set color_page_link = "#ac5a00";
 set color_page_link_active = "#ac1e00";
-set color_page_link = "#ac5a00";
 set color_page_link_hover = "#ff8500";
 set color_page_link_visited = "#ac7b00";
+set color_page_text = "#000";
 
-set color_entry_interaction_links_active = "#ac1e00";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#ffe1c0";
 set color_entry_border = "#c47c2d";
 set color_entry_interaction_links = "#ac5a00";
+set color_entry_interaction_links_active = "#ac1e00";
+set color_entry_interaction_links_hover = "#c4482d";
 set color_entry_interaction_links_visited = "#ac5a00";
+set color_entry_link = "#ac5a00";
+set color_entry_link_active = "#ac1e00";
 set color_entry_link_hover = "#ff8500";
-set color_entry_link = "#ac5a00";
 set color_entry_link_visited = "#ac7b00";
-set color_entry_interaction_links_hover = "#c4482d";
-set color_entry_link_active = "#ac1e00";
-set color_entry_background = "#ffe1c0";
 
-set color_module_link_hover = "#ff8500";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#ffe1c0";
-set color_module_title = "#ac5a00";
+set color_module_border = "#c47c2d";
 set color_module_link = "#ac5a00";
 set color_module_link_active = "#ac1e00";
-set color_module_text = "#000000";
-set color_module_border = "#c47c2d";
+set color_module_link_hover = "#ff8500";
 set color_module_link_visited = "#ac7b00";
+set color_module_text = "#000";
+set color_module_title = "#ac5a00";
+
 
 #NEWLAYER: negatives/corporateembrace
 layerinfo type = "theme";
@@ -346,34 +398,47 @@ layerinfo redist_uniq = "negatives/corpo
 layerinfo redist_uniq = "negatives/corporateembrace";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#9090c0";
-set color_page_text = "#000000";
+set color_page_link = "#2a2a5e";
 set color_page_link_active = "#7777c0";
-set color_page_link = "#2a2a5e";
 set color_page_link_hover = "#7777c0";
 set color_page_link_visited = "#292944";
+set color_page_text = "#000";
 
-set color_entry_interaction_links_active = "#7777c0";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#9090c0";
 set color_entry_border = "#0c0c3a";
 set color_entry_interaction_links = "#0C0C3A";
+set color_entry_interaction_links_active = "#7777c0";
+set color_entry_interaction_links_hover = "#7777c0";
 set color_entry_interaction_links_visited = "#292944";
+set color_entry_link = "#2a2a5e";
+set color_entry_link_active = "#7777c0";
 set color_entry_link_hover = "#7777c0";
-set color_entry_link = "#2a2a5e";
 set color_entry_link_visited = "#292944";
-set color_entry_interaction_links_hover = "#7777c0";
-set color_entry_link_active = "#7777c0";
-set color_entry_background = "#9090c0";
 
-set color_module_link_hover = "#7777c0";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#9090c0";
-set color_module_title = "#480125";
+set color_module_border = "#0c0c3a";
 set color_module_link = "#2a2a5e";
 set color_module_link_active = "#7777c0";
-set color_module_text = "#000000";
-set color_module_border = "#0c0c3a";
+set color_module_link_hover = "#7777c0";
 set color_module_link_visited = "#292944";
+set color_module_text = "#000";
+set color_module_title = "#480125";
+
 
 #NEWLAYER: negatives/easyreader
 layerinfo type = "theme";
@@ -381,37 +446,48 @@ layerinfo redist_uniq = "negatives/easyr
 layerinfo redist_uniq = "negatives/easyreader";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#965014";
+set color_page_link = "#2a1867";
 set color_page_link_active = "#2c4402";
-set color_page_link = "#2a1867";
-set color_page_text = "#000000";
-set color_page_background = "#965014";
+set color_page_link_hover = "#8b74db";
 set color_page_link_visited = "#5e8b13";
-set color_page_link_hover = "#8b74db";
+set color_page_text = "#000";
 
-set color_entry_interaction_links_active = "#e6c5a8";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#e6a46b";
 set color_entry_border = "#492303";
 set color_entry_interaction_links = "#e6c5a8";
+set color_entry_interaction_links_active = "#e6c5a8";
+set color_entry_interaction_links_hover = "#8b74db";
 set color_entry_interaction_links_visited = "#b7e46a";
+set color_entry_link = "#2a1867";
+set color_entry_link_active = "#2c4402";
 set color_entry_link_hover = "#8b74db";
-set color_entry_link = "#2a1867";
 set color_entry_link_visited = "#5e8b13";
-set color_entry_interaction_links_hover = "#8b74db";
-set color_entry_link_active = "#2c4402";
-set color_entry_background = "#e6a46b";
-set color_entry_text = "000000";
+set color_entry_text = "#000";
 
-set color_module_link_hover = "#8b74db";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#e6a46b";
-set color_module_title = "#000000";
 set color_module_border = "#492303";
 set color_module_link = "#2a1867";
+set color_module_link_active = "#2c4402";
+set color_module_link_hover = "#8b74db";
 set color_module_link_visited = "#5e8b13";
-set color_module_link_active = "#2c4402";
-set color_module_text = "#000000";
+set color_module_text = "#000";
+set color_module_title = "#000";
 
-set image_background_module_position = "top left";
 
 #NEWLAYER: negatives/evening
 layerinfo type = "theme";
@@ -419,29 +495,42 @@ layerinfo redist_uniq = "negatives/eveni
 layerinfo redist_uniq = "negatives/evening";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
 
-set color_page_background = "#000000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_link = "#fd7d83";
+set color_page_link_active = "#750006";
+set color_page_link_hover = "#fde0e2";
+set color_page_link_visited = "#fd7d83";
 set color_page_text = "#fd7d83";
-set color_page_link_active = "#750006";
-set color_page_link = "#fd7d83";
-set color_page_link_visited = "#fd7d83";
-set color_page_link_hover = "#fde0e2";
 
-set color_entry_background = "#ffffff";
-set color_entry_text = "000000";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_border = "#750006";
 set color_entry_link = "#fd7d83";
+set color_entry_link_active = "#750006";
 set color_entry_link_hover = "#380003";
 set color_entry_link_visited = "#4a1b1e";
-set color_entry_link_active = "#750006";
-set color_entry_border = "#750006";
+set color_entry_text = "#000";
 
-set color_module_link_hover = "#380003";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_border = "#750006";
 set color_module_link = "#fde0e2";
+set color_module_link_active = "#750006";
+set color_module_link_hover = "#380003";
 set color_module_link_visited = "#fd7d83";
-set color_module_link_active = "#750006";
-set color_module_text = "#ffffff";
+set color_module_text = "#fff";
+
 
 #NEWLAYER: negatives/lightondark
 layerinfo type = "theme";
@@ -449,162 +538,211 @@ layerinfo redist_uniq = "negatives/light
 layerinfo redist_uniq = "negatives/lightondark";
 layerinfo author_name = "cesy";
 
-set theme_authors = [ { "name" => "cesy", "type" => "user" }];
+set theme_authors = [ { "name" => "cesy", "type" => "user" } ];
 
-set color_page_background = "#666666";
-set color_page_text = "#ffffff";
-set color_page_link = "#ddddff";
-set color_page_link_visited = "#ffffcc";
-set color_page_link_hover = "#ccffcc";
-set color_page_link_active = "#ffcccc";
+##===============================
+## Page Colors
+##===============================
 
-set color_header_background = "#666666";
-set color_header_link = "#ddddff";
-set color_header_link_visited = "#ffffcc";
-set color_header_link_hover = "#ccffcc";
-set color_header_link_active = "#ffcccc";
+set color_page_background = "#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_header_background = "#666";
+set color_header_link = "#ddf";
+set color_header_link_active = "#fcc";
+set color_header_link_hover = "#cfc";
+set color_header_link_visited = "#ffc";
+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";
 
-set color_footer_background = "#666666";
-set color_footer_link = "#ddddff";
-set color_footer_link_visited = "#ffffcc";
-set color_footer_link_hover = "#ccffcc";
-set color_footer_link_active = "#ffcccc";
+##===============================
+## Entry Colors
+##===============================
 
-set color_module_background = "#000000";
-set color_module_border = "#ffffff";
-set color_module_title = "#ffffff";
-set color_module_text = "#ffffff";
-set color_module_link = "#ddddff";
-set color_module_link_visited = "#ffffcc";
-set color_module_link_hover = "#ccffcc";
-set color_module_link_active = "#ffcccc";
+set color_entry_background = "#000";
+set color_entry_border = "#fff";
+set color_entry_interaction_links = "#fff";
+set color_entry_interaction_links_active = "#fcc";
+set color_entry_interaction_links_background = "#000";
+set color_entry_interaction_links_hover = "#cfc";
+set color_entry_interaction_links_visited = "#ffc";
+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_background = "#000000";
-set color_entry_border = "#ffffff";
-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_visited = "#ffffcc";
-set color_entry_link_active = "#ffcccc";
-set color_entry_interaction_links_background = "#000000";
-set color_entry_interaction_links = "#ffffff";
-set color_entry_interaction_links_visited = "#ffffcc";
-set color_entry_interaction_links_hover = "#ccffcc";
-set color_entry_interaction_links_active = "#ffcccc";
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#000";
+set color_module_border = "#fff";
+set color_module_link = "#ddf";
+set color_module_link_active = "#fcc";
+set color_module_link_hover = "#cfc";
+set color_module_link_visited = "#ffc";
+set color_module_text = "#fff";
+set color_module_title = "#fff";
+
 
 #NEWLAYER: negatives/limecherry
-layerinfo "type" = "theme";
-layerinfo "name" = "Lime Cherry";
+layerinfo type = "theme";
+layerinfo name = "Lime Cherry";
 layerinfo redist_uniq = "negatives/limecherry";
 layerinfo author_name = "zvi";
 
 set theme_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#d9f3d3";
 set color_page_link = "#8f0000";
-set color_module_background = "#d9f3d3";
-set color_entry_link = "#8f0000";
-set color_module_border = "#DDB4B4";
-set color_entry_text = "#103f0a";
-set color_entry_border = "#DDB4B4";
-set color_module_title = "#103f0a";
+set color_page_link_active = "#8F008F";
+set color_page_link_hover = "#919e89";
+set color_page_link_visited = "#00008F";
 set color_page_text = "#103f0a";
-set color_module_link = "#8f0000";
-set color_entry_title = "#103f0a";
-set color_entry_interaction_links = "#8f0000";
-set color_module_text = "#103f0a";
-set color_entry_background = "#d9f3d3";
-
 set color_header_background = "#d9f3d3";
 set color_header_link = "#8f0000";
+set color_header_link_active = "#8f008f";
 set color_header_link_hover = "#919e89";
-set color_header_link_active = "#8f008f";
 set color_header_link_visited = "#00008F";
-
 set color_footer_background = "#d9f3d3";
 set color_footer_link = "#8f0000";
+set color_footer_link_active = "#8f008f";
 set color_footer_link_hover = "#919e89";
-set color_footer_link_active = "#8f008f";
 set color_footer_link_visited = "#00008F";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#d9f3d3";
+set color_entry_border = "#DDB4B4";
+set color_entry_interaction_links = "#8f0000";
+set color_entry_interaction_links_active = "#8F008F";
 set color_entry_interaction_links_background = "#d9f3d3";
 set color_entry_interaction_links_hover = "#919e89";
-set color_entry_interaction_links_active = "#8F008F";
 set color_entry_interaction_links_visited = "#00008F";
+set color_entry_link = "#8f0000";
 set color_entry_link_active = "#8F008F";
 set color_entry_link_hover = "#919e89";
 set color_entry_link_visited = "#00008F";
+set color_entry_text = "#103f0a";
+set color_entry_title = "#103f0a";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#d9f3d3";
+set color_module_border = "#DDB4B4";
+set color_module_link = "#8f0000";
 set color_module_link_active = "#8F008F";
 set color_module_link_hover = "#919e89";
 set color_module_link_visited = "#00008F";
-set color_page_link_active = "#8F008F";
-set color_page_link_hover = "#919e89";
-set color_page_link_visited = "#00008F";
+set color_module_text = "#103f0a";
+set color_module_title = "#103f0a";
+
 
 #NEWLAYER: negatives/nnwm2009
-layerinfo "type" = "theme";
-layerinfo "name" = "NNWM 2009";
+layerinfo type = "theme";
+layerinfo name = "NNWM 2009";
 layerinfo redist_uniq = "negatives/nnwm2009";
 layerinfo author_name = "zvi";
 
 set theme_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+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_link_active = "#a5cf39";
-set color_page_background = "#000000";
-set color_page_link = "#429ace";
-set color_page_link_hover = "#842021";
-set color_module_background = "#ffefbd";
-set color_module_title = "#ef8229";
-set color_page_text = "#ffffff";
-set color_module_text = "#000000";
+set color_page_text = "#fff";
 set color_footer_background = "#ffefbd";
 
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#ffefbd";
+set color_module_text = "#000";
+set color_module_title = "#ef8229";
+
+
 #NEWLAYER: negatives/pumpkinjuice
-layerinfo "type" = "theme";
-layerinfo "name" = "Pumpkin Juice";
+layerinfo type = "theme";
+layerinfo name = "Pumpkin Juice";
 layerinfo redist_uniq = "negatives/pumpkinjuice";
 layerinfo author_name = "zvi";
 
 set theme_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#fc7837";
-set color_entry_link_hover = "#78f5e8";
 set color_page_link = "#fffff6";
-set color_module_link_hover = "#78f5e8";
-set color_module_background = "#f6aa79";
-set color_entry_link = "#a6e820";
-set color_module_border = "#fc7837";
-set color_entry_text = "#000002";
-set color_entry_border = "#fc7837";
-set color_module_title = "#a6e820";
+set color_page_link_active = "#38BBFC";
+set color_page_link_hover = "#78f5e8";
+set color_page_link_visited = "#38BBFC";	
 set color_page_text = "#a8a8a8";
-set color_module_link = "#a6e820";
-set color_entry_title = "#a6e820";
-set color_page_link_hover = "#78f5e8";
-set color_entry_interaction_links = "#a6e820";
-set color_module_text = "#000002";
 set color_header_background = "#fc7837";
 set color_header_link = "#fffff6";
+set color_header_link_active = "#38bbfc";
 set color_header_link_hover = "#78f5e8";
-set color_header_link_active = "#38bbfc";
 set color_header_link_visited = "#38bbfc";
 set color_footer_background = "#fc7837";
 set color_footer_link = "#fffff6";
+set color_footer_link_active = "#38bbfc";
 set color_footer_link_hover = "#78f5e8";
-set color_footer_link_active = "#38bbfc";
 set color_footer_link_visited = "#38bbfc";
+
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#f6aa79";
+set color_entry_border = "#fc7837";
+set color_entry_interaction_links = "#a6e820";
+set color_entry_interaction_links_active = "#38BBFC";
 set color_entry_interaction_links_background = "#fc7837";
 set color_entry_interaction_links_hover = "#78f5e8";
-set color_entry_interaction_links_active = "#38BBFC";
-set color_entry_interaction_links_visited  = "#38BBFC";
+set color_entry_interaction_links_visited = "#38BBFC";
+set color_entry_link = "#a6e820";
 set color_entry_link_active = "#38BBFC";
+set color_entry_link_hover = "#78f5e8";
 set color_entry_link_visited = "#38BBFC";
+set color_entry_text = "#000002";
+set color_entry_title = "#a6e820";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#f6aa79";
+set color_module_border = "#fc7837";
+set color_module_link = "#a6e820";
 set color_module_link_active = "#38BBFC";
+set color_module_link_hover = "#78f5e8";
 set color_module_link_visited = "#38BBFC";
-set color_page_link_active = "#38BBFC";
-set color_page_link_visited  = "#38BBFC";	
+set color_module_text = "#000002";
+set color_module_title = "#a6e820";
+
 
 #NEWLAYER: negatives/spring
 layerinfo type = "theme";
@@ -612,34 +750,47 @@ layerinfo redist_uniq = "negatives/sprin
 layerinfo redist_uniq = "negatives/spring";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#ffea8d";
-set color_page_text = "#c8434d";
+set color_page_link = "#d7777e";
 set color_page_link_active = "#7ac76e";
-set color_page_link = "#d7777e";
 set color_page_link_hover = "#7e70b8";
 set color_page_link_visited = "#5641ab";
+set color_page_text = "#c8434d";
 
-set color_entry_interaction_links_active = "#7ac76e";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#ffe884";
 set color_entry_border = "#80e96f";
 set color_entry_interaction_links = "#5641ab";
+set color_entry_interaction_links_active = "#7ac76e";
+set color_entry_interaction_links_hover = "#7e70b8";
 set color_entry_interaction_links_visited = "#4fb93e";
+set color_entry_link = "#d7777e";
+set color_entry_link_active = "#7ac76e";
 set color_entry_link_hover = "#ffe679";
-set color_entry_link = "#d7777e";
 set color_entry_link_visited = "#5641ab";
-set color_entry_interaction_links_hover = "#7e70b8";
-set color_entry_link_active = "#7ac76e";
-set color_entry_background = "#ffe884";
 
-set color_module_link_hover = "#7e70b8";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#ffea8d";
-set color_module_title = "#c8434d";
+set color_module_border = "#4fb93e";
 set color_module_link = "#d7777e";
 set color_module_link_active = "#7ac76e";
-set color_module_text = "#000000";
-set color_module_border = "#4fb93e";
+set color_module_link_hover = "#7e70b8";
 set color_module_link_visited = "#5641ab";
+set color_module_text = "#000";
+set color_module_title = "#c8434d";
+
 
 #NEWLAYER: negatives/summer
 layerinfo type = "theme";
@@ -647,34 +798,47 @@ layerinfo redist_uniq = "negatives/summe
 layerinfo redist_uniq = "negatives/summer";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
 
-set color_page_background = "#ffffff";
-set color_page_text = "#000000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#fff";
+set color_page_link = "#c75a00";
 set color_page_link_active = "#5d038e";
-set color_page_link = "#c75a00";
 set color_page_link_hover = "#c7c700";
 set color_page_link_visited = "#008383";
+set color_page_text = "#000";
 
-set color_entry_interaction_links_active = "#5d038e";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#ffe8d5";
 set color_entry_border = "#d7d722";
 set color_entry_interaction_links = "#168d8d";
+set color_entry_interaction_links_active = "#5d038e";
+set color_entry_interaction_links_hover = "#c7c700";
 set color_entry_interaction_links_visited = "#73f9f9";
+set color_entry_link = "#c75a00";
+set color_entry_link_active = "#5d038e";
 set color_entry_link_hover = "#cc78fa";
-set color_entry_link = "#c75a00";
 set color_entry_link_visited = "#008383";
-set color_entry_interaction_links_hover = "#c7c700";
-set color_entry_link_active = "#5d038e";
-set color_entry_background = "#ffe8d5";
 
-set color_module_link_hover = "#c7c700";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#ffb476";
-set color_module_title = "#000000";
+set color_module_border = "#d77422";
 set color_module_link = "#c75a00";
 set color_module_link_active = "#5d038e";
-set color_module_text = "#000000";
-set color_module_border = "#d77422";
+set color_module_link_hover = "#c7c700";
 set color_module_link_visited = "#008383";
+set color_module_text = "#000";
+set color_module_title = "#000";
+
 
 #NEWLAYER: negatives/winter
 layerinfo type = "theme";
@@ -682,34 +846,47 @@ layerinfo redist_uniq = "negatives/winte
 layerinfo redist_uniq = "negatives/winter";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#606193";
-set color_page_text = "#202260";
+set color_page_link = "#202260";
 set color_page_link_active = "#4e7b25";
-set color_page_link = "#202260";
 set color_page_link_hover = "#cecffb";
 set color_page_link_visited = "#9f926e";
+set color_page_text = "#202260";
 
-set color_entry_interaction_links_active = "#4e7b25";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#e6a46b";
 set color_entry_border = "#8d6270";
 set color_entry_interaction_links = "#d2bd7d";
+set color_entry_interaction_links_active = "#4e7b25";
+set color_entry_interaction_links_hover = "#fdfafc";
 set color_entry_interaction_links_visited = "#8a712a";
+set color_entry_link = "#7a2540";
+set color_entry_link_active = "#778e63";
 set color_entry_link_hover = "#cecffb";
-set color_entry_link = "#7a2540";
 set color_entry_link_visited = "#9f926e";
-set color_entry_interaction_links_hover = "#fdfafc";
-set color_entry_link_active = "#778e63";
-set color_entry_background = "#e6a46b";
 
-set color_module_link_hover = "#8b74db";
+##===============================
+## Module Colors
+##===============================
+
 set color_module_background = "#cecffb";
-set color_module_title = "#202260";
+set color_module_border = "#7a2540";
 set color_module_link = "#202260";
 set color_module_link_active = "#4e7b25";
-set color_module_text = "#000000";
-set color_module_border = "#7a2540";
+set color_module_link_hover = "#8b74db";
 set color_module_link_visited = "#9f926e";
+set color_module_text = "#000";
+set color_module_title = "#202260";
+
 
 #NEWLAYER: negatives/yozakura
 layerinfo type = "theme";
@@ -717,31 +894,43 @@ layerinfo redist_uniq = "negatives/yozak
 layerinfo redist_uniq = "negatives/yozakura";
 layerinfo author_name = "busaikko";
 
-set theme_authors = [ { "name" => "busaikko", "type" => "user" }];
+set theme_authors = [ { "name" => "busaikko", "type" => "user" } ];
+
+##===============================
+## Page Colors
+##===============================
 
 set color_page_background = "#c62677";
-set color_page_text = "#000000";
+set color_page_link = "#480125";
 set color_page_link_active = "#580802";
-set color_page_link = "#480125";
 set color_page_link_hover = "#23b83d";
 set color_page_link_visited = "#582b02";
+set color_page_text = "#000";
 
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_border = "#000";
+set color_entry_interaction_links = "#fff";
 set color_entry_interaction_links_active = "#3cca55";
-set color_entry_border = "#000000";
-set color_entry_interaction_links = "#ffffff";
+set color_entry_interaction_links_hover = "#3cca55";
 set color_entry_interaction_links_visited = "#3cca55";
+set color_entry_link = "#014304";
+set color_entry_link_active = "#580802";
 set color_entry_link_hover = "#23b83d";
-set color_entry_link = "#014304";
 set color_entry_link_visited = "#582b02";
-set color_entry_interaction_links_hover = "#3cca55";
-set color_entry_link_active = "#580802";
-set color_entry_background = "#ffffff";
 
-set color_module_link_hover = "#ff8500";
-set color_module_background = "#000000";
-set color_module_title = "#480125";
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#000";
+set color_module_border = "#c62677";
 set color_module_link = "#014304";
 set color_module_link_active = "#580802";
-set color_module_text = "#ffffff";
-set color_module_border = "#c62677";
-set color_module_link_visited = "#582b02";
\ No newline at end of file
+set color_module_link_hover = "#ff8500";
+set color_module_link_visited = "#582b02";
+set color_module_text = "#fff";
+set color_module_title = "#480125";
--------------------------------------------------------------------------------