diff --git a/assets/theme.css b/assets/theme.css
index 6b08a55..304ae09 100644
--- a/assets/theme.css
+++ b/assets/theme.css
@@ -276,40 +276,38 @@ tooltip {
 }
 
 /* Top-level menu items */
-
-/* TODO: shadows not working properly */
-.menu item > popover > contents > stack > box > box {
-  box-shadow: 0 0 1px 2px rgba(0,0,0,0.5);
+/* GTK documentation:
+"The visible part of the popover can have a shadow.
+To specify it in CSS, set the box-shadow of the contents node."
+*/
+.menu item > popover > contents {
+  box-shadow: 2px 3px 3px rgba(0,0,0,0.5)
+           , -2px 3px 3px rgba(0,0,0,0.5)
+           ,  0px 4px 3px rgba(0,0,0,0.5);
 }
 
-/* Submenus without separators */
-.menu item > popover > contents > stack > box > box > modelbutton,
-/* Submenus with separators */
-.menu item > popover > contents > stack > box > box > box > box > modelbutton
+/* Look at the CSS with the GTK inspector to figure this out... */
+.menu item > popover > contents > scrolledwindow > viewport > stack > box > box > modelbutton,
+.menu item > popover > contents > scrolledwindow > viewport > stack > box > box > box > box > modelbutton
  {
   background-color: rgb(41, 40, 40);
   color: rgb(72,70,61);
   border-top: 0px;
   border-left: 2px solid rgb(41, 40, 40);
-  padding: 2px 10px 6px 10px;
+  padding: 6px 10px 6px 10px;
 }
 
-
-.menu item > popover > contents > stack > box > box > box > separator,
-.menu item > popover > contents > stack > box > box > box > separator :hover {
+.menu item > popover > contents > scrolledwindow > viewport > stack > box > box > box > separator,
+.menu item > popover > contents > scrolledwindow > viewport > stack > box > box > box > separator :hover {
   background-color: rgb(72,70,61);
   padding: 1px 0px 0px 1px;
 }
 
-
-.accelLabel {
-  padding: 2px 8px 2px 0px;
-}
-
-.accelLabel accelerator {
+.menu item > popover > contents > scrolledwindow > viewport > stack > box > box > modelbutton > accelerator,
+.menu item > popover > contents > scrolledwindow > viewport > stack > box > box > box > box > modelbutton > accelerator {
   font-size: 10px;
   color: rgb(112, 109, 96);
-  padding: 0px;
+  padding-left: 10px;
 }
 
 .windowIcon {