diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss
index a1e33cf..0de71b6 100755
--- a/gtk-3.0/scss/_functions.scss
+++ b/gtk-3.0/scss/_functions.scss
@@ -1,79 +1,79 @@
 $modules: () !default;
 
 @mixin exports($name) {
-	@if (not index($modules, $name)) {
-		$modules: append($modules, $name) !global;
+    @if (not index($modules, $name)) {
+        $modules: append($modules, $name) !global;
 
-		@content;
-	}
+        @content;
+    }
 }
 
 @function alpha($color, $amount) {
-	@if type-of($color) == "color" {
-		@return fade-out($color, (1 - $amount));
-	} @else {
-		@return unquote("alpha(#{$color},#{$amount})");
-	}
+    @if type-of($color) == "color" {
+        @return fade-out($color, (1 - $amount));
+    } @else {
+        @return unquote("alpha(#{$color},#{$amount})");
+    }
 }
 
 @function shade($color, $amount) {
-	@if type-of($color) == "color" {
-		@if ($amount > 1) {
-			@return lighten($color, ($amount - 1) * lightness($color))
-		} @else {
-			@return darken($color, (1 - $amount) * lightness($color))
-		}
-	} @else {
-		@return unquote("shade(#{$color},#{$amount})");
-	}
+    @if type-of($color) == "color" {
+        @if ($amount > 1) {
+            @return lighten($color, ($amount - 1) * lightness($color))
+        } @else {
+            @return darken($color, (1 - $amount) * lightness($color))
+        }
+    } @else {
+        @return unquote("shade(#{$color},#{$amount})");
+    }
 }
 
 @function mix($color1, $color2, $amount) {
-	@return unquote("mix(#{$color1},#{$color2},#{$amount})");
+    @return unquote("mix(#{$color1},#{$color2},#{$amount})");
 }
 
 @function border_normal($color) {
-	@return shade($color, $contrast);
+    @return shade($color, $contrast);
 }
 
 @function border_focus($color) {
-	@return shade($color, ($contrast - .05));
+    @return shade($color, ($contrast - .05));
 }
 
 @function border_active($color) {
-	@return shade($color, ($contrast - .1));
+    @return shade($color, ($contrast - .1));
 }
 
 @function border_insensitive($color) {
-	@return shade($color, ($contrast + .05));
+    @return shade($color, ($contrast + .05));
 }
 
 @mixin linear-gradient($color, $direction: to bottom) {
-	@if $gradient == 0 {
-		background-color: $color;
-		background-image: none;
-	} @else {
-		$amount: $gradient / 2;
+    @if $gradient == 0 {
+        background-color: $color;
+        background-image: none;
+    } @else {
+        $amount: $gradient / 2;
 
-		background-color: $color;
-		background-image: linear-gradient($direction,
-			shade($color, (1 + $amount)),
-			shade($color, (1 - $amount))
-		);
-	}
+        background-color: $color;
+        background-image: linear-gradient($direction,
+            shade($color, (1 + $amount)),
+            shade($color, (1 - $amount))
+        );
+    }
 }
 
 @mixin border($color) {
-	border-color: border_normal($color);
+    border-color: border_normal($color);
 
-	&:focus, &:hover { border-color: border_focus($color); }
+    &:focus, &:hover { border-color: border_focus($color); }
 
-	&:active, &:active:hover,
-	&:active:focus, &:active:hover:focus,
-	&:checked, &:checked:hover,
-	&:checked:focus, &:checked:hover:focus { border-color: border_active($color); }
+    &:active, &:active:hover,
+    &:active:focus, &:active:hover:focus,
+    &:checked, &:checked:hover,
+    &:checked:focus, &:checked:hover:focus { border-color: border_active($color); }
 
-	&:insensitive { border-color: border_insensitive($color); }
+    &:insensitive { border-color: border_insensitive($color); }
 
-	&:active:insensitive, &:checked:insensitive { border-color: border_normal($color); }
+    &:active:insensitive, &:checked:insensitive { border-color: border_normal($color); }
 }
diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss
index 6f78913..e2b70ee 100755
--- a/gtk-3.0/scss/_global.scss
+++ b/gtk-3.0/scss/_global.scss
@@ -18,6 +18,10 @@ $dark_fg_color: #eee;
 $dark_shadow: #000;
 $light_shadow: #fff;
 
+// white and black
+$black: #000;
+$white: #fff;
+
 // misc colors used by gtk+
 $info_fg_color: #fff;
 $info_bg_color: #03a9f4;
@@ -56,14 +60,14 @@ $lightdm_fg_color: $dark_fg_color;
 $wm_bg: $titlebar_bg_color;
 $wm_border_focused: transparent;
 $wm_border_unfocused: transparent;
-$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1);
-$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4);
-$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1);
+$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1);
+$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4);
+$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1);
 $wm_icons_focused_prelight: $selected_bg_color;
-$wm_icons_focused_pressed: shade($selected_bg_color, 0.8);
-$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4);
+$wm_icons_focused_pressed: shade($selected_bg_color, .8);
+$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4);
 $wm_icons_unfocused_prelight: $selected_bg_color;
-$wm_icons_unfocused_pressed: shade($selected_bg_color, 0.8);
+$wm_icons_unfocused_pressed: shade($selected_bg_color, .8);
 
 // widget styles
 $roundness: 2px;
diff --git a/gtk-3.0/scss/apps/_gedit.scss b/gtk-3.0/scss/apps/_gedit.scss
index 86ec7a5..f1614a6 100644
--- a/gtk-3.0/scss/apps/_gedit.scss
+++ b/gtk-3.0/scss/apps/_gedit.scss
@@ -15,7 +15,7 @@
 
     .gedit-document-panel {
         background-color: $bg_color;
-        color: mix($fg_color, $bg_color, 0.1);
+        color: mix($fg_color, $bg_color, .1);
 
         .list-row {
             padding: $spacing;
@@ -33,21 +33,21 @@
             }
         }
 
-        .prelight-row .button  {
-            border-color: alpha(black, 0.1);
-            color: alpha(white, 0.8);
+        .prelight-row .button {
+            border-color: alpha($black, .1);
+            color: alpha($white, .8);
 
             &:active {
-                border-color: alpha(black, 0.2);
-                background-color: alpha(black, 0.08);
-                color: white;
+                border-color: alpha($black, .2);
+                background-color: alpha($black, .08);
+                color: $white;
             }
         }
 
         list-row, .prelight-row {
             .button:hover {
-                border-color: alpha(black, 0.1);
-                color: white;
+                border-color: alpha($black, .1);
+                color: $white;
             }
         }
     }
@@ -68,14 +68,14 @@
     }
 
     .gedit-document-panel-dragged-row {
-        border: 1px solid alpha(black, 0.1);
-        background-color: alpha(black, 0.5);
-        color: white;
+        border: 1px solid alpha($black, .1);
+        background-color: alpha($black, .5);
+        color: $white;
     }
 
     .gedit-document-panel-placeholder-row {
-        border: none;
-        background-color: alpha(black, 0.08);
+        border: 0;
+        background-color: alpha($black, .08);
         transition: all 200ms ease-in;
     }
 
@@ -94,7 +94,7 @@
             &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); }
 
             &:active {
-                background-color: shade($bg_color, 0.95);
+                background-color: shade($bg_color, .95);
                 color: $fg_color;
             }
         }
@@ -103,7 +103,7 @@
     GeditViewFrame .gedit-search-slider {
         padding: $spacing;
         border-radius: 0 0 $roundness $roundness;
-        border-width: 0 1px 1px 1px;
+        border-width: 0 1px 1px;
         border-style: solid;
         border-color: border_normal($base_color);
         background-color: $base_color;
@@ -119,7 +119,7 @@
 
     GeditFileBrowserWidget .toolbar {
         padding: $spacing / 2;
-        border-top: none;
+        border-top: 0;
         background-color: $bg_color;
         background-image: none;
     }
@@ -127,6 +127,6 @@
     .gedit-search-entry-occurrences-tag {
         margin: $spacing / 2;
         padding: $spacing / 2;
-        color: mix($text_color, $base_color, 0.5);
+        color: mix($text_color, $base_color, .5);
     }
 }
