Removed non-existing style properties

20 files changed, 102 insertions, 162 deletions

diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css
index 86195fc..3b8f50a 100644
--- a/themes/b5/gtk-3.0/gtk.css
+++ b/themes/b5/gtk-3.0/gtk.css
@@ -30,20 +30,18 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 5;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: out;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 11;
     -GtkRange-stepper-size           : 11;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkToolbar-shadow-type          : out;
-    -GtkWidget-interior-focus        : 1;
+    -GtkWidget-interior-focus        : true;
 
     color: @fg_normal;
     background-color: @bg_normal;
@@ -60,7 +58,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css
index c6bcd2b..a9850ae 100644
--- a/themes/basic/gtk-3.0/gtk.css
+++ b/themes/basic/gtk-3.0/gtk.css
@@ -6,19 +6,21 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 8;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 2;
-    -GtkMenuItem-shadow-type         : out;
-    /*GtkPaned::handle_full_size     : 1*/
+    -GtkMenuBar-shadow-type          : out;
     -GtkToolbar-shadow-type          : out;
-    -GtkWidget-interior-focus        : 1;
+    -GtkWidget-interior-focus        : true;
     -GtkRange-slider-width           : 14;
     -GtkRange-stepper-size           : 14;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
 }
 
+*:insensitive {
+    text-shadow: 1 1 white;
+}
+
 .button {
     border-width: 2 2;
 
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css
index 0bd47da..12152fd 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/cadmium/gtk-3.0/gtk.css
@@ -33,22 +33,19 @@
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 5;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 2;
     -GtkCheckButton-indicator-size   : 12;
     -GtkMenuBar-internal-padding     : 0;
     -GtkMenuBar-shadow-type          : out;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 12;
     -GtkRange-stepper-size           : 12;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkToolBar-shadow-type          : out;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 2;
+    -GtkToolbar-shadow-type          : out;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -67,7 +64,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css
index 00afcfa..2250807 100644
--- a/themes/curve/gtk-3.0/gtk.css
+++ b/themes/curve/gtk-3.0/gtk.css
@@ -30,24 +30,20 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 2;
-    -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: out;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkStatusBar-shadow-type        : in;
+    -GtkStatusbar-shadow-type        : in;
     -GtkToolbar-shadow-type          : out;
-    /*GtkWidget::focus-line-pattern  : "\0"*/
+    -GtkWidget-focus-line-pattern    : "\0";
     -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-interior-focus        : 0;
-    -GtkWidget-internal-padding      : 2;
+    -GtkWidget-interior-focus        : false;
 
     border-width: 2 2;
 
@@ -66,7 +62,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css
index d9b637a..5ab7043 100644
--- a/themes/dawn/gtk-3.0/gtk.css
+++ b/themes/dawn/gtk-3.0/gtk.css
@@ -33,13 +33,10 @@
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 8;
     -GtkCheckButton-indicator-size   : 12;
-    -GtkMenuBar-interal-padding      : 4;
+    -GtkMenuBar-internal-padding     : 4;
     -GtkMenuBar-shadow-type          : out;
-    -GtkHandleBox-shadow-type        : out;
     -GtkMenuItem-selected-shadow-type: etched-in;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size     	     : 7;
     -GtkRange-slider-width           : 16;
     -GtkRange-stepper-size           : 16;
@@ -49,8 +46,7 @@
     -GtkToolbar-shadow-type          : out;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 3;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 5;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -69,7 +65,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/dusk/gtk-3.0/gtk.css b/themes/dusk/gtk-3.0/gtk.css
index caaa844..0f0bc12 100644
--- a/themes/dusk/gtk-3.0/gtk.css
+++ b/themes/dusk/gtk-3.0/gtk.css
@@ -33,31 +33,25 @@
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 4;
     -GtkCheckButton-indicator-size   : 8;
-    -GtkMenuBar-internal-paddinc     : 1;
+    -GtkMenuBar-internal-padding     : 1;
     -GtkMenuBar-shadow-type          : out;
-    -GtkHandleBox-shadow-type        : out;
     -GtkMenuItem-selected-shadow-type: etched-in;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size     	     : 4;
     -GtkRange-slider-width           : 12;
     -GtkRange-stepper-size           : 10;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
-    -GtkScrollbar-has-backward-stepper: 1;
-    -GtkScrollbar-has-secondary-backward-stepper: 0;
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-secondary-backward-stepper: false;
     -GtkScrollbar-min-slider-length  : 10;
     -GtkToolbar-shadow-type          : out;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 1;
-    -GtkWidget-interior-focus        : 1;
-    -GtkWidget-internal-padding      : 2;
-    -GtkEntry-cursor-color           : #fcfcfc;
-    -GtkEntry-secondary-cursor-color : #fcfcfc;
-    -GtkTesxView-cursor-color        : #fcfcfc;
-    -GtkTesxView-secondary-cursor-color: #fcfcfc;
-    -GtkEntry-cursor-aspect-ratio    : 0.1;
+    -GtkWidget-interior-focus        : true;
+    -GtkWidget-cursor-color          : #fcfcfc;
+    -GtkWidget-secondary-cursor-color: #fcfcfc;
+    -GtkWidget-cursor-aspect-ratio   : 0.1;
 
     border-width: 1 1;
 
@@ -76,7 +70,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/kde2/gtk-3.0/gtk.css b/themes/kde2/gtk-3.0/gtk.css
index c009a45..c7cad14 100644
--- a/themes/kde2/gtk-3.0/gtk.css
+++ b/themes/kde2/gtk-3.0/gtk.css
@@ -30,22 +30,19 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 12;
     -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuItem-selected-shadow-type: in;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-trough-border          : 0;
     -GtkSpinButton-shadow-type       : in;
-    -GtkScrollbar-has-backward-stepper: 1;
-    -GtkScrollbar-has-forward-stepper: 1;
-    -GtkScrollbar-has-secondary-backward-stepper: 1;
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-forward-stepper: true;
+    -GtkScrollbar-has-secondary-backward-stepper: true;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkWidget-focus-padding         : 2;
-    -GtkWidget-interior-focus        : 2;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -64,7 +61,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -286,6 +283,8 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 0.9)));
 
     border-width: 3 3;
