fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2012-05-01 04:29 am
  • Add Memory
  • Share This Entry

[dw-free] Standardize/Clean/Reformat themes.s2 files

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

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

Hibiscus: reformatting and minor tweaks: sort props and lines, split
font_base into font_base and font_fallback, remove URL from the comment
about resources (blank page). Also adds a missing comment title color for
the first two themes.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/hibiscus/themes.s2
--------------------------------------------------------------------------------
diff -r da88aac82467 -r 9c6883e1539e bin/upgrading/s2layers/hibiscus/themes.s2
--- a/bin/upgrading/s2layers/hibiscus/themes.s2	Sun Apr 29 22:01:47 2012 +0000
+++ b/bin/upgrading/s2layers/hibiscus/themes.s2	Tue May 01 12:29:12 2012 +0800
@@ -1,49 +1,31 @@
 #NEWLAYER: hibiscus/buttercupsummer
 layerinfo type = "theme";
 layerinfo name = "Buttercup Summer";
+layerinfo redist_uniq = "hibiscus/buttercupsummer";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/buttercupsummer";
 
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
-## Fonts
-##===============================
-set font_base = "'Times New Roman', serif";
-set font_comment_title = "'Century Gothic', Verdana, sans-serif";
-set font_entry_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
-set font_module_heading = "'Century Gothic', Verdana, sans-serif";
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_header_url = "hibiscus/buttercupsummer.png";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_position = "bottom left";
-
-##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#fff";
+set color_page_link = "#37c75c";
+set color_page_link_active = "#009";
+set color_page_link_visited = "#2ca04a";
+set color_page_text = "#000";
+set color_page_title = "#fff";
 set color_header_background = "#4d2455";
 set color_footer_background = "#4d2455";
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#37c75c";
-set color_page_link_visited = "#2ca04a";
-set color_page_link_active = "#009";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#dcc300";
+set color_comment_title = "#dcc300";
 
 ##===============================
 ## Module Colors
@@ -52,54 +34,55 @@
 set color_module_border = "#4d2455";
 set color_module_title = "#dcc300";
 
-
-#NEWLAYER: hibiscus/buttercupsummernight
-layerinfo type = "theme";
-layerinfo name = "Buttercup Summer Night";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/buttercupsummernight";
-
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
 ##===============================
 ## Fonts
 ##===============================
-set font_base = "'Times New Roman', serif";
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
 set font_comment_title = "'Century Gothic', Verdana, sans-serif";
 set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_module_heading = "'Century Gothic', Verdana, sans-serif";
 
 ##===============================
-## Page Images
+## Images
 ##===============================
 
 set image_background_header_position = "bottom left";
 set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "hibiscus/buttercupsummer.png";
 
+
+#NEWLAYER: hibiscus/buttercupsummernight
+layerinfo type = "theme";
+layerinfo name = "Buttercup Summer Night";
+layerinfo redist_uniq = "hibiscus/buttercupsummernight";
+layerinfo author_name = "branchandroot";
+
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
 ##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#1c031c";
+set color_page_link = "#88de9e";
+set color_page_link_active = "#99f";
+set color_page_link_visited = "#37c75c";
+set color_page_title = "#fff";
+set color_page_text = "#fff";
 set color_header_background = "#6c536c";
 set color_footer_background = "#6c536c";
-set color_page_background = "#1c031c";
-set color_page_text = "#fff";
-set color_page_link = "#88de9e";
-set color_page_link_visited = "#37c75c";
-set color_page_link_active = "#99f";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#f5ff85";
+set color_comment_title = "#f5ff85";
 
 ##===============================
 ## Module Colors
@@ -108,59 +91,54 @@
 set color_module_border = "#6c536c";
 set color_module_title = "#f5ff85";
 
+##===============================
+## Fonts
+##===============================
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_position = "bottom left";
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "hibiscus/buttercupsummer.png";
+
 
 #NEWLAYER: hibiscus/earlymorning
 layerinfo type = "theme";
 layerinfo name = "Early Morning";
+layerinfo redist_uniq = "hibiscus/earlymorning";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/earlymorning";
 
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
-## Fonts
-##===============================
-set font_base = "'Times New Roman', serif";
-set font_comment_title = "'Century Gothic', Verdana, sans-serif";
-set font_entry_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
-set font_module_heading = "'Century Gothic', Verdana, sans-serif";
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_header_position = "bottom left";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_url = "hibiscus/earlymorning.png";
-
-##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#fff";
+set color_page_link = "#5536c8";
+set color_page_link_active = "#a00";
+set color_page_link_visited = "#442b9f";
+set color_page_text = "#000";
+set color_page_title = "#fff";
 set color_header_background = "#aDaC98";
 set color_footer_background = "#aDaC98";
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#5536c8";
-set color_page_link_visited = "#442b9f";
-set color_page_link_active = "#a00";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#55b9ff";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#55b9ff";
 
 ##===============================
