diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 747e1cf9b..b93f6f942 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -324,8 +324,15 @@ StScrollBar {
   .panel-status-menu-box {
     spacing: 2px;
   }
+  
+  .screencast-indicator { color: $warning_color; }
 }
 
+  .system-switch-user-submenu-icon {
+    icon-size: 24px;
+    border: 1px solid transparentize($fg_color,0.6);
+  }
+  
   #appMenu {
     spinner-image: url("process-working.svg");
     spacing: 4px;
@@ -337,7 +344,22 @@ StScrollBar {
     .popup-menu-icon { padding: 0 4px; }
   }
   
-  .system-menu-action { } //FIXME, what's this?
+  .system-menu-action {
+    color: $fg_color;
+    border-radius: 32px; /* wish we could do 50% */
+    padding: 13px;
+    border: 1px solid lighten($borders_color,5%);
+    
+    &:hover, &:focus {
+      color: lighten($fg_color, 10%);
+      background-color: lighten($bg_color,10%);
+      border: none;
+      padding: 14px;
+    }
+    &:active { background-color: lighten($borders_color,5%); }
+    
+    & > StIcon { icon-size: 16px; }
+  }
   .system0switch-user0submenu-icon { } //FIXME, what's this?
   
 
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index d3d2904f6..6f9b1e26c 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -91,135 +91,6 @@
 
 
 
-/* Panel */
-
-#appMenu {
-    spinner-image: url("process-working.svg");
-    spacing: 4px;
-}
-
-/* used for the app menu header only */
-.label-shadow {
-    color: rgba(0,0,0,0.5);
-}
-
-.panel-button #appMenuIcon {
-    app-icon-bottom-clip: 1px;
-}
-
-.panel-button:active #appMenuIcon,
-.panel-button:checked #appMenuIcon,
-.panel-button:focus #appMenuIcon {
-    app-icon-bottom-clip: 2px;
-}
-
-.panel-button {
-    -natural-hpadding: 12px;
-    -minimum-hpadding: 6px;
-    font-weight: bold;
-    color: #ccc;
-    transition-duration: 100ms;
-}
-
-#panel.unlock-screen .panel-button,
-#panel.lock-screen .panel-button,
-#panel.login-screen .panel-button {
-    color: #e6e6e6;
-}
-
-#panel.unlock-screen .panel-button:hover,
-#panel.lock-screen .panel-button:hover,
-#panel.login-screen .panel-button:hover,
-#panel.unlock-screen .panel-button:active,
-#panel.lock-screen .panel-button:active,
-#panel.login-screen .panel-button:active,
-#panel.unlock-screen .panel-button:focus,
-#panel.lock-screen .panel-button:focus,
-#panel.login-screen .panel-button:focus {
-    color: white;
-}
-
-.panel-button:hover {
-    color: white;
-    text-shadow: black 0px 2px 2px;
-}
-
-.panel-button:active,
-.panel-button:overview,
-.panel-button:focus {
-    border-image: url("panel-button-border.svg") 6 10 0 2;
-    background-image: url("panel-button-highlight-wide.svg");
-    color: white;
-    text-shadow: black 0px 2px 2px;
-}
-
-.panel-status-button:active,
-.panel-status-button:checked,
-.panel-status-button:focus {
-    background-image: url("panel-button-highlight-narrow.svg");
-}
-
-.panel-button:active > .system-status-icon,
-.panel-button:checked > .system-status-icon,
-.panel-button:focus > .system-status-icon {
-    icon-shadow: black 0px 2px 2px;
-}
-
-.panel-menu {
-    -boxpointer-gap: 4px;
-}
-
-.panel-status-indicators-box,
-.panel-status-menu-box {
-    spacing: 2px;
-}
-
-.system-status-icon {
-    icon-size: 1.09em;
-    padding: 0 5px;
-}
-
-.aggregate-menu {
-    width: 360px;
-}
-
-.aggregate-menu .popup-menu-icon {
-    padding: 0 4px;
-}
-
-.system-switch-user-submenu-icon {
-    icon-size: 24px;
-    border: 1px solid #8b8b8b;
-}
-
-.system-menu-action {
-    color: #e6e6e6;
-    border-radius: 32px; /* wish we could do 50% */
-    padding: 13px;
-    border: 2px solid #5f5f5f; /* using rgba() is flaky unfortunately */
-}
-
-.system-menu-action:hover,
-.system-menu-action:focus {
-    color: white;
-    background-color: #4c4c4c;
-    border: none;
-    padding: 15px;
-}
-
-.system-menu-action:active {
-    color: black;
-    background-color: #6f6f6f;
-
-}
-
-.system-menu-action > StIcon {
-    icon-size: 16px;
-}
-
-.screencast-indicator {
-    color: #ff0000;
-}
 
 /* Overview */
 
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index d860288f7..00b897de3 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -70,120 +70,6 @@
 .no-networks-box {
   spacing: 12px; }
 
