diff --git a/core.sh b/core.sh
index cca82cf..5b8a386 100755
--- a/core.sh
+++ b/core.sh
@@ -301,8 +301,8 @@ install_theme() {
 
 link_theme() {
   for theme in "${themes[@]}"; do
-    for color in "${colors[2]}"; do
-      for size in "${sizes[0]}"; do
+    for color in "${colors[@]}"; do
+      for size in "${SIZE_VARIANTS[0]}"; do
         link_libadwaita "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
       done
     done
diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index b7dec43..dcf0a1b 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -3,16 +3,8 @@
  * Base States *
  ***************/
 .background {
-  background-color: rgba($background, 1);
+  background-color: $background;
   color: $text;
-
-  &.csd { // Set csd windows botttom border radius
-    border-radius: $window-radius;
-  }
-
-  &.maximized, &.tiled, &.fullscreen, &.solid-csd { // No radius when windows maximized
-    border-radius: 0;
-  }
 }
 
 dnd {
@@ -1088,13 +1080,15 @@ toolbar {
 
 // searchbar
 searchbar > revealer > box {
-  padding: $container-padding $container-padding * 2;
+  padding: $container-padding;
   border-spacing: $container-padding;
   border-style: solid;
   border-width: 0 0 1px;
   border-color: $divider;
   background-color: $background;
   background-clip: border-box;
+
+  entry { margin: 0; }
 }
 
 /***************
@@ -1691,6 +1685,10 @@ popover.background {
       background-color: transparent;
     }
 
+    > scrolledwindow > viewport > stack > box {
+      padding: 0;
+    }
+
     separator {
       background-color: $divider;
       margin: $container-padding / 2 0;
@@ -1738,9 +1736,12 @@ popover.background {
   }
 
   listview {
+    padding: 0;
+
     > row {
       padding: $container-padding $container-padding * 2;
       border-radius: $corner-radius / 2;
+      margin: 0;
     }
   }
 }
@@ -3319,12 +3320,6 @@ window.dialog.message { // Message Dialog styling
   }
 
   &.csd { // rounded bottom border styling for csd version
-    &.background {
-      // bigger radius for better antialiasing
-      border-bottom-left-radius: $window-radius;
-      border-bottom-right-radius: $window-radius;
-    }
-
     .dialog-action-area {
       // margin-top: -$container-padding;
       padding: $container-padding;
@@ -3347,11 +3342,6 @@ window.dialog.message { // Message Dialog styling
 }
 
 filechooser {
-  .csd & {
-    background-color: $base;
-    border-radius: 0 0 $window-radius $window-radius;
-  }
-
   .dialog-action-box { border-top: 1px solid $divider; }
 
   #pathbarbox {
@@ -3365,44 +3355,8 @@ filechooser {
   }
 
   stack.view {
-    background-color: transparent;
-
-    scrolledwindow {
-      background-color: transparent;
-      border-radius: 0 0 $window-radius 0;
-
-      list { background-color: transparent; }
-
-      treeview.view {
-        @extend %view;
-        background-color: transparent;
-      }
-    }
-
-    > placesview {
-      background-color: transparent;
-      // border-bottom-right-radius: $window-radius;
-
-      > actionbar {
-        &, > revealer > box {
-          background-color: transparent;
-        }
-      }
-    }
-
     frame > border { border: none; }
   }
-
-  .csd & placessidebar {
-    background: none;
-    border-bottom-left-radius: $window-radius;
-  }
-
-  actionbar {
-    &, > revealer > box {
-      background-color: transparent;
-    }
-  }
 }
 
 filechooserbutton > button > box {
@@ -3414,6 +3368,14 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+// aboutdialog
+window.aboutdialog {
+  stack scrolledwindow.frame {
+    &, > .view, > .view > text {
+      border-radius: $corner-radius;
+    }
+  }
+}
 
 /***********
  * Sidebar *
@@ -4134,6 +4096,8 @@ popover.emoji-picker {
   background: none;
 
   entry {
+    margin: 0;
+
     text {
       background: none;
       box-shadow: none;
@@ -4143,15 +4107,16 @@ popover.emoji-picker {
 
 .emoji-toolbar {
   padding: 0;
-  border-spacing: $container-padding/2;
+  border-spacing: $container-padding / 2;
   border-top: 1px solid $divider;
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
   margin: 0;
   padding: $container-padding;
-  border-radius: $corner-radius -$container-padding/2;
+  border-radius: $corner-radius -$container-padding / 2;
 
   &:checked {
     color: $primary;
@@ -4172,7 +4137,7 @@ popover.emoji-picker emoji {
 
 emoji-completion-row {
   min-height: $menuitem-size;
-  padding: 0 $container-padding*2;
+  padding: 0 $container-padding * 2;
 
   > box {
     border-spacing: $container-padding;
diff --git a/src/_sass/gtk/_drawing-4.0.scss b/src/_sass/gtk/_drawing-4.0.scss
index 81cc663..49b0858 100644
--- a/src/_sass/gtk/_drawing-4.0.scss
+++ b/src/_sass/gtk/_drawing-4.0.scss
@@ -13,24 +13,28 @@
     box-shadow: inset 0 0 0 2px transparent;
     background-color: if($fc == $primary, $entry, rgba($fc, 0.08));
     color: if($fc == $primary, $text, $fc);
+    outline: none;
   }
 
   @if $t == hover {
     background-color: $overlay-hover;
     box-shadow: inset 0 0 0 2px $overlay-hover;
     color: if($fc == $primary, $text, $fc);
+    outline: none;
   }
 
   @if $t == focus {
     background-color: $overlay-focus;
     box-shadow: inset 0 0 0 2px if($fc == $primary, $track, $fc);
     color: if($fc == $primary, $text, $fc);
+    outline: none;
   }
 
   @if $t == checked {
     background-color: if($fc == $primary, $entry, rgba($fc, 0.08));
     box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc);
     color: if($fc == $primary, $text, $fc);
+    outline: none;
   }
 
   @if $t == disabled {
@@ -38,6 +42,7 @@
     background-color: if($fc == $primary, $fill, rgba($fc, 0.04));
     color: $text-disabled;
     color: if($fc == $primary, $text-disabled, rgba($fc, 0.35));
+    outline: none;
   }
 
   @if $t == raised-normal {
@@ -46,21 +51,25 @@
     box-shadow: inset 0 0 0 2px transparent;
     background-color: if($fc == $primary, $surface, $fc);
     color: if($fc == $primary, $text, on($fc));
+    outline: none;
   }
 
   @if $t == raised-hover {
     box-shadow: inset 0 0 0 2px $overlay-hover;
+    outline: none;
   }
 
   @if $t == raised-focus {
     border-image: none;
     box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc);
+    outline: none;
   }
 
   @if $t == raised-disabled {
     box-shadow: inset 0 0 0 2px transparent;
     background-color: $base-alt;
     color: $text-disabled;
+    outline: none;
   }
 }
 
diff --git a/src/_sass/gtk/apps/_libadwaita.scss b/src/_sass/gtk/apps/_libadwaita.scss
index 7fb3b52..92f3a4e 100644
--- a/src/_sass/gtk/apps/_libadwaita.scss
+++ b/src/_sass/gtk/apps/_libadwaita.scss
@@ -679,8 +679,8 @@ dnd {
   tab {
     min-height: $menuitem-size;
     padding: $container-padding / 2 $container-padding;
-    border-radius: $menu-radius;
-    margin: 0 2px;
+    border-radius: $corner-radius / 2;
+    margin: 0 1px;
 
     button.image-button {
       padding: 0;
@@ -729,4 +729,8 @@ leaflet {
     border-radius: 0;
     outline: none;
   }
+
+  > box > scrolledwindow > viewport > widget > stack {
+    background-color: $base;
+  }
 }
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/border.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/border.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/border.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/border.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/button-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/button-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/button-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/button-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/button.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/checkbox-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/checkbox-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-left-entry.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-left-entry.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/combo-right-entry.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/combo-right-entry.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-background-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-background-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-background-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-background-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-background.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-background.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-background.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-background.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/entry-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/entry.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/entry.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/entry.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/flat-button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/flat-button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/focus.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/focus.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/focus.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/focus.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/frame-inline.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/frame-inline.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/frame-inline.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/frame-inline.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/frame-notebook.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/frame-notebook.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/frame-notebook.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/frame-notebook.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/frame.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/frame.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/frame.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/frame.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-horz-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-horz-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-horz-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-horz-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-horz-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-horz-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-horz-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-horz-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-horz.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-horz.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-horz.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-horz.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-vert-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-vert-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-vert-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-vert-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-vert-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-vert-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-vert-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-vert-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-vert.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-vert.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/handle-vert.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/handle-vert.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-checkbox-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-checkbox-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/menu-radio-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/menu-radio-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-down.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-down.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-semi.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-semi.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left-semi.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left-semi.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-left.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-left.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-semi.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-semi.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right-semi.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right-semi.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-right.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-right.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/pan-up.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/pan-up.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/progressbar-progress.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/progressbar-progress.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/progressbar-progress.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/progressbar-progress.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/progressbar-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/progressbar-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/progressbar-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/progressbar-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/radio-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/radio-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-horz-trough-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-horz-trough-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-horz-trough-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-horz-trough-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-horz-trough-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-horz-trough-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-horz-trough-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-horz-trough-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-horz-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-horz-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-horz-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-horz-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-vert-trough-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-vert-trough-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-vert-trough-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-vert-trough-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-vert-trough-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-vert-trough-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-vert-trough-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-vert-trough-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-vert-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-vert-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scale-vert-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scale-vert-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-horz-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-horz-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-ltr-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-ltr-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/scrollbar-vert-rtl-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/scrollbar-vert-rtl-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-down.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-down.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-ltr-up.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-ltr-up.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-down.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-down.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/spin-rtl-up.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/spin-rtl-up.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/tab.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/tab.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/tab.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/tab.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-ltr-button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-ltr-button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-ltr-button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-ltr-button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-ltr-button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-ltr-button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-ltr-button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-ltr-button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-ltr-button.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-ltr-button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-ltr-button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-ltr-button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-rtl-button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-rtl-button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-rtl-button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-rtl-button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-rtl-button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-rtl-button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-rtl-button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-rtl-button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-rtl-button.png b/src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-rtl-button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow-Dark/treeview-rtl-button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow-Dark/treeview-rtl-button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/border.png b/src/gtk-2.0/assets-folder/assets-Yellow/border.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/border.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/border.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/button-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/button-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/button-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/button-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/button.png b/src/gtk-2.0/assets-folder/assets-Yellow/button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/checkbox-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/checkbox-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-left-entry.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-left-entry.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry.png b/src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/combo-right-entry.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/combo-right-entry.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/entry-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/entry-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/entry-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/entry-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/entry-background-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/entry-background-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/entry-background-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/entry-background-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/entry-background.png b/src/gtk-2.0/assets-folder/assets-Yellow/entry-background.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/entry-background.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/entry-background.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/entry-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/entry-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/entry-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/entry-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/entry-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/entry-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/entry-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/entry-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/entry.png b/src/gtk-2.0/assets-folder/assets-Yellow/entry.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/entry.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/entry.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/flat-button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/flat-button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/flat-button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/flat-button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/flat-button-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/flat-button-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/flat-button-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/flat-button-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/flat-button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/flat-button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/flat-button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/flat-button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/flat-button.png b/src/gtk-2.0/assets-folder/assets-Yellow/flat-button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/flat-button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/flat-button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/focus.png b/src/gtk-2.0/assets-folder/assets-Yellow/focus.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/focus.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/focus.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/frame-inline.png b/src/gtk-2.0/assets-folder/assets-Yellow/frame-inline.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/frame-inline.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/frame-inline.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/frame-notebook.png b/src/gtk-2.0/assets-folder/assets-Yellow/frame-notebook.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/frame-notebook.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/frame-notebook.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/frame.png b/src/gtk-2.0/assets-folder/assets-Yellow/frame.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/frame.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/frame.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/handle-horz-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/handle-horz-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/handle-horz-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/handle-horz-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/handle-horz-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/handle-horz-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/handle-horz-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/handle-horz-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/handle-horz.png b/src/gtk-2.0/assets-folder/assets-Yellow/handle-horz.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/handle-horz.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/handle-horz.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/handle-vert-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/handle-vert-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/handle-vert-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/handle-vert-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/handle-vert-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/handle-vert-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/handle-vert-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/handle-vert-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/handle-vert.png b/src/gtk-2.0/assets-folder/assets-Yellow/handle-vert.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/handle-vert.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/handle-vert.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-checkbox-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-checkbox-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-radio-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-radio-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-radio-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-radio-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-radio-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-radio-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-radio-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-radio-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-radio-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-radio-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/menu-radio-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/menu-radio-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/menu-radio-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-down-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-down-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-down-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-down-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-down-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-down-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-down-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-down-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-down-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-down-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-down-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-down-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-down.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-down.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-down.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-down.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-left-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-left-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-left-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-left-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-left-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-left-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-left-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-left-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-left-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-left-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-left-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-left-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-left-semi.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-left-semi.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-left-semi.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-left-semi.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-left.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-left.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-left.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-left.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-right-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-right-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-right-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-right-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-right-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-right-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-right-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-right-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-right-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-right-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-right-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-right-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-right-semi.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-right-semi.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-right-semi.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-right-semi.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-right.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-right.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-right.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-right.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-up-alt-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-up-alt-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-up-alt-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-up-alt-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-up-alt.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-up-alt.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-up-alt.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-up-alt.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-up-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-up-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-up-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-up-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/pan-up.png b/src/gtk-2.0/assets-folder/assets-Yellow/pan-up.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/pan-up.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/pan-up.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/progressbar-progress.png b/src/gtk-2.0/assets-folder/assets-Yellow/progressbar-progress.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/progressbar-progress.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/progressbar-progress.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/progressbar-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow/progressbar-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/progressbar-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/progressbar-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-checked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-checked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-checked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-checked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-checked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-checked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-checked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-checked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-checked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-checked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-checked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-checked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-checked.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-checked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-checked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-checked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-mixed-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-mixed-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-mixed-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-mixed-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-mixed-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-mixed-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-mixed.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-mixed.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-mixed.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked.png b/src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/radio-unchecked.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/radio-unchecked.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-horz-trough-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-horz-trough-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-horz-trough-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-horz-trough-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-horz-trough-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-horz-trough-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-horz-trough-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-horz-trough-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-horz-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-horz-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-horz-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-horz-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-vert-trough-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-vert-trough-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-vert-trough-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-vert-trough-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-vert-trough-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-vert-trough-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-vert-trough-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-vert-trough-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scale-vert-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow/scale-vert-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scale-vert-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scale-vert-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-horz-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-horz-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-ltr-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-ltr-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-slider.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-slider.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-trough.png b/src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-trough.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/scrollbar-vert-rtl-trough.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/scrollbar-vert-rtl-trough.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-down.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-down.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-ltr-up.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-ltr-up.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-down.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-down.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up-disabled.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up-disabled.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up-disabled.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up-disabled.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up.png b/src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/spin-rtl-up.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/spin-rtl-up.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/tab.png b/src/gtk-2.0/assets-folder/assets-Yellow/tab.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/tab.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/tab.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/treeview-ltr-button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/treeview-ltr-button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/treeview-ltr-button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/treeview-ltr-button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/treeview-ltr-button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/treeview-ltr-button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/treeview-ltr-button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/treeview-ltr-button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/treeview-ltr-button.png b/src/gtk-2.0/assets-folder/assets-Yellow/treeview-ltr-button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/treeview-ltr-button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/treeview-ltr-button.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/treeview-rtl-button-active.png b/src/gtk-2.0/assets-folder/assets-Yellow/treeview-rtl-button-active.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/treeview-rtl-button-active.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/treeview-rtl-button-active.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/treeview-rtl-button-hover.png b/src/gtk-2.0/assets-folder/assets-Yellow/treeview-rtl-button-hover.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/treeview-rtl-button-hover.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/treeview-rtl-button-hover.png
diff --git a/src/gtk-2.0/assets-folder/assets-yellow/treeview-rtl-button.png b/src/gtk-2.0/assets-folder/assets-Yellow/treeview-rtl-button.png
similarity index 100%
rename from src/gtk-2.0/assets-folder/assets-yellow/treeview-rtl-button.png
rename to src/gtk-2.0/assets-folder/assets-Yellow/treeview-rtl-button.png
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 40a1c97..f58aecf 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -2,18 +2,10 @@
  * Base States *
  ***************/
 .background {
-  background-color: #f2f2f2;
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background.csd {
-  border-radius: 14px;
-}
-
-.background.maximized, .background.tiled, .background.fullscreen, .background.solid-csd {
-  border-radius: 0;
-}
-
 dnd {
   color: rgba(0, 0, 0, 0.87);
 }
@@ -47,12 +39,12 @@ treeview.expander:disabled {
   -gtk-icon-filter: opacity(0.5);
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+iconview, .view {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
 }
 
-filechooser stack.view scrolledwindow treeview.view:disabled, iconview:disabled, .view:disabled {
+iconview:disabled, .view:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
@@ -267,6 +259,7 @@ entry {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:focus-within, spinbutton:focus-within:not(.vertical),
@@ -274,6 +267,7 @@ entry:focus-within {
   background-color: rgba(0, 0, 0, 0.04);
   box-shadow: inset 0 0 0 2px #1A73E8;
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:drop(active), spinbutton:drop(active):not(.vertical),
@@ -281,6 +275,7 @@ entry:drop(active) {
   background-color: alpha(currentColor, 0.08);
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:disabled, spinbutton:disabled:not(.vertical),
@@ -289,6 +284,7 @@ entry:disabled {
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(0, 0, 0, 0.38);
+  outline: none;
 }
 
 spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
@@ -359,6 +355,7 @@ entry.error {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(217, 48, 37, 0.08);
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical image, spinbutton.error:not(.vertical) image,
@@ -377,6 +374,7 @@ entry.error:focus-within {
   background-color: rgba(217, 48, 37, 0.08);
   box-shadow: inset 0 0 0 2px #D93025;
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical:disabled, spinbutton.error:disabled:not(.vertical),
@@ -385,6 +383,7 @@ entry.error:disabled {
   background-color: rgba(217, 48, 37, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(217, 48, 37, 0.35);
+  outline: none;
 }
 
 spinbutton.success.vertical, spinbutton.success:not(.vertical),
@@ -393,6 +392,7 @@ entry.success {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(15, 157, 88, 0.08);
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical image, spinbutton.success:not(.vertical) image,
@@ -411,6 +411,7 @@ entry.success:focus-within {
   background-color: rgba(15, 157, 88, 0.08);
   box-shadow: inset 0 0 0 2px #0F9D58;
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical:disabled, spinbutton.success:disabled:not(.vertical),
@@ -419,6 +420,7 @@ entry.success:disabled {
   background-color: rgba(15, 157, 88, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(15, 157, 88, 0.35);
+  outline: none;
 }
 
 spinbutton.warning.vertical, spinbutton.warning:not(.vertical),
@@ -427,6 +429,7 @@ entry.warning {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(244, 180, 0, 0.08);
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical image, spinbutton.warning:not(.vertical) image,
@@ -445,6 +448,7 @@ entry.warning:focus-within {
   background-color: rgba(244, 180, 0, 0.08);
   box-shadow: inset 0 0 0 2px #F4B400;
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical:disabled, spinbutton.warning:disabled:not(.vertical),
@@ -453,6 +457,7 @@ entry.warning:disabled {
   background-color: rgba(244, 180, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(244, 180, 0, 0.35);
+  outline: none;
 }
 
 spinbutton.vertical > progress, spinbutton:not(.vertical) > progress,
@@ -514,6 +519,7 @@ editablelabel > stack > text {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 /***********
@@ -1197,6 +1203,7 @@ button.combo:only-child {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 button.combo:only-child:focus {
@@ -1326,7 +1333,7 @@ toolbar:not(.inline-toolbar):not(.osd) switch {
 }
 
 searchbar > revealer > box {
-  padding: 4px 8px;
+  padding: 4px;
   border-spacing: 4px;
   border-style: solid;
   border-width: 0 0 1px;
@@ -1335,6 +1342,10 @@ searchbar > revealer > box {
   background-clip: border-box;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -1979,6 +1990,10 @@ popover.background > contents > toolbar {
   background-color: transparent;
 }
 
+popover.background > contents > scrolledwindow > viewport > stack > box {
+  padding: 0;
+}
+
 popover.background > contents separator {
   background-color: rgba(0, 0, 0, 0.12);
   margin: 2px 0;
@@ -2022,9 +2037,14 @@ popover.background button.model {
   background-color: transparent;
 }
 
+popover.background listview {
+  padding: 0;
+}
+
 popover.background listview > row {
   padding: 4px 8px;
   border-radius: 5px;
+  margin: 0;
 }
 
 magnifier {
@@ -3711,11 +3731,6 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(0, 0, 0, 0.6);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   padding: 4px;
 }
@@ -3736,11 +3751,6 @@ window.dialog.message.csd .dialog-action-area > button.destructive-action:not(:d
   color: #D93025;
 }
 
-.csd filechooser {
-  background-color: #FFFFFF;
-  border-radius: 0 0 14px 14px;
-}
-
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -3750,44 +3760,10 @@ filechooser #pathbarbox {
   background-color: #F2F2F2;
 }
 
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
-  background-color: transparent;
-  border-radius: 0 0 14px 0;
-}
-
-filechooser stack.view scrolledwindow list {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow treeview.view {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview > actionbar, filechooser stack.view > placesview > actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooser stack.view frame > border {
   border: none;
 }
 
-.csd filechooser placessidebar {
-  background: none;
-  border-bottom-left-radius: 14px;
-}
-
-filechooser actionbar, filechooser actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooserbutton > button > box {
   border-spacing: 4px;
 }
@@ -3797,6 +3773,10 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 10px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4323,7 +4303,7 @@ gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:sel
   background-color: alpha(currentColor, 0.06);
 }
 
-.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, filechooser stack.view scrolledwindow treeview.view:selected, stacksidebar row:selected, .navigation-sidebar > row:selected {
+.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, stacksidebar row:selected, .navigation-sidebar > row:selected {
   color: #1A73E8;
   background-color: rgba(26, 115, 232, 0.2);
 }
@@ -4460,6 +4440,10 @@ popover.emoji-picker > contents {
   background: none;
 }
 
+.emoji-searchbar entry {
+  margin: 0;
+}
+
 .emoji-searchbar entry text {
   background: none;
   box-shadow: none;
@@ -4470,6 +4454,7 @@ popover.emoji-picker > contents {
   border-spacing: 2px;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
@@ -5231,8 +5216,8 @@ tabbar tab,
 dnd tab {
   min-height: 24px;
   padding: 2px 4px;
-  border-radius: 9px;
-  margin: 0 2px;
+  border-radius: 5px;
+  margin: 0 1px;
 }
 
 tabbar tab button.image-button,
@@ -5279,6 +5264,10 @@ leaflet leaflet {
   outline: none;
 }
 
+leaflet > box > scrolledwindow > viewport > widget > stack {
+  background-color: #FFFFFF;
+}
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index b42730e..644004a 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -6,14 +6,6 @@
   color: white;
 }
 
-.background.csd {
-  border-radius: 14px;
-}
-
-.background.maximized, .background.tiled, .background.fullscreen, .background.solid-csd {
-  border-radius: 0;
-}
-
 dnd {
   color: white;
 }
@@ -47,12 +39,12 @@ treeview.expander:disabled {
   -gtk-icon-filter: opacity(0.5);
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+iconview, .view {
   background-color: #2C2C2C;
   color: white;
 }
 
-filechooser stack.view scrolledwindow treeview.view:disabled, iconview:disabled, .view:disabled {
+iconview:disabled, .view:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
@@ -267,6 +259,7 @@ entry {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(255, 255, 255, 0.04);
   color: white;
+  outline: none;
 }
 
 spinbutton.vertical:focus-within, spinbutton:focus-within:not(.vertical),
@@ -274,6 +267,7 @@ entry:focus-within {
   background-color: rgba(255, 255, 255, 0.04);
   box-shadow: inset 0 0 0 2px #3281ea;
   color: white;
+  outline: none;
 }
 
 spinbutton.vertical:drop(active), spinbutton:drop(active):not(.vertical),
@@ -281,6 +275,7 @@ entry:drop(active) {
   background-color: alpha(currentColor, 0.08);
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   color: white;
+  outline: none;
 }
 
 spinbutton.vertical:disabled, spinbutton:disabled:not(.vertical),
@@ -289,6 +284,7 @@ entry:disabled {
   background-color: rgba(255, 255, 255, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(255, 255, 255, 0.5);
+  outline: none;
 }
 
 spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
@@ -359,6 +355,7 @@ entry.error {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(242, 139, 130, 0.08);
   color: #F28B82;
+  outline: none;
 }
 
 spinbutton.error.vertical image, spinbutton.error:not(.vertical) image,
@@ -377,6 +374,7 @@ entry.error:focus-within {
   background-color: rgba(242, 139, 130, 0.08);
   box-shadow: inset 0 0 0 2px #F28B82;
   color: #F28B82;
+  outline: none;
 }
 
 spinbutton.error.vertical:disabled, spinbutton.error:disabled:not(.vertical),
@@ -385,6 +383,7 @@ entry.error:disabled {
   background-color: rgba(242, 139, 130, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(242, 139, 130, 0.35);
+  outline: none;
 }
 
 spinbutton.success.vertical, spinbutton.success:not(.vertical),
@@ -393,6 +392,7 @@ entry.success {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(129, 201, 149, 0.08);
   color: #81C995;
+  outline: none;
 }
 
 spinbutton.success.vertical image, spinbutton.success:not(.vertical) image,
@@ -411,6 +411,7 @@ entry.success:focus-within {
   background-color: rgba(129, 201, 149, 0.08);
   box-shadow: inset 0 0 0 2px #81C995;
   color: #81C995;
+  outline: none;
 }
 
 spinbutton.success.vertical:disabled, spinbutton.success:disabled:not(.vertical),
@@ -419,6 +420,7 @@ entry.success:disabled {
   background-color: rgba(129, 201, 149, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(129, 201, 149, 0.35);
+  outline: none;
 }
 
 spinbutton.warning.vertical, spinbutton.warning:not(.vertical),
@@ -427,6 +429,7 @@ entry.warning {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(253, 214, 51, 0.08);
   color: #FDD633;
+  outline: none;
 }
 
 spinbutton.warning.vertical image, spinbutton.warning:not(.vertical) image,
@@ -445,6 +448,7 @@ entry.warning:focus-within {
   background-color: rgba(253, 214, 51, 0.08);
   box-shadow: inset 0 0 0 2px #FDD633;
   color: #FDD633;
+  outline: none;
 }
 
 spinbutton.warning.vertical:disabled, spinbutton.warning:disabled:not(.vertical),
@@ -453,6 +457,7 @@ entry.warning:disabled {
   background-color: rgba(253, 214, 51, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(253, 214, 51, 0.35);
+  outline: none;
 }
 
 spinbutton.vertical > progress, spinbutton:not(.vertical) > progress,
@@ -514,6 +519,7 @@ editablelabel > stack > text {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(255, 255, 255, 0.04);
   color: white;
+  outline: none;
 }
 
 /***********
@@ -1197,6 +1203,7 @@ button.combo:only-child {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(255, 255, 255, 0.04);
   color: white;
+  outline: none;
 }
 
 button.combo:only-child:focus {
@@ -1326,7 +1333,7 @@ toolbar:not(.inline-toolbar):not(.osd) switch {
 }
 
 searchbar > revealer > box {
-  padding: 4px 8px;
+  padding: 4px;
   border-spacing: 4px;
   border-style: solid;
   border-width: 0 0 1px;
@@ -1335,6 +1342,10 @@ searchbar > revealer > box {
   background-clip: border-box;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -1979,6 +1990,10 @@ popover.background > contents > toolbar {
   background-color: transparent;
 }
 
+popover.background > contents > scrolledwindow > viewport > stack > box {
+  padding: 0;
+}
+
 popover.background > contents separator {
   background-color: rgba(255, 255, 255, 0.12);
   margin: 2px 0;
@@ -2022,9 +2037,14 @@ popover.background button.model {
   background-color: transparent;
 }
 
+popover.background listview {
+  padding: 0;
+}
+
 popover.background listview > row {
   padding: 4px 8px;
   border-radius: 5px;
+  margin: 0;
 }
 
 magnifier {
@@ -3711,11 +3731,6 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(255, 255, 255, 0.7);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   padding: 4px;
 }
@@ -3736,11 +3751,6 @@ window.dialog.message.csd .dialog-action-area > button.destructive-action:not(:d
   color: #F28B82;
 }
 
-.csd filechooser {
-  background-color: #2C2C2C;
-  border-radius: 0 0 14px 14px;
-}
-
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -3750,44 +3760,10 @@ filechooser #pathbarbox {
   background-color: #212121;
 }
 
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
-  background-color: transparent;
-  border-radius: 0 0 14px 0;
-}
-
-filechooser stack.view scrolledwindow list {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow treeview.view {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview > actionbar, filechooser stack.view > placesview > actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooser stack.view frame > border {
   border: none;
 }
 
-.csd filechooser placessidebar {
-  background: none;
-  border-bottom-left-radius: 14px;
-}
-
-filechooser actionbar, filechooser actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooserbutton > button > box {
   border-spacing: 4px;
 }
@@ -3797,6 +3773,10 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 10px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4323,7 +4303,7 @@ gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:sel
   background-color: alpha(currentColor, 0.06);
 }
 
-.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, filechooser stack.view scrolledwindow treeview.view:selected, stacksidebar row:selected, .navigation-sidebar > row:selected {
+.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, stacksidebar row:selected, .navigation-sidebar > row:selected {
   color: #3281ea;
   background-color: rgba(50, 129, 234, 0.2);
 }
@@ -4460,6 +4440,10 @@ popover.emoji-picker > contents {
   background: none;
 }
 
+.emoji-searchbar entry {
+  margin: 0;
+}
+
 .emoji-searchbar entry text {
   background: none;
   box-shadow: none;
@@ -4470,6 +4454,7 @@ popover.emoji-picker > contents {
   border-spacing: 2px;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
@@ -5231,8 +5216,8 @@ tabbar tab,
 dnd tab {
   min-height: 24px;
   padding: 2px 4px;
-  border-radius: 9px;
-  margin: 0 2px;
+  border-radius: 5px;
+  margin: 0 1px;
 }
 
 tabbar tab button.image-button,
@@ -5279,6 +5264,10 @@ leaflet leaflet {
   outline: none;
 }
 
+leaflet > box > scrolledwindow > viewport > widget > stack {
+  background-color: #2C2C2C;
+}
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index a8a0f86..ed39ad4 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -6,14 +6,6 @@
   color: white;
 }
 
-.background.csd {
-  border-radius: 18px;
-}
-
-.background.maximized, .background.tiled, .background.fullscreen, .background.solid-csd {
-  border-radius: 0;
-}
-
 dnd {
   color: white;
 }
@@ -47,12 +39,12 @@ treeview.expander:disabled {
   -gtk-icon-filter: opacity(0.5);
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+iconview, .view {
   background-color: #2C2C2C;
   color: white;
 }
 
-filechooser stack.view scrolledwindow treeview.view:disabled, iconview:disabled, .view:disabled {
+iconview:disabled, .view:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
@@ -267,6 +259,7 @@ entry {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(255, 255, 255, 0.04);
   color: white;
+  outline: none;
 }
 
 spinbutton.vertical:focus-within, spinbutton:focus-within:not(.vertical),
@@ -274,6 +267,7 @@ entry:focus-within {
   background-color: rgba(255, 255, 255, 0.04);
   box-shadow: inset 0 0 0 2px #3281ea;
   color: white;
+  outline: none;
 }
 
 spinbutton.vertical:drop(active), spinbutton:drop(active):not(.vertical),
@@ -281,6 +275,7 @@ entry:drop(active) {
   background-color: alpha(currentColor, 0.08);
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   color: white;
+  outline: none;
 }
 
 spinbutton.vertical:disabled, spinbutton:disabled:not(.vertical),
@@ -289,6 +284,7 @@ entry:disabled {
   background-color: rgba(255, 255, 255, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(255, 255, 255, 0.5);
+  outline: none;
 }
 
 spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
@@ -359,6 +355,7 @@ entry.error {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(242, 139, 130, 0.08);
   color: #F28B82;
+  outline: none;
 }
 
 spinbutton.error.vertical image, spinbutton.error:not(.vertical) image,
@@ -377,6 +374,7 @@ entry.error:focus-within {
   background-color: rgba(242, 139, 130, 0.08);
   box-shadow: inset 0 0 0 2px #F28B82;
   color: #F28B82;
+  outline: none;
 }
 
 spinbutton.error.vertical:disabled, spinbutton.error:disabled:not(.vertical),
@@ -385,6 +383,7 @@ entry.error:disabled {
   background-color: rgba(242, 139, 130, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(242, 139, 130, 0.35);
+  outline: none;
 }
 
 spinbutton.success.vertical, spinbutton.success:not(.vertical),
@@ -393,6 +392,7 @@ entry.success {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(129, 201, 149, 0.08);
   color: #81C995;
+  outline: none;
 }
 
 spinbutton.success.vertical image, spinbutton.success:not(.vertical) image,
@@ -411,6 +411,7 @@ entry.success:focus-within {
   background-color: rgba(129, 201, 149, 0.08);
   box-shadow: inset 0 0 0 2px #81C995;
   color: #81C995;
+  outline: none;
 }
 
 spinbutton.success.vertical:disabled, spinbutton.success:disabled:not(.vertical),
@@ -419,6 +420,7 @@ entry.success:disabled {
   background-color: rgba(129, 201, 149, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(129, 201, 149, 0.35);
+  outline: none;
 }
 
 spinbutton.warning.vertical, spinbutton.warning:not(.vertical),
@@ -427,6 +429,7 @@ entry.warning {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(253, 214, 51, 0.08);
   color: #FDD633;
+  outline: none;
 }
 
 spinbutton.warning.vertical image, spinbutton.warning:not(.vertical) image,
@@ -445,6 +448,7 @@ entry.warning:focus-within {
   background-color: rgba(253, 214, 51, 0.08);
   box-shadow: inset 0 0 0 2px #FDD633;
   color: #FDD633;
+  outline: none;
 }
 
 spinbutton.warning.vertical:disabled, spinbutton.warning:disabled:not(.vertical),
@@ -453,6 +457,7 @@ entry.warning:disabled {
   background-color: rgba(253, 214, 51, 0.04);
   color: rgba(255, 255, 255, 0.5);
   color: rgba(253, 214, 51, 0.35);
+  outline: none;
 }
 
 spinbutton.vertical > progress, spinbutton:not(.vertical) > progress,
@@ -514,6 +519,7 @@ editablelabel > stack > text {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(255, 255, 255, 0.04);
   color: white;
+  outline: none;
 }
 
 /***********
@@ -1197,6 +1203,7 @@ button.combo:only-child {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(255, 255, 255, 0.04);
   color: white;
+  outline: none;
 }
 
 button.combo:only-child:focus {
@@ -1326,7 +1333,7 @@ toolbar:not(.inline-toolbar):not(.osd) switch {
 }
 
 searchbar > revealer > box {
-  padding: 6px 12px;
+  padding: 6px;
   border-spacing: 6px;
   border-style: solid;
   border-width: 0 0 1px;
@@ -1335,6 +1342,10 @@ searchbar > revealer > box {
   background-clip: border-box;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -1979,6 +1990,10 @@ popover.background > contents > toolbar {
   background-color: transparent;
 }
 
+popover.background > contents > scrolledwindow > viewport > stack > box {
+  padding: 0;
+}
+
 popover.background > contents separator {
   background-color: rgba(255, 255, 255, 0.12);
   margin: 3px 0;
@@ -2022,9 +2037,14 @@ popover.background button.model {
   background-color: transparent;
 }
 
+popover.background listview {
+  padding: 0;
+}
+
 popover.background listview > row {
   padding: 6px 12px;
   border-radius: 6px;
+  margin: 0;
 }
 
 magnifier {
@@ -3711,11 +3731,6 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(255, 255, 255, 0.7);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 18px;
-  border-bottom-right-radius: 18px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   padding: 6px;
 }
@@ -3736,11 +3751,6 @@ window.dialog.message.csd .dialog-action-area > button.destructive-action:not(:d
   color: #F28B82;
 }
 
-.csd filechooser {
-  background-color: #2C2C2C;
-  border-radius: 0 0 18px 18px;
-}
-
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -3750,44 +3760,10 @@ filechooser #pathbarbox {
   background-color: #212121;
 }
 
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
-  background-color: transparent;
-  border-radius: 0 0 18px 0;
-}
-
-filechooser stack.view scrolledwindow list {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow treeview.view {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview > actionbar, filechooser stack.view > placesview > actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooser stack.view frame > border {
   border: none;
 }
 
-.csd filechooser placessidebar {
-  background: none;
-  border-bottom-left-radius: 18px;
-}
-
-filechooser actionbar, filechooser actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooserbutton > button > box {
   border-spacing: 6px;
 }
@@ -3797,6 +3773,10 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 12px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4323,7 +4303,7 @@ gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:sel
   background-color: alpha(currentColor, 0.06);
 }
 
-.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, filechooser stack.view scrolledwindow treeview.view:selected, stacksidebar row:selected, .navigation-sidebar > row:selected {
+.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, stacksidebar row:selected, .navigation-sidebar > row:selected {
   color: #3281ea;
   background-color: rgba(50, 129, 234, 0.2);
 }
@@ -4460,6 +4440,10 @@ popover.emoji-picker > contents {
   background: none;
 }
 
+.emoji-searchbar entry {
+  margin: 0;
+}
+
 .emoji-searchbar entry text {
   background: none;
   box-shadow: none;
@@ -4470,6 +4454,7 @@ popover.emoji-picker > contents {
   border-spacing: 3px;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
@@ -5231,8 +5216,8 @@ tabbar tab,
 dnd tab {
   min-height: 28px;
   padding: 3px 6px;
-  border-radius: 12px;
-  margin: 0 2px;
+  border-radius: 6px;
+  margin: 0 1px;
 }
 
 tabbar tab button.image-button,
@@ -5279,6 +5264,10 @@ leaflet leaflet {
   outline: none;
 }
 
+leaflet > box > scrolledwindow > viewport > widget > stack {
+  background-color: #2C2C2C;
+}
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 5774599..a051af6 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -2,18 +2,10 @@
  * Base States *
  ***************/
 .background {
-  background-color: #f2f2f2;
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background.csd {
-  border-radius: 14px;
-}
-
-.background.maximized, .background.tiled, .background.fullscreen, .background.solid-csd {
-  border-radius: 0;
-}
-
 dnd {
   color: rgba(0, 0, 0, 0.87);
 }
@@ -47,12 +39,12 @@ treeview.expander:disabled {
   -gtk-icon-filter: opacity(0.5);
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+iconview, .view {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
 }
 
-filechooser stack.view scrolledwindow treeview.view:disabled, iconview:disabled, .view:disabled {
+iconview:disabled, .view:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
@@ -267,6 +259,7 @@ entry {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:focus-within, spinbutton:focus-within:not(.vertical),
@@ -274,6 +267,7 @@ entry:focus-within {
   background-color: rgba(0, 0, 0, 0.04);
   box-shadow: inset 0 0 0 2px #1A73E8;
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:drop(active), spinbutton:drop(active):not(.vertical),
@@ -281,6 +275,7 @@ entry:drop(active) {
   background-color: alpha(currentColor, 0.08);
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:disabled, spinbutton:disabled:not(.vertical),
@@ -289,6 +284,7 @@ entry:disabled {
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(0, 0, 0, 0.38);
+  outline: none;
 }
 
 spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
@@ -359,6 +355,7 @@ entry.error {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(217, 48, 37, 0.08);
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical image, spinbutton.error:not(.vertical) image,
@@ -377,6 +374,7 @@ entry.error:focus-within {
   background-color: rgba(217, 48, 37, 0.08);
   box-shadow: inset 0 0 0 2px #D93025;
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical:disabled, spinbutton.error:disabled:not(.vertical),
@@ -385,6 +383,7 @@ entry.error:disabled {
   background-color: rgba(217, 48, 37, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(217, 48, 37, 0.35);
+  outline: none;
 }
 
 spinbutton.success.vertical, spinbutton.success:not(.vertical),
@@ -393,6 +392,7 @@ entry.success {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(15, 157, 88, 0.08);
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical image, spinbutton.success:not(.vertical) image,
@@ -411,6 +411,7 @@ entry.success:focus-within {
   background-color: rgba(15, 157, 88, 0.08);
   box-shadow: inset 0 0 0 2px #0F9D58;
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical:disabled, spinbutton.success:disabled:not(.vertical),
@@ -419,6 +420,7 @@ entry.success:disabled {
   background-color: rgba(15, 157, 88, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(15, 157, 88, 0.35);
+  outline: none;
 }
 
 spinbutton.warning.vertical, spinbutton.warning:not(.vertical),
@@ -427,6 +429,7 @@ entry.warning {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(244, 180, 0, 0.08);
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical image, spinbutton.warning:not(.vertical) image,
@@ -445,6 +448,7 @@ entry.warning:focus-within {
   background-color: rgba(244, 180, 0, 0.08);
   box-shadow: inset 0 0 0 2px #F4B400;
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical:disabled, spinbutton.warning:disabled:not(.vertical),
@@ -453,6 +457,7 @@ entry.warning:disabled {
   background-color: rgba(244, 180, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(244, 180, 0, 0.35);
+  outline: none;
 }
 
 spinbutton.vertical > progress, spinbutton:not(.vertical) > progress,
@@ -514,6 +519,7 @@ editablelabel > stack > text {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 /***********
@@ -1197,6 +1203,7 @@ button.combo:only-child {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 button.combo:only-child:focus {
@@ -1326,7 +1333,7 @@ toolbar:not(.inline-toolbar):not(.osd) switch {
 }
 
 searchbar > revealer > box {
-  padding: 4px 8px;
+  padding: 4px;
   border-spacing: 4px;
   border-style: solid;
   border-width: 0 0 1px;
@@ -1335,6 +1342,10 @@ searchbar > revealer > box {
   background-clip: border-box;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -1979,6 +1990,10 @@ popover.background > contents > toolbar {
   background-color: transparent;
 }
 
+popover.background > contents > scrolledwindow > viewport > stack > box {
+  padding: 0;
+}
+
 popover.background > contents separator {
   background-color: rgba(0, 0, 0, 0.12);
   margin: 2px 0;
@@ -2022,9 +2037,14 @@ popover.background button.model {
   background-color: transparent;
 }
 
+popover.background listview {
+  padding: 0;
+}
+
 popover.background listview > row {
   padding: 4px 8px;
   border-radius: 5px;
+  margin: 0;
 }
 
 magnifier {
@@ -3711,11 +3731,6 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(0, 0, 0, 0.6);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 14px;
-  border-bottom-right-radius: 14px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   padding: 4px;
 }
@@ -3736,11 +3751,6 @@ window.dialog.message.csd .dialog-action-area > button.destructive-action:not(:d
   color: #D93025;
 }
 
-.csd filechooser {
-  background-color: #FFFFFF;
-  border-radius: 0 0 14px 14px;
-}
-
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -3750,44 +3760,10 @@ filechooser #pathbarbox {
   background-color: #F2F2F2;
 }
 
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
-  background-color: transparent;
-  border-radius: 0 0 14px 0;
-}
-
-filechooser stack.view scrolledwindow list {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow treeview.view {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview > actionbar, filechooser stack.view > placesview > actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooser stack.view frame > border {
   border: none;
 }
 
-.csd filechooser placessidebar {
-  background: none;
-  border-bottom-left-radius: 14px;
-}
-
-filechooser actionbar, filechooser actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooserbutton > button > box {
   border-spacing: 4px;
 }
@@ -3797,6 +3773,10 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 10px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4323,7 +4303,7 @@ gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:sel
   background-color: alpha(currentColor, 0.06);
 }
 
-.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, filechooser stack.view scrolledwindow treeview.view:selected, stacksidebar row:selected, .navigation-sidebar > row:selected {
+.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, stacksidebar row:selected, .navigation-sidebar > row:selected {
   color: #1A73E8;
   background-color: rgba(26, 115, 232, 0.2);
 }
@@ -4460,6 +4440,10 @@ popover.emoji-picker > contents {
   background: none;
 }
 
+.emoji-searchbar entry {
+  margin: 0;
+}
+
 .emoji-searchbar entry text {
   background: none;
   box-shadow: none;
@@ -4470,6 +4454,7 @@ popover.emoji-picker > contents {
   border-spacing: 2px;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
@@ -5231,8 +5216,8 @@ tabbar tab,
 dnd tab {
   min-height: 24px;
   padding: 2px 4px;
-  border-radius: 9px;
-  margin: 0 2px;
+  border-radius: 5px;
+  margin: 0 1px;
 }
 
 tabbar tab button.image-button,
@@ -5279,6 +5264,10 @@ leaflet leaflet {
   outline: none;
 }
 
+leaflet > box > scrolledwindow > viewport > widget > stack {
+  background-color: #FFFFFF;
+}
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 6713af3..2ef5806 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -2,18 +2,10 @@
  * Base States *
  ***************/
 .background {
-  background-color: #f2f2f2;
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background.csd {
-  border-radius: 18px;
-}
-
-.background.maximized, .background.tiled, .background.fullscreen, .background.solid-csd {
-  border-radius: 0;
-}
-
 dnd {
   color: rgba(0, 0, 0, 0.87);
 }
@@ -47,12 +39,12 @@ treeview.expander:disabled {
   -gtk-icon-filter: opacity(0.5);
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+iconview, .view {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
 }
 
-filechooser stack.view scrolledwindow treeview.view:disabled, iconview:disabled, .view:disabled {
+iconview:disabled, .view:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
@@ -267,6 +259,7 @@ entry {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:focus-within, spinbutton:focus-within:not(.vertical),
@@ -274,6 +267,7 @@ entry:focus-within {
   background-color: rgba(0, 0, 0, 0.04);
   box-shadow: inset 0 0 0 2px #1A73E8;
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:drop(active), spinbutton:drop(active):not(.vertical),
@@ -281,6 +275,7 @@ entry:drop(active) {
   background-color: alpha(currentColor, 0.08);
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:disabled, spinbutton:disabled:not(.vertical),
@@ -289,6 +284,7 @@ entry:disabled {
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(0, 0, 0, 0.38);
+  outline: none;
 }
 
 spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
@@ -359,6 +355,7 @@ entry.error {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(217, 48, 37, 0.08);
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical image, spinbutton.error:not(.vertical) image,
@@ -377,6 +374,7 @@ entry.error:focus-within {
   background-color: rgba(217, 48, 37, 0.08);
   box-shadow: inset 0 0 0 2px #D93025;
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical:disabled, spinbutton.error:disabled:not(.vertical),
@@ -385,6 +383,7 @@ entry.error:disabled {
   background-color: rgba(217, 48, 37, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(217, 48, 37, 0.35);
+  outline: none;
 }
 
 spinbutton.success.vertical, spinbutton.success:not(.vertical),
@@ -393,6 +392,7 @@ entry.success {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(15, 157, 88, 0.08);
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical image, spinbutton.success:not(.vertical) image,
@@ -411,6 +411,7 @@ entry.success:focus-within {
   background-color: rgba(15, 157, 88, 0.08);
   box-shadow: inset 0 0 0 2px #0F9D58;
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical:disabled, spinbutton.success:disabled:not(.vertical),
@@ -419,6 +420,7 @@ entry.success:disabled {
   background-color: rgba(15, 157, 88, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(15, 157, 88, 0.35);
+  outline: none;
 }
 
 spinbutton.warning.vertical, spinbutton.warning:not(.vertical),
@@ -427,6 +429,7 @@ entry.warning {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(244, 180, 0, 0.08);
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical image, spinbutton.warning:not(.vertical) image,
@@ -445,6 +448,7 @@ entry.warning:focus-within {
   background-color: rgba(244, 180, 0, 0.08);
   box-shadow: inset 0 0 0 2px #F4B400;
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical:disabled, spinbutton.warning:disabled:not(.vertical),
@@ -453,6 +457,7 @@ entry.warning:disabled {
   background-color: rgba(244, 180, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(244, 180, 0, 0.35);
+  outline: none;
 }
 
 spinbutton.vertical > progress, spinbutton:not(.vertical) > progress,
@@ -514,6 +519,7 @@ editablelabel > stack > text {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 /***********
@@ -1197,6 +1203,7 @@ button.combo:only-child {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 button.combo:only-child:focus {
@@ -1326,7 +1333,7 @@ toolbar:not(.inline-toolbar):not(.osd) switch {
 }
 
 searchbar > revealer > box {
-  padding: 6px 12px;
+  padding: 6px;
   border-spacing: 6px;
   border-style: solid;
   border-width: 0 0 1px;
@@ -1335,6 +1342,10 @@ searchbar > revealer > box {
   background-clip: border-box;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -1979,6 +1990,10 @@ popover.background > contents > toolbar {
   background-color: transparent;
 }
 
+popover.background > contents > scrolledwindow > viewport > stack > box {
+  padding: 0;
+}
+
 popover.background > contents separator {
   background-color: rgba(0, 0, 0, 0.12);
   margin: 3px 0;
@@ -2022,9 +2037,14 @@ popover.background button.model {
   background-color: transparent;
 }
 
+popover.background listview {
+  padding: 0;
+}
+
 popover.background listview > row {
   padding: 6px 12px;
   border-radius: 6px;
+  margin: 0;
 }
 
 magnifier {
@@ -3711,11 +3731,6 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(0, 0, 0, 0.6);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 18px;
-  border-bottom-right-radius: 18px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   padding: 6px;
 }
@@ -3736,11 +3751,6 @@ window.dialog.message.csd .dialog-action-area > button.destructive-action:not(:d
   color: #D93025;
 }
 
-.csd filechooser {
-  background-color: #FFFFFF;
-  border-radius: 0 0 18px 18px;
-}
-
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -3750,44 +3760,10 @@ filechooser #pathbarbox {
   background-color: #F2F2F2;
 }
 
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
-  background-color: transparent;
-  border-radius: 0 0 18px 0;
-}
-
-filechooser stack.view scrolledwindow list {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow treeview.view {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview > actionbar, filechooser stack.view > placesview > actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooser stack.view frame > border {
   border: none;
 }
 
-.csd filechooser placessidebar {
-  background: none;
-  border-bottom-left-radius: 18px;
-}
-
-filechooser actionbar, filechooser actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooserbutton > button > box {
   border-spacing: 6px;
 }
@@ -3797,6 +3773,10 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 12px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4323,7 +4303,7 @@ gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:sel
   background-color: alpha(currentColor, 0.06);
 }
 
-.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, filechooser stack.view scrolledwindow treeview.view:selected, stacksidebar row:selected, .navigation-sidebar > row:selected {
+.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, stacksidebar row:selected, .navigation-sidebar > row:selected {
   color: #1A73E8;
   background-color: rgba(26, 115, 232, 0.2);
 }
@@ -4460,6 +4440,10 @@ popover.emoji-picker > contents {
   background: none;
 }
 
+.emoji-searchbar entry {
+  margin: 0;
+}
+
 .emoji-searchbar entry text {
   background: none;
   box-shadow: none;
@@ -4470,6 +4454,7 @@ popover.emoji-picker > contents {
   border-spacing: 3px;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
@@ -5231,8 +5216,8 @@ tabbar tab,
 dnd tab {
   min-height: 28px;
   padding: 3px 6px;
-  border-radius: 12px;
-  margin: 0 2px;
+  border-radius: 6px;
+  margin: 0 1px;
 }
 
 tabbar tab button.image-button,
@@ -5279,6 +5264,10 @@ leaflet leaflet {
   outline: none;
 }
 
+leaflet > box > scrolledwindow > viewport > widget > stack {
+  background-color: #FFFFFF;
+}
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index bc57e7f..adcd769 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -2,18 +2,10 @@
  * Base States *
  ***************/
 .background {
-  background-color: #f2f2f2;
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background.csd {
-  border-radius: 18px;
-}
-
-.background.maximized, .background.tiled, .background.fullscreen, .background.solid-csd {
-  border-radius: 0;
-}
-
 dnd {
   color: rgba(0, 0, 0, 0.87);
 }
@@ -47,12 +39,12 @@ treeview.expander:disabled {
   -gtk-icon-filter: opacity(0.5);
 }
 
-filechooser stack.view scrolledwindow treeview.view, iconview, .view {
+iconview, .view {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
 }
 
-filechooser stack.view scrolledwindow treeview.view:disabled, iconview:disabled, .view:disabled {
+iconview:disabled, .view:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
@@ -267,6 +259,7 @@ entry {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:focus-within, spinbutton:focus-within:not(.vertical),
@@ -274,6 +267,7 @@ entry:focus-within {
   background-color: rgba(0, 0, 0, 0.04);
   box-shadow: inset 0 0 0 2px #1A73E8;
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:drop(active), spinbutton:drop(active):not(.vertical),
@@ -281,6 +275,7 @@ entry:drop(active) {
   background-color: alpha(currentColor, 0.08);
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 spinbutton.vertical:disabled, spinbutton:disabled:not(.vertical),
@@ -289,6 +284,7 @@ entry:disabled {
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(0, 0, 0, 0.38);
+  outline: none;
 }
 
 spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
@@ -359,6 +355,7 @@ entry.error {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(217, 48, 37, 0.08);
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical image, spinbutton.error:not(.vertical) image,
@@ -377,6 +374,7 @@ entry.error:focus-within {
   background-color: rgba(217, 48, 37, 0.08);
   box-shadow: inset 0 0 0 2px #D93025;
   color: #D93025;
+  outline: none;
 }
 
 spinbutton.error.vertical:disabled, spinbutton.error:disabled:not(.vertical),
@@ -385,6 +383,7 @@ entry.error:disabled {
   background-color: rgba(217, 48, 37, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(217, 48, 37, 0.35);
+  outline: none;
 }
 
 spinbutton.success.vertical, spinbutton.success:not(.vertical),
@@ -393,6 +392,7 @@ entry.success {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(15, 157, 88, 0.08);
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical image, spinbutton.success:not(.vertical) image,
@@ -411,6 +411,7 @@ entry.success:focus-within {
   background-color: rgba(15, 157, 88, 0.08);
   box-shadow: inset 0 0 0 2px #0F9D58;
   color: #0F9D58;
+  outline: none;
 }
 
 spinbutton.success.vertical:disabled, spinbutton.success:disabled:not(.vertical),
@@ -419,6 +420,7 @@ entry.success:disabled {
   background-color: rgba(15, 157, 88, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(15, 157, 88, 0.35);
+  outline: none;
 }
 
 spinbutton.warning.vertical, spinbutton.warning:not(.vertical),
@@ -427,6 +429,7 @@ entry.warning {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(244, 180, 0, 0.08);
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical image, spinbutton.warning:not(.vertical) image,
@@ -445,6 +448,7 @@ entry.warning:focus-within {
   background-color: rgba(244, 180, 0, 0.08);
   box-shadow: inset 0 0 0 2px #F4B400;
   color: #F4B400;
+  outline: none;
 }
 
 spinbutton.warning.vertical:disabled, spinbutton.warning:disabled:not(.vertical),
@@ -453,6 +457,7 @@ entry.warning:disabled {
   background-color: rgba(244, 180, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   color: rgba(244, 180, 0, 0.35);
+  outline: none;
 }
 
 spinbutton.vertical > progress, spinbutton:not(.vertical) > progress,
@@ -514,6 +519,7 @@ editablelabel > stack > text {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 /***********
@@ -1197,6 +1203,7 @@ button.combo:only-child {
   box-shadow: inset 0 0 0 2px transparent;
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.87);
+  outline: none;
 }
 
 button.combo:only-child:focus {
@@ -1326,7 +1333,7 @@ toolbar:not(.inline-toolbar):not(.osd) switch {
 }
 
 searchbar > revealer > box {
-  padding: 6px 12px;
+  padding: 6px;
   border-spacing: 6px;
   border-style: solid;
   border-width: 0 0 1px;
@@ -1335,6 +1342,10 @@ searchbar > revealer > box {
   background-clip: border-box;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -1979,6 +1990,10 @@ popover.background > contents > toolbar {
   background-color: transparent;
 }
 
+popover.background > contents > scrolledwindow > viewport > stack > box {
+  padding: 0;
+}
+
 popover.background > contents separator {
   background-color: rgba(0, 0, 0, 0.12);
   margin: 3px 0;
@@ -2022,9 +2037,14 @@ popover.background button.model {
   background-color: transparent;
 }
 
+popover.background listview {
+  padding: 0;
+}
+
 popover.background listview > row {
   padding: 6px 12px;
   border-radius: 6px;
+  margin: 0;
 }
 
 magnifier {
@@ -3711,11 +3731,6 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(0, 0, 0, 0.6);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 18px;
-  border-bottom-right-radius: 18px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   padding: 6px;
 }
@@ -3736,11 +3751,6 @@ window.dialog.message.csd .dialog-action-area > button.destructive-action:not(:d
   color: #D93025;
 }
 
-.csd filechooser {
-  background-color: #FFFFFF;
-  border-radius: 0 0 18px 18px;
-}
-
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -3750,44 +3760,10 @@ filechooser #pathbarbox {
   background-color: #F2F2F2;
 }
 
-filechooser stack.view {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow {
-  background-color: transparent;
-  border-radius: 0 0 18px 0;
-}
-
-filechooser stack.view scrolledwindow list {
-  background-color: transparent;
-}
-
-filechooser stack.view scrolledwindow treeview.view {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview {
-  background-color: transparent;
-}
-
-filechooser stack.view > placesview > actionbar, filechooser stack.view > placesview > actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooser stack.view frame > border {
   border: none;
 }
 
-.csd filechooser placessidebar {
-  background: none;
-  border-bottom-left-radius: 18px;
-}
-
-filechooser actionbar, filechooser actionbar > revealer > box {
-  background-color: transparent;
-}
-
 filechooserbutton > button > box {
   border-spacing: 6px;
 }
@@ -3797,6 +3773,10 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 12px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4323,7 +4303,7 @@ gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:sel
   background-color: alpha(currentColor, 0.06);
 }
 
-.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, filechooser stack.view scrolledwindow treeview.view:selected, stacksidebar row:selected, .navigation-sidebar > row:selected {
+.view:selected, iconview:selected, flowbox > flowboxchild:selected, calendar > grid > label.today, stacksidebar row:selected, .navigation-sidebar > row:selected {
   color: #1A73E8;
   background-color: rgba(26, 115, 232, 0.2);
 }
@@ -4460,6 +4440,10 @@ popover.emoji-picker > contents {
   background: none;
 }
 
+.emoji-searchbar entry {
+  margin: 0;
+}
+
 .emoji-searchbar entry text {
   background: none;
   box-shadow: none;
@@ -4470,6 +4454,7 @@ popover.emoji-picker > contents {
   border-spacing: 3px;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   background: none;
+  box-shadow: none;
 }
 
 button.emoji-section {
@@ -5231,8 +5216,8 @@ tabbar tab,
 dnd tab {
   min-height: 28px;
   padding: 3px 6px;
-  border-radius: 12px;
-  margin: 0 2px;
+  border-radius: 6px;
+  margin: 0 1px;
 }
 
 tabbar tab button.image-button,
@@ -5279,6 +5264,10 @@ leaflet leaflet {
   outline: none;
 }
 
+leaflet > box > scrolledwindow > viewport > widget > stack {
+  background-color: #FFFFFF;
+}
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */