diff --git a/Extras/override/gtk-3.24/gtk.css b/Extras/override/gtk-3.24/gtk.css
index 712ee65..b903b6f 100755
--- a/Extras/override/gtk-3.24/gtk.css
+++ b/Extras/override/gtk-3.24/gtk.css
@@ -18,9 +18,17 @@
 .color-profiles {
   background-color: #c0c0c0; }
 
+/* XFCE Session logout dialogue */
+.xfsm-logout-dialog {
+  border-left: 1px solid @border_bright;
+  border-top: 1px solid @border_bright;
+  border-bottom: 1px solid @border_dark;
+  border-right: 1px solid @border_dark;
+  box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light; }
+
 /* Thunar borders */
 .thunar .sidebar {
-  border-right: 1px solid @bg_bright; }
+  border-right: 2px solid @border_color; }
   
 .thunar notebook .standard-view {
   padding: 0px;
diff --git a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css
index 2c92b32..983a6c7 100644
--- a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css
+++ b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css
@@ -1,7 +1,5 @@
 /* Whisker Menu and Application Menu Panel Button style */
 
-/* FOR GTK3.24 */
-
 /* We will remove the border effect and margin effects on the button and apply it to the box inside. 
 This will allow people to be able to run their pointer to the far corner of the screen and activate 
 the whisker menu without having to correct their pointer location. */
@@ -31,17 +29,14 @@ the whisker menu without having to correct their pointer location. */
       border-radius: 0px; }
   #whiskermenu-button image,
   #applicationmenu-button image {
-    margin-right: -4px;
-    margin-left: 1px;
     padding: 1px;
+    margin-right: -2px;
     background-repeat: no-repeat;
     background-size: contain;
     background-position: center; }
   #whiskermenu-button label,
   #applicationmenu-button label {
-    padding: 0px;
-    margin-right: 1px;
-    margin-left: -1px;
+    padding: 1px;
     border: none;
     color: black;
     font-family: "MS Sans Serif Bold", Sans, Sans-Serif;
@@ -53,98 +48,88 @@ the whisker menu without having to correct their pointer location. */
 
 #whiskermenu-window {
   box-shadow: inset 23px 0 @whisker_menu_logo; }
-  #whiskermenu-window > frame {
-    border: 2px solid @border_dark;
-    border-image: url("../assets/frame_outset.png");
-    border-image-slice: 2 2 2 2;}
-#whiskermenu-window treeview {
-  padding-left: 5px;
-  padding-right: 5px;
-  padding-top: 2px;
-  padding-bottom: 2px; }
+  #whiskermenu-window treeview {
+    padding-left: 2px;
+    padding-right: 5px;
+    padding-top: 1px;
+    padding-bottom: 1px; }
   #whiskermenu-window button {
-    padding: 2px;
-    min-height: 16px; }
+    padding: 1px;
+    min-height: 16px;
+    min-width: 16px; }
     #whiskermenu-window button:not(:hover):not(:checked) {
       border-color: transparent;
       box-shadow: none;
       background-color: transparent; }
-#whiskermenu-window scrolledwindow viewport button:hover {
-  outline-color: @border_bright; }
-#whiskermenu-window separator {
-  margin: 5px; }
-#whiskermenu-window scrolledwindow {
-  border: 1px solid @bg_shade;
-  box-shadow: none;
-  padding: 0px; }
-#whiskermenu-window frame {
+  #whiskermenu-window scrolledwindow {
+    border: none;
+    box-shadow: none; }
+    #whiskermenu-window scrolledwindow.frame {
+      padding: 0px;
+      border: 2px solid @border_dark;
+      border-image: url("../assets/frame_inset.png");
+      border-image-slice: 2 2 2 2;
+      border-radius: 0px;
+      box-shadow: none; }
+  #whiskermenu-window scrolledwindow viewport button:hover {
+    outline-color: @border_bright; }
+  #whiskermenu-window separator {
+    margin: 5px; }
+  #whiskermenu-window > frame {
+    border: 2px solid @border_dark;
+    border-image: url("../assets/frame_outset.png");
+    border-image-slice: 2 2 2 2;}
+    #whiskermenu-window > frame > stack > box > box:first-child {
+      padding: 2px;
+      margin: 0;
+      color: @text_color;
+      /*background-image: linear-gradient(to right, @selected_bg_color, @transparent);*/ /* Note: You can setup a gradient here if you want! */ }
+  #whiskermenu-window frame {
 /* 
    These are the Whisker Menu side bar images to replicate Windows 95.
    comment branding_C95.png and uncomment which one you would prefer to use:
-    - w95-orig: the original from the boss
     - w95: Replicated version of the original in a higher resolution
-    - l95: A linux version
-    - C95: Branded version of this theme
+    - w95-orig: the original from the boss
+    - L95: A linux version
+    - L95_aliased: A linux version with aliased font style.
+    - C95: A Chicago95 version of this theme.
+    - C95_aliased: A Chicago95 version with aliased font style.
    If none of these catch your fancy edit misc/whisker-sidebar.svg in 
    Inkscape
 */