-/* Panel */
-#appMenu {
-  spinner-image: url("process-working.svg");
-  spacing: 4px; }
-
-/* used for the app menu header only */
-.label-shadow {
-  color: rgba(0, 0, 0, 0.5); }
-
-.panel-button #appMenuIcon {
-  app-icon-bottom-clip: 1px; }
-
-.panel-button:active #appMenuIcon,
-.panel-button:checked #appMenuIcon,
-.panel-button:focus #appMenuIcon {
-  app-icon-bottom-clip: 2px; }
-
-.panel-button {
-  -natural-hpadding: 12px;
-  -minimum-hpadding: 6px;
-  font-weight: bold;
-  color: #ccc;
-  transition-duration: 100ms; }
-
-#panel.unlock-screen .panel-button,
-#panel.lock-screen .panel-button,
-#panel.login-screen .panel-button {
-  color: #e6e6e6; }
-
-#panel.unlock-screen .panel-button:hover,
-#panel.lock-screen .panel-button:hover,
-#panel.login-screen .panel-button:hover,
-#panel.unlock-screen .panel-button:active,
-#panel.lock-screen .panel-button:active,
-#panel.login-screen .panel-button:active,
-#panel.unlock-screen .panel-button:focus,
-#panel.lock-screen .panel-button:focus,
-#panel.login-screen .panel-button:focus {
-  color: white; }
-
-.panel-button:hover {
-  color: white;
-  text-shadow: black 0px 2px 2px; }
-
-.panel-button:active,
-.panel-button:overview,
-.panel-button:focus {
-  border-image: url("panel-button-border.svg") 6 10 0 2;
-  background-image: url("panel-button-highlight-wide.svg");
-  color: white;
-  text-shadow: black 0px 2px 2px; }
-
-.panel-status-button:active,
-.panel-status-button:checked,
-.panel-status-button:focus {
-  background-image: url("panel-button-highlight-narrow.svg"); }
-
-.panel-button:active > .system-status-icon,
-.panel-button:checked > .system-status-icon,
-.panel-button:focus > .system-status-icon {
-  icon-shadow: black 0px 2px 2px; }
-
-.panel-menu {
-<<<<<<< HEAD
-    -boxpointer-gap: 4px;
-    margin-bottom: 1.75em;
-}
-=======
-  -boxpointer-gap: 4px; }
->>>>>>> theme: rewrite to be structured
-
-.panel-status-indicators-box,
-.panel-status-menu-box {
-  spacing: 2px; }
-
-.system-status-icon {
-  icon-size: 1.09em;
-  padding: 0 5px; }
-
-.aggregate-menu {
-  width: 360px; }
-
-.aggregate-menu .popup-menu-icon {
-  padding: 0 4px; }
-
-.system-switch-user-submenu-icon {
-  icon-size: 24px;
-  border: 1px solid #8b8b8b; }
-
-.system-menu-action {
-  color: #e6e6e6;
-  border-radius: 32px;
-  /* wish we could do 50% */
-  padding: 13px;
-  border: 2px solid #5f5f5f;
-  /* using rgba() is flaky unfortunately */ }
-
-.system-menu-action:hover,
-.system-menu-action:focus {
-  color: white;
-  background-color: #4c4c4c;
-  border: none;
-  padding: 15px; }
-
-.system-menu-action:active {
-  color: black;
-  background-color: #6f6f6f; }
-
-.system-menu-action > StIcon {
-  icon-size: 16px; }
-
-.screencast-indicator {
-  color: #ff0000; }
-
 /* Overview */
 #overview {
   spacing: 24px; }
@@ -531,21 +417,11 @@
 
 /* LookingGlass */
 #LookingGlassDialog {
-<<<<<<< HEAD
-    background-color: rgba(0,0,0,0.80);
-    spacing: 4px;
-    padding: 4px;
-    border: 2px solid grey;
-    border-top-width: 0;
-    border-radius: 0 0 4px 4px;
-}
-=======
   background-color: rgba(0, 0, 0, 0.8);
   spacing: 4px;
   padding: 4px;
   border: 2px solid grey;
   border-radius: 4px; }
->>>>>>> theme: rewrite to be structured
 
 #LookingGlassDialog > #Toolbar {
   border: 1px solid grey;
@@ -1024,29 +900,15 @@
 
 /* OSD */
 .osd-window {
-<<<<<<< HEAD
-    text-align: center;
-    font-weight: bold;
-    spacing: 1em;
-    margin: 32px;
-    min-width: 64px;
-    min-height: 64px;
-}
-=======
   text-align: center;
   font-weight: bold;
   spacing: 1em; }
->>>>>>> theme: rewrite to be structured
 
 .osd-window .level {
   height: 0.6em;
   border-radius: 0.3em;
   background-color: rgba(190, 190, 190, 0.2); }
 
-.osd-monitor-label {
-    font-size: 3em;
-}
-
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
@@ -2038,6 +1900,12 @@ StScrollBar {
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
+  #panel .screencast-indicator {
+    color: #f57900; }
+
+.system-switch-user-submenu-icon {
+  icon-size: 24px;
+  border: 1px solid rgba(238, 238, 236, 0.4); }
 
 #appMenu {
   spinner-image: url("process-working.svg");
@@ -2050,6 +1918,22 @@ StScrollBar {
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
 
+.system-menu-action {
+  color: #eeeeec;
+  border-radius: 32px;
+  /* wish we could do 50% */
+  padding: 13px;
+  border: 1px solid #282c2c; }
+  .system-menu-action:hover, .system-menu-action:focus {
+    color: white;
+    background-color: #515a5a;
+    border: none;
+    padding: 14px; }
+  .system-menu-action:active {
+    background-color: #282c2c; }
+  .system-menu-action > StIcon {
+    icon-size: 16px; }
+
 .popup-menu-arrow {
   width: 16px;
   height: 16px; }