Theme update

Includes theming additions for Libreoffice for issue #80.
Includes some additional modifications for Thunar, filechooser, and Whisker Menu.
Made some adjustments to indention and white spaces. Trying to move back to some semblance of order.

Theme/Chicago95/gtk-3.24/apps/filechooser.css

@@ -71,6 +71,15 @@ filechooser .sidebar-row:selected:backdrop {
 background-color: @bg_shade;
 }
 
+filechooser placessidebar viewport {
+  border: 1px solid @bg_shade;
+  box-shadow: none; }
+
+filechooser scrolledwindow {
+  border: 1px solid @bg_shade;
+  box-shadow: none;
+  padding: 0px; }
+
 /* Adjust stack buttons*/
 filechooser revealer > box > stack {
     border-left: 1px solid @bg_shade;
@@ -79,7 +88,8 @@ filechooser revealer > box > stack {
     border-bottom: 1px solid @bg_bright;
     box-shadow: inset 1px 1px @bg_bright, inset -1px -1px @bg_shade;
     padding: 0px;}
-    filechooser revealer > box > stack button {
+    filechooser revealer > box > stack button,
+    filechooser revealer > box > stack button:backdrop {
         border-left: 1px solid @bg_bright;
         border-top: 1px solid @bg_bright;
         border-right: 1px solid @bg_shade;
@@ -99,5 +109,5 @@ filechooser revealer > box > stack {
             padding-left: 1px;
             padding-right: 1px; }
         filechooser revealer > box > stack button label {
-            padding-left: 1px;
+            padding-left: 0px;
-            padding-right: 1px; }
+            padding-right: 0px; }

Theme/Chicago95/gtk-3.24/apps/thunar.css

@@ -7,11 +7,21 @@
   border-right: 1px solid @bg_bright;
   box-shadow: none; }
 
-.thunar paned scrolledwindow {
+/*.thunar grid grid scrolledwindow .view { background-color: transparent; }*/
-  border-right: 1px solid @bg_bright; }
+
+.thunar scrolledwindow {
+  padding-top: 0px;
+  padding-left: 0px;
+  border-right: 1px solid @bg_bright;
+  border-top: 1px solid @bg_shade;
+  border-left: 1px solid @bg_shade; }
   .thunar paned .view:focus {
     outline-color: white; }
 
+.thunar grid grid scrolledwindow {
+padding-left: 1px;
+}
+
 .thunar notebook tab {
   padding: 0px;
   min-width: 16px;
@@ -68,7 +78,7 @@
       box-shadow: inset 1px 0px @bg_bright;
       min-width: 21px;
       min-height: 17px;
-      background-image: url("../assets/status_badge_msw.png");
+      background-image: url("../assets/status_badge_c95.png");
       background-repeat: no-repeat;
       background-position: center;
       background-size: 21px 17px;

Theme/Chicago95/gtk-3.24/apps/whiskermenu.css

@@ -60,18 +60,46 @@
       background-color: transparent; }
 #whiskermenu-window separator {
   margin: 5px; }
+#whiskermenu-window scrolledwindow {
+  border: 1px solid @bg_shade;
+  box-shadow: none;
+  padding: 0px; }
 #whiskermenu-window frame > stack > box > stack > box > scrolledwindow {
   padding: 5px;
-    border: 1px solid;
+  border-top: 1px solid transparent;
-    background-color: transparent;
+  border-right: 1px solid transparent;
-    border-color: @bg_shade @bg_bright @bg_bright @bg_shade;
+  border-bottom: 1px solid transparent;
-    box-shadow: inset 1px 1px @bg_bright,
+  border-left: 1px solid @bg_shade;
-                inset -1px -1px @bg_shade; }
+  box-shadow: inset 1px 0px @bg_bright; }
+  #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button {
+    border: 1px solid transparent;
+    background-color: @selected_bg_color;
+    box-shadow: none; }
+    #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button:checked {
+    background-color: @bg_shade; }
+    #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button:hover,
+    #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button:active,
+    #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button:checked {
+      color: white; }
+#whiskermenu-window > frame > stack > box > box:first-child {
+  padding: 2px;
+  margin: 0;
+  color: @active_title_text;
+  background-image: linear-gradient(to right, @selected_bg_color, @transparent); /* Note: You can setup a gradient here if you want! */ }
 #whiskermenu-window frame > box > box > box button image {
   padding: 0px; }
 #whiskermenu-window entry {
   margin-top: 3px;
   margin-bottom: 3px;
