diff --git a/src/other/plank/theme-dark/dock.theme b/src/other/plank/theme-dark/dock.theme
index 82b8117..2ebcb56 100644
--- a/src/other/plank/theme-dark/dock.theme
+++ b/src/other/plank/theme-dark/dock.theme
@@ -6,15 +6,15 @@ TopRoundness=16
 #The roundness of the bottom corners.
 BottomRoundness=16
 #The thickness (in pixels) of lines drawn.
-LineWidth=0
+LineWidth=1
 #The color (RGBA) of the outer stroke.
-OuterStrokeColor=0;;0;;0;;95
+OuterStrokeColor=0;;0;;0;;200
 #The starting color (RGBA) of the fill gradient.
-FillStartColor=15;;15;;15;;50
+FillStartColor=15;;15;;15;;150
 #The ending color (RGBA) of the fill gradient.
-FillEndColor=15;;15;;15;;75
+FillEndColor=15;;15;;15;;175
 #The color (RGBA) of the inner stroke.
-InnerStrokeColor=75;;75;;75;;50
+InnerStrokeColor=100;;100;;100;;100
 
 [PlankDrawingDockTheme]
 #The padding on the left/right dock edges, in tenths of a percent of IconSize.
diff --git a/src/other/plank/theme-light/dock.theme b/src/other/plank/theme-light/dock.theme
index f71a2a0..4dc97e4 100644
--- a/src/other/plank/theme-light/dock.theme
+++ b/src/other/plank/theme-light/dock.theme
@@ -6,7 +6,7 @@ TopRoundness=16
 #The roundness of the bottom corners.
 BottomRoundness=16
 #The thickness (in pixels) of lines drawn.
-LineWidth=0
+LineWidth=1
 #The color (RGBA) of the outer stroke.
 OuterStrokeColor=0;;0;;0;;95
 #The starting color (RGBA) of the fill gradient.
@@ -14,7 +14,7 @@ FillStartColor=209;;209;;209;;110
 #The ending color (RGBA) of the fill gradient.
 FillEndColor=209;;209;;209;;115
 #The color (RGBA) of the inner stroke.
-InnerStrokeColor=255;;255;;255;;245
+InnerStrokeColor=210;;210;;210;;50
 
 [PlankDockTheme]
 #The padding on the left/right dock edges, in tenths of a percent of IconSize.
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 15937ee..845a09e 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -456,54 +456,6 @@ spinner {
   }
 }
 
-//
-// General Typography
-//
-.large-title {
-  font-weight: 300;
-  font-size: 24pt;
-}
-
-.title-1 {
-  font-weight: 800;
-  font-size: 20pt;
-}
-
-.title-2 {
-  font-weight: 800;
-  font-size: 15pt;
-}
-
-.title-3 {
-  font-weight: 700;
-  font-size: 15pt;
-}
-
-.title-4 {
-   font-weight: 700;
-   font-size: 13pt;
-}
-
-.heading {
-  font-weight: 700;
-  font-size: 11pt;
-}
-
-.body {
-  font-weight: 400;
-  font-size: 11pt;
-}
-
-.caption-heading {
-  font-weight: 700;
-  font-size: 9pt;
-}
-
-.caption {
-  font-weight: 400;
-  font-size: 9pt;
-}
-
 //
 // Text Entries
 //