-/*  background-image: url("../assets/branding_W95.png"); */
-/*  background-image: url("../assets/branding_W95-orig.png"); */
-/*  background-image: url("../assets/branding_L95.png"); */
-/*  background-image: url("../assets/branding_L95_aliased.png"); */
-/*  background-image: url("../assets/branding_C95.png"); */
-  background-image: url("../assets/branding_C95_aliased.png");
-  background-repeat: no-repeat;
-  background-position: 0% 100%; }
-#whiskermenu-window frame > box {
-margin-left: 18px; }
-  #whiskermenu-window frame > box > box > scrolledwindow {
-    padding: 5px;
-    border-top: 1px solid transparent;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-    border-left: 1px solid @border_shade;
-    box-shadow: inset 1px 0px @border_bright; }
-#whiskermenu-window frame > box > box > scrolledwindow button {
+/*    background-image: url("../assets/branding_W95.png"); */
+/*    background-image: url("../assets/branding_W95-orig.png"); */
+/*    background-image: url("../assets/branding_L95.png"); */
+/*    background-image: url("../assets/branding_L95_aliased.png"); */
+/*    background-image: url("../assets/branding_C95.png"); */
+    background-image: url("../assets/branding_C95_aliased.png");
+    background-repeat: no-repeat;
+    background-position: 0% 100%; }
+    #whiskermenu-window frame > stack,
+    #whiskermenu-window frame > box { /* frame > box is for older versions of Whisker menu. */
+      margin-left: 18px; }
+    #whiskermenu-window frame scrolledwindow button {
       border: 1px solid transparent;
       background-color: @selected_bg_color;
       box-shadow: none; }
-  #whiskermenu-window frame > box > box > scrolledwindow button:checked {
+      #whiskermenu-window frame scrolledwindow button:checked {
       background-color: @border_shade; }
-      #whiskermenu-window frame > box > box > scrolledwindow button:hover,
-      #whiskermenu-window frame > box > box > scrolledwindow button:active,
-      #whiskermenu-window frame > box > box > scrolledwindow button:checked,
-      #whiskermenu-window frame > box > box > scrolledwindow button:disabled
-      #whiskermenu-window frame > box > box > scrolledwindow button:backdrop {
+      #whiskermenu-window frame scrolledwindow button:hover,
+      #whiskermenu-window frame scrolledwindow button:active,
+      #whiskermenu-window frame scrolledwindow button:checked {
         color: white; }