-    min-height: 16px; }
+  min-height: 16px;
+  border: 1px solid @bg_shade;
+  box-shadow: none; }
 #whiskermenu-window frame, #whiskermenu-window GtkListBox, #whiskermenu-window scrolledwindow, #whiskermenu-window viewport {
   background-color: transparent; }
+#whiskermenu-window scrollbar button {
+  margin: 0px;
+  padding: 0px;
+  min-width: 16px;
+  min-height: 16px;
+  border: none;
+  box-shadow: none; }

Theme/Chicago95/gtk-3.24/apps/xfce.css

@@ -14,6 +14,11 @@ XfdesktopIconView.view {
     background: rgba(0,0,50.2,0.5);
     border-radius: 0px; }
 
+.xfce4-panel {
+box-shadow: none;
+border: none;
+}
+
 /* Panel buttons */
 /* Note: The ".xfce4-panel > widget > frame" and ".xfce4-panel .flat:not(.toggle)" CSS classes are specified in this manner due to the volatility in the naming of CSS IDs presented by the XFCE panelbar.*/
 .xfce4-panel > widget > frame, /* affects the frame of the notification area plugin for GTK2 notifications. */
@@ -21,13 +26,17 @@ XfdesktopIconView.view {
 #sn-button, /* Specifying this class is redundant due to ".xfce4-panel .flat:not(.toggle)" but included for consistency. */
 #xfce4-notification-plugin,
 #pulseaudio-button,
-#xfce4-power-manager-plugin {
+#xfce4-power-manager-plugin,
+#indicator-button {
   padding: 0px;
   border: transparent;
   /*box-shadow: inset 0px 1px white;*/
   box-shadow: none;
   color: @panel_fg_color;
   background-color: transparent; }
+  #indicator-button:hover,
+  #indicator-button:active,
+  #indicator-button:checked,
   .xfce4-panel .flat:not(.toggle):hover,
   .xfce4-panel .flat:not(.toggle):active,
   .xfce4-panel .flat:not(.toggle):checked,

Theme/Chicago95/gtk-3.24/gtk-widgets.css

@@ -70,13 +70,15 @@ image:disabled,
 label,
 label:disabled,
 box,