+
+    -GtkWidget-focus-padding: 0;
 }
 
 .button:active {
diff --git a/themes/kolors/gtk-3.0/gtk.css b/themes/kolors/gtk-3.0/gtk.css
index 92eca18..4fd136e 100644
--- a/themes/kolors/gtk-3.0/gtk.css
+++ b/themes/kolors/gtk-3.0/gtk.css
@@ -31,25 +31,22 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 11;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: none;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 11;
     -GtkRange-stepper-size           : 13;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkScrollbar-has-backward-stepper: 1;
-    -GtkScrollbar-has-secondary-backward-stepper: 1;
-    -GtkStatusBar-shadow-type        : in;
-    -GtkToolBar-shadow-type          : out;
-    /*-GtkWidget-focus-line-pattern    : "\0";*/
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-secondary-backward-stepper: true;
+    -GtkStatusbar-shadow-type        : in;
+    -GtkToolbar-shadow-type          : out;
+    -GtkWidget-focus-line-pattern    : "\0";
     -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-interior-focus        : 1;
-    -GtkWidget-internal-padding      : 0;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 1 1;
 
@@ -68,7 +65,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -182,7 +179,7 @@ GtkCalendar:selected {
     background-color: @base_normal;
     border-color: darker(@bg_normal);
 
-    -GtkCheckButton-indicator-size   : 10;
+    -GtkCheckButton-indicator-size: 10;
 }
 
 .check:active, .radio:active {
diff --git a/themes/light/gtk-3.0/gtk.css b/themes/light/gtk-3.0/gtk.css
index 1217a2f..b8c15ff 100644
--- a/themes/light/gtk-3.0/gtk.css
+++ b/themes/light/gtk-3.0/gtk.css
@@ -30,20 +30,18 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 5;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: in;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkToolbar-shadow-type          : out;
-    -GtkWidget-interior-focus        : 1;
+    -GtkWidget-interior-focus        : true;
 
     color: @fg_normal;
     background-color: @bg_normal;
@@ -60,7 +58,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/orange/gtk-3.0/gtk.css b/themes/orange/gtk-3.0/gtk.css
index 03a7268..75151cf 100644
--- a/themes/orange/gtk-3.0/gtk.css
+++ b/themes/orange/gtk-3.0/gtk.css
@@ -38,22 +38,18 @@
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 5;
-    -GtkWidget-focus-padding         : 1;
     -GtkCheckButton-indicator-size   : 12;
     -GtkMenuItem-selected-shadow-type: none;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
-    -GtkScrollbar-has-backward-stepper: 1;
+    -GtkScrollbar-has-backward-stepper: true;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 4;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 4;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -72,7 +68,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -371,6 +367,8 @@ GtkCalendar:selected {
 .button {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ebe6e1, 1.05)), to(shade(#ebe6e1, 0.95)));
     border-color: darker(#ebe6e1);
+
+    -GtkWidget-focus-padding: 1;
 }                                                         
                                                           
 .button:active {                                          
diff --git a/themes/redmondxp/gtk-3.0/gtk.css b/themes/redmondxp/gtk-3.0/gtk.css
index 5797475..6386924 100644
--- a/themes/redmondxp/gtk-3.0/gtk.css
+++ b/themes/redmondxp/gtk-3.0/gtk.css
@@ -30,21 +30,18 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 10;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: none;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkToolbar-shadow-type          : out;
-    -GtkWidget-interior-focus        : 1;
-    -GtkWidget-internal-padding      : 4;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -63,7 +60,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/saltlake/gtk-3.0/gtk.css b/themes/saltlake/gtk-3.0/gtk.css
index 62961a7..a8b726d 100644
--- a/themes/saltlake/gtk-3.0/gtk.css
+++ b/themes/saltlake/gtk-3.0/gtk.css
@@ -32,17 +32,15 @@
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 1;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 5;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : etched-in;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkWidget-interior-focus        : 1;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -61,7 +59,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/smooth/gtk-3.0/gtk.css b/themes/smooth/gtk-3.0/gtk.css
index 63cdbd2..064bcf2 100644
--- a/themes/smooth/gtk-3.0/gtk.css
+++ b/themes/smooth/gtk-3.0/gtk.css
@@ -30,18 +30,16 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 5;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuItem-selected-shadow-type: out;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkWidget-interior-focus        : 1;
+    -GtkWidget-interior-focus        : true;
 
     color: @fg_normal;
     background-color: @bg_normal;
@@ -58,7 +56,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/stellar/gtk-3.0/gtk.css b/themes/stellar/gtk-3.0/gtk.css
index a8213ae..619ca9a 100644
--- a/themes/stellar/gtk-3.0/gtk.css
+++ b/themes/stellar/gtk-3.0/gtk.css
@@ -31,21 +31,18 @@
 
     -GtkButton-default-border        : 5;
     -GtkButton-default-outside-border: 6;
-    -GtkButton-default-spacing       : 5;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuItem-selected-shadow-type: in;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkRange-slider-width           : 12;
     -GtkRange-stepper-size           : 12;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkToolbar-shadow-type          : out;
-    /*GtkWidget::focus-line-pattern  : "\0"*/
+    -GtkWidget-focus-line-pattern    : "\0";
     -GtkWidget-focus-line-width      : 2;
-    -GtkWidget-interior-focus        : 0;
-    -GtkWidget-internal-padding      : 2;
+    -GtkWidget-interior-focus        : false;
 
     border-width: 1 1;
 
@@ -64,7 +61,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/winter/gtk-3.0/gtk.css b/themes/winter/gtk-3.0/gtk.css
index 5434d4b..4875acf 100644
--- a/themes/winter/gtk-3.0/gtk.css
+++ b/themes/winter/gtk-3.0/gtk.css
@@ -31,13 +31,9 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 10;
-    -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: out;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size            : 8;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -47,8 +43,7 @@
     -GtkToolbar-shadow-type          : none;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 2;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 0;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -67,7 +62,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -326,6 +321,8 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
 
     border-width: 3 3;
+
+    -GtkWidget-focus-padding: 0;
 }
 
 .button:active, .menuitem:active {
diff --git a/themes/xfce-4.0/gtk-3.0/gtk.css b/themes/xfce-4.0/gtk-3.0/gtk.css
index 34469ad..2cdba7f 100644
--- a/themes/xfce-4.0/gtk-3.0/gtk.css
+++ b/themes/xfce-4.0/gtk-3.0/gtk.css
@@ -34,13 +34,9 @@
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    -GtkButton-default-spacing       : 10;
-    -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
     -GtkMenuItem-selected-shadow-type: out;
-    /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size            : 8;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -50,8 +46,7 @@
     -GtkToolbar-shadow-type          : out;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 2;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 0;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -70,7 +65,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -392,7 +387,15 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
 }
 
-.button, .scale {
+.button {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(#fafaf2, 1.8)));
+
+    border-width: 3 3;
+
+    -GtkWidget-focus-padding: 0;
+}
+
+.scale {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(#fafaf2, 1.8)));
 
     border-width: 3 3;
diff --git a/themes/xfce-4.2/gtk-3.0/gtk.css b/themes/xfce-4.2/gtk-3.0/gtk.css
index 3426c8d..269bf25 100644
--- a/themes/xfce-4.2/gtk-3.0/gtk.css
+++ b/themes/xfce-4.2/gtk-3.0/gtk.css
@@ -37,25 +37,21 @@
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 5;
     -GtkCheckButton-indicator-size   : 12;
     -GtkMenuBar-internal-padding     : 2;
     -GtkMenuBar-shadow-type          : out;
-    -GtkHandleBox-shadow-type        : out;
     -GtkMenuItem-selected-shadow-type: etched-in;
-    /*GtkPaned::handle_full_size     : 1*/
-    -GtkPaned-handle-full-size       : 7;
+    -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
-    -GtkScrollbar-has_backward_stepper: 1;
+    -GtkScrollbar-has-backward-stepper: true;
     -GtkScrollbar-min-slider-length  : 20;
     -GtkToolbar-shadow-type          : out;
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 4;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 4;
+    -GtkWidget-interior-focus        : true;
 
     border-width: 2 2;
 
@@ -74,7 +70,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
diff --git a/themes/xfce-4.4/gtk-3.0/gtk.css b/themes/xfce-4.4/gtk-3.0/gtk.css
index fbb84ef..ad965c9 100644
--- a/themes/xfce-4.4/gtk-3.0/gtk.css
+++ b/themes/xfce-4.4/gtk-3.0/gtk.css
@@ -39,23 +39,19 @@
 
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 4;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 4;
+    -GtkWidget-interior-focus        : true;
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
-    -GtkButton-default-spacing       : 5;
-    -GtkButton-focus-padding         : 1;
     -GtkCheckButton-indicator-size   : 12;
     -GtkMenuItem-selected-shadow-type: etched-in;
-    /*GtkPaned::handle_full_size     : 1*/
-    -GtkPaned-handle-full-size       : 7;
+    -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
-    -GtkScrollbar-has-backward-stepper: 1;
+    -GtkScrollbar-has-backward-stepper: true;
     -GtkScrollbar-min-slider-length  : 20;
 
     border-width: 2 2;
@@ -75,7 +71,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -335,7 +331,6 @@ GtkCalendar:selected {
     border-color: darker(#ffffff);
 
     border-width: 1 2;
-    -GtkWidget-internal-padding: 5;
 }
 
 .menuitem:active {
@@ -390,6 +385,8 @@ GtkCalendar:selected {
 .button {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.1)), to(shade(#eeeeec, 0.95)));
     border-color: darker(#eeeeec);
+
+    -GtkWidget-focus-padding: 1;
 }
 
 .button:active {
diff --git a/themes/xfce-4.6/gtk-3.0/gtk.css b/themes/xfce-4.6/gtk-3.0/gtk.css
index 71aaa25..1f84a2f 100644
--- a/themes/xfce-4.6/gtk-3.0/gtk.css
+++ b/themes/xfce-4.6/gtk-3.0/gtk.css
@@ -40,14 +40,12 @@
 
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
-    -GtkWidget-interior-focus        : 0;
-    -GtkWidget-internal-padding      : 0;
+    -GtkWidget-interior-focus        : false;
 
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    /*-GtkButton-focus-line-pattern    : "\0";*/
 
     -GtkButtonBox-child-internal-pad-x: 0;
     -GtkButtonBox-child-internal-pad-y: 0;
@@ -55,11 +53,6 @@
     -GtkButtonBox-child-min-width    : 0;
 
     -GtkCheckButton-indicator-size   : 12;
-    /*-GtkCheckButton-focus-line-pattern: "\1\1";*/
-
-    /*-GtkEntry-focus-line-pattern     : "\0";*/
-
-    /*-GtkRadioButton-focus-line-pattern: "\1\1";*/
 
     -GtkExpander-expander-size       : 11;
     -GtkExpander-expander-spacing    : 0;
@@ -69,28 +62,20 @@
     -GtkMenu-horizontal-padding      : 0;
     -GtkMenu-vertical-padding        : 0;
 
-    -GtkMenuItem-internal-padding    : 2;
     -GtkMenuItem-selected-shadow-type: etched-in;
 
-    -GtkOptionMenu-indicator-size    : 0;
-    -GtkOptionMenu-indicator-spacing : 0;
-
-    /*GtkPaned::handle_full_size     : 1*/
-    -GtkPaned-handle-full-size       : 3;
+    -GtkPaned-handle-size            : 3;
 
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
 
-    -GtkScale-trough-size-details    : 1;
     -GtkScale-value-spacing          : 0;
 
-    -GtkScrollbar-has-backward-stepper: 1;
+    -GtkScrollbar-has-backward-stepper: true;
     -GtkScrollbar-min-slider-length  : 20;
 
-    /*-GtkTextView-focus-line-pattern  : "\0";*/
-
     -GtkToolbar-internal-padding     : 0;
     -GtkToolbar-space-size           : 10;
 
@@ -115,7 +100,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -134,6 +119,8 @@
     color: @text_normal;
     background-color: @base_normal;
     border-color: darker(@bg_normal);
+
+    -GtkEntry-focus-line-pattern: "\0";
 }
 
 .view:active, .entry:active {
@@ -222,6 +209,8 @@ GtkCalendar:selected {
     color: @text_normal;
     background-color: @base_normal;
     border-color: darker(@bg_normal);
+
+    -GtkWidget-focus-line-pattern: "\1\1";
 }
 
 .check:active, .radio:active {
@@ -414,6 +403,8 @@ GtkCalendar:selected {
 .button {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.1)), to(shade(#eeeeec, 0.95)));
     border-color: darker(#eeeeec);
+
+    -GtkWidget-focus-line-pattern: "\0";
 }
 
 .button:active {
diff --git a/themes/xfce/gtk-3.0/gtk.css b/themes/xfce/gtk-3.0/gtk.css
index 71aaa25..1f84a2f 100644
--- a/themes/xfce/gtk-3.0/gtk.css
+++ b/themes/xfce/gtk-3.0/gtk.css
@@ -40,14 +40,12 @@
 
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
-    -GtkWidget-interior-focus        : 0;
-    -GtkWidget-internal-padding      : 0;
+    -GtkWidget-interior-focus        : false;
 
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
-    /*-GtkButton-focus-line-pattern    : "\0";*/
 
     -GtkButtonBox-child-internal-pad-x: 0;
     -GtkButtonBox-child-internal-pad-y: 0;
@@ -55,11 +53,6 @@
     -GtkButtonBox-child-min-width    : 0;
 
     -GtkCheckButton-indicator-size   : 12;
-    /*-GtkCheckButton-focus-line-pattern: "\1\1";*/
-
-    /*-GtkEntry-focus-line-pattern     : "\0";*/
-
-    /*-GtkRadioButton-focus-line-pattern: "\1\1";*/
 
     -GtkExpander-expander-size       : 11;
     -GtkExpander-expander-spacing    : 0;
@@ -69,28 +62,20 @@
     -GtkMenu-horizontal-padding      : 0;
     -GtkMenu-vertical-padding        : 0;
 
-    -GtkMenuItem-internal-padding    : 2;
     -GtkMenuItem-selected-shadow-type: etched-in;
 
-    -GtkOptionMenu-indicator-size    : 0;
-    -GtkOptionMenu-indicator-spacing : 0;
-
-    /*GtkPaned::handle_full_size     : 1*/
-    -GtkPaned-handle-full-size       : 3;
+    -GtkPaned-handle-size            : 3;
 
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
 
-    -GtkScale-trough-size-details    : 1;
     -GtkScale-value-spacing          : 0;
 
-    -GtkScrollbar-has-backward-stepper: 1;
+    -GtkScrollbar-has-backward-stepper: true;
     -GtkScrollbar-min-slider-length  : 20;
 
-    /*-GtkTextView-focus-line-pattern  : "\0";*/
-
     -GtkToolbar-internal-padding     : 0;
     -GtkToolbar-space-size           : 10;
 
@@ -115,7 +100,7 @@
     color: @fg_insensitive;
     background-color: @bg_insensitive;
     border-color: darker(@bg_insensitive);
-    text-shadow: 1 1 white
+    text-shadow: 1 1 white;
 }
 
 *:hover {
@@ -134,6 +119,8 @@
     color: @text_normal;
     background-color: @base_normal;
     border-color: darker(@bg_normal);
+
+    -GtkEntry-focus-line-pattern: "\0";
 }
 
 .view:active, .entry:active {
@@ -222,6 +209,8 @@ GtkCalendar:selected {
     color: @text_normal;
     background-color: @base_normal;
     border-color: darker(@bg_normal);
+
+    -GtkWidget-focus-line-pattern: "\1\1";
 }
 
 .check:active, .radio:active {
@@ -414,6 +403,8 @@ GtkCalendar:selected {
 .button {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.1)), to(shade(#eeeeec, 0.95)));
     border-color: darker(#eeeeec);
+
+    -GtkWidget-focus-line-pattern: "\0";
 }
 
 .button:active {