diff --git a/Theme/Chicago95/gtk-3.0/apps/xfce.css b/Theme/Chicago95/gtk-3.0/apps/xfce.css
index 1b18e77..db69454 100644
--- a/Theme/Chicago95/gtk-3.0/apps/xfce.css
+++ b/Theme/Chicago95/gtk-3.0/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 
@@ -133,7 +150,7 @@ wnck-pager {
       border-top: 3px solid @border_dark;
       border-image: url("../buttons/toggle_pressed.png");
       border-image-slice: 3 2 2 2;
-      background-color:  @scrollbar_trough_bg_color; /* This is how windows themes are applied */
+      background-color: @scrollbar_trough_bg_color; /* This is how windows themes are applied */
       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%, @bg_dark);
       background-size: 2px 2px;
       background-position: 0 0, 1px 1px;
@@ -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,6 +221,7 @@ wnck-pager {
     border-bottom-color: @border_dark; }
 
 /* XFCE terminal */
+#xfce4-terminal-notebook overlay > box,
 #xfce4-terminal-notebook stack > box {
   border: 2px solid @border_dark;
   border-image: url("../assets/frame_inset.png");
@@ -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.0/gtk-basic-effects.css b/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css
index 4ed6175..cf82b7a 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css
@@ -32,8 +32,7 @@ slider {
   border-radius: 0px; }
   /* Makes a checkerboard */
   slider:disabled,
-  trough,
-  paned > separator {
+  trough {
     background-color: @scrollbar_trough_bg_color;
     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%, @bg_dark);
     background-size: 2px 2px;
diff --git a/Theme/Chicago95/gtk-3.0/gtk-combobox.css b/Theme/Chicago95/gtk-3.0/gtk-combobox.css
index 210b8a1..d645d89 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-combobox.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-combobox.css
@@ -47,23 +47,29 @@ combobox entry {
 
 /* Combobox window and menu decorations */
 combobox window decoration {
-  padding: 1px;
-  border: 1px solid @border_dark;
-  background-color: @bg_bright;
-  box-shadow: none; }
-combobox window menu {
-  background-color: @bg_bright;
-  border-color: @bg_bright; }
-
+  padding: 0px;    /* Padding is not required here. */
+  border: 1px solid @border_dark; }    /* Need to make the border 1px and a solid colour. */
+combobox window .context-menu,
+combobox window menu {    /* The combobox window menu is included for sub-menus that branch off of the .context-menu. */
+  background-color: @bg_bright;    /* Background colour needs to be applied. */
+  border: none; }    /* Borders are not necessary here. */
+  combobox window .context-menu menuitem {
+    padding: 1px; }    /* Menuitems need only be 1px. */
+    combobox window .context-menu separator {
+      margin-left: 1px;    /* A margin is required so that the separator isn't touching the menu border. */
+      margin-right: 1px; }    /* A margin is required so that the separator isn't touching the menu border. */
 #gtk-combobox-popup-menu,
 #gtk-combobox-popup-menu window {
-  border: none;
-  box-shadow: none;
-  background-color: @bg_bright; }
+  border: none;    /* Borders are not necessary here. */
+  box-shadow: none;    /* Box shadows are not necessary here. */
+  background-color: @bg_bright; }    /* Background colour needs to be applied. */
   #gtk-combobox-popup-menu arrow  {
     -gtk-icon-source: none; }
   #gtk-combobox-popup-menu menuitem {