-box:disabled,
+box:disabled {
-grid,
-grid:disabled {
   background-color: transparent;
   min-width: 0px;
   min-height: 0px; }
 
+grid,
+grid:disabled  {
+  background-color: @bg_color; }
+
 stepper,
 .stepper {
     min-width: 16px;
@@ -723,45 +725,35 @@ frame {
   box-shadow: inset 1px 1px @bg_dark,
               inset -1px -1px @bg_color;
   background-color: @theme_bg_color; }
-  .frame {
-  background-color: transparent;}
   frame.border-outset {
     border-color: @bg_bright @bg_dark @bg_dark @bg_bright;
-    box-shadow: inset 1px 1px @bg_color,
+    box-shadow: inset 1px 1px @bg_color, inset -1px -1px @bg_shade; }
-               inset -1px -1px @bg_shade; }
   frame.border-inset {
     border-color: @bg_shade @bg_bright @bg_bright @bg_shade;
-      box-shadow: inset 1px 1px @bg_dark,
+    box-shadow: inset 1px 1px @bg_dark, inset -1px -1px @bg_color;
-                  inset -1px -1px @bg_color;
       background-color: @theme_bg_color; }
   frame > list, frame > .view  {
     margin: -2px; }
   frame > label {
     margin-left: 6px; }
-  window > frame {
+
-    border-style: solid;
-    border-width: 1px;
-    border-color: @bg_color @bg_dark @bg_dark @bg_color;
-    box-shadow: inset 1px 1px @bg_bright,
-                inset -1px -1px @bg_shade;
-    border-radius: 0px; }
 dialog box box notebook stack box frame {
   border-left: 1px solid @bg_shade;
   border-top: 1px solid @bg_shade;
   border-right: 1px solid white;
   border-bottom: 1px solid white;
-    box-shadow: inset 1px 1px white,
+  box-shadow: inset 1px 1px white, inset -1px -1px @bg_shade; }
-                inset -1px -1px @bg_shade; }
 dialog box box box notebook stack grid frame {
   border-left: 1px solid @bg_shade;
   border-top: 1px solid @bg_shade;
   border-right: 1px solid white;
   border-bottom: 1px solid white;
-      box-shadow: inset 1px 1px white,
+  box-shadow: inset 1px 1px white, inset -1px -1px @bg_shade; }
-                  inset -1px -1px @bg_shade; }
+
-  viewport.frame > frame, viewport.frame > box > frame {
+/*viewport.frame > frame, viewport.frame > box > frame {
   background-color: @base_color;
-    color: @font_color; }
+  color: @font_color; }*/
+
 scrolledwindow.frame {
   padding: 1px;
   background-color: white;
@@ -769,32 +761,44 @@ frame {
   border-top: 1px solid @bg_dark;
   border-right: 1px solid @bg_bright;
   border-bottom: 1px solid @bg_bright;
-    box-shadow: inset -1px -1px @bg_color,
+  box-shadow: inset -1px -1px @bg_color, inset 1px 1px @bg_shade;
-                inset 1px 1px @bg_shade;
   margin: 0px; }
+
 notebook.frame {
   border-style: solid;
   border-width: 1px;
   border-color: @bg_color @bg_dark @bg_dark @bg_color;
-      box-shadow: inset 1px 1px @bg_bright,
+  box-shadow: inset 1px 1px @bg_bright, inset -1px -1px @bg_shade;
-                  inset -1px -1px @bg_shade;
   border-radius: 0px; }
 notebook stack frame, frame frame {
   border-left: 1px solid @bg_shade;
   border-top: 1px solid @bg_shade;
   border-right: 1px solid white;
   border-bottom: 1px solid white;
-      box-shadow: inset 1px 1px white,
+  box-shadow: inset 1px 1px white, inset -1px -1px @bg_shade; }
-                  inset -1px -1px @bg_shade; }
+notebook scrolledwindow frame {
+  background-color: @bg_color; }
+
 .osd.frame {
   background-clip: border-box;
   background-origin: border-box; }
+
 statusbar frame {
   padding: 1px;
   border-left: 1px solid @bg_shade;
   border-top: 1px solid @bg_shade;
   box-shadow: none; }
 
+.frame {
+  background-color: transparent;}
+
+window > frame {
+  border-style: solid;
+  border-width: 1px;
+  border-color: @bg_color @bg_dark @bg_dark @bg_color;
+  box-shadow: inset 1px 1px @bg_bright, inset -1px -1px @bg_shade;
+  border-radius: 0px; }
+
 /****************************
  * viewport, iconview, view *
  ****************************/
@@ -1040,9 +1044,8 @@ paned.vertical > separator {
   border-bottom: none;
   border-top: none;
   background: none;
-  box-shadow: inset 0px 1px @bg_shade;
+  /*box-shadow: inset 0px 1px @bg_shade;*/
-  margin: 4px;
+  margin: 0px; }
-}
 
 /* GTK has the panes flipped. the .horizontal is ACTUALLY a vertical.*/
 paned.horizontal > separator {
@@ -1052,9 +1055,8 @@ paned.horizontal > separator {
   border-bottom: none;
   border-top: none;
   background: none;
-  box-shadow: inset 1px 0px @bg_shade;
+  /*box-shadow: inset 1px 0px @bg_shade;*/
-  margin: 4px;
+  margin: 0px; }
-}
 
 
 toolbar > separator {
@@ -1138,92 +1140,134 @@ box.vertical.linked > button {
  ************/
 
 combobox {
-  margin: -2px; }
+  background-color: @bg_color; }
-
-combobox window menu {
-    background-color: @bg_color;
-    color: @fg_color;
-    border: none;
-    box-shadow: none;
-}
-
-combobox entry {
-    min-width: 20px;
-    min-height: 20px;
-}
-
-combobox cellview {
-    padding-left: 2px;
-}
-
   combobox button {
-  padding: 0px;
+    padding: 2px;
     margin: 0px;
-  min-width: 20px;
+    min-width: 16px;
-  min-height: 20px; }
+    min-height: 16px;
+    outline: none; }
   combobox button.combo {
     margin: 2px; }