@@ -170,58 +148,54 @@
 set color_module_border = "aDaC98";
 set color_module_title = "#55b9ff";
 
-
-#NEWLAYER: hibiscus/earlynight
-layerinfo type = "theme";
-layerinfo name = "Early Night";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/earlynight";
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
 ##===============================
 ## Fonts
 ##===============================
-set font_base = "'Times New Roman', serif";
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
 set font_comment_title = "'Century Gothic', Verdana, sans-serif";
 set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_module_heading = "'Century Gothic', Verdana, sans-serif";
 
 ##===============================
-## Page Images
+## Images
 ##===============================
 
 set image_background_header_position = "bottom left";
 set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "hibiscus/earlymorning.png";
 
+
+#NEWLAYER: hibiscus/earlynight
+layerinfo type = "theme";
+layerinfo name = "Early Night";
+layerinfo redist_uniq = "hibiscus/earlynight";
+layerinfo author_name = "branchandroot";
+
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
 ##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#1a1600";
+set color_page_link = "#92dafc";
+set color_page_link_active = "#fcc";
+set color_page_link_visited = "#a997ed";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
 set color_header_background = "#aDaC98";
 set color_footer_background = "#aDaC98";
-set color_page_background = "#1a1600";
-set color_page_text = "#fff";
-set color_page_link = "#92dafc";
-set color_page_link_visited = "#a997ed";
-set color_page_link_active = "#fcc";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#55fdff";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#55b9ff";
 
 ##===============================
@@ -231,58 +205,54 @@
 set color_module_border = "CDCCB8";
 set color_module_title = "#55fdff";
 
+##===============================
+## Fonts
+##===============================
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_position = "bottom left";
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "hibiscus/earlymorning.png";
+
 
 #NEWLAYER: hibiscus/margarita
 layerinfo type = "theme";
 layerinfo name = "Margarita";
+layerinfo redist_uniq = "hibiscus/margarita";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/margarita";
 
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
-## Fonts
-##===============================
-set font_base = "'Times New Roman', serif";
-set font_comment_title = "'Century Gothic', Verdana, sans-serif";
-set font_entry_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
-set font_module_heading = "'Century Gothic', Verdana, sans-serif";
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_header_position = "bottom left";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_url = "hibiscus/margarita.png";
-
-##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#fff";
+set color_page_link = "#369dc8";
+set color_page_link_active = "#a00";
+set color_page_link_visited = "#2c7ea0";
+set color_page_text = "#000";
+set color_page_title = "#fff";
 set color_header_background = "#742740";
 set color_footer_background = "#742740";
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#369dc8";
-set color_page_link_visited = "#2c7ea0";
-set color_page_link_active = "#a00";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#55ef65";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#55ef65";
 
 ##===============================
@@ -292,58 +262,54 @@
 set color_module_border = "742740";
 set color_module_title = "#55ef65";
 
-
-#NEWLAYER: hibiscus/margaritanight
-layerinfo type = "theme";
-layerinfo name = "Margarita Night";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/margaritanight";
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
 ##===============================
 ## Fonts
 ##===============================
-set font_base = "'Times New Roman', serif";
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
 set font_comment_title = "'Century Gothic', Verdana, sans-serif";
 set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_module_heading = "'Century Gothic', Verdana, sans-serif";
 
 ##===============================
-## Page Images
+## Images
 ##===============================
 
 set image_background_header_position = "bottom left";
 set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "hibiscus/margarita.png";
 
+
+#NEWLAYER: hibiscus/margaritanight
+layerinfo type = "theme";
+layerinfo name = "Margarita Night";
+layerinfo redist_uniq = "hibiscus/margaritanight";
+layerinfo author_name = "branchandroot";
+
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
 ##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#3a0016";
+set color_page_link = "#88c5de";
+set color_page_link_active = "#f99";
+set color_page_link_visited = "#369dc8";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
 set color_header_background = "#7a4056";
 set color_footer_background = "#7a4056";
-set color_page_background = "#3a0016";
-set color_page_text = "#fff";
-set color_page_link = "#88c5de";
-set color_page_link_visited = "#369dc8";
-set color_page_link_active = "#f99";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#75ef85";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#75ef85";
 
 ##===============================
@@ -353,58 +319,54 @@
 set color_module_border = "7a4056";
 set color_module_title = "#75ef85";
 
+##===============================
+## Fonts
+##===============================
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_position = "bottom left";
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "hibiscus/margarita.png";
+
 
 #NEWLAYER: hibiscus/roseate
 layerinfo type = "theme";
 layerinfo name = "Roseate";
