diff --git a/.themes/oomox-gruvbox/gtk-2.0/gtkrc b/.themes/oomox-gruvbox/gtk-2.0/gtkrc
index 323edf06..8aa1f65a 100644
--- a/.themes/oomox-gruvbox/gtk-2.0/gtkrc
+++ b/.themes/oomox-gruvbox/gtk-2.0/gtkrc
@@ -143,7 +143,7 @@ style "murrine-default" {
 		menustyle = 0 # 0 = none, 1 = vertical striped
 		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
 		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 8# roundness of widgets
+		roundness = 6# roundness of widgets
 		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
 		sliderstyle = 0 # 0 = none, 1 = handles
 		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
@@ -193,7 +193,7 @@ style "murrine-button"  = "murrine-wider" {
 
 	engine "murrine" {
 		border_colors = { mix(0.4, @btn_fg_color, @btn_bg_color), mix(0.4, @btn_fg_color, @btn_bg_color) }
-		roundness = 8
+		roundness = 6
 	}
 }
 
@@ -214,7 +214,7 @@ style "murrine-scrollbar" {
 	bg[ACTIVE] = @selected_bg_color
 
 	engine "murrine" {
-		roundness = 8
+		roundness = 6
 		contrast = 0.0
 		border_shades = { 0.9, 0.9 }
 		trough_shades = { 0.97, 0.97 }
@@ -252,7 +252,7 @@ style "murrine-progressbar" = "murrine-thin" {
 	fg[PRELIGHT] = @selected_fg_color
 
 	engine "murrine" {
-		roundness = 8
+		roundness = 6
 		border_shades = { 1.2, 1.2 }
 		trough_border_shades = { 0.8, 0.8 }
 	}
@@ -300,7 +300,7 @@ style "murrine-tooltips" {
 
 	engine "murrine" {
 		textstyle = 0
-		roundness = 8
+		roundness = 6
 		rgba = FALSE
 	}
 }
@@ -318,7 +318,7 @@ style "clearlooks-radiocheck" = "murrine-default" {
 	text[PRELIGHT] = @selected_bg_color
 
 	engine "clearlooks" {
-		radius = 8.0
+		radius = 6.0
 	}
 }
 
@@ -330,7 +330,7 @@ style "murrine-entry" = "murrine-wider" {
 	engine "murrine" {
 		#border_shades = { 1.15, 1.15 }
 		border_colors = { mix(0.4, @text_color, @base_color), mix(0.4, @text_color, @base_color) }
-		roundness = 8
+		roundness = 6
 	}
 }
 
@@ -673,7 +673,7 @@ widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkV
 
 style "chromium-toolbar-button" {
 	engine "murrine" {
-		roundness = 8
+		roundness = 6
 		textstyle = 0
 	}
 }
diff --git a/.themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css
index e3971f19..62e3ec5f 100644
--- a/.themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css
+++ b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css
@@ -105,7 +105,7 @@
   outline-style: dashed;
   outline-width: 1px;
   outline-offset: -1px;
-  -gtk-outline-radius: 4px; }
+  -gtk-outline-radius: 3px; }
 
 /*************
  ! Base states
@@ -179,7 +179,7 @@ assistant.csd .sidebar {
   border-top-style: none; }
 
 assistant .sidebar label {
-  padding: 0px 0px; }
+  padding: 4px 8px; }
 
 assistant .sidebar label.highlight {
   background-color: mix(#32302f,#ebdbb2,0.8); }
@@ -210,12 +210,12 @@ button, headerbar button, .titlebar:not(headerbar) button, toolbar button, toolb
 #XfceNotifyWindow button, .osd button, .osd spinbutton:not(.vertical) button,
 #XfceNotifyWindow spinbutton:not(.vertical) button, .osd spinbutton.vertical button:first-child,
 #XfceNotifyWindow spinbutton.vertical button:first-child, .nemo-window toolbar button, .nemo-window .sidebar + separator + box .primary-toolbar button.flat, #login_window button, #shutdown_button button, #restart_button button {
-  min-height: 14px;
-  min-width: 14px;
-  padding: 0px 2px;
+  min-height: 22px;
+  min-width: 22px;
+  padding: 4px 6px;
   border-width: 1px;
   border-style: solid;
-  border-radius: 4px;
+  border-radius: 3px;
   transition: 150ms ease;
   outline-color: transparent; }
 
@@ -262,7 +262,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   .linked > button:first-child, combobox box button:first-child, combobox box entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, headerbar .linked > button:first-child, .titlebar:not(headerbar) .linked > button:first-child, toolbar .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat,
   toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, popover.background .linked > button:first-child, .nemo-window toolbar toolitem stack widget button:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-style: solid;
     border-right-style: none;
     border-top-right-radius: 0;
@@ -276,7 +276,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   .linked > button:last-child, combobox box button:last-child, combobox box entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, headerbar .linked > button:last-child, .titlebar:not(headerbar) .linked > button:last-child, toolbar .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat,
   toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, popover.background .linked > button:last-child, .nemo-window toolbar toolitem stack widget button:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-style: none;
     border-right-style: solid;
     border-top-left-radius: 0;
@@ -295,7 +295,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   .inline-toolbar button:only-child,
   .linked > button:only-child, combobox box button:only-child, combobox box entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, headerbar .linked > button:only-child, .titlebar:not(headerbar) .linked > button:only-child, toolbar .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat,
   toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, popover.background .linked > button:only-child, .nemo-window toolbar toolitem stack widget button:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 .linked.vertical > button {
   border-width: 1px;
@@ -305,7 +305,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   border-bottom-style: none; }
   .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-style: solid;
     border-bottom-style: none;
     border-bottom-left-radius: 0;
@@ -315,7 +315,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
       border-bottom-style: solid; }
   .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-style: none;
     border-bottom-style: solid;
     border-top-left-radius: 0;
@@ -327,7 +327,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
     border-width: 1px;
     border-style: solid; }
   .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 infobar.info button.close, infobar.warning button.close, infobar.question button.close, infobar.error button.close, notebook > header > tabs > arrow {
   border: 1px solid transparent;
@@ -549,7 +549,7 @@ spinbutton:not(.vertical) {
   background-image: none;
   /*@include border($base_color);*/
   padding: 0;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #32302f;
   caret-color: #32302f;
   /*&:focus, &:active { border-color: border_focus($borders_color); }*/ }
@@ -558,7 +558,7 @@ spinbutton:not(.vertical) {
     background-image: none;
     color: mix(#ebdbb2,#32302f,0.5); }
   spinbutton:not(.vertical) entry {
-    border-radius: 4px 0 0 4px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0;
     box-shadow: none; }
   spinbutton:not(.vertical) button {
@@ -589,14 +589,14 @@ spinbutton:not(.vertical) {
       spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
         border-style: none solid none none; }
     spinbutton:not(.vertical) button:dir(rtl):first-child {
-      border-radius: 4px 0 0 4px; }
+      border-radius: 3px 0 0 3px; }
     spinbutton:not(.vertical) button:dir(ltr):last-child {
-      border-radius: 0 4px 4px 0; }
+      border-radius: 0 3px 3px 0; }
 
 spinbutton.vertical button, spinbutton.vertical entry {
   min-width: 0;
-  padding-left: -2px;
-  padding-right: -2px; }
+  padding-left: 2px;
+  padding-right: 2px; }
 
 spinbutton.vertical entry {
   border-radius: 0;
@@ -605,19 +605,19 @@ spinbutton.vertical entry {
 
 spinbutton.vertical button.up {
   border-style: solid solid none;
-  border-radius: 4px 4px 0 0; }
+  border-radius: 3px 3px 0 0; }
 
 spinbutton.vertical button.down {
   border-style: none solid solid;
-  border-radius: 0 0 4px 4px; }
+  border-radius: 0 0 3px 3px; }
 
 /******************
 ! ComboBoxes *
 *******************/
 combobox button.combo {
   min-width: 0;
-  padding-left: 2px;
-  padding-right: 2px; }
+  padding-left: 6px;
+  padding-right: 6px; }
 
 combobox arrow {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
@@ -625,7 +625,7 @@ combobox arrow {
   min-width: 16px; }
 
 combobox box button, combobox box entry {
-  padding: 0px 2px; }
+  padding: 4px 6px; }
 
 /*********
  ! Entry *
@@ -637,7 +637,7 @@ combobox box button, combobox box entry {
   border-left-width: 0; }
   .linked:not(.vertical) > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-right-width: 0;
     border-bottom-right-radius: 0;
     border-top-right-radius: 0; }
@@ -646,7 +646,7 @@ combobox box button, combobox box entry {
       border-right-width: 1px; }
   .linked:not(.vertical) > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-width: 0;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0; }
@@ -656,7 +656,7 @@ combobox box button, combobox box entry {
   .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child {
     border-width: 1px; }
   .linked:not(.vertical) > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 .linked.vertical > entry {
   border-width: 1px;
@@ -665,7 +665,7 @@ combobox box button, combobox box entry {
   border-bottom-width: 0; }
   .linked.vertical > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 1px;
     border-bottom-width: 0;
     border-bottom-left-radius: 0;
@@ -675,7 +675,7 @@ combobox box button, combobox box entry {
       border-bottom-width: 1px; }
   .linked.vertical > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 0;
     border-bottom-width: 1px;
     border-top-left-radius: 0;
@@ -686,13 +686,13 @@ combobox box button, combobox box entry {
   .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child {
     border-width: 1px; }
   .linked.vertical > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 entry, menuitem entry, popover.background entry, .osd entry,
 #XfceNotifyWindow entry, #login_window entry {
   border-width: 1px;
   border-style: solid;
-  border-radius: 4px;
+  border-radius: 3px;
   transition: border 100ms ease-out;
   box-shadow: inset 1px 0 rgba(10, 10, 9, 0.1), inset 0 1px rgba(10, 10, 9, 0.12), inset -1px 0 rgba(10, 10, 9, 0.1), inset 0 -1px rgba(10, 10, 9, 0.05); }
   entry:focus, popover.background entry:focus,
@@ -712,12 +712,12 @@ entry, menuitem entry, popover.background entry, .osd entry,
     background-color: #83a598;
     background-image: none;
     border-width: 0;
-    border-radius: 4px;
+    border-radius: 3px;
     color: #ebdbb2; }
   entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left {
-    padding-right: 0px; }
+    padding-right: 4px; }
   entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right {
-    padding-left: 0px; }
+    padding-left: 4px; }
   entry.warning, popover.background entry.warning,
   #XfceNotifyWindow entry.warning, #login_window entry.warning {
     color: #32302f;
@@ -771,7 +771,7 @@ entry {
   background-color: #ebdbb2;
   background-image: none;
   border-color: shade(mix(#ebdbb2,#32302f,0.2),0.8);
-  padding: 0px;
+  padding: 4px;
   color: #32302f;
   caret-color: #282828;
   -gtk-secondary-caret-color: #282828; }
@@ -818,12 +818,12 @@ entry {
  ! Toolbar
 **********/
 toolbar {
-  padding: -1px;
+  padding: 3px;
   border-style: none; }
   toolbar.horizontal separator {
-    margin: 0 2px 1px; }
+    margin: 0 6px 1px; }
   toolbar.vertical separator {
-    margin: 2px 1px 2px 0; }
+    margin: 6px 1px 6px 0; }
 
 headerbar {
   border-width: 0 0 1px;
@@ -832,17 +832,17 @@ headerbar {
   headerbar spinbutton,
   headerbar separator,
   headerbar button {
-    margin-top: 3px;
-    margin-bottom: 3px; }
+    margin-top: 7px;
+    margin-bottom: 7px; }
   headerbar switch {
-    margin-top: 1px;
-    margin-bottom: 1px; }
+    margin-top: 5px;
+    margin-bottom: 5px; }
   window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar,
   window:not(.tiled):not(.maximized) headerbar:first-child:backdrop,
   window:not(.tiled):not(.maximized) headerbar:first-child {
-    border-top-left-radius: 4px; }
+    border-top-left-radius: 3px; }
   window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child {
-    border-top-right-radius: 4px; }
+    border-top-right-radius: 3px; }
 
 headerbar, .titlebar:not(headerbar) {
   background-color: #282828;
@@ -851,9 +851,9 @@ headerbar, .titlebar:not(headerbar) {
   color: #d5c4a1;
   background-color: #282828;
   background-image: none;
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   color: mix(#d5c4a1,#282828,0.1);
-  padding: 0 0px;
+  padding: 0 8px;
   min-height: 42px; }
   headerbar:focus, .titlebar:focus:not(headerbar), headerbar:hover, .titlebar:hover:not(headerbar) {
     border-color: #527065; }
@@ -869,10 +869,10 @@ headerbar, .titlebar:not(headerbar) {
     color: mix(#d5c4a1,#282828,0.5); }
   headerbar .title, .titlebar:not(headerbar) .title {
     font-weight: bold;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar .subtitle, .titlebar:not(headerbar) .subtitle {
     font-size: smaller;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar button, .titlebar:not(headerbar) button {
     background-color: #282828;
     background-image: none;
@@ -992,11 +992,11 @@ headerbar, .titlebar:not(headerbar) {
     headerbar .linked > button:active:only-child, .titlebar:not(headerbar) .linked > button:active:only-child, headerbar .linked > button:active:only-child:focus, .titlebar:not(headerbar) .linked > button:active:only-child:focus, headerbar .linked > button:active:only-child:hover, .titlebar:not(headerbar) .linked > button:active:only-child:hover, headerbar .linked > button:active:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:active:only-child:hover:focus, headerbar .linked > button:checked:only-child, .titlebar:not(headerbar) .linked > button:checked:only-child, headerbar .linked > button:checked:only-child:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:focus, headerbar .linked > button:checked:only-child:hover, .titlebar:not(headerbar) .linked > button:checked:only-child:hover, headerbar .linked > button:checked:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:hover:focus {
       box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); }
   headerbar combobox, .titlebar:not(headerbar) combobox, headerbar button, .titlebar:not(headerbar) button {
-    padding: 0px; }
+    padding: 4px; }
     headerbar combobox.text-button, .titlebar:not(headerbar) combobox.text-button, headerbar button.text-button, .titlebar:not(headerbar) button.text-button {
-      padding: 0px; }
+      padding: 4px; }
     headerbar combobox.image-button, .titlebar:not(headerbar) combobox.image-button, headerbar button.image-button, .titlebar:not(headerbar) button.image-button {
-      padding: 0px; }
+      padding: 4px; }
   headerbar separator, .titlebar:not(headerbar) separator, headerbar separator:disabled, .titlebar:not(headerbar) separator:disabled {
     color: #181818;
     border-color: currentColor;
@@ -1024,7 +1024,7 @@ headerbar, .titlebar:not(headerbar) {
   headerbar .title, .titlebar:not(headerbar) .title {
     font-weight: bold; }
   headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
-    margin-left: 0px; }
+    margin-left: 4px; }
   headerbar button, .titlebar:not(headerbar) button {
     background-color: #32302f;
     background-image: none;
@@ -1127,7 +1127,7 @@ headerbar, .titlebar:not(headerbar) {
         color: rgba(50, 48, 47, 0.85); }
   headerbar button.titlebutton + separator.titlebutton, .titlebar:not(headerbar) button.titlebutton + separator.titlebutton {
     margin-left: 0;
-    margin-right: 0px; }
+    margin-right: 4px; }
   headerbar button.titlebutton, .titlebar:not(headerbar) button.titlebutton {
     border: 0;
     background-image: none;
@@ -1168,10 +1168,10 @@ toolbar {
     color: mix(#32302f,#ebdbb2,0.5); }
   toolbar .title {
     font-weight: bold;
-    padding: 0 0px; }
+    padding: 0 8px; }
   toolbar .subtitle {
     font-size: smaller;
-    padding: 0 0px; }
+    padding: 0 8px; }
   toolbar button {
     background-color: #ebdbb2;
     background-image: none;
@@ -1291,11 +1291,11 @@ toolbar {
     toolbar .linked > button:active:only-child, toolbar .linked > button:active:only-child:focus, toolbar .linked > button:active:only-child:hover, toolbar .linked > button:active:only-child:hover:focus, toolbar .linked > button:checked:only-child, toolbar .linked > button:checked:only-child:focus, toolbar .linked > button:checked:only-child:hover, toolbar .linked > button:checked:only-child:hover:focus {
       box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); }
   toolbar combobox, toolbar button {
-    padding: 0px; }
+    padding: 4px; }
     toolbar combobox.text-button, toolbar button.text-button {
-      padding: 0px; }
+      padding: 4px; }
     toolbar combobox.image-button, toolbar button.image-button {
-      padding: 0px; }
+      padding: 4px; }
   toolbar separator, toolbar separator:disabled {
     color: #c59c33;
     border-color: currentColor;
@@ -1424,8 +1424,8 @@ window.csd > .titlebar:not(headerbar) {
   background-color: #232323; }
 
 .background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
 .background:not(.csd):not(.ssd):not(.solid-csd) headerbar, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:not(:last-child), .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop:not(:last-child) {
   border-radius: 0;
@@ -1435,7 +1435,7 @@ window.csd > .titlebar:not(headerbar) {
  ! Action-bar *
 ***************/
 actionbar > revealer > box {
-  padding: 0px;
+  padding: 4px;
   border-top: 1px solid mix(#ebdbb2,#32302f,0.1); }
   actionbar > revealer > box:backdrop {
     border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); }
@@ -1750,11 +1750,11 @@ headerbar.selection-mode,
   headerbar.selection-mode .title,
   .titlebar:not(headerbar).selection-mode .title {
     font-weight: bold;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar.selection-mode .subtitle,
   .titlebar:not(headerbar).selection-mode .subtitle {
     font-size: smaller;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar.selection-mode button,
   .titlebar:not(headerbar).selection-mode button {
     background-color: #83a598;
@@ -2091,15 +2091,15 @@ headerbar.selection-mode,
   headerbar.selection-mode combobox, headerbar.selection-mode button,
   .titlebar:not(headerbar).selection-mode combobox,
   .titlebar:not(headerbar).selection-mode button {
-    padding: 0px; }
+    padding: 4px; }
     headerbar.selection-mode combobox.text-button, headerbar.selection-mode button.text-button,
     .titlebar:not(headerbar).selection-mode combobox.text-button,
     .titlebar:not(headerbar).selection-mode button.text-button {
-      padding: 0px; }
+      padding: 4px; }
     headerbar.selection-mode combobox.image-button, headerbar.selection-mode button.image-button,
     .titlebar:not(headerbar).selection-mode combobox.image-button,
     .titlebar:not(headerbar).selection-mode button.image-button {
-      padding: 0px; }
+      padding: 4px; }
   headerbar.selection-mode separator, headerbar.selection-mode separator:disabled,
   .titlebar:not(headerbar).selection-mode separator,
   .titlebar:not(headerbar).selection-mode separator:disabled {
@@ -2422,7 +2422,7 @@ calendar {
   outline-offset: -1px;
   color: #32302f; }
   calendar:selected {
-    border-radius: 4px; }
+    border-radius: 3px; }
   calendar.header {
     border-bottom: 1px solid rgba(20, 19, 19, 0.1);
     border-radius: 0; }
@@ -2456,32 +2456,32 @@ colorswatch:drop(active), colorswatch {
   border-style: none; }
 
 colorswatch.top {
-  border-top-left-radius: 4.5px;
-  border-top-right-radius: 4.5px; }
+  border-top-left-radius: 3.5px;
+  border-top-right-radius: 3.5px; }
   colorswatch.top overlay {
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px; }
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px; }
 
 colorswatch.bottom {
-  border-bottom-left-radius: 4.5px;
-  border-bottom-right-radius: 4.5px; }
+  border-bottom-left-radius: 3.5px;
+  border-bottom-right-radius: 3.5px; }
   colorswatch.bottom overlay {
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px; }
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px; }
 
 colorswatch.left, colorswatch:first-child:not(.top) {
-  border-top-left-radius: 4.5px;
-  border-bottom-left-radius: 4.5px; }
+  border-top-left-radius: 3.5px;
+  border-bottom-left-radius: 3.5px; }
   colorswatch.left overlay, colorswatch:first-child:not(.top) overlay {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px; }
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px; }
 
 colorswatch.right, colorswatch:last-child:not(.bottom) {
-  border-top-right-radius: 4.5px;
-  border-bottom-right-radius: 4.5px; }
+  border-top-right-radius: 3.5px;
+  border-bottom-right-radius: 3.5px; }
   colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px; }
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px; }
 
 colorswatch.dark overlay {
   color: #ebdbb2; }
@@ -2524,9 +2524,9 @@ row:selected colorswatch {
   box-shadow: 0 0 0 2px #ebdbb2; }
 
 colorswatch#add-color-button {
-  border-radius: 4px 4px 0 0; }
+  border-radius: 3px 3px 0 0; }
   colorswatch#add-color-button:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
   colorswatch#add-color-button overlay {
     background-color: #e7d3a2;
     color: #32302f; }
@@ -2536,14 +2536,14 @@ colorswatch#add-color-button {
       background-color: #e7d3a2; }
 
 colorswatch#editor-color-sample {
-  border-radius: 4px; }
+  border-radius: 3px; }
   colorswatch#editor-color-sample overlay {