-
   combobox button arrow {
     padding: 0px;
     margin: 0px;
-  min-width: 20px;
+    min-width: 16px;
-  min-height: 20px;
+    min-height: 16px;
     border: 1px solid transparent; }
     combobox button:disabled arrow {
       background-image: url("assets/arrow-down-disabled.png"); }
+  combobox entry, entry {
+    min-width: 20px;
+    min-height: 16px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+    min-height: 16px;
+    border: 1px solid @bg_shade;
+    box-shadow: none; }
+  combobox cellview {
+    padding-left: 2px; }
+  combobox arrow {
+    -gtk-icon-source: url("assets/arrow-down_test.png");
+    -gtk-icon-transform: scale(0.39); }
+    combobox:disabled arrow {
+      -gtk-icon-source: url("assets/arrow-down-disabled.png");
+      -gtk-icon-transform: scale(0.5); }
+  combobox window menu {
+    background-color: @bg_color;
+    color: @text_color;
+    border: none;
+    box-shadow: none; }
 
 /*************
  * scrollbar *
  *************/
 
-scrollbar button {
+scrollbar {
-    margin: 0px;
+  border-top: 0px solid; 
-    padding: 0px;
+   border-bottom: 0px solid;
-    background-color: @bg_color;
+   border: none;
-    -gtk-icon-source: none;
+   background-color: @bg_color; }
-    background-position: center;
+   scrollbar trough {
-    background-repeat: no-repeat;
+   border: none;
-    border-width: 0px;
+   border-radius: 0; }
-    border-style: solid;
-    min-width: 16px;
-    min-height: 16px;
-    box-shadow: none;
-}
-
-scrollbar button:active {
-    margin: 0px;
-    padding: 0px;
-    background-color: @bg_color;
-    -gtk-icon-source: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    border-width: 0px;
-    border-style: solid;
-    min-width: 16px;
-    min-height: 16px;
-    box-shadow: none;
-}
-
-
   scrollbar slider {
-    margin: 0px;
+    margin-top: 0px;
     padding: 0px;
     background-color: @bg_color;
     border-color: @bg_color @bg_dark @bg_dark @bg_color;
-    box-shadow: inset 1px 1px @selected_fg_color,
+    box-shadow: inset 1px 1px @selected_fg_color, inset -1px -1px @bg_shade;
-                inset -1px -1px @bg_shade;
     border-style: solid;
     border-width: 1px;
     min-width: 14px;
-    min-height: 14px;
+    min-height: 14px; }
-}
+  /* This is for Libreoffice scrollbar buttons */
-
+  scrollbar button,
-scrollbar {
+  scrollbar .button {
+    background-image: url("scrollbar/scrollbar_button.png");
+    background-position: center; /* Note: This can affect other applications, such as Whisker Menu */
+    background-repeat: no-repeat; /* Note: This can affect other applications, such as Whisker Menu */
+    min-height: 16px;
+    min-width: 16px; 
+    margin: 0px;
+    padding: 0px;
+    border: none;
+    background-color: @bg_color;
+    box-shadow: none; }
+    scrollbar button:disabled {
+      background-image: url("scrollbar/scrollbar_button_disabled.png"); }
+    scrollbar button:active,
+    scrollbar .button:active {
       min-width: 16px;
       min-height: 16px;
+      border: 1px solid @bg_shade; 
+      background-color: @bg_color;
+      background-image: none;
+      box-shadow: none; }
+  /* Every other scrollbar that isn't Libreoffice */
+  scrollbar button.up,
+  scrollbar button.down,
+  scrollbar button.left,
+  scrollbar button.right {
+    margin: 0px;
+    padding: 0px;
+    background-color: @bg_color;
+    -gtk-icon-source: none;
+    background-position: center;
+    background-repeat: no-repeat;
+    box-shadow: none;
     border-width: 0px;
-}
+    border-style: solid;
+    min-width: 16px;
+    min-height: 16px; }
+    scrollbar button.up:disabled,
+    scrollbar button.down:disabled,
+    scrollbar button.left:disabled,
+    scrollbar button.right:disabled {
+      box-shadow: inset 1px 1px @bg_shade; }
+    scrollbar button.up:active,
+    scrollbar button.down:active,
+    scrollbar button.left:active,
+    scrollbar button.right:active {
+      border: none;
+      box-shadow: none; }
+  /* Scrollbar buttons for GTK3 applications (such as Firefox or Thunderbird) using deprecated selectors */
+  scrollbar .button {
+    -gtk-icon-source: none;
+    background-position: center;
+    background-repeat: no-repeat;
+    border-width: 0px;
+    min-width: 16px;
+    min-height: 16px;
+    box-shadow: none; }
+    scrollbar .button:active {
+      -gtk-icon-source: none;
+      background-position: center;
+      background-repeat: no-repeat;
+      border-width: 0px;
+      min-width: 16px;
+      min-height: 16px;
+      box-shadow: none; }
 
 /* where is the junction? in scrollablewindow? doesent exists anymore? */
 scrollbar.junction,