diff --git a/gtk-3.0/scss/apps/_lightdm.scss b/gtk-3.0/scss/apps/_lightdm.scss
index 453434e..52eda61 100644
--- a/gtk-3.0/scss/apps/_lightdm.scss
+++ b/gtk-3.0/scss/apps/_lightdm.scss
@@ -6,30 +6,30 @@
     #panel_window {
         background-color: transparent;
         background-image: none;
-        color: white;
+        color: $white;
         font: bold;
-        text-shadow: 0 1px alpha(black, 0.5);
-        icon-shadow: 0 1px alpha(black, 0.5);
+        text-shadow: 0 1px alpha($black, .5);
+        icon-shadow: 0 1px alpha($black, .5);
 
         .menubar {
             &, > .menuitem {
                 background-color: transparent;
                 background-image: none;
-                color: white;
+                color: $white;
                 font: bold;
-                text-shadow: 0 1px alpha(black, 0.5);
-                icon-shadow: 0 1px alpha(black, 0.5);
+                text-shadow: 0 1px alpha($black, .5);
+                icon-shadow: 0 1px alpha($black, .5);
 
-                *:hover { color: white; }
+                *:hover { color: $white; }
 
                 &:hover {
                     border-style: none;
-                    background-color: alpha(white, 0.2);
+                    background-color: alpha($white, .2);
                     background-image: none;
-                    color: white;
+                    color: $white;
                 }
 
-                &:insensitive { color: alpha(white, 0.7); }
+                &:insensitive { color: alpha($white, .7); }
 
                 .menu {
                     border-radius: 1px;
@@ -52,30 +52,30 @@
         color: $lightdm_fg_color;
 
         /* draw border using box-shadow */
-        box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21),
-                    inset -1px 0 mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21),
-                    inset 0 1px mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21),
-                    inset 0 -1px mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21);
+        box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21),
+                    inset -1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21),
+                    inset 0 1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21),
+                    inset 0 -1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21);
 
         .button {
             padding: 3px 15px;
             border-width: 1px;
             border-radius: $roundness;
             border-style: solid;
-            border-color: shade($lightdm_bg_color, 0.8);
+            border-color: shade($lightdm_bg_color, .8);
             background-color: shade($lightdm_bg_color, 1.08);
             background-image: none;
             color: $lightdm_fg_color;
             transition: all 150ms ease-out;
 
             &.default, &:focus, &:active:focus {
-                border-color: shade($selected_bg_color, 0.8);
+                border-color: shade($selected_bg_color, .8);
                 background-color: shade($selected_bg_color, 1.08);
                 background-image: none;
                 color: $selected_fg_color;
 
                 &:hover {
-                    border-color: shade($selected_bg_color, 0.7);
+                    border-color: shade($selected_bg_color, .7);
                     background-color: $selected_bg_color;
                 }
             }
@@ -100,21 +100,21 @@
             padding: 3px 5px;
             border-width: 1px;
             border-style: solid;
-            border-color: shade($lightdm_bg_color, 0.8);
+            border-color: shade($lightdm_bg_color, .8);
             border-radius: $roundness;
-            background-color: shade($lightdm_bg_color, 0.9);
+            background-color: shade($lightdm_bg_color, .9);
             background-image: none;
             color: $lightdm_fg_color;
             box-shadow: none;
             transition: all 150ms ease-out;
 
             &:focus, &:hover {
-                border-color: shade($lightdm_bg_color, 0.7);
+                border-color: shade($lightdm_bg_color, .7);
 
-                box-shadow: inset 1px 0 alpha($dark_shadow, 0.10),
-                            inset 0 1px alpha($dark_shadow, 0.12),
-                            inset -1px 0 alpha($dark_shadow, 0.10),
-                            inset 0 -1px alpha($dark_shadow, 0.05);
+                box-shadow: inset 1px 0 alpha($dark_shadow, .1),
+                            inset 0 1px alpha($dark_shadow, .12),
+                            inset -1px 0 alpha($dark_shadow, .1),
+                            inset 0 -1px alpha($dark_shadow, .05);
             }
         }
     }
@@ -125,7 +125,7 @@
 
         .menu { font: normal; }
 
-        .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); }
+        .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); }
     }
 
     #user_image {
@@ -133,20 +133,20 @@
         border-radius: $roundness;
 
         /* draw border using box-shadow */
-        box-shadow: inset 1px 0 shade($lightdm_bg_color, 0.7),
-                    inset -1px 0 shade($lightdm_bg_color, 0.7),
-                    inset 0 1px shade($lightdm_bg_color, 0.7),
-                    inset 0 -1px shade($lightdm_bg_color, 0.7);
+        box-shadow: inset 1px 0 shade($lightdm_bg_color, .7),
+                    inset -1px 0 shade($lightdm_bg_color, .7),
+                    inset 0 1px shade($lightdm_bg_color, .7),
+                    inset 0 -1px shade($lightdm_bg_color, .7);
     }
 
     #user_image_border {
         border-radius: $roundness;
-        background-color: shade($lightdm_bg_color, 0.9);
+        background-color: shade($lightdm_bg_color, .9);
         background-image: none;
-        box-shadow: inset 1px 0 alpha($dark_shadow, 0.07),
-                    inset 0 1px alpha($dark_shadow, 0.08),
-                    inset -1px 0 alpha($dark_shadow, 0.07),
-                    inset 0 -1px alpha($dark_shadow, 0.05);
+        box-shadow: inset 1px 0 alpha($dark_shadow, .07),
+                    inset 0 1px alpha($dark_shadow, .08),
+                    inset -1px 0 alpha($dark_shadow, .07),
+                    inset 0 -1px alpha($dark_shadow, .05);
     }
 
     #buttonbox_frame {
@@ -164,26 +164,26 @@
 
     /* shutdown button */
     #shutdown_button {
-        border-color: shade($error_bg_color, 0.8);
+        border-color: shade($error_bg_color, .8);
         background-color: shade($error_bg_color, 1.08);
         background-image: none;
         color: $error_fg_color;
 
         &:hover, &:active, &:active:hover {
-            border-color: shade($error_bg_color, 0.7);
+            border-color: shade($error_bg_color, .7);
             background-color: $error_bg_color;
         }
     }
 
     /* restart button */
     #restart_button {
-        border-color: shade($warning_bg_color, 0.8);
+        border-color: shade($warning_bg_color, .8);
         background-color: shade($warning_bg_color, 1.08);
         background-image: none;
         color: $warning_fg_color;
 
         &:hover, &:active, &:active:hover {
-            border-color: shade($warning_bg_color, 0.7);
+            border-color: shade($warning_bg_color, .7);
             background-color: $warning_bg_color;
         }
     }
diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss
index 9a9f754..32cbae7 100644
--- a/gtk-3.0/scss/apps/_nautilus.scss
+++ b/gtk-3.0/scss/apps/_nautilus.scss
@@ -4,8 +4,8 @@
 
 @include exports("nautilus") {
     .nautilus-desktop.nautilus-canvas-item {
-        color: white;
-        text-shadow: 1px 1px black;
+        color: $white;
+        text-shadow: 1px 1px $black;
 
         &:active { color: $fg_color; }
 
@@ -21,7 +21,7 @@
             border-color: border_normal($toolbar_bg_color);
         }
 
-        .sidebar .frame { border: none; }
+        .sidebar .frame { border: 0; }
 
         GtkPaned {
             border-width: 0 1px 0 0;
@@ -41,17 +41,17 @@
             border-bottom-width: 0;
         }
 
-        .frame { border: none; }
+        .frame { border: 0; }
     }
 
     NautilusQueryEditor {
         .toolbar {
             padding-top: $spacing - 1px;
             padding-bottom: $spacing - 2px;
-            border-width: 1px 0 0 0;
+            border-width: 1px 0 0;
             border-style: solid;
             border-color: $toolbar_bg_color;
-            background-color: shade($toolbar_bg_color, 0.9);
+            background-color: shade($toolbar_bg_color, .9);
 
             &:nth-child(2) { border-color: border_normal($toolbar_bg_color); }
 
diff --git a/gtk-3.0/scss/apps/_nemo.scss b/gtk-3.0/scss/apps/_nemo.scss
index 63518aa..b7e0041 100644
--- a/gtk-3.0/scss/apps/_nemo.scss
+++ b/gtk-3.0/scss/apps/_nemo.scss
@@ -4,8 +4,8 @@
 
 @include exports("nemo") {
     .nemo-desktop.nemo-canvas-item {
-        color: white;
-        text-shadow: 1px 1px black;
+        color: $white;
+        text-shadow: 1px 1px $black;
 
         &:active { color: $fg_color; }
 
@@ -21,7 +21,7 @@
     }
 
     NemoPlacesTreeView {
-        -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, 0.8);
+        -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, .8);
         -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color;
         -NemoPlacesTreeView-disk-full-bar-width: 1px;
         -NemoPlacesTreeView-disk-full-bar-radius: 1px;
diff --git a/gtk-3.0/scss/apps/_panel.scss b/gtk-3.0/scss/apps/_panel.scss
index c84c98b..d9513f8 100644
--- a/gtk-3.0/scss/apps/_panel.scss
+++ b/gtk-3.0/scss/apps/_panel.scss
@@ -18,22 +18,22 @@
         color: $panel_fg_color;
 
         &:hover, &:prelight {
-            @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11));
+            @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .11));
 
-            border-color: mix($panel_bg_color, $panel_fg_color, 0.11);
+            border-color: mix($panel_bg_color, $panel_fg_color, .11);
             color: shade($panel_fg_color, 1.08);
         }
 
         &:active, &:checked {
-            @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top);
+            @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .21), to top);
 
-            border-color: mix($panel_bg_color, $panel_fg_color, 0.21);
+            border-color: mix($panel_bg_color, $panel_fg_color, .21);
             color: shade($panel_fg_color, 1.08);
 
             &:prelight {
-                @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top);
+                @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .31), to top);
 
-                border-color: mix($panel_bg_color, $panel_fg_color, 0.31);
+                border-color: mix($panel_bg_color, $panel_fg_color, .31);
             }
         }
     }
@@ -45,7 +45,7 @@
     }
 
     PanelApplet {
-        border: none;
+        border: 0;
 
         .button {
             @extend %panelbutton;
@@ -57,14 +57,14 @@
     PanelSeparator {
         @extend %panel;
 
-        border: none;
+        border: 0;
     }
 
     PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar {
         &.menuitem {
             @extend %panel;
 
-            border: none;
+            border: 0;
 
             -PanelMenuBar-icon-visible: true;
         }
@@ -73,7 +73,7 @@
     PanelAppletFrame {
         @extend %panel;
 
-        border: none;
+        border: 0;
     }
 
     WnckPager, WnckTasklist { @extend %panel; }
diff --git a/gtk-3.0/scss/apps/_synaptic.scss b/gtk-3.0/scss/apps/_synaptic.scss
index ca67412..c19b78e 100644
--- a/gtk-3.0/scss/apps/_synaptic.scss
+++ b/gtk-3.0/scss/apps/_synaptic.scss
@@ -8,7 +8,7 @@
             @include linear-gradient($toolbar-bg-color);
 
             padding: $spacing;
-            border: none;
+            border: 0;
             color: $toolbar_fg_color;
         }
     }
diff --git a/gtk-3.0/scss/apps/_unity.scss b/gtk-3.0/scss/apps/_unity.scss
index 5cea4ad..e463223 100644
--- a/gtk-3.0/scss/apps/_unity.scss
+++ b/gtk-3.0/scss/apps/_unity.scss
@@ -11,9 +11,9 @@
 
         -UnityDecoration-shadow-offset-x: 1px;
         -UnityDecoration-shadow-offset-y: 1px;
-        -UnityDecoration-active-shadow-color: rgba(0,0,0,0.7);
+        -UnityDecoration-active-shadow-color: rgba(0, 0, 0, .7);
         -UnityDecoration-active-shadow-radius: 8px;
-        -UnityDecoration-inactive-shadow-color: rgba(0,0,0,0.5);
+        -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, .5);
         -UnityDecoration-inactive-shadow-radius: 5px;
 
         -UnityDecoration-glow-size: 10px;
@@ -21,21 +21,21 @@
 
         -UnityDecoration-title-indent: 10px;
         -UnityDecoration-title-fade: 35px;
-        -UnityDecoration-title-alignment: 0.0;
+        -UnityDecoration-title-alignment: 0;
 
 
         &.top {
             border: 1px solid $wm_border_focused;
-            border-bottom: none;
+            border-bottom: 0;
             border-radius: 2px 2px 0 0;
-            padding: 1px ($spacing * 2) 0 ($spacing * 2);
+            padding: 1px ($spacing * 2) 0;
             background-color: $titlebar_bg_color;
-            color: mix($titlebar_fg_color, $titlebar_bg_color, 0.1);
+            color: mix($titlebar_fg_color, $titlebar_bg_color, .1);
             text-shadow: none;
 
             &:backdrop {
                 border: 1px solid $wm_border_unfocused;
-                color: mix($titlebar_fg_color, $titlebar_bg_color, 0.4);
+                color: mix($titlebar_fg_color, $titlebar_bg_color, .4);
             }
         }
 
