kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-09-24 10:16 pm

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

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

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

Reorder and reformat lines in Funky Circles theme file.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/funkycircles/themes.s2
--------------------------------------------------------------------------------
diff -r 32ac7b21797f -r f2c4465b2a61 bin/upgrading/s2layers/funkycircles/themes.s2
--- a/bin/upgrading/s2layers/funkycircles/themes.s2	Fri Sep 24 17:10:00 2010 -0500
+++ b/bin/upgrading/s2layers/funkycircles/themes.s2	Fri Sep 24 17:15:49 2010 -0500
@@ -1,6 +1,6 @@
 #NEWLAYER: funkycircles/atomicorange
-layerinfo "type" = "theme";
-layerinfo "name" = "Atomic Orange";
+layerinfo type = "theme";
+layerinfo name = "Atomic Orange";
 layerinfo redist_uniq = "funkycircles/atomicorange";
 layerinfo author_name = "900degrees";
 
@@ -11,101 +11,91 @@ set layout_resources = [ { "name" => "St
 ##===============================
 
 set color_page_background = "#21232b";
-set color_page_text = "#fff";
 set color_page_link = "#c1c3c7";
 set color_page_link_active = "#FF863B";
 set color_page_link_hover = "#FF863B";
 set color_page_link_visited = "#DBE4BF";
+set color_page_subtitle = "#000";
+set color_page_subtitle_background = "#ff863b";
+set color_page_text = "#fff";
+set color_page_title = "#000";
+set color_page_title_background = "#DBE4BF";
 set color_header_background = "#080E13";
-set color_page_title_background = "#DBE4BF";
-set color_page_title = "#000";
-set color_page_subtitle_background = "#ff863b";
-set color_page_subtitle = "#000";
+set color_footer_link = "#c1c3c7";
+set color_footer_link_hover = "#FF863B";
+set color_footer_link_visited = "#DBE4BF";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#fff";
 set color_entry_border = "#ff863b";
-set color_entry_background = "#fff";
-set color_entry_text = "#000";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#080E13";
-set color_entry_link = "#434343";
-set color_entry_link_hover_background  = "#FFDFCA";
-set color_entry_link_hover = "#000";
-set color_entry_link_visited = "#BD4900";
 set color_entry_footer_background = "#080E13";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#c1c3c7";
 set color_entry_footer_link_hover = "#FF863B";
 set color_entry_footer_link_visited = "#DBE4BF";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#434343";
+set color_entry_link_hover = "#000";
+set color_entry_link_hover_background = "#FFDFCA";
+set color_entry_link_visited = "#BD4900";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#000";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#080E13";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#c1c3c7";
-set color_footer_link_hover = "#FF863B";
-set color_footer_link_visited = "#DBE4BF";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/atomicorange-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/atomicorange-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/atomicorange-header.png";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/atomicorange-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/atomicorange-modulebullet.png";
 set image_module_list_active = "funkycircles/atomicorange-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/atomicorange-modulebullethover.png";
 
-function Page::print_theme_stylesheet()
-{
+function Page::print_theme_stylesheet() {
+    """
+    .module-calendar td.empty-day,
+    .module-search .search-button {
+        background-color: $*color_header_background;
+        }
 
-    """
-/* Modules
-***************************************************************************/
-        .module-calendar td.empty-day,
-        .module-search .search-button {
-            background-color: $*color_header_background;
-            }
+    .module-calendar td.entry-day a,
+    .module-search .search-box {
+        color: $*color_page_subtitle !important;
+        }
 
-            .module-calendar td.entry-day a,
-            .module-search .search-box {
-                color: $*color_page_subtitle !important;
-                }
+    .module-calendar td.entry-day a:visited {
+        color: $*color_page_background !important;
+        text-decoration: none !important;
+        }
 
-                .module-calendar td.entry-day a:visited {
-                    color: $*color_page_background !important;
-                    text-decoration: none !important;
-                    }
-
-                .module-calendar td.entry-day:hover > a,
-                .module-calendar td.entry-day a:hover {
-                    color: $*color_entry_text !important;
-                    }
+    .module-calendar td.entry-day:hover > a,
+    .module-calendar td.entry-day a:hover {
+        color: $*color_entry_text !important;
+        }
     """;
-
 }
 
 
 #NEWLAYER: funkycircles/chocolaterose
-layerinfo "type" = "theme";
-layerinfo "name" = "Chocolate Rose";
+layerinfo type = "theme";
+layerinfo name = "Chocolate Rose";
 layerinfo redist_uniq = "funkycircles/chocolaterose";
 layerinfo author_name = "900degrees";
 
@@ -116,74 +106,68 @@ set layout_resources = [ { "name" => "Di
 ##===============================
 
 set color_page_background = "#4d423d";
-set color_page_text = "#fff";
 set color_page_link = "#DAD1CF";
 set color_page_link_active = "#FFBBC8";
 set color_page_link_hover = "#FFBBC8";
 set color_page_link_visited = "#FFEEB3";
+set color_page_subtitle = "#fff";
+set color_page_subtitle_background = "#B35B6B";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_page_title_background = "#362C2A";
 set color_header_background = "#16130f";
-set color_page_title_background = "#362C2A";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#B35B6B";
-set color_page_subtitle = "#fff";
+set color_footer_link = "#DAD1CF";
+set color_footer_link_hover = "#FFBBC8";
+set color_footer_link_visited = "#FFEEB3";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#fff";
 set color_entry_border = "#B35B6B";
-set color_entry_background = "#fff";
-set color_entry_text = "#000";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#16130f";
-set color_entry_link = "#333";
-set color_entry_link_hover_background  = "#FFBBC8";
-set color_entry_link_hover = "#16130f";
-set color_entry_link_visited = "#AE4055";
 set color_entry_footer_background = "#16130f";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#DAD1CF";
 set color_entry_footer_link_hover = "#FFBBC8";
 set color_entry_footer_link_visited = "#FFEEB3";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#333";
+set color_entry_link_hover = "#16130f";
+set color_entry_link_hover_background = "#FFBBC8";
+set color_entry_link_visited = "#AE4055";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#000";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#16130f";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#DAD1CF";
-set color_footer_link_hover = "#FFBBC8";
-set color_footer_link_visited = "#FFEEB3";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/chocolaterose-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/chocolaterose-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/chocolaterose-header.png";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_position = "top right";
+set image_entry_list_background_position = "center";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/chocolaterose-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
-set image_entry_list_background_position = "center";
 set image_module_list = "funkycircles/chocolaterose-modulebullet.png";
 set image_module_list_active = "funkycircles/chocolaterose-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/chocolaterose-modulebullethover.png";
 
 
 #NEWLAYER: funkycircles/darkblue
-layerinfo "type" = "theme";
-layerinfo "name" = "Dark Blue";
+layerinfo type = "theme";
+layerinfo name = "Dark Blue";
 layerinfo redist_uniq = "funkycircles/darkblue";
 layerinfo author_name = "900degrees";
 
@@ -192,72 +176,67 @@ layerinfo author_name = "900degrees";
 ##===============================
 
 set color_page_background = "#2d385b";
-set color_page_text = "#fff";
 set color_page_link = "#C8C8C8";
 set color_page_link_active = "#fff";
 set color_page_link_hover = "#fff";
 set color_page_link_visited = "#B3E3FF";
+set color_page_subtitle = "#fff";
+set color_page_subtitle_background = "#6c778e";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_page_title_background = "#19243c";
 set color_header_background = "#101423";
-set color_page_title_background = "#19243c";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#6c778e";
-set color_page_subtitle = "#fff";
+set color_footer_link = "#C8C8C8";
+set color_footer_link_hover = "#fff";
+set color_footer_link_visited = "#B3E3FF";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#fff";
 set color_entry_border = "#6c778e";
-set color_entry_background = "#fff";
-set color_entry_text = "#000";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#101423";
-set color_entry_link = "#434343";
-set color_entry_link_hover_background  = "#C8EAFF";
-set color_entry_link_hover = "#19243c";
-set color_entry_link_visited = "#1B479F";
 set color_entry_footer_background = "#101423";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#C8C8C8";
 set color_entry_footer_link_hover = "#fff";
 set color_entry_footer_link_visited = "#B3E3FF";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#434343";
+set color_entry_link_hover = "#19243c";
+set color_entry_link_hover_background = "#C8EAFF";
+set color_entry_link_visited = "#1B479F";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#000";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#101423";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#C8C8C8";
-set color_footer_link_hover = "#fff";
-set color_footer_link_visited = "#B3E3FF";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/darkblue-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/darkblue-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/darkblue-header.png";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/darkblue-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/darkblue-modulebullet.png";
 set image_module_list_active = "funkycircles/darkblue-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/darkblue-modulebullethover.png";
 
 
 #NEWLAYER: funkycircles/darkpurple
-layerinfo "type" = "theme";
-layerinfo "name" = "Dark Purple";
+layerinfo type = "theme";
+layerinfo name = "Dark Purple";
 layerinfo redist_uniq = "funkycircles/darkpurple";
 layerinfo author_name = "900degrees";
 
@@ -268,72 +247,67 @@ set layout_resources = [ { "name" => "Sm
 ##===============================
 
 set color_page_background = "#473A61";
-set color_page_text = "#fff";
 set color_page_link = "#B8B8B8";
 set color_page_link_active = "#fff";
 set color_page_link_hover = "#fff";
 set color_page_link_visited = "#CEC5FF";
+set color_page_subtitle = "#fff";
+set color_page_subtitle_background = "#696580";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_page_title_background = "#24203D";
 set color_header_background = "#211F2C";
-set color_page_title_background = "#24203D";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#696580";
-set color_page_subtitle = "#fff";
+set color_footer_link = "#B8B8B8";
+set color_footer_link_hover = "#fff";
+set color_footer_link_visited = "#CEC5FF";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#fff";
 set color_entry_border = "#696580";
-set color_entry_background = "#fff";
-set color_entry_text = "#000";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#211F2C";
-set color_entry_link = "#434343";
-set color_entry_link_hover_background  = "#CEC5FF";
-set color_entry_link_hover = "#24203D";
-set color_entry_link_visited = "#6540AE";
 set color_entry_footer_background = "#211F2C";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#B8B8B8";
 set color_entry_footer_link_hover = "#fff";
 set color_entry_footer_link_visited = "#CEC5FF";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#434343";
+set color_entry_link_hover = "#24203D";
+set color_entry_link_hover_background = "#CEC5FF";
+set color_entry_link_visited = "#6540AE";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#000";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#211F2C";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#B8B8B8";
-set color_footer_link_hover = "#fff";
-set color_footer_link_visited = "#CEC5FF";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/darkpurple-header.jpg";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/darkpurple-page.jpg";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/darkpurple-header.jpg";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/darkpurple-entrybullet.jpg";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/darkpurple-modulebullet.jpg";
 set image_module_list_active = "funkycircles/darkpurple-modulebulletactive.jpg";
 set image_module_list_hover = "funkycircles/darkpurple-modulebullethover.jpg";
 
 
 #NEWLAYER: funkycircles/earthygreen
-layerinfo "type" = "theme";
-layerinfo "name" = "Earthy Green";
+layerinfo type = "theme";
+layerinfo name = "Earthy Green";
 layerinfo redist_uniq = "funkycircles/earthygreen";
 layerinfo author_name = "900degrees";
 
@@ -344,96 +318,85 @@ set layout_resources = [ { "name" => "Go
 ##===============================
 
 set color_page_background = "#4a684a";
-set color_page_text = "#fff";
 set color_page_link = "#F6FFE1";
 set color_page_link_active = "#E4FFA1";
 set color_page_link_hover = "#E4FFA1";
 set color_page_link_visited = "#FFDEAC";
+set color_page_subtitle = "#000";
+set color_page_subtitle_background = "#F3CE97";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_page_title_background = "#283723";
 set color_header_background = "#1b1f15";
-set color_page_title_background = "#283723";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#F3CE97";
-set color_page_subtitle = "#000";
+set color_footer_link = "#F6FFE1";
+set color_footer_link_hover = "#E4FFA1";
+set color_footer_link_visited = "#FFDEAC";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#fff";
 set color_entry_border = "#F3CE97";
-set color_entry_background = "#fff";
-set color_entry_text = "#000";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#1b1f15";
-set color_entry_link = "#434343";
-set color_entry_link_hover_background  = "#D4EEB0";
-set color_entry_link_hover = "#1b1f15";
-set color_entry_link_visited = "#004D00";
 set color_entry_footer_background = "#1b1f15";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#F6FFE1";
 set color_entry_footer_link_hover = "#E4FFA1";
 set color_entry_footer_link_visited = "#FFDEAC";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#434343";
+set color_entry_link_hover = "#1b1f15";
+set color_entry_link_hover_background = "#D4EEB0";
+set color_entry_link_visited = "#004D00";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#000";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#1b1f15";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#F6FFE1";
-set color_footer_link_hover = "#E4FFA1";
-set color_footer_link_visited = "#FFDEAC";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/earthygreen-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/earthygreen-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/earthygreen-header.png";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/earthygreen-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/earthygreen-modulebullet.png";
 set image_module_list_active = "funkycircles/earthygreen-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/earthygreen-modulebullethover.png";
 
-function Page::print_theme_stylesheet()
-{
+function Page::print_theme_stylesheet() {
+    """
+    .module-calendar td.entry-day a,
+    .module-search .search-box {
+        color: $*color_entry_text !important;
+        }
 
-    """
-/* Modules
-***************************************************************************/
-            .module-calendar td.entry-day a,
-            .module-search .search-box {
-                color: $*color_entry_text !important;
-                }
+    .module-calendar td.entry-day a:visited {
+        color: $*color_page_title_background !important;
+        }
 
-                .module-calendar td.entry-day a:visited {
-                    color: $*color_page_title_background !important;
-                    }
-
-                .module-calendar td.entry-day:hover > a,
-                .module-calendar td.entry-day a:hover {
-                    color: $*color_entry_text !important;
-                    }
-
+    .module-calendar td.entry-day:hover > a,
+    .module-calendar td.entry-day a:hover {
+        color: $*color_entry_text !important;
+        }
     """;
-
 }
 
 
 #NEWLAYER: funkycircles/industrialpink
-layerinfo "type" = "theme";
-layerinfo "name" = "Industrial Pink";
+layerinfo type = "theme";
+layerinfo name = "Industrial Pink";
 layerinfo redist_uniq = "funkycircles/industrialpink";
 layerinfo author_name = "900degrees";
 
@@ -442,99 +405,89 @@ layerinfo author_name = "900degrees";
 ##===============================
 
 set color_page_background = "#626666";
-set color_page_text = "#fff";
 set color_page_link = "#E4E9E8";
 set color_page_link_active = "#78005A";
-set color_page_link_hover = "#FFFF00";
+set color_page_link_hover = "#ff0";
 set color_page_link_visited = "#FFC3FF";
+set color_page_subtitle = "#fff";
+set color_page_subtitle_background = "#CC1684";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
+set color_page_title_background = "#4B4C4F";
 set color_header_background = "#111";
-set color_page_title_background = "#4B4C4F";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#CC1684";
-set color_page_subtitle = "#fff";
+set color_footer_link = "#E4E9E8";
+set color_footer_link_hover = "#ff0";
+set color_footer_link_visited = "#FFC3FF";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#111";
 set color_entry_border = "#CC1684";
-set color_entry_background = "#111";
-set color_entry_text = "#fff";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#222";
-set color_entry_link = "#E4E9E8";
-set color_entry_link_hover_background  = "#FFFF00";
-set color_entry_link_hover = "#111";
-set color_entry_link_visited = "#FF85DB";
 set color_entry_footer_background = "#111";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#E4E9E8";
-set color_entry_footer_link_hover = "#FFFF00";
+set color_entry_footer_link_hover = "#ff0";
 set color_entry_footer_link_visited = "#FF85DB";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#E4E9E8";
+set color_entry_link_hover = "#111";
+set color_entry_link_hover_background = "#ff0";
+set color_entry_link_visited = "#FF85DB";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#fff";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#222";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#E4E9E8";
-set color_footer_link_hover = "#FFFF00";
-set color_footer_link_visited = "#FFC3FF";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/industrial-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/industrial-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/industrial-header.png";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/industrial-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/industrialpink-modulebullet.png";
 set image_module_list_active = "funkycircles/industrial-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/industrial-modulebullethover.png";
 
-function Page::print_theme_stylesheet()
-{
+function Page::print_theme_stylesheet() {
+    """
+    .module-calendar td.entry-day,
+    .module-search .search-box {
+        background-color: $*color_page_link_hover;
+        box-shadow: .067em .067em .134em #444;
+        -moz-box-shadow: .067em .067em .134em #444;
+        -webkit-box-shadow: .067em .067em .134em #444;
+        -khtml-box-shadow: .067em .067em .134em #444;
+        }
 
-    """
-/* Modules
-***************************************************************************/
-        .module-calendar td.entry-day,
-        .module-search .search-box {
-            background-color: $*color_page_link_hover;
-            box-shadow: .067em .067em .134em #444;
-            -moz-box-shadow: .067em .067em .134em #444;
-            -webkit-box-shadow: .067em .067em .134em #444;
-            -khtml-box-shadow: .067em .067em .134em #444;
-            }
+    .module-calendar td.entry-day a:visited {
+        color: $*color_page_background !important;
+        }
 
-                .module-calendar td.entry-day a:visited {
-                    color: $*color_page_background !important;
-                    }
-
-                .module-calendar td.entry-day:hover > a,
-                .module-calendar td.entry-day a:hover {
-                    color: $*color_entry_text !important;
-                    }
+    .module-calendar td.entry-day:hover > a,
+    .module-calendar td.entry-day a:hover {
+        color: $*color_entry_text !important;
+        }
     """;
-
 }
 
 
 #NEWLAYER: funkycircles/industrialteal
-layerinfo "type" = "theme";
-layerinfo "name" = "Industrial Teal";
+layerinfo type = "theme";
+layerinfo name = "Industrial Teal";
 layerinfo redist_uniq = "funkycircles/industrialteal";
 layerinfo author_name = "900degrees";
 
@@ -545,93 +498,83 @@ set layout_resources = [ { "name" => "To
 ##===============================
 
 set color_page_background = "#5A5A5A";
+set color_page_link = "#DDE1E0";
+set color_page_link_active = "#ff0";
+set color_page_link_hover = "#ff0";
+set color_page_link_visited = "#88F2FF";
+set color_page_subtitle = "#fff";
+set color_page_subtitle_background = "#1693A5";
 set color_page_text = "#fff";
-set color_page_link = "#DDE1E0";
-set color_page_link_active = "#FFFF00";
-set color_page_link_hover = "#FFFF00";
-set color_page_link_visited = "#88F2FF";
+set color_page_title = "#fff";
+set color_page_title_background = "#3D3D3D";
 set color_header_background = "#111";
-set color_page_title_background = "#3D3D3D";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#1693A5";
-set color_page_subtitle = "#fff";
+set color_footer_link = "#DDE1E0";
+set color_footer_link_hover = "#ff0";
+set color_footer_link_visited = "#88F2FF";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#fff";
+set color_entry_background = "#111";
 set color_entry_border = "#1693A5";
-set color_entry_background = "#111";
-set color_entry_text = "#fff";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#222";
-set color_entry_link = "#CED2D1";
-set color_entry_link_hover_background  = "#FFFF00";
-set color_entry_link_hover = "#111";
-set color_entry_link_visited = "#88F2FF";
 set color_entry_footer_background = "#111";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#CED2D1";
-set color_entry_footer_link_hover = "#FFFF00";
+set color_entry_footer_link_hover = "#ff0";
 set color_entry_footer_link_visited = "#88F2FF";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#CED2D1";
+set color_entry_link_hover = "#111";
+set color_entry_link_hover_background = "#ff0";
+set color_entry_link_visited = "#88F2FF";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#fff";
+set color_entry_title = "#fff";
+set color_entry_userpic_border = "#222";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#fff";
 set color_module_title = "#fff";
-set color_module_text = "#fff";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#DDE1E0";
-set color_footer_link_hover = "#FFFF00";
-set color_footer_link_visited = "#88F2FF";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/industrial-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/industrial-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/industrial-header.png";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/industrial-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/industrialteal-modulebullet.png";
 set image_module_list_active = "funkycircles/industrial-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/industrial-modulebullethover.png";
 
-function Page::print_theme_stylesheet()
-{
+function Page::print_theme_stylesheet() {
+    """
+    .module-calendar td.entry-day,
+    .module-search .search-box {
+        background-color: $*color_page_link_hover;
+        box-shadow: .067em .067em .134em #444;
+        -moz-box-shadow: .067em .067em .134em #444;
+        -webkit-box-shadow: .067em .067em .134em #444;
+        -khtml-box-shadow: .067em .067em .134em #444;
+        }
 
-    """
-/* Modules
-***************************************************************************/
-        .module-calendar td.entry-day,
-        .module-search .search-box {
-            background-color: $*color_page_link_hover;
-            box-shadow: .067em .067em .134em #444;
-            -moz-box-shadow: .067em .067em .134em #444;
-            -webkit-box-shadow: .067em .067em .134em #444;
-            -khtml-box-shadow: .067em .067em .134em #444;
-            }
+    .module-calendar td.entry-day a:visited {
+        color: $*color_page_background !important;
+        }
 
-                .module-calendar td.entry-day a:visited {
-                    color: $*color_page_background !important;
-                    }
-
-                .module-calendar td.entry-day:hover > a,
-                .module-calendar td.entry-day a:hover {
-                    color: $*color_entry_text !important;
-                    }
+    .module-calendar td.entry-day:hover > a,
+    .module-calendar td.entry-day a:hover {
+        color: $*color_entry_text !important;
+        }
     """;
-
 }
 
 
@@ -648,78 +591,72 @@ set theme_authors = [ { "name" => "cesy"
 ##===============================
 
 set color_page_background = "#473a61";
-set color_page_border = "#ffffff";
-set color_page_text = "#ffffff";
-set color_page_link = "#ddddff";
-set color_page_link_active = "#ffcccc";
-set color_page_link_hover = "#ccffcc";
-set color_page_link_visited = "#ffffcc";
-set color_header_background = "#666666";
-set color_page_title = "#ffffff";
+set color_page_border = "#fff";
+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_subtitle = "#fff";
+set color_page_subtitle_background = "#473a61";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
 set color_page_title_background = "#473a61";
-set color_page_subtitle = "#ffffff";
-set color_page_subtitle_background = "#473a61";
+set color_header_background = "#666";
+set color_footer_background = "#666";
+set color_footer_link = "#ddf";
+set color_footer_link_active = "#fcc";
+set color_footer_link_hover = "#cfc";
+set color_footer_link_visited = "#ffc";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#ffffff";
-set color_entry_title_background = "#330066";
-set color_entry_background = "#000000";
-set color_entry_border = "#9900ff";
-set color_entry_text = "#ffffff";
-set color_entry_poster_border = "#ffffff";
-set color_entry_userpic_border = "#ffffff";
-set color_entry_link = "#ddddff";
-set color_entry_link_active = "#ffcccc";
-set color_entry_link_hover = "#ccffcc";
-set color_entry_link_hover_background = "#000000";
-set color_entry_link_visited = "#ffffcc";
-set color_entry_footer_background = "#000000";
-set color_entry_footer_text = "#ffffff";
-set color_entry_footer_border = "#ffffff";
-set color_entry_footer_link = "#ddddff";
-set color_entry_footer_link_active = "#ffcccc";
-set color_entry_footer_link_hover = "#ccffcc";
-set color_entry_footer_link_visited = "#ffffcc";
-set color_entry_interaction_links = "#ffffff";
-
-set color_comment_title_background = "#660066";
+set color_entry_background = "#000";
+set color_entry_border = "#90f";
+set color_entry_footer_background = "#000";
+set color_entry_footer_border = "#fff";
+set color_entry_footer_link = "#ddf";
+set color_entry_footer_link_active = "#fcc";
+set color_entry_footer_link_hover = "#cfc";
+set color_entry_footer_link_visited = "#ffc";
+set color_entry_footer_text = "#fff";
+set color_entry_interaction_links = "#fff";
+set color_entry_link = "#ddf";
+set color_entry_link_active = "#fcc";
+set color_entry_link_hover = "#cfc";
+set color_entry_link_hover_background = "#000";
+set color_entry_link_visited = "#ffc";
+set color_entry_poster_border = "#fff";
+set color_entry_text = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#306";
+set color_entry_userpic_border = "#fff";
+set color_comment_title_background = "#606";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#330066";
-set color_module_border = "#eeeeee";
-set color_module_title = "#ffffff";
-set color_module_title_background = "#666666";
-set color_module_text = "#ffffff";
-set color_module_link = "#ddddff";
-set color_module_link_active = "#ffcccc";
-set color_module_link_hover = "#ccffcc";
-set color_module_link_visited = "#ffffcc";
+set color_module_background = "#306";
+set color_module_border = "#eee";
+set color_module_link = "#ddf";
+set color_module_link_active = "#fcc";
+set color_module_link_hover = "#cfc";
+set color_module_link_visited = "#ffc";
+set color_module_text = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#666";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_background = "#666666";
-set color_footer_link = "#ddddff";
-set color_footer_link_active = "#ffcccc";
-set color_footer_link_hover = "#ccffcc";
-set color_footer_link_visited = "#ffffcc";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/darkpurple-header.jpg";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/darkpurple-page.jpg";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/darkpurple-header.jpg";
-set image_background_header_repeat = "no-repeat";
 set image_module_list = "funkycircles/darkpurple-modulebullet.jpg";
 set image_module_list_hover = "funkycircles/darkpurple-modulebullethover.jpg";
 
@@ -737,73 +674,63 @@ set layout_resources = [ { "name" => "Wo
 ## Page Colors
 ##===============================
 
-set color_page_background = "#000000";
-set color_page_border = "#333333";
-set color_page_link = "#eeeeee";
-set color_page_link_active = "#eeeeee";
-set color_page_link_hover = "#eeeeee";
-set color_page_link_visited = "#eeeeee";
-set color_page_subtitle = "#666666";
-set color_page_subtitle_background = "#333333";
-set color_page_text = "#666666";
-set color_page_title = "#770000";
-set color_page_title_background = "#000000";
+set color_page_background = "#000";
+set color_page_border = "#333";
+set color_page_link = "#eee";
+set color_page_link_active = "#eee";
+set color_page_link_hover = "#eee";
+set color_page_link_visited = "#eee";
+set color_page_subtitle = "#666";
+set color_page_subtitle_background = "#333";
+set color_page_text = "#666";
+set color_page_title = "#700";
+set color_page_title_background = "#000";
+set color_header_background = "#000";
+set color_footer_background = "#000";
+set color_footer_link = "#700";
+set color_footer_link_active = "#700";
+set color_footer_link_hover = "#700";
+set color_footer_link_visited = "#700";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_background = "#000000";
-set color_entry_border = "#333333";
-set color_entry_footer_background = "#000000";
-set color_entry_footer_border = "#333333";
-set color_entry_footer_link = "#eeeeee";
-set color_entry_footer_link_active = "#eeeeee";
-set color_entry_footer_link_hover = "#ffffff";
-set color_entry_footer_link_visited = "#eeeeee";
-set color_entry_footer_text = "#770000";
-set color_entry_interaction_links = "#eeeeee";
-set color_entry_link = "#eeeeee";
-set color_entry_link_active = "#eeeeee";
-set color_entry_link_hover = "#eeeeee";
-set color_entry_link_hover_background = "#000000";
-set color_entry_link_visited = "#eeeeee";
-set color_entry_poster_border = "#666666";
-set color_entry_text = "#666666";
-set color_entry_title = "#770000";
-set color_entry_title_background = "#000000";
-set color_entry_userpic_border = "#666666";
-
-##===============================
-## Comment Colors
-##===============================
-
-set color_comment_title_background = "#000000";
+set color_entry_background = "#000";
+set color_entry_border = "#333";
+set color_entry_footer_background = "#000";
+set color_entry_footer_border = "#333";
+set color_entry_footer_link = "#eee";
+set color_entry_footer_link_active = "#eee";
+set color_entry_footer_link_hover = "#fff";
+set color_entry_footer_link_visited = "#eee";
+set color_entry_footer_text = "#700";
+set color_entry_interaction_links = "#eee";
+set color_entry_link = "#eee";
+set color_entry_link_active = "#eee";
+set color_entry_link_hover = "#eee";
+set color_entry_link_hover_background = "#000";
+set color_entry_link_visited = "#eee";
+set color_entry_poster_border = "#666";
+set color_entry_text = "#666";
+set color_entry_title = "#700";
+set color_entry_title_background = "#000";
+set color_entry_userpic_border = "#666";
+set color_comment_title_background = "#000";
 
 ##===============================
 ## Module Colors
 ##===============================
 
-set color_module_background = "#333333";
-set color_module_border = "#770000";
-set color_module_link = "#eeeeee";
-set color_module_link_active = "#eeeeee";
-set color_module_link_hover = "#eeeeee";
-set color_module_link_visited = "#eeeeee";
-set color_module_text = "#666666";
-set color_module_title = "#770000";
-set color_module_title_background = "#000000";
-
-##===============================
-## Footer Colors
-##===============================
-
-set color_footer_background = "#000000";
-set color_footer_link = "#770000";
-set color_footer_link_active = "#770000";
-set color_footer_link_hover = "#770000";
-set color_footer_link_visited = "#770000";
-set color_header_background = "#000000";
+set color_module_background = "#333";
+set color_module_border = "#700";
+set color_module_link = "#eee";
+set color_module_link_active = "#eee";
+set color_module_link_hover = "#eee";
+set color_module_link_visited = "#eee";
+set color_module_text = "#666";
+set color_module_title = "#700";
+set color_module_title_background = "#000";
 
 ##===============================
 ## Fonts
@@ -831,17 +758,9 @@ set font_module_text_units = "em";
 ## Images
 ##===============================
 
-set image_background_entry_position = "top left";
-set image_background_entry_repeat = "repeat";
-set image_background_header_position = "top center";
-set image_background_header_repeat = "no-repeat";
-set image_background_module_position = "top left";
-set image_background_module_repeat = "repeat";
 set image_background_page_position = "top right";
 set image_background_page_repeat = "repeat";
 set image_background_page_url = "funkycircles/nevermore-background.png";
-set image_entry_list_background_position = "top center";
-set image_entry_list_background_repeat = "no-repeat";
 
 
 #NEWLAYER: funkycircles/nnwm2009
@@ -852,28 +771,34 @@ layerinfo author_name = "zvi";
 
 set theme_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_footer_background = "#ffefbd";
-set color_footer_link = "#ef8229";
+##===============================
+## Page Colors
+##===============================
 
-set color_header_background = "#ffefbd";
-
-set color_module_background = "#ffefbd";
-set color_module_text="#000000";
-set color_module_title = "#ef8229";
-
-set color_page_background = "#000000";
+set color_page_background = "#000";
 set color_page_border = "#842021";
 set color_page_link = "#429ace";
 set color_page_link_active = "#A5CF39";
 set color_page_link_hover = "#842021";
 set color_page_link_visited = "#ef4921";
-set color_page_text = "#ffffff";
+set color_page_text = "#fff";
 set color_page_title = "#ef8229";
+set color_header_background = "#ffefbd";
+set color_footer_background = "#ffefbd";
+set color_footer_link = "#ef8229";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#ffefbd";
+set color_module_text="#000";
+set color_module_title = "#ef8229";
 
 
 #NEWLAYER: funkycircles/seablues
-layerinfo "type" = "theme";
-layerinfo "name" = "Sea Blues";
+layerinfo type = "theme";
+layerinfo name = "Sea Blues";
 layerinfo redist_uniq = "funkycircles/seablues";
 layerinfo author_name = "900degrees";
 
@@ -882,64 +807,59 @@ layerinfo author_name = "900degrees";
 ##===============================
 
 set color_page_background = "#C2D6DC";
-set color_page_text = "#000";
 set color_page_link = "#03525C";
 set color_page_link_active = "#000";
 set color_page_link_hover = "#000";
 set color_page_link_visited = "#002F9C";
+set color_page_subtitle = "#fff";
+set color_page_subtitle_background = "#368F88";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_page_title_background = "#03525C";
 set color_header_background = "#0a142b";
-set color_page_title_background = "#03525C";
-set color_page_title = "#fff";
-set color_page_subtitle_background = "#368F88";
-set color_page_subtitle = "#fff";
+set color_footer_link = "#03525C";
+set color_footer_link_hover = "#000";
+set color_footer_link_visited = "#002F9C";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#000";
+set color_entry_background = "#fff";
 set color_entry_border = "#368F88";
-set color_entry_background = "#fff";
-set color_entry_text = "#000000";
-set color_entry_poster_border = "#7D7D7D";
-set color_entry_userpic_border = "#0a142b";
-set color_entry_link = "#333";
-set color_entry_link_hover_background  = "#C2D6DC";
-set color_entry_link_hover = "#02444D";
-set color_entry_link_visited = "#002F9C";
 set color_entry_footer_background = "#0a142b";
-set color_entry_footer_text = "#fff";
 set color_entry_footer_border = "#7D7D7D";
 set color_entry_footer_link = "#DFDFDF";
 set color_entry_footer_link_hover = "#fff";
 set color_entry_footer_link_visited = "#00C3B2";
+set color_entry_footer_text = "#fff";
+set color_entry_link = "#333";
+set color_entry_link_hover = "#02444D";
+set color_entry_link_hover_background = "#C2D6DC";
+set color_entry_link_visited = "#002F9C";
+set color_entry_poster_border = "#7D7D7D";
+set color_entry_text = "#000";
+set color_entry_title = "#000";
+set color_entry_userpic_border = "#0a142b";
 
 ##===============================
 ## Module Colors
 ##===============================
 
+set color_module_text = "#000";
 set color_module_title = "#000";
-set color_module_text = "#000";
 
 ##===============================
-## Footer Colors
+## Images
 ##===============================
 
-set color_footer_link = "#03525C";
-set color_footer_link_hover = "#000";
-set color_footer_link_visited = "#002F9C";
-
-#=================
-# Images
-#=================
-
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "funkycircles/seablues-header.png";
+set image_background_page_position = "bottom left";
+set image_background_page_repeat = "no-repeat";
 set image_background_page_url = "funkycircles/seablues-page.png";
-set image_background_page_repeat = "no-repeat";
-set image_background_page_position = "bottom left";
-set image_background_header_url = "funkycircles/seablues-header.png";
-set image_background_header_repeat = "no-repeat";
+set image_entry_list_background_repeat = "no-repeat";
 set image_entry_list_background_url = "funkycircles/seablues-entrybullet.png";
-set image_entry_list_background_repeat = "no-repeat";
 set image_module_list = "funkycircles/seablues-modulebullet.png";
 set image_module_list_active = "funkycircles/seablues-modulebulletactive.png";
 set image_module_list_hover = "funkycircles/seablues-modulebullethover.png";
--------------------------------------------------------------------------------