-  #whiskermenu-window frame > box > box:nth-child(1) {
-    padding: 2px;
-    margin: 0;
-    color: @text_color;
-    /*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:nth-child(2) .frame {
-  border: 1px solid @bg_shade;
-  padding: 0px; }
-#whiskermenu-window frame > box > box > box button image {
-  padding: 0px; }
-#whiskermenu-window entry {
-  margin-top: 3px;
-  margin-bottom: 3px;
-  min-height: 16px; }
-#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; }
-#whiskermenu-window stack > scrolledwindow {
-  border-left: 1px solid @border_dark;
-  border-right: 1px solid @border_bright;
-  border-top: 1px solid @border_dark;
-  border-bottom: 1px solid @border_bright;
-  box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
-  background: @base_color;
-  padding: 1px; }
+    #whiskermenu-window frame > box > box > box button image {
+      padding: 0px; }
+  #whiskermenu-window entry {
+    margin-top: 3px;
+    margin-bottom: 3px;
+    min-height: 16px; }
+  #whiskermenu-window scrollbar button {
+    margin: 0px;
+    padding: 0px;
+    min-width: 16px;
+    min-height: 16px;
+    border: none;
+    box-shadow: none; }
+  #whiskermenu-window frame, #whiskermenu-window GtkListBox, #whiskermenu-window scrolledwindow, #whiskermenu-window viewport {
+    background-color: transparent; }
diff --git a/Theme/Chicago95/gtk-3.0/gtk-frames.css b/Theme/Chicago95/gtk-3.0/gtk-frames.css
index c2fcf96..ec359cf 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-frames.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-frames.css
@@ -83,7 +83,6 @@ statusbar {
 
 scrolledwindow.frame {
   padding: 0px;
-  padding-right: 1px;
   background-color: @base_color;
   border: 2px solid @border_dark;
   border-image: url("assets/frame_inset.png");
diff --git a/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css b/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css
index 48b3573..3fa34d5 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css
@@ -10,7 +10,7 @@
 */
 
 scrolledwindow {
-  padding: 1px;
+  padding: 0px;
   background-color: @bg_color;
   border: 2px solid @border_dark;
   border-image: url("assets/frame_inset.png");
diff --git a/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css
index 87786a4..983a6c7 100644
--- a/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css
+++ b/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css
@@ -1,7 +1,5 @@
 /* Whisker Menu and Application Menu Panel Button style */
 
-/* FOR GTK3.24 */
-
 /* We will remove the border effect and margin effects on the button and apply it to the box inside. 
 This will allow people to be able to run their pointer to the far corner of the screen and activate 
 the whisker menu without having to correct their pointer location. */
@@ -50,89 +48,88 @@ the whisker menu without having to correct their pointer location. */
 
 #whiskermenu-window {
   box-shadow: inset 23px 0 @whisker_menu_logo; }
-  #whiskermenu-window > frame {
-    border: 2px solid @border_dark;
-    border-image: url("../assets/frame_outset.png");
-    border-image-slice: 2 2 2 2;}
-#whiskermenu-window treeview {
-  padding-left: 5px;
-  padding-right: 5px;
-  padding-top: 2px;
-  padding-bottom: 2px; }
+  #whiskermenu-window treeview {
+    padding-left: 2px;
+    padding-right: 5px;
+    padding-top: 1px;
+    padding-bottom: 1px; }
   #whiskermenu-window button {
-    padding: 2px;
-    min-height: 16px; }
+    padding: 1px;
+    min-height: 16px;
+    min-width: 16px; }
     #whiskermenu-window button:not(:hover):not(:checked) {
       border-color: transparent;
       box-shadow: none;
       background-color: transparent; }
-#whiskermenu-window scrolledwindow viewport button:hover {
-  outline-color: @border_bright; }
-#whiskermenu-window separator {
-  margin: 5px; }
-#whiskermenu-window frame {
+  #whiskermenu-window scrolledwindow {
+    border: none;
+    box-shadow: none; }
+    #whiskermenu-window scrolledwindow.frame {
+      padding: 0px;
+      border: 2px solid @border_dark;
+      border-image: url("../assets/frame_inset.png");
+      border-image-slice: 2 2 2 2;
+      border-radius: 0px;
+      box-shadow: none; }
+  #whiskermenu-window scrolledwindow viewport button:hover {
+    outline-color: @border_bright; }
+  #whiskermenu-window separator {
+    margin: 5px; }
+  #whiskermenu-window > frame {
+    border: 2px solid @border_dark;
+    border-image: url("../assets/frame_outset.png");
+    border-image-slice: 2 2 2 2;}
+    #whiskermenu-window > frame > stack > box > box:first-child {
+      padding: 2px;
+      margin: 0;
+      color: @text_color;
+      /*background-image: linear-gradient(to right, @selected_bg_color, @transparent);*/ /* Note: You can setup a gradient here if you want! */ }
+  #whiskermenu-window frame {
 /* 
    These are the Whisker Menu side bar images to replicate Windows 95.
    comment branding_C95.png and uncomment which one you would prefer to use:
-    - w95-orig: the original from the boss
     - w95: Replicated version of the original in a higher resolution
-    - l95: A linux version
-    - C95: Branded version of this theme
+    - w95-orig: the original from the boss
+    - L95: A linux version
+    - L95_aliased: A linux version with aliased font style.
+    - C95: A Chicago95 version of this theme.
+    - C95_aliased: A Chicago95 version with aliased font style.
    If none of these catch your fancy edit misc/whisker-sidebar.svg in 
    Inkscape
 */