@@ -49,7 +49,7 @@
     UnityPanelWidget, .unity-panel {
         @extend %panel;
 
-        border: none;
+        border: 0;
     }
 
     .unity-panel {
@@ -58,8 +58,8 @@
             color: $panel_fg_color;
 
             &:hover, *:hover {
-                border-color: mix($panel_bg_color, $panel_fg_color, 0.21);
-                background-color: mix($panel_bg_color, $panel_fg_color, 0.21);
+                border-color: mix($panel_bg_color, $panel_fg_color, .21);
+                background-color: mix($panel_bg_color, $panel_fg_color, .21);
                 background-image: none;
                 color: shade($panel_fg_color, 1.08);
             }
diff --git a/gtk-3.0/scss/apps/_xfce.scss b/gtk-3.0/scss/apps/_xfce.scss
index 20dd546..dc38a86 100644
--- a/gtk-3.0/scss/apps/_xfce.scss
+++ b/gtk-3.0/scss/apps/_xfce.scss
@@ -8,7 +8,7 @@
     XfceHeading {
         margin: 0;
         padding: 0;
-        border: none;
+        border: 0;
         background-image: none;
         background-color: $base_color;
         color: $text_color;
diff --git a/gtk-3.0/scss/widgets/_actionbar.scss b/gtk-3.0/scss/widgets/_actionbar.scss
index cfae302..749f549 100644
--- a/gtk-3.0/scss/widgets/_actionbar.scss
+++ b/gtk-3.0/scss/widgets/_actionbar.scss
@@ -10,7 +10,7 @@
         @include linear-gradient($bg_color);
 
         padding: $spacing;
-        border-width: 1px 0 0 0;
+        border-width: 1px 0 0;
         border-style: solid;
         border-color: border_normal($bg_color);
         color: $fg_color;
@@ -40,9 +40,9 @@
 
 @include exports("searchbar") {
     .search-bar {
-        @include linear-gradient(shade($bg_color, 0.98));
+        @include linear-gradient(shade($bg_color, .98));
 
-        border-width: 0 0 1px 0;
+        border-width: 0 0 1px;
         border-style: solid;
         border-color: border_normal($bg_color);
         color: $fg_color;
@@ -86,7 +86,7 @@
             }
 
             .selection-menu.button {
-                border: none;
+                border: 0;
                 background-color: transparent;
                 background-image: none;
                 color: shade($selected_bg_color, $contrast);
diff --git a/gtk-3.0/scss/widgets/_base.scss b/gtk-3.0/scss/widgets/_base.scss
index 9897e50..eddb5be 100755
--- a/gtk-3.0/scss/widgets/_base.scss
+++ b/gtk-3.0/scss/widgets/_base.scss
@@ -3,7 +3,7 @@
 ***************/
 
 * {
-    -GtkArrow-arrow-scaling: 0.5;
+    -GtkArrow-arrow-scaling: .5;
     -GtkExpander-expander-size: 8;
     -GtkStatusbar-shadow-type: none;
     -GtkToolItemGroup-expander-size: 8;
@@ -11,7 +11,7 @@
     -GtkWindow-resize-grip-width: 0;
     -WnckTasklist-fade-overlay-rect: 0;
 
-    outline-color: alpha($selected_bg_color, 0.5);
+    outline-color: alpha($selected_bg_color, .5);
     outline-style: dashed;
     outline-width: 1px;
     outline-offset: -1px;
@@ -31,21 +31,21 @@
 }
 
 * {
-    &:selected { @extend %selected; }
-
-    &:insensitive,
-    &:insensitive:insensitive { color: mix($fg_color, $bg_color, 0.50); }
-
-    &:insensitive { -gtk-image-effect: dim; }
-
-    &:hover { -gtk-image-effect: highlight; }
-
     /* hyperlinks */
     -GtkHTML-link-color: $link_color;
     -GtkIMHtml-hyperlink-color: $link_color;
     -GtkWidget-link-color: $link_color;
     -GtkWidget-visited-link-color: $link_color;
 
+    &:selected { @extend %selected; }
+
+    &:insensitive,
+    &:insensitive:insensitive { color: mix($fg_color, $bg_color, .5); }
+
+    &:insensitive { -gtk-image-effect: dim; }
+
+    &:hover { -gtk-image-effect: highlight; }
+
     &:link, &:visited { color: $link_color; }
 }
 
@@ -71,13 +71,13 @@
     }
 
     &:active {
-        background-color: shade($bg_color, 0.9);
+        background-color: shade($bg_color, .9);
         color: $fg_color;
     }
 
     &:insensitive {
-        background-color: shade(shade($bg_color, 0.95), 1.05);
-        color: mix($fg_color, $bg_color, 0.50);
+        background-color: shade(shade($bg_color, .95), 1.05);
+        color: mix($fg_color, $bg_color, .5);
     }
 
     &:selected { @extend %selected; }
@@ -89,12 +89,12 @@ GtkImage, GtkLabel, GtkBox, GtkGrid {
 
 GtkLabel {
     &.separator {
-        color: $fg_color;
-
         @extend .dim-label;
+
+        color: $fg_color;
     }
 
     &:selected { @extend %selected; }
 
-    &:insensitive { color: mix($fg_color, $bg_color, 0.50); }
+    &:insensitive { color: mix($fg_color, $bg_color, .5); }
 }
diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss
index e62bf60..c1b92aa 100755
--- a/gtk-3.0/scss/widgets/_button.scss
+++ b/gtk-3.0/scss/widgets/_button.scss
@@ -25,7 +25,7 @@
         &:dir(rtl) {
             border-radius: 0; // needed when including %linked_middle:dir(rtl)
             border-right-style: none;
-            border-left-style: solid
+            border-left-style: solid;
         }
     }
 
@@ -78,11 +78,11 @@
 
     @extend %linked_button;
 
-    box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12 + $border_strength)),
+    box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)),
                 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
 
     &:focus, &:hover {
-        box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12 + $border_strength)),
+        box-shadow: inset -1px 0 border_focus(rgba(0, 0, 0, .12 + $border_strength)),
                     0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength);
     }
 
@@ -90,7 +90,7 @@
     &:active:focus, &:active:hover:focus,
     &:checked, &:checked:hover,
     &:checked:focus, &:checked:hover:focus {
-        box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12 + $border_strength)),
+        box-shadow: inset -1px 0 border_active(rgba(0, 0, 0, .12 + $border_strength)),
                     inset 0 1px alpha($dark_shadow, .07),
                     inset 0 -1px alpha($dark_shadow, .05);
     }
@@ -127,7 +127,7 @@
 
     @extend %button;
     @include linear-gradient($button_bg);
-    @include border(rgba(0,0,0,.12 + $border_strength));
+    @include border(rgba(0, 0, 0, .12 + $border_strength));
 
     color: $fg;
     box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
@@ -142,7 +142,7 @@
     &, &.flat {
         &:focus, &:hover {
             @include linear-gradient(shade($button_bg, 1.2));
-            @include border(rgba(0,0,0,.2 + $border_strength));
+            @include border(rgba(0, 0, 0, .2 + $border_strength));
 
             box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength);
         }
@@ -150,7 +150,7 @@
         &:active, &:checked {
             @include linear-gradient(shade($button_bg, .7), to top);
 
-            color: white;
+            color: $white;
             box-shadow: inset 1px 0 alpha($dark_shadow, .06),
                         inset 0 1px alpha($dark_shadow, .07),
                         inset -1px 0 alpha($dark_shadow, .06),
@@ -159,7 +159,7 @@
             &:focus, &:hover {
                 @include linear-gradient(shade($button_bg, .65), to top);
 
-                color: white;
+                color: $white;
             }
         }
 
@@ -212,15 +212,15 @@
         box-shadow: none;
 
         &:focus, &:hover {
-            border: 1px solid alpha(black, .3);
-            background-color: alpha(white, .2);
+            border: 1px solid alpha($black, .3);
+            background-color: alpha($white, .2);
             background-image: none;
             box-shadow: none;
         }
 
-        &:active, &:checked, &:active:hover, &:checked:hover  {
-            border: 1px solid alpha(black, .3);
-            background-color: alpha(black, .1);
+        &:active, &:checked, &:active:hover, &:checked:hover {
+            border: 1px solid alpha($black, .3);
+            background-color: alpha($black, .1);
             background-image: none;
             box-shadow: none;
         }
@@ -236,7 +236,7 @@
         .spinbutton & {
             color: mix($text_color, $base_color, .4);
             padding: $spacing ($spacing * 2);
-            border: none;
+            border: 0;
             border-radius: 0;
             border-style: none;
             background-color: transparent;
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index d9705f4..409eb5b 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -7,11 +7,11 @@
         padding: $spacing;
         outline-offset: -1px;
 
-        &:inconsistent { color: mix($fg_color, $bg_color, 0.5); }
+        &:inconsistent { color: mix($fg_color, $bg_color, .5); }
 
         &.view, &.highlight, &.header, &.button {
             &, &:focus, &:hover, &:insensitive {
-                border: none;
+                border: 0;
                 background-color: transparent;
                 background-image: none;
             }
diff --git a/gtk-3.0/scss/widgets/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss
index 53f1de2..b650c47 100644
--- a/gtk-3.0/scss/widgets/_choosers.scss
+++ b/gtk-3.0/scss/widgets/_choosers.scss
@@ -5,12 +5,12 @@
 @include exports("colorchooser") {
     GtkColorSwatch {
         &, &:selected {
-            border: 1px solid alpha(black, 0.1);
+            border: 1px solid alpha($black, .1);
             border-radius: $roundness - 1px;
             background-color: transparent;
             background-clip: border-box;
 
-            &:hover { border-color: alpha(black, 0.3); }
+            &:hover { border-color: alpha($black, .3); }
         }
 
         &.color-light:selected:hover, &.color-dark:selected:hover { background-image: none; }
@@ -42,20 +42,20 @@
 
             &.color-dark:hover, &.color-light:hover {
                 background-image: none;
-                border-color: alpha(black, 0.3);
+                border-color: alpha($black, .3);
             }
         }
     }
 
     GtkColorChooserWidget #add-color-button {
         background-clip: padding-box;
-        border-color: alpha(black, 0.1);
-        background-color: shade($bg_color, 0.95);
+        border-color: alpha($black, .1);
+        background-color: shade($bg_color, .95);
         color: $fg_color;
 
         &:hover {
-            border-color: alpha(black, 0.3);
-            background-color: shade($bg_color, 0.90);
+            border-color: alpha($black, .3);
+            background-color: shade($bg_color, .9);
             color: $fg_color;
         }
     }
@@ -69,15 +69,15 @@
 
         &.color-light {
             &, &:hover {
-                border-color: alpha(black, 0.3);
-                color: alpha(black, 0.3);
+                border-color: alpha($black, .3);
+                color: alpha($black, .3);
             }
         }
 
         &.color-dark {
             &, &:hover {
-                border-color: alpha(white, 0.3);
-                color: alpha(white, 0.3);
+                border-color: alpha($white, .3);
+                color: alpha($white, .3);
             }
         }
     }
@@ -99,9 +99,9 @@
             -GtkWidget-vertical-separator: 0;
         }
 