+layerinfo redist_uniq = "hibiscus/roseate";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/roseate";
 
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
-## Fonts
-##===============================
-set font_base = "'Times New Roman', serif";
-set font_comment_title = "'Century Gothic', Verdana, sans-serif";
-set font_entry_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
-set font_module_heading = "'Century Gothic', Verdana, sans-serif";
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_header_position = "bottom left";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_url = "hibiscus/roseate.png";
-
-##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#fff";
+set color_page_link = "#c83677";
+set color_page_link_active = "#00c";
+set color_page_link_visited = "#a02c60";
+set color_page_text = "#000";
+set color_page_title = "#000";
 set color_header_background = "#D7EAC1";
 set color_footer_background = "#D7EAC1";
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#c83677";
-set color_page_link_visited = "#a02c60";
-set color_page_link_active = "#00c";
-set color_page_title = "#000";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#752bcd";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#752bcd";
 
 ##===============================
@@ -413,60 +375,55 @@
 
 set color_module_border = "a7bA91";
 set color_module_title = "#752bcd";
-set color_module_border = "a7bA91";
-
-
-#NEWLAYER: hibiscus/roseatenight
-layerinfo type = "theme";
-layerinfo name = "Roseate Night";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/roseatenight";
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
 ## Fonts
 ##===============================
-set font_base = "'Times New Roman', serif";
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
 set font_comment_title = "'Century Gothic', Verdana, sans-serif";
 set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_module_heading = "'Century Gothic', Verdana, sans-serif";
 
 ##===============================
-## Page Images
+## Images
 ##===============================
 
 set image_background_header_position = "bottom left";
 set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "hibiscus/roseate.png";
 
+
+#NEWLAYER: hibiscus/roseatenight
+layerinfo type = "theme";
+layerinfo name = "Roseate Night";
+layerinfo redist_uniq = "hibiscus/roseatenight";
+layerinfo author_name = "branchandroot";
+
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
 ##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#28181B";
+set color_page_link = "#de86ad";
+set color_page_link_active = "#ccf";
+set color_page_link_visited = "#c83878";
+set color_page_text = "#fff";
+set color_page_title = "#28181B";
 set color_header_background = "#E4CBCB";
 set color_footer_background = "#E4CBCB";
-set color_page_background = "#28181B"; #031c03
-set color_page_text = "#fff";
-set color_page_link = "#de86ad";
-set color_page_link_visited = "#c83878";
-set color_page_link_active = "#ccf";
-set color_page_title = "#28181B";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#fea6cd";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#fea6cd";
 
 ##===============================
@@ -476,58 +433,54 @@
 set color_module_border = "D7EAC1";
 set color_module_title = "#fea6cd";
 
+##===============================
+## Fonts
+##===============================
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_position = "bottom left";
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "hibiscus/roseate.png";
+
 
 #NEWLAYER: hibiscus/tangerine
 layerinfo type = "theme";
 layerinfo name = "Tangerine";
+layerinfo redist_uniq = "hibiscus/tangerine";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/tangerine";
 
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
-## Fonts
-##===============================
-set font_base = "'Times New Roman', serif";
-set font_comment_title = "'Century Gothic', Verdana, sans-serif";
-set font_entry_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
-set font_module_heading = "'Century Gothic', Verdana, sans-serif";
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_header_position = "bottom left";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_url = "hibiscus/tangerine.png";
-
-##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#fff";
+set color_page_link = "#51c836";
+set color_page_link_active = "#009";
+set color_page_link_visited = "#42a02c";
+set color_page_text = "#000";
+set color_page_title = "#fff";
 set color_header_background = "#244D55";
 set color_footer_background = "#244D55";
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#51c836";
-set color_page_link_visited = "#42a02c";
-set color_page_link_active = "#009";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#fcab2c";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#fcab2c";
 
 ##===============================
@@ -537,58 +490,54 @@
 set color_module_border = "#244D55";
 set color_module_title = "#fcab2c";
 
-
-#NEWLAYER: hibiscus/tangerinenight
-layerinfo type = "theme";
-layerinfo name = "Tangerine Night";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/tangerinenight";
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
 ##===============================
 ## Fonts
 ##===============================
-set font_base = "'Times New Roman', serif";
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
 set font_comment_title = "'Century Gothic', Verdana, sans-serif";
 set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_module_heading = "'Century Gothic', Verdana, sans-serif";
 
 ##===============================
-## Page Images
+## Images
 ##===============================
 
 set image_background_header_position = "bottom left";
 set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "hibiscus/tangerine.png";
 