-    border-radius: 4.5px; }
+    border-radius: 3.5px; }
 
 button.color {
-  padding: 0px; }
+  padding: 4px; }
   button.color colorswatch:only-child, button.color colorswatch:only-child overlay {
-    border-radius: 4px; }
+    border-radius: 3px; }
   button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child {
     box-shadow: none; }
 
@@ -2574,7 +2574,7 @@ list {
     background-color: #ebdbb2;
     border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); }
   list row {
-    padding: 0px; }
+    padding: 4px; }
 
 row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
@@ -2596,8 +2596,8 @@ row {
     background-color: #83a598; }
 
 flowbox flowboxchild {
-  padding: 0px;
-  border-radius: 4px; }
+  padding: 4px;
+  border-radius: 3px; }
   flowbox flowboxchild:selected {
     outline-offset: -2px; }
 
@@ -3051,7 +3051,7 @@ infobar {
   border-left-width: 0; }
   .linked:not(.vertical) > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-right-width: 0;
     border-bottom-right-radius: 0;
     border-top-right-radius: 0; }
@@ -3060,7 +3060,7 @@ infobar {
       border-right-width: 1px; }
   .linked:not(.vertical) > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-width: 0;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0; }
@@ -3070,7 +3070,7 @@ infobar {
   .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child {
     border-width: 1px; }
   .linked:not(.vertical) > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 .linked.vertical > entry {
   border-width: 1px;
@@ -3079,7 +3079,7 @@ infobar {
   border-bottom-width: 0; }
   .linked.vertical > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 1px;
     border-bottom-width: 0;
     border-bottom-left-radius: 0;
@@ -3089,7 +3089,7 @@ infobar {
       border-bottom-width: 1px; }
   .linked.vertical > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 0;
     border-bottom-width: 1px;
     border-top-left-radius: 0;
@@ -3100,13 +3100,13 @@ infobar {
   .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child {
     border-width: 1px; }
   .linked.vertical > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 entry, menuitem entry, popover.background entry, .osd entry,
 #XfceNotifyWindow entry, #login_window entry {
   border-width: 1px;
   border-style: solid;
-  border-radius: 4px;
+  border-radius: 3px;
   transition: border 100ms ease-out;
   box-shadow: inset 1px 0 rgba(10, 10, 9, 0.1), inset 0 1px rgba(10, 10, 9, 0.12), inset -1px 0 rgba(10, 10, 9, 0.1), inset 0 -1px rgba(10, 10, 9, 0.05); }
   entry:focus, popover.background entry:focus,
@@ -3126,12 +3126,12 @@ entry, menuitem entry, popover.background entry, .osd entry,
     background-color: #83a598;
     background-image: none;
     border-width: 0;
-    border-radius: 4px;
+    border-radius: 3px;
     color: #ebdbb2; }
   entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left {
-    padding-right: 0px; }
+    padding-right: 4px; }
   entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right {
-    padding-left: 0px; }
+    padding-left: 4px; }
   entry.warning, popover.background entry.warning,
   #XfceNotifyWindow entry.warning, #login_window entry.warning {
     color: #32302f;
