diff --git a/Paper/gnome-shell/gnome-shell.css b/Paper/gnome-shell/gnome-shell.css
index c761ff3..6373fcf 100644
--- a/Paper/gnome-shell/gnome-shell.css
+++ b/Paper/gnome-shell/gnome-shell.css
@@ -1224,8 +1224,8 @@ StScrollBar {
   width: 34em;
   margin: 5px;
   border-radius: 6px;
-  color: #dbdee0;
-  background-color: #454d50;
+  color: #555;
+  background-color: #f7f7f7;
   border: 1px solid rgba(0, 0, 0, 0.2);
   spacing-rows: 4px;
   padding: 8px;
@@ -1269,6 +1269,8 @@ StScrollBar {
 .notification-button {
   height: 24px;
   padding: 4px 4px 5px;
+  color: #555;
+  background-color: #f7f7f7;
   border-radius: 0 0 6px 6px; }
 
 .notification-icon-button {
@@ -1276,7 +1278,12 @@ StScrollBar {
   height: 24px;
   width: 24px;
   border: none;
-  box-shadow: none; }
+  border-top-width: 1px;
+  color: #555;
+  background-color: #f7f7f7;
+  border-color: rgba(0,0,0,0.2);
+  border-radius: 0 0 3px 3px;
+  box-shadow: inset 0 1px rgba(255,255,255,0.1); }
   .notification-icon-button > StIcon {
     icons-size: 16px;
     width: 16px;
diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css
index 3bbec76..c8b2cf8 100644
--- a/Paper/gtk-3.0/apps/nautilus.css
+++ b/Paper/gtk-3.0/apps/nautilus.css
@@ -17,6 +17,10 @@
 */
 
 @define-color nautilus #636E73;
+@define-color disk_space_unknown #888a85;
+@define-color disk_space_used #9FB0B9;
+@define-color disk_space_free #D8D8D8;
+
 
 /**********
  * Header *
@@ -70,6 +74,105 @@ NautilusWindow .dynamic-notebook tab.right:active {
     box-shadow:inset 3px 0 0 0 @nautilus;
 }
 
+.nautilus-circular-button,
+.button .image-button .nautilus-circular-button {
+    border-radius: 50%;
+}
+
+.nautilus-canvas-item {
+    border-radius: 5px;
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.50);
+}
+
+.nautilus-canvas-item.dim-label:selected,
+.nautilus-list-dim-label:selected {
+    color: mix (@theme_selected_fg_color, @theme_selected_bg_color, 0.20);
+}
+
+.nautilus-desktop.nautilus-canvas-item {
+    color: @theme_selected_fg_color;
+    text-shadow: 1px 1px black;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active {
+    color: @theme_text_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:selected {
+    text-shadow: none;
+}
+
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
+    color: @theme_unfocused_selected_fg_color;
+}
+
+.nautilus-circular-button {
+  border-radius: 20px;
+  outline-radius: 20px;
+}
+
+/* Floating status bar */
+.floating-bar {
+  padding: 2px;
+  background-color: @background;
+  border-width: 1px;
+  border-style: solid solid none;
+  border-color: @border;
+  border-radius: 3px 3px 0 0;
+}
+
+.floating-bar.bottom.left { /* axes left border and border radius */
+  border-left-style: none;
+  border-top-left-radius: 0;
+}
+.floating-bar.bottom.right { /* axes right border and border radius */
+  border-right-style: none;
+  border-top-right-radius: 0;
+}
+
+.floating-bar:backdrop {
+  background-color: @backdrop_background;
+  border-color: @backdrop_border;
+}
+
+.floating-bar .button {
+    padding: 4px;
+}
+
+.search-bar {
+    box-shadow: none;
+}
+
+.disk-space-display {
+    border: 2px solid;
+}
+
+.disk-space-display.unknown {
+    background-color: @disk_space_unknown;
+    border-color: shade(@disk_space_unknown, 0.8);
+}
+
+.disk-space-display.used {
+    background-color: @disk_space_used;
+    border-color: shade(@disk_space_used, 0.8);
+}
+
+.disk-space-display.free {
+    background-color: @disk_space_free;
+    border-color: shade(@disk_space_free, 0.8);
+}
+
+
 /***********
  * Desktop *
  ***********/
@@ -83,16 +186,16 @@ NautilusWindow .dynamic-notebook tab.right:active {
 }
 
 .nautilus-desktop.nautilus-canvas-item {
-    color: white;
+    color: #fff;
     text-shadow: 1px 1px alpha(#000, 0.2);
 }
 
 .nautilus-desktop.nautilus-canvas-item:active {
-    color: white;
+    color: #fff;
 }
 
 .nautilus-desktop.nautilus-canvas-item:backdrop {
-    color: white;
+    color: #fff;
 }
 
 .nautilus-desktop.nautilus-canvas-item:selected {
@@ -118,61 +221,4 @@ NautilusWindow GtkScrolledWindow.frame {
 
 NautilusWindow .sidebar .frame {
     border-width: 0px;
-}
-
-NautilusWindow .notebook {
-    border-width: 1px 0 0 0;
-}
-
-NautilusWindow > GtkGrid > .pane-separator,
-NautilusWindow > GtkGrid > .pane-separator:hover {
-    border-width: 0 1px 0 0;
-    border-style: solid;
-    border-color: @border;
-    background-color: @background;
-    color: @border;
-}
-
-NautilusWindow > GtkGrid > .pane-separator:backdrop,
-NautilusWindow > GtkGrid > .pane-separator:hover:backdrop {
-    border-color: @backdrop_border;
-    background-color: @backdrop_background;
-}
-
-
-NautilusQueryEditor .primary-toolbar.toolbar {
-    border-top-width: 0;
-    border-bottom-width: 0;
-}
-
-NautilusQueryEditor .toolbar {
-    padding-top: 3px;
-    padding-bottom: 2px;
-
-    border-width: 1px 0 0 0;
-    border-style: solid;
-    
-    border-color: @background;
-    color: @text;
-    
-}
-
-NautilusQueryEditor .toolbar:nth-child(2) {
-    border-color: @border;
-}
-
-NautilusQueryEditor .toolbar:last-child,
-NautilusQueryEditor .primary-toolbar.toolbar:only-child {
-    border-top-width: 0;
-    border-bottom-width: 1px;
-    border-bottom-color: @border;
-}
-
-NautilusQueryEditor .toolbar:backdrop {
-    background-color: @backdrop_background;
-    border-color: @backdrop_background;
-}
-
-NautilusQueryEditor .toolbar:backdrop:nth-child(2) {
-    border-color: @backdrop_border;
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css
index bbd9eea..7e171c5 100644
--- a/Paper/gtk-3.0/gtk-common.css
+++ b/Paper/gtk-3.0/gtk-common.css
@@ -27,7 +27,7 @@
 @define-color insensitive_border shade(@border, 1.1);
 @define-color insensitive_button @insensitive_background;
 @define-color insensitive_separator shade(@separator, 1.05);
-@define-color insensitive_text shade(@text, 2.6);
+@define-color insensitive_text shade(@background, 0.8);
 @define-color insensitive_selection shade(@selection, 1.05);
 
 /* Backdrop colors */
@@ -36,7 +36,7 @@
 @define-color backdrop_foreground shade(@foreground, 1.2);
 @define-color backdrop_border shade(@border, 1.02);
 @define-color backdrop_separator shade(@separator, 0.99);
-@define-color backdrop_text shade(@text, 2.2);
+@define-color backdrop_text shade(@text, 1.2);
 @define-color backdrop_selection shade(@selection, 1.3);
 
 /* Backdrop-insensitive colors */
@@ -64,7 +64,7 @@
 /* Selected color */
 @define-color selected_background @selection;
 @define-color selected_border shade(@selection, 0.9);
-@define-color selected_foreground #fff;
+@define-color selected_foreground shade(@selection, 0.8);
 @define-color selection_foreground @selected_foreground;
 
 /****************
@@ -112,8 +112,8 @@
  * Progressbars *
  ****************/
 
-@define-color progressbar_background shade(@selected_background, 1.02);
-@define-color backdrop_progressbar_background shade(@selected_background, 1.2);
+@define-color progressbar_background @selection;
+@define-color backdrop_progressbar_background shade(@progressbar_background, 1.2);
 @define-color insensitive_progressbar_background shade(@insensitive_background, 0.85);
 
 
diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css
index 0d87461..40bcfaa 100644
--- a/Paper/gtk-3.0/gtk-widgets.css
+++ b/Paper/gtk-3.0/gtk-widgets.css
@@ -67,7 +67,6 @@
 @import url("widgets/dialogs.css");
 @import url("widgets/dynamic-notebook.css");
 @import url("widgets/entry.css");
-@import url("widgets/floating-bar.css");
 @import url("widgets/header-bar.css");
 @import url("widgets/images.css");
 @import url("widgets/infobars.css");
diff --git a/Paper/gtk-3.0/widgets/combobox.css b/Paper/gtk-3.0/widgets/combobox.css
index 9b7358f..188c6e4 100644
--- a/Paper/gtk-3.0/widgets/combobox.css
+++ b/Paper/gtk-3.0/widgets/combobox.css
@@ -23,10 +23,8 @@
 
 GtkComboBox {
     padding: 0;
-
     -GtkComboBox-arrow-scaling: 0.5;
     -GtkComboBox-shadow-type: none;
-    color: @foreground;
 
 }
 
@@ -40,7 +38,7 @@ GtkComboBox .separator {
 .arrow {
     background: none;
     border: none;
-    color: @foreground;
+    color: inherit;
 }
 
 /******************
diff --git a/Paper/gtk-3.0/widgets/floating-bar.css b/Paper/gtk-3.0/widgets/floating-bar.css
deleted file mode 100644
index e63d3d2..0000000
--- a/Paper/gtk-3.0/widgets/floating-bar.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2015 Sam Hewitt.
-*
-* This file is part of the Paper GTK theme.
-*
-* The Paper GTK theme is free software: you can redistribute it
-* and/or modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation, either version 3 of the
-* License, or (at your option) any later version.
-*
-* The Paper GTK theme is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-* Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
-*/
-
-/****************
- * Floating Bar *
- ****************/
-.floating-bar {
-    background-color:shade(@base, 0.99);
-    border-radius: 3px;
-    border: 1px solid @border;
-    color: @foreground;
-}
-
-.floating-bar.top {
-    border-top-width: 0;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-    border-right-width: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-    border-bottom-width: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar .button {
-    -GtkButton-image-spacing: 6px;
-    -GtkButton-inner-border: 0;
-
-    border-style: none;
-    background: none;
-    background-image: none;
-}
diff --git a/Paper/gtk-3.0/widgets/labels.css b/Paper/gtk-3.0/widgets/labels.css
index d0010b4..7aa009b 100644
--- a/Paper/gtk-3.0/widgets/labels.css
+++ b/Paper/gtk-3.0/widgets/labels.css
@@ -28,7 +28,7 @@ GtkLabel {
 
 .dim-label,
 .dim-label GtkLabel {
-	color: alpha(@text,0.5)
+	color: @insensitive_text;
 }
 
 .label:active,
diff --git a/Paper/gtk-3.0/widgets/progressbars.css b/Paper/gtk-3.0/widgets/progressbars.css
index 02c23ce..64575ee 100644
--- a/Paper/gtk-3.0/widgets/progressbars.css
+++ b/Paper/gtk-3.0/widgets/progressbars.css
@@ -29,7 +29,7 @@ GtkProgressBar {
 
 GtkProgressBar.progressbar,
 GtkProgressBar.progressbar:active {
-    border: 1px solid alpha(#000, 0.2);
+    border: 1px solid alpha(#000, 0.15);
     color: @text;
     background-color: @progressbar_background;
 }
@@ -42,7 +42,7 @@ GtkProgressBar.progressbar:active:backdrop {
 }
 
 GtkProgressBar.trough {
-    border: 1px solid alpha(#000, 0.2);
+    border: 1px solid alpha(#000, 0.15);
     color: @text;
     background-color: @trough_background;
 }
diff --git a/Paper/gtk-3.0/widgets/switches.css b/Paper/gtk-3.0/widgets/switches.css
index 5c99362..0f3a40a 100644
--- a/Paper/gtk-3.0/widgets/switches.css
+++ b/Paper/gtk-3.0/widgets/switches.css
@@ -17,10 +17,12 @@
 */
 
 /* Trough colors */
-@define-color trough_border shade(@text, 2.2);
+@define-color trough_border shade(@background, 0.7);
+@define-color backdrop_trough_border shade(@trough_border, 1.1);
 
 /* Slider colors */
 @define-color slider_border @trough_border;
+@define-color backdrop_slider_border @backdrop_trough_border;
 
 
 /*************
@@ -28,7 +30,7 @@
  *************/
 GtkSwitch {
     border-radius: 1em;
-    font: bold;
+    font: condensed;
 }
 
 /* Trough */
@@ -47,9 +49,9 @@ GtkSwitch.trough:active {
 
 GtkSwitch.trough:backdrop,
 GtkSwitch.trough:active:backdrop {
-    border: 1px solid @backdrop_text;
+    border: 1px solid @backdrop_trough_border;
     background-color: @backdrop_background;
-    color: @backdrop_text;
+    color: @backdrop_trough_border;
 }
 
 GtkSwitch.trough:insensitive,
@@ -75,5 +77,5 @@ GtkSwitch.slider:insensitive {
 
 GtkSwitch.slider:active:backdrop,
 GtkSwitch.slider:backdrop {
-    background-color: @backdrop_text;
+    background-color: @backdrop_slider_border;
 }
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 12ac709..d893900 100755
--- a/install.sh
+++ b/install.sh
@@ -90,12 +90,12 @@ elif [ "$UID" -ne "$ROOT_UID" ]; then
 		mkdir -p $HOME/.local/share/themes
 		cp -R ./Paper/ $HOME/.local/share/themes/
 	fi
-	# ./themes
-	if [ -d $HOME/./themes ]; then
-		cp -R ./Paper/ $HOME/./themes/
+	# .themes
+	if [ -d $HOME/.themes ]; then
+		cp -R ./Paper/ $HOME/.themes/
 	else
-		mkdir -p $HOME/./themes
-		cp -R ./Paper/ $HOME/.local/share/themes/
+		mkdir -p $HOME/.themes
+		cp -R ./Paper/ $HOME/.themes/
 	fi
 	echo "Installation complete!"
 	set