-    padding: 0px; }
+    padding: 0px;    /* Remove any inherited padding. */
+    padding-left: 2px;    /* Need padding on the left to keep menuitem images from touching the border. */
+    padding-right: 2px;    /* Need padding on the right to keep menuitem images from touching the border. */
+    min-height: 16px; }
 
 /* Combobox arrows */
 combobox arrow {
diff --git a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
index 648f009..543313e 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
@@ -9,29 +9,31 @@
    Make sure that all changes made here are part of the GtkHeaderbar.
 */
 
+/* This applies to GTK Client Side Decorations (CSD) */
+
 headerbar,
 .titlebar {
   padding: 0px;
   padding-left: 2px;
   padding-right: 2px;
-  background-color: @selected_bg_color;
+  background-color: @window_title_bg_color;
   background-image: none;
   text-shadow: none; }
   headerbar:backdrop,
   .titlebar:backdrop {
     background-image: none;
-    background-color: @selected_inactive_bg_color; }
+    background-color: @inactive_title_bg_color; }
   headerbar .title,
   headerbar .subtitle,
   headerbar > checkbutton label,
   .titlebar > checkbutton label {
     font-size: 8pt;
-    color: @selected_fg_color; }
+    color: @window_title_text_color; }
     headerbar .title:backdrop,
     headerbar .subtitle:backdrop,
     headerbar:backdrop > checkbutton label,
     .titlebar:backdrop > checkbutton label {
-      color: @selected_inactive_fg_color; }
+      color: @inactive_title_bg_color; }
   headerbar entry {
     margin: 3px;
     padding-top: 1px;
diff --git a/Theme/Chicago95/gtk-3.0/gtk-menu.css b/Theme/Chicago95/gtk-3.0/gtk-menu.css
index 563d11b..d354f63 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-menu.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-menu.css
@@ -26,36 +26,34 @@ window > menu {
 
 /* NOTE: Menu border styling is moved to client side decorations. See gtk-window.css for menu border styling. */
 menu {
-  border-left: 3px solid transparent;
-  border-right: 3px solid transparent;
-  border-top: 2px solid transparent;
-  border-bottom: 2px solid transparent;
-  background-color: @menu_bg_color;
+  border: 1px solid transparent;
+  background-color: @menu_bg_color;    /* NOTE: While a background colour is required here, there will be a 2px internal padding applied to window decorations which will also have a background colour too. */ 
   color: @menu_text_color; }
+  /* menuitem */
+  menu menuitem {
+    padding-left: 2px;
+    padding-right: 2px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    background-color: transparent; }
+    menu menuitem check,
+    menu menuitem radio {
+      padding-right: 4px; }
+    menuitem:active,
+    menuitem:hover {
+      background-color: @theme_selected_bg_color;
+      color: @selected_fg_color; }
 
 /* menubar */
 menubar, 
 .menubar {
-  -GtkWidget-window-dragging: false; }
+  -GtkWidget-window-dragging: false;
+  background-color: @menu_bg_color;
+  color: @menu_text_color; }
   menubar menuitem {
     padding: 0px 6px;
     min-height:17px; }
 
-/* menuitem */
-menu menuitem {
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  background-color: @menu_bg_color; }
-  menu menuitem check,
-  menu menuitem radio {
-    padding-right: 4px; }
-  menuitem:active,
-  menuitem:hover {
-    background-color: @theme_selected_bg_color;
-    color: @selected_fg_color; }
-
 menu separator {
   padding: 3px;
   border: none;
diff --git a/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css b/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css
index 51c5b56..b395f78 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css
@@ -18,7 +18,7 @@ scrollbar {
   scrollbar slider {
     margin-top: 0px;
     padding: 0px;
-    background-color: @scrollbar_trough_bg_color;
+    background-color: @scrollbar_bg_color;
     border: 2px solid @border_dark;
     box-shadow: none;
     border-image: url("scrollbar/scrollbar_button.png");
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index 42cf938..7b9b533 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/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; }*/
diff --git a/Theme/Chicago95/gtk-3.0/gtk-window.css b/Theme/Chicago95/gtk-3.0/gtk-window.css
index 46817e1..dc40a32 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-window.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-window.css
@@ -13,7 +13,7 @@
  * The border image contains a 8px surrounding transparency with an additional non-transparent 2px for the border. This gives the illusion of a 2px border image instead of the full 10px. */
 window decoration,
 dialog > decoration {
-  padding: 2px;
+  padding: 2px;    /* Padding is required so that there is some space between the window decoration border and any internal components. */
   border: 10px solid @border_dark;
   background-color: @bg_color;
   border-image: url("assets/window_decoration.png");
diff --git a/Theme/Chicago95/gtk-3.0/gtk.css b/Theme/Chicago95/gtk-3.0/gtk.css
index 20aeed9..62ebabe 100755
--- a/Theme/Chicago95/gtk-3.0/gtk.css
+++ b/Theme/Chicago95/gtk-3.0/gtk.css
@@ -7,7 +7,7 @@
 
 /* Comment about Pop-overs: I couldn't get over how much they looked like Clippy in MS Office 97 so thats why the buttons are different */
 
-/* Do not remove 
+/* Do not remove */
 
 /* default color scheme */
 @define-color bg_color #c0c0c0; /* Window Theme: buttonface */
@@ -52,7 +52,6 @@
 @define-color inactive_title_bg_color #808080; /* Windows Theme: inactivetitle */
 @define-color inactive_title_text_color #c0c0c0; /* Windows Theme: inactivetitletext */
 
-
 /* dark color scheme */
 @define-color dark_bg_color @bg_color;
 @define-color dark_fg_color @fg_color;
diff --git a/Theme/Chicago95/gtk-3.24/apps/xfce.css b/Theme/Chicago95/gtk-3.24/apps/xfce.css
index 2739601..db69454 100644
--- a/Theme/Chicago95/gtk-3.24/apps/xfce.css
+++ b/Theme/Chicago95/gtk-3.24/apps/xfce.css
@@ -222,7 +222,7 @@ wnck-pager {
 
 /* XFCE terminal */
 #xfce4-terminal-notebook overlay > box,
-#xfce4-terminal-notebook stack > 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;
diff --git a/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css b/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css
index 4ed6175..cf82b7a 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css
@@ -32,8 +32,7 @@ slider {
   border-radius: 0px; }
   /* Makes a checkerboard */
   slider:disabled,
-  trough,
-  paned > separator {
+  trough {
     background-color: @scrollbar_trough_bg_color;
     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%, @bg_dark);
     background-size: 2px 2px;
diff --git a/Theme/Chicago95/gtk-3.24/gtk-combobox.css b/Theme/Chicago95/gtk-3.24/gtk-combobox.css
index 210b8a1..d645d89 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-combobox.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-combobox.css
@@ -47,23 +47,29 @@ combobox entry {
 
 /* Combobox window and menu decorations */
 combobox window decoration {
-  padding: 1px;
-  border: 1px solid @border_dark;
-  background-color: @bg_bright;
-  box-shadow: none; }
-combobox window menu {
-  background-color: @bg_bright;
-  border-color: @bg_bright; }
-
+  padding: 0px;    /* Padding is not required here. */
+  border: 1px solid @border_dark; }    /* Need to make the border 1px and a solid colour. */
+combobox window .context-menu,
+combobox window menu {    /* The combobox window menu is included for sub-menus that branch off of the .context-menu. */
+  background-color: @bg_bright;    /* Background colour needs to be applied. */
+  border: none; }    /* Borders are not necessary here. */
+  combobox window .context-menu menuitem {
+    padding: 1px; }    /* Menuitems need only be 1px. */
+    combobox window .context-menu separator {
+      margin-left: 1px;    /* A margin is required so that the separator isn't touching the menu border. */
+      margin-right: 1px; }    /* A margin is required so that the separator isn't touching the menu border. */
 #gtk-combobox-popup-menu,
 #gtk-combobox-popup-menu window {
-  border: none;
-  box-shadow: none;
-  background-color: @bg_bright; }
+  border: none;    /* Borders are not necessary here. */
+  box-shadow: none;    /* Box shadows are not necessary here. */
+  background-color: @bg_bright; }    /* Background colour needs to be applied. */
   #gtk-combobox-popup-menu arrow  {
     -gtk-icon-source: none; }
   #gtk-combobox-popup-menu menuitem {
-    padding: 0px; }
+    padding: 0px;    /* Remove any inherited padding. */
+    padding-left: 2px;    /* Need padding on the left to keep menuitem images from touching the border. */
+    padding-right: 2px;    /* Need padding on the right to keep menuitem images from touching the border. */
+    min-height: 16px; }
 
 /* Combobox arrows */
 combobox arrow {
diff --git a/Theme/Chicago95/gtk-3.24/gtk-menu.css b/Theme/Chicago95/gtk-3.24/gtk-menu.css
index aa5cd4e..d354f63 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-menu.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-menu.css
@@ -26,37 +26,33 @@ window > menu {
 
 /* NOTE: Menu border styling is moved to client side decorations. See gtk-window.css for menu border styling. */
 menu {
-  border-left: 3px solid transparent;
-  border-right: 3px solid transparent;
-  border-top: 2px solid transparent;
-  border-bottom: 2px solid transparent;     
-  background-color: @menu_bg_color;
+  border: 1px solid transparent;
+  background-color: @menu_bg_color;    /* NOTE: While a background colour is required here, there will be a 2px internal padding applied to window decorations which will also have a background colour too. */ 
   color: @menu_text_color; }
+  /* menuitem */
+  menu menuitem {
+    padding-left: 2px;
+    padding-right: 2px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    background-color: transparent; }
+    menu menuitem check,
+    menu menuitem radio {
+      padding-right: 4px; }
+    menuitem:active,
+    menuitem:hover {
+      background-color: @theme_selected_bg_color;
+      color: @selected_fg_color; }
 
 /* menubar */
 menubar, 
 .menubar {
   -GtkWidget-window-dragging: false;
-    background-color: @menu_bg_color;
-    color: @menu_text_color; }
+  background-color: @menu_bg_color;
+  color: @menu_text_color; }
   menubar menuitem {
     padding: 0px 6px;
-    min-height:17px;}
-
-/* menuitem */
-menu menuitem {
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  background-color: @menu_bg_color; }
-  menu menuitem check,
-  menu menuitem radio {
-    padding-right: 4px; }
-  menuitem:active,
-  menuitem:hover {
-    background-color: @theme_selected_bg_color;
-    color: @selected_fg_color; }
+    min-height:17px; }
 
 menu separator {
   padding: 3px;
diff --git a/Theme/Chicago95/gtk-3.24/gtk-scrollbar.css b/Theme/Chicago95/gtk-3.24/gtk-scrollbar.css
index 13149c7..b395f78 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-scrollbar.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-scrollbar.css
@@ -36,7 +36,7 @@ scrollbar {
     margin: 0px;
     padding: 0px;
     border: none;
-    background-color: @scrollbar_bg_color;
+    background-color: @scrollbar_trough_bg_color;
     box-shadow: none; }
     scrollbar button:disabled {
       background-image: url("scrollbar/scrollbar_button_disabled.png"); }
@@ -45,7 +45,7 @@ scrollbar {
       min-width: 16px;
       min-height: 16px;
       border: 1px solid @border_shade; 
-      background-color: @scrollbar_bg_color;
+      background-color: @scrollbar_trough_bg_color;
       background-image: none;
       box-shadow: none; }
   /* Every other scrollbar that isn't Libreoffice */
@@ -55,7 +55,7 @@ scrollbar {
   scrollbar button.right {
     margin: 0px;
     padding: 0px;
-    background-color: @scrollbar_bg_color;
+    background-color: @scrollbar_trough_bg_color;
     -gtk-icon-source: none;
     background-position: center;
     background-repeat: no-repeat;
diff --git a/Theme/Chicago95/gtk-3.24/gtk-window.css b/Theme/Chicago95/gtk-3.24/gtk-window.css
index 46817e1..dc40a32 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-window.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-window.css
@@ -13,7 +13,7 @@
  * The border image contains a 8px surrounding transparency with an additional non-transparent 2px for the border. This gives the illusion of a 2px border image instead of the full 10px. */
 window decoration,
 dialog > decoration {
-  padding: 2px;
+  padding: 2px;    /* Padding is required so that there is some space between the window decoration border and any internal components. */
   border: 10px solid @border_dark;
   background-color: @bg_color;
   border-image: url("assets/window_decoration.png");
diff --git a/Theme/Chicago95/gtk-3.24/gtk.css b/Theme/Chicago95/gtk-3.24/gtk.css
index cb26519..62ebabe 100755
--- a/Theme/Chicago95/gtk-3.24/gtk.css
+++ b/Theme/Chicago95/gtk-3.24/gtk.css
@@ -7,6 +7,8 @@
 
 /* Comment about Pop-overs: I couldn't get over how much they looked like Clippy in MS Office 97 so thats why the buttons are different */
 
+/* Do not remove */
+
 /* default color scheme */
 @define-color bg_color #c0c0c0; /* Window Theme: buttonface */
 @define-color fg_color #000000; /* Windows Theme: windowtext */