diff --git a/Paper/gnome-shell/gnome-shell.css b/Paper/gnome-shell/gnome-shell.css
index 21b551e..e6ef7e0 100644
--- a/Paper/gnome-shell/gnome-shell.css
+++ b/Paper/gnome-shell/gnome-shell.css
@@ -697,7 +697,7 @@ StScrollBar StButton#vhandle:active {
     border-image: none;
     background-image: none;
     background: rgba(44, 58, 64, 1.0);
-    color: #D1D4D5;
+    color: #D3D4D5;
     text-shadow: none;
     transition-duration: 300ms;
 }
diff --git a/Paper/gtk-2.0/Tabs/tab-bottom-active.png b/Paper/gtk-2.0/Tabs/tab-bottom-active.png
index b4b5b0e..899bf36 100644
Binary files a/Paper/gtk-2.0/Tabs/tab-bottom-active.png and b/Paper/gtk-2.0/Tabs/tab-bottom-active.png differ
diff --git a/Paper/gtk-2.0/Tabs/tab-left-active.png b/Paper/gtk-2.0/Tabs/tab-left-active.png
index 72a6ed1..3a1ec6a 100644
Binary files a/Paper/gtk-2.0/Tabs/tab-left-active.png and b/Paper/gtk-2.0/Tabs/tab-left-active.png differ
diff --git a/Paper/gtk-2.0/Tabs/tab-right-active.png b/Paper/gtk-2.0/Tabs/tab-right-active.png
index 8cababf..8fc9132 100644
Binary files a/Paper/gtk-2.0/Tabs/tab-right-active.png and b/Paper/gtk-2.0/Tabs/tab-right-active.png differ
diff --git a/Paper/gtk-2.0/Tabs/tab-top-active.png b/Paper/gtk-2.0/Tabs/tab-top-active.png
index 52156d1..6236a25 100644
Binary files a/Paper/gtk-2.0/Tabs/tab-top-active.png and b/Paper/gtk-2.0/Tabs/tab-top-active.png differ
diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css
index 8a9a646..7d433b6 100644
--- a/Paper/gtk-3.0/apps.css
+++ b/Paper/gtk-3.0/apps.css
@@ -21,6 +21,7 @@
  ********/
 
 @import url("apps/archive-manager.css");
+@import url("apps/baobab.css");
 @import url("apps/bijiben.css");
 @import url("apps/budgie.css");
 @import url("apps/calculator.css");
@@ -29,11 +30,13 @@
 @import url("apps/fallback.css");
 @import url("apps/geary.css");
 @import url("apps/gedit.css");
+@import url("apps/logs.css");
 @import url("apps/gnome-clocks.css");
 /*@import url("apps/gnome-music.css");*/
 @import url("apps/gnome-contacts.css");
+@import url("apps/gnome-documents.css");
 @import url("apps/gnome-disks.css");
-@import url("apps/gnome-software.css");
+/*@import url("apps/gnome-software.css");*/
 @import url("apps/gnome-terminal.css");
 @import url("apps/gnome.css");
 @import url("apps/nautilus.css");