@@ -1234,124 +1278,47 @@ scrollbar .junction {
     background-color: red;
 }
 
+/* Vertical scrollbar button icons */
 scrollbar.vertical button.up,
-.scrollbar.button.vertical.top {
-    background-image: url("scrollbar/stepper-up.png");
-}
-
-scrollbar.vertical button.up:active {
-    background-image: url("scrollbar/stepper-up-active.png");
-}
-
-scrollbar.vertical button.up:disabled {
-    background-image: url("scrollbar/stepper-up-insense.png");
-}
-
-scrollbar.vertical button.down {
-    background-image: url("scrollbar/stepper-down.png");
-}
-
-scrollbar.vertical button.down:active {
-    background-image: url("scrollbar/stepper-down-active.png");
-}
-
-scrollbar.vertical button.down:disabled {
-    background-image: url("scrollbar/stepper-down-insense.png");
-}
-
-scrollbar.horizontal button.up {
-    background-image: url("scrollbar/stepper-left.png");
-}
-
-scrollbar.horizontal button.up:active {
-    background-image: url("scrollbar/stepper-left-active.png");
-}
-
-scrollbar.horizontal button.up:disabled {
-    background-image: url("scrollbar/stepper-left-insense.png");
-}
-
-scrollbar.horizontal button.down {
-    background-image: url("scrollbar/stepper-right.png");
-}
-
-scrollbar.horizontal button.down:active {
-    background-image: url("scrollbar/stepper-right-active.png");
-}
-
-scrollbar.horizontal button.down:disabled {
-    background-image: url("scrollbar/stepper-right-insense.png");
-}
-
-/* Scrollbar buttons for older GTK3 applications (such as Firefox or Thunderbird) */
-
-scrollbar .button {
-    -gtk-icon-source: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    border-width: 0px;
-    min-width: 16px;
-    min-height: 16px;
-    box-shadow: none;
-}
-
-scrollbar .button:active {
-    -gtk-icon-source: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    border-width: 0px;
-    min-width: 16px;
-    min-height: 16px;
-    box-shadow: none;
-}
-
 scrollbar .button.vertical.top {
-    background-image: url("scrollbar/stepper-up.png");
+  background-image: url("scrollbar/stepper-up.png"); }
-}
+  scrollbar.vertical button.up:active,
-
   scrollbar .button.vertical.top:active {
-    background-image: url("scrollbar/stepper-up-active.png");
+    background-image: url("scrollbar/stepper-up-active.png"); }
-}
+  scrollbar.vertical button.up:disabled,
-
   scrollbar .button.vertical.top:disabled {
-    background-image: url("scrollbar/stepper-up-insense.png");
+    background-image: url("scrollbar/stepper-up-insense.png"); }
-}
+scrollbar.vertical button.down,
-
 scrollbar .button.vertical.bottom {
-    background-image: url("scrollbar/stepper-down.png");
+  background-image: url("scrollbar/stepper-down.png"); }
-}
+  scrollbar.vertical button.down:active,
-
   scrollbar .button.vertical.bottom:active {
-    background-image: url("scrollbar/stepper-down-active.png");
+    background-image: url("scrollbar/stepper-down-active.png"); }
-}
+  scrollbar.vertical button.down:disabled,
-
   scrollbar .button.vertical.bottom:disabled {
-    background-image: url("scrollbar/stepper-down-insense.png");
+    background-image: url("scrollbar/stepper-down-insense.png");}
-}
 