-/*  background-image: url("../assets/branding_W95.png"); */
-/*  background-image: url("../assets/branding_W95-orig.png"); */
-/*  background-image: url("../assets/branding_L95.png"); */
-/*  background-image: url("../assets/branding_L95_aliased.png"); */
-/*  background-image: url("../assets/branding_C95.png"); */
-  background-image: url("../assets/branding_C95_aliased.png");
-  background-repeat: no-repeat;
-  background-position: 0% 100%; }
-#whiskermenu-window frame > stack {
-margin-left: 18px; }
-  #whiskermenu-window frame > stack > box > stack > box > scrolledwindow {
-    padding: 5px;
-    border-top: 1px solid transparent;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-    border-left: 1px solid @border_shade;
-    box-shadow: inset 1px 0px @border_bright; }
-    #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button {
+/*    background-image: url("../assets/branding_W95.png"); */
+/*    background-image: url("../assets/branding_W95-orig.png"); */
+/*    background-image: url("../assets/branding_L95.png"); */
+/*    background-image: url("../assets/branding_L95_aliased.png"); */
+/*    background-image: url("../assets/branding_C95.png"); */
+    background-image: url("../assets/branding_C95_aliased.png");
+    background-repeat: no-repeat;
+    background-position: 0% 100%; }
+    #whiskermenu-window frame > stack,
+    #whiskermenu-window frame > box { /* frame > box is for older versions of Whisker menu. */
+      margin-left: 18px; }
+    #whiskermenu-window frame scrolledwindow button {
       border: 1px solid transparent;
       background-color: @selected_bg_color;
       box-shadow: none; }
-      #whiskermenu-window frame > stack > box > stack > box > scrolledwindow button:checked {
+      #whiskermenu-window frame scrolledwindow button:checked {
       background-color: @border_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 {
+      #whiskermenu-window frame scrolledwindow button:hover,
+      #whiskermenu-window frame scrolledwindow button:active,
+      #whiskermenu-window frame scrolledwindow button:checked {
         color: white; }