@@ -565,7 +517,7 @@ entry {
   @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $light_fg_color),
                                           (error, $error_color, $light_fg_color),
                                           (search-missing, $error_color, $light_fg_color) { // entry.search-missing for Gnome-Builder
-    &.#{$e_type} {
+    &.#{$e_type}, &.#{$e_type}.search {
       color: $e_fg_color;
       background-color: mix($e_color, $base_color, 60%);
       border-image: none;
@@ -847,14 +799,15 @@ button {
     background-color: $osd_bg_color;
     border-color: darken($osd_bg_color, 8%);
 
-    &.image-button {
+    &.image-button, &.round-button {
       padding: 0;
       min-height: 42px;
       min-width: 42px;
+      border-radius: $circular_radius;
     }
 
     &:hover {
-      color: $selected_bg_color;
+      color: $osd_fg_color;
       box-shadow: none;
       background-color: $osd_button_bg;
     }
diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index 45199da..ba5e694 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -111,15 +111,6 @@ $raven_padding: 8px;
 
   list {
     background-color: transparent;
-
-    &.content-box {
-      row.activatable {
-        padding: 0;
-        background: 0;
-        border: none;
-        box-shadow: none;
-      }
-    }
   }
 
   switch { margin-left: 56px; margin-right: 6px; }
@@ -134,14 +125,6 @@ $raven_padding: 8px;
     &:disabled { color: $disabled_fg_color; }
   }
 
-  scrolledwindow.sidebar.categories {  //AppMenu (budgie)
-    border-bottom-left-radius: $wm_radius;
-
-    button.flat.category-button {
-      @extend %flat_button;
-    }
-  }
-
   treeview.view.sidebar {
     background: none;
     border-right: none;
@@ -184,11 +167,62 @@ $raven_padding: 8px;
 
   &.budgie-menu {
     .container { padding: 0; }
+
+    &.background {
+      padding: 0;
+      background-color: $base_color;
+    }
+
+    scrollbar,
+    entry.search { background-color: transparent; }
+
+    entry.search {
+      padding: 5px 10px;
+      border: none;
+      border-bottom: 1px solid $borders_color;
+      border-radius: 0;
+      box-shadow: none;
+      font-size: 110%;
+    }
+
+    .categories {
+      &:dir(ltr) { border-bottom-left-radius: $bt_radius; }
+      &:dir(rtl) { border-bottom-right-radius: $bt_radius; }
+    }
+
+    scrolledwindow.sidebar.categories {  //AppMenu (budgie)
+      border-bottom-left-radius: $wm_radius;
+
+      button.flat.category-button {
+        min-height: 28px;
+        border-radius: 0;
+      }
+    }
+
+    row {
+      padding: 0;
+      &:hover { box-shadow: none; }
+
+      button.flat {
+        min-height: 32px;
+        border-radius: 0;
+      }
+    }
   }
 
   &.user-menu {
     .container { padding: 8px; }
+
     separator { margin: 4px 0; }
+
+    .content-box { background-color: transparent; }
+
+    row {
+      padding: 0;
+      background: 0;
+      border: none;
+      box-shadow: none;
+    }
   }
 
   &.sound-popover {
@@ -212,6 +246,13 @@ $raven_padding: 8px;
   &.places-menu {
     .container { padding: 6px; }
 
+    row.activatable {
+      padding: 0;
+      background: 0;
+      border: none;
+      box-shadow: none;
+    }
+
     .places-list:not(.always-expand) {
       margin-top: 4px;
       padding-top: 4px;
@@ -302,77 +343,11 @@ window.budgie-popover:not(.csd) {
   }
 }
 
-// Budgie Menu
-.budgie-menu {
-  &.background {
-    padding: 0;
-    background-color: $base_color;
-  }
-
-  scrollbar,
-  entry.search { background-color: transparent; }
-
-  entry.search {
-    padding: 5px 10px;
-    border: none;
-    border-bottom: 1px solid $borders_color;
-    border-radius: 0;
-    box-shadow: none;
-    font-size: 110%;
-  }
-
-  .categories {
-    &:dir(ltr) { border-bottom-left-radius: $bt_radius; }
-    &:dir(rtl) { border-bottom-right-radius: $bt_radius; }
-  }
-
-  button {
-    @extend %row_activatable;
-    min-height: 32px;
-    padding: 0 8px;
-    border-radius: 0;
-    color: $fg_color;
-    font-weight: normal;
-    border: none;
-    box-shadow: none;
-
-    &:hover { transition: none; }
-    &:disabled { color: $disabled_fg_color; }
-    &:checked { @extend %selected_items; }
-
-    &:checked:hover {
-      background-image: none;
-      background-color: lighten($selected_bg_color, 5%);
-    }
-
-    &:checked:disabled { background-color: rgba($selected_bg_color, 0.5); } // overriding
-  }
-
-  row {
-    padding: 0;
-    &:hover { box-shadow: none; }
-  }
-}
-
 // Menu Button
 button.budgie-menu-launcher {
   @extend %flat_button;
 }
 
-// User Menu
-popover.background.user-menu {
-  padding: 8px;
-
-  .content-box { background-color: transparent; }
-  separator { margin: 4px 0; }
-
-  row {
-    padding: 0;
-    box-shadow: none;
-    background-image: none;
-  }
-}
-
 // Raven Trigger
 button.raven-trigger {
   padding: 0 4px;
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 04fdcaa..30d3bfe 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -708,7 +708,6 @@ window.org-gnome-gedit {
   }
 
   .gedit-document-panel { // 'documents' pane
-
     row.activatable { padding: 6px 0; }
 
     row button { // 'close' button