diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css
index 21e04fe..808bf0a 100644
--- a/Paper/gtk-3.0/apps.css
+++ b/Paper/gtk-3.0/apps.css
@@ -32,25 +32,27 @@
 @import url("apps/fallback.css");
 @import url("apps/geary.css");
 @import url("apps/gedit.css");
-@import url("apps/logs.css");
+@import url("apps/gnome.css");
 @import url("apps/gnome-clocks.css");
 @import url("apps/gnome-contacts.css");
-@import url("apps/gnome-documents.css");
 @import url("apps/gnome-disks.css");
+@import url("apps/gnome-documents.css");
 /*@import url("apps/gnome-music.css");*/
 @import url("apps/gnome-photos.css");
 /*@import url("apps/gnome-software.css");*/
 @import url("apps/gnome-system-monitor.css");
-@import url("apps/gnome-terminal.css");
 @import url("apps/gnome-tweak-tool.css");
-@import url("apps/gnome.css");
+@import url("apps/gnome-weather.css");
+@import url("apps/logs.css");
 @import url("apps/nautilus.css");
-@import url("apps/snap.css");
-@import url("apps/scratch-text-editor.css");
 @import url("apps/pantheon.css");
+@import url("apps/rhythmbox.css");
+@import url("apps/scratch-text-editor.css");
 @import url("apps/settings.css");
 @import url("apps/shotwell.css");
+@import url("apps/snap.css");
 @import url("apps/synaptic.css");
+@import url("apps/terminal.css");
 @import url("apps/unity.css");
 @import url("apps/xfce.css");
