diff --git a/.gitignore b/.gitignore
index fc6be0c..280f2dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,3 @@
 .DS_store
 .sass-cache
 *-temp.scss
-release/Orchis-Green.tar.xz
-release/Orchis-Grey.tar.xz
-release/Orchis-Orange.tar.xz
-release/Orchis-Pink.tar.xz
-release/Orchis-Purple.tar.xz
-release/Orchis-Red.tar.xz
-release/Orchis-Teal.tar.xz
-release/Orchis-Yellow.tar.xz
-release/Orchis.tar.xz
diff --git a/release/Orchis-Green.tar.xz b/release/Orchis-Green.tar.xz
new file mode 100644
index 0000000..f502548
Binary files /dev/null and b/release/Orchis-Green.tar.xz differ
diff --git a/release/Orchis-Grey.tar.xz b/release/Orchis-Grey.tar.xz
new file mode 100644
index 0000000..759074e
Binary files /dev/null and b/release/Orchis-Grey.tar.xz differ
diff --git a/release/Orchis-Orange.tar.xz b/release/Orchis-Orange.tar.xz
new file mode 100644
index 0000000..86b083e
Binary files /dev/null and b/release/Orchis-Orange.tar.xz differ
diff --git a/release/Orchis-Pink.tar.xz b/release/Orchis-Pink.tar.xz
new file mode 100644
index 0000000..99bd6b0
Binary files /dev/null and b/release/Orchis-Pink.tar.xz differ
diff --git a/release/Orchis-Purple.tar.xz b/release/Orchis-Purple.tar.xz
new file mode 100644
index 0000000..616bb12
Binary files /dev/null and b/release/Orchis-Purple.tar.xz differ
diff --git a/release/Orchis-Red.tar.xz b/release/Orchis-Red.tar.xz
new file mode 100644
index 0000000..7d2e37c
Binary files /dev/null and b/release/Orchis-Red.tar.xz differ
diff --git a/release/Orchis-Teal.tar.xz b/release/Orchis-Teal.tar.xz
new file mode 100644
index 0000000..488674d
Binary files /dev/null and b/release/Orchis-Teal.tar.xz differ
diff --git a/release/Orchis-Yellow.tar.xz b/release/Orchis-Yellow.tar.xz
new file mode 100644
index 0000000..ca59ec9
Binary files /dev/null and b/release/Orchis-Yellow.tar.xz differ
diff --git a/release/Orchis.tar.xz b/release/Orchis.tar.xz
new file mode 100644
index 0000000..34548c5
Binary files /dev/null and b/release/Orchis.tar.xz differ
diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
index dd09124..242b6e2 100644
--- a/src/_sass/gtk/_common-3.20.scss
+++ b/src/_sass/gtk/_common-3.20.scss
@@ -1707,18 +1707,24 @@ menubar,
 menu {
   margin: $space-size / 2; // See https://bugzilla.gnome.org/show_bug.cgi?id=591258
   padding: $space-size;
-  box-shadow: inset 0 1px highlight($surface);
   background-color: $surface;
   background-clip: border-box;
-  border-radius: $menu-radius;
 
-  background:not(.popup) & {
+  .background > & {
+    border-radius: $menu-radius;
+    box-shadow: inset 0 1px highlight($surface);
+  }
+
+  .background:not(.popup) > & {
     border: 1px solid $frame; // adds borders in a non composited env
     border-radius: 0;
+    box-shadow: none;
   }
 
-  .csd & {
+  .background.csd > & {
     border: none; // axes borders in a composited env
+    border-radius: $menu-radius;
+    box-shadow: inset 0 1px highlight($surface);
   }
 
   menuitem {
diff --git a/src/_sass/gtk/apps/_lightdm.scss b/src/_sass/gtk/apps/_lightdm.scss
index bc9f29b..76dc49f 100644
--- a/src/_sass/gtk/apps/_lightdm.scss
+++ b/src/_sass/gtk/apps/_lightdm.scss
@@ -80,14 +80,14 @@
 // .lightdm-gtk-greeter button {}
 
 // the user's avatar box
-#user_image {
-  border-radius: $corner-radius;
-}
+// #user_image {
+//   border-radius: $corner-radius;
+// }
 
 // the border around the user's avatar box
-#user_image_border {
-  border-radius: $corner-radius;
-}
+// #user_image_border {
+//   border-radius: $corner-radius;
+// }
 
 // the lower half of the login-window, in GtkDialog terms the buttonbox or action area
 #buttonbox_frame {
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index 25bf457..270a1c7 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -1845,19 +1845,25 @@ menubar > menuitem label:disabled,
 menu {
   margin: 2px;
   padding: 4px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+}
+
+.background > menu {
   border-radius: 9px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
-background:not(.popup) menu {
+.background:not(.popup) > menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 0;
+  box-shadow: none;
 }
 
-.csd menu {
+.background.csd > menu {
   border: none;
+  border-radius: 9px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 menu menuitem {
@@ -8131,14 +8137,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
   padding-bottom: 16px;
 }
 
-#user_image {
-  border-radius: 10px;
-}
-
-#user_image_border {
-  border-radius: 10px;
-}
-
 #buttonbox_frame {
   padding-top: 24px;
 }
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index e3f028b..e3734e4 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -1845,19 +1845,25 @@ menubar > menuitem label:disabled,
 menu {
   margin: 2px;
   padding: 4px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   background-clip: border-box;
+}
+
+.background > menu {
   border-radius: 9px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-background:not(.popup) menu {
+.background:not(.popup) > menu {
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 0;
+  box-shadow: none;
 }
 
-.csd menu {
+.background.csd > menu {
   border: none;
+  border-radius: 9px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 menu menuitem {
@@ -8127,14 +8133,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
   padding-bottom: 16px;
 }
 
-#user_image {
-  border-radius: 10px;
-}
-
-#user_image_border {
-  border-radius: 10px;
-}
-
 #buttonbox_frame {
   padding-top: 24px;
 }
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index 80a4ba8..317b651 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -1845,19 +1845,25 @@ menubar > menuitem label:disabled,
 menu {
   margin: 3px;
   padding: 6px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   background-clip: border-box;
+}
+
+.background > menu {
   border-radius: 11px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
-background:not(.popup) menu {
+.background:not(.popup) > menu {
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 0;
+  box-shadow: none;
 }
 
-.csd menu {
+.background.csd > menu {
   border: none;
+  border-radius: 11px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 menu menuitem {
@@ -8127,14 +8133,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
   padding-bottom: 16px;
 }
 
-#user_image {
-  border-radius: 12px;
-}
-
-#user_image_border {
-  border-radius: 12px;
-}
-
 #buttonbox_frame {
   padding-top: 24px;
 }
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index 7c4535b..8b11df4 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -1845,19 +1845,25 @@ menubar > menuitem label:disabled,
 menu {
   margin: 2px;
   padding: 4px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+}
+
+.background > menu {
   border-radius: 9px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
-background:not(.popup) menu {
+.background:not(.popup) > menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 0;
+  box-shadow: none;
 }
 
-.csd menu {
+.background.csd > menu {
   border: none;
+  border-radius: 9px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 menu menuitem {
@@ -8130,14 +8136,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
   padding-bottom: 16px;
 }
 
-#user_image {
-  border-radius: 10px;
-}
-
-#user_image_border {
-  border-radius: 10px;
-}
-
 #buttonbox_frame {
   padding-top: 24px;
 }
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index 0d4f758..d1dfa50 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -1845,19 +1845,25 @@ menubar > menuitem label:disabled,
 menu {
   margin: 3px;
   padding: 6px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+}
+
+.background > menu {
   border-radius: 11px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
-background:not(.popup) menu {
+.background:not(.popup) > menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 0;
+  box-shadow: none;
 }
 
-.csd menu {
+.background.csd > menu {
   border: none;
+  border-radius: 11px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 menu menuitem {
@@ -8130,14 +8136,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
   padding-bottom: 16px;
 }
 
-#user_image {
-  border-radius: 12px;
-}
-
-#user_image_border {
-  border-radius: 12px;
-}
-
 #buttonbox_frame {
   padding-top: 24px;
 }
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index 1461df7..3385653 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -1845,19 +1845,25 @@ menubar > menuitem label:disabled,
 menu {
   margin: 3px;
   padding: 6px;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   background-clip: border-box;
+}
+
+.background > menu {
   border-radius: 11px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
-background:not(.popup) menu {
+.background:not(.popup) > menu {
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 0;
+  box-shadow: none;
 }
 
-.csd menu {
+.background.csd > menu {
   border: none;
+  border-radius: 11px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 menu menuitem {
@@ -8131,14 +8137,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
   padding-bottom: 16px;
 }
 
-#user_image {
-  border-radius: 12px;
-}
-
-#user_image_border {
-  border-radius: 12px;
-}
-
 #buttonbox_frame {
   padding-top: 24px;
 }