+
+#NEWLAYER: hibiscus/tangerinenight
+layerinfo type = "theme";
+layerinfo name = "Tangerine Night";
+layerinfo redist_uniq = "hibiscus/tangerinenight";
+layerinfo author_name = "branchandroot";
+
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
 ##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#03032c";
+set color_page_link = "#99dd87";
+set color_page_link_active = "#99f";
+set color_page_link_visited = "#51c836";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
 set color_header_background = "#244D55";
 set color_footer_background = "#244D55";
-set color_page_background = "#03032c";
-set color_page_text = "#fff";
-set color_page_link = "#99dd87";
-set color_page_link_visited = "#51c836";
-set color_page_link_active = "#99f";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#febc54";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#febc54";
 
 ##===============================
@@ -598,59 +547,54 @@
 set color_module_border = "#446D75";
 set color_module_title = "#febc54";
 
+##===============================
+## Fonts
+##===============================
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_position = "bottom left";
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "hibiscus/tangerine.png";
+
 
 #NEWLAYER: hibiscus/tropical
 layerinfo type = "theme";
 layerinfo name = "Tropical";
+layerinfo redist_uniq = "hibiscus/tropical";
 layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/tropical";
 
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
 ##===============================
-## Fonts
-##===============================
-set font_base = "'Times New Roman', serif";
-set font_comment_title = "'Century Gothic', Verdana, sans-serif";
-set font_entry_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
-set font_module_heading = "'Century Gothic', Verdana, sans-serif";
-
-
-##===============================
-## Page Images
-##===============================
-
-set image_background_header_position = "bottom left";
-set image_background_header_repeat = "no-repeat";
-set image_background_header_url = "hibiscus/tropical.png";
-
-##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#fff";
+set color_page_link = "#abc837";
+set color_page_link_active = "#009";
+set color_page_link_visited = "#677821";
+set color_page_title = "#fff";
+set color_page_text = "#000";
 set color_header_background = "#6c5353";
 set color_footer_background = "#6c5353";
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#abc837";
-set color_page_link_visited = "#677821";
-set color_page_link_active = "#009";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#ff2a2a";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#ff2a2a";
 
 ##===============================
@@ -660,58 +604,54 @@
 set color_module_border = "#6c5353";
 set color_module_title = "#ff2a2a";
 
-
-#NEWLAYER: hibiscus/tropicalnight
-layerinfo type = "theme";
-layerinfo name = "Tropical Night";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "hibiscus/tropicalnight";
-
-#image is edited from public domain image "Hibiscus Remixed" by Kattekrab (http://openclipart.org/media/files/kattekrab/9689)
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
 ##===============================
 ## Fonts
 ##===============================
-set font_base = "'Times New Roman', serif";
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
 set font_comment_title = "'Century Gothic', Verdana, sans-serif";
 set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_journal_title = "'Century Gothic', Verdana, sans-serif";
-set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
 set font_module_heading = "'Century Gothic', Verdana, sans-serif";
 
 ##===============================
-## Page Images
+## Images
 ##===============================
 
 set image_background_header_position = "bottom left";
 set image_background_header_repeat = "no-repeat";
 set image_background_header_url = "hibiscus/tropical.png";
 
+
+#NEWLAYER: hibiscus/tropicalnight
+layerinfo type = "theme";
+layerinfo name = "Tropical Night";
+layerinfo redist_uniq = "hibiscus/tropicalnight";
+layerinfo author_name = "branchandroot";
+
+# Image is edited from public domain image "Hibiscus Remixed" by Kattekrab
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
 ##===============================
 ## Page Colors
 ##===============================
 
+set color_page_background = "#1c0303";
+set color_page_link = "#ccdd86";
+set color_page_link_active = "#009";
+set color_page_link_visited = "#abc837";
+set color_page_text = "#fff";
+set color_page_title = "#fff";
 set color_header_background = "#6c5353";
 set color_footer_background = "#6c5353";
-set color_page_background = "#1c0303";
-set color_page_text = "#fff";
-set color_page_link = "#ccdd86";
-set color_page_link_visited = "#abc837";
-set color_page_link_active = "#009";
-set color_page_title = "#fff";
 
 ##===============================
 ## Entry Colors
 ##===============================
 
 set color_entry_title = "#fe5555";
-
-##===============================
-## Comment Colors
-##===============================
-
 set color_comment_title = "#fe5555";
 
 ##===============================
@@ -721,3 +661,22 @@
 set color_module_border = "#6c5353";
 set color_module_title = "#fe5555";
 
+##===============================
+## Fonts
+##===============================
+
+set font_base = "'Times New Roman'";
+set font_fallback = "serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_position = "bottom left";
+set image_background_header_repeat = "no-repeat";
+set image_background_header_url = "hibiscus/tropical.png";
--------------------------------------------------------------------------------