diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css
index fd33afd..6f20072 100644
--- a/Paper/gtk-3.0/apps.css
+++ b/Paper/gtk-3.0/apps.css
@@ -39,8 +39,9 @@
 @import url("apps/gnome-disks.css");
 /*@import url("apps/gnome-music.css");*/
 @import url("apps/gnome-photos.css");
-@import url("apps/gnome-terminal.css");
 /*@import url("apps/gnome-software.css");*/
+@import url("apps/gnome-terminal.css");
+@import url("apps/gnome-tweak-tool.css");
 @import url("apps/gnome.css");
 @import url("apps/nautilus.css");
 @import url("apps/snap.css");
diff --git a/Paper/gtk-3.0/apps/gnome-tweak-tool.css b/Paper/gtk-3.0/apps/gnome-tweak-tool.css
new file mode 100644
index 0000000..d0c951e
--- /dev/null
+++ b/Paper/gtk-3.0/apps/gnome-tweak-tool.css
@@ -0,0 +1,37 @@
+/* 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/.
+*/
+
+
+/**************
+ * tweak-tool *
+ **************/
+.tweak {
+    color: @text;
+}
+
+.list-row .tweak:hover {
+    background-color: @selection;
+}
+
+.list-row .tweak:hover GtkLabel {
+    color: @selection;
+}
+
+.tweak-startup {
+    border:1px solid @border;
+}
\ 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 b9e4c48..43e935f 100644
--- a/Paper/gtk-3.0/apps/gnome.css
+++ b/Paper/gtk-3.0/apps/gnome.css
@@ -25,13 +25,6 @@ SushiFontWidget {
 }
 
 
-/**************
- * tweak-tool *
- **************/
-.tweak-startup {
-    border:1px solid #cccccc;
-}
-
 /**********
  * Sudoku *
  **********/