-@import url("apps/yelp.css");
+@import url("apps/yelp.css");
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/gedit.css b/Paper/gtk-3.0/apps/gedit.css
index 18e1c70..3d744c8 100644
--- a/Paper/gtk-3.0/apps/gedit.css
+++ b/Paper/gtk-3.0/apps/gedit.css
@@ -80,23 +80,7 @@ GeditWindow .dynamic-notebook tab.right:active {
 /************
  * Etc etc. *
  ************/
-
  
-GeditWindow .gedit-headerbar-paned,
-GeditWindow .titlebar .pane-separator,
-GeditWindow .header-bar .pane-separator {
-    background-color: @gedit;
-}
-
-GeditPanel.title GtkLabel {
-    padding: 4px 0;
-}
-
-GeditPanel.vertical .title {
-    padding: 4px 0 4px 3px;
-    border-style: none;
-}
-
 GeditPanel .toolbar {
     border-style: none;
     background: none;
diff --git a/Paper/gtk-3.0/apps/gnome-disks.css b/Paper/gtk-3.0/apps/gnome-disks.css
index 4838637..49975af 100644
--- a/Paper/gtk-3.0/apps/gnome-disks.css
+++ b/Paper/gtk-3.0/apps/gnome-disks.css
@@ -16,7 +16,7 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
-@define-color disks #7C5183;
+@define-color disks #8561C5;
 
 /**********
  * Header *
diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css
index 5cbd3e9..cf93347 100644
--- a/Paper/gtk-3.0/apps/nautilus.css
+++ b/Paper/gtk-3.0/apps/nautilus.css
@@ -70,11 +70,19 @@ NautilusWindow .header-bar .entry {
  * Sidebar *
  ***********/
 
-NautilusWindow .sidebar {
+NautilusWindow .sidebar,
+NautilusWindow .sidebar:backdrop {
     box-shadow: none;
     border-width: 0px;
 }
 
+NautilusWindow .sidebar .separator {
+    color: @separator
+}
+NautilusWindow .sidebar .separator:backdrop {
+    color: @backdrop_separator
+}
+
 NautilusWindow .pane-separator {
     border-color: @border;
     border-right-width: 1px;
@@ -84,8 +92,8 @@ NautilusWindow .pane-separator {
  * Notebook *
  ************/
 
-/* Active */
-NautilusWindow .notebook .frame {
+NautilusWindow .notebook .frame,
+NautilusWindow .notebook .frame:backdrop {
     border: none;
 }
 
@@ -109,6 +117,52 @@ NautilusWindow .dynamic-notebook tab.right:active {
     box-shadow:inset 3px 0 0 0 @nautilus;
 }
 
+
+.nautilus-circular-button {
+  border-radius: 20px;
+  outline-radius: 20px;
+}
+
+
+.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/Canvas *
+ ******************/
+
+NautilusCanvasView,
+NautilusCanvasView:active,
+NautilusCanvasView:focus,
+NautilusCanvasView:backdrop {
+    border: none;
+}
+
+.nautilus-desktop {
+    color: @foreground;
+}
+
 .nautilus-canvas-item {
     border-radius: 5px;
 }
@@ -144,74 +198,25 @@ NautilusWindow .dynamic-notebook tab.right:active {
     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;
-}
-
-
-.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 *
- ***********/
-
-.nautilus-canvas-item {
-    border-radius: 5px;
-}
-
-.nautilus-desktop {
-    color: @foreground;
-}
 
 .nautilus-desktop.nautilus-canvas-item {
     color: #fff;
     text-shadow: 1px 1px alpha(#000, 0.2);
 }
 
-.nautilus-desktop.nautilus-canvas-item:active {
-    color: #fff;
-}
-
-.nautilus-desktop.nautilus-canvas-item:backdrop {
-    color: #fff;
-}
-
+.nautilus-desktop.nautilus-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:backdrop
 .nautilus-desktop.nautilus-canvas-item:selected {
+    background-color: @selected_background;
     color: @selected_foreground;
 }
 
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
+    background-color: @backdrop_selected_background;
+    color: @backdrop_selected_foreground;
+}
+
 .nautilus-desktop.nautilus-canvas-item:active,
 .nautilus-desktop.nautilus-canvas-item:prelight,
 .nautilus-desktop.nautilus-canvas-item:selected {
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-    color: @backdrop_selected_foreground;
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/rhythmbox.css b/Paper/gtk-3.0/apps/rhythmbox.css
index 65ea8ef..897bf83 100644
--- a/Paper/gtk-3.0/apps/rhythmbox.css
+++ b/Paper/gtk-3.0/apps/rhythmbox.css
@@ -16,17 +16,10 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
-/*@define-color geary #ebdd4d;*/
-
-/*********************
- * Custon View *
- *********************/
-
 RBHeader {
-	padding: none;
-	height: 2em;
+	padding: 0px;
 }
 
 RBLibrarySource  {
-	padding: none;
+	padding: 0px;
 }
diff --git a/Paper/gtk-3.0/apps/snap.css b/Paper/gtk-3.0/apps/snap.css
index 5c9705e..d4bac93 100644
--- a/Paper/gtk-3.0/apps/snap.css
+++ b/Paper/gtk-3.0/apps/snap.css
@@ -33,6 +33,10 @@ SnapSnapWindow .header-bar:backdrop {
     background-color: shade(@snap,0.9);
 }
 
+SnapSnapWindow .take-button {
+	border-radius: 0;
+}
+
 SnapWidgetsCamera {
 	background-color:@snap_background;
 }
diff --git a/Paper/gtk-3.0/apps/gnome-terminal.css b/Paper/gtk-3.0/apps/terminal.css
similarity index 63%
rename from Paper/gtk-3.0/apps/gnome-terminal.css
rename to Paper/gtk-3.0/apps/terminal.css
index 33954e4..eb15df8 100644
--- a/Paper/gtk-3.0/apps/gnome-terminal.css
+++ b/Paper/gtk-3.0/apps/terminal.css
@@ -16,99 +16,96 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
-@define-color terminal #dbdee0;
+@define-color terminal_text #dbdee0;
 @define-color terminal_background #002B36;
-@define-color terminal_text #839495;
-@define-color terminal_window #636E73;
-@define-color terminal_window_text #dbdee0;
-@define-color backdrop_terminal_window_text  shade(@terminal_window_text, 0.8);
-@define-color insensitive_terminal_window_text  shade(@terminal_window_text, 0.95);
+@define-color terminal #51666B;
+@define-color backdrop_terminal shade(@terminal, 0.95);
+
+@define-color terminal_header #41555B;
+@define-color terminal_header_text #dbdee0;
+@define-color backdrop_terminal_header_text  shade(@terminal_header_text, 0.8);
+@define-color insensitive_terminal_header_text  shade(@terminal_header_text, 0.95);
 
 /**********
  * Header *
  **********/
 
 TerminalWindow .titlebar,
-TerminalWindow .header-bar {
-    background-color: @terminal;
+TerminalWindow .header-bar,
+PantheonTerminalPantheonTerminalWindow .titlebar,
+PantheonTerminalPantheonTerminalWindow .header-bar {
+    background-color: @terminal_header;
 }
 
 TerminalWindow .titlebar:backdrop,
-TerminalWindow .header-bar:backdrop{
-    background-color: shade(@terminal,0.9);
-}
-
-
-/* Switch */
-TerminalWindow .header-bar GtkSwitch.trough:active {
-    background-color: @terminal;
-}
-
-TerminalWindow GtkSwitch.trough:active {
-    border: 1px solid shade(@terminal, 0.8);
-    background-color: @terminal;
-}
-
-TerminalWindow GtkSwitch.slider:active {
-    border: 1px solid shade(@terminal, 0.8);
-} 
-
-TerminalWindow .header-bar GtkSwitch.slider:active:backdrop,
-TerminalWindow .header-bar GtkSwitch.slider:backdrop {
-    background-color: shade(@terminal, 0.9);
+TerminalWindow .header-bar:backdrop,
+PantheonTerminalPantheonTerminalWindow .titlebar:backdrop,
+PantheonTerminalPantheonTerminalWindow .header-bar:backdrop {
+    background-color: shade(@terminal_header,0.9);
 }
 
 /************
  * Notebook *
  ************/
 
-TerminalNotebook {
-    box-shadow: inset 0 1px 0 0 @border;
+PantheonTerminalPantheonTerminalWindow .notebook.header,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook .notebook.header {
+    background-color: @terminal;
+    box-shadow: none;
+}
+
+PantheonTerminalPantheonTerminalWindow .notebook.header:backdrop,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook .notebook.header:backdrop {
+    background: @backdrop_terminal;
+    box-shadow: none;
+}
+
+TerminalNotebook {
+    box-shadow: none;
 }
 
-/* Active */
 TerminalNotebook tab.top:active,
 TerminalWindow .notebook tab.top:active,
-TerminalWindow .dynamic-notebook tab.top:active {
-    box-shadow:inset 0 -3px 0 0 @terminal;
-}
-
-/* Normal */
-TerminalWindow .notebook tab.top {
-    box-shadow:inset 0 -1px 0 0 @terminal_window;
+TerminalWindow .dynamic-notebook tab.top:active,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook tab.top:active {
+    box-shadow:inset 0 -2px 0 0 @terminal_text;
 }
 
 /*----- Tabs -----*/
 
-TerminalWindow .notebook tab {
+TerminalWindow .notebook tab,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook tab {
     /*border: none;*/
     border-radius: 0;
-    background: @terminal_window;
-    color: @terminal_window_text;
+    background-color: @terminal;
+    color: @terminal_text;
 }
 
-TerminalWindow .notebook tab:active {
+TerminalWindow .notebook tab:active ,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook tab:active {
     border: none;
-    background: @terminal_window;
-    color: @terminal_window_text;
+    background-color: @terminal;
+    color: @terminal_text;
 }
 
-TerminalWindow .notebook tab:hover {
-    background-color: shade(@terminal_window, 1.05);
+TerminalWindow .notebook tab:hover,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook tab:hover {
     color: alpha(#fff, 0.3);
-    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook:backdrop tab,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook tab:backdrop,
 TerminalWindow .notebook tab:backdrop {
     border: none;
-    background: @backdrop_header;
-    color: @backdrop_terminal_window_text;
+    background-color: @backdrop_terminal;
+    color: @backdrop_terminal_text;
 }
 
-TerminalWindow .notebook tab:insensitive {
+TerminalWindow .notebook tab:insensitive,
+PantheonTerminalPantheonTerminalWindow .dynamic-notebook tab:insensitive {
     border: none;
     background: @insensitive_header;
-    color: @insensitive_terminal_window_text;
+    color: @insensitive_terminal_text;
 }
 
 /* Labels */
@@ -116,33 +113,33 @@ TerminalWindow .notebook GtkLabel,
 TerminalWindow .notebook:active GtkLabel,
 TerminalWindow .notebook:focus GtkLabel,
 TerminalWindow .notebook:hover GtkLabel {
-    color: @terminal_window_text;
+    color: @terminal_text;
 }
 
 TerminalWindow .notebook:backdrop GtkLabel,
 TerminalWindow .notebook:backdrop:hover GtkLabel,
 TerminalWindow .notebook:active:backdrop GtkLabel {
-    color: @backdrop_terminal_window_text;
+    color: @backdrop_terminal_text;
 }
 
 TerminalWindow .notebook:insensitive GtkLabel {
-    color: @insensitive_terminal_window_text;
+    color: @insensitive_terminal_text;
 }
 
 TerminalWindow .notebook:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_terminal_window_text, @insensitive_terminal_window_text, 0.5);
+    color: mix(@backdrop_terminal_text, @insensitive_terminal_text, 0.5);
 }
 
 TerminalWindow .notebook tab GtkLabel {
     background: none;
-    color: @backdrop_terminal_window_text;
+    color: @backdrop_terminal_text;
 }
 
 TerminalWindow .notebook tab:active GtkLabel,
 TerminalWindow .notebook .active-page,
 TerminalWindow .notebook tab .active-page GtkLabel {
     background: none;
-    color: @terminal_window_text;
+    color: @terminal_header_text;
     font-weight: bold;
     text-shadow: none;
 }
@@ -150,13 +147,11 @@ TerminalWindow .notebook tab .active-page GtkLabel {
 TerminalWindow .notebook tab:backdrop GtkLabel,
 TerminalWindow .notebook tab GtkLabel:backdrop {
     background: none;
-    color: @backdrop_terminal_window_text;
+    color: @backdrop_terminal_header_text;
 }
 
-
-
-TerminalWindow .notebook tab .button GtkImage {
-    color: @terminal_window_text;
+#TerminalWindow .notebook tab .button GtkImage {
+    color: @terminal_header_text;
 }
 
 TerminalWindow .notebook tab .button:hover GtkImage,
@@ -165,7 +160,7 @@ TerminalWindow .notebook tab .button:active GtkImage {
 }
 
 TerminalWindow .notebook tab .button:backdrop GtkImage {
-    color: @backdrop_terminal_window_text;
+    color: @backdrop_terminal_header_text;
 }
 
 /**********
@@ -234,7 +229,7 @@ TerminalWindow .scrollbars-junction, /* the small square between scrollbars!!! *
 TerminalWindow .scrollbar.trough {
     /*border-radius: 10px;*/
     background-image: none;
-    background: @terminal_background;
+    background-color: @terminal_background;
     border-width: 0;
     border-image: none;
 }
@@ -247,7 +242,7 @@ TerminalWindow .scrollbar.trough:insensitive {
 TerminalWindow .scrollbars-junction:backdrop,
 TerminalWindow .scrollbar.trough:backdrop {
     background-image: none;
-    background: @terminal_background;
+    background-color: @terminal_background;
     border-width: 0;
     border-radius: 0;
     border-image: none;
diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css
index ba5efb6..67e97c7 100644
--- a/Paper/gtk-3.0/gtk-common.css
+++ b/Paper/gtk-3.0/gtk-common.css
@@ -36,7 +36,7 @@
 @define-color backdrop_foreground shade(@foreground, 1.2);
 @define-color backdrop_border shade(@border, 1.02);
 @define-color backdrop_separator alpha(@separator, 0.9);
-@define-color backdrop_text shade(@text, 1.2);
+@define-color backdrop_text shade(@text, 1.1);
 @define-color backdrop_selection shade(@selection, 1.3);
 
 /* Backdrop-insensitive colors */
@@ -46,9 +46,9 @@
 @define-color backdrop_insensitive_text mix(@backdrop_text, @insensitive_text, 0.5);
 
 /* Backdrop-selected colors */
-@define-color backdrop_selected_background shade(@selection, 1.3);
+@define-color backdrop_selected_background shade(@backdrop_background, 0.9);
 @define-color backdrop_selection @backdrop_selected_background;
-@define-color backdrop_selected_foreground @backdrop_text;
+@define-color backdrop_selected_foreground shade(@selection_foreground, 0.9);
 
 /* Hover colors */
 @define-color hover_base shade(@base, 1.02);
diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css
index 4af8cde..ab25ab2 100644
--- a/Paper/gtk-3.0/gtk-dark.css
+++ b/Paper/gtk-3.0/gtk-dark.css
@@ -25,7 +25,7 @@
 @define-color background #6f7b81;/* Background color */
 @define-color foreground #d3d9dc;/* Foreground color */
 @define-color border shade(@background, 0.8);/* Borders color */
-@define-color separator alpha(#000, 0.2);/* Separator color */
+@define-color separator alpha(#000, 0.1);/* Separator color */
 @define-color text @foreground;/* Text color */
 @define-color panel #454D50;/* Panel color */
 @define-color header #636E73;/* Header color */
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index d19197a..1f59c22 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -25,7 +25,7 @@
 @define-color background #f7f7f7;/* Background color */
 @define-color foreground #555;/* Foreground color */
 @define-color border #D8D8D8;/* Borders color */
-@define-color separator alpha(#000, 0.2);/* Separator color */
+@define-color separator alpha(#000, 0.15);/* Separator color */
 @define-color text @foreground;/* Text color */
 @define-color panel #454D50;/* Panel color */
 @define-color header #636E73;/* Header color */
diff --git a/Paper/gtk-3.0/widgets/dynamic-notebook.css b/Paper/gtk-3.0/widgets/dynamic-notebook.css
index 8bf724d..98b3fe8 100644
--- a/Paper/gtk-3.0/widgets/dynamic-notebook.css
+++ b/Paper/gtk-3.0/widgets/dynamic-notebook.css
@@ -129,10 +129,8 @@
 
 /* Hover */
 .dynamic-notebook tab:hover {
-    background-image: linear-gradient(to bottom,
-                                  alpha(#fff, 0.10),
-                                  alpha(#fff, 0.20)
-                                  );
+    background-image: none;
+    background-color: alpha(@text, 0.05);
 }
 
 
@@ -183,46 +181,46 @@
 
 /* Active-Backdrop */
 .dynamic-notebook tab.top:active:backdrop {
-    box-shadow:inset 0 -3px 0 0 @backdrop_border;
+    box-shadow:inset 0 -3px 0 0 @backdrop_text;
 }
 .dynamic-notebook tab.bottom:active:backdrop {
-    box-shadow:inset 0 3px 0 0 @backdrop_border;
+    box-shadow:inset 0 3px 0 0 @backdrop_text;
 }
 .dynamic-notebook tab.left:active:backdrop {
-    box-shadow:inset -3px 0 0 0 @backdrop_border;
+    box-shadow:inset -3px 0 0 0 @backdrop_text;
 }
 .dynamic-notebook tab.right:active:backdrop {
-    box-shadow:inset 3px 0 0 0 @backdrop_border;
+    box-shadow:inset 3px 0 0 0 @backdrop_text;
 }
 
 
 /* Hover */
 .dynamic-notebook tab.top:hover {
-    box-shadow:inset 0 -3px 0 0 alpha(white, 0.4);
+    box-shadow:inset 0 -3px 0 0 alpha(@text, 0.4);
 }
 .dynamic-notebook tab.bottom:hover {
-    box-shadow:inset 0 3px 0 0 alpha(white, 0.4);
+    box-shadow:inset 0 3px 0 0 alpha(@text, 0.4);
 }
 .dynamic-notebook tab.left:hover {
-    box-shadow:inset -3px 0 0 0 alpha(white, 0.4);
+    box-shadow:inset -3px 0 0 0 alpha(@text, 0.4);
 }
 .dynamic-notebook tab.right:hover {
-    box-shadow:inset 3px 0 0 0 alpha(white, 0.4);
+    box-shadow:inset 3px 0 0 0 alpha(@text, 0.4);
 }
 
 
 /* Hover-Backdrop */
 .dynamic-notebook tab.top:hover {
-    box-shadow:inset 0 -3px 0 0 alpha(white, 0.1);
+    box-shadow:inset 0 -3px 0 0 alpha(@text, 0.1);
 }
 .dynamic-notebook tab.bottom:hover:backdrop {
-    box-shadow:inset 0 3px 0 0 alpha(white, 0.1);
+    box-shadow:inset 0 3px 0 0 alpha(@text, 0.1);
 }
 .dynamic-notebook tab.left:hover:backdrop {
-    box-shadow:inset -3px 0 0 0 alpha(white, 0.1);
+    box-shadow:inset -3px 0 0 0 alpha(@text, 0.1);
 }
 .dynamic-notebook tab.right:hover:backdrop {
-    box-shadow:inset 3px 0 0 0 alpha(white, 0.1);
+    box-shadow:inset 3px 0 0 0 alpha(@text, 0.1);
 }
 
 /* Backdrop */
@@ -253,47 +251,25 @@
     box-shadow:inset 1px 0 0 0 @insensitive_border;
 }
 
+
 /*----- In-tab Padding -----*/
 
 .dynamic-notebook tab.top {
-    padding-top: 4px;
-    padding-left: 8px;
-    padding-bottom: 6px;
-    padding-right: 8px;
+    padding: 6px 8px 8px 8px;
 }
 
 .dynamic-notebook tab.bottom {
-    padding-top: 6px;
-    padding-left: 8px;
-    padding-bottom: 4px;
-    padding-right: 8px;
+    padding: 8px 8px 6px 8px;
 }
 
 .dynamic-notebook tab.left {
-    padding: 6px;
+    padding: 8px;
 }
 
 .dynamic-notebook tab.right {
-    padding: 6px;
+    padding: 8px;
 }
 
-.dynamic-notebook tab.top:active {
-    padding: 2px 8px 3px 8px;
-}
-
-.dynamic-notebook tab.bottom:active {
-    padding: 3px 8px 2px 8px;
-}
-
-.dynamic-notebook tab.left:active {
-    padding: 6px;
-}
-
-.dynamic-notebook tab.right:active {
-    padding: 6px;
-}
-
-
 .dynamic-notebook .notebook tab > .button,
 .dynamic-notebook .notebook tab > .button:hover,
 .dynamic-notebook .notebook tab > .button:hover:active,
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 0ff8461..df57ebe 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -55,19 +55,26 @@
 }
 
 /* Title */
+.title,
 .header-bar .title {
+    padding: 0;
     padding-left: 13px;
     padding-right: 13px;
     font: Bold;
     color: @header_text;
 }
 
+.header-bar .button.flat .title {
+    padding: 0;
+}
+
 .header-bar .title:backdrop {
     color: @backdrop_header_text;
 }
 
 /* Subtitle */
 .header-bar .subtitle {
+    padding: 0;
     font: 9;
 }
 
@@ -86,7 +93,7 @@
 /* Separator */
 .header-bar .separator {
     background: none;
-    color: transparent;
+    color: @separator;
 }
 
 /**********************
@@ -393,8 +400,8 @@
 .header-bar .separator,
 .header-bar .button .separator,
 .header-bar .button.separator {
-    background: none;
-    color: transparent;
+    background: inherit;
+    color: @separator;
     border:none;
 } 
 
diff --git a/Paper/gtk-3.0/widgets/menu-button.css b/Paper/gtk-3.0/widgets/menu-button.css
index e385ac8..80c2385 100644
--- a/Paper/gtk-3.0/widgets/menu-button.css
+++ b/Paper/gtk-3.0/widgets/menu-button.css
@@ -25,17 +25,23 @@
 }
 
 .menu-button .menu,
-.menu-button .menu GtkLabel {
+.menu-button .menu GtkLabel,
+.menu-button.image-button .menu,
+.menu-button.image-button .menu GtkLabel {
 	color: @text;
 }
 
 .menu-button .menu:backdrop GtkLabel,
-.menu-button .menuitem:backdrop GtkLabel {
+.menu-button .menuitem:backdrop GtkLabel
+.menu-button.image-button .menu:backdrop GtkLabel,
+.menu-button.image-button .menuitem:backdrop GtkLabel {
 	color: @backdrop_text;
 }
 
 .menu-button .menu:insensitive GtkLabel,
-.menu-button .menuitem:insensitive GtkLabel {
+.menu-button .menuitem:insensitive GtkLabel,
+.menu-button.image-button .menu:insensitive GtkLabel,
+.menu-button.image-button .menuitem:insensitive GtkLabel {
 	color: @insensitive_text;
 }
 
@@ -44,7 +50,13 @@
 .menu-button .menuitem .accelerator,
 .menu-button .menuitem .accelerator:insensitive
 .menu-button .menu .menuitem .accelerator,
-.menu-button .menu .menuitem .accelerator:insensitive {
+.menu-button .menu .menuitem .accelerator:insensitive,
+.menu-button.image-button .menu .accelerator,
+.menu-button.image-button .menu .accelerator:insensitive,
+.menu-button.image-button .menuitem .accelerator,
+.menu-button.image-button .menuitem .accelerator:insensitive
+.menu-button.image-button .menu .menuitem .accelerator,
+.menu-button.image-button .menu .menuitem .accelerator:insensitive {
 	color: @insensitive_text;
 }
 
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index aa5decc..3f224c8 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -262,22 +262,6 @@
     padding: 8px;
 }
 
-.notebook tab.top:active {
-    padding: 8px 8px 6px 8px;
-}
-
-.notebook tab.bottom:active {
-    padding: 6px 8px 8px 8px;
-}
-
-.notebook tab.left:active {
-    padding: 8px;
-}
-
-.notebook tab.right:active {
-    padding: 8px;
-}
-
 
 /*----- Labels -----*/
 
diff --git a/Paper/gtk-3.0/widgets/sidebar.css b/Paper/gtk-3.0/widgets/sidebar.css
index 6583ccc..034ae38 100644
--- a/Paper/gtk-3.0/widgets/sidebar.css
+++ b/Paper/gtk-3.0/widgets/sidebar.css
@@ -51,6 +51,15 @@ GtkDialog .sidebar GtkScrolledWindow {
     -GtkTreeView-vertical-separator: 6px;
 }
 
+.sidebar .separator,
+.source-list .separator {
+    color: @separator;
+}
+.sidebar .separator:backdrop,
+.source-list .separator:backdrop {
+    color: @backdrop_separator;
+}
+
 .sidebar:backdrop,
 .source-list:backdrop {
     border: solid @backdrop_border;
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 39c8b5a..d385639 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -55,15 +55,22 @@
     color: @header_text;
 }
 
+.title,
 .titlebar .title {
+    padding: 0;
     padding-left: 13px;
     padding-right: 13px;
     color: @header_text;
     font: Bold;
 }
 
+.titlebar .button.flat .title {
+    padding: 0;
+}
+
 /* Subtitle */
 .titlebar .subtitle {
+    padding: 0;
     font: 9;
 }
 
@@ -81,6 +88,12 @@
 
 
 
+/* Separator */
+.titlebar .separator {
+    background: none;
+    color: @separator;
+}
+
 /**********************
  * Header bar buttons *
  **********************/
@@ -95,7 +108,7 @@
     background-color: transparent;
     background-image: none;
     border: none;
-    padding: 12px 15px 10px 15px;
+    padding: 13px 15px;
 }
 
 /* Normal Button */
@@ -439,3 +452,26 @@
     outline: none;
 }
 
+
+
+/*************************
+ * Header bar separator  *
+ *************************/
+
+.titlebar > GtkBox > .separator.vertical {
+    -GtkWidget-wide-separators: 1;
+    -GtkWidget-separator-width: 0;
+    background-color: @separator;
+    color: @separator;
+    border:none;
+}
+
+/* Separator */
+.titlebar .separator,
+.titlebar .button .separator,
+.titlebar .button.separator {
+    background: inherit;
+    color: @separator;
+    border:none;
+} 
+