-        GtkLabel:last-child { color: alpha(currentColor, 0.7); }
+        GtkLabel:last-child { color: alpha(currentColor, .7); }
 
-        GtkImage:last-child { color: alpha(currentColor, 0.7); }
+        GtkImage:last-child { color: alpha(currentColor, .7); }
     }
 
     GtkFileChooser {
@@ -119,7 +119,7 @@
         .dialog-action-box {
             border-width: 1px 0 0;
             border-style: solid;
-            border-color: shade($bg_color, 0.7);
+            border-color: shade($bg_color, .7);
         }
     }
 }
diff --git a/gtk-3.0/scss/widgets/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss
index 13016da..e4b9e8f 100644
--- a/gtk-3.0/scss/widgets/_grid.scss
+++ b/gtk-3.0/scss/widgets/_grid.scss
@@ -4,12 +4,12 @@
 
 @include exports("grid") {
     .list {
-        background-color: shade($bg_color, 0.97);
+        background-color: shade($bg_color, .97);
         color: $fg_color;
 
         &-row {
             &, &.button {
-                border: none;
+                border: 0;
                 border-radius: 0;
                 padding: $spacing;
                 background-image: none;
diff --git a/gtk-3.0/scss/widgets/_infobar.scss b/gtk-3.0/scss/widgets/_infobar.scss
index 1579c01..9b5a679 100644
--- a/gtk-3.0/scss/widgets/_infobar.scss
+++ b/gtk-3.0/scss/widgets/_infobar.scss
@@ -7,7 +7,7 @@
 
 @include exports("infobar") {
     GtkInfoBar {
-        border: none;
+        border: 0;
 
         $types: (
             info: ( $info_fg_color, $info_bg_color ),
@@ -24,7 +24,7 @@
             &.#{$type} {
                 @include linear-gradient($bg_color);
 
-                border: 1px solid shade($bg_color, 0.8);
+                border: 1px solid shade($bg_color, .8);
                 color: $fg_color;
 
                 .button {
diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss
index 8b08c5c..1973351 100755
--- a/gtk-3.0/scss/widgets/_menu.scss
+++ b/gtk-3.0/scss/widgets/_menu.scss
@@ -9,7 +9,7 @@
     .menubar {
         -GtkWidget-window-dragging: true;
 
-        border: none;
+        border: 0;
         background-color: $menubar_bg_color;
         background-image: none;
         color: $menubar_fg_color;
@@ -23,13 +23,13 @@
             color: $menubar_fg_color;
 
             &:hover {
-                border-color: mix($menubar_bg_color, $menubar_fg_color, 0.21);
-                background-color: mix($menubar_bg_color, $menubar_fg_color, 0.21);
+                border-color: mix($menubar_bg_color, $menubar_fg_color, .21);
+                background-color: mix($menubar_bg_color, $menubar_fg_color, .21);
                 background-image: none;
                 color: shade($menubar_fg_color, 1.08);
             }
 
-            & *:hover { color: shade($menubar_fg_color, 1.08); }
+            *:hover { color: shade($menubar_fg_color, 1.08); }
         }
     }
 }
@@ -55,7 +55,7 @@
     #toolbar-popup, .menu {
         padding: 0;
         border-radius: 0;
-        border: none;
+        border: 0;
         background-color: $menu_bg_color;
         color: $menu_fg_color;
 
@@ -81,23 +81,23 @@
         &, .menu & {
             margin: $spacing;
             padding: $spacing;
-            border: none;
+            border: 0;
             border-radius: 0;
             background-color: transparent;
             background-image: none;
 
-            -GtkMenuItem-arrow-scaling: 0.5;
+            -GtkMenuItem-arrow-scaling: .5;
 
             &:active, &:hover {
-                border: none;
+                border: 0;
                 background-color: $selected_bg_color;
                 background-image: none;
                 color: $selected_fg_color;
             }
 
-            & *:active, & *:hover { color: $selected_fg_color; }
+            *:active, *:hover { color: $selected_fg_color; }
 
-            &:insensitive, & *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); }
+            &:insensitive, *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); }
         }
 
         &.check, &.radio {
@@ -175,7 +175,7 @@
         background-color: $menu_bg_color;
         background-image: none;
         color: $menu_fg_color;
-        box-shadow: 0 3px 6px alpha(black, .16);
+        box-shadow: 0 3px 6px alpha($black, .16);
 
         &.background {
             background-image: none;
@@ -186,7 +186,7 @@
         &:backdrop { box-shadow: none; }
 
         &.osd {
-            box-shadow: 0 2px 7px 3px alpha(black, .5);
+            box-shadow: 0 2px 7px 3px alpha($black, .5);
 
             > .toolbar .button {
                 border-radius: 0;
diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss
index 3436192..b5a6cc9 100644
--- a/gtk-3.0/scss/widgets/_misc.scss
+++ b/gtk-3.0/scss/widgets/_misc.scss
@@ -4,7 +4,7 @@
 
 @include exports("dimlabel") {
     .dim-label {
-        opacity: 0.5;
+        opacity: .5;
         text-shadow: none;
     }
 }
@@ -19,7 +19,7 @@
         &.background {
             @include linear-gradient($tooltip_bg_color);
 
-            border: none;
+            border: 0;
             border-radius: $roundness;
             color: $tooltip_fg_color;
         }
@@ -57,7 +57,7 @@
         &, &.frame {
             border-style: solid;
             border-color: border_normal($osd_bg);
-            border-width: 0 1px 1px 1px;
+            border-width: 0 1px 1px;
             border-radius: 0 0 $roundness $roundness;
             padding: $spacing * 2;
             background-color: $osd_bg;
@@ -81,17 +81,17 @@
     }
 
     .expander {
-        color: alpha(currentColor, 0.7);
-        border: alpha(currentColor, 0.7);
+        color: alpha(currentColor, .7);
+        border: alpha(currentColor, .7);
 
         &:hover {
-            color: alpha(currentColor, 0.8);
-            border-color: alpha(currentColor, 0.8);
+            color: alpha(currentColor, .8);
+            border-color: alpha(currentColor, .8);
         }
 
         &:active {
-            color: alpha(currentColor, 0.9);
-            border-color: alpha(currentColor, 0.9);
+            color: alpha(currentColor, .9);
+            border-color: alpha(currentColor, .9);
         }
     }
 }
@@ -103,9 +103,9 @@
 
 @include exports("symbolicimage") {
     .image {
-        color: alpha(currentColor, 0.5);
+        color: alpha(currentColor, .5);
 
-        &:hover { color: alpha(currentColor, 0.9); }
+        &:hover { color: alpha(currentColor, .9); }
 
         &:selected, &:selected:hover { color: $selected_fg_color; }
     }
@@ -152,7 +152,7 @@
             -GtkButton-image-spacing: 0;
             -GtkButton-inner-border: 0;
 
-            border: none;
+            border: 0;
             background-color: transparent;
             background-image: none;
         }
diff --git a/gtk-3.0/scss/widgets/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss
index b0ecfbb..9447d30 100644
--- a/gtk-3.0/scss/widgets/_notebook.scss
+++ b/gtk-3.0/scss/widgets/_notebook.scss
@@ -8,7 +8,7 @@
 @include exports("notebook") {
     .notebook {
         padding: 0;
-        border-width: 1px 0 0 0;
+        border-width: 1px 0 0;
         border-style: solid;
         border-color: border_normal($base_color);
         border-radius: 0;
@@ -32,11 +32,11 @@
             &.frame {
                 border-color: border_normal($base_color);
 
-                &.top { border-width: 1px 1px 0 1px; }
+                &.top { border-width: 1px 1px 0; }
 
                 &.right { border-width: 1px 1px 1px 0; }
 
-                &.bottom { border-width: 0 1px 1px 1px; }
+                &.bottom { border-width: 0 1px 1px; }
 
                 &.left { border-width: 1px 0 1px 1px; }
             }
@@ -90,14 +90,14 @@
                 border-bottom-right-radius: 0;
             }
 
-            GtkLabel { color: mix($text_color, $base_color, 0.3); }
+            GtkLabel { color: mix($text_color, $base_color, .3); }
 
             /* close button styling */
             .button { @extend %close_button; }
         }
 
         .prelight-page {
-            &, GtkLabel { color: mix($text_color, $base_color, 0.15); }
+            &, GtkLabel { color: mix($text_color, $base_color, .15); }
         }
 
         .active-page {
@@ -106,20 +106,20 @@
 
         .reorderable-page {
             &:hover {
-                background-color: shade($base_color, 0.85);
+                background-color: shade($base_color, .85);
                 border-left: 0;
                 border-right: 0;
                 /* using box shadows instead of borders due to slanted edges */
-                box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
-                            inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7);
+                box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03),
+                            inset 1px 0 shade($base_color, .7), inset -1px 0 shade($base_color, .7);
             }
 
             &:active {
-                background-color: shade($base_color, 0.90);
+                background-color: shade($base_color, .9);
                 border-left: 0;
                 border-right: 0;
-                box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
-                            inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75);
+                box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03),
+                            inset 1px 0 shade($base_color, .75), inset -1px 0 shade($base_color, .75);
             }
         }
     }
diff --git a/gtk-3.0/scss/widgets/_osd.scss b/gtk-3.0/scss/widgets/_osd.scss
index 87be1e5..dbf1d16 100644
--- a/gtk-3.0/scss/widgets/_osd.scss
+++ b/gtk-3.0/scss/widgets/_osd.scss
@@ -10,7 +10,7 @@
 
     .osd {
         &.background {
-            background-color: alpha($osd_bg, 0.8);
+            background-color: alpha($osd_bg, .8);
             color: $osd_fg;
         }
 
@@ -36,7 +36,7 @@
         }
 
         /* used by gnome-settings-daemon's media-keys OSD */
-        &.trough { background-color: shade($osd_bg, 0.8); }
+        &.trough { background-color: shade($osd_bg, .8); }
 
         &.progressbar { background-color: $osd_fg; }
 
@@ -45,11 +45,11 @@
                 @include linear-gradient(shade($osd_bg, 1.08));
                 @include border($osd_bg);
 
-                &:insensitive { @include linear-gradient(shade($osd_bg, 0.9)); }
+                &:insensitive { @include linear-gradient(shade($osd_bg, .9)); }
             }
 
             &.trough {
-                border-color: shade($osd_bg, 0.8);
+                border-color: shade($osd_bg, .8);
                 background-color: shade($osd_bg, 1.08);
                 background-image: none;
 
@@ -60,8 +60,8 @@
                 }
 
                 &:insensitive, &.highlight:insensitive {
-                    border-color: shade($osd_bg, 0.85);
-                    background-color: shade($osd_bg, 0.9);
+                    border-color: shade($osd_bg, .85);
+                    background-color: shade($osd_bg, .9);
                     background-image: none;
                 }
             }
