diff --git a/Paper/gtk-3.0/apps/nexulockr.css b/Paper/gtk-3.0/apps/nexulockr.css
deleted file mode 100644
index 585229c..0000000
--- a/Paper/gtk-3.0/apps/nexulockr.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 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 nexulockr #01A3BA;
-
-/**********
- * Header *
- **********/
-
-NexulockrWindow .titlebar,
-NexulockrWindow .header-bar {
-    background-color: @nexulockr;
-}
-
-NexulockrWindow .titlebar:backdrop,
-NexulockrWindow .header-bar:backdrop {
-    background-color: shade(@nexulockr,0.9);
-}
diff --git a/Paper/gtk-3.0/apps/settings.css b/Paper/gtk-3.0/apps/settings.css
index 831a75d..8f25d47 100644
--- a/Paper/gtk-3.0/apps/settings.css
+++ b/Paper/gtk-3.0/apps/settings.css
@@ -118,30 +118,6 @@ CcWindow .dynamic-notebook tab.right:active {
     box-shadow:inset 3px 0 0 0 @settings;
 }
 
-/***********
- * Buttons *
- ***********/
-
-CcWindow .button.text-button,
-CcWindow .button.image-button,
-CcWindow .button {
-    color: @settings;
-}
-
-CcWindow GtkComboBox,
-CcWindow GtkComboBox * {
-    color: @settings;
-}
-
-CcWindow GtkComboBox:hover,
-CcWindow GtkComboBox *:hover,
-CcWindow .button.text-button:hover,
-CcWindow .button.image-button:hover,
-CcWindow .button:hover {
-    background-color: @settings;
-}
-
-
 
 /* List Row Button */
 CcWindow .button.list-row {
diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css
index 3bb3bfa..71d8446 100644
--- a/Paper/gtk-3.0/widgets/buttons.css
+++ b/Paper/gtk-3.0/widgets/buttons.css
@@ -16,7 +16,7 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
-@define-color button_background shade(@base, 0.9);/* Button background color */
+@define-color button_background shade(@base, 0.95);/* 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 */
@@ -26,7 +26,7 @@
  ***********/
  
 .button {
-    border-radius: px;
+    border-radius: 3px;
     padding: 4px 9px;
     border: 1px solid @button_border;
     background-color: @button_background;
@@ -70,11 +70,10 @@ GtkCalendar.button:backdrop:hover,
 .button:active:focus,
 .button.text-button:focus,
 .button.image-button:focus {
-    outline-color: selected_foreground;
     border: 1px solid shade(@selection, 1.1);
     background-color: shade(@selection, 1.1);
     color: @selected_foreground;
-    /*box-shadow: 0 1px 2px 0px alpha(#000,0.2);*/
+    box-shadow: 0 1px 2px 0px alpha(@selection,0.4);
 }
 
 /* Hover Button */
@@ -86,11 +85,11 @@ GtkCalendar.button:backdrop:hover,
     border: 1px solid shade(@selection, 1.2);
     background-color: shade(@selection, 1.2);
     color: @selected_foreground;
-    box-shadow: 0 1px 2px 1px alpha(#000,0.4);
-    transition: all 50ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
+    box-shadow: 0 1px 2px 1px alpha(#000,0.3);
+    transition: all 100ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
-/* Active/Pressed Button */
+/* Active (Pressed) Button */
 .button:active,
 .button.default:active,
 .button.text-button:active,
@@ -98,7 +97,8 @@ GtkCalendar.button:backdrop:hover,
     border: 1px solid @selection;
     background-color: @selection;
     color: @selected_foreground;
-    box-shadow: 0 1px 2px 0px alpha(#000,0.2);
+    /*box-shadow: 0 1px 2px 0px alpha(#000,0.2);*/
+    box-shadow: none;
 
 }
 
diff --git a/Paper/gtk-3.0/widgets/combobox.css b/Paper/gtk-3.0/widgets/combobox.css
index fc4dc42..a271757 100644
--- a/Paper/gtk-3.0/widgets/combobox.css
+++ b/Paper/gtk-3.0/widgets/combobox.css
@@ -161,4 +161,58 @@ GtkComboBox.combobox-entry .entry:first-child {
 
 GtkComboBox.combobox-entry .entry:last-child {
     border-radius: 0 4px 4px 0;
+}
+
+
+/* Images */
+GtkCombobox GtkImage {
+    color: @text;
+}
+
+GtkCombobox:active GtkImage,
+GtkCombobox:focus GtkImage,
+GtkCombobox:hover GtkImage {
+    color: @selected_foreground;
+}
+
+GtkCombobox:backdrop GtkImage,
+GtkCombobox:backdrop:hover GtkImage,
+GtkCombobox:active:backdrop GtkImage {
+    color: @backdrop_text;
+    -gtk-image-effect: dim;
+}
+
+GtkCombobox:insensitive GtkImage {
+    color: @insensitive_text;
+    -gtk-image-effect: dim;
+}
+
+GtkCombobox:insensitive:backdrop GtkImage {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+    -gtk-image-effect: dim;
+}
+
+/* Labels */
+GtkCombobox GtkLabel {
+    color: @text;
+}
+
+GtkCombobox:active GtkLabel,
+GtkCombobox:focus GtkLabel,
+GtkCombobox:hover GtkLabel {
+    color: @selected_foreground;
+}
+
+GtkCombobox:backdrop GtkLabel,
+GtkCombobox:backdrop:hover GtkLabel,
+GtkCombobox:active:backdrop GtkLabel {
+    color: @backdrop_text;
+}
+
+GtkCombobox:insensitive GtkLabel {
+    color: @insensitive_text;
+}
+
+GtkCombobox:insensitive:backdrop GtkLabel {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/links.css b/Paper/gtk-3.0/widgets/links.css
index b2f18a4..b68a793 100644
--- a/Paper/gtk-3.0/widgets/links.css
+++ b/Paper/gtk-3.0/widgets/links.css
@@ -39,7 +39,7 @@
 
 *:selected *:link:visited,
 *:selected .button:visited {
-      color: @visited_link;
+    color: @visited_link;
 }
 
 *:link:hover,
@@ -71,5 +71,5 @@
 
 *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
 .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited {
-    color: #dae8f7;
+    color: @selected;
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/list-rows.css b/Paper/gtk-3.0/widgets/list-rows.css
index 54a0647..3539809 100644
--- a/Paper/gtk-3.0/widgets/list-rows.css
+++ b/Paper/gtk-3.0/widgets/list-rows.css
@@ -36,6 +36,32 @@
     padding: 2px;
 }
 
+/* List Row Button */
+.button.list-row {
+}
+
+.button.list-row:hover  {
+    background-color: alpha(@selection, 0.2);
+    color: @selection;
+}
+
+.button.list-row:active,
+.button.list-row:selected {
+    background-color: alpha(@selection, 0.4);
+    color: @selection;
+}
+
+.button.list-row:active:selected,
+.button.list-row:active:selected:hover {
+    background-color: alpha(@selection, 0.2);
+    color: @selection;
+}
+
+.button.list-row:hover:selected {
+    background-color: alpha(@selection, 0.2);
+    color: @selection;
+}
+
 
 .list-row.button,
 .header-bar .list-row.button.titlebutton,
@@ -112,120 +138,6 @@
     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 {
diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css
index 765e99f..c2293a5 100644
--- a/Paper/gtk-3.0/widgets/menus.css
+++ b/Paper/gtk-3.0/widgets/menus.css
@@ -26,7 +26,6 @@
 }
 
 /*Context Menu*/
-
 .context-menu {
     font: initial;
     box-shadow: 0 2px 3px 2px @menu_shadow;
@@ -45,10 +44,7 @@
     color: @base;
 }
 
-/*************
- * Menu Item *
- *************/
-
+/* Menu Items */
 
 .menuitem,
 .menu .menuitem {