diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css
index 29cbd97..9658fe8 100644
--- a/Paper/gtk-3.0/gtk-widgets.css
+++ b/Paper/gtk-3.0/gtk-widgets.css
@@ -83,6 +83,7 @@
 @import url("widgets/images.css");
 @import url("widgets/infobars.css");
 @import url("widgets/inline-toolbars.css");
+@import url("widgets/labels.css");
 @import url("widgets/levelbars.css");
 @import url("widgets/links.css");
 @import url("widgets/linked-buttons.css");
diff --git a/Paper/gtk-3.0/widgets/images.css b/Paper/gtk-3.0/widgets/images.css
index 414ce4a..ca12ad8 100644
--- a/Paper/gtk-3.0/widgets/images.css
+++ b/Paper/gtk-3.0/widgets/images.css
@@ -20,30 +20,26 @@
  * Images *
  **********/
  
-GtkImage,
-* GtkImage {
-	background: none;
-    color: @toolbar_text;
+*:active GtkImage,
+*:focus GtkImage,
+*:hover GtkImage {
+    color: @selected_foreground;
 }
 
-GtkImage:backdrop,
-* GtkImage:backdrop {
-	background: none;
-    color: @backdrop_toolbar_text;
+*:backdrop GtkImage,
+*:backdrop:hover GtkImage,
+*:active:backdrop GtkImage {
+    color: @backdrop_text;
     -gtk-image-effect: dim;
 }
 
-GtkImage:insensitive,
-* GtkImage:insensitive {
-	background: none;
-    color: @insensitive_toolbar_text;
+*:insensitive GtkImage {
+    color: @insensitive_text;
     -gtk-image-effect: dim;
 }
 
-GtkImage:insensitive:backdrop,
-* GtkImage:insensitive:backdrop {
-	background: none;
-    color: mix(@backdrop_toolbar_text , @insensitive_toolbar_text , 0.5);
+*:insensitive:backdrop GtkImage {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
     -gtk-image-effect: dim;
 }
 
diff --git a/Paper/gtk-3.0/widgets/labels.css b/Paper/gtk-3.0/widgets/labels.css
new file mode 100644
index 0000000..bdf37e2
--- /dev/null
+++ b/Paper/gtk-3.0/widgets/labels.css
@@ -0,0 +1,54 @@
+/* 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/.
+*/
+
+/**********
+ * Labels *
+ **********/
+
+.label,
+GtkLabel {
+	color: @text;
+}
+
+.label:active,
+.label:focus,
+.label:hover,
+*:active GtkLabel,
+*:focus GtkLabel,
+*:hover GtkLabel {
+    color: @selected_foreground;
+}
+
+.label:backdrop,
+.label:backdrop:hover,
+.label:active:backdrop,
+*:backdrop GtkLabel,
+*:backdrop:hover GtkLabel,
+*:active:backdrop GtkLabel {
+    color: @backdrop_text;
+}
+
+.label:insensitive,
+*:insensitive GtkLabel {
+    color: @insensitive_text;
+}
+
+.label:insensitive:backdrop,
+*: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/menu-button.css b/Paper/gtk-3.0/widgets/menu-button.css
index 3ca0330..584b7a9 100644
--- a/Paper/gtk-3.0/widgets/menu-button.css
+++ b/Paper/gtk-3.0/widgets/menu-button.css
@@ -20,67 +20,47 @@
  * Menu Button *
  ***************/
 
-.menu.button {
+.menu-button {
     background-image: none;
     background-color: @base;
     border: 1px solid @selection;
 }
 
-.menu.button.separator {
+.menu-button.separator {
     border-style: none;
     color: shade(@foreground, 3.2);
     -GtkMenuItem-horizontal-padding: 0;
     -GtkWidget-separator-height: 1;
 }
 
-.menu.button:hover {
+.menu-button:hover {
     background-image: none;
     background-color: @base;
     color: @foreground;
     border-style: none;
 }
 
-.menu.button:insensitive {
+.menu-button:insensitive {
     background-color: @base;
     color: lighter(@internal_element);
     border-style: none;
 }
 
-.menu.button:hover,
-.menu.button:active,
-.menu.button:active:insensitive,
-.menu.button:insensitive,
-.menu.button {
+.menu-button:hover,
+.menu-button:active,
+.menu-button:active:insensitive,
+.menu-button:insensitive,
+.menu-button {
     border-width: 0;
     background-color: shade(@foreground, 1.05);
     background-image: none;
 }
 
-
 GtkMenuButton.button:active,
 GtkMenuButton.button.raised:active {
     color: @foreground;
 }
 
-.button.menuitem.menubar:active {
-    background-image: none;
-    background-color: @background;
-
-    border: 1px solid @background;
-    border-radius: 0 0;
-    border-image: none;
-    border-bottom-width: 0px;
-}
-
-.button.menuitem.menubar *:active,
-GtkMenuButton.button *:active,
-.toolbar GtkMenuButton.button *:active {
-    color: @foreground;
-}
-
-GtkMenuButton .menu {
-}
-
 
 /* Images */
 .menu-button .menu .menuitem GtkImage {
diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css
index c2293a5..b27e9dc 100644
--- a/Paper/gtk-3.0/widgets/menus.css
+++ b/Paper/gtk-3.0/widgets/menus.css
@@ -26,6 +26,7 @@
 }
 
 /*Context Menu*/
+
 .context-menu {
     font: initial;
     box-shadow: 0 2px 3px 2px @menu_shadow;
@@ -44,8 +45,7 @@
     color: @base;
 }
 
-/* Menu Items */
-
+/* Menu Item */
 .menuitem,
 .menu .menuitem {
     padding-top: 4px;
@@ -59,17 +59,6 @@
     -gtk-icon-style: symbolic;
 }
 
-/* Menu Text */
-.menuitem GtkLabel {
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-.menu .menuitem GtkLabel {
-    padding-left: 6px;
-    padding-right: 2px;
-}
-
 /* Active */
 .menuitem:active,
 .menu .menuitem:active {
@@ -113,6 +102,7 @@
 .menu .menuitem.arrow:dir(rtl) {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
 }
+
 /* Separator color */
 .menuitem.separator {
     padding-left: 2px;
@@ -150,8 +140,18 @@
 }
 
 
+/* Menu Text */
+.menuitem GtkLabel {
+    padding-left: 2px;
+    padding-right: 2px;
+}
 
-/* Images */
+.menu .menuitem GtkLabel {
+    padding-left: 6px;
+    padding-right: 2px;
+}
+
+/* Images * Labels */
 .menuitem GtkImage {
     color: @text;
 }
diff --git a/Paper/gtk-3.0/widgets/spinner.css b/Paper/gtk-3.0/widgets/spinner.css
index 0c170e9..f93e367 100644
--- a/Paper/gtk-3.0/widgets/spinner.css
+++ b/Paper/gtk-3.0/widgets/spinner.css
@@ -1,3 +1,21 @@
+/* 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/.
+*/
+
 /***********
  * Spinner *
  ***********/
diff --git a/Paper/gtk-3.0/widgets/statusbar.css b/Paper/gtk-3.0/widgets/statusbar.css
index 08a61c2..c569f1e 100644
--- a/Paper/gtk-3.0/widgets/statusbar.css
+++ b/Paper/gtk-3.0/widgets/statusbar.css
@@ -17,7 +17,7 @@
 */
 
 /*************
- * statusbar *
+ * Statusbar *
  *************/
 GtkStatusbar {
     padding: 0;