@@ -73,17 +73,17 @@
             .trough { background-color: $osd_bg; }
 
             .slider {
-                border: 1px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21);
+                border: 1px solid mix(shade($osd_bg, .87), $osd_fg, .21);
                 border-radius: 0;
-                background-color: mix($osd_bg, $osd_fg, 0.21);
+                background-color: mix($osd_bg, $osd_fg, .21);
 
                 &:hover {
-                    border-color: mix(shade($osd_bg, 0.87), $osd_fg, 0.31);
-                    background-color: mix($osd_bg, $osd_fg, 0.31);
+                    border-color: mix(shade($osd_bg, .87), $osd_fg, .31);
+                    background-color: mix($osd_bg, $osd_fg, .31);
                 }
 
                 &:active {
-                    border-color: shade($selected_bg_color, 0.9);
+                    border-color: shade($selected_bg_color, .9);
                     background-color: $selected_bg_color;
                 }
             }
@@ -92,7 +92,7 @@
         GtkIconView.cell {
             &:selected, &:selected:focus {
                 background-color: transparent;
-                border: 3px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21);
+                border: 3px solid mix(shade($osd_bg, .87), $osd_fg, .21);
                 border-radius: $roundness;
                 outline-color: transparent;
             }
@@ -100,7 +100,7 @@
 
         /* used by Documents */
         .page-thumbnail {
-            border: 1px solid shade($osd_bg, 0.9);
+            border: 1px solid shade($osd_bg, .9);
             /* when there's no pixbuf yet */
             background-color: $osd_bg;
         }
diff --git a/gtk-3.0/scss/widgets/_overshoot.scss b/gtk-3.0/scss/widgets/_overshoot.scss
index fa5fe1b..bc3d1fd 100644
--- a/gtk-3.0/scss/widgets/_overshoot.scss
+++ b/gtk-3.0/scss/widgets/_overshoot.scss
@@ -9,15 +9,11 @@
     @if $position == bottom {
         $_position: center bottom;
         $_linear_gradient_direction: to top;
-    }
-
-    @else if $position == right {
+    } @else if $position == right {
         $_position: right center;
         $_small_gradient_size: $_small_gradient_length 100%;
         $_big_gradient_size: $_big_gradient_length 100%;
-    }
-
-    @else if $position == left {
+    } @else if $position == left {
         $_position: left center;
         $_small_gradient_size: $_small_gradient_length 100%;
         $_big_gradient_size: $_big_gradient_length 100%;
@@ -28,13 +24,13 @@
 
     $_small_gradient: -gtk-gradient(radial,
                                     $_position, 0,
-                                    $_position, 0.5,
+                                    $_position, .5,
                                     to(alpha($_small_gradient_color, .35)),
                                     to(alpha($_small_gradient_color, .25)));
 
     $_big_gradient: -gtk-gradient(radial,
                                   $_position, 0,
-                                  $_position, 0.6,
+                                  $_position, .6,
                                   from(alpha($_big_gradient_color, .2)),
                                   to(alpha($_big_gradient_color, 0)));
 
@@ -50,13 +46,13 @@
     background-position: $_position;
 
     background-color: transparent; // reset some properties to be sure to not inherit them somehow
-    border: none;
+    border: 0;
     box-shadow: none;
 }
 
 @mixin undershoot($position) {
-    $_undershoot_color_dark: alpha(black, .2);
-    $_undershoot_color_light: alpha(white, .2);
+    $_undershoot_color_dark: alpha($black, .2);
+    $_undershoot_color_light: alpha($white, .2);
 
     $_gradient_dir: left;
     $_dash_bg_size: 10px 1px;
diff --git a/gtk-3.0/scss/widgets/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss
index 25064a9..28df150 100644
--- a/gtk-3.0/scss/widgets/_progress.scss
+++ b/gtk-3.0/scss/widgets/_progress.scss
@@ -7,7 +7,7 @@
         padding: 0;
         border-radius: $roundness;
         font-size: smaller;
-        color: alpha($fg_color, 0.6);
+        color: alpha($fg_color, .6);
 
         -GtkProgressBar-min-horizontal-bar-height: 6;
         -GtkProgressBar-min-vertical-bar-width: 6;
@@ -19,7 +19,7 @@
         }
 
         &.trough {
-            border: 1px solid alpha(border_normal($bg_color), 0.5);
+            border: 1px solid alpha(border_normal($bg_color), .5);
             background-color: shade($bg_color, 1.08);
             background-image: none;
         }