-  #whiskermenu-window > frame > stack > box > box:first-child {
-    padding: 2px;
-    margin: 0;
-    color: @text_color;
-    /*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; }
-#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; }
-#whiskermenu-window stack > scrolledwindow {
-  border-left: 1px solid @border_dark;
-  border-right: 1px solid @border_bright;
-  border-top: 1px solid @border_dark;
-  border-bottom: 1px solid @border_bright;
-  box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
-  background: @base_color;
-  padding: 1px; }
+    #whiskermenu-window frame > box > box > box button image {
+      padding: 0px; }
+  #whiskermenu-window entry {
+    margin-top: 3px;
+    margin-bottom: 3px;
+    min-height: 16px; }
+  #whiskermenu-window scrollbar button {
+    margin: 0px;
+    padding: 0px;
+    min-width: 16px;
+    min-height: 16px;
+    border: none;
+    box-shadow: none; }
+  #whiskermenu-window frame, #whiskermenu-window GtkListBox, #whiskermenu-window scrolledwindow, #whiskermenu-window viewport {
+    background-color: transparent; }
diff --git a/Theme/Chicago95/gtk-3.24/apps/xfce.css b/Theme/Chicago95/gtk-3.24/apps/xfce.css
index e78740b..2739601 100644
--- a/Theme/Chicago95/gtk-3.24/apps/xfce.css
+++ b/Theme/Chicago95/gtk-3.24/apps/xfce.css
@@ -96,6 +96,23 @@ wnck-pager {
     background-color: @border_shade;
     color: white; }
 
+/* Panel entry */
+/* NOTE! Entry background colouring is bugged in some versions of XFCE. */
+.xfce4-panel entry {
+  background-color: @base_color;
+  margin: 2px;
+  box-shadow: none; }
+  .xfce4-panel entry selection {
+    background-color: @selected_bg_color;
+    color: @text_bright }
+
+/* Plugin buttons */
+.xfce4-panel .toggle {
+  border: none;
+  box-shadow: none;
+  margin: 0px;
+  background-color: transparent; }
+
 /* Tasklist */
 .tasklist .toggle {
   /* We remove borders and shadows for the '.tasklist' '.toggle' button 
@@ -151,11 +168,14 @@ wnck-pager {
 
 /* XFCE Power Manager plugin */
 #xfce4-power-manager-plugin,
-#xfce4-power-manager-plugin:active {
+#xfce4-power-manager-plugin:active,
+#xfce4-power-manager-plugin:hover,
+#xfce4-power-manager-plugin:checked {
   margin: 0px;
   box-shadow: none;
   border: transparent; }
   #xfce4-power-manager-plugin * {
+    -gtk-icon-style: regular;
     -gtk-icon-transform: scale(1); }
 
 /* XFCE Notification plugin */
@@ -201,7 +221,8 @@ wnck-pager {
     border-bottom-color: @border_dark; }
 
 /* XFCE terminal */
-#xfce4-terminal-notebook overlay > box {
+#xfce4-terminal-notebook overlay > box,
+#xfce4-terminal-notebook stack > box { {
   border: 2px solid @border_dark;
   border-image: url("../assets/frame_inset.png");
   border-image-slice: 2 2 2 2;
@@ -218,3 +239,12 @@ wnck-pager {
       padding: 0px;
       margin-top: -1px;
       margin-bottom: -2px; }
+
+/* XFCE Session logout dialogue */
+/* Doesn't look like this works, so moving it to the override... */
+.xfsm-logout-dialog {
+  border-left: 1px solid @border_bright;
+  border-top: 1px solid @border_bright;
+  border-bottom: 1px solid @border_dark;
+  border-right: 1px solid @border_dark;
+  box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light; }
diff --git a/Theme/Chicago95/gtk-3.24/gtk-frames.css b/Theme/Chicago95/gtk-3.24/gtk-frames.css
index c2fcf96..ec359cf 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-frames.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-frames.css
@@ -83,7 +83,6 @@ statusbar {
 
 scrolledwindow.frame {
   padding: 0px;
-  padding-right: 1px;
   background-color: @base_color;
   border: 2px solid @border_dark;
   border-image: url("assets/frame_inset.png");
diff --git a/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css b/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css
index 48b3573..3fa34d5 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css
@@ -10,7 +10,7 @@
 */
 
 scrolledwindow {
-  padding: 1px;
+  padding: 0px;
   background-color: @bg_color;
   border: 2px solid @border_dark;
   border-image: url("assets/frame_inset.png");
diff --git a/Theme/Chicago95/gtk-3.24/gtk-widgets.css b/Theme/Chicago95/gtk-3.24/gtk-widgets.css
index 42cf938..7b9b533 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-widgets.css
@@ -448,10 +448,9 @@ grid viewport box box textview {
 .dialog-vbox flowbox flowboxchild:focus {
   outline-color: @selected_fg_color; }
 
-.dialog-vbox > grid {
-  border: 1px solid red;
+/*.dialog-vbox > grid {
   border: 2px solid @border_dark;
   border-image: url("assets/frame_inset.png");
   border-image-slice: 2 2 2 2;
   border-radius: 0px;
-  box-shadow: none; }
+  box-shadow: none; }*/