diff --git a/Paper/gtk-3.0/apps/baobab.css b/Paper/gtk-3.0/apps/baobab.css
new file mode 100644
index 0000000..ca4e3fd
--- /dev/null
+++ b/Paper/gtk-3.0/apps/baobab.css
@@ -0,0 +1,53 @@
+/* Copyright 2014 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/.
+*/
+
+@define-color baobab #7c4182;
+
+/**********
+ * Header *
+ **********/
+
+BaobabWindow .titlebar,
+BaobabWindow .header-bar {
+    background-color: @baobab;
+}
+
+BaobabWindow .titlebar:backdrop,
+BaobabWindow .header-bar:backdrop {
+    background-color: shade(@baobab,0.9);
+}
+
+
+/* Toolbar */
+.baobab-toolbar.toolbar {
+    border-color: shade (@background, 0.9);
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-radius: 0;
+}
+
+/* Cell */
+.cell.baobab-level-cell,
+.cell.baobab-level-cell:hover,
+.cell.baobab-level-cell:selected,
+.cell.baobab-level-cell:selected:hover {
+    border-color: alpha(#000, 0.06);
+    border-width: 1px;
+    border-style: solid;
+    background-color: @base;
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/gnome-disks.css b/Paper/gtk-3.0/apps/gnome-disks.css
index ee8f426..6af09bd 100644
--- a/Paper/gtk-3.0/apps/gnome-disks.css
+++ b/Paper/gtk-3.0/apps/gnome-disks.css
@@ -32,22 +32,10 @@ GduWindow .header-bar:backdrop {
     background-color: shade(@disks,0.9);
 }
 
-
-/* Switch */
-GduWindow .header-bar GtkSwitch.trough:active {
-    background-color: @disks;
+GduVolumeGrid *:active,
+GduVolumeGrid *:focus,
+GduVolumeGrid *:selected {
+	background-color: @selection;
+	color: @selection_foreground;
 }
 
-GduWindow GtkSwitch.trough:active {
-    border: 1px solid shade(@disks, 0.8);
-    background-color: @disks;
-}
-
-GduWindow GtkSwitch.slider:active {
-    border: 1px solid shade(@disks, 0.8);
-} 
-
-GduWindow .header-bar GtkSwitch.slider:active:backdrop,
-GduWindow .header-bar GtkSwitch.slider:backdrop {
-    background-color: shade(@disks, 0.9);
-}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/gnome-documents.css b/Paper/gtk-3.0/apps/gnome-documents.css
new file mode 100644
index 0000000..b7f9fdc
--- /dev/null
+++ b/Paper/gtk-3.0/apps/gnome-documents.css
@@ -0,0 +1,127 @@
+/* Copyright 2014 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/.
+*/
+
+
+/*******************
+ * GNOME Documents *
+ *******************/
+.documents-dropdown,
+.documents-dropdown .view {
+    background-color: shade (@background, 1.02);
+}
+
+.documents-dropdown.frame {
+    padding: 6px;
+    border-width: 0 1px 1px 1px;
+    border-style: solid;
+    border-radius: 0 0 5px 5px;
+}
+
+.documents-dropdown .view.radio,
+.documents-dropdown .view.radio:focused,
+.documents-dropdown .view.radio:selected {
+    background-image: none;
+    background-color: alpha(@base, 0.0);
+}
+
+.documents-dropdown .view.radio:active,
+.documents-dropdown .view.radio:active:focused,
+.documents-dropdown .view.radio:active:prelight {
+    background-image: url("assets/sidebar-radio-checked.svg");
+}
+
+.documents-dropdown .view.radio:prelight {
+    background-image: url("assets/sidebar-radio-prelight.svg");
+}
+
+.documents-dropdown .view.radio:active:selected,
+.documents-dropdown .view.radio:active:selected:focused {
+    background-image: url("assets/sidebar-radio-selected.svg");
+}
+
+.documents-dropdown .view.radio:selected:prelight,
+.documents-dropdown .view.radio:selected:focused {
+    background-image: url("assets/sidebar-radio-selected-prelight.svg");
+}
+
+.documents-load-more.button {
+    border-image: none;
+    border-color: @border;
+    border-width: 1px 0 0;
+    border-radius: 0;
+}
+
+.documents-scrolledwin.frame {
+    border-width: 1px 0 0;
+    border-radius: 0;
+}
+
+.documents-icon-bg {
+    background-color: @documents_emblem_background;
+    border-radius: 4px;
+
+    color: @base;
+}
+
+.documents-collection-icon {
+    background-color: @documents_collection_background;
+    border-radius: 8px;
+}
+
+.documents-counter {
+    background-image: url('assets/dnd-counter.svg');
+    background-size: contain;
+    background-color: transparent;
+    color: @base;
+    font: bold;
+}
+
+.documents-favorite.button:active,
+.documents-favorite.button:active:hover {
+    color: shade(@selected_background, 1.20);
+}
+
+.documents-entry-tag {
+    background-color: @selection;
+    color: @selected_foreground;
+
+    border-radius: 4px;
+    border-width: 0;
+
+    margin: 2px;
+    padding: 4px;
+}
+
+.documents-entry-tag:hover {
+    background-color: shade(@selection, 1.10);
+    color: @selected_foreground;
+}
+
+.documents-entry-tag.button,
+.documents-entry-tag.button:hover,
+.documents-entry-tag.button:active,
+.documents-entry-tag.button:active:hover {
+    background-color: transparent;
+    background-image: none;
+    border-image: none;
+    border-width: 0;
+}
+
+.documents-entry-tag.button:hover {
+    color: shade(@selection, 2.10);
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/gnome-terminal.css b/Paper/gtk-3.0/apps/gnome-terminal.css
index 8b2614e..3ca3abe 100644
--- a/Paper/gtk-3.0/apps/gnome-terminal.css
+++ b/Paper/gtk-3.0/apps/gnome-terminal.css
@@ -76,4 +76,66 @@ TerminalWindow .dynamic-notebook tab.left:active {
 TerminalWindow .notebook tab.right:active,
 TerminalWindow .dynamic-notebook tab.right:active {
     box-shadow:inset 3px 0 0 0 @terminal;
+}
+
+/******************
+ * GNOME Terminal *
+ ******************/
+VteTerminal {
+    background-color: @panel;
+    color: @panel_text;
+}
+
+TerminalWindow GtkNotebook.notebook {
+    border-right-width: 0;
+    border-bottom-width: 0;
+    border-left-width: 0;
+}
+
+TerminalWindow .scrollbars-junction,
+TerminalWindow .scrollbar.trough {
+    border-width: 0;
+    border-radius: 0;
+    background-color: @panel;
+    border-color: transparent;
+}
+
+TerminalWindow .scrollbar.button,
+TerminalWindow .scrollbar.button:active,
+TerminalWindow .scrollbar.button:active:hover {
+    border-width: 0;
+    border-radius: 0;
+    background-color: transparent;
+    background-image: none;
+    color: shade(@panel, 0.6);
+}
+
+TerminalWindow .scrollbar.slider {
+    border: 1px solid transparent;
+    border-radius: 10px;
+    background-color: shade(@panel, 0.8);
+}
+
+TerminalWindow .scrollbar.slider.vertical {
+    /* Borders are opposite what you'd expect */
+    border-radius: 10px;
+    border: 1px solid transparent;
+}
+
+TerminalWindow .scrollbar.slider.horizontal {
+    /* Borders are opposite what you'd expect */
+    border-radius: 10px;
+    border: 1px solid transparent;
+}
+
+TerminalWindow .scrollbar.slider:hover,
+TerminalWindow .scrollbar.slider.vertical:hover {
+    border: 1px solid transparent;
+    background-color: shade(@panel, 0.8);
+}
+
+TerminalWindow .scrollbar.slider:active,
+TerminalWindow .scrollbar.slider.vertical:active {
+    border: 1px solid transparent;
+    background-color: shade(@panel, 1.2);
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/gnome.css b/Paper/gtk-3.0/apps/gnome.css
index 5c47b23..bf20309 100644
--- a/Paper/gtk-3.0/apps/gnome.css
+++ b/Paper/gtk-3.0/apps/gnome.css
@@ -63,177 +63,6 @@ GucharmapChartable:selected {
     color: @selected_foreground;
 }
 
-/*******************
- * GNOME Documents *
- *******************/
-.documents-dropdown,
-.documents-dropdown .view {
-    background-color: shade (@background, 1.02);
-}
-
-.documents-dropdown.frame {
-    padding: 6px;
-    border-width: 0 1px 1px 1px;
-    border-style: solid;
-    border-radius: 0 0 5px 5px;
-}
-
-.documents-dropdown .view.radio,
-.documents-dropdown .view.radio:focused,
-.documents-dropdown .view.radio:selected {
-    background-image: none;
-    background-color: alpha(@base, 0.0);
-}
-
-.documents-dropdown .view.radio:active,
-.documents-dropdown .view.radio:active:focused,
-.documents-dropdown .view.radio:active:prelight {
-    background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.documents-dropdown .view.radio:prelight {
-    background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.documents-dropdown .view.radio:active:selected,
-.documents-dropdown .view.radio:active:selected:focused {
-    background-image: url("assets/sidebar-radio-selected.svg");
-}
-
-.documents-dropdown .view.radio:selected:prelight,
-.documents-dropdown .view.radio:selected:focused {
-    background-image: url("assets/sidebar-radio-selected-prelight.svg");
-}
-
-.documents-load-more.button {
-    border-image: none;
-    border-color: @border;
-    border-width: 1px 0 0;
-    border-radius: 0;
-}
-
-.documents-scrolledwin.frame {
-    border-width: 1px 0 0;
-    border-radius: 0;
-}
-
-.documents-icon-bg {
-    background-color: @documents_emblem_background;
-    border-radius: 4px;
-
-    color: @base;
-}
-
-.documents-collection-icon {
-    background-color: @documents_collection_background;
-    border-radius: 8px;
-}
-
-.documents-counter {
-    background-image: url('assets/dnd-counter.svg');
-    background-size: contain;
-    background-color: transparent;
-    color: @base;
-    font: bold;
-}
-
-.documents-favorite.button:active,
-.documents-favorite.button:active:hover {
-    color: shade(@selected_background, 1.20);
-}
-
-.documents-entry-tag {
-    background-color: @selection;
-    color: @selected_foreground;
-
-    border-radius: 4px;
-    border-width: 0;
-
-    margin: 2px;
-    padding: 4px;
-}
-
-.documents-entry-tag:hover {
-    background-color: shade(@selection, 1.10);
-    color: @selected_foreground;
-}
-
-.documents-entry-tag.button,
-.documents-entry-tag.button:hover,
-.documents-entry-tag.button:active,
-.documents-entry-tag.button:active:hover {
-    background-color: transparent;
-    background-image: none;
-    border-image: none;
-    border-width: 0;
-}
-
-.documents-entry-tag.button:hover {
-    color: shade(@selection, 2.10);
-}
-
-/******************
- * GNOME Terminal *
- ******************/
-VteTerminal {
-    background-color: @panel;
-    color: @panel_text;
-}
-
-TerminalWindow GtkNotebook.notebook {
-    border-right-width: 0;
-    border-bottom-width: 0;
-    border-left-width: 0;
-}
-
-TerminalWindow .scrollbars-junction,
-TerminalWindow .scrollbar.trough {
-    border-width: 0;
-    border-radius: 0;
-    background-color: @panel;
-    border-color: transparent;
-}
-
-TerminalWindow .scrollbar.button,
-TerminalWindow .scrollbar.button:active,
-TerminalWindow .scrollbar.button:active:hover {
-    border-width: 0;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: none;
-    color: shade(@panel, 0.6);
-}
-
-TerminalWindow .scrollbar.slider {
-    border: 1px solid transparent;
-    border-radius: 10px;
-    background-color: shade(@panel, 0.8);
-}
-
-TerminalWindow .scrollbar.slider.vertical {
-    /* Borders are opposite what you'd expect */
-    border-radius: 10px;
-    border: 1px solid transparent;
-}
-
-TerminalWindow .scrollbar.slider.horizontal {
-    /* Borders are opposite what you'd expect */
-    border-radius: 10px;
-    border: 1px solid transparent;
-}
-
-TerminalWindow .scrollbar.slider:hover,
-TerminalWindow .scrollbar.slider.vertical:hover {
-    border: 1px solid transparent;
-    background-color: shade(@panel, 0.8);
-}
-
-TerminalWindow .scrollbar.slider:active,
-TerminalWindow .scrollbar.slider.vertical:active {
-    border: 1px solid transparent;
-    background-color: shade(@panel, 1.2);
-}
-
 
 /**************
  * GNOME Misc *
@@ -247,24 +76,4 @@ CheeseThumbView /* Cheese */
 }
 
 
-/**********
- * Baobab *
- **********/
-
-.baobab-toolbar.toolbar {
-    border-color: shade (@background, 0.9);
-    border-style: solid;
-    border-width: 0 0 1px 0;
-    border-radius: 0;
-}
-
-.cell.baobab-level-cell,
-.cell.baobab-level-cell:hover,
-.cell.baobab-level-cell:selected,
-.cell.baobab-level-cell:selected:hover {
-    border-color: alpha(#000, 0.06);
-    border-width: 1px;
-    border-style: solid;
-    background-color: @base;
-}
 
diff --git a/Paper/gtk-3.0/apps/logs.css b/Paper/gtk-3.0/apps/logs.css
new file mode 100644
index 0000000..2852756
--- /dev/null
+++ b/Paper/gtk-3.0/apps/logs.css
@@ -0,0 +1,43 @@
+/* Copyright 2014 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/.
+*/
+
+@define-color logs #349F8C;
+
+/**********
+ * Header *
+ **********/
+
+LogviewWindow .titlebar,
+LogviewWindow .header-bar {
+    background-color: @logs;
+}
+
+LogviewWindow .titlebar:backdrop,
+LogviewWindow .header-bar:backdrop {
+    background-color: shade(@logs,0.9);
+}
+
+GlWindow .titlebar,
+GlWindow .header-bar {
+    background-color: @logs;
+}
+
+GlWindow .titlebar:backdrop,
+GlWindow .header-bar:backdrop {
+    background-color: shade(@logs,0.9);
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css
index 4655282..dbf6655 100644
--- a/Paper/gtk-3.0/apps/nautilus.css
+++ b/Paper/gtk-3.0/apps/nautilus.css
@@ -16,7 +16,7 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
-@define-color nautilus #349F8C;
+@define-color nautilus #636E73;
 
 /**********
  * Header *
diff --git a/Paper/gtk-3.0/apps/rhythmbox.css b/Paper/gtk-3.0/apps/rhythmbox.css
new file mode 100644
index 0000000..f1471de
--- /dev/null
+++ b/Paper/gtk-3.0/apps/rhythmbox.css
@@ -0,0 +1,32 @@
+/* Copyright 2014 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/.
+*/
+
+/*@define-color geary #ebdd4d;*/
+
+/*********************
+ * Custon View *
+ *********************/
+
+RBHeader {
+	padding: none;
+	height: 2em;
+}
+
+RBLibrarySource  {
+	padding: none;
+}
diff --git a/Paper/gtk-3.0/apps/settings.css b/Paper/gtk-3.0/apps/settings.css
index 4585dc1..369529d 100644
--- a/Paper/gtk-3.0/apps/settings.css
+++ b/Paper/gtk-3.0/apps/settings.css
@@ -53,6 +53,14 @@ CcWindow .maximized .header-bar {
     background-color: @settings;
 }
 
+/*******
+ * Nav *
+ *******/
+
+CcShellNavBar {
+    padding:0px;
+}
+
 /************
  * ItemView *
  ************/
diff --git a/Paper/gtk-3.0/apps/unity.css b/Paper/gtk-3.0/apps/unity.css
index 3afeff4..479c6fa 100644
--- a/Paper/gtk-3.0/apps/unity.css
+++ b/Paper/gtk-3.0/apps/unity.css
@@ -20,7 +20,7 @@
  * Unity Colors *
  ****************/
 
-@define-color unity #636E73;
+@define-color unity @header;
 @define-color unity_text #fff;/* Header text color */
 
 @define-color backdrop_unity shade(@unity, 0.9);
@@ -117,6 +117,12 @@ UnityPanelWidget,
     color: @panel_text;
 }
 
+.unity-panel.menu.menubar,
+.unity-panel .menu .menubar {
+    background-color: @panel;
+    color: @panel_text;
+}
+
 .unity-panel.menubar:backdrop,
 .unity-panel .menubar *:backdrop {
     color: @backdrop_foreground;
@@ -130,19 +136,20 @@ UnityPanelWidget,
     border: none;
     background-color: transparent;
     color: @panel_text;
+    box-shadow: none;
 }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem:hover {
-    border-radius: 4px 4px 0px 0px;
-    border-bottom: 0px;
-    border: 1px solid shade(@panel, 0.7);
-    background-color: shade(@panel, 0.8);
-    color: white;
+    border-radius: 0px;
+    background: shade(@unity, 0.8);
+    color: @panel_text;
+    box-shadow: none;
 }
 
 .unity-panel.menubar .menuitem *:hover {
     color: white;
+    box-shadow: none;
 }
 
 .unity-panel.menubar .menuitem.separator,
diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css
index 3a04e45..daa8599 100644
--- a/Paper/gtk-3.0/gtk-dark.css
+++ b/Paper/gtk-3.0/gtk-dark.css
@@ -29,7 +29,7 @@
 @define-color button #1E272B;/* Button color */
 @define-color separator @border;/* Separator color */
 @define-color text #A8B5BA;/* Text color */
-@define-color panel #263238;/* Panel color */
+@define-color panel #1e282c;/* Panel color */
 @define-color header #263238;/* Header color */
 @define-color header_text #A8B5BA;/* Header text color */
 @define-color selection #2D5364;/* Selection color */
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index fd03864..3ab2923 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -29,13 +29,13 @@
 @define-color button #ccc;/* Button color */
 @define-color separator alpha(#000, 0.2);/* Separator color */
 @define-color text @foreground;/* Text color */
-@define-color panel #1E272B;/* Panel color */
+@define-color panel #576165;/* Panel color */
 @define-color header #636E73;/* Header color */
 @define-color header_text #fff;/* Header text color */
 @define-color selection #9BA8AD;/* Selection color */
 @define-color view_background #ffffff;/* View background */
 @define-color inactive_frame @border;/* Inactive frame color */
-@define-color panel_text #ffffff;/* Panel text color */
+@define-color panel_text #dbdee0;/* Panel text color */
 @define-color panel_text_shadow alpha(#000, 0.2);/* Panel text color */
 @define-color text_shadow alpha(white, 0.4);/* Text shadow */
 @define-color icon_shadow @text_shadow;/* Icon shadow */
diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css
index 38aadfb..ce7c8eb 100644
--- a/Paper/gtk-3.0/widgets/buttons.css
+++ b/Paper/gtk-3.0/widgets/buttons.css
@@ -36,7 +36,7 @@
 
 .button GtkImage,
 .button .flat GtkImage,
-* .image-button {
+.button.image-button GtkImage {
     color: @text;
 }
 
diff --git a/Paper/gtk-3.0/widgets/calendar.css b/Paper/gtk-3.0/widgets/calendar.css
index 0cd4230..de36f45 100644
--- a/Paper/gtk-3.0/widgets/calendar.css
+++ b/Paper/gtk-3.0/widgets/calendar.css
@@ -23,26 +23,25 @@
 GtkCalendar {
     padding: 2px;
     border-radius: 2px;
+    background: shade(@background, 0.8)
 }
 
 GtkCalendar.view {
-    border-color: @border;
     border-radius: 4px;
-    border-style: solid;
+    border: 1px solid @border;
     border-width: 1px;
-    padding: 2px;
+    color: @text;
 }
 
 GtkCalendar.header {
     border-radius: 0;
     background-color: @background;
     border-width: 0;
+    color: @text;
 }
 
 GtkCalendar.button {
-    border: none;
-    background-color: transparent;
-    color: @foreground;
+    color: @text;
 }
 
 GtkCalendar.button:insensitive,
diff --git a/Paper/gtk-3.0/widgets/column-header.css b/Paper/gtk-3.0/widgets/column-header.css
index ced3f94..a6b2afb 100644
--- a/Paper/gtk-3.0/widgets/column-header.css
+++ b/Paper/gtk-3.0/widgets/column-header.css
@@ -20,6 +20,10 @@
  * Column header *
  *****************/
  
+column-header.button {
+    border-width: 0 1px 1px 0;
+}
+ 
 column-header.button,
 column-header .button,
 column-header.button:active,
@@ -32,7 +36,6 @@ column-header.button:insensitive,
 column-header .button:insensitive,
 column-header.button:last-child:backdrop,
 column-header:last-child .button:backdrop {
-    border-width: 0 1px 1px 0;
     border-radius: 0;
     border-style: solid;
     border-color: @border;
diff --git a/Paper/gtk-3.0/widgets/search-bars.css b/Paper/gtk-3.0/widgets/search-bars.css
index 2971ad0..f9480cb 100644
--- a/Paper/gtk-3.0/widgets/search-bars.css
+++ b/Paper/gtk-3.0/widgets/search-bars.css
@@ -16,34 +16,109 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
+@define-color search #dbdee0;
+@define-color search_text shade(#dbdee0, 0.6);
+
+
 /***************
  * Search bars *
  ***************/
 
+.search-bar.toolbar,
 .search-bar {
-    background-color: shade(@background, 0.98);
-    border-color: shade(@border, 0.90);
-    border-style: solid;
-    border-width: 0 0 1px;
+    background: @search;
+    border-bottom: 1px solid @border;
+    box-shadow: inset 0 -3px 3px -4px alpha(#000, 0.5);
+    color: @search_text;
 }
 
+.search-bar.toolbar:backdrop,
 .search-bar:backdrop {
-    background-color: @backdrop_background;
-    border: 1px solid @backdrop_border;
+    background: shade(@search, 0.9);
+    border-bottom: 1px solid @border;
     box-shadow: none;
+    color: shade(@search_text, 0.9);
 }
 
-GtkDialog .search-bar {
-    background-color: @background;
-    background-image: none;
-    border-color: @border;
-    box-shadow: none;
+.search-bar.toolbar:backdrop,
+.search-bar:backdrop {
+    background: shade(@search, 0.9);
+    border-bottom: 1px solid @border;
+    box-shadow: inset 0 -1px 2px -1px alpha(#000, 0.3);
+    color: shade(@search_text, 0.9);
 }
 
-.search-bar .button.close-button {
-    padding: 5px 4px 5px 5px;
+.search-bar .entry {
+    border-radius: 0px;
+    background:transparent;
 }
 
-.search-bar .button.close-button {
-    padding: 5px 4px 5px 5px;
-}
\ No newline at end of file
+.search-bar .entry:focus {
+    border: solid @search_text;
+    border-bottom-width: 1px;
+}
+
+
+/***********
+ * Buttons *
+ ***********/
+.search-bar.toolbar .button,
+.search-bar .button {
+    border: none;
+    color: @search_text;
+}
+
+.search-bar.toolbar .button:active,
+.search-bar .button:active {
+    border: none;
+    color: @search_text;
+    box-shadow: inset 0 -2px 0 0 @search_text;
+}
+
+/* Hover */
+.search-bar.toolbar .button:hover,
+.search-bar .button:hover,
+.search-bar.toolbar .button:active:hover,
+.search-bar .button:active:hover{
+    border: none;
+    background: alpha(#000, 0.1);
+    color: @search_text;
+    box-shadow: inset 0 -2px 0 0 @search_text;
+}
+
+/********************
+ * Search bar entry *
+ ********************/
+
+.search-bar .entry {
+    background-color: transparent;
+    color: @text;
+    padding: 6px;
+    border-radius: 6px;
+    border: none;
+    icon-shadow:none;
+}
+
+.search-bar .entry:active,
+.search-bar .entry:focus {
+    background-color: transparent;
+    color: @text;
+    border: none;
+}
+
+.search-bar .entry:backdrop {
+    background-color: transparent;
+    color: @backdrop_text;
+    border: none;
+}
+
+.search-bar .entry.image {
+    color: @insensitive_text;
+    icon-shadow:none;
+}
+
+.search-bar .entry.image.left {
+    padding-right: 6px;
+    color: @text;
+    icon-shadow:none;
+}
diff --git a/Paper/gtk-3.0/widgets/toolbars.css b/Paper/gtk-3.0/widgets/toolbars.css
index f365348..41b6f57 100644
--- a/Paper/gtk-3.0/widgets/toolbars.css
+++ b/Paper/gtk-3.0/widgets/toolbars.css
@@ -16,93 +16,86 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
+@define-color toolbar @header;
+@define-color backdrop_toolbar shade(@toolbar, 0.9);
+@define-color toolbar_text @header_text;
+@define-color backdrop_toolbar_text alpha(@toolbar_text, 0.7);
+@define-color insensitive_toolbar_text alpha(@toolbar_text, 0.5);
+
+
+
 /***********
  * Toolbar *
  ***********/
 
 /* Main Colors*/
-.toolbar,
-GtkToolbar {
-    color: @foreground;
-    border: solid @border;
-    border-bottom-width: 1px;
-    padding: 4px;
+.toolbar {
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 4px;
+    padding-right: 4px;
+    color: @toolbar_text;
+    background-color: @toolbar;
+}
+
+.toolbar:insensitive {
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 4px;
+    padding-right: 4px;
+    color: @insensitive_toolbar_text;
     background-color: @background;
 }
 
-.toolbar:insensitive,
-GtkToolbar:insensitive {
-    color: @insensitive_text;
-    border: solid @insensitive_border;
-    border-bottom-width: 1px;
-    background-color: @background;
-}
-
-.toolbar:backdrop,
-GtkToolbar:backdrop {
-    color: @backdrop_text;
-    border: solid @backdrop_border;
-    border-bottom-width: 1px;
-    background-color: @backdrop_background;
+.toolbar:backdrop {
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 4px;
+    padding-right: 4px;
+    color: @backdrop_toolbar_text;
+    background-color: @backdrop_toolbar;
     -gtk-image-effect: dim;
 }
 
-.toolbar GtkComboBox,
+/* Buttons */
 .toolbar .button {
-    background-color: @background;
-    color: @foreground;
+    border: none;
+    background: none;
+    color: @toolbar_text;
+    border-radius: 0px;
+    padding: 13px;
 }
 
-.toolbar GtkComboBox:active,
 .toolbar .button:active {
+    border: none;
     color: @foreground;
-    background-color: @background;
-}
-
-.toolbar .separator,
-.toolbar .button .separator,
-.toolbar .button.separator {
-    color: @separator;
+    box-shadow: inset 0 -2px 0 0 @toolbar_text;
+    padding: 13px;
 }
 
 /* Hover */
 .toolbar .button:hover,
 .toolbar .button:active:hover {
-    color: @foreground;
-
-    background-image: linear-gradient(to bottom,
-                                  @button_gradient_a,
-                                  @button_gradient_b
-                                  );
+    padding: 13px;
+    border: none;
+    background: alpha(#000, 0.1);
+    color: @toolbar_text;
+    box-shadow: inset 0 -2px 0 0 @toolbar_text;
 }
 
-
 /* Insensitive */
-.toolbar .button:insensitive,
-.toolbar .button:active:insensitive {
-    color: @insensitive_foreground;
-    background-image:none;
-    background-color:@insensitive_background;
+.toolbar .button:insensitive {
+    padding: 13px;
+    border: none;
+    color: @insensitive_toolbar_text;
 }
 
-.toolbar .separator:insensitive,
-.toolbar .button .separator:insensitive,
-.toolbar .button.separator:insensitive {
-    color: @insensitive_separator;
-}
-
-/* backdrop */
+/* Backdrop */
 .toolbar .button:backdrop,
 .toolbar .button:active:backdrop {
-    color: @backdrop_foreground;
-    background-image:none;
-    background-color:@backdrop_background;
-}
-
-.toolbar .separator:backdrop,
-.toolbar .button .separator:backdrop,
-.toolbar .button.separator:backdrop {
-    color: @backdrop_separator;
+    color: @backdrop_toolbar_text;
+    border: none;
+    padding: 13px;
 }
 
 
@@ -111,35 +104,36 @@ GtkToolbar:backdrop {
  *******************/
 
 /* Normal */
-.primary-toolbar.toolbar,
 .primary-toolbar .toolbar {
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 4px;
+    padding-right: 4px;
+    background-color: @toolbar;
     border: none;
-    padding: 4px 6px 4px 6px;
-    background-color: @background;
-    border: solid @border;
-    border-bottom-width: 1px;
 }
 
 /* Backdrop */
-.primary-toolbar.toolbar:backdrop,
 .primary-toolbar .toolbar:backdrop {
-
-    background-color: @backdrop_background;
+    padding-top: 0px;
+    padding-bottom: 0px;
+    padding-left: 4px;
+    padding-right: 4px;
+    background-color: @backdrop_toolbar;
+    border: none;
     -gtk-image-effect: dim;
 }
 
 
 /* Buttons */
-.primary-toolbar .button.text-button {
-    background: none;
-    color: @foreground;
-    box-shadow: none;
-}
 
 .primary-toolbar GtkComboBox,
 .primary-toolbar .button,
-.primary-toolbar .button.image-button {
-    color: @foreground;
+.primary-toolbar .button.text-button,
+.primary-toolbar .button.image-button, 
+.primary-toolbar .button.image-button GtkImage {
+    border: none;
+    color: @toolbar_text;
     box-shadow: none;
 }
 
@@ -160,23 +154,13 @@ GtkToolbar:backdrop {
 /* Hover buttons */
 .primary-toolbar .button:hover,
 .primary-toolbar .button:active:hover {
-    color: @hover_text;
-    background-image: linear-gradient(to bottom,
-                                  @button_hover_gradient_a,
-                                  @button_hover_gradient_b
-                                  );
+    background: alpha(#000, 0.1);
     box-shadow: none;
 }
 
-
 /* Insensitive buttons */
 .primary-toolbar .button:insensitive,
 .primary-toolbar .button:active:insensitive {
-    color: @insensitive_foreground;
-    background-image: linear-gradient(to bottom,
-                                      @button_insensitive_gradient_a,
-                                      @button_insensitive_gradient_b
-                                      );
 }
 
 .primary-toolbar .separator:insensitive,
@@ -260,28 +244,22 @@ GtkToolbar:backdrop {
 
 /* Buttons */
 .inline-toolbar .button.text-button {
-    background-image: linear-gradient(to bottom,
-                              @button_gradient_a,
-                              @button_gradient_b
-                              );
+    background-image: none;
+    background-color:@base;;
 }
 
 .inline-toolbar .button.image-button,
 .inline-toolbar .button.image-button:active {
     padding: 2px;
-    background-image: linear-gradient(to bottom,
-                              @button_gradient_a,
-                              @button_gradient_b
-                              );
+    background-image: none;
+    background-color:@base;;
 }
 
 .inline-toolbar GtkComboBox,
 .inline-toolbar .button {
     color: @foreground;
-    background-image: linear-gradient(to bottom,
-                                  @button_gradient_a,
-                                  @button_gradient_b
-                                  );
+    background-image: none;
+    background-color:@base;
 
 }
 
diff --git a/Paper/gtk-3.0/widgets/views.css b/Paper/gtk-3.0/widgets/views.css
index 993ef94..04c536f 100644
--- a/Paper/gtk-3.0/widgets/views.css
+++ b/Paper/gtk-3.0/widgets/views.css
@@ -353,10 +353,8 @@ GtkIconView.content-view.check:selected {
 .content-view column-header .button {
     border-width: 0 0 1px 1px;
 
-    background-image: linear-gradient(to bottom,
-                              @button_gradient_a,
-                              @button_gradient_b
-                              );
+    background-image: none;
+    background-color:@base;;
 
     border-color: @border;
 }
diff --git a/Paper/metacity-1/metacity-theme-2.xml b/Paper/metacity-1/metacity-theme-2.xml
index 322427d..a5ee68f 100644
--- a/Paper/metacity-1/metacity-theme-2.xml
+++ b/Paper/metacity-1/metacity-theme-2.xml
@@ -32,7 +32,7 @@
 <constant name="C_titlebar_unfocused" value="#454D50" />
 <constant name="C_border_focused" value="#636E73" />
 <constant name="C_border_unfocused" value="#454D50" />
-<constant name="C_title_focused" value="#D1D4D5" />
+<constant name="C_title_focused" value="#D3D4D5" />
 <constant name="C_title_unfocused" value="#929A9D" />
 
 <!-- GEOMETRY -->
diff --git a/Paper/metacity-1/metacity-theme-3.xml b/Paper/metacity-1/metacity-theme-3.xml
index c1b7fc1..6be4763 100644
--- a/Paper/metacity-1/metacity-theme-3.xml
+++ b/Paper/metacity-1/metacity-theme-3.xml
@@ -32,7 +32,7 @@
 <constant name="C_titlebar_unfocused" value="#454D50" />
 <constant name="C_border_focused" value="#636E73" />
 <constant name="C_border_unfocused" value="#454D50" />
-<constant name="C_title_focused" value="#D1D4D5" />
+<constant name="C_title_focused" value="#D3D4D5" />
 <constant name="C_title_unfocused" value="#929A9D" />
 
 <!-- GEOMETRY -->
diff --git a/Paper/plank/dock.theme b/Paper/plank/dock.theme
index f1818c1..c762612 100644
--- a/Paper/plank/dock.theme
+++ b/Paper/plank/dock.theme
@@ -29,13 +29,13 @@ BottomRoundness=0
 #The thickness (in pixels) of lines drawn.
 LineWidth=1
 #The color (RGBA) of the outer stroke.
-OuterStrokeColor=30;;39;;43;;255
+OuterStrokeColor=211;;212;;213;;214
 #The starting color (RGBA) of the fill gradient.
-FillStartColor=30;;39;;43;;255
+FillStartColor=211;;212;;213;;214
 #The ending color (RGBA) of the fill gradient.
-FillEndColor=30;;39;;43;;255
+FillEndColor=211;;212;;213;;214
 #The color (RGBA) of the inner stroke.
-InnerStrokeColor=255;;255;;255;;0
+InnerStrokeColor=211;;212;;213;;0
 
 [PlankDrawingDockTheme]
 #The padding on the left/right dock edges, in tenths of a percent of IconSize.
diff --git a/README.md b/README.md
index 9635948..e81cab2 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Paper Theme
 ===========
 
-Paper is a modern GNOME desktop theme belonging to the [Paper Project](http://snwh.org/paper/).
+[Paper](http://snwh.org/paper/) is a modern GNOME desktop theme.
 
 Paper is distributed under the terms the GNU GPL v.3
 
diff --git a/src/gtk2/Tabs/tab-bottom-active.png b/src/gtk2/Tabs/tab-bottom-active.png
deleted file mode 100644
index b4b5b0e..0000000
Binary files a/src/gtk2/Tabs/tab-bottom-active.png and /dev/null differ
diff --git a/src/gtk2/Tabs/tab-left-active.png b/src/gtk2/Tabs/tab-left-active.png
deleted file mode 100644
index 72a6ed1..0000000
Binary files a/src/gtk2/Tabs/tab-left-active.png and /dev/null differ
diff --git a/src/gtk2/Tabs/tab-right-active.png b/src/gtk2/Tabs/tab-right-active.png
deleted file mode 100644
index 8cababf..0000000
Binary files a/src/gtk2/Tabs/tab-right-active.png and /dev/null differ
diff --git a/src/gtk2/Tabs/tab-top-active.png b/src/gtk2/Tabs/tab-top-active.png
deleted file mode 100644
index 52156d1..0000000
Binary files a/src/gtk2/Tabs/tab-top-active.png and /dev/null differ