diff --git a/Theme/Chicago95/gtk-3.0/apps/xfce.css b/Theme/Chicago95/gtk-3.0/apps/xfce.css
index 97c4086..6f13279 100644
--- a/Theme/Chicago95/gtk-3.0/apps/xfce.css
+++ b/Theme/Chicago95/gtk-3.0/apps/xfce.css
@@ -234,6 +234,7 @@ wnck-pager {
 #xfce4-terminal-notebook overlay > box,
 #xfce4-terminal-notebook stack > box,
 #xfce4-terminal-notebook stack scrolledwindow {
+  margin: 0;
   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.0/assets/frame_outset.png b/Theme/Chicago95/gtk-3.0/assets/frame_outset.png
index 198e7fc..c416396 100644
Binary files a/Theme/Chicago95/gtk-3.0/assets/frame_outset.png and b/Theme/Chicago95/gtk-3.0/assets/frame_outset.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/mate_menu_decoration.png b/Theme/Chicago95/gtk-3.0/assets/mate_menu_decoration.png
index 81791a6..c416396 100644
Binary files a/Theme/Chicago95/gtk-3.0/assets/mate_menu_decoration.png and b/Theme/Chicago95/gtk-3.0/assets/mate_menu_decoration.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/window_decoration.png b/Theme/Chicago95/gtk-3.0/assets/window_decoration.png
index 806c10e..bd55211 100644
Binary files a/Theme/Chicago95/gtk-3.0/assets/window_decoration.png and b/Theme/Chicago95/gtk-3.0/assets/window_decoration.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/button_pressed.png b/Theme/Chicago95/gtk-3.0/buttons/button_pressed.png
index 06446b6..89b5235 100644
Binary files a/Theme/Chicago95/gtk-3.0/buttons/button_pressed.png and b/Theme/Chicago95/gtk-3.0/buttons/button_pressed.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/close_normal.png b/Theme/Chicago95/gtk-3.0/buttons/close_normal.png
index fd7c321..8e231ee 100755
Binary files a/Theme/Chicago95/gtk-3.0/buttons/close_normal.png and b/Theme/Chicago95/gtk-3.0/buttons/close_normal.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/dialog_button_focus.png b/Theme/Chicago95/gtk-3.0/buttons/dialog_button_focus.png
index 0e5a1f0..2f49605 100644
Binary files a/Theme/Chicago95/gtk-3.0/buttons/dialog_button_focus.png and b/Theme/Chicago95/gtk-3.0/buttons/dialog_button_focus.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/dialog_button_normal.png b/Theme/Chicago95/gtk-3.0/buttons/dialog_button_normal.png
index 7a768b8..7347205 100644
Binary files a/Theme/Chicago95/gtk-3.0/buttons/dialog_button_normal.png and b/Theme/Chicago95/gtk-3.0/buttons/dialog_button_normal.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/maximize_normal.png b/Theme/Chicago95/gtk-3.0/buttons/maximize_normal.png
index c926b58..471cb23 100755
Binary files a/Theme/Chicago95/gtk-3.0/buttons/maximize_normal.png and b/Theme/Chicago95/gtk-3.0/buttons/maximize_normal.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/minimize_normal.png b/Theme/Chicago95/gtk-3.0/buttons/minimize_normal.png
index 70c2a62..efb2c7e 100755
Binary files a/Theme/Chicago95/gtk-3.0/buttons/minimize_normal.png and b/Theme/Chicago95/gtk-3.0/buttons/minimize_normal.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/restore_normal.png b/Theme/Chicago95/gtk-3.0/buttons/restore_normal.png
index 46aea62..d2e0f5a 100755
Binary files a/Theme/Chicago95/gtk-3.0/buttons/restore_normal.png and b/Theme/Chicago95/gtk-3.0/buttons/restore_normal.png differ
diff --git a/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css b/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css
index b395f78..50c9bcc 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-scrollbar.css
@@ -38,8 +38,6 @@ scrollbar {
     border: none;
     background-color: @scrollbar_trough_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;
@@ -64,11 +62,6 @@ scrollbar {
     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 @border_shade; }
     scrollbar button.up:active,
     scrollbar button.down:active,
     scrollbar button.left:active,
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button.png b/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button.png
index cd5a5ed..add95ab 100644
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button.png and b/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button_disabled.png b/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button_disabled.png
deleted file mode 100644
index 693e0f7..0000000
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/scrollbar_button_disabled.png and /dev/null differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-active.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-active.png
index e3bd7fc..2f2cae1 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-active.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-active.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-insense.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-insense.png
index ace8993..0b644ac 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-insense.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down-insense.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down.png
index 09f09bf..e812af1 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-down.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-active.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-active.png
index 652f366..35fc20f 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-active.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-active.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-insense.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-insense.png
index 2ab91a7..a09ff8e 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-insense.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left-insense.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left.png
index 537f2d0..1ef3af0 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-left.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-active.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-active.png
index 4c37827..8131844 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-active.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-active.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-insense.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-insense.png
index 0716c03..e22b017 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-insense.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right-insense.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right.png
index 6804a04..3c5250d 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-right.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-active.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-active.png
index f11186e..d1dbdff 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-active.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-active.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-insense.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-insense.png
index e0d9ac5..b7151b0 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-insense.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up-insense.png differ
diff --git a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up.png b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up.png
index 48a3c5f..ba6960c 100755
Binary files a/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up.png and b/Theme/Chicago95/gtk-3.0/scrollbar/stepper-up.png differ
diff --git a/Theme/Chicago95/gtk-3.0/thumbnail.png b/Theme/Chicago95/gtk-3.0/thumbnail.png
index 48ae00d..b448cd7 100755
Binary files a/Theme/Chicago95/gtk-3.0/thumbnail.png and b/Theme/Chicago95/gtk-3.0/thumbnail.png differ
diff --git a/Theme/Chicago95/xfwm4/themerc b/Theme/Chicago95/xfwm4/themerc
index 5fd024a..53bb2ef 100755
--- a/Theme/Chicago95/xfwm4/themerc
+++ b/Theme/Chicago95/xfwm4/themerc
@@ -23,8 +23,8 @@ active_mid_1=#C0C0C0
 inactive_mid_1=#C0C0C0
 
 #buttonLight
-active_hilight_1=#DFDFDF
-inactive_hilight_1=#DFDFDF
+active_hilight_1=#C0C0C0
+inactive_hilight_1=#C0C0C0
 
 #buttonhilight
 active_hilight_2=#ffffff