@@ -72,7 +72,7 @@
         &.trough {
             @include linear-gradient(shade($bg_color, 1.08), to top);
 
-            border: 1px solid alpha(border_normal($bg_color), 0.5);
+            border: 1px solid alpha(border_normal($bg_color), .5);
             border-radius: $roundness;
         }
 
@@ -86,6 +86,7 @@
 
             &.indicator-discrete {
                 &.horizontal { margin-right: 1px; }
+
                 &.vertical { margin-bottom: 1px; }
             }
 
@@ -127,7 +128,7 @@
             border-style: solid;
             box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3);
 
-            &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); }
+            &:insensitive { @include linear-gradient(shade($bg_color, .9)); }
         }
 
         &.fine-tune {
@@ -140,17 +141,17 @@
             }
         }
 
-        &.mark { border-color: alpha(border_normal($bg_color), 0.5); }
+        &.mark { border-color: alpha(border_normal($bg_color), .5); }
 
 
         &.trough {
             @include linear-gradient(shade($bg_color, 1.08));
 
             margin: 7px 0;
-            border: 1px solid alpha(border_normal($bg_color), 0.5);
+            border: 1px solid alpha(border_normal($bg_color), .5);
             border-radius: $roundness;
 
-            &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); }
+            &:insensitive { @include linear-gradient(shade($bg_color, .9)); }
 
             &.vertical { margin: 0 7px; }
         }
@@ -162,9 +163,9 @@
                 border-color: $selected_bg_color;
 
                 &:insensitive {
-                    @include linear-gradient(shade($bg_color, 0.8));
+                    @include linear-gradient(shade($bg_color, .8));
 
-                    border-color: shade($bg_color, 0.7);
+                    border-color: shade($bg_color, .7);
                 }
             }
         }
diff --git a/gtk-3.0/scss/widgets/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss
index bfc210e..56156d4 100644
--- a/gtk-3.0/scss/widgets/_scrollbar.scss
+++ b/gtk-3.0/scss/widgets/_scrollbar.scss
@@ -25,16 +25,16 @@
                 border-radius: 0;
                 background-color: transparent;
                 background-image: none;
-                color: alpha($fg_color, 0.5);
+                color: alpha($fg_color, .5);
             }
         }
 
         &.slider, &.slider.vertical {
             border: 0;
             border-radius: $roundness;
-            background-color: shade($bg_color, 0.5);
+            background-color: shade($bg_color, .5);
 
-            &:hover { background-color: shade($bg_color, 0.3); }
+            &:hover { background-color: shade($bg_color, .3); }
 
             &:active { background-color: $selected_bg_color; }
 
@@ -44,7 +44,7 @@
         // overlay scrolling indicator
         &.overlay-indicator {
             &:not(.dragging):not(.hovering) {
-                opacity: 0.5;
+                opacity: .5;
 
                 -GtkRange-slider-width: 4px;
 
@@ -60,7 +60,7 @@
                 }
             }
 
-            &.dragging, &.hovering { opacity: 0.7; }
+            &.dragging, &.hovering { opacity: .7; }
         }
     }
 
@@ -75,12 +75,12 @@
 
     // ubuntu overlay scrollbars
     OsThumb, OsScrollbar {
-        color: shade($bg_color, 0.7);
+        color: shade($bg_color, .7);
 
         &:selected { background-color: $selected_bg_color; }
 
         &:active { background-color: $selected_bg_color; }
 
-        &:insensitive { background-color: shade($bg_color, 0.9); }
+        &:insensitive { background-color: shade($bg_color, .9); }
     }
 }
diff --git a/gtk-3.0/scss/widgets/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss
index 7d5d9f1..16583d7 100755
--- a/gtk-3.0/scss/widgets/_sidebar.scss
+++ b/gtk-3.0/scss/widgets/_sidebar.scss
@@ -4,16 +4,16 @@
 
 @include exports("sidebar") {
     .sidebar {
-        &, &.view, & .view, & GtkScrolledWindow {
+        &, &.view, .view, GtkScrolledWindow {
             background-color: $bg_color;
-            color: mix($fg_color, $bg_color, 0.1);
+            color: mix($fg_color, $bg_color, .1);
 
             &.separator {
                 &, &:hover, &:focus {
                     border-width: 1px;
                     border-style: solid;
-                    border-color: shade($bg_color, 0.9);
-                    color: shade($bg_color, 0.9);
+                    border-color: shade($bg_color, .9);
+                    color: shade($bg_color, .9);
                 }
             }
         }
@@ -21,14 +21,14 @@
         row, .view row {
             &:selected {
                 &, &:hover, &:focus {
-                    border: none;
+                    border: 0;
                     background-image: none;
                     background-color: $selected_bg_color;
                     color: $selected_fg_color;
                 }
 
                 &:prelight {
-                    border: none;
+                    border: 0;
                     background-image: none;
                     background-color: shade($selected_bg_color, 1.05);
                     color: $selected_fg_color;
@@ -36,7 +36,7 @@
             }
 
             &:prelight {
-                border: none;
+                border: 0;
                 background-image: none;
                 background-color: shade($bg_color, 1.05);
             }
@@ -51,15 +51,16 @@
             border-right-color: border_normal($bg_color);
             border-radius: 0;
             background-color: $bg_color;
-            color: mix($fg_color, $bg_color, 0.1);
+            color: mix($fg_color, $bg_color, .1);
 
             &:dir(ltr) { border-width: 0 1px 0 0; }
+
             &:dir(rtl) { border-width: 0 0 0 1px; }
 
             .label {
                 padding: $spacing ($spacing * 2);
 
-                &.highlight { background-color: mix($bg_color, $fg_color, 0.80); }
+                &.highlight { background-color: mix($bg_color, $fg_color, .8); }
             }
 
             &.csd .sidebar { border-top-style: none; }
@@ -88,7 +89,7 @@
         margin-left: $spacing;
     }
 
-    GtkPaned .pane-separator { background-color: shade($bg_color, 0.9); }
+    GtkPaned .pane-separator { background-color: shade($bg_color, .9); }
 
     GtkPaned.wide {
         -GtkPaned-handle-size: 4;
@@ -99,7 +100,7 @@
     GtkPaned.wide .pane-separator {
         background-color: transparent;
         border-style: none solid;
-        border-color: shade($bg_color, 0.9);
+        border-color: shade($bg_color, .9);
         border-width: 1px;
     }
 
diff --git a/gtk-3.0/scss/widgets/_spinner.scss b/gtk-3.0/scss/widgets/_spinner.scss
index 395c21c..9c753f7 100644
--- a/gtk-3.0/scss/widgets/_spinner.scss
+++ b/gtk-3.0/scss/widgets/_spinner.scss
@@ -18,7 +18,7 @@
             opacity: 1;
             animation: spin 1s linear infinite;
 
-            &:insensitive { opacity: 0.5; }
+            &:insensitive { opacity: .5; }
         }
     }
 }
diff --git a/gtk-3.0/scss/widgets/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss
index a13a427..52bdee3 100755
--- a/gtk-3.0/scss/widgets/_toggle.scss
+++ b/gtk-3.0/scss/widgets/_toggle.scss
@@ -78,12 +78,12 @@ $suffix: if($variant == "dark", "-dark", "");
         &.slider {
             @include linear-gradient(shade($bg_color, 1.2));
 
-            border: 1px solid rgba(0,0,0,0.2);
+            border: 1px solid rgba(0, 0, 0, .2);
             box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12);
 
             &:insensitive {
-                border-color: rgba(0,0,0,0.1);
-                background-color: shade($bg_color, 0.9);
+                border-color: rgba(0, 0, 0, .1);
+                background-color: shade($bg_color, .9);
                 box-shadow: none;
             }
         }
@@ -101,7 +101,7 @@ $suffix: if($variant == "dark", "-dark", "");
             &:active {
                 @include linear-gradient($selected_bg_color, to top);
 
-                border-color: shade($selected_bg_color, 0.9);
+                border-color: shade($selected_bg_color, .9);
                 color: $selected_fg_color;
             }
 
@@ -109,7 +109,7 @@ $suffix: if($variant == "dark", "-dark", "");
                 @include linear-gradient(shade($bg_color, .9), to top);
 
                 border-color: border_insensitive($bg_color);
-                color: mix($fg_color, $bg_color, 0.5);
+                color: mix($fg_color, $bg_color, .5);
             }
         }
     }
diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss
index e391f3d..019e79b 100755
--- a/gtk-3.0/scss/widgets/_toolbar.scss
+++ b/gtk-3.0/scss/widgets/_toolbar.scss
@@ -35,7 +35,7 @@
     GtkComboBox, .button {
         padding: $spacing - 1px;
 
-        &.text-button { padding:  $spacing; }
+        &.text-button { padding: $spacing; }
 
         &.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; }
     }
@@ -65,7 +65,7 @@
     .header-bar {
         @include toolbar($titlebar_bg_color, $titlebar_fg_color);
 
-        border-width: 0 0 1px 0;
+        border-width: 0 0 1px;
         border-style: solid;
     }
 
@@ -83,7 +83,7 @@
         }
 
         &.default-decoration {
-            border: none;
+            border: 0;
             box-shadow: none;
         }
 
@@ -93,7 +93,7 @@
 
         .titlebutton {
             padding: $spacing;
-            border: none;
+            border: 0;
             background-image: none;
             background-color: transparent;
             color: mix($titlebar_fg_color, $titlebar_bg_color, .1);
diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss
index e077972..d868914 100644
--- a/gtk-3.0/scss/widgets/_view.scss
+++ b/gtk-3.0/scss/widgets/_view.scss
@@ -10,8 +10,8 @@
         background-color: $base_color;
 
         &:insensitive, &:insensitive:insensitive {
-            background-color: shade($base_color, 0.9);
-            color: mix($text_color, $base_color, 0.5);
+            background-color: shade($base_color, .9);
+            color: mix($text_color, $base_color, .5);
         }
 
         &:selected, &:selected:focus { @extend %selected; }
@@ -33,7 +33,7 @@
                 -GtkWidget-focus-padding: 1;
                 -GtkWidget-focus-line-width: 0;
 
-                border: none;
+                border: 0;
                 background-color: $selected_bg_color;
                 background-image: none;
                 color: $selected_fg_color;
@@ -45,11 +45,11 @@
         &.view {
             background-color: $base_color;
 
-            &:prelight { background-color: alpha($selected_bg_color, 0.6); }
+            &:prelight { background-color: alpha($selected_bg_color, .6); }
 
             &:selected, &:active { background-color: $selected_bg_color; }
 
-            &:insensitive { background-color: shade($base_color, 0.9); }
+            &:insensitive { background-color: shade($base_color, .9); }
 
             &.check {
                 &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; }
@@ -67,7 +67,7 @@
 
         &.view.cell {
             &:selected, &:selected:focus {
-                border: none;
+                border: 0;
                 border-radius: 2px;
                 background-image: none;
                 background-color: $selected_bg_color;
@@ -77,32 +77,32 @@
     }
 
     .dim-label {
-        &, &.view { color: alpha(currentColor, 0.5); }
+        &, &.view { color: alpha(currentColor, .5); }
     }
 
     .dnd { border: 1px solid $selected_bg_color; }
 
     .grip { background-color: transparent; }
 
-    .arrow { color: alpha(currentColor, 0.7); }
+    .arrow { color: alpha(currentColor, .7); }
 
     .rubberband {
         &, &.view, &.content-view.view {
             border: 1px solid $selected_bg_color;
             border-radius: 0;
-            background-color: alpha($selected_bg_color, 0.3);
+            background-color: alpha($selected_bg_color, .3);
         }
     }
 
     GdMainIconView.content-view { -GdMainIconView-icon-size: 40; }
 
     /* this will get overridden by .view, needed by gedit line numbers */
-    GtkTextView { background-color: mix($bg_color, $base_color, 0.50); }
+    GtkTextView { background-color: mix($bg_color, $base_color, .5); }
 
     GtkHTML {
         @extend .view;
 
-        &:insensitive { background-color: shade($base_color, 0.9); }
+        &:insensitive { background-color: shade($base_color, .9); }
     }
 
     GtkDrawingArea { background-color: transparent; }
@@ -155,20 +155,20 @@
             }
 
             &, &:active, &:focus, &:active:focus {
-                border-color: shade($base_color, 0.9);
-                border-bottom-color: shade($base_color, 0.8);
-                background-color: shade($base_color, 0.97);
+                border-color: shade($base_color, .9);
+                border-bottom-color: shade($base_color, .8);
+                background-color: shade($base_color, .97);
                 background-image: none;
             }
 
             &:hover, &:active:hover, &:hover:focus, &:active:hover:focus {
-                border-color: shade($base_color, 0.9);
-                border-bottom-color: shade($base_color, 0.8);
-                background-color: shade($base_color, 0.99);
+                border-color: shade($base_color, .9);
+                border-bottom-color: shade($base_color, .8);
+                background-color: shade($base_color, .99);
                 background-image: none;
             }
 
-            &:last-child .button { border-width: 0 0 1px 0; }
+            &:last-child .button { border-width: 0 0 1px; }
         }
     }
 }
@@ -182,10 +182,10 @@
     .frame {
         border: 1px solid border_normal($bg_color);
 
-        &.flat { border: none; }
+        &.flat { border: 0; }
     }
 
     /* avoid double borders when a viewport is packed into a GtkScrolledWindow */
-    GtkScrolledWindow GtkViewport.frame { border: none; }
+    GtkScrolledWindow GtkViewport.frame { border: 0; }
 }
 
diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss
index 4ffb165..f609010 100755
--- a/gtk-3.0/scss/widgets/_window.scss
+++ b/gtk-3.0/scss/widgets/_window.scss
@@ -4,11 +4,11 @@
 
 @include exports("window") {
     %window {
-        box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22),
+        box-shadow: 0 19px 38px rgba(0, 0, 0, .3), 0 15px 12px rgba(0, 0, 0, .22),
                     0 0 0 1px $wm_border_focused;
 
         &:backdrop {
-            box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23),
+            box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23),
                         0 0 0 1px $wm_border_unfocused;
         }
     }
@@ -16,7 +16,7 @@
     .window-frame {
         @extend %window;
 
-        border: none;
+        border: 0;
         border-radius: $roundness $roundness 0 0;
 
         /* this is used for the resize cursor area */