This is an autogenerated patch header for a single-debian-patch file. The
delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.

--- darkcold-gtk-theme-5.0.0.orig/gtk-3.20/gtk.css
+++ darkcold-gtk-theme-5.0.0/gtk-3.20/gtk.css
@@ -1,6 +1,7 @@
 /**
  * DarkCold GTK Theme
  * @author originalseed
+ * @since 2018-06-01
  * 
  * For dev
  * sudo apt-get install gtk-3-examples
@@ -44,6 +45,7 @@
 @define-color theme_text_color #6EBEFE;
 @define-color theme_bg_color #232323;
 @define-color theme_fg_color @theme_text_color;
+@define-color text_view_bg #0b0b0d;
 @define-color selected_bg_color #0D377C;
 @define-color selected_fg_color #ffffff;
 @define-color theme_selected_bg_color @selected_bg_color;
@@ -1072,7 +1074,8 @@ scrolledwindow viewport.frame {
  * Buttons *
  ***********/
 
-button {
+button ,
+popover.background button {
     padding: 3px;
     color: @theme_text_color;
 	border: solid;
@@ -1085,7 +1088,8 @@ button {
 
 button:disabled,
 combobox button.combo:disabled,
-toolbar combobox button.combo:disabled {
+toolbar combobox button.combo:disabled,
+popover.background button:disabled {
 border: solid;
     background-image: url("darkelements/column-header.png");
     border-image: url("darkelements/button-normal-border.png") 2 2 2 2 / 2px 2px 2px 2px stretch stretch;
@@ -1248,11 +1252,11 @@ button {
 	background-color: transparent;
 }
 
-/* We want anything inside the buttons to use their background */
+/* We want anything inside the buttons to use their background
 button * {
     background-color: transparent;
 }
-
+*/
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 GtkMenuToolButton *,
 toolbar.primary-toolbar button,
@@ -1272,7 +1276,8 @@ toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
 button:checked,
 button:checked:focus,
-button:focus {
+button:focus,
+popover.background button:focus {
     padding: 3px;
     color: @theme_text_color;
 	border: solid;
@@ -1713,7 +1718,8 @@ toolbar .raised button:hover,
 toolbar combobox button.combo:hover,
 toolbar.primary-toolbar button:hover,
 toolbar.primary-toolbar combobox button.combo:hover,
-colorchooser #add-color-button:hover {
+colorchooser #add-color-button:hover,
+popover.background button:hover {
 	border: solid;
     background-image: url("darkelements/button-hover.png");
     border-image: url("darkelements/button-hover-border.png") 2 2 2 2 / 2px 2px 2px 2px stretch stretch;
@@ -2450,7 +2456,7 @@ scrollbar.vertical .slider:hover {
 
 scrollbar.horizontal slider,
 scrollbar.horizontal .slider {
-    min-height: 16px;
+    
     border: solid;
  	border-image: url("darkelements/scrollbars/slider-horiz.png") 8 2 8 2 / 8px 2px 8px 2px stretch stretch;
     border-width: 8px 2px;
@@ -2510,7 +2516,8 @@ treemenu menuitem {
 }
 
 menu,
-.menu {
+.menu, 
+.context-menu {
     background-image: url("darkelements/menu-bg.png"); 
 	border: solid;
     border-image: url("darkelements/menu-border.png") 5 5 5 23 / 5px 5px 5px 23px stretch stretch; 
@@ -3901,13 +3908,9 @@ headerbar {
     padding-left: 5px;
     padding-right: 5px;
 	border-radius: 0;
+	min-height: 40px;
 }
 
-headerbar,
-.titlebar {
-   border-color: shade(@border_color, 1.30);
-    padding: 5px 4px 4px 4px;
-}
 
 /* fix for gedit, .titlebar does not match headerbar selector */
 .background.csd > paned.horizontal.titlebar,
@@ -3954,6 +3957,10 @@ decoration:backdrop {
 /*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
     box-shadow: none;
 }
+decoration {
+	border-radius: 0;
+  	border-width: 0;
+}
 
 .tiled decoration {
     border-radius: 0;
@@ -3977,9 +3984,11 @@ decoration:backdrop {
     box-shadow: none;
 }
 
+
 messagedialog.csd decoration {
-    border-radius: 7px;
+    border-radius: 0;
     box-shadow: 0 1px 5px @wm_shadow;
+	background-color: @theme_bg_color;
 }
 
 /**************
@@ -4001,25 +4010,18 @@ popover.background {
   background-clip: initial;
   margin: 10px;
   padding: 2px;
-  border: 1px solid darker(@theme_base_color);
-  border-radius: 3px;
+  border: 1px solid #3D3D3D;
+  border-radius: 0;
   background-color: @theme_bg_color;
   box-shadow: 0 1px 5px #000000;
   text-shadow: none;
   -gtk-icon-shadow: none;
 }
-
-.popover {
-  background-clip: initial;
-  margin: 10px;
-  padding: 2px;
-  border: 1px solid darker(@theme_base_color);
-  border-radius: 3px;
-  background-color: @theme_bg_color;
-  box-shadow: 0 1px 5px #000000;
-  text-shadow: none;
-  -gtk-icon-shadow: none;
+popover.background separator {
+    margin: 3px; 
 }
+
+
 .popover > .list, 
 .popover > .view,
 .popover > .toolbar .popover.osd > .toolbar, 
@@ -4168,6 +4170,11 @@ modelbutton.flat:selected {
     color: @theme_selected_fg_color;
 }
 
+modelbutton:hover {
+	background-color: @selected_bg_color;
+}
+
+
 popover separator {
 	border-image: url("darkelements/line-h.png") 0 0 2 0  stretch ;
 	border-width:  0 0 2px 0;
--- darkcold-gtk-theme-5.0.0.orig/metacity-1/metacity-theme-3.xml
+++ darkcold-gtk-theme-5.0.0/metacity-1/metacity-theme-3.xml
@@ -1,1228 +1,352 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
-	<author>horst3180</author>
-	<copyright>horst3180</copyright>
-	<date>2015</date>
-	<description>Arc Metacity theme</description>
+  <name>DarkCold</name>
+  <author>OriginalSeed</author>
+  <copyright>GPL</copyright>
+  <date>Jun, 2011</date>
+  <description>ColdDark based on RoyaleVSQ Black</description>
 </info>
 
-<!-- meaningfull constants -->
+<constant name="IconTitleSpacing" value="0"/>
 
-<constant name="C_title_focused" value="rgba(207,207,207,1.0)" />
-<constant name="C_title_unfocused" value="rgba(207,207,207,1.0)" />
-
-<constant name="C_wm_bg_focused" value="rgba(47,47,47,1.0)" />
-<constant name="C_wm_bg_unfocused" value="rgba(47,47,47,1.0)" />
-
-<constant name="C_wm_border" value="rgba(47,47,47,1.0)" />
-
-<constant name="C_wm_highlight" value="rgba(55,55,55,1.0)" />
-
-<!-- window button colors -->
-
-<!-- close -->
-<constant name="C_button_close_bg_focused" value="gtk:custom(selected_bg_color,#9ab87c)" />
-<constant name="C_button_close_bg_hover" value="shade/gtk:custom(selected_bg_color,#9ab87c)/1.14" />
-<constant name="C_button_close_bg_active" value="shade/gtk:custom(selected_bg_color,#9ab87c)/0.8" />
-
-<constant name="C_icon_close_bg" value="#2f2f2f" />
-
-<!-- minimize, maximize -->
-<constant name="C_button_bg_hover" value="#4C4C4C" />
-<constant name="C_button_bg_active" value="#949494" />
-
-<constant name="C_button_border_hover" value="#262626" />
-
-<constant name="C_icon_bg_focused" value="#909090" />
-<constant name="C_icon_bg_unfocused" value="#666666" />
-<constant name="C_icon_bg_hover" value="#C4C4C4" />
-<constant name="C_icon_bg_active" value="#ffffff" />
-
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="2"/>
-	<distance name="right_titlebar_edge" value="2"/>
-	<distance name="title_vertical_pad" value="3"/>
-	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-  <distance name="button_width" value="30"/>
-  <distance name="button_height" value="16"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="2"/>
-	<distance name="right_titlebar_edge" value="2"/>
-	<distance name="title_vertical_pad" value="2"/> <!--
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons		-->
-	<distance name="bottom_height" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="normal">
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="normal">
-	<distance name="left_width" value="1" />
-	<distance name="bottom_height" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="1" rounded_top_right="1">
-	<distance name="title_vertical_pad" value="7"/>
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<distance name="title_vertical_pad" value="1" />
-    <distance name="button_height" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-    <distance name="button_height" value="0"/>
+<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false" title_scale="medium">
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
+  <distance name="bottom_height" value="6"/>
+  <distance name="left_titlebar_edge" value="6"/>
+  <distance name="right_titlebar_edge" value="6"/>
+  <distance name="button_width" value="34"/>
+  <distance name="button_height" value="24"/>
+  <distance name="title_vertical_pad" value="0"/>
+  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
+  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
+<frame_geometry name="maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false" title_scale="medium">
+  <distance name="left_width" value="0"/>
+  <distance name="right_width" value="0"/>
+  <distance name="bottom_height" value="0"/>
+  <distance name="left_titlebar_edge" value="2"/>
+  <distance name="right_titlebar_edge" value="2"/>
+  <distance name="button_width" value="34"/>
+  <distance name="button_height" value="24"/>
+  <distance name="title_vertical_pad" value="0"/>
+  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
+  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
-<!--chromium save dialog-->
-<frame_geometry name="attached" title_scale="small" has_title="false"  hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_left="0" rounded_bottom_right="0" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-	<distance name="bottom_height" value="1"/>
-	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
+<frame_geometry name="border" parent="normal" has_title="false">
+  <distance name="button_width" value="34"/>
+  <distance name="button_height" value="24"/>
+  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
+  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2))"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2))"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="C_wm_bg_focused" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<rectangle color="C_wm_bg_unfocused" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<rectangle color="C_wm_bg_focused" x="0" y="0" width="width" height="height" filled="true" />
-	<rectangle color="C_wm_highlight" x="0" y="0" width="width" height="1" filled="true" />
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<rectangle color="C_wm_bg_unfocused" x="0" y="0" width="width" height="height" filled="true" />
-	<rectangle color="C_wm_highlight" x="0" y="0" width="width" height="1" filled="true" />
-</draw_ops>
-
-<draw_ops name="titlebar_max">
-
-</draw_ops>
-
-<draw_ops name="titlebar_small_focused">
-
-</draw_ops>
-
-<draw_ops name="titlebar_small_unfocused">
-
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_wm_bg_focused" x="0" y="0" width="width" height="height" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_wm_bg_unfocused" x="0" y="0" width="width" height="height" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_max">
-	<line x1="1" y1="height-1" x2="width" y2="height-1" color="C_wm_border" />
-</draw_ops>
-
-
-<!--close-->
-<draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<!--maximize-->
-<draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<!--minimize-->
-<draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title-text-focused">
+  <title color="#000000" x="(width - title_width) / 2 +1" y="(height - title_height) / 2 + 1"/>
+  <title color="#ffffff" x="(width - title_width) / 2" y="(height - title_height) / 2"/>
 </draw_ops>
 
-<draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title-text-unfocused">
+  <title color="#000000" x="(width - title_width) / 2 +1" y="(height - title_height) / 2 + 1"/>
+  <title color="#afafaf" x="(width - title_width) / 2" y="(height - title_height) / 2"/>
 </draw_ops>
 
-<!--stick-->
-<draw_ops name="stick_focused">
-	<image filename="stick-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="blank">
 </draw_ops>
 
-<draw_ops name="stick_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="stick-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title">
+  <image filename="titlebar-left-focused.png" x="0" y="0" width="object_width" height="height"/>
+  <image filename="titlebar-mid-focused.png" x="10" y="0" width="width - 10" height="height"/>
+  <image filename="titlebar-right-focused.png" x="width - object_width" y="0" width="object_width" height="height"/>
 </draw_ops>
 
-<draw_ops name="stick_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="stick-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title-unfocused">
+  <image filename="titlebar-left-unfocused.png" x="0" y="0" width="object_width" height="height"/>
+  <image filename="titlebar-mid-unfocused.png" x="10" y="0" width="width - 10" height="height"/>
+  <image filename="titlebar-right-unfocused.png" x="width - object_width" y="0" width="object_width" height="height"/>
 </draw_ops>
 
-<draw_ops name="stick_unfocused">
-	<image filename="stick-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
 
-<draw_ops name="stick_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="stick-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title-maximized">
+  <image filename="titlebar-mid-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="stick_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="stick-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title-maximized-unfocused">
+  <image filename="titlebar-mid-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<!--unstick-->
-<draw_ops name="unstick_focused">
-	<image filename="unstick-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="title-shaded">
+  <image filename="titlebar-left-unfocused.png" x="0" y="0" width="object_width" height="height"/>
+  <image filename="titlebar-mid-unfocused.png" x="10" y="0" width="width - 10" height="height"/>
+  <image filename="titlebar-right-unfocused.png" x="width - object_width" y="0" width="object_width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unstick_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unstick-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="frame-left-focused">
+  <image filename="frame-left-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
-
-<draw_ops name="unstick_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unstick-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="frame-left-unfocused">
+  <image filename="frame-left-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unstick_unfocused">
-	<image filename="unstick-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="frame-right-focused">
+  <image filename="frame-right-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
-
-<draw_ops name="unstick_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unstick-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="frame-right-unfocused">
+  <image filename="frame-right-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unstick_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unstick-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="frame-bottom-focused">
+  <image filename="frame-bottom-left-focused.png" x="0" y="0" width="6" height="object_height"/>
+  <image filename="frame-bottom-mid-focused.png" x="6" y="0" width="width - 10" height="object_height"/>
+  <image filename="frame-bottom-right-focused.png" x="width - object_width" y="0" width="object_width" height="object_height"/>
 </draw_ops>
-
-<!--shade-->
-<draw_ops name="shade_focused">
-	<image filename="shade-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="frame-bottom-unfocused">
+  <image filename="frame-bottom-left-unfocused.png" x="0" y="0" width="6" height="object_height"/>
+  <image filename="frame-bottom-mid-unfocused.png" x="6" y="0" width="width - 10" height="object_height"/>
+  <image filename="frame-bottom-right-unfocused.png" x="width - object_width" y="0" width="object_width" height="object_height"/>
 </draw_ops>
 
-<draw_ops name="shade_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="shade-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-close-focused">
+  <image filename="button-close-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="shade_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="shade-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-close-focused-active">
+  <image filename="button-close-focused-active.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="shade_unfocused">
-	<image filename="shade-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-close-unfocused">
+  <image filename="button-close-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="shade_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="shade-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-close-pressed">
+  <image filename="button-close-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="shade_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="shade-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
 
-<!--unshade-->
-<draw_ops name="unshade_focused">
-	<image filename="unshade-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-maximize-focused">
+  <image filename="button-maximize-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unshade_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unshade-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-maximize-focused-active">
+  <image filename="button-maximize-focused-active.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unshade_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unshade-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-maximize-unfocused">
+  <image filename="button-maximize-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unshade_unfocused">
-	<image filename="unshade-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-maximize-pressed">
+  <image filename="button-maximize-pressed.png" x="0"  y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unshade_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unshade-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-minimize-focused">
+  <image filename="button-minimize-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="unshade_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="unshade-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-minimize-focused-active">
+  <image filename="button-minimize-focused-active.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<!--menu-->
-<draw_ops name="menu_focused">
-	<image filename="menu-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-minimize-unfocused">
+  <image filename="button-minimize-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="menu_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="menu-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-minimize-pressed">
+  <image filename="button-minimize-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="menu_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-menu-focused">
+  <image filename="button-menu-focused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="menu_unfocused">
-	<image filename="menu-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-menu-focused-active">
+  <image filename="button-menu-focused-active.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="menu_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-menu-unfocused">
+  <image filename="button-menu-unfocused.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
-<draw_ops name="menu_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="menu-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+<draw_ops name="button-menu-pressed">
+  <image filename="button-menu-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
+<frame_style name="normal-focused" geometry="normal">
+  <piece position="title" draw_ops="title-text-focused"/>
+  <piece position="titlebar" draw_ops="title"/>
+  <piece position="left_edge" draw_ops="frame-left-focused"/>
+  <piece position="right_edge" draw_ops="frame-right-focused"/>
+  <piece position="bottom_edge" draw_ops="frame-bottom-focused"/>
 
-<!-- frame styles -->
+  <button function="close" state="normal" draw_ops="button-close-focused"/>
+  <button function="close" state="prelight" draw_ops="button-close-focused-active"/>
+  <button function="close" state="pressed" draw_ops="button-close-pressed"/>
 
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_max" />
-	<piece position="titlebar" draw_ops="titlebar_max" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
-</frame_style>
+  <button function="minimize" state="normal" draw_ops="button-minimize-focused"/>
+  <button function="minimize" state="prelight" draw_ops="button-minimize-focused-active"/>
+  <button function="minimize" state="pressed" draw_ops="button-minimize-pressed"/>
 
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_max" />
-	<piece position="titlebar" draw_ops="titlebar_max" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
-</frame_style>
+  <button function="maximize" state="normal" draw_ops="button-maximize-focused"/>
+  <button function="maximize" state="prelight" draw_ops="button-maximize-focused-active"/>
+  <button function="maximize" state="pressed" draw_ops="button-maximize-pressed"/>
 
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_max" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
+  <button function="menu" state="normal" draw_ops="button-menu-focused"/>
+  <button function="menu" state="prelight" draw_ops="button-menu-focused-active"/>
+  <button function="menu" state="pressed" draw_ops="button-menu-pressed"/>
+  
+  <button function="shade" state="normal"><draw_ops></draw_ops></button>
+  <button function="shade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unshade" state="normal"><draw_ops></draw_ops></button>
+  <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="above" state="normal"><draw_ops></draw_ops></button>
+  <button function="above" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unabove" state="normal"><draw_ops></draw_ops></button>
+  <button function="unabove" state="pressed"><draw_ops></draw_ops></button>
+  <button function="stick" state="normal"><draw_ops></draw_ops></button>
+  <button function="stick" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unstick" state="normal"><draw_ops></draw_ops></button>
+  <button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+  
 </frame_style>
 
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_max" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
-</frame_style>
+<frame_style name="normal-unfocused" geometry="normal">
+  <piece position="title" draw_ops="title-text-unfocused"/>
+  <piece position="titlebar" draw_ops="title-unfocused"/>
+  <piece position="left_edge" draw_ops="frame-left-unfocused"/>
+  <piece position="right_edge" draw_ops="frame-right-unfocused"/>
+  <piece position="bottom_edge" draw_ops="frame-bottom-unfocused"/>
 
-<frame_style name="dialog_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
-</frame_style>
+  <button function="close" state="normal" draw_ops="button-close-unfocused"/>
+  <button function="close" state="prelight" draw_ops="button-close-focused"/>
+  <button function="close" state="pressed" draw_ops="button-close-pressed"/>
 
-<frame_style name="dialog_unfocused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
-</frame_style>
+  <button function="minimize" state="normal" draw_ops="button-minimize-unfocused"/>
+  <button function="minimize" state="prelight" draw_ops="button-minimize-focused"/>
+  <button function="minimize" state="pressed" draw_ops="button-minimize-pressed"/>
 
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
-</frame_style>
+  <button function="maximize" state="normal" draw_ops="button-maximize-unfocused"/>
+  <button function="maximize" state="prelight" draw_ops="button-maximize-focused"/>
+  <button function="maximize" state="pressed" draw_ops="button-maximize-pressed"/>
 
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
+  <button function="menu" state="normal" draw_ops="button-menu-unfocused"/>
+  <button function="menu" state="prelight" draw_ops="button-menu-focused"/>
+  <button function="menu" state="pressed" draw_ops="button-menu-pressed"/>
+  
+  <button function="shade" state="normal"><draw_ops></draw_ops></button>
+  <button function="shade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unshade" state="normal"><draw_ops></draw_ops></button>
+  <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="above" state="normal"><draw_ops></draw_ops></button>
+  <button function="above" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unabove" state="normal"><draw_ops></draw_ops></button>
+  <button function="unabove" state="pressed"><draw_ops></draw_ops></button>
+  <button function="stick" state="normal"><draw_ops></draw_ops></button>
+  <button function="stick" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unstick" state="normal"><draw_ops></draw_ops></button>
+  <button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+  
 </frame_style>
 
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_small_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
-</frame_style>
+<frame_style name="normal-maximized-focused" geometry="maximized">
+  <piece position="title" draw_ops="title-text-focused"/>
+  <piece position="titlebar" draw_ops="title-maximized"/>
 
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_small_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
-</frame_style>
+  <button function="close" state="normal" draw_ops="button-close-focused"/>
+  <button function="close" state="prelight" draw_ops="button-close-focused-active"/>
+  <button function="close" state="pressed" draw_ops="button-close-pressed"/>
 
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
+  <button function="minimize" state="normal" draw_ops="button-minimize-focused"/>
+  <button function="minimize" state="prelight" draw_ops="button-minimize-focused-active"/>
+  <button function="minimize" state="pressed" draw_ops="button-minimize-pressed"/>
 
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
+  <button function="maximize" state="normal" draw_ops="button-maximize-focused"/>
+  <button function="maximize" state="prelight" draw_ops="button-maximize-focused-active"/>
+  <button function="maximize" state="pressed" draw_ops="button-maximize-pressed"/>
 
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+  <button function="menu" state="normal" draw_ops="button-menu-focused"/>
+  <button function="menu" state="prelight" draw_ops="button-menu-focused-active"/>
+  <button function="menu" state="pressed" draw_ops="button-menu-pressed"/>
+  
+  <button function="shade" state="normal"><draw_ops></draw_ops></button>
+  <button function="shade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unshade" state="normal"><draw_ops></draw_ops></button>
+  <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="above" state="normal"><draw_ops></draw_ops></button>
+  <button function="above" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unabove" state="normal"><draw_ops></draw_ops></button>
+  <button function="unabove" state="pressed"><draw_ops></draw_ops></button>
+  <button function="stick" state="normal"><draw_ops></draw_ops></button>
+  <button function="stick" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unstick" state="normal"><draw_ops></draw_ops></button>
+  <button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+  
 </frame_style>
 
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
+<frame_style name="normal-maximized-unfocused" geometry="maximized">
+  <piece position="title" draw_ops="title-text-unfocused"/>
+  <piece position="titlebar" draw_ops="title-maximized-unfocused"/>
 
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
+  <button function="close" state="normal" draw_ops="button-close-unfocused"/>
+  <button function="close" state="prelight" draw_ops="button-close-focused"/>
+  <button function="close" state="pressed" draw_ops="button-close-pressed"/>
 
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
-</frame_style>
+  <button function="minimize" state="normal" draw_ops="button-minimize-unfocused"/>
+  <button function="minimize" state="prelight" draw_ops="button-minimize-focused"/>
+  <button function="minimize" state="pressed" draw_ops="button-minimize-pressed"/>
 
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
-</frame_style>
+  <button function="maximize" state="normal" draw_ops="button-maximize-unfocused"/>
+  <button function="maximize" state="prelight" draw_ops="button-maximize-focused"/>
+  <button function="maximize" state="pressed" draw_ops="button-maximize-pressed"/>
 
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
-	<button function="unshade" state="normal" draw_ops="unshade_focused" />
-	<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
-	<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_focused" />
-	<button function="stick" state="pressed" draw_ops="stick_focused_pressed" />
-	<button function="stick" state="prelight" draw_ops="stick_focused_prelight" />
-	<button function="unstick" state="normal" draw_ops="unstick_focused" />
-	<button function="unstick" state="pressed" draw_ops="unstick_focused_pressed" />
-	<button function="unstick" state="prelight" draw_ops="unstick_focused_prelight" />
+  <button function="menu" state="normal" draw_ops="button-menu-unfocused"/>
+  <button function="menu" state="prelight" draw_ops="button-menu-focused"/>
+  <button function="menu" state="pressed" draw_ops="button-menu-pressed"/>
+  
+  <button function="shade" state="normal"><draw_ops></draw_ops></button>
+  <button function="shade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unshade" state="normal"><draw_ops></draw_ops></button>
+  <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
+  <button function="above" state="normal"><draw_ops></draw_ops></button>
+  <button function="above" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unabove" state="normal"><draw_ops></draw_ops></button>
+  <button function="unabove" state="pressed"><draw_ops></draw_ops></button>
+  <button function="stick" state="normal"><draw_ops></draw_ops></button>
+  <button function="stick" state="pressed"><draw_ops></draw_ops></button>
+  <button function="unstick" state="normal"><draw_ops></draw_ops></button>
+  <button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+  
 </frame_style>
 
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal" draw_ops="stick_unfocused" />
-	<button function="stick" state="prelight" draw_ops="stick_unfocused_prelight" />
-	<button function="stick" state="pressed" draw_ops="stick_unfocused_pressed" />
-	<button function="unstick" state="normal" draw_ops="unstick_unfocused" />
-	<button function="unstick" state="prelight" draw_ops="unstick_unfocused_prelight" />
-	<button function="unstick" state="pressed" draw_ops="unstick_unfocused_pressed" />
+<frame_style name="normal-shaded-focused" geometry="normal" parent="normal-focused">
+  <piece position="titlebar" draw_ops="title-shaded"/>
 </frame_style>
 
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+<frame_style name="normal-shaded-unfocused" geometry="normal" parent="normal-unfocused">
+  <piece position="titlebar" draw_ops="title-shaded"/>
 </frame_style>
 
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+<frame_style_set name="normal">
+  <frame focus="yes" state="normal" resize="both" style="normal-focused"/>
+  <frame focus="no" state="normal" resize="both" style="normal-unfocused"/>
+  <frame focus="yes" state="maximized" style="normal-maximized-focused"/>
+  <frame focus="no" state="maximized" style="normal-maximized-unfocused"/>
+  <frame focus="yes" state="shaded" style="normal-shaded-focused"/>
+  <frame focus="no" state="shaded" style="normal-shaded-unfocused"/>
+  <frame focus="yes" state="maximized_and_shaded" style="normal-shaded-focused"/>
+  <frame focus="no" state="maximized_and_shaded" style="normal-shaded-unfocused"/>
 </frame_style_set>
 
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="normal_style_set"/>
-<window type="modal_dialog" style_set="normal_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
+<window type="normal" style_set="normal"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="normal"/>
+<window type="menu" style_set="normal"/>
+<window type="utility" style_set="normal"/>
+<window type="border" style_set="normal"/>
+
+<menu_icon function="close" state="normal" draw_ops="button-close-focused"/>
+<menu_icon function="maximize" state="normal" draw_ops="button-maximize-focused"/>
+<menu_icon function="unmaximize" state="normal" draw_ops="button-maximize-focused"/>
+<menu_icon function="minimize" state="normal" draw_ops="button-minimize-focused"/>
 </metacity_theme>