diff --git a/Paper/gtk-3.0/apps/unity.css b/Paper/gtk-3.0/apps/unity.css
index 72fa3c4..555f210 100644
--- a/Paper/gtk-3.0/apps/unity.css
+++ b/Paper/gtk-3.0/apps/unity.css
@@ -43,7 +43,7 @@ UnityDecoration {
 
     /* Glow applied to the selected scaled window */
     -UnityDecoration-glow-size: 8px;/* Size property, size of glow */
-    -UnityDecoration-glow-color: rgb(159, 68, 173);/* Color property of the glow */
+    -UnityDecoration-glow-color: @selection;/* Color property of the glow */
 
     /* Title settings */
     -UnityDecoration-title-indent: 10px;/* Size property, left indent of the title */
diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css
index 1a983bc..12c1029 100644
--- a/Paper/gtk-3.0/widgets/buttons.css
+++ b/Paper/gtk-3.0/widgets/buttons.css
@@ -17,6 +17,7 @@
 */
 
 @define-color button_background shade(@background, 0.9);/* Button background color */
+@define-color button_border @border;/* Button border color */
 @define-color backdrop_button_background shade(@backdrop_background, 0.9);/* Button background color */
 @define-color button_border @button_background; /* Button border color */
 
@@ -27,9 +28,10 @@
 .button {
     border-radius: 4px;
     padding: 4px 9px;
-    border-color: @button_background;
+    /*border: 1px solid @button_border;*/
     background-color: @button_background;
     border: none;
+    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
 .button.flat,
diff --git a/Paper/gtk-3.0/widgets/dynamic-notebook.css b/Paper/gtk-3.0/widgets/dynamic-notebook.css
index 8dffc36..00a5592 100644
--- a/Paper/gtk-3.0/widgets/dynamic-notebook.css
+++ b/Paper/gtk-3.0/widgets/dynamic-notebook.css
@@ -22,6 +22,7 @@
 
 .dynamic-notebook .notebook.header {
     background: none;
+    background-color: @background;
     border: 0 solid @border;
     border-radius: 0;
     border: none;
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index c3b6516..4b9d748 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -22,7 +22,8 @@
  **************/
 
 .header-bar {
-    padding: 0px;
+    padding-left: 6px;
+    padding-right: 6px;
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 -3px 3px -4px alpha(#000, 0.7);
@@ -76,6 +77,7 @@
     background-color: transparent;
     background: none;
     padding: 13px;
+    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
 /* Normal Button */
diff --git a/Paper/gtk-3.0/widgets/list-rows.css b/Paper/gtk-3.0/widgets/list-rows.css
index 8bf4f51..680d610 100644
--- a/Paper/gtk-3.0/widgets/list-rows.css
+++ b/Paper/gtk-3.0/widgets/list-rows.css
@@ -1,38 +1,16 @@
-/* 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/.
-*/
-
 /*********
- * Lists *
- *********/
+* Lists *
+*********/
 .list,
 .list-row {
     background-color: @background;
-    color: @foreground;
-}
-
-.list:insensitive,
-.list-row:insensitive {
-    background-color: @insensitive_background;
+    border-color: @border;
 }
 
 .list:backdrop,
 .list-row:backdrop {
     background-color: @backdrop_background;
+    border-color: @backdrop_border;
 }
 
 .list-row,
@@ -40,70 +18,199 @@
     padding: 2px;
 }
 
-/* List Row Button */
-.button.list-row {
-    outline: none;
-    border: solid transparent;
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-    border-radius: 0px;
+
+.list-row.button,
+.header-bar .list-row.button.titlebutton,
+.titlebar .list-row.button.titlebutton {
+    background-color: transparent;
+    border-style: none;
+    border-radius: 0;
 }
 
-.button.list-row:hover  {
-    border: solid alpha(@selection, 0.2);
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-    background-color: alpha(@selection, 0.2);
-    color: @selection;
-}
-
-.button.list-row:active,
-.button.list-row:selected {
-    border: solid alpha(@selection, 0.4);
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-    background-color: alpha(@selection, 0.4);
-    color: @selection;
-}
-
-.button.list-row:active:selected,
-.button.list-row:active:selected:hover {
-    border: solid alpha(@selection, 0.2);
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-    background-color: alpha(@selection, 0.2);
-    color: @selection;
-}
-
-.button.list-row:hover:selected {
-    border: solid alpha(@selection, 0.2);
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-    background-color: alpha(@selection, 0.2);
-    color: @selection;
-}
-
-/* Labels */
-.button .list-row GtkLabel {
-    color: @text;
-}
-
-.button .list-row:active GtkLabel,
-.button .list-row:focus GtkLabel,
-.button .list-row:hover GtkLabel {
+.list-row.button:hover {
+    border-color: @selection;
+    background-color: @selection;
     color: @selected_foreground;
 }
 
-.button .list-row:backdrop GtkLabel,
-.button .list-row:backdrop:hover GtkLabel,
-.button .list-row:active:backdrop GtkLabel {
-    color: @backdrop_text;
+.list-row.button:active {
 }
 
-.button .list-row:insensitive GtkLabel {
-    color: @insensitive_text;
+.list-row.button:selected:active {
 }
 
-.button .list-row:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
\ No newline at end of file
+.list-row.button:selected:hover {
+    border-color: shade(@selection, 1.2);
+    background-color: shade(@selection, 1.2);
+}
+
+.list-row.button:selected:backdrop {
+    background-color: @backdrop_selection;
+}
+
+.list-row:selected .button {
+    color: @button;
+    border-color: @border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button.flat,
+.list-row:selected .header-bar .titlebutton.button,
+.header-bar .list-row:selected .titlebutton.button,
+.list-row:selected .titlebar .titlebutton.button,
+.titlebar .list-row:selected .titlebutton.button {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    color: @selection;
+}
+
+.list-row:selected .button:hover {
+    color: @button;
+    border-color: @border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:active,
+.list-row:selected .button:checked {
+    color: @button;
+    border-color: @border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:backdrop,
+.list-row:selected .button.flat:backdrop,
+.list-row:selected .header-bar .titlebutton.button:backdrop,
+.header-bar .list-row:selected .titlebutton.button:backdrop,
+.list-row:selected .titlebar .titlebutton.button:backdrop,
+.titlebar .list-row:selected .titlebutton.button:backdrop {
+    color: @insensitive_background;
+    border-color: @insensitive_border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:backdrop:active,
+.list-row:selected .button:backdrop:checked,
+.list-row:selected .button.flat:backdrop:active,
+.list-row:selected .header-bar .titlebutton.button:backdrop:active,
+.header-bar .list-row:selected .titlebutton.button:backdrop:active,
+.list-row:selected .titlebar .titlebutton.button:backdrop:active,
+.titlebar .list-row:selected .titlebutton.button:backdrop:active,
+.list-row:selected .button.flat:backdrop:checked,
+.list-row:selected .header-bar .titlebutton.button:backdrop:checked,
+.header-bar .list-row:selected .titlebutton.button:backdrop:checked,
+.list-row:selected .titlebar .titlebutton.button:backdrop:checked,
+.titlebar .list-row:selected .titlebutton.button:backdrop:checked {
+    color: @insensitive_background;
+    border-color: @insensitive_border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:backdrop:insensitive,
+.list-row:selected .button.flat:backdrop:insensitive,
+.list-row:selected .header-bar .titlebutton.button:backdrop:insensitive,
+.header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
+.list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
+.titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
+    color: #c7c7c7;
+    border-color: @insensitive_border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:backdrop:insensitive > .label,
+.list-row:selected .header-bar .button.titlebutton:backdrop:insensitive > .label,
+.list-row:selected .titlebar .button.titlebutton:backdrop:insensitive > .label,
+.list-row:selected .button.flat:backdrop:insensitive > .label,
+.list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label,
+.header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label,
+.list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label,
+.titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label {
+    color: inherit;
+}
+
+.list-row:selected .button:backdrop:insensitive:active,
+.list-row:selected .button:backdrop:insensitive:checked,
+.list-row:selected .button.flat:backdrop:insensitive:active,
+.list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active,
+.header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
+.list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
+.titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
+.list-row:selected .button.flat:backdrop:insensitive:checked,
+.list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked,
+.header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
+.list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
+.titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
+    color: #c7c7c7;
+    border-color: @insensitive_border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:backdrop:insensitive:active > .label,
+.list-row:selected .header-bar .button.titlebutton:backdrop:insensitive:active > .label,
+.list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:active > .label,
+.list-row:selected .button:backdrop:insensitive:checked > .label,
+.list-row:selected .header-bar .button.titlebutton:backdrop:insensitive:checked > .label,
+.list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:checked > .label,
+.list-row:selected .button.flat:backdrop:insensitive:active > .label,
+.list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
+.header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label,
+.list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
+.titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label,
+.list-row:selected .button.flat:backdrop:insensitive:checked > .label,
+.list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked > .label,
+.header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label,
+.list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label,
+.titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
+    color: inherit;
+}
+
+.list-row:selected .button.flat:backdrop,
+.list-row:selected .header-bar .titlebutton.button:backdrop,
+.header-bar .list-row:selected .titlebutton.button:backdrop,
+.list-row:selected .titlebar .titlebutton.button:backdrop,
+.titlebar .list-row:selected .titlebutton.button:backdrop {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    color: white;
+}
+
+.list-row:selected .button:insensitive {
+    color: @insensitive_background;
+    border-color: @border;
+    border-color: @selected_border;
+}
+
+.list-row:selected .button:insensitive > .label,
+.list-row:selected .header-bar .button.titlebutton:insensitive > .label,
+.list-row:selected .titlebar .button.titlebutton:insensitive > .label {
+    color: inherit;
+}
+
+.list-row:selected .button:insensitive:active,
+.list-row:selected .button:insensitive:checked {
+    color: @insensitive_background;
+    border-color: @border;
+}
+
+.list-row:selected .button:insensitive:active > .label,
+.list-row:selected .header-bar .button.titlebutton:insensitive:active > .label,
+.list-row:selected .titlebar .button.titlebutton:insensitive:active > .label,
+.list-row:selected .button:insensitive:checked > .label,
+.list-row:selected .header-bar .button.titlebutton:insensitive:checked > .label,
+.list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
+    color: inherit;
+}
+
+
+.list-row, list-row.button,
+.header-bar list-row.button.titlebutton,
+.titlebar list-row.button.titlebutton {
+    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
+}
+
+.list-row:hover, list-row.button:hover,
+.header-bar list-row.button.titlebutton:hover,
+.titlebar list-row.button.titlebutton:hover {
+    transition: none;
+}
diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css
index 4f1ef43..765e99f 100644
--- a/Paper/gtk-3.0/widgets/menus.css
+++ b/Paper/gtk-3.0/widgets/menus.css
@@ -154,9 +154,62 @@
 }
 
 
-/*******************
- * Checks & Radios *
- *******************/
+
+/* Images */
+.menuitem GtkImage {
+    color: @text;
+}
+
+.menuitem:active GtkImage,
+.menuitem:focus GtkImage,
+.menuitem:hover GtkImage {
+    color: @selected_foreground;
+}
+
+.menuitem:backdrop GtkImage,
+.menuitem:backdrop:hover GtkImage,
+.menuitem:active:backdrop GtkImage {
+    color: @backdrop_text;
+    -gtk-image-effect: dim;
+}
+
+.menuitem:insensitive GtkImage {
+    color: @insensitive_text;
+    -gtk-image-effect: dim;
+}
+
+.menuitem:insensitive:backdrop GtkImage {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+    -gtk-image-effect: dim;
+}
+
+/* Labels */
+.menuitem GtkLabel {
+    color: @text;
+}
+
+.menuitem:active GtkLabel,
+.menuitem:focus GtkLabel,
+.menuitem:hover GtkLabel {
+    color: @selected_foreground;
+}
+
+.menuitem:backdrop GtkLabel,
+.menuitem:backdrop:hover GtkLabel,
+.menuitem:active:backdrop GtkLabel {
+    color: @backdrop_text;
+}
+
+.menuitem:insensitive GtkLabel {
+    color: @insensitive_text;
+}
+
+.menuitem:insensitive:backdrop GtkLabel {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+}
+
+
+/* Checks & Radios */
 
 .menuitem.check,
 .menuitem.radio {
diff --git a/Paper/gtk-3.0/widgets/separators.css b/Paper/gtk-3.0/widgets/separators.css
index 1270586..a46021e 100644
--- a/Paper/gtk-3.0/widgets/separators.css
+++ b/Paper/gtk-3.0/widgets/separators.css
@@ -24,20 +24,35 @@
 .separator {
     color: @separator;
 }
+
 .pane-separator {
     -GtkPaned-handle-size: 2px;
+    padding: 4px;
     background-color: @background;
+    border: 1px solid @separator;
+    border-left-width: 0px;
+    border-right-width: 0px;
+    color: @base;
+}
+
+.pane-separator.vertical {
+    -GtkPaned-handle-size: 2px;
+    padding: 4px;
+    background-color: @background;
+    border: 1px solid @separator;
+    border-left-width: 0px;
+    border-right-width: 0px;
     color: @base;
 }
 
 .pane-separator:hover,
 .pane-separator:selected {
-    color: @foreground;
+    color: @selection;
 }
 
 .pane-separator:backdrop,
 .pane-separator:hover:backdrop {
-    background-color: @background;
+    background-color: @backdrop_background;
 }
 
 .notebook .pane-separator,
@@ -53,9 +68,8 @@
 .sidebar-pane-separator,
 .sidebar-pane-separator:hover,
 .sidebar-pane-separator:selected {
-    border-width: 0;
     -GtkPaned-handle-size: 2px;
     background-image: none;
-    background-color: @border;
+    background-color: @separator;
     border: 1px solid @border;
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/switches.css b/Paper/gtk-3.0/widgets/switches.css
index 53f4914..a28054e 100644
--- a/Paper/gtk-3.0/widgets/switches.css
+++ b/Paper/gtk-3.0/widgets/switches.css
@@ -49,6 +49,7 @@ GtkSwitch.trough:active:backdrop {
 
 GtkSwitch.trough:insensitive,
 GtkSwitch.trough:active:insensitive {
+    background: none;
     border: 1px solid @insensitive_border;
     color: @insensitive_text;
 }
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 2ad7adf..0d4bb3d 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -21,8 +21,9 @@
  ******************/
 
 .titlebar {
+    padding-left: 6px;
+    padding-right: 6px;
     border-width: 0px;
-    padding: 0px;
     background-color: @header;
     color: @header_text;
 }
@@ -71,6 +72,7 @@
     background-color: transparent;
     background: none;
     padding: 13px;
+    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
 /* Normal Button */
diff --git a/Paper/gtk-3.0/widgets/views.css b/Paper/gtk-3.0/widgets/views.css
index 4fb65e3..ade4be7 100644
--- a/Paper/gtk-3.0/widgets/views.css
+++ b/Paper/gtk-3.0/widgets/views.css
@@ -93,27 +93,6 @@
 }
 
 
-/************
- * List Box *
- ************/
-
-GtkListBoxRow:selected,
-.view:selected {
-    background-color: @selection;
-    color: white;
-}
-
-GtkListBoxRow:selected:backdrop {
-    background-color: @backdrop_background;
-    color: @foreground;
-}
-
-GtkListBoxRow:selected:focus,
-.view:selected:focus {
-    background-color: @selection;
-    color: @selected_foreground;
-}
-
 /************
  * Treeview *
  ************/
@@ -131,6 +110,7 @@ GtkTreeView {
     -GtkTreeView-horizontal-separator: 6px;
     -GtkTreeView-expander-size: 8px;
     -GtkTreeView-grid-line-pattern: "\000\000";
+    border: 1px solid @border;
 }
 
 GtkTreeView row:nth-child(even) {