From a57b032c5adad8c369c5a9a7783f95654c53805d Mon Sep 17 00:00:00 2001
From: Sam Hewitt <hewittsamuel@gmail.com>
Date: Wed, 16 Mar 2016 13:34:25 -0400
Subject: [PATCH] some refinement & bug fixes

---
 Paper/gtk-3.0/apps/vocal.css               |  33 ++
 Paper/gtk-3.0/gtk.css                      |   2 +-
 Paper/gtk-3.0/widgets/buttons.css          | 117 +------
 Paper/gtk-3.0/widgets/dynamic-notebook.css |  41 +--
 Paper/gtk-3.0/widgets/entry.css            |   7 +-
 Paper/gtk-3.0/widgets/header-bar.css       | 377 ++++++---------------
 Paper/gtk-3.0/widgets/notebook.css         |  19 +-
 Paper/gtk-3.0/widgets/titlebar.css         | 367 +-------------------
 8 files changed, 178 insertions(+), 785 deletions(-)
 create mode 100644 Paper/gtk-3.0/apps/vocal.css

diff --git a/Paper/gtk-3.0/apps/vocal.css b/Paper/gtk-3.0/apps/vocal.css
new file mode 100644
index 0000000..1152c8f
--- /dev/null
+++ b/Paper/gtk-3.0/apps/vocal.css
@@ -0,0 +1,33 @@
+/* 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/.
+*/
+
+@define-color vocal #B286D7;
+
+/**********
+ * Header *
+ **********/
+
+.titlebar.vocal-headerbar,
+.header-bar.vocal-headerbar {
+    background-color: @vocal;
+}
+
+.titlebar.vocal-headerbar:backdrop,
+.header-bar.vocal-headerbar:backdrop {
+    background-color: shade(@vocal,0.9);
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index 29a7e7e..ad87045 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -23,7 +23,7 @@
 /* Base colors */
 @define-color base #fff;/* Base color */
 @define-color background #f7f7f7;/* Background color */
-@define-color foreground #555;/* Foreground color */
+@define-color foreground #666;/* Foreground color */
 @define-color border #D8D8D8;/* Borders color */
 @define-color separator alpha(#000, 0.15);/* Separator color */
 @define-color text @foreground;/* Text color */
diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css
index 0a2ce6e..a873a94 100644
--- a/Paper/gtk-3.0/widgets/buttons.css
+++ b/Paper/gtk-3.0/widgets/buttons.css
@@ -1,4 +1,4 @@
-/* Copyright 2015 Sam Hewitt.
+/* Copyright 2016 Sam Hewitt.
 *
 * This file is part of the Paper GTK theme.
 *
@@ -36,6 +36,7 @@
                                       @button_background,
                                       shade(@button_background, 0.98)
                                       );
+    color: @text;
 }
 
 .button.flat,
@@ -103,7 +104,6 @@ GtkCalendar.button:backdrop:hover,
                                       shade(@selection, 1.2),
                                       shade(shade(@selection, 1.2), 0.98)
                                       );
-    color: @selected_foreground;
 }
 
 /* Active (Pressed) Button */
@@ -167,119 +167,6 @@ GtkCalendar.button:backdrop:hover,
     color: @insensitive_text;
 }
 
-/* Images */
-.button GtkImage {
-    color: @text;
-}
-
-.button:active GtkImage,
-.button:focus GtkImage,
-.button:hover GtkImage {
-    color: @selected_foreground;
-}
-
-.button:backdrop GtkImage,
-.button:backdrop:hover GtkImage,
-.button:active:backdrop GtkImage {
-    color: @backdrop_text;
-}
-
-.button:insensitive GtkImage {
-    color: @insensitive_text;
-    -gtk-image-effect: dim;
-}
-
-.button:insensitive:backdrop GtkImage {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-/* Labels */
-.button GtkLabel {
-    color: @text;
-}
-
-.button:active GtkLabel,
-.button:focus GtkLabel,
-.button:hover GtkLabel {
-    color: @selected_foreground;
-}
-
-.button:backdrop GtkLabel,
-.button:backdrop:hover GtkLabel,
-.button:focus:backdrop GtkLabel,
-.button:active:backdrop GtkLabel {
-    color: @backdrop_text;
-}
-
-.button:insensitive GtkLabel {
-    color: @insensitive_text;
-}
-
-.button:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
-
-/* Text Button Labels */
-.text-button GtkLabel {
-    color: @text;
-}
-
-.text-button:focus GtkLabel {
-    /*color: shade(@text, 2.0);*/
-    color: @text;
-}
-
-.text-button:active GtkLabel,
-.text-button:hover GtkLabel {
-    color: shade(@selection, 0.85);
-    /*color: @text;*/
-}
-
-.text-button:backdrop GtkLabel,
-.text-button:backdrop:hover GtkLabel,
-.text-button:active:backdrop GtkLabel {
-    color: @backdrop_text;
-}
-
-.text-button:insensitive GtkLabel {
-    color: @insensitive_text;
-}
-
-.text-button:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
-
-
-/* Image Button Images */
-.image-button GtkImage {
-    color: @text;
-}
-
-.image-button:focus GtkImage {
-    /*color: shade(@text, 2.0);*/
-    color: @text;
-}
-
-.image-button:active GtkImage,
-.image-button:hover GtkImage {
-    /*color: alpha(#000, 0.5);*/
-    color: @selected_foreground;
-}
-
-.image-button:backdrop GtkImage,
-.image-button:backdrop:hover GtkImage,
-.image-button:active:backdrop GtkImage {
-    color: @backdrop_text;
-}
-
-.image-button:insensitive GtkImage {
-    color: @insensitive_text;
-}
-
-.image-button:insensitive:backdrop GtkImage {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
 
 /**************
 * Help Button *
diff --git a/Paper/gtk-3.0/widgets/dynamic-notebook.css b/Paper/gtk-3.0/widgets/dynamic-notebook.css
index 98b3fe8..06e19fb 100644
--- a/Paper/gtk-3.0/widgets/dynamic-notebook.css
+++ b/Paper/gtk-3.0/widgets/dynamic-notebook.css
@@ -110,6 +110,7 @@
 
 
 .dynamic-notebook .notebook tab {
+    padding-top: 3px;
     color: @foreground;
 }
 
@@ -167,60 +168,54 @@
 
 /* Active */
 .dynamic-notebook tab.top:active {
-    box-shadow:inset 0 -3px 0 0 @selection;
+    box-shadow:inset 0 -2px 0 0 @text;
 }
 .dynamic-notebook tab.bottom:active {
-    box-shadow:inset 0 3px 0 0 @selection;
+    box-shadow:inset 0 2px 0 0 @text;
 }
 .dynamic-notebook tab.left:active {
-    box-shadow:inset -3px 0 0 0 @selection;
+    box-shadow:inset -2px 0 0 0 @text;
 }
 .dynamic-notebook tab.right:active {
-    box-shadow:inset 3px 0 0 0 @selection;
+    box-shadow:inset 2px 0 0 0 @text;
 }
 
 /* Active-Backdrop */
 .dynamic-notebook tab.top:active:backdrop {
-    box-shadow:inset 0 -3px 0 0 @backdrop_text;
+    box-shadow:inset 0 -2px 0 0 @backdrop_text;
 }
 .dynamic-notebook tab.bottom:active:backdrop {
-    box-shadow:inset 0 3px 0 0 @backdrop_text;
+    box-shadow:inset 0 2px 0 0 @backdrop_text;
 }
 .dynamic-notebook tab.left:active:backdrop {
-    box-shadow:inset -3px 0 0 0 @backdrop_text;
+    box-shadow:inset -2px 0 0 0 @backdrop_text;
 }
 .dynamic-notebook tab.right:active:backdrop {
-    box-shadow:inset 3px 0 0 0 @backdrop_text;
+    box-shadow:inset 2px 0 0 0 @backdrop_text;
 }
 
 
 /* Hover */
-.dynamic-notebook tab.top:hover {
-    box-shadow:inset 0 -3px 0 0 alpha(@text, 0.4);
-}
-.dynamic-notebook tab.bottom:hover {
-    box-shadow:inset 0 3px 0 0 alpha(@text, 0.4);
-}
-.dynamic-notebook tab.left:hover {
-    box-shadow:inset -3px 0 0 0 alpha(@text, 0.4);
-}
+.dynamic-notebook tab.top:hover,
+.dynamic-notebook tab.bottom:hover,
+.dynamic-notebook tab.left:hover,
 .dynamic-notebook tab.right:hover {
-    box-shadow:inset 3px 0 0 0 alpha(@text, 0.4);
+    box-shadow: none;
+    background: shade(@background, 0.95);
 }
 
-
 /* Hover-Backdrop */
 .dynamic-notebook tab.top:hover {
-    box-shadow:inset 0 -3px 0 0 alpha(@text, 0.1);
+    box-shadow:inset 0 -2px 0 0 alpha(@text, 0.1);
 }
 .dynamic-notebook tab.bottom:hover:backdrop {
-    box-shadow:inset 0 3px 0 0 alpha(@text, 0.1);
+    box-shadow:inset 0 2px 0 0 alpha(@text, 0.1);
 }
 .dynamic-notebook tab.left:hover:backdrop {
-    box-shadow:inset -3px 0 0 0 alpha(@text, 0.1);
+    box-shadow:inset -2px 0 0 0 alpha(@text, 0.1);
 }
 .dynamic-notebook tab.right:hover:backdrop {
-    box-shadow:inset 3px 0 0 0 alpha(@text, 0.1);
+    box-shadow:inset 2px 0 0 0 alpha(@text, 0.1);
 }
 
 /* Backdrop */
diff --git a/Paper/gtk-3.0/widgets/entry.css b/Paper/gtk-3.0/widgets/entry.css
index bc3ed01..f7540f1 100644
--- a/Paper/gtk-3.0/widgets/entry.css
+++ b/Paper/gtk-3.0/widgets/entry.css
@@ -32,7 +32,7 @@
     background-color: @base;
     color: @text;
     border: 1px solid @border;
-    box-shadow:inset 0 -1px 0 1px alpha(#000, 0.05),
+    box-shadow:inset 0 3px 0 1px alpha(#000, 0.05),
                inset 0 1px 0 0 alpha(#000, 0.02);
 }
 
@@ -40,8 +40,9 @@
     background-color: @base;
     color: @text;
     border: 1px solid shade(@selection, 0.8);
-    box-shadow:inset 0 0 0 1px alpha(@selection, 0.4),
-               inset 0 1px 0 0 alpha(@selection, 0.1);
+    box-shadow:inset 0 0 0 1px alpha(@selection, 0.2),
+               inset 0 0 0 2px alpha(@selection, 0.1),
+               inset 0 1px 0 0 alpha(@selection, 0.3);
 }
 
 .entry:backdrop:active,
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 0abc8e8..4ecd47f 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -1,4 +1,4 @@
-/* Copyright 2015 Sam Hewitt.
+/* Copyright 2016 Sam Hewitt.
 *
 * This file is part of the Paper GTK theme.
 *
@@ -32,8 +32,7 @@
     border-radius: 4px 4px 0 0;
     background-color: @header;
     color: @header_text;
-    box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
-                inset 0 -1px 2px 0 rgba(0,0,0,0.1);
+    box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
 }
 
 
@@ -64,7 +63,11 @@
     color: @header_text;
 }
 
-.header-bar .button.linked .title,
+.header-bar > GtkImage {
+    color: @header_text;
+}
+
+.header-bar .button.button.linked .title,
 .header-bar .button.flat .title {
     padding: 0;
 }
@@ -91,302 +94,142 @@
     color: alpha(@backdrop_header_text,0.8);
 }
 
+/*Images*/
+
+.header-bar GtkImage,
+.header-bar *:active GtkImage,
+.header-bar *:focus GtkImage,
+.header-bar *:hover GtkImage {
+    color: @header_text;
+}
+
+.header-bar *:backdrop GtkImage,
+.header-bar *:backdrop:hover GtkImage,
+.header-bar *:active:backdrop GtkImage {
+    color: shade(@header_text, 1.1);
+    /*-gtk-image-effect: dim;*/
+}
+
+.header-bar *:insensitive GtkImage
+.header-bar *:insensitive:backdrop GtkImage {
+    color: @header_text;
+    -gtk-image-effect: dim;
+}
+
+
 /* Separator */
 .header-bar .separator {
     background: none;
     color: @separator;
 }
 
-/**********************
- * Header bar buttons *
- **********************/
-.header-bar .flat,
+/* Buttons */
 .header-bar .button,
-.header-bar .titlebutton,
-.header-bar .linked,
-.header-bar .text-button,
-.header-bar .image-button {
-    background-color: transparent;
-    background-image: none;
-    box-shadow: none;
-    border: none;
-    padding: 10px 12px;
-}
-
-/* Normal Button */
-.header-bar .button,
-.header-bar .text-button,
-.header-bar .titlebutton,
-.header-bar .linked,
 .header-bar .flat,
+.header-bar .button.image-button,
+.header-bar .button.linked,
 .header-bar .suggested-action .button,
-.header-bar .image-button {
+.header-bar .button.text-button,
+.header-bar .titlebutton {
     background-color: transparent;
     background-image: none;
     border-radius: 0px;
     border: none;
     box-shadow: none;
+    padding: 10px 12px;
     color: @header_text;
 }
 
-/* Active Button */
-.header-bar .button:active,
-.header-bar .text-button:active,
-.header-bar .titlebutton:active,
-.header-bar .linked:active,
-.header-bar .flat:active,
-.header-bar .suggested-action .button:active,
-.header-bar .image-button:active {
-    border-radius: 0px;
-    /*background-color: alpha(#000, 0.1);*/
+/* Buttons (Hover) */
+.header-bar .button:hover,
+.header-bar .flat:hover,
+.header-bar .button.image-button:hover,
+.header-bar .button.linked:hover,
+.header-bar .suggested-action .button:hover,
+.header-bar .button.text-button:hover,
+.header-bar .titlebutton:hover {
     background-image: none;
+    border-radius: 0px;
     border: none;
+    box-shadow: none;
+    background-color: alpha(#000,0.1);
     color: @header_text;
-    box-shadow: inset 0 -2px 0 0 @header_text;
 }
 
-.header-bar .text-button:active {
-    font: Bold;
-}
-
-/* Checked Button */
-.header-bar .button:checked,
-.header-bar .text-button:checked,
-.header-bar .titlebutton:checked,
-.header-bar .linked:checked,
-.header-bar .flat:checked,
-.header-bar .suggested-action .button:checked,
-.header-bar .image-button:checked {
-    border-radius: 0px;
-    background-image: none;
+/* Buttons (Backdrop) */
+.header-bar .button:backdrop,
+.header-bar .flat:backdrop,
+.header-bar .button.image-button:backdrop,
+.header-bar .button.linked:backdrop,
+.header-bar .suggested-action .button:backdrop,
+.header-bar .button.text-button:backdrop,
+.header-bar .titlebutton:backdrop {
     background: none;
+    background-image: none;
+    border-radius: 0px;
     border: none;
+    box-shadow: none;
+    color: shade(@header_text, 1.1);
+}
+
+/* Buttons (Insensitive) */
+.header-bar .button:insensitive,
+.header-bar .flat:insensitive,
+.header-bar .button.image-button:insensitive,
+.header-bar .button.linked:insensitive,
+.header-bar .suggested-action .button:insensitive,
+.header-bar .button.text-button:insensitive,
+.header-bar .titlebutton:insensitive {
+    background: none;
+    background-image: none;
+    border-radius: 0px;
+    border: none;
+    box-shadow: none;
+    color: alpha(@header_text, 0.5);
+}
+
+/* Buttons (Checked) */
+.header-bar .button:checked,
+.header-bar .flat:checked,
+.header-bar .button.image-button:checked,
+.header-bar .button.linked:checked,
+.header-bar .suggested-action .button:checked,
+.header-bar .button.text-button:checked,
+.header-bar .titlebutton:checked {
+    font: Bold;
+    background-image: none;
+    border: none;
+    border-radius: 0px;
+    box-shadow: none;
+    background-color: alpha(#000,0.1);
     color: @header_text;
     box-shadow:inset 0 -2px 0 0 @header_text;
 }
 
-.header-bar .text-button:checked {
-    font: Bold;
-}
-
-/* Focus Button */
+/* Buttons (Active/Focused) */
 .header-bar .button:focus,
-.header-bar .text-button:focus,
-.header-bar .titlebutton:focus,
-.header-bar .linked:focus,
 .header-bar .flat:focus,
+.header-bar .button.image-button:focus,
+.header-bar .button.linked:focus,
 .header-bar .suggested-action .button:focus,
-.header-bar .image-button:focus {
-    border-radius: 0px;
-    background-color: transparent;
+.header-bar .button.text-button:focus,
+.header-bar .titlebutton:focus,
+.header-bar .button:active,
+.header-bar .flat:active,
+.header-bar .button.image-button:active,
+.header-bar .button.linked:active,
+.header-bar .suggested-action .button:active,
+.header-bar .button.text-button:active,
+.header-bar .titlebutton:active {
     background-image: none;
     border: none;
-    color: @header_text;
-    box-shadow: inset 0 -2px 0 0 @header_text;
-}
-
-
-/* Hover Button */
-.header-bar .button:hover,
-.header-bar .text-button:hover,
-.header-bar .titlebutton:hover,
-.header-bar .linked:hover,
-.header-bar .flat:hover,
-.header-bar .suggested-action .button:hover,
-.header-bar .image-button:hover {
     border-radius: 0px;
-    background-color: alpha(#000, 0.1);
-    background-image: none;
-    border: none;
-    /*box-shadow: inset 0 -2px 0 0 @header_text;*/
-    color: @header_text;
-}
-
-/* Backdrop Button */
-.header-bar .button:backdrop,
-.header-bar .text-button:backdrop,
-.header-bar .titlebutton:backdrop,
-.header-bar .linked:backdrop,
-.header-bar .flat:backdrop,
-.header-bar .suggested-action .button:backdrop,
-.header-bar .image-button:backdrop {
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    border: none;
     box-shadow: none;
-    color: @backdrop_header_text;
-}
-
-/* *:Backdrop Button */
-.header-bar .button:hover:backdrop,
-.header-bar .text-button:hover:backdrop,
-.header-bar .titlebutton:hover:backdrop,
-.header-bar .linked:hover:backdrop,
-.header-bar .flat:hover:backdrop,
-.header-bar .suggested-action .button:hover:backdrop,
-.header-bar .image-button:hover:backdrop,
-.header-bar .button:checked:backdrop,
-.header-bar .text-button:checked:backdrop,
-.header-bar .titlebutton:checked:backdrop,
-.header-bar .linked:checked:backdrop,
-.header-bar .flat:checked:backdrop,
-.header-bar .suggested-action .button:checked:backdrop,
-.header-bar .image-button:checked:backdrop,
-.header-bar .button:focus:backdrop,
-.header-bar .text-button:focus:backdrop,
-.header-bar .titlebutton:focus:backdrop,
-.header-bar .linked:focus:backdrop,
-.header-bar .flat:focus:backdrop,
-.header-bar .suggested-action .button:focus:backdrop,
-.header-bar .image-button:focus:backdrop,
-.header-bar .button:active:backdrop,
-.header-bar .text-button:active:backdrop,
-.header-bar .titlebutton:active:backdrop,
-.header-bar .linked:active:backdrop,
-.header-bar .flat:active:backdrop,
-.header-bar .suggested-action .button:active:backdrop,
-.header-bar .image-button:active:backdrop {
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    border: none;
-    color: @backdrop_header_text;
-    box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
-}
-
-.header-bar .text-button:active:backdrop {
-    font: Bold;
-}
-
-/* Backdrop:Hover Button */
-.header-bar .button:backdrop:hover,
-.header-bar .text-button:backdrop:hover,
-.header-bar .titlebutton:backdrop:hover,
-.header-bar .linked:backdrop:hover,
-.header-bar .flat:backdrop:hover,
-.header-bar .suggested-action .button:backdrop:hover,
-.header-bar .image-button:backdrop:hover {
-    background-color: transparent;
-    background-image: none;
-    border-radius: 0px;
-    border: none;
-    box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
-    color: @backdrop_header_text;
-}
-
-/* Insensitive Button */
-.header-bar .button:insensitive,
-.header-bar .text-button:insensitive,
-.header-bar .titlebutton:insensitive,
-.header-bar .linked:insensitive,
-.header-bar .flat:insensitive,
-.header-bar .suggested-action .button:insensitive,
-.header-bar .image-button:insensitive {
-    background-color: transparent;
-    background-image: none;
-    border-radius: 0px;
-    border: none;
-    box-shadow: none;
-    color: @insensitive_header_text;
-}
-
-/* Insensitive:Backdrop Button */
-.header-bar .button:insensitive:backdrop,
-.header-bar .text-button:insensitive:backdrop,
-.header-bar .titlebutton:insensitive:backdrop,
-.header-bar .linked:insensitive:backdrop,
-.header-bar .flat:insensitive:backdrop,
-.header-bar .suggested-action .button:insensitive:backdrop,
-.header-bar .image-button:insensitive:backdrop {
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    border: none;
-    color: @insensitive_header_text;
-}
-
-
-/* Button Images */
-.header-bar .button GtkImage,
-.header-bar .button GtkImage:active,
-.header-bar .button GtkImage:focus,
-.header-bar .button GtkImage:hover {
+    background-color: alpha(#000,0.1);
     color: @header_text;
 }
 
-.header-bar .button GtkImage:active:backdrop,
-.header-bar .button GtkImage:backdrop,
-.header-bar .button GtkImage:backdrop:hover {
-    color: @backdrop_header_text;
-    -gtk-image-effect: dim;
-}
-
-.header-bar .button GtkImage:insensitive {
-    color: @insensitive_header_text;
-    -gtk-image-effect: dim;
-}
-
-.header-bar .button GtkImage:insensitive:backdrop {
-    color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-/* Button Arrows */
-.header-bar .button GtkArrow,
-.header-bar .button GtkArrow:active,
-.header-bar .button GtkArrow:focus,
-.header-bar .button GtkArrow:hover {    
-    -GtkComboBox-arrow-scaling: 1;
-    color: @header_text;
-}
-
-.header-bar .button GtkArrow:active:backdrop,
-.header-bar .button GtkArrow:backdrop,
-.header-bar .button GtkArrow:backdrop:hover {
-    color: @backdrop_header_text;
-    -gtk-image-effect: dim;
-}
-
-.header-bar .button GtkArrow:insensitive {
-    color: @insensitive_header_text;
-    -gtk-image-effect: dim;
-}
-
-.header-bar .button GtkArrow:insensitive:backdrop {
-    color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-/* Button Labels */
-.header-bar .button GtkLabel,
-.header-bar .button GtkLabel:active,
-.header-bar .button GtkLabel:focus,
-.header-bar .button GtkLabel:hover {
-    color: @header_text;
-}
-
-.header-bar .button GtkLabel:active:backdrop,
-.header-bar .button GtkLabel:backdrop,
-.header-bar .button GtkLabel:backdrop:hover {
-    color: @backdrop_header_text;
-    -gtk-image-effect: dim;
-}
-
-.header-bar .button GtkLabel:insensitive {
-    color: @insensitive_header_text;
-    -gtk-image-effect: dim;
-}
-
-.header-bar .button GtkLabel:insensitive:backdrop {
-    color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-
-/*************************
- * Header bar separator  *
- *************************/
+/* Separators */
 
 .header-bar > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: 1;
@@ -396,7 +239,6 @@
     border:none;
 }
 
-/* Separator */
 .header-bar .separator,
 .header-bar .button .separator,
 .header-bar .button.separator {
@@ -406,14 +248,11 @@
 } 
 
 
-/********************
- * Header bar entry *
- ********************/
+/* Entries */
 
 .header-bar .entry {
     background: none;
     color: @header_text;
-    padding: 13px;
     border-radius: 0px;
     border: 1px solid transparent;
     box-shadow: none;
@@ -448,9 +287,7 @@
 }
 
 
-/*********************
- * Header bar switch *
- *********************/
+/* switches */
 
 .header-bar GtkSwitch {
     border-radius: 1em;
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index 91f4d75..c8671f1 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -1,4 +1,4 @@
-/* Copyright 2015 Sam Hewitt.
+/* Copyright 2016 Sam Hewitt.
 *
 * This file is part of the Paper GTK theme.
 *
@@ -126,6 +126,7 @@
 .notebook tab {
     /*border: none;*/
     border-radius: 0;
+    padding-top: 3px;
     background: @background;
     color: @foreground;
 }
@@ -185,30 +186,30 @@
 
 /* Active */
 .notebook tab.top:active {
-    box-shadow:inset 0 -3px 0 0 @selection;
+    box-shadow:inset 0 -2px 0 0 @text;
 }
 .notebook tab.bottom:active {
-    box-shadow:inset 0 3px 0 0 @selection;
+    box-shadow:inset 0 2px 0 0 @text;
 }
 .notebook tab.left:active {
-    box-shadow:inset -3px 0 0 0 @selection;
+    box-shadow:inset -2px 0 0 0 @text;
 }
 .notebook tab.right:active {
-    box-shadow:inset 3px 0 0 0 @selection;
+    box-shadow:inset 2px 0 0 0 @text;
 }
 
 /* Active-Backdrop */
 .notebook tab.top:active:backdrop {
-    box-shadow:inset 0 -3px 0 0 @backdrop_border;
+    box-shadow:inset 0 -2px 0 0 @backdrop_border;
 }
 .notebook tab.bottom:active:backdrop {
-    box-shadow:inset 0 3px 0 0 @backdrop_border;
+    box-shadow:inset 0 2px 0 0 @backdrop_border;
 }
 .notebook tab.left:active:backdrop {
-    box-shadow:inset -3px 0 0 0 @backdrop_border;
+    box-shadow:inset -2px 0 0 0 @backdrop_border;
 }
 .notebook tab.right:active:backdrop {
-    box-shadow:inset 3px 0 0 0 @backdrop_border;
+    box-shadow:inset 2px 0 0 0 @backdrop_border;
 }
 
 /* Backdrop */
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 6afa4e0..94ec081 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -1,4 +1,4 @@
-/* Copyright 2015 Sam Hewitt.
+/* Copyright 2016 Sam Hewitt.
 *
 * This file is part of the Paper GTK theme.
 *
@@ -27,7 +27,7 @@
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
-                inset 0 -1px 2px 0 rgba(0,0,0,0.1);
+                inset 0 -1px 0 0 rgba(0,0,0,0.1);
 }
 
 .maximized .titlebar {
@@ -47,9 +47,7 @@
 }
 
 .titlebar.default-decoration {
-    padding: 6px;
-    padding-bottom: 0px;
-    padding-top: 0px;
+    padding: 0;
     background-color: @header;
     background-image: none;
     color: @header_text;
@@ -88,371 +86,12 @@
 }
 
 
-
 /* Separator */
 .titlebar .separator {
     background: none;
     color: @separator;
 }
 
-/**********************
- * Header bar buttons *
- **********************/
-
-.titlebar .flat,
-.titlebar .button,
-.titlebar .titlebutton,
-.titlebar .linked,
-.titlebar .text-button,
-.titlebar .image-button {
-    background-color: transparent;
-    background-image: none;
-    border: none;
-    padding: 13px 15px;
-}
-
-/* Normal Button */
-.titlebar .button,
-.titlebar .text-button,
-.titlebar .titlebutton,
-.titlebar .linked,
-.titlebar .flat,
-.titlebar .suggested-action .button,
-.titlebar .image-button {
-    background-color: transparent;
-    background-image: none;
-    border-radius: 0px;
-    border: none;
-    outline: none;
-    color: @header_text;
-    box-shadow: none;
-}
-
-/* Active Button */
-.titlebar .button:active,
-.titlebar .text-button:active,
-.titlebar .titlebutton:active,
-.titlebar .linked:active,
-.titlebar .flat:active,
-.titlebar .suggested-action .button:active,
-.titlebar .image-button:active {
-    border-radius: 0px;
-    /*background-color: alpha(#000, 0.1);*/
-    background-image: none;
-    border: none;
-    outline: none;
-    color: @header_text;
-    box-shadow: inset 0 -2px 0 0 @header_text;
-}
-
-.titlebar .text-button:active {
-    font: Bold;
-}
-
-/* Checked Button */
-.titlebar .button:checked,
-.titlebar .text-button:checked,
-.titlebar .titlebutton:checked,
-.titlebar .linked:checked,
-.titlebar .flat:checked,
-.titlebar .suggested-action .button:checked,
-.titlebar .image-button:checked {
-    border-radius: 0px;
-    /*background-color: alpha(#000, 0.1);*/
-    background-image: none;
-    border: none;
-    outline: none;
-    color: @header_text;
-    box-shadow: inset 0 -2px 0 0 @header_text;
-}
-
-.titlebar .text-button:checked {
-    font: Bold;
-}
-
-/* Focus Button */
-.titlebar .button:focus,
-.titlebar .text-button:focus,
-.titlebar .titlebutton:focus,
-.titlebar .linked:focus,
-.titlebar .flat:focus,
-.titlebar .suggested-action .button:focus,
-.titlebar .image-button:focus {
-    border-radius: 0px;
-    background-color: transparent;
-    border: none;
-    outline: none;
-    color: @header_text;
-    box-shadow: inset 0 -2px 0 0 @header_text;
-}
-
-/* Hover Button */
-.titlebar .button:hover,
-.titlebar .text-button:hover,
-.titlebar .titlebutton:hover,
-.titlebar .linked:hover,
-.titlebar .flat:hover,
-.titlebar .suggested-action .button:hover,
-.titlebar .image-button:hover {
-    border-radius: 0px;
-    background-color: alpha(#000, 0.1);
-    background-image: none;
-    border: none;
-    outline: none;
-    /*box-shadow: inset 0 -2px 0 0 @header_text;*/
-    color: @header_text;
-}
-
-/* Backdrop Button */
-.titlebar .button:backdrop,
-.titlebar .text-button:backdrop,
-.titlebar .titlebutton:backdrop,
-.titlebar .linked:backdrop,
-.titlebar .flat:backdrop,
-.titlebar .suggested-action .button:backdrop,
-.titlebar .image-button:backdrop {
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    border: none;
-    outline: none;
-    color: @backdrop_header_text;
-}
-
-
-/* *:Backdrop Button */
-.titlebar .button:hover:backdrop,
-.titlebar .text-button:hover:backdrop,
-.titlebar .titlebutton:hover:backdrop,
-.titlebar .linked:hover:backdrop,
-.titlebar .flat:hover:backdrop,
-.titlebar .suggested-action .button:hover:backdrop,
-.titlebar .image-button:hover:backdrop,
-.titlebar .button:checked:backdrop,
-.titlebar .text-button:checked:backdrop,
-.titlebar .titlebutton:checked:backdrop,
-.titlebar .linked:checked:backdrop,
-.titlebar .flat:checked:backdrop,
-.titlebar .suggested-action .button:checked:backdrop,
-.titlebar .image-button:checked:backdrop,
-.titlebar .button:focus:backdrop,
-.titlebar .text-button:focus:backdrop,
-.titlebar .titlebutton:focus:backdrop,
-.titlebar .linked:focus:backdrop,
-.titlebar .flat:focus:backdrop,
-.titlebar .suggested-action .button:focus:backdrop,
-.titlebar .image-button:focus:backdrop,
-.titlebar .button:active:backdrop,
-.titlebar .text-button:active:backdrop,
-.titlebar .titlebutton:active:backdrop,
-.titlebar .linked:active:backdrop,
-.titlebar .flat:active:backdrop,
-.titlebar .suggested-action .button:active:backdrop,
-.titlebar .image-button:active:backdrop {
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    border: none;
-    outline: none;
-    color: @backdrop_header_text;
-    box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
-}
-
-
-.titlebar .text-button:active:backdrop {
-    font: Bold;
-}
-
-/* Backdrop:Hover; Button */
-.titlebar .button:backdrop:hover,
-.titlebar .text-button:backdrop:hover,
-.titlebar .titlebutton:backdrop:hover,
-.titlebar .linked:backdrop:hover,
-.titlebar .flat:backdrop:hover,
-.titlebar .suggested-action .button:backdrop:hover,
-.titlebar .image-button:backdrop:hover {
-    background-color: transparent;
-    background-image: none;
-    border-radius: 0px;
-    border: none;
-    outline: none;
-    box-shadow: inset 0 -2px 0 0 @backdrop_header_text;
-    color: @backdrop_header_text;
-}
-
-/* Insensitive Button */
-.titlebar .button:insensitive,
-.titlebar .text-button:insensitive,
-.titlebar .titlebutton:insensitive,
-.titlebar .linked:insensitive,
-.titlebar .flat:insensitive,
-.titlebar .suggested-action .button:insensitive,
-.titlebar .image-button:insensitive {
-    background-color: transparent;
-    background-image: none;
-    border-radius: 0px;
-    border: none;
-    outline: none;
-    color: @insensitive_header_text;
-}
-
-/* Insensitive:Backdrop Button */
-.titlebar .button:insensitive:backdrop,
-.titlebar .text-button:insensitive:backdrop,
-.titlebar .titlebutton:insensitive:backdrop,
-.titlebar .linked:insensitive:backdrop,
-.titlebar .flat:insensitive:backdrop,
-.titlebar .suggested-action .button:insensitive:backdrop,
-.titlebar .image-button:insensitive:backdrop {
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    border: none;
-    outline: none;
-    color: @insensitive_header_text;
-}
-
-/* Button Images */
-.titlebar .button GtkImage,
-.titlebar .button GtkImage:active,
-.titlebar .button GtkImage:focus,
-.titlebar .button GtkImage:hover,
-.titlebar .titlebutton .button GtkImage,
-.titlebar .titlebutton .button GtkImage:active,
-.titlebar .titlebutton .button GtkImage:focus,
-.titlebar .titlebutton .button GtkImage:hover,
-.titlebar .titlebutton GtkImage,
-.titlebar .titlebutton GtkImage:active,
-.titlebar .titlebutton GtkImage:focus,
-.titlebar .titlebutton GtkImage:hover {
-    color: @header_text;
-}
-
-.titlebar .titlebutton .button GtkImage:active:backdrop,
-.titlebar .titlebutton .button GtkImage:backdrop,
-.titlebar .titlebutton .button GtkImage:backdrop:hover,
-.titlebar .titlebutton GtkImage:active:backdrop,
-.titlebar .titlebutton GtkImage:backdrop,
-.titlebar .titlebutton GtkImage:backdrop:hover,
-.titlebar .button GtkImage:active:backdrop,
-.titlebar .button GtkImage:backdrop,
-.titlebar .button GtkImage:backdrop:hover {
-    color: @backdrop_header_text;
-    -gtk-image-effect: dim;
-}
-
-
-.titlebar .button GtkImage:insensitive,
-.titlebar .titlebutton GtkImage:insensitive,
-.titlebar .titlebutton .button GtkImage:insensitive  {
-    color: @insensitive_header_text;
-    -gtk-image-effect: dim;
-}
-
-.titlebar .button GtkImage:insensitive:backdrop,
-.titlebar .titlebutton GtkImage:insensitive:backdrop,
-.titlebar .titlebutton .button GtkImage:insensitive:backdrop  {
-    color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-
-/* Button Arrows */
-.titlebar .button GtkArrow,
-.titlebar .button GtkArrow:active,
-.titlebar .button GtkArrow:focus,
-.titlebar .button GtkArrow:hover {
-    color: @header_text;
-}
-
-.titlebar .button GtkArrow:active:backdrop,
-.titlebar .button GtkArrow:backdrop,
-.titlebar .button GtkArrow:backdrop:hover {
-    color: @backdrop_header_text;
-    -gtk-image-effect: dim;
-}
-
-.titlebar .button GtkArrow:insensitive {
-    color: @insensitive_header_text;
-    -gtk-image-effect: dim;
-}
-
-.titlebar .button GtkArrow:insensitive:backdrop {
-    color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-
-/* Button Labels */
-.titlebar .button GtkLabel,
-.titlebar .button GtkLabel:active,
-.titlebar .button GtkLabel:focus,
-.titlebar .button GtkLabel:hover,
-.titlebar .titlebutton .button GtkLabel,
-.titlebar .titlebutton .button GtkLabel:active,
-.titlebar .titlebutton .button GtkLabel:focus,
-.titlebar .titlebutton .button GtkLabel:hover,
-.titlebar .titlebutton GtkLabel,
-.titlebar .titlebutton GtkLabel:active,
-.titlebar .titlebutton GtkLabel:focus,
-.titlebar .titlebutton GtkLabel:hover {
-    color: @header_text;
-}
-
-.titlebar .titlebutton .button GtkLabel:active:backdrop,
-.titlebar .titlebutton .button GtkLabel:backdrop,
-.titlebar .titlebutton .button GtkLabel:backdrop:hover,
-.titlebar .titlebutton GtkLabel:active:backdrop,
-.titlebar .titlebutton GtkLabel:backdrop,
-.titlebar .titlebutton GtkLabel:backdrop:hover,
-.titlebar .button GtkLabel:active:backdrop,
-.titlebar .button GtkLabel:backdrop,
-.titlebar .button GtkLabel:backdrop:hover {
-    color: @backdrop_header_text;
-    -gtk-image-effect: dim;
-}
-
-
-.titlebar .button GtkLabel:insensitive,
-.titlebar .titlebutton GtkLabel:insensitive,
-.titlebar .titlebutton .button GtkLabel:insensitive  {
-    color: @insensitive_header_text;
-    -gtk-image-effect: dim;
-}
-
-.titlebar .button GtkLabel:insensitive:backdrop,
-.titlebar .titlebutton GtkLabel:insensitive:backdrop,
-.titlebar .titlebutton .button GtkLabel:insensitive:backdrop  {
-    color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-
-.titlebar .right .button:first-child,
-.titlebar .right .titlebutton:first-child {
-    border: none;
-    outline: none;
-}
-
-.titlebar .right .button:last-child,
-.titlebar .right .titlebutton:last-child {
-    border: none;
-    outline: none;
-}
-
-.titlebar .left .button:last-child,
-.titlebar .left .titlebutton:last-child {
-    border: none;
-    outline: none;
-}
-
-.titlebar .left .button:first-child,
-.titlebar .left .titlebutton:first-child {
-    border: none;
-    outline: none;
-}
-
-
 
 /*************************
  * Header bar separator  *