diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 199c673..a58ef32 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -32,28 +32,7 @@
 /****************
  * Text Entries *
  ****************/
-spinbutton:not(.vertical),
-entry {
-  min-height: 32px;
 
-  border: 1px solid @theme_bg_color_breeze;
-  border-radius: 5px;
-  transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  color: @theme_text_color_breeze;
-  background-color: @theme_base_color_breeze;
-  /*box-shadow: inset 0 0 0 1px rgba(42, 145, 250, 0);*/
-  box-shadow: inset 0 4px 3px 0px alpha(black,0.5),
-              inset 0 1px 1px 0 alpha(black, 0.7),
-              inset 0 -1px 1px 0 @highlight_color;
-   }
-spinbutton:not(.vertical):dir(ltr) {
-        padding-left: 8px;
-        padding-right: 0px;
-}  
-spinbutton:not(.vertical):dir(rtl) {
-        padding-left: 0px;
-        padding-right: 8px;
-}  
 
 
 /***********
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index e44aaa0..5dc248a 100755
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -66,40 +66,9 @@
   font-weight: 400;
   font-size: 9pt; }
 
-
-
-
 /****************
  * Text Entries *
  ****************/
-spinbutton:not(.vertical),
-spinbutton.vertical text,
-entry {
-  min-height: 32px;
-  border: 1px solid @theme_bg_color_breeze;
-  border-radius: 5px;
-  transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  color: @theme_text_color_breeze;
-  background-color: @theme_base_color_breeze;
-  /*box-shadow: inset 0 0 0 1px rgba(42, 145, 250, 0);*/
-  box-shadow: inset 0 4px 3px 0px alpha(black,0.5),
-              /*0 -1px 1px 0 alpha(black, 0.7),*/
-              0 1px 1px 0 @highlight_color;
-   }
-  
-spinbutton:not(.vertical):dir(ltr) {
-        padding-left: 8px;
-        padding-right: 0px;
-}  
-spinbutton:not(.vertical):dir(rtl) {
-        padding-left: 0px;
-        padding-right: 8px;
-}  
-spinbutton.vertical text {
-        padding-left: 8px;
-        padding-right: 8px;
-}
-
 
 /***********
  * Buttons *
@@ -688,7 +657,7 @@ window.tiled-bottom {
 
   window.csd.popup, window.csd.dialog.message, window.csd.solid-csd
    { 
-    box-shadow: 0 4px 8px -4px alpha(black, 0.23); }
+    box-shadow: 0 4px 8px 0px alpha(black, 0.7); }
 
 /*
   .csd.popup decoration {
diff --git a/gtk-common/common.css b/gtk-common/common.css
index e45e08f..15b9963 100644
--- a/gtk-common/common.css
+++ b/gtk-common/common.css
@@ -307,17 +307,52 @@ spinner {
  * Text Entries *
  ****************/
  
+spinbutton:not(.vertical),
+spinbutton.vertical text,
+entry {
+  min-height: 32px;
+
+  border: 1px solid @theme_bg_color_breeze;
+  border-radius: 5px;
+  transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  color: @theme_text_color_breeze;
+  background-color: @theme_base_color_breeze;
+  /*box-shadow: inset 0 0 0 1px rgba(42, 145, 250, 0);*/
+  box-shadow: inset 0 4px 3px 0px alpha(black,0.5),
+              inset 0 1px 1px 0 alpha(black, 0.35),
+              inset 0 -1px 1px 0 @highlight_color;
+   }
+spinbutton:not(.vertical):dir(ltr) {
+        padding-left: 8px;
+        padding-right: 0px;
+}  
+spinbutton:not(.vertical):dir(rtl) {
+        padding-left: 0px;
+        padding-right: 8px;
+}  
+ 
+ 
 entry {
   padding-left: 8px;
   padding-right: 8px;
 }
 
+spinbutton.vertical text {
+        padding-left: 0;
+        padding-right: 0;
+}
+
+spinbutton:not(.vertical) text  {
+        background: none;
+}
+
 spinbutton:not(.vertical) image.left,
   entry image.left {
     margin-right: 6px; }
   spinbutton:not(.vertical) image.right,
   entry image.right {
     margin-left: 6px; }
+    
 
   /* undershoots defined globally later
    *
@@ -625,7 +660,9 @@ button {
 button.default {
     font-weight: bold;
 }
-notebook > header > tabs > arrow, button.titlebutton:hover,
+notebook > header > tabs > arrow,
+button.titlebutton:hover,
+windowcontrols button:hover,
 button, button.flat:hover, button.flat:focus {
   color: @button_fg_color;
   outline-color: alpha(black, 0.1);
@@ -644,7 +681,7 @@ button, button.flat:hover, button.flat:focus {
 	inset 0 0 0 1px black;
   background-color: @button_bg_color;
 }
-  notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton,
+  notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton, windowcontrols button,
   button.flat {
     border-color: transparent;
     background-color: transparent;
@@ -1367,6 +1404,9 @@ button {
   button.image-button {
     padding-left: 2px;
     padding-right: 2px; }
+  calendar header button.image-button {
+        padding: 0;
+  }
   .stack-switcher >
   button.needs-attention:active > label,
   .stack-switcher >