+/* Horizontal scrollbar button icons */
+scrollbar.horizontal button.up,
 scrollbar .button.horizontal.left {
-    background-image: url("scrollbar/stepper-left.png");
+  background-image: url("scrollbar/stepper-left.png"); }
-}
+  scrollbar.horizontal button.up:active,
-
   scrollbar .button.horizontal.left:active {
-    background-image: url("scrollbar/stepper-left-active.png");
+    background-image: url("scrollbar/stepper-left-active.png"); }
-}
+  scrollbar.horizontal button.up:disabled,
-
   scrollbar .button.horizontal.left:disabled {
-    background-image: url("scrollbar/stepper-left-insense.png");
+    background-image: url("scrollbar/stepper-left-insense.png"); }
-}
+scrollbar.horizontal button.down,
-
 scrollbar .button.horizontal.right {
-    background-image: url("scrollbar/stepper-right.png");
+  background-image: url("scrollbar/stepper-right.png"); }
-}
+  scrollbar.horizontal button.down:active,
-
   scrollbar .button.horizontal.right:active {
-    background-image: url("scrollbar/stepper-right-active.png");
+    background-image: url("scrollbar/stepper-right-active.png"); }
-}
+  scrollbar.horizontal button.down:disabled,
-
   scrollbar .button.horizontal.right:disabled {
-    background-image: url("scrollbar/stepper-right-insense.png");
+    background-image: url("scrollbar/stepper-right-insense.png"); }
-}
+
+
 
 /*************
  * assistant *
@@ -1419,7 +1386,7 @@ expander arrow {
   min-height: 16px; }
 
 treeview.view.expander {
-  -gtk-icon-transform: scale(2); }
+  -gtk-icon-transform: scale(2); } /* NOTE: This is specific for GTK3.24! */
 
 /************
  * iconview *
@@ -1528,7 +1495,7 @@ menubar,
   border-bottom: 1px solid white;
   box-shadow: inset 0 -1px @selected_inactive_bg_color;
   -GtkWidget-window-dragging: true;
-}
+  background-color: @bg_color; }
 
 
 /***************
@@ -1551,6 +1518,12 @@ menu menuitem {
     background-color: @menu_bg_color;
 }
 
+/* we dont want any extra padding in those */
+menuitem > window,
+window > menu {
+    padding: 0px;
+}
+
 menuitem:active,
 menuitem:hover {
     background-color: @theme_selected_bg_color;
@@ -2326,32 +2299,45 @@ GtkSidebarRow .sidebar-label:dir(rtl) {
  * spinbutton *
  **************/
 
-spinbutton.horizontal button {
+spinbutton:not(.vertical) {
-    padding: 0px;
+  min-height: 16px;
-    margin-top: 2px;
+  border: 1px solid @bg_shade;
-    margin-bottom: 2px;
+  border-radius: 0px;
+  background-color: @bg_color; }
+  spinbutton:not(.vertical) entry {
+    min-width: 28px;
+    margin: 0;
+    background: none;
+    background-color: @base_color;
+    border: none;
+    border-radius: 0px;
+    box-shadow: none; }
+  spinbutton:not(.vertical) button {
     min-height: 16px;
     min-width: 16px;
-}
+    margin-right: -1px;
-
+    margin-top: -1px;
-spinbutton.horizontal entry {
+    margin-bottom: -1px;
-    margin: 2px;
+    padding-bottom: 0px;
-    min-width: 35px;
+    padding-top: 0;
-    min-height: 16px;
+    background-image: none;
-}
+    /*border-style: none none none solid;*/
-
+    border-left: 1px solid @bg_shade;
-spinbutton.vertical button {
+    border-top: 1px solid @bg_shade;
-    margin: 1px;
+    border-right: 1px solid @bg_shade;
-    min-height: 16px;
+    border-bottom: 1px solid black;
-    min-width: 16px;
+    border-radius: 0px;
-    padding: 0px;
+    box-shadow: inset 1px 1px @bg_bright; }
-}
+    /* For some reason this has to be specified on its own or else Libreoffice doesn't colour the spinbuttons */
-
+    spinbutton:not(.vertical) button {
-spinbutton.vertical entry {
+      color: @bg_dark;
-    min-width: 16px;
+      background-color: rgba(192, 192, 192, 0.05); }
-    min-height: 16px;
+    spinbutton:not(.vertical) button:active {
-    padding: 2px;
+      border-left: 1px solid @bg_dark;
-}
+      border-top: 1px solid @bg_dark;
+      border-right: 1px solid @bg_bright;
+      border-bottom: 1px solid @bg_bright;
+      box-shadow: inset 1px 1px @bg_shade }
 
 /**********
  * switch *
@@ -2527,6 +2513,11 @@ border-bottom: none;
 box-shadow: none;
 }
 
+overlay frame {
+border: none;
+box-shadow: none;
+}
+
 /* toolitem box button */
 toolitem button {
 background-color: @bg_color;
@@ -2595,7 +2586,7 @@ toolbar {
   border-bottom: 1px solid;
   border-color: @bg_color @bg_color @bg_bright @bg_color;
   box-shadow: inset 0px -1px @bg_shade;
-}
+  background-color: @bg_color; }
 
 toolbar button {
   margin: 1px;
@@ -2604,7 +2595,7 @@ toolbar button {
   padding: 2px;
   border-color: @bg_bright @bg_dark @bg_dark @bg_bright;
   box-shadow: inset -1px -1px @bg_shade; }
-  toolbar button:disabled {
+  toolbar > toolbutton > button:disabled {
     background-color: @border_bright;
     background-image: linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_color), linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @border_dark);
     background-size: 2px 2px;
@@ -2650,85 +2641,93 @@ window.ssd .titlebar:backdrop {
     background-color: @selected_inactive_bg_color;
     color: @selected_inactive_fg_color;
 }
-/*
-.default-decoration
-{
-background-color: red;
-border: 0px solid @bg_color;
-border-bottom: 0px;
-border-radius: 0px;
-}
- */
 
+/* Window server-side decorations (SSD) */
+window.ssd headerbar,
+window.ssd .titlebar,
+headerbar {
+  border-radius: 0px;
+  padding: 0px;
+  background-color: @selected_bg_color;
+  background-image: none;
+  text-shadow: none; }
+    window.ssd .titlebar:backdrop {
+      padding: 0px;
+      margin: 0px;
+      background-color: @selected_inactive_bg_color;
+      color: @selected_inactive_fg_color; }
     window.ssd .titlebar label {
       padding: 0px;
       margin: 0px;
       font-size: 8pt;
-    color: @selected_fg_color;
+      color: @selected_fg_color; }
-}
-
       window.ssd .titlebar label:backdrop,
       window.ssd .titlebar:backdrop label{
-    color: @selected_inactive_fg_color;
+        color: @selected_inactive_fg_color; }
-}
+
+window.csd tooltip {
+    border-radius: 0;
+    border: 0 none @border_dark;
+    box-shadow: none; }
 
 headerbar,
 .titlebar {
   padding: 0px;
   padding-left: 2px;
   padding-right: 2px;
-    margin: 0px;
   background-color: @selected_bg_color;
   background-image: none;
-    text-shadow: none;
+  text-shadow: none; }
-}
-
   headerbar:backdrop,
   .titlebar:backdrop {
     background-image: none;
-    background-color: @selected_inactive_bg_color;
+    background-color: @selected_inactive_bg_color; }
-}
-
   headerbar > label,
   .titlebar > label,
   headerbar > box > label,
   .titlebar > box > label {
     font-size: 8pt;
-    color: @selected_fg_color;
+    color: @selected_fg_color; }
-}
-
     headerbar:backdrop > label,
     .titlebar:backdrop > label,
     headerbar:backdrop > box > label,
     .titlebar:backdrop > box > label {
-    color: @selected_inactive_fg_color;
+      color: @selected_inactive_fg_color; }
-}
-
   headerbar entry {
     margin: 3px;
     padding-top: 1px;
-    padding-bottom: 1px;
+    padding-bottom: 1px; }
-}
+  headerbar button:not(.titlebutton) > image {
-
+    border: solid 1px;
-/* we dont want any extra padding in those */
+    border-color: transparent;
-menuitem > window,
+    padding-left: 3px;
-window > menu {
+    padding-right: 3px;
-    padding: 0px;
+    margin-top: -3px;
-}
+    margin-bottom: -3px; }
+    headerbar button:active:not(.titlebutton) > image {
+      border: solid;
+      border-color: transparent;
+      border-left-width: 2px;
+      border-right-width: 0px;
+      border-top-width: 2px;
+      border-bottom-width: 0px; }
+  headerbar separator {
+    margin-right: 3px;
+    border-left-width: 1px;
+    border-style: solid; }
+  headerbar scale {
+    margin-top: 4px;
+    margin-bottom: -6px; }
 
 .titlebar button {
   margin: 0px;
   padding: 0px;
   min-height: 16px;
-	min-width: 16px;
+  min-width: 16px; }
-}
-
   .titlebar button label  {
     padding-left: 4px;
-    padding-right: 4px;
+    padding-right: 4px; }
-}
+  /* The following button definitions allows us to have slim buttons on
-
-/* following button definitions allows us to have slim buttons on
    * headerbars with no big elements while still maintaining a good
    * looking headerbar with big elements */
   .titlebar button:not(.titlebutton) {
@@ -2739,60 +2738,21 @@ window > menu {
     margin-top: 2px;
     margin-bottom: 2px;
     min-height: 16px;
-	min-width: 16px;
+    min-width: 16px; }
-}
-
-
-headerbar button:not(.titlebutton) > image {
-	border: solid 1px;
-	border-color: transparent;
-	padding-left: 3px;
-	padding-right: 3px;
-	margin-top: -3px;
-	margin-bottom: -3px;
-}
-
-headerbar button:active:not(.titlebutton) > image {
-	border: solid;
-	border-color: transparent;
-	border-left-width: 2px;
-	border-right-width: 0px;
-	border-top-width: 2px;
-	border-bottom-width: 0px;
-}
-
-headerbar separator {
-	margin-right: 3px;
-	border-left-width: 1px;
-	border-style: solid;
-}
-
-headerbar scale {
-    margin-top: 4px;
-    margin-bottom: -6px;
-}
-
-window.csd tooltip {
-    border-radius: 0;
-    border: 0 none @border_dark;
-    box-shadow: none; 
-}
-
-.maximized > decoration,
-window.maximized,
-window.tiled {
-    border: 0px;
-    box-shadow: none;
-    margin: 0px;
-}
 
 window.ssd.maximized headerbar,
 window.ssd.maximized .titlebar {
   border: 0px;
   border-bottom: 1px solid transparent;
   box-shadow: none;
-    margin: 0px;
+  margin: 0px; }
-}
+
+.maximized > decoration,
+window.maximized,
+window.tiled {
+  border: 0px;
+  box-shadow: none;
+  margin: 0px; }
 
 .tiled headerbar,
 .maximized headerbar,
@@ -2800,8 +2760,12 @@ window.ssd.maximized .titlebar {
 .maximized .titlebar {
   border: 0px;
   box-shadow: none;
-    border-radius: 0;
+  border-radius: 0; }
-}
+
+/* Removed the frame seen in Lireoffice. */
+window > grid > grid > scrolledwindow {
+  border: none;
+  box-shadow: none; }
 
 /******************
  * window buttons *