@@ -3193,7 +3193,7 @@ menubar, .menubar {
   color: #d5c4a1; }
   menubar > menuitem, .menubar > menuitem {
     min-height: 16px;
-    padding: 0px 0px;
+    padding: 6px 10px;
     border: 1px solid transparent;
     background-color: transparent;
     background-image: none;
@@ -3214,7 +3214,7 @@ menu,
 .context-menu {
   border: 0;
   border-radius: 0;
-  padding: 0px;
+  padding: 4px;
   background-color: #282828;
   color: #d5c4a1; }
   .csd menu, .csd
@@ -3234,7 +3234,7 @@ menu,
   .csd
   .context-menu separator {
     background-color: #242424;
-    margin: -2px 0; }
+    margin: 2px 0; }
   menu .separator,
   .csd menu .separator,
   .menu .separator,
@@ -3249,7 +3249,7 @@ menu,
   .context-menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 0px;
+    padding: 4px;
     border-radius: 0; }
     menu menuitem:active, menu menuitem:hover,
     .menu menuitem:active,
@@ -3371,7 +3371,7 @@ menu,
   .context-menu > arrow {
     min-height: 16px;
     min-width: 16px;
-    padding: 0px;
+    padding: 4px;
     background-color: #282828;
     border-radius: 0; }
     menu > arrow.top,
@@ -3429,7 +3429,7 @@ menuitem entry {
   background-color: #282828;
   background-image: none;
   border-color: shade(mix(#282828,#d5c4a1,0.2),0.8);
-  padding: 0px;
+  padding: 4px;
   color: #d5c4a1;
   caret-color: #282828;
   -gtk-secondary-caret-color: #282828; }
@@ -3464,8 +3464,8 @@ menuitem entry {
  ! Popover
 **********/
 popover.background {
-  padding: -3px;
-  border-radius: 4px;
+  padding: 1px;
+  border-radius: 3px;
   background-clip: border-box;
   background-color: #282828;
   background-image: none;
@@ -3509,12 +3509,12 @@ popover.background {
       color: #ebdbb2; }
   popover.background .frame {
     border-color: #202020;
-    border-radius: 4px; }
+    border-radius: 3px; }
   popover.background entry {
     background-color: #ebdbb2;
     background-image: none;
     border-color: shade(mix(#ebdbb2,#32302f,0.2),0.8);
-    padding: 0px;
+    padding: 4px;
     color: #32302f;
     caret-color: #282828;
     -gtk-secondary-caret-color: #282828; }
@@ -3668,7 +3668,7 @@ popover.background {
 
 modelbutton.flat,
 menuitem.button.flat {
-  padding: 0px 2px;
+  padding: 4px 6px;
   outline-color: transparent;
   transition: none; }
   modelbutton.flat:hover,
@@ -3711,7 +3711,7 @@ tooltip.background.csd {
   background-color: #32302f;
   background-clip: padding-box;
   border: 1px solid #282626;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #ebdbb2; }
 
 .tooltip *,
@@ -3725,11 +3725,11 @@ tooltip * {
 messagedialog, .message-dialog, .prompt {
   -GtkDialog-content-area-border: 0;
   -GtkDialog-action-area-border: 0;
-  -GtkDialog-button-spacing: 0px;
+  -GtkDialog-button-spacing: 4px;
   margin: 0;
   padding: 0; }
   messagedialog .dialog-action-box, .message-dialog .dialog-action-box, .prompt .dialog-action-box {
-    margin: 0px; }
+    margin: 8px; }
 
 printdialog paper {
   color: #32302f;
@@ -3741,7 +3741,7 @@ printdialog paper {
     border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); }
 
 printdialog .dialog-action-box {
-  margin: 0px; }
+  margin: 8px; }
 
 /*********************
  ! App notifications *
@@ -3750,8 +3750,8 @@ frame.app-notification {
   border-style: solid;
   border-color: rgba(32, 32, 32, 0.8);
   border-width: 0 1px 1px;
-  border-radius: 0 0 4px 4px;
-  padding: 0px;
+  border-radius: 0 0 3px 3px;
+  padding: 8px;
   background-color: rgba(40, 40, 40, 0.8);
   background-image: none;
   color: #d5c4a1; }
@@ -3889,7 +3889,7 @@ expander arrow {
   background-color: #ebdbb2;
   background-image: none;
   border: 1px solid #dabc70;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #32302f; }
   .floating-bar.top {
     border-top-width: 0;
@@ -3916,7 +3916,7 @@ expander arrow {
  ! Touch text selections *
 **************************/
 GtkBubbleWindow {
-  border-radius: 4px;
+  border-radius: 3px;
   background-clip: border-box; }
   GtkBubbleWindow.osd.background {
     background-color: rgba(40, 40, 40, 0.8); }
@@ -3927,7 +3927,7 @@ GtkBubbleWindow {
  ! Font-viewer *
 ****************/
 SushiFontWidget {
-  padding: 0px 0px; }
+  padding: 4px 8px; }
 
 /*************
  ! Gucharmap *
@@ -3949,8 +3949,8 @@ EPreviewPane .entry {
 entry.entry.pin-entry {
   font-style: normal;
   font-size: 50px;
-  padding-left: 0px;
-  padding-right: 0px; }
+  padding-left: 20px;
+  padding-right: 20px; }
 
 label.pin-label {
   font-style: normal;
@@ -3963,14 +3963,14 @@ label.pin-label {
   min-width: 20px;
   min-height: 24px;
   margin-top: 2px;
-  padding-bottom: 0px;
-  padding-left: 0px;
-  padding-right: 0px;
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
   color: #32302f;
   background-color: #ebdbb2;
   border: 1px solid;
   border-color: mix(#ebdbb2,#32302f,0.1);
-  border-radius: 4px;
+  border-radius: 3px;
   box-shadow: inset 0 -3px mix(mix(#ebdbb2,#32302f,0.1),#ebdbb2,0.6);
   font-size: smaller; }
   .keycap:backdrop {
@@ -4072,7 +4072,7 @@ notebook {
   notebook > stack:not(:only-child) {
     background-color: #ebdbb2; }
   notebook > header {
-    padding: 0px;
+    padding: 4px;
     background-color: #ebdbb2; }
     notebook > header.top {
       box-shadow: inset 0 -1px mix(#ebdbb2,#32302f,0.1); }
@@ -4111,7 +4111,7 @@ notebook {
       background-image: none;
       border-color: mix(mix(#ebdbb2,#32302f,0.1),mix(#32302f,#ebdbb2,0.5),0.15);
       color: rgba(50, 48, 47, 0.8);
-      padding: 0px 8px;
+      padding: 4px 12px;
       min-width: 20px;
       min-height: 20px;
       outline-offset: -4px;
@@ -4147,90 +4147,90 @@ notebook {
       padding-bottom: 0; }
       notebook > header.top > tabs > tab {
         border-bottom: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-top: 4px; }
+        margin-top: 3px; }
         notebook > header.top > tabs > tab + tab {
           margin-left: -1px; }
         notebook > header.top > tabs > tab:first-child {
-          border-radius: 4px 0 0;
-          -gtk-outline-radius: 4px 0 0; }
+          border-radius: 3px 0 0;
+          -gtk-outline-radius: 3px 0 0; }
         notebook > header.top > tabs > tab:last-child {
-          border-radius: 0 4px 0 0;
-          -gtk-outline-radius: 0 4px 0 0; }
+          border-radius: 0 3px 0 0;
+          -gtk-outline-radius: 0 3px 0 0; }
         notebook > header.top > tabs > tab:checked {
           border-top-width: 3px;
           border-top-color: #83a598;
           margin-top: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 4px 4px 0 0; }
+          -gtk-outline-radius: 3px;
+          border-radius: 3px 3px 0 0; }
     notebook > header.bottom {
       padding-top: 0; }
       notebook > header.bottom > tabs > tab {
         border-top: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-bottom: 4px; }
+        margin-bottom: 3px; }
         notebook > header.bottom > tabs > tab + tab {
           margin-left: -1px; }
         notebook > header.bottom > tabs > tab:first-child {
-          border-radius: 0 0 0 4px;
-          -gtk-outline-radius: 0 0 0 4px; }
+          border-radius: 0 0 0 3px;
+          -gtk-outline-radius: 0 0 0 3px; }
         notebook > header.bottom > tabs > tab:last-child {
-          border-radius: 0 0 4px;
-          -gtk-outline-radius: 0 0 4px; }
+          border-radius: 0 0 3px;
+          -gtk-outline-radius: 0 0 3px; }
         notebook > header.bottom > tabs > tab:checked {
           border-bottom-width: 3px;
           border-bottom-color: #83a598;
           margin-bottom: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 0 0 4px 4px; }
+          -gtk-outline-radius: 3px;
+          border-radius: 0 0 3px 3px; }
     notebook > header.right {
       padding-left: 0; }
       notebook > header.right > tabs > tab {
         border-left: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-right: 4px; }
+        margin-right: 3px; }
         notebook > header.right > tabs > tab + tab {
           margin-top: -1px; }
         notebook > header.right > tabs > tab:first-child {
-          border-radius: 0 4px 0 0;
-          -gtk-outline-radius: 0 4px 0 0; }
+          border-radius: 0 3px 0 0;
+          -gtk-outline-radius: 0 3px 0 0; }
         notebook > header.right > tabs > tab:last-child {
-          border-radius: 0 0 4px;
-          -gtk-outline-radius: 0 0 4px; }
+          border-radius: 0 0 3px;
+          -gtk-outline-radius: 0 0 3px; }
         notebook > header.right > tabs > tab:checked {
           border-right-width: 3px;
           border-right-color: #83a598;
           margin-right: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 0 4px 4px 0; }
+          -gtk-outline-radius: 3px;
+          border-radius: 0 3px 3px 0; }
     notebook > header.left {
       padding-right: 0; }
       notebook > header.left > tabs > tab {
         border-right: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-left: 4px; }
+        margin-left: 3px; }
         notebook > header.left > tabs > tab + tab {
           margin-top: -1px; }
         notebook > header.left > tabs > tab:first-child {
-          border-radius: 4px 0 0;
-          -gtk-outline-radius: 4px 0 0; }
+          border-radius: 3px 0 0;
+          -gtk-outline-radius: 3px 0 0; }
         notebook > header.left > tabs > tab:last-child {
-          border-radius: 0 0 0 4px;
-          -gtk-outline-radius: 0 0 0 4px; }
+          border-radius: 0 0 0 3px;
+          -gtk-outline-radius: 0 0 0 3px; }
         notebook > header.left > tabs > tab:checked {
           border-left-width: 3px;
           border-left-color: #83a598;
           margin-left: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 4px 0 0 4px; }
+          -gtk-outline-radius: 3px;
+          border-radius: 3px 0 0 3px; }
 
 /*********
  ! Buttons
@@ -4245,7 +4245,7 @@ overlay.osd {
   background-color: transparent; }
 
 colorchooser .popover.osd {
-  border-radius: 4px; }
+  border-radius: 3px; }
 
 button.color .osd colorswatch:only-child {
   box-shadow: none; }
@@ -4535,9 +4535,9 @@ button.osd,
 
 toolbar.osd {
   -GtkToolbar-button-relief: normal;
-  padding: 0px;
+  padding: 4px;
   border: 1px solid rgba(32, 32, 32, 0.8);
-  border-radius: 4px;
+  border-radius: 3px;
   background-color: rgba(40, 40, 40, 0.8);
   background-image: none;
   color: #d5c4a1; }
@@ -4857,7 +4857,7 @@ progressbar.osd {
     background-color: #282828;
     background-image: none;
     border-color: shade(mix(#282828,#d5c4a1,0.2),0.8);
-    padding: 0px;
+    padding: 4px;
     color: #d5c4a1;
     caret-color: #282828;
     -gtk-secondary-caret-color: #282828; }
@@ -5017,7 +5017,7 @@ progressbar.osd {
   #XfceNotifyWindow iconview.cell:selected:focus {
     background-color: transparent;
     border: 3px solid mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.21);
-    border-radius: 4px;
+    border-radius: 3px;
     outline-color: transparent; }
   .osd .page-thumbnail,
   #XfceNotifyWindow .page-thumbnail {
@@ -5379,10 +5379,10 @@ progressbar.osd {
           border-style: none solid none none; }
       .osd spinbutton:not(.vertical) button:dir(rtl):first-child,
       #XfceNotifyWindow spinbutton:not(.vertical) button:dir(rtl):first-child {
-        border-radius: 4px 0 0 4px; }
+        border-radius: 3px 0 0 3px; }
       .osd spinbutton:not(.vertical) button:dir(ltr):last-child,
       #XfceNotifyWindow spinbutton:not(.vertical) button:dir(ltr):last-child {
-        border-radius: 0 4px 4px 0; }
+        border-radius: 0 3px 3px 0; }
   .osd spinbutton.vertical button:first-child,
   #XfceNotifyWindow spinbutton.vertical button:first-child {
     background-color: rgba(40, 40, 40, 0.8);
@@ -5800,7 +5800,7 @@ scrolledwindow junction {
 ******************/
 progressbar {
   padding: 0;
-  border-radius: 4px;
+  border-radius: 3px;
   font-size: smaller;
   color: rgba(50, 48, 47, 0.6); }
   progressbar.horizontal trough,
@@ -5813,23 +5813,23 @@ progressbar {
     border: 1px solid mix(#ebdbb2,#32302f,0.17);
     background-color: #f2e7cc;
     background-image: none;
-    border-radius: 4px; }
+    border-radius: 3px; }
   progressbar progress {
     background-color: #83a598;
     background-image: none;
     border-radius: 0; }
     progressbar progress.left {
-      border-top-left-radius: 4px;
-      border-bottom-left-radius: 4px; }
+      border-top-left-radius: 3px;
+      border-bottom-left-radius: 3px; }
     progressbar progress.right {
-      border-top-right-radius: 4px;
-      border-bottom-right-radius: 4px; }
+      border-top-right-radius: 3px;
+      border-bottom-right-radius: 3px; }
     progressbar progress.bottom {
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px; }
+      border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px; }
     progressbar progress.top {
-      border-top-left-radius: 4px;
-      border-top-right-radius: 4px; }
+      border-top-left-radius: 3px;
+      border-top-right-radius: 3px; }
 
 levelbar.horizontal block {
   min-width: 34px;
@@ -5845,7 +5845,7 @@ levelbar:backdrop {
 levelbar trough {
   background-color: #f2e7cc;
   border: 1px solid mix(#ebdbb2,#32302f,0.17);
-  border-radius: 4px;
+  border-radius: 3px;
   padding: 2px; }
 
 levelbar.horizontal.discrete block {
@@ -5861,7 +5861,7 @@ levelbar.vertical.discrete block {
 levelbar block {
   background-color: #83a598;
   border-color: transparent;
-  border-radius: 4px; }
+  border-radius: 3px; }
   levelbar block.low {
     background-color: #ff7f42;
     border-color: transparent; }
@@ -5879,7 +5879,7 @@ levelbar block {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 0px; }
+  padding: 4px; }
   scale.horizontal trough {
     padding: 0 3px; }
   scale.horizontal highlight, scale.horizontal fill {
@@ -6064,7 +6064,7 @@ scrollbar {
     min-width: 7px;
     min-height: 7px;
     border: 1px solid transparent;
-    border-radius: 4px;
+    border-radius: 3px;
     background-clip: padding-box;
     background-color: mix(#ebdbb2,#32302f,0.5); }
     scrollbar slider:hover {
@@ -6158,10 +6158,10 @@ scrollbar {
     border-style: none; }
 
 stacksidebar row {
-  padding: 0px 0px; }
+  padding: 8px 4px; }
   stacksidebar row > label {
-    padding-left: 0px;
-    padding-right: 0px; }
+    padding-left: 4px;
+    padding-right: 4px; }
   stacksidebar row.needs-attention > label {
     background-size: 6px 6px, 0 0; }
 
@@ -6172,7 +6172,7 @@ placessidebar row {
   min-height: 32px;
   padding: 0; }
   placessidebar row > revealer {
-    padding: 0 0px; }
+    padding: 0 8px; }
   placessidebar row:selected {
     color: #ebdbb2; }
   placessidebar row:disabled {
@@ -6186,11 +6186,11 @@ placessidebar row {
   placessidebar row image.sidebar-icon {
     opacity: 0.7; }
     placessidebar row image.sidebar-icon:dir(ltr) {
-      padding-right: 2px;
-      padding-left: 0px; }
+      padding-right: 10px;
+      padding-left: 4px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
-      padding-left: 2px;
-      padding-right: 0px; }
+      padding-left: 10px;
+      padding-right: 4px; }
   placessidebar row label.sidebar-label:dir(ltr) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {
@@ -6296,7 +6296,7 @@ radio {
   -gtk-icon-source: url("../assets/radio-unchecked-dark.svg");
   min-width: 16px;
   min-height: 16px;
-  margin-right: 0px; }
+  margin-right: 4px; }
   radio:disabled {
     -gtk-icon-source: url("../assets/radio-unchecked-insensitive-dark.svg"); }
   radio:checked, radio:active {
@@ -6329,7 +6329,7 @@ check {
   -gtk-icon-source: url("../assets/checkbox-unchecked-dark.svg");
   min-width: 16px;
   min-height: 16px;
-  margin-right: 0px; }
+  margin-right: 4px; }
   check:disabled {
     -gtk-icon-source: url("../assets/checkbox-unchecked-insensitive-dark.svg"); }
   check:checked, check:active {
@@ -6359,7 +6359,7 @@ check {
 
 radio:dir(rtl), check:dir(rtl) {
   margin-right: 0;
-  margin-left: 0px; }
+  margin-left: 4px; }
 
 .view.content-view.check:not(list), iconview.content-view.check:not(list) {
   -gtk-icon-shadow: none;
@@ -6405,8 +6405,8 @@ radio:dir(rtl), check:dir(rtl) {
  ! Switch
 *********/
 switch {
-  border-radius: 4px;
-  padding: -1px;
+  border-radius: 3px;
+  padding: 3px;
   border: 0;
   outline: none;
   transition: background-color .3s linear;
@@ -6419,7 +6419,7 @@ switch {
     background-color: mix(#32302f,#ebdbb2,0.5);
     transition: all .3s ease-in;
     box-shadow: 0 1px 2px 0 rgba(10, 10, 9, 0.07), 1px 0 2px 0 rgba(10, 10, 9, 0.07);
-    border-radius: 4px; }
+    border-radius: 3px; }
   switch:checked {
     background-color: #83a598;
     background-image: none;
@@ -6480,7 +6480,7 @@ textview text {
   .view text:selected,
   iconview text:selected,
   textview text:selected {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 textview border {
   background-color: mix(#ebdbb2,#ebdbb2,0.5); }
@@ -6507,7 +6507,7 @@ treeview entry.flat, treeview entry {
     border-color: #83a598; }
 
 treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
-  padding: -2px 1px;
+  padding: 2px 5px;
   border-radius: 0;
   background-image: none;
   text-shadow: none;
@@ -6580,7 +6580,7 @@ treeview.view {
     treeview.view.expander:backdrop {
       color: mix(#ebdbb2,mix(#32302f,#ebdbb2,0.5),0.7); }
   treeview.view.progressbar {
-    border-radius: 4px;
+    border-radius: 3px;
     border: 1px solid #527065;
     background-color: #83a598; }
     treeview.view.progressbar:selected {
@@ -6589,7 +6589,7 @@ treeview.view {
         box-shadow: inset 0 1px rgba(236, 220, 180, 0.05);
         background-color: #83a598;
         background-image: none;
-        border-radius: 4px; }
+        border-radius: 3px; }
         treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop {
           border-color: #ebdbb2;
           background-color: mix(#ebdbb2,#83a598,0.9); }
@@ -6603,10 +6603,10 @@ treeview.view {
       box-shadow: none; }
   treeview.view.trough {
     background-color: rgba(50, 48, 47, 0.1);
-    border-radius: 4px; }
+    border-radius: 3px; }
     treeview.view.trough:selected:focus, treeview.view.trough:selected {
       background-color: #83a598;
-      border-radius: 4px; }
+      border-radius: 3px; }
   treeview.view header button {
     color: mix(#32302f,#ebdbb2,0.5);
     background-color: #ebdbb2;
@@ -6689,7 +6689,7 @@ placesview > actionbar > revealer > box > label {
  ! Window frame
 ***************/
 decoration {
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   box-shadow: 0 3px 9px 1px rgba(20, 19, 19, 0.7), 0 0 0 1px #282828;
   /* this is used for the resize cursor area */
   border-width: 0px;
@@ -6712,10 +6712,10 @@ decoration {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(20, 19, 19, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); }
   tooltip.csd decoration {
-    border-radius: 4px;
+    border-radius: 3px;
     box-shadow: none; }
   messagedialog.csd decoration {
-    border-radius: 4px;
+    border-radius: 3px;
     box-shadow: 0 1px 2px rgba(20, 19, 19, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); }
 
 /***********************
@@ -6883,7 +6883,7 @@ workbench.csd > stack.titlebar:not(headerbar) {
   border: 0;
   box-shadow: none; }
   workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
-    border-radius: 4px 4px 0 0; }
+    border-radius: 3px 3px 0 0; }
 
 /****************
  ! Geary *
@@ -6908,25 +6908,25 @@ workbench.csd > stack.titlebar:not(headerbar) {
   background-image: none;
   background-color: rgba(20, 19, 19, 0.3);
   border-color: rgba(236, 220, 180, 0.9);
-  border-radius: 9px;
-  padding: 0px;
+  border-radius: 7px;
+  padding: 4px;
   color: #ecdcb4; }
 
 .lightdm.menu {
   background-image: none;
   background-color: rgba(20, 19, 19, 0.6);
   border-color: rgba(236, 220, 180, 0.2);
-  border-radius: 8px;
+  border-radius: 6px;
   padding: 1px;
   color: #ecdcb4; }
   .lightdm.menu .menuitem *, .lightdm.menu .menuitem.check:active, .lightdm.menu .menuitem.radio:active {
     color: #ecdcb4; }
 
 .lightdm.menubar *, .lightdm.menubar.menuitem {
-  padding: -3px; }
+  padding: 1px; }
 
 .lightdm.option-button {
-  padding: 0px;
+  padding: 4px;
   background: none;
   border: 0; }
 
@@ -6949,8 +6949,8 @@ workbench.csd > stack.titlebar:not(headerbar) {
   background-image: none;
   background-color: rgba(20, 19, 19, 0.3);
   border-color: rgba(236, 220, 180, 0.6);
-  border-radius: 9px;
-  padding: 2px;
+  border-radius: 7px;
+  padding: 6px;
   color: #ecdcb4;
   text-shadow: none; }
 
@@ -6991,10 +6991,10 @@ GeditWindow .pane-separator {
   background-color: #ebdbb2;
   color: mix(#32302f,#ebdbb2,0.1); }
   .gedit-document-panel list row {
-    padding: 0px; }
+    padding: 4px; }
     .gedit-document-panel list row button {
       padding: 1px;
-      border-radius: 4px;
+      border-radius: 3px;
       border-style: solid;
       border-color: transparent;
       border-width: 1px;
@@ -7045,8 +7045,8 @@ statusbar GeditSmallButton, GeditStatusMenuButton {
       color: #32302f; }
 
 GeditViewFrame .gedit-search-slider {
-  padding: 0px;
-  border-radius: 0 0 4px 4px;
+  padding: 4px;
+  border-radius: 0 0 3px 3px;
   border-width: 0 1px 1px;
   border-style: solid;
   border-color: #dabc70;
@@ -7057,14 +7057,14 @@ GeditViewFrame .gedit-search-slider {
     color: #32302f; }
 
 GeditFileBrowserWidget .toolbar {
-  padding: 0px;
+  padding: 2px;
   border-top: 0;
   background-color: #ebdbb2;
   background-image: none; }
 
 .gedit-search-entry-occurrences-tag {
-  margin: 0px;
-  padding: 0px;
+  margin: 2px;
+  padding: 2px;
   color: mix(#32302f,#ebdbb2,0.5); }
 
 .gedit-bottom-panel-paned,
@@ -7107,8 +7107,8 @@ paned.titlebar {
 .nautilus-window .searchbar-container {
   margin-top: -1px; }
   .nautilus-window .searchbar-container searchbar {
-    padding-top: -3px;
-    padding-bottom: -2px;
+    padding-top: 1px;
+    padding-bottom: 2px;
     border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); }
 
 .disk-space-display {
@@ -7278,18 +7278,18 @@ paned.titlebar {
       border-color: currentColor;
       -GtkWidget-window-dragging: true; }
     .nemo-window toolbar.primary-toolbar button.image-button {
-      padding: 0 5px; }
+      padding: 0 9px; }
     .nemo-window toolbar combobox, .nemo-window toolbar button {
-      padding: 0px; }
+      padding: 4px; }
       .nemo-window toolbar combobox.text-button, .nemo-window toolbar button.text-button {
-        padding: 0px; }
+        padding: 4px; }
       .nemo-window toolbar combobox.image-button, .nemo-window toolbar button.image-button {
-        padding: 0px; }
+        padding: 4px; }
     .nemo-window toolbar toolitem stack {
       margin-left: 15px; }
       .nemo-window toolbar toolitem stack widget button {
         box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12);
-        -NemoPathbarButton-border-radius: 4px; }
+        -NemoPathbarButton-border-radius: 3px; }
         .nemo-window toolbar toolitem stack widget button:focus, .nemo-window toolbar toolitem stack widget button:hover {
           box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); }
         .nemo-window toolbar toolitem stack widget button:active, .nemo-window toolbar toolitem stack widget button:active:hover, .nemo-window toolbar toolitem stack widget button:active:focus, .nemo-window toolbar toolitem stack widget button:active:hover:focus, .nemo-window toolbar toolitem stack widget button:checked, .nemo-window toolbar toolitem stack widget button:checked:hover, .nemo-window toolbar toolitem stack widget button:checked:focus, .nemo-window toolbar toolitem stack widget button:checked:hover:focus {
@@ -7309,7 +7309,7 @@ paned.titlebar {
   .nemo-window grid > widget:last-child button {
     min-height: 16px;
     min-width: 16px;
-    padding: -1px -2px; }
+    padding: 3px 6px; }
   .nemo-window grid > widget:last-child button:first-child {
     margin-left: 20px; }
   .nemo-window grid > widget:last-child button:first-child + button {
@@ -7325,8 +7325,8 @@ paned.titlebar {
     .nemo-window .sidebar .frame {
       border: 0; }
     .nemo-window .sidebar image {
-      padding-left: 0px;
-      padding-right: 0px; }
+      padding-left: 4px;
+      padding-right: 4px; }
     .nemo-window .sidebar .nemo-places-sidebar, .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview {
       background-color: mix(#ebdbb2,#ebdbb2,0.5); }
     .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview {
@@ -7342,8 +7342,8 @@ paned.titlebar {
     .nemo-window .sidebar + separator + box .primary-toolbar {
       background-color: #e9d8ab;
       background-image: none;
-      padding-top: -3px;
-      padding-bottom: -3px;
+      padding-top: 1px;
+      padding-bottom: 1px;
       border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); }
       .nemo-window .sidebar + separator + box .primary-toolbar button:nth-child(2) {
         border-right: 0;
@@ -7384,7 +7384,7 @@ paned.titlebar {
 GtkWindow > GtkVBox > .dock, GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar {
   background-color: #ebdbb2;
   background-image: none;
-  padding: 0px;
+  padding: 4px;
   border: 0;
   color: #32302f; }
 
@@ -7431,8 +7431,8 @@ UnityDecoration {
   UnityDecoration .top {
     border: 1px solid #282828;
     border-bottom: 0;
-    border-radius: 4px 4px 0 0;
-    padding: 1px 3px 0;
+    border-radius: 3px 3px 0 0;
+    padding: 1px 7px 0;
     background-color: #282828;
     color: mix(#d5c4a1,#282828,0.1);
     text-shadow: none; }
@@ -7484,7 +7484,7 @@ SheetStyleDialog.unity-force-quit {
   text-shadow: 0 1px rgba(20, 19, 19, 0.5);
   -gtk-icon-shadow: 0 1px rgba(20, 19, 19, 0.5); }
   #panel_window menubar {
-    padding-left: 0px; }
+    padding-left: 4px; }
     #panel_window menubar, #panel_window menubar > menuitem {
       background-color: transparent;
       background-image: none;
@@ -7504,11 +7504,11 @@ SheetStyleDialog.unity-force-quit {
       font-weight: normal; }
 
 #content_frame {
-  padding-bottom: 0px; }
+  padding-bottom: 12px; }
 
 #login_window, #shutdown_dialog, #restart_dialog {
   border-style: none;
-  border-radius: 4px;
+  border-radius: 3px;
   background-color: #282828;
   color: #d5c4a1;
   /* draw border using box-shadow */
@@ -7622,7 +7622,7 @@ SheetStyleDialog.unity-force-quit {
   background-color: #282828;
   background-image: none;
   border-color: shade(mix(#282828,#d5c4a1,0.2),0.8);
-  padding: 0px;
+  padding: 4px;
   color: #d5c4a1;
   caret-color: #282828;
   -gtk-secondary-caret-color: #282828; }
@@ -7662,22 +7662,22 @@ SheetStyleDialog.unity-force-quit {
     color: mix(#d5c4a1,#282828,0.5); }
 
 #user_image {
-  border-radius: 4px;
+  border-radius: 3px;
   /* draw border using box-shadow */
   box-shadow: inset 1px 0 #1c1c1c, inset -1px 0 #1c1c1c, inset 0 1px #1c1c1c, inset 0 -1px #1c1c1c; }
 
 #user_image_border {
-  border-radius: 4px;
+  border-radius: 3px;
   background-color: #242424;
   background-image: none;
   box-shadow: inset 1px 0 rgba(10, 10, 9, 0.07), inset 0 1px rgba(10, 10, 9, 0.08), inset -1px 0 rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); }
 
 #buttonbox_frame {
-  padding-top: 0px;
+  padding-top: 8px;
   padding-bottom: 0;
   border-style: none;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   background-color: transparent;
   background-image: none;
   box-shadow: none; }
diff --git a/.themes/oomox-gruvbox/gtk-3.20/dist/gtk.css b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk.css
index 129a0572..14cf6d5d 100644
--- a/.themes/oomox-gruvbox/gtk-3.20/dist/gtk.css
+++ b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk.css
@@ -105,7 +105,7 @@
   outline-style: dashed;
   outline-width: 1px;
   outline-offset: -1px;
-  -gtk-outline-radius: 4px; }
+  -gtk-outline-radius: 3px; }
 
 /*************
  ! Base states
@@ -179,7 +179,7 @@ assistant.csd .sidebar {
   border-top-style: none; }
 
 assistant .sidebar label {
-  padding: 0px 0px; }
+  padding: 4px 8px; }
 
 assistant .sidebar label.highlight {
   background-color: mix(#ebdbb2,#32302f,0.8); }
@@ -210,12 +210,12 @@ button, headerbar button, .titlebar:not(headerbar) button, toolbar button, toolb
 #XfceNotifyWindow button, .osd button, .osd spinbutton:not(.vertical) button,
 #XfceNotifyWindow spinbutton:not(.vertical) button, .osd spinbutton.vertical button:first-child,
 #XfceNotifyWindow spinbutton.vertical button:first-child, .nemo-window toolbar button, .nemo-window .sidebar + separator + box .primary-toolbar button.flat, #login_window button, #shutdown_button button, #restart_button button {
-  min-height: 14px;
-  min-width: 14px;
-  padding: 0px 2px;
+  min-height: 22px;
+  min-width: 22px;
+  padding: 4px 6px;
   border-width: 1px;
   border-style: solid;
-  border-radius: 4px;
+  border-radius: 3px;
   transition: 150ms ease;
   outline-color: transparent; }
 
@@ -262,7 +262,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   .linked > button:first-child, combobox box button:first-child, combobox box entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, headerbar .linked > button:first-child, .titlebar:not(headerbar) .linked > button:first-child, toolbar .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat,
   toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, popover.background .linked > button:first-child, .nemo-window toolbar toolitem stack widget button:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-style: solid;
     border-right-style: none;
     border-top-right-radius: 0;
@@ -276,7 +276,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   .linked > button:last-child, combobox box button:last-child, combobox box entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, headerbar .linked > button:last-child, .titlebar:not(headerbar) .linked > button:last-child, toolbar .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat,
   toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, popover.background .linked > button:last-child, .nemo-window toolbar toolitem stack widget button:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-style: none;
     border-right-style: solid;
     border-top-left-radius: 0;
@@ -295,7 +295,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   .inline-toolbar button:only-child,
   .linked > button:only-child, combobox box button:only-child, combobox box entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, headerbar .linked > button:only-child, .titlebar:not(headerbar) .linked > button:only-child, toolbar .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat,
   toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, popover.background .linked > button:only-child, .nemo-window toolbar toolitem stack widget button:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 .linked.vertical > button {
   border-width: 1px;
@@ -305,7 +305,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
   border-bottom-style: none; }
   .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-style: solid;
     border-bottom-style: none;
     border-bottom-left-radius: 0;
@@ -315,7 +315,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
       border-bottom-style: solid; }
   .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-style: none;
     border-bottom-style: solid;
     border-top-left-radius: 0;
@@ -327,7 +327,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat {
     border-width: 1px;
     border-style: solid; }
   .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 infobar.info button.close, infobar.warning button.close, infobar.question button.close, infobar.error button.close, notebook > header > tabs > arrow {
   border: 1px solid transparent;
@@ -549,7 +549,7 @@ spinbutton:not(.vertical) {
   background-image: none;
   /*@include border($base_color);*/
   padding: 0;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #ebdbb2;
   caret-color: #ebdbb2;
   /*&:focus, &:active { border-color: border_focus($borders_color); }*/ }
@@ -558,7 +558,7 @@ spinbutton:not(.vertical) {
     background-image: none;
     color: mix(#32302f,#ebdbb2,0.5); }
   spinbutton:not(.vertical) entry {
-    border-radius: 4px 0 0 4px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0;
     box-shadow: none; }
   spinbutton:not(.vertical) button {
@@ -589,14 +589,14 @@ spinbutton:not(.vertical) {
       spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
         border-style: none solid none none; }
     spinbutton:not(.vertical) button:dir(rtl):first-child {
-      border-radius: 4px 0 0 4px; }
+      border-radius: 3px 0 0 3px; }
     spinbutton:not(.vertical) button:dir(ltr):last-child {
-      border-radius: 0 4px 4px 0; }
+      border-radius: 0 3px 3px 0; }
 
 spinbutton.vertical button, spinbutton.vertical entry {
   min-width: 0;
-  padding-left: -2px;
-  padding-right: -2px; }
+  padding-left: 2px;
+  padding-right: 2px; }
 
 spinbutton.vertical entry {
   border-radius: 0;
@@ -605,19 +605,19 @@ spinbutton.vertical entry {
 
 spinbutton.vertical button.up {
   border-style: solid solid none;
-  border-radius: 4px 4px 0 0; }
+  border-radius: 3px 3px 0 0; }
 
 spinbutton.vertical button.down {
   border-style: none solid solid;
-  border-radius: 0 0 4px 4px; }
+  border-radius: 0 0 3px 3px; }
 
 /******************
 ! ComboBoxes *
 *******************/
 combobox button.combo {
   min-width: 0;
-  padding-left: 2px;
-  padding-right: 2px; }
+  padding-left: 6px;
+  padding-right: 6px; }
 
 combobox arrow {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
@@ -625,7 +625,7 @@ combobox arrow {
   min-width: 16px; }
 
 combobox box button, combobox box entry {
-  padding: 0px 2px; }
+  padding: 4px 6px; }
 
 /*********
  ! Entry *
@@ -637,7 +637,7 @@ combobox box button, combobox box entry {
   border-left-width: 0; }
   .linked:not(.vertical) > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-right-width: 0;
     border-bottom-right-radius: 0;
     border-top-right-radius: 0; }
@@ -646,7 +646,7 @@ combobox box button, combobox box entry {
       border-right-width: 1px; }
   .linked:not(.vertical) > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-width: 0;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0; }
@@ -656,7 +656,7 @@ combobox box button, combobox box entry {
   .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child {
     border-width: 1px; }
   .linked:not(.vertical) > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 .linked.vertical > entry {
   border-width: 1px;
@@ -665,7 +665,7 @@ combobox box button, combobox box entry {
   border-bottom-width: 0; }
   .linked.vertical > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 1px;
     border-bottom-width: 0;
     border-bottom-left-radius: 0;
@@ -675,7 +675,7 @@ combobox box button, combobox box entry {
       border-bottom-width: 1px; }
   .linked.vertical > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 0;
     border-bottom-width: 1px;
     border-top-left-radius: 0;
@@ -686,13 +686,13 @@ combobox box button, combobox box entry {
   .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child {
     border-width: 1px; }
   .linked.vertical > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 entry, menuitem entry, popover.background entry, .osd entry,
 #XfceNotifyWindow entry, #login_window entry {
   border-width: 1px;
   border-style: solid;
-  border-radius: 4px;
+  border-radius: 3px;
   transition: border 100ms ease-out;
   box-shadow: inset 1px 0 rgba(66, 52, 17, 0.1), inset 0 1px rgba(66, 52, 17, 0.12), inset -1px 0 rgba(66, 52, 17, 0.1), inset 0 -1px rgba(66, 52, 17, 0.05); }
   entry:focus, popover.background entry:focus,
@@ -712,12 +712,12 @@ entry, menuitem entry, popover.background entry, .osd entry,
     background-color: #83a598;
     background-image: none;
     border-width: 0;
-    border-radius: 4px;
+    border-radius: 3px;
     color: #ebdbb2; }
   entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left {
-    padding-right: 0px; }
+    padding-right: 4px; }
   entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right {
-    padding-left: 0px; }
+    padding-left: 4px; }
   entry.warning, popover.background entry.warning,
   #XfceNotifyWindow entry.warning, #login_window entry.warning {
     color: #32302f;
@@ -771,7 +771,7 @@ entry {
   background-color: #32302f;
   background-image: none;
   border-color: shade(mix(#32302f,#ebdbb2,0.2),0.8);
-  padding: 0px;
+  padding: 4px;
   color: #ebdbb2;
   caret-color: #282828;
   -gtk-secondary-caret-color: #282828; }
@@ -818,12 +818,12 @@ entry {
  ! Toolbar
 **********/
 toolbar {
-  padding: -1px;
+  padding: 3px;
   border-style: none; }
   toolbar.horizontal separator {
-    margin: 0 2px 1px; }
+    margin: 0 6px 1px; }
   toolbar.vertical separator {
-    margin: 2px 1px 2px 0; }
+    margin: 6px 1px 6px 0; }
 
 headerbar {
   border-width: 0 0 1px;
@@ -832,17 +832,17 @@ headerbar {
   headerbar spinbutton,
   headerbar separator,
   headerbar button {
-    margin-top: 3px;
-    margin-bottom: 3px; }
+    margin-top: 7px;
+    margin-bottom: 7px; }
   headerbar switch {
-    margin-top: 1px;
-    margin-bottom: 1px; }
+    margin-top: 5px;
+    margin-bottom: 5px; }
   window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar,
   window:not(.tiled):not(.maximized) headerbar:first-child:backdrop,
   window:not(.tiled):not(.maximized) headerbar:first-child {
-    border-top-left-radius: 4px; }
+    border-top-left-radius: 3px; }
   window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child {
-    border-top-right-radius: 4px; }
+    border-top-right-radius: 3px; }
 
 headerbar, .titlebar:not(headerbar) {
   background-color: #282828;
@@ -851,9 +851,9 @@ headerbar, .titlebar:not(headerbar) {
   color: #d5c4a1;
   background-color: #282828;
   background-image: none;
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   color: mix(#d5c4a1,#282828,0.1);
-  padding: 0 0px;
+  padding: 0 8px;
   min-height: 42px; }
   headerbar:focus, .titlebar:focus:not(headerbar), headerbar:hover, .titlebar:hover:not(headerbar) {
     border-color: mix(#83a598,#282828,0.3); }
@@ -869,10 +869,10 @@ headerbar, .titlebar:not(headerbar) {
     color: mix(#d5c4a1,#282828,0.5); }
   headerbar .title, .titlebar:not(headerbar) .title {
     font-weight: bold;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar .subtitle, .titlebar:not(headerbar) .subtitle {
     font-size: smaller;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar button, .titlebar:not(headerbar) button {
     background-color: #282828;
     background-image: none;
@@ -992,11 +992,11 @@ headerbar, .titlebar:not(headerbar) {
     headerbar .linked > button:active:only-child, .titlebar:not(headerbar) .linked > button:active:only-child, headerbar .linked > button:active:only-child:focus, .titlebar:not(headerbar) .linked > button:active:only-child:focus, headerbar .linked > button:active:only-child:hover, .titlebar:not(headerbar) .linked > button:active:only-child:hover, headerbar .linked > button:active:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:active:only-child:hover:focus, headerbar .linked > button:checked:only-child, .titlebar:not(headerbar) .linked > button:checked:only-child, headerbar .linked > button:checked:only-child:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:focus, headerbar .linked > button:checked:only-child:hover, .titlebar:not(headerbar) .linked > button:checked:only-child:hover, headerbar .linked > button:checked:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:hover:focus {
       box-shadow: inset 1px 0 rgba(66, 52, 17, 0.06), inset 0 1px rgba(66, 52, 17, 0.07), inset -1px 0 rgba(66, 52, 17, 0.06); }
   headerbar combobox, .titlebar:not(headerbar) combobox, headerbar button, .titlebar:not(headerbar) button {
-    padding: 0px; }
+    padding: 4px; }
     headerbar combobox.text-button, .titlebar:not(headerbar) combobox.text-button, headerbar button.text-button, .titlebar:not(headerbar) button.text-button {
-      padding: 0px; }
+      padding: 4px; }
     headerbar combobox.image-button, .titlebar:not(headerbar) combobox.image-button, headerbar button.image-button, .titlebar:not(headerbar) button.image-button {
-      padding: 0px; }
+      padding: 4px; }
   headerbar separator, .titlebar:not(headerbar) separator, headerbar separator:disabled, .titlebar:not(headerbar) separator:disabled {
     color: #181818;
     border-color: currentColor;
@@ -1024,7 +1024,7 @@ headerbar, .titlebar:not(headerbar) {
   headerbar .title, .titlebar:not(headerbar) .title {
     font-weight: bold; }
   headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
-    margin-left: 0px; }
+    margin-left: 4px; }
   headerbar button, .titlebar:not(headerbar) button {
     background-color: #32302f;
     background-image: none;
@@ -1127,7 +1127,7 @@ headerbar, .titlebar:not(headerbar) {
         color: rgba(50, 48, 47, 0.85); }
   headerbar button.titlebutton + separator.titlebutton, .titlebar:not(headerbar) button.titlebutton + separator.titlebutton {
     margin-left: 0;
-    margin-right: 0px; }
+    margin-right: 4px; }
   headerbar button.titlebutton, .titlebar:not(headerbar) button.titlebutton {
     border: 0;
     background-image: none;
@@ -1168,10 +1168,10 @@ toolbar {
     color: mix(#ebdbb2,#32302f,0.5); }
   toolbar .title {
     font-weight: bold;
-    padding: 0 0px; }
+    padding: 0 8px; }
   toolbar .subtitle {
     font-size: smaller;
-    padding: 0 0px; }
+    padding: 0 8px; }
   toolbar button {
     background-color: #32302f;
     background-image: none;
@@ -1291,11 +1291,11 @@ toolbar {
     toolbar .linked > button:active:only-child, toolbar .linked > button:active:only-child:focus, toolbar .linked > button:active:only-child:hover, toolbar .linked > button:active:only-child:hover:focus, toolbar .linked > button:checked:only-child, toolbar .linked > button:checked:only-child:focus, toolbar .linked > button:checked:only-child:hover, toolbar .linked > button:checked:only-child:hover:focus {
       box-shadow: inset 1px 0 rgba(66, 52, 17, 0.06), inset 0 1px rgba(66, 52, 17, 0.07), inset -1px 0 rgba(66, 52, 17, 0.06); }
   toolbar combobox, toolbar button {
-    padding: 0px; }
+    padding: 4px; }
     toolbar combobox.text-button, toolbar button.text-button {
-      padding: 0px; }
+      padding: 4px; }
     toolbar combobox.image-button, toolbar button.image-button {
-      padding: 0px; }
+      padding: 4px; }
   toolbar separator, toolbar separator:disabled {
     color: #1e1d1c;
     border-color: currentColor;
@@ -1424,8 +1424,8 @@ window.csd > .titlebar:not(headerbar) {
   background-color: #232323; }
 
 .background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
 .background:not(.csd):not(.ssd):not(.solid-csd) headerbar, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:not(:last-child), .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop:not(:last-child) {
   border-radius: 0;
@@ -1435,7 +1435,7 @@ window.csd > .titlebar:not(headerbar) {
  ! Action-bar *
 ***************/
 actionbar > revealer > box {
-  padding: 0px;
+  padding: 4px;
   border-top: 1px solid mix(#32302f,#ebdbb2,0.18); }
   actionbar > revealer > box:backdrop {
     border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); }
@@ -1750,11 +1750,11 @@ headerbar.selection-mode,
   headerbar.selection-mode .title,
   .titlebar:not(headerbar).selection-mode .title {
     font-weight: bold;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar.selection-mode .subtitle,
   .titlebar:not(headerbar).selection-mode .subtitle {
     font-size: smaller;
-    padding: 0 0px; }
+    padding: 0 8px; }
   headerbar.selection-mode button,
   .titlebar:not(headerbar).selection-mode button {
     background-color: #83a598;
@@ -2091,15 +2091,15 @@ headerbar.selection-mode,
   headerbar.selection-mode combobox, headerbar.selection-mode button,
   .titlebar:not(headerbar).selection-mode combobox,
   .titlebar:not(headerbar).selection-mode button {
-    padding: 0px; }
+    padding: 4px; }
     headerbar.selection-mode combobox.text-button, headerbar.selection-mode button.text-button,
     .titlebar:not(headerbar).selection-mode combobox.text-button,
     .titlebar:not(headerbar).selection-mode button.text-button {
-      padding: 0px; }
+      padding: 4px; }
     headerbar.selection-mode combobox.image-button, headerbar.selection-mode button.image-button,
     .titlebar:not(headerbar).selection-mode combobox.image-button,
     .titlebar:not(headerbar).selection-mode button.image-button {
-      padding: 0px; }
+      padding: 4px; }
   headerbar.selection-mode separator, headerbar.selection-mode separator:disabled,
   .titlebar:not(headerbar).selection-mode separator,
   .titlebar:not(headerbar).selection-mode separator:disabled {
@@ -2422,7 +2422,7 @@ calendar {
   outline-offset: -1px;
   color: #ebdbb2; }
   calendar:selected {
-    border-radius: 4px; }
+    border-radius: 3px; }
   calendar.header {
     border-bottom: 1px solid rgba(131, 104, 34, 0.1);
     border-radius: 0; }
@@ -2456,32 +2456,32 @@ colorswatch:drop(active), colorswatch {
   border-style: none; }
 
 colorswatch.top {
-  border-top-left-radius: 4.5px;
-  border-top-right-radius: 4.5px; }
+  border-top-left-radius: 3.5px;
+  border-top-right-radius: 3.5px; }
   colorswatch.top overlay {
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px; }
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px; }
 
 colorswatch.bottom {
-  border-bottom-left-radius: 4.5px;
-  border-bottom-right-radius: 4.5px; }
+  border-bottom-left-radius: 3.5px;
+  border-bottom-right-radius: 3.5px; }
   colorswatch.bottom overlay {
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px; }
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px; }
 
 colorswatch.left, colorswatch:first-child:not(.top) {
-  border-top-left-radius: 4.5px;
-  border-bottom-left-radius: 4.5px; }
+  border-top-left-radius: 3.5px;
+  border-bottom-left-radius: 3.5px; }
   colorswatch.left overlay, colorswatch:first-child:not(.top) overlay {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px; }
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px; }
 
 colorswatch.right, colorswatch:last-child:not(.bottom) {
-  border-top-right-radius: 4.5px;
-  border-bottom-right-radius: 4.5px; }
+  border-top-right-radius: 3.5px;
+  border-bottom-right-radius: 3.5px; }
   colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px; }
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px; }
 
 colorswatch.dark overlay {
   color: #ebdbb2; }
@@ -2524,9 +2524,9 @@ row:selected colorswatch {
   box-shadow: 0 0 0 2px #ebdbb2; }
 
 colorswatch#add-color-button {
-  border-radius: 4px 4px 0 0; }
+  border-radius: 3px 3px 0 0; }
   colorswatch#add-color-button:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
   colorswatch#add-color-button overlay {
     background-color: #302e2d;
     color: #ebdbb2; }
@@ -2536,14 +2536,14 @@ colorswatch#add-color-button {
       background-color: #302e2d; }
 
 colorswatch#editor-color-sample {
-  border-radius: 4px; }
+  border-radius: 3px; }
   colorswatch#editor-color-sample overlay {
-    border-radius: 4.5px; }
+    border-radius: 3.5px; }
 
 button.color {
-  padding: 0px; }
+  padding: 4px; }
   button.color colorswatch:only-child, button.color colorswatch:only-child overlay {
-    border-radius: 4px; }
+    border-radius: 3px; }
   button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child {
     box-shadow: none; }
 
@@ -2574,7 +2574,7 @@ list {
     background-color: #32302f;
     border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); }
   list row {
-    padding: 0px; }
+    padding: 4px; }
 
 row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
@@ -2596,8 +2596,8 @@ row {
     background-color: #83a598; }
 
 flowbox flowboxchild {
-  padding: 0px;
-  border-radius: 4px; }
+  padding: 4px;
+  border-radius: 3px; }
   flowbox flowboxchild:selected {
     outline-offset: -2px; }
 
@@ -3051,7 +3051,7 @@ infobar {
   border-left-width: 0; }
   .linked:not(.vertical) > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-right-width: 0;
     border-bottom-right-radius: 0;
     border-top-right-radius: 0; }
@@ -3060,7 +3060,7 @@ infobar {
       border-right-width: 1px; }
   .linked:not(.vertical) > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-left-width: 0;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0; }
@@ -3070,7 +3070,7 @@ infobar {
   .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child {
     border-width: 1px; }
   .linked:not(.vertical) > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 .linked.vertical > entry {
   border-width: 1px;
@@ -3079,7 +3079,7 @@ infobar {
   border-bottom-width: 0; }
   .linked.vertical > entry:first-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 1px;
     border-bottom-width: 0;
     border-bottom-left-radius: 0;
@@ -3089,7 +3089,7 @@ infobar {
       border-bottom-width: 1px; }
   .linked.vertical > entry:last-child {
     border-width: 1px;
-    border-radius: 4px;
+    border-radius: 3px;
     border-top-width: 0;
     border-bottom-width: 1px;
     border-top-left-radius: 0;
@@ -3100,13 +3100,13 @@ infobar {
   .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child {
     border-width: 1px; }
   .linked.vertical > entry:only-child {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 entry, menuitem entry, popover.background entry, .osd entry,
 #XfceNotifyWindow entry, #login_window entry {
   border-width: 1px;
   border-style: solid;
-  border-radius: 4px;
+  border-radius: 3px;
   transition: border 100ms ease-out;
   box-shadow: inset 1px 0 rgba(66, 52, 17, 0.1), inset 0 1px rgba(66, 52, 17, 0.12), inset -1px 0 rgba(66, 52, 17, 0.1), inset 0 -1px rgba(66, 52, 17, 0.05); }
   entry:focus, popover.background entry:focus,
@@ -3126,12 +3126,12 @@ entry, menuitem entry, popover.background entry, .osd entry,
     background-color: #83a598;
     background-image: none;
     border-width: 0;
-    border-radius: 4px;
+    border-radius: 3px;
     color: #ebdbb2; }
   entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left {
-    padding-right: 0px; }
+    padding-right: 4px; }
   entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right {
-    padding-left: 0px; }
+    padding-left: 4px; }
   entry.warning, popover.background entry.warning,
   #XfceNotifyWindow entry.warning, #login_window entry.warning {
     color: #32302f;
@@ -3193,7 +3193,7 @@ menubar, .menubar {
   color: #d5c4a1; }
   menubar > menuitem, .menubar > menuitem {
     min-height: 16px;
-    padding: 0px 0px;
+    padding: 6px 10px;
     border: 1px solid transparent;
     background-color: transparent;
     background-image: none;
@@ -3214,7 +3214,7 @@ menu,
 .context-menu {
   border: 0;
   border-radius: 0;
-  padding: 0px;
+  padding: 4px;
   background-color: #282828;
   color: #d5c4a1; }
   .csd menu, .csd
@@ -3234,7 +3234,7 @@ menu,
   .csd
   .context-menu separator {
     background-color: #242424;
-    margin: -2px 0; }
+    margin: 2px 0; }
   menu .separator,
   .csd menu .separator,
   .menu .separator,
@@ -3249,7 +3249,7 @@ menu,
   .context-menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 0px;
+    padding: 4px;
     border-radius: 0; }
     menu menuitem:active, menu menuitem:hover,
     .menu menuitem:active,
@@ -3371,7 +3371,7 @@ menu,
   .context-menu > arrow {
     min-height: 16px;
     min-width: 16px;
-    padding: 0px;
+    padding: 4px;
     background-color: #282828;
     border-radius: 0; }
     menu > arrow.top,
@@ -3429,7 +3429,7 @@ menuitem entry {
   background-color: #282828;
   background-image: none;
   border-color: shade(mix(#282828,#d5c4a1,0.2),0.8);
-  padding: 0px;
+  padding: 4px;
   color: #d5c4a1;
   caret-color: #282828;
   -gtk-secondary-caret-color: #282828; }
@@ -3464,8 +3464,8 @@ menuitem entry {
  ! Popover
 **********/
 popover.background {
-  padding: -3px;
-  border-radius: 4px;
+  padding: 1px;
+  border-radius: 3px;
   background-clip: border-box;
   background-color: #282828;
   background-image: none;
@@ -3509,12 +3509,12 @@ popover.background {
       color: #ebdbb2; }
   popover.background .frame {
     border-color: #202020;
-    border-radius: 4px; }
+    border-radius: 3px; }
   popover.background entry {
     background-color: #32302f;
     background-image: none;
     border-color: shade(mix(#32302f,#ebdbb2,0.2),0.8);
-    padding: 0px;
+    padding: 4px;
     color: #ebdbb2;
     caret-color: #282828;
     -gtk-secondary-caret-color: #282828; }
@@ -3668,7 +3668,7 @@ popover.background {
 
 modelbutton.flat,
 menuitem.button.flat {
-  padding: 0px 2px;
+  padding: 4px 6px;
   outline-color: transparent;
   transition: none; }
   modelbutton.flat:hover,
@@ -3711,7 +3711,7 @@ tooltip.background.csd {
   background-color: #32302f;
   background-clip: padding-box;
   border: 1px solid #282626;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #ebdbb2; }
 
 .tooltip *,
@@ -3725,11 +3725,11 @@ tooltip * {
 messagedialog, .message-dialog, .prompt {
   -GtkDialog-content-area-border: 0;
   -GtkDialog-action-area-border: 0;
-  -GtkDialog-button-spacing: 0px;
+  -GtkDialog-button-spacing: 4px;
   margin: 0;
   padding: 0; }
   messagedialog .dialog-action-box, .message-dialog .dialog-action-box, .prompt .dialog-action-box {
-    margin: 0px; }
+    margin: 8px; }
 
 printdialog paper {
   color: #ebdbb2;
@@ -3741,7 +3741,7 @@ printdialog paper {
     border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); }
 
 printdialog .dialog-action-box {
-  margin: 0px; }
+  margin: 8px; }
 
 /*********************
  ! App notifications *
@@ -3750,8 +3750,8 @@ frame.app-notification {
   border-style: solid;
   border-color: rgba(32, 32, 32, 0.8);
   border-width: 0 1px 1px;
-  border-radius: 0 0 4px 4px;
-  padding: 0px;
+  border-radius: 0 0 3px 3px;
+  padding: 8px;
   background-color: rgba(40, 40, 40, 0.8);
   background-image: none;
   color: #d5c4a1; }
@@ -3889,7 +3889,7 @@ expander arrow {
   background-color: #32302f;
   background-image: none;
   border: 1px solid #282626;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #ebdbb2; }
   .floating-bar.top {
     border-top-width: 0;
@@ -3916,7 +3916,7 @@ expander arrow {
  ! Touch text selections *
 **************************/
 GtkBubbleWindow {
-  border-radius: 4px;
+  border-radius: 3px;
   background-clip: border-box; }
   GtkBubbleWindow.osd.background {
     background-color: rgba(40, 40, 40, 0.8); }
@@ -3927,7 +3927,7 @@ GtkBubbleWindow {
  ! Font-viewer *
 ****************/
 SushiFontWidget {
-  padding: 0px 0px; }
+  padding: 4px 8px; }
 
 /*************
  ! Gucharmap *
@@ -3949,8 +3949,8 @@ EPreviewPane .entry {
 entry.entry.pin-entry {
   font-style: normal;
   font-size: 50px;
-  padding-left: 0px;
-  padding-right: 0px; }
+  padding-left: 20px;
+  padding-right: 20px; }
 
 label.pin-label {
   font-style: normal;
@@ -3963,14 +3963,14 @@ label.pin-label {
   min-width: 20px;
   min-height: 24px;
   margin-top: 2px;
-  padding-bottom: 0px;
-  padding-left: 0px;
-  padding-right: 0px;
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
   color: #ebdbb2;
   background-color: #32302f;
   border: 1px solid;
   border-color: mix(mix(#32302f,#ebdbb2,0.18),#32302f,0.5);
-  border-radius: 4px;
+  border-radius: 3px;
   box-shadow: inset 0 -3px mix(#32302f,#32302f,0.2);
   font-size: smaller; }
   .keycap:backdrop {
@@ -4073,7 +4073,7 @@ notebook {
   notebook > stack:not(:only-child) {
     background-color: #32302f; }
   notebook > header {
-    padding: 0px;
+    padding: 4px;
     background-color: #32302f; }
     notebook > header.top {
       box-shadow: inset 0 -1px mix(#32302f,#ebdbb2,0.18); }
@@ -4112,7 +4112,7 @@ notebook {
       background-image: none;
       border-color: mix(mix(#32302f,#ebdbb2,0.18),mix(#ebdbb2,#32302f,0.5),0.15);
       color: rgba(235, 219, 178, 0.8);
-      padding: 0px 8px;
+      padding: 4px 12px;
       min-width: 20px;
       min-height: 20px;
       outline-offset: -4px;
@@ -4148,90 +4148,90 @@ notebook {
       padding-bottom: 0; }
       notebook > header.top > tabs > tab {
         border-bottom: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-top: 4px; }
+        margin-top: 3px; }
         notebook > header.top > tabs > tab + tab {
           margin-left: -1px; }
         notebook > header.top > tabs > tab:first-child {
-          border-radius: 4px 0 0;
-          -gtk-outline-radius: 4px 0 0; }
+          border-radius: 3px 0 0;
+          -gtk-outline-radius: 3px 0 0; }
         notebook > header.top > tabs > tab:last-child {
-          border-radius: 0 4px 0 0;
-          -gtk-outline-radius: 0 4px 0 0; }
+          border-radius: 0 3px 0 0;
+          -gtk-outline-radius: 0 3px 0 0; }
         notebook > header.top > tabs > tab:checked {
           border-top-width: 3px;
           border-top-color: #83a598;
           margin-top: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 4px 4px 0 0; }
+          -gtk-outline-radius: 3px;
+          border-radius: 3px 3px 0 0; }
     notebook > header.bottom {
       padding-top: 0; }
       notebook > header.bottom > tabs > tab {
         border-top: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-bottom: 4px; }
+        margin-bottom: 3px; }
         notebook > header.bottom > tabs > tab + tab {
           margin-left: -1px; }
         notebook > header.bottom > tabs > tab:first-child {
-          border-radius: 0 0 0 4px;
-          -gtk-outline-radius: 0 0 0 4px; }
+          border-radius: 0 0 0 3px;
+          -gtk-outline-radius: 0 0 0 3px; }
         notebook > header.bottom > tabs > tab:last-child {
-          border-radius: 0 0 4px;
-          -gtk-outline-radius: 0 0 4px; }
+          border-radius: 0 0 3px;
+          -gtk-outline-radius: 0 0 3px; }
         notebook > header.bottom > tabs > tab:checked {
           border-bottom-width: 3px;
           border-bottom-color: #83a598;
           margin-bottom: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 0 0 4px 4px; }
+          -gtk-outline-radius: 3px;
+          border-radius: 0 0 3px 3px; }
     notebook > header.right {
       padding-left: 0; }
       notebook > header.right > tabs > tab {
         border-left: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-right: 4px; }
+        margin-right: 3px; }
         notebook > header.right > tabs > tab + tab {
           margin-top: -1px; }
         notebook > header.right > tabs > tab:first-child {
-          border-radius: 0 4px 0 0;
-          -gtk-outline-radius: 0 4px 0 0; }
+          border-radius: 0 3px 0 0;
+          -gtk-outline-radius: 0 3px 0 0; }
         notebook > header.right > tabs > tab:last-child {
-          border-radius: 0 0 4px;
-          -gtk-outline-radius: 0 0 4px; }
+          border-radius: 0 0 3px;
+          -gtk-outline-radius: 0 0 3px; }
         notebook > header.right > tabs > tab:checked {
           border-right-width: 3px;
           border-right-color: #83a598;
           margin-right: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 0 4px 4px 0; }
+          -gtk-outline-radius: 3px;
+          border-radius: 0 3px 3px 0; }
     notebook > header.left {
       padding-right: 0; }
       notebook > header.left > tabs > tab {
         border-right: none;
-        padding-left: 8px;
-        padding-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
         -gtk-outline-radius: 0;
-        margin-left: 4px; }
+        margin-left: 3px; }
         notebook > header.left > tabs > tab + tab {
           margin-top: -1px; }
         notebook > header.left > tabs > tab:first-child {
-          border-radius: 4px 0 0;
-          -gtk-outline-radius: 4px 0 0; }
+          border-radius: 3px 0 0;
+          -gtk-outline-radius: 3px 0 0; }
         notebook > header.left > tabs > tab:last-child {
-          border-radius: 0 0 0 4px;
-          -gtk-outline-radius: 0 0 0 4px; }
+          border-radius: 0 0 0 3px;
+          -gtk-outline-radius: 0 0 0 3px; }
         notebook > header.left > tabs > tab:checked {
           border-left-width: 3px;
           border-left-color: #83a598;
           margin-left: 0;
-          -gtk-outline-radius: 4px;
-          border-radius: 4px 0 0 4px; }
+          -gtk-outline-radius: 3px;
+          border-radius: 3px 0 0 3px; }
 
 /*********
  ! Buttons
@@ -4246,7 +4246,7 @@ overlay.osd {
   background-color: transparent; }
 
 colorchooser .popover.osd {
-  border-radius: 4px; }
+  border-radius: 3px; }
 
 button.color .osd colorswatch:only-child {
   box-shadow: none; }
@@ -4539,9 +4539,9 @@ button.osd,
 
 toolbar.osd {
   -GtkToolbar-button-relief: normal;
-  padding: 0px;
+  padding: 4px;
   border: 1px solid rgba(32, 32, 32, 0.8);
-  border-radius: 4px;
+  border-radius: 3px;
   background-color: rgba(40, 40, 40, 0.8);
   background-image: none;
   color: #d5c4a1; }
@@ -4861,7 +4861,7 @@ progressbar.osd {
     background-color: #282828;
     background-image: none;
     border-color: shade(mix(#282828,#d5c4a1,0.2),0.8);
-    padding: 0px;
+    padding: 4px;
     color: #d5c4a1;
     caret-color: #282828;
     -gtk-secondary-caret-color: #282828; }
@@ -5021,7 +5021,7 @@ progressbar.osd {
   #XfceNotifyWindow iconview.cell:selected:focus {
     background-color: transparent;
     border: 3px solid mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.21);
-    border-radius: 4px;
+    border-radius: 3px;
     outline-color: transparent; }
   .osd .page-thumbnail,
   #XfceNotifyWindow .page-thumbnail {
@@ -5383,10 +5383,10 @@ progressbar.osd {
           border-style: none solid none none; }
       .osd spinbutton:not(.vertical) button:dir(rtl):first-child,
       #XfceNotifyWindow spinbutton:not(.vertical) button:dir(rtl):first-child {
-        border-radius: 4px 0 0 4px; }
+        border-radius: 3px 0 0 3px; }
       .osd spinbutton:not(.vertical) button:dir(ltr):last-child,
       #XfceNotifyWindow spinbutton:not(.vertical) button:dir(ltr):last-child {
-        border-radius: 0 4px 4px 0; }
+        border-radius: 0 3px 3px 0; }
   .osd spinbutton.vertical button:first-child,
   #XfceNotifyWindow spinbutton.vertical button:first-child {
     background-color: rgba(40, 40, 40, 0.8);
@@ -5804,7 +5804,7 @@ scrolledwindow junction {
 ******************/
 progressbar {
   padding: 0;
-  border-radius: 4px;
+  border-radius: 3px;
   font-size: smaller;
   color: rgba(235, 219, 178, 0.6); }
   progressbar.horizontal trough,
@@ -5817,23 +5817,23 @@ progressbar {
     border: 1px solid mix(#32302f,#ebdbb2,0.17);
     background-color: #363433;
     background-image: none;
-    border-radius: 4px; }
+    border-radius: 3px; }
   progressbar progress {
     background-color: #83a598;
     background-image: none;
     border-radius: 0; }
     progressbar progress.left {
-      border-top-left-radius: 4px;
-      border-bottom-left-radius: 4px; }
+      border-top-left-radius: 3px;
+      border-bottom-left-radius: 3px; }
     progressbar progress.right {
-      border-top-right-radius: 4px;
-      border-bottom-right-radius: 4px; }
+      border-top-right-radius: 3px;
+      border-bottom-right-radius: 3px; }
     progressbar progress.bottom {
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px; }
+      border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px; }
     progressbar progress.top {
-      border-top-left-radius: 4px;
-      border-top-right-radius: 4px; }
+      border-top-left-radius: 3px;
+      border-top-right-radius: 3px; }
 
 levelbar.horizontal block {
   min-width: 34px;
@@ -5849,7 +5849,7 @@ levelbar:backdrop {
 levelbar trough {
   background-color: #363433;
   border: 1px solid mix(#32302f,#ebdbb2,0.17);
-  border-radius: 4px;
+  border-radius: 3px;
   padding: 2px; }
 
 levelbar.horizontal.discrete block {
@@ -5865,7 +5865,7 @@ levelbar.vertical.discrete block {
 levelbar block {
   background-color: #83a598;
   border-color: transparent;
-  border-radius: 4px; }
+  border-radius: 3px; }
   levelbar block.low {
     background-color: #ff7f42;
     border-color: transparent; }
@@ -5883,7 +5883,7 @@ levelbar block {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 0px; }
+  padding: 4px; }
   scale.horizontal trough {
     padding: 0 3px; }
   scale.horizontal highlight, scale.horizontal fill {
@@ -6068,7 +6068,7 @@ scrollbar {
     min-width: 7px;
     min-height: 7px;
     border: 1px solid transparent;
-    border-radius: 4px;
+    border-radius: 3px;
     background-clip: padding-box;
     background-color: mix(#32302f,#ebdbb2,0.5); }
     scrollbar slider:hover {
@@ -6162,10 +6162,10 @@ scrollbar {
     border-style: none; }
 
 stacksidebar row {
-  padding: 0px 0px; }
+  padding: 8px 4px; }
   stacksidebar row > label {
-    padding-left: 0px;
-    padding-right: 0px; }
+    padding-left: 4px;
+    padding-right: 4px; }
   stacksidebar row.needs-attention > label {
     background-size: 6px 6px, 0 0; }
 
@@ -6176,7 +6176,7 @@ placessidebar row {
   min-height: 32px;
   padding: 0; }
   placessidebar row > revealer {
-    padding: 0 0px; }
+    padding: 0 8px; }
   placessidebar row:selected {
     color: #ebdbb2; }
   placessidebar row:disabled {
@@ -6190,11 +6190,11 @@ placessidebar row {
   placessidebar row image.sidebar-icon {
     opacity: 0.7; }
     placessidebar row image.sidebar-icon:dir(ltr) {
-      padding-right: 2px;
-      padding-left: 0px; }
+      padding-right: 10px;
+      padding-left: 4px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
-      padding-left: 2px;
-      padding-right: 0px; }
+      padding-left: 10px;
+      padding-right: 4px; }
   placessidebar row label.sidebar-label:dir(ltr) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {
@@ -6300,7 +6300,7 @@ radio {
   -gtk-icon-source: url("../assets/radio-unchecked.svg");
   min-width: 16px;
   min-height: 16px;
-  margin-right: 0px; }
+  margin-right: 4px; }
   radio:disabled {
     -gtk-icon-source: url("../assets/radio-unchecked-insensitive.svg"); }
   radio:checked, radio:active {
@@ -6333,7 +6333,7 @@ check {
   -gtk-icon-source: url("../assets/checkbox-unchecked.svg");
   min-width: 16px;
   min-height: 16px;
-  margin-right: 0px; }
+  margin-right: 4px; }
   check:disabled {
     -gtk-icon-source: url("../assets/checkbox-unchecked-insensitive.svg"); }
   check:checked, check:active {
@@ -6363,7 +6363,7 @@ check {
 
 radio:dir(rtl), check:dir(rtl) {
   margin-right: 0;
-  margin-left: 0px; }
+  margin-left: 4px; }
 
 .view.content-view.check:not(list), iconview.content-view.check:not(list) {
   -gtk-icon-shadow: none;
@@ -6409,8 +6409,8 @@ radio:dir(rtl), check:dir(rtl) {
  ! Switch
 *********/
 switch {
-  border-radius: 4px;
-  padding: -1px;
+  border-radius: 3px;
+  padding: 3px;
   border: 0;
   outline: none;
   transition: background-color .3s linear;
@@ -6423,7 +6423,7 @@ switch {
     background-color: mix(#ebdbb2,#32302f,0.5);
     transition: all .3s ease-in;
     box-shadow: 0 1px 2px 0 rgba(66, 52, 17, 0.07), 1px 0 2px 0 rgba(66, 52, 17, 0.07);
-    border-radius: 4px; }
+    border-radius: 3px; }
   switch:checked {
     background-color: #83a598;
     background-image: none;
@@ -6484,7 +6484,7 @@ textview text {
   .view text:selected,
   iconview text:selected,
   textview text:selected {
-    border-radius: 4px; }
+    border-radius: 3px; }
 
 textview border {
   background-color: mix(#32302f,#32302f,0.5); }
@@ -6511,7 +6511,7 @@ treeview entry.flat, treeview entry {
     border-color: #83a598; }
 
 treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
-  padding: -2px 1px;
+  padding: 2px 5px;
   border-radius: 0;
   background-image: none;
   text-shadow: none;
@@ -6585,7 +6585,7 @@ treeview.view {
       color: mix(#32302f,mix(#ebdbb2,#32302f,0.5),0.7); }
   treeview.view.progressbar {
     color: #32302f;
-    border-radius: 4px;
+    border-radius: 3px;
     border: 1px solid mix(#83a598,#ebdbb2,0.3);
     background-color: #83a598; }
     treeview.view.progressbar:selected {
@@ -6595,7 +6595,7 @@ treeview.view {
         box-shadow: none;
         background-color: #83a598;
         background-image: none;
-        border-radius: 4px; }
+        border-radius: 3px; }
         treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop {
           color: mix(#83a598,#ebdbb2,0.66);
           border-color: mix(#83a598,#ebdbb2,0.3);
@@ -6610,13 +6610,13 @@ treeview.view {
       box-shadow: none; }
   treeview.view.trough {
     background-color: rgba(235, 219, 178, 0.1);
-    border-radius: 4px; }
+    border-radius: 3px; }
     treeview.view.trough:selected:focus, treeview.view.trough:selected {
       background-color: rgba(235, 219, 178, 0.3);
       border-width: 1px 0;
       border-style: solid;
       border-color: #83a598;
-      border-radius: 4px; }
+      border-radius: 3px; }
   treeview.view header button {
     color: mix(#ebdbb2,#32302f,0.5);
     background-color: #32302f;
@@ -6699,7 +6699,7 @@ placesview > actionbar > revealer > box > label {
  ! Window frame
 ***************/
 decoration {
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   box-shadow: 0 3px 9px 1px rgba(131, 104, 34, 0.7), 0 0 0 1px #282828;
   /* this is used for the resize cursor area */
   border-width: 0px;
@@ -6722,10 +6722,10 @@ decoration {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(131, 104, 34, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); }
   tooltip.csd decoration {
-    border-radius: 4px;
+    border-radius: 3px;
     box-shadow: none; }
   messagedialog.csd decoration {
-    border-radius: 4px;
+    border-radius: 3px;
     box-shadow: 0 1px 2px rgba(131, 104, 34, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); }
 
 /***********************
@@ -6893,7 +6893,7 @@ workbench.csd > stack.titlebar:not(headerbar) {
   border: 0;
   box-shadow: none; }
   workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
-    border-radius: 4px 4px 0 0; }
+    border-radius: 3px 3px 0 0; }
 
 /****************
  ! Geary *
@@ -6918,25 +6918,25 @@ workbench.csd > stack.titlebar:not(headerbar) {
   background-image: none;
   background-color: rgba(131, 104, 34, 0.3);
   border-color: rgba(51, 49, 48, 0.9);
-  border-radius: 9px;
-  padding: 0px;
+  border-radius: 7px;
+  padding: 4px;
   color: #333130; }
 
 .lightdm.menu {
   background-image: none;
   background-color: rgba(131, 104, 34, 0.6);
   border-color: rgba(51, 49, 48, 0.2);
-  border-radius: 8px;
+  border-radius: 6px;
   padding: 1px;
   color: #333130; }
   .lightdm.menu .menuitem *, .lightdm.menu .menuitem.check:active, .lightdm.menu .menuitem.radio:active {
     color: #333130; }
 
 .lightdm.menubar *, .lightdm.menubar.menuitem {
-  padding: -3px; }
+  padding: 1px; }
 
 .lightdm.option-button {
-  padding: 0px;
+  padding: 4px;
   background: none;
   border: 0; }
 
@@ -6959,8 +6959,8 @@ workbench.csd > stack.titlebar:not(headerbar) {
   background-image: none;
   background-color: rgba(131, 104, 34, 0.3);
   border-color: rgba(51, 49, 48, 0.6);
-  border-radius: 9px;
-  padding: 2px;
+  border-radius: 7px;
+  padding: 6px;
   color: #333130;
   text-shadow: none; }
 
@@ -7001,10 +7001,10 @@ GeditWindow .pane-separator {
   background-color: #32302f;
   color: mix(#ebdbb2,#32302f,0.1); }
   .gedit-document-panel list row {
-    padding: 0px; }
+    padding: 4px; }
     .gedit-document-panel list row button {
       padding: 1px;
-      border-radius: 4px;
+      border-radius: 3px;
       border-style: solid;
       border-color: transparent;
       border-width: 1px;
@@ -7055,8 +7055,8 @@ statusbar GeditSmallButton, GeditStatusMenuButton {
       color: #ebdbb2; }
 
 GeditViewFrame .gedit-search-slider {
-  padding: 0px;
-  border-radius: 0 0 4px 4px;
+  padding: 4px;
+  border-radius: 0 0 3px 3px;
   border-width: 0 1px 1px;
   border-style: solid;
   border-color: #282626;
@@ -7067,14 +7067,14 @@ GeditViewFrame .gedit-search-slider {
     color: #32302f; }
 
 GeditFileBrowserWidget .toolbar {
-  padding: 0px;
+  padding: 2px;
   border-top: 0;
   background-color: #32302f;
   background-image: none; }
 
 .gedit-search-entry-occurrences-tag {
-  margin: 0px;
-  padding: 0px;
+  margin: 2px;
+  padding: 2px;
   color: mix(#ebdbb2,#32302f,0.5); }
 
 .gedit-bottom-panel-paned,
@@ -7117,8 +7117,8 @@ paned.titlebar {
 .nautilus-window .searchbar-container {
   margin-top: -1px; }
   .nautilus-window .searchbar-container searchbar {
-    padding-top: -3px;
-    padding-bottom: -2px;
+    padding-top: 1px;
+    padding-bottom: 2px;
     border-bottom: 1px solid mix(#32302f,#ebdbb2,0.18); }
 
 .disk-space-display {
@@ -7288,18 +7288,18 @@ paned.titlebar {
       border-color: currentColor;
       -GtkWidget-window-dragging: true; }
     .nemo-window toolbar.primary-toolbar button.image-button {
-      padding: 0 5px; }
+      padding: 0 9px; }
     .nemo-window toolbar combobox, .nemo-window toolbar button {
-      padding: 0px; }
+      padding: 4px; }
       .nemo-window toolbar combobox.text-button, .nemo-window toolbar button.text-button {
-        padding: 0px; }
+        padding: 4px; }
       .nemo-window toolbar combobox.image-button, .nemo-window toolbar button.image-button {
-        padding: 0px; }
+        padding: 4px; }
     .nemo-window toolbar toolitem stack {
       margin-left: 15px; }
       .nemo-window toolbar toolitem stack widget button {
         box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(66, 52, 17, 0.22);
-        -NemoPathbarButton-border-radius: 4px; }
+        -NemoPathbarButton-border-radius: 3px; }
         .nemo-window toolbar toolitem stack widget button:focus, .nemo-window toolbar toolitem stack widget button:hover {
           box-shadow: inset -1px 0 mix(#83a598,rgba(0, 0, 0, 0.22),0.3), 0 1px 2px -1px rgba(66, 52, 17, 0.42); }
         .nemo-window toolbar toolitem stack widget button:active, .nemo-window toolbar toolitem stack widget button:active:hover, .nemo-window toolbar toolitem stack widget button:active:focus, .nemo-window toolbar toolitem stack widget button:active:hover:focus, .nemo-window toolbar toolitem stack widget button:checked, .nemo-window toolbar toolitem stack widget button:checked:hover, .nemo-window toolbar toolitem stack widget button:checked:focus, .nemo-window toolbar toolitem stack widget button:checked:hover:focus {
@@ -7319,7 +7319,7 @@ paned.titlebar {
   .nemo-window grid > widget:last-child button {
     min-height: 16px;
     min-width: 16px;
-    padding: -1px -2px; }
+    padding: 3px 6px; }
   .nemo-window grid > widget:last-child button:first-child {
     margin-left: 20px; }
   .nemo-window grid > widget:last-child button:first-child + button {
@@ -7335,8 +7335,8 @@ paned.titlebar {
     .nemo-window .sidebar .frame {
       border: 0; }
     .nemo-window .sidebar image {
-      padding-left: 0px;
-      padding-right: 0px; }
+      padding-left: 4px;
+      padding-right: 4px; }
     .nemo-window .sidebar .nemo-places-sidebar, .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview {
       background-color: mix(#32302f,#32302f,0.5); }
     .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview {
@@ -7352,8 +7352,8 @@ paned.titlebar {
     .nemo-window .sidebar + separator + box .primary-toolbar {
       background-color: #312f2e;
       background-image: none;
-      padding-top: -3px;
-      padding-bottom: -3px;
+      padding-top: 1px;
+      padding-bottom: 1px;
       border-bottom: 1px solid mix(#32302f,#ebdbb2,0.18); }
       .nemo-window .sidebar + separator + box .primary-toolbar button:nth-child(2) {
         border-right: 0;
@@ -7394,7 +7394,7 @@ paned.titlebar {
 GtkWindow > GtkVBox > .dock, GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar {
   background-color: #32302f;
   background-image: none;
-  padding: 0px;
+  padding: 4px;
   border: 0;
   color: #ebdbb2; }
 
@@ -7441,8 +7441,8 @@ UnityDecoration {
   UnityDecoration .top {
     border: 1px solid #282828;
     border-bottom: 0;
-    border-radius: 4px 4px 0 0;
-    padding: 1px 3px 0;
+    border-radius: 3px 3px 0 0;
+    padding: 1px 7px 0;
     background-color: #282828;
     color: mix(#d5c4a1,#282828,0.1);
     text-shadow: none; }
@@ -7494,7 +7494,7 @@ SheetStyleDialog.unity-force-quit {
   text-shadow: 0 1px rgba(131, 104, 34, 0.5);
   -gtk-icon-shadow: 0 1px rgba(131, 104, 34, 0.5); }
   #panel_window menubar {
-    padding-left: 0px; }
+    padding-left: 4px; }
     #panel_window menubar, #panel_window menubar > menuitem {
       background-color: transparent;
       background-image: none;
@@ -7514,11 +7514,11 @@ SheetStyleDialog.unity-force-quit {
       font-weight: normal; }
 
 #content_frame {
-  padding-bottom: 0px; }
+  padding-bottom: 12px; }
 
 #login_window, #shutdown_dialog, #restart_dialog {
   border-style: none;
-  border-radius: 4px;
+  border-radius: 3px;
   background-color: #282828;
   color: #d5c4a1;
   /* draw border using box-shadow */
@@ -7632,7 +7632,7 @@ SheetStyleDialog.unity-force-quit {
   background-color: #282828;
   background-image: none;
   border-color: shade(mix(#282828,#d5c4a1,0.2),0.8);
-  padding: 0px;
+  padding: 4px;
   color: #d5c4a1;
   caret-color: #282828;
   -gtk-secondary-caret-color: #282828; }
@@ -7672,22 +7672,22 @@ SheetStyleDialog.unity-force-quit {
     color: mix(#d5c4a1,#282828,0.5); }
 
 #user_image {
-  border-radius: 4px;
+  border-radius: 3px;
   /* draw border using box-shadow */
   box-shadow: inset 1px 0 #1c1c1c, inset -1px 0 #1c1c1c, inset 0 1px #1c1c1c, inset 0 -1px #1c1c1c; }
 
 #user_image_border {
-  border-radius: 4px;
+  border-radius: 3px;
   background-color: #242424;
   background-image: none;
   box-shadow: inset 1px 0 rgba(66, 52, 17, 0.07), inset 0 1px rgba(66, 52, 17, 0.08), inset -1px 0 rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); }
 
 #buttonbox_frame {
-  padding-top: 0px;
+  padding-top: 8px;
   padding-bottom: 0;
   border-style: none;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   background-color: transparent;
   background-image: none;
   box-shadow: none; }
diff --git a/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource b/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource
index 39215fa0..2f8d4676 100644
Binary files a/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource and b/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource differ
diff --git a/.themes/oomox-gruvbox/openbox-3/themerc b/.themes/oomox-gruvbox/openbox-3/themerc
index a626ce4b..accc6bbc 100644
--- a/.themes/oomox-gruvbox/openbox-3/themerc
+++ b/.themes/oomox-gruvbox/openbox-3/themerc
@@ -146,9 +146,9 @@ menu.title.text.font:shadow=n
 
 
 # Everything else
-border.width: 0
+border.width: 4
 padding.width: 8
-padding.height: 0
+padding.height: 4
 window.handle.width: 0
 window.client.padding.width: 0
 window.label.text.justify: center