diff --git a/gtk-3.20/scss/apps/_unity-greeter.scss b/gtk-3.20/scss/apps/_unity-greeter.scss
index e7b07f3..70f5c3a 100644
--- a/gtk-3.20/scss/apps/_unity-greeter.scss
+++ b/gtk-3.20/scss/apps/_unity-greeter.scss
@@ -3,114 +3,103 @@
  ***********************/
 
 @include exports("unity-greeter") {
-
-
-    .lightdm.menu {
-        background-image: none;
-        background-color: fade-out($black, .4);
-        border-color: fade-out($white, .8);
-        border-radius: 4px;
-        padding: 1px;
-
-        color: $white;
-    }
-
-    .lightdm-combo .menu {
-        background-color: shade($dark_bg_color, 1.08);
-        border-radius: 0;
-        padding: 0;
-        color: $white;
-    }
-
-    .lightdm.menu .menuitem *,
-    .lightdm.menu .menuitem.check:active,
-    .lightdm.menu .menuitem.radio:active {
-        color: $white;
-    }
-
-    .lightdm.menubar *,    
-    .lightdm.menubar .menuitem {
-        padding: 2px;
-    }
-
-    .lightdm-combo.combobox-entry .button,
-    .lightdm-combo .cell,
-    .lightdm-combo .button,
-    .lightdm-combo .entry,
-    
-    .lightdm.button{
-        background-image: none;
-        background-color: fade-out($black, .7);
-        border-color: fade-out($white, .1);
-        border-radius: 5px;
-        padding: 5px;
-        color: $white;
-        }
-    .lightdm.button:hover {
-        background-image: none;
-        background-color: fade-out($white, .7);
-        border-color: fade-out($white, .4);
-        border-radius: 5px;
-        padding: 5px;
-        color: $white;
-        text-shadow: none;
-        }
-    .lightdm.button:active,
-    .lightdm.button:active:focus,
-    .lightdm.button:focus,
-
-    .lightdm.entry {
-        background-image: none;
-        background-color: fade-out($black, .7);
-        border-color: fade-out($white, .4);
-        border-radius: 5px;
-        padding: 7px;
-        color: $white;
-        text-shadow: none;
-    }
-    .lightdm.entry:hover,
-    .lightdm.entry:active,
-    .lightdm.entry:active:focus {
-        background-image: none;
-        border-image: none;
-    }
-    .lightdm.entry:focus {
-        border-color: fade-out($white, .4);
-        border-width: 1px;
-        border-style: solid;
-        color: $white;
-    }
-    .lightdm.entry:selected {
-        background-color: fade-out($white, .8);
-    }
-
     @keyframes dashentry_spinner {
         to { -gtk-icon-transform: rotate(1turn); }
     }
 
-    .lightdm.entry:active {
-        -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
-        animation: dashentry_spinner 1s infinite linear;
-    }
-
-    .lightdm.option-button {
-        padding: 5px;
-        background: none;
-        border: 0;
-    }
-
-    .lightdm.toggle-button {
-        background: none;
-        border-width: 0;
-    }
-    .lightdm.toggle-button.selected:hover {
-        background-color: fade-out($white, .7);
-        border-color: fade-out($white, .7);
-        border-width: 1px;
-    }
-    .lightdm.toggle-button.selected {
+    %lightdm-button {
+        background-image: none;
         background-color: fade-out($black, .7);
-        border-color: fade-out($white, .7);
-        border-width: 1px;
+        border-color: fade-out($white, .1);
+        border-radius: ($roundness * 2) + 1px;
+        padding: $spacing;
+        color: $white;
+    }
+
+    .lightdm {
+        &.menu {
+            background-image: none;
+            background-color: fade-out($black, .4);
+            border-color: fade-out($white, .8);
+            border-radius: $roundness * 2;
+            padding: 1px;
+
+            color: $white;
+
+            .menuitem { *, &.check:active, &.radio:active { color: $white; } }
+        }
+
+        &.menubar { *, &.menuitem { padding: $spacing - 3px; } }
+
+        &.option-button {
+            padding: $spacing;
+            background: none;
+            border: 0;
+        }
+
+        &.toggle-button {
+            background: none;
+            border-width: 0;
+
+            &.selected {
+                background-color: fade-out($black, .7);
+                border-color: fade-out($white, .7);
+                border-width: 1px;
+
+                &:hover { background-color: fade-out($white, .7); }
+            }
+        }
+
+        &.button {
+            @extend %lightdm-button;
+
+            &:hover {
+                background-color: fade-out($white, .7);
+                border-color: fade-out($white, .4);
+                text-shadow: none;
+            }
+        }
+
+        &.entry, &.button:active, &.button:active:focus, &.button:focus {
+            background-image: none;
+            background-color: fade-out($black, .7);
+            border-color: fade-out($white, .4);
+            border-radius: ($roundness * 2) + 1px;
+            padding: $spacing + 2px;
+            color: $white;
+            text-shadow: none;
+        }
+
+        &.entry {
+            &:hover, &:active, &:active:focus {
+                background-image: none;
+                border-image: none;
+            }
+
+            &:active {
+                -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+                animation: dashentry_spinner 1s infinite linear;
+            }
+
+            &:focus {
+                border-color: fade-out($white, .4);
+                border-width: 1px;
+                border-style: solid;
+                color: $white;
+            }
+
+            &:selected { background-color: fade-out($white, .8); }
+        }
+    }
+
+    .lightdm-combo {
+        &.combobox-entry .button, .cell, .button, .entry { @extend %lightdm-button; }
+
+        &.menu {
+            background-color: shade($dark_bg_color, 1.08);
+            border-radius: 0;
+            padding: 0;
+            color: $white;
+        }
     }
 }