diff --git a/Extras/override/gtk-3.22/gtk.css b/Extras/override/gtk-3.22/gtk.css
index b206d44..702ad34 100755
--- a/Extras/override/gtk-3.22/gtk.css
+++ b/Extras/override/gtk-3.22/gtk.css
@@ -1,31 +1,31 @@
-/* XFCE Panel bar */
+/* GTK 3.22 Theme Override for the Chicago95 theme.
+ * REMOVE THIS FILE WHEN USING OTHER GTK THEMES! */
+
+/* XFCE APP: XFCE Panel bar
+ * Add a border around the panelbar. */
 .xfce4-panel {
   border-right: 1px solid @bg_shade;
   border-left: 1px solid @bg_bright;
   border-top: 1px solid @bg_bright;
   border-bottom: 1px solid @bg_shade; }
 
-/* This just keeps the power manager plugin icon to stay small. Only useful for XUbuntu 18.04; not required for 19.04.*/
+/* XFCE APP: XFCE Power Manager
+ * This helps keep the power manager plugin icon in the panel bar to
+ * stay small with the other plugin icons. */
 #xfce4-power-manager-plugin { 
   padding: 6px 6px; }
 
-/* Force MATE panel tasklist margins */
-#tasklist-button {
-  margin-left: 2px;
-  margin-right: 2px; }
-
-/* GNOME Disk utility */
-/* This is a fix for the GNOME disk application grid style. */ 
+/* XFCE APP: Color Profiles
+ * Add a background colour since the color profile app overrides the GTK theme. */
+.color-profiles {
+  background-color: @bg_color; }
 
+/* GNOME APP: GNOME Disks
+ * This is a fix for the GNOME Disks application grid style. */ 
 .gnome-disk-utility-grid {
   background-color: @bg_shade;
   color: @font_bright;
   border-radius: 0px;
-  outline-color: white; }
+  outline-color: @border_bright; }
   .gnome-disk-utility-grid:backdrop {
     background-color: @bg_shade; }
-
-/* XFCE APP: Color Profiles */
-/* Force a background colour since the color profile app overrides the GTK theme. */
-.color-profiles {
-  background-color: #c0c0c0; }
diff --git a/Extras/override/gtk-3.24/gtk.css b/Extras/override/gtk-3.24/gtk.css
index b903b6f..e61c5ea 100755
--- a/Extras/override/gtk-3.24/gtk.css
+++ b/Extras/override/gtk-3.24/gtk.css
@@ -1,24 +1,13 @@
-/* Force MATE panel tasklist margins */
-#tasklist-button {
-  margin-left: 2px;
-  margin-right: 2px; }
+/* GTK 3.24 Theme Override for the Chicago95 theme.
+ * REMOVE THIS FILE WHEN USING OTHER GTK THEMES! */
 
-/* GNOME Disk utility */
-/* This is a fix for the GNOME disk application grid style. */ 
-
-.gnome-disk-utility-grid {
-  background-color: @bg_shade;
-  color: @font_bright;
-  border-radius: 0px;
-  outline-color: white; }
-  .gnome-disk-utility-grid:backdrop {
-    background-color: @bg_shade; }
-
-/* XFCE APP: Color Profiles */
+/* XFCE APP: Color Profiles
+ * Add a background colour since the color profile app overrides the GTK theme. */
 .color-profiles {
-  background-color: #c0c0c0; }
+  background-color: @bg_color; }
 
-/* XFCE Session logout dialogue */
+/* XFCE APP: XFCE Session logout dialogue
+ * Add a border to the logout dialogue. */
 .xfsm-logout-dialog {
   border-left: 1px solid @border_bright;
   border-top: 1px solid @border_bright;
@@ -26,11 +15,23 @@
   border-right: 1px solid @border_dark;
   box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light; }
 
-/* Thunar borders */
+/* XFCE APP: Thunar
+ * Add a border effect to areas where Thunar will attempt to override. */
 .thunar .sidebar {
   border-right: 2px solid @border_color; }
-  
 .thunar notebook .standard-view {
   padding: 0px;
   border-left: 2px solid @border_color;
   border-right: 2px solid @border_color; }
+
+/* GNOME APP: GNOME Disks
+ * This is a fix for the GNOME Disks application grid style. */ 
+.gnome-disk-utility-grid {
+  background-color: @bg_shade;
+  color: @font_bright;
+  border-radius: 0px;
+  outline-color: @border_bright; }
+  .gnome-disk-utility-grid:backdrop {
+    background-color: @bg_shade; }
+
+
diff --git a/Icons/Chicago95-tux/devices/16/computer-symbolic.png b/Icons/Chicago95-tux/devices/16/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/16/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95-tux/devices/22/computer-symbolic.png b/Icons/Chicago95-tux/devices/22/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/22/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95-tux/devices/24/computer-symbolic.png b/Icons/Chicago95-tux/devices/24/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/24/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95-tux/devices/48/computer-symbolic.png b/Icons/Chicago95-tux/devices/48/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/48/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/16/computer-symbolic.png b/Icons/Chicago95/devices/16/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95/devices/16/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/22/computer-symbolic.png b/Icons/Chicago95/devices/22/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95/devices/22/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/24/computer-symbolic.png b/Icons/Chicago95/devices/24/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95/devices/24/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/48/computer-symbolic.png b/Icons/Chicago95/devices/48/computer-symbolic.png
new file mode 120000
index 0000000..9282466
--- /dev/null
+++ b/Icons/Chicago95/devices/48/computer-symbolic.png
@@ -0,0 +1 @@
+computer.png
\ No newline at end of file