diff --git a/Extras/DOSrc b/Extras/DOSrc
index 63d6b5a..1b3795d 100644
--- a/Extras/DOSrc
+++ b/Extras/DOSrc
@@ -11,7 +11,6 @@
 function msdos_pwd
 {
     local dir="`pwd`"
-    dir=${dir/$HOME/'~'}
 
     echo $dir | tr '/' '\\'
 }
diff --git a/Theme/Chicago95/gtk-3.0/apps/thunar.css b/Theme/Chicago95/gtk-3.0/apps/thunar.css
index 6938055..ed40696 100644
--- a/Theme/Chicago95/gtk-3.0/apps/thunar.css
+++ b/Theme/Chicago95/gtk-3.0/apps/thunar.css
@@ -2,8 +2,6 @@
  * Thunar *
  **********/
 
-/* Created 2020-04-01 by EMH-Mark-I */
-
 /*Contributor notes:
 Please use two space indentions.
 Stack all related and child selectors and selector states into a logical hierarchy to a readable degree.
diff --git a/Theme/Chicago95/gtk-3.0/assets/Wait_2.png b/Theme/Chicago95/gtk-3.0/assets/Wait_2.png
deleted file mode 100644
index 502ec9f..0000000
Binary files a/Theme/Chicago95/gtk-3.0/assets/Wait_2.png and /dev/null differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/expander_minus.png b/Theme/Chicago95/gtk-3.0/assets/expander_minus.png
new file mode 100644
index 0000000..c9e3dde
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/expander_minus.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/expander_minus_highlight.png b/Theme/Chicago95/gtk-3.0/assets/expander_minus_highlight.png
new file mode 100644
index 0000000..9fa7ede
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/expander_minus_highlight.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/expander_plus.png b/Theme/Chicago95/gtk-3.0/assets/expander_plus.png
new file mode 100644
index 0000000..fae71bb
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/expander_plus.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/expander_plus_highlight.png b/Theme/Chicago95/gtk-3.0/assets/expander_plus_highlight.png
new file mode 100644
index 0000000..31f5658
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/expander_plus_highlight.png differ
diff --git a/Theme/Chicago95/gtk-3.0/gtk-combobox.css b/Theme/Chicago95/gtk-3.0/gtk-combobox.css
index 77b0448..591d75d 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-combobox.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-combobox.css
@@ -20,7 +20,7 @@ combobox {
     margin-right: 2px;
     margin-left: 2px;
     min-width: 16px;
-    min-height: 16px; }
+    min-height: 15px; } /* Set to 15px to prevent scaling issues with arrow icon. */
     combobox button:active,
     combobox button:checked {
       border-color: @border_shade;
@@ -29,9 +29,7 @@ combobox {
     padding-left: 0px; }
 
 /* The default cellview top or bottom margin will affect the arrow icon scaling in the combobox button. To resolve this, we will add a negative margin. */ 
-combobox button cellview {
-  margin-bottom: -1px;
-  padding-left: 1px; }
+
 
 /* Combobox entry */
 combobox entry {
@@ -70,12 +68,15 @@ combobox window menu {    /* The combobox window menu is included for sub-menus
     padding-right: 2px;    /* Need padding on the right to keep menuitem images from touching the border. */
     min-height: 16px; }
 
+
 /* Combobox arrows */
 combobox arrow {
   -gtk-icon-source: url("assets/vcl-combobox-arrow-down.png");
+  margin-bottom: -1px; 
   min-width: 16px;
   min-height: 16px; } /* 16px icons only or else Libreoffice will distort the icon. */
   combobox:disabled arrow:disabled {
+  margin-bottom: -1px; 
   min-width: 16px;
   min-height: 16px;
   -gtk-icon-source: url("assets/vcl-combobox-arrow-down-disabled.png");
@@ -84,16 +85,18 @@ combobox arrow {
   combobox > box > button > box > arrow {
     background-image: url("assets/vcl-combobox-arrow-down.png");
     background-repeat: no-repeat;
-    background-position: 0px 0px;
+    background-position: 50% 50%;
     background-size: 16px 16px;
+    margin-bottom: -1px; 
     min-width: 16px;
     min-height: 16px;
     -gtk-icon-source: none; }
     combobox:disabled > box > button > box > arrow:disabled {
       background-image: url("assets/vcl-combobox-arrow-down-disabled.png");
       background-repeat: no-repeat;
-      background-position: 0px 0px;
+      background-position: 50% 50%;
       background-size: 16px 16px;
+      margin-bottom: -1px; 
       min-width: 16px;
       min-height: 16px;
-      -gtk-icon-source: none; }
+-gtk-icon-source: none; }
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index d08b15e..f7ee2b7 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -19,7 +19,7 @@
   -GtkTextView-error-underline-color: @error_color;
   -GtkToolButton-icon-spacing: 6;
   -GtkToolItemGroup-expander-size: 8;
-  -GtkTreeView-expander-size: 18;
+  -GtkTreeView-expander-size: 16;
   -GtkWindow-resize-grip-default: true;
   -GtkWindow-resize-grip-height: 16;
   -GtkWindow-resize-grip-width: 16;
@@ -182,7 +182,13 @@ expander arrow {
     background-image: url("assets/arrow-down-selected.png"); }
 
 treeview.view.expander {
-  -gtk-icon-transform: scale(0.55); } /* NOTE: This sets the treeview expander arrow size within the expander button area. */
+ -gtk-icon-source: url("assets/expander_plus.png"); }
+  treeview.view.expander:selected {
+    -gtk-icon-source: url("assets/expander_plus_highlight.png"); }
+  treeview.view.expander:checked {
+    -gtk-icon-source: url("assets/expander_minus.png"); }
+  treeview.view.expander:checked:selected {
+    -gtk-icon-source: url("assets/expander_minus_highlight.png"); }
 
 /************
  * iconview *