diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css
index 241e9f8..5fd7a70 100644
--- a/Paper/gtk-3.0/apps.css
+++ b/Paper/gtk-3.0/apps.css
@@ -51,4 +51,5 @@
 @import url("apps/shotwell.css");
 @import url("apps/synaptic.css");
 @import url("apps/unity.css");
-@import url("apps/xfce.css");
\ No newline at end of file
+@import url("apps/xfce.css");
+@import url("apps/yelp.css");
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/yelp.css b/Paper/gtk-3.0/apps/yelp.css
new file mode 100644
index 0000000..c096aa9
--- /dev/null
+++ b/Paper/gtk-3.0/apps/yelp.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 yelp #435ece;
+
+/**********
+ * Header *
+ **********/
+
+YelpWindow .titlebar,
+YelpWindow .header-bar {
+    background-color: @yelp;
+}
+
+YelpWindow .titlebar:backdrop,
+YelpWindow .header-bar:backdrop {
+    background-color: shade(@yelp,0.9);
+}
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index 18a33a5..1a22d29 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 #fff;/* Background color */
+@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 */
diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css
index 0d78df3..f525415 100644
--- a/Paper/gtk-3.0/widgets/buttons.css
+++ b/Paper/gtk-3.0/widgets/buttons.css
@@ -223,7 +223,7 @@ GtkCalendar.button:backdrop:hover,
     color: mix(@backdrop_text, @insensitive_text, 0.5);
 }
 
-/* Labels */
+/* Text Button Labels */
 .text-button GtkLabel {
     color: @text;
 }
@@ -253,6 +253,37 @@ GtkCalendar.button:backdrop:hover,
     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/inline-toolbars.css b/Paper/gtk-3.0/widgets/inline-toolbars.css
index 98061a3..692e0c6 100644
--- a/Paper/gtk-3.0/widgets/inline-toolbars.css
+++ b/Paper/gtk-3.0/widgets/inline-toolbars.css
@@ -22,7 +22,7 @@
  *******************/
 
 .inline-toolbar.toolbar {
-    background-color: shade(@background, 0.9);
+    background-color: @base;
     border: solid @border;
     border-width: 0 1px 1px 1px;
     color: @text;
@@ -30,7 +30,7 @@
 }
 
 .inline-toolbar.toolbar:backdrop {
-    background-color: shade(@backdrop_background, 0.9);
+    background-color: @backdrop_base;
     box-shadow: none;
     -gtk-image-effect: dim;
 }
diff --git a/Paper/gtk-3.0/widgets/linked-buttons.css b/Paper/gtk-3.0/widgets/linked-buttons.css
index d8f341d..10789fb 100644
--- a/Paper/gtk-3.0/widgets/linked-buttons.css
+++ b/Paper/gtk-3.0/widgets/linked-buttons.css
@@ -109,6 +109,121 @@
     border-radius: 0px;
 }
 
+
+/* Images */
+.linked.button GtkImage {
+    color: @text;
+}
+
+.linked.button:active GtkImage,
+.linked.button:focus GtkImage,
+.linked.button:hover GtkImage {
+    color: @selected_foreground;
+}
+
+.linked.button:backdrop GtkImage,
+.linked.button:backdrop:hover GtkImage,
+.linked.button:active:backdrop GtkImage {
+    color: @backdrop_text;
+    -gtk-image-effect: dim;
+}
+
+.linked.button:insensitive GtkImage {
+    color: @insensitive_text;
+    -gtk-image-effect: dim;
+}
+
+.linked.button:insensitive:backdrop GtkImage {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+    -gtk-image-effect: dim;
+}
+
+/* Labels */
+.linked.button GtkLabel {
+    color: @text;
+}
+
+.linked.button:active GtkLabel,
+.linked.button:focus GtkLabel,
+.linked.button:hover GtkLabel {
+    color: @selected_foreground;
+}
+
+.linked.button:backdrop GtkLabel,
+.linked.button:backdrop:hover GtkLabel,
+.linked.button:active:backdrop GtkLabel {
+    color: @backdrop_text;
+}
+
+.linked.button:insensitive GtkLabel {
+    color: @insensitive_text;
+}
+
+.linked.button:insensitive:backdrop GtkLabel {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+}
+
+/* Labels */
+.linked.text-button GtkLabel {
+    color: @text;
+}
+
+.linked.text-button:focus GtkLabel {
+    /*color: shade(@text, 2.0);*/
+    color: @text;
+}
+
+.linked.text-button:active GtkLabel,
+.linked.text-button:hover GtkLabel {
+    color: alpha(#000, 0.5);
+    /*color: @text;*/
+}
+
+.linked.text-button:backdrop GtkLabel,
+.linked.text-button:backdrop:hover GtkLabel,
+.linked.text-button:active:backdrop GtkLabel {
+    color: @backdrop_text;
+}
+
+.linked.text-button:insensitive GtkLabel {
+    color: @insensitive_text;
+}
+
+.linked.text-button:insensitive:backdrop GtkLabel {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+}
+
+
+/* Images */
+.linked.image-button GtkImage {
+    color: @text;
+}
+
+.linked.image-button:focus GtkImage {
+    /*color: shade(@text, 2.0);*/
+    color: @text;
+}
+
+.linked.image-button:active GtkImage,
+.linked.image-button:hover GtkImage {
+    color: alpha(#000, 0.5);
+    /*color: @text;*/
+}
+
+.linked.image-button:backdrop GtkImage,
+.linked.image-button:backdrop:hover GtkImage,
+.linked.image-button:active:backdrop GtkImage {
+    color: @backdrop_text;
+}
+
+.linked.image-button:insensitive GtkImage {
+    color: @insensitive_text;
+}
+
+.linked.image-button:insensitive:backdrop GtkImage {
+    color: mix(@backdrop_text, @insensitive_text, 0.5);
+}
+
 /* Linked buttons on primary toolbars */
 
 /* Middle button */
diff --git a/Paper/gtk-3.0/widgets/list-rows.css b/Paper/gtk-3.0/widgets/list-rows.css
index a052213..ffa711d 100644
--- a/Paper/gtk-3.0/widgets/list-rows.css
+++ b/Paper/gtk-3.0/widgets/list-rows.css
@@ -26,7 +26,7 @@
     border-radius: 0px;
     border:none;
     background-image: none;
-    background-color: transparent;
+    background-color: @base;
     color: @text;
 }
 
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index ec7ce99..795e0b5 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -89,7 +89,7 @@
 .notebook tab {
     border: none;
     border-radius: 0;
-    background: @background;
+    background: shade(@background, 0.9);;
     color: @foreground;
 }
 
@@ -100,7 +100,7 @@
 
 .notebook tab:active {
     border: none;
-    background: @background;
+    background: shade(@background, 0.9);;
     color: @foreground;
 }
 
diff --git a/Paper/gtk-3.0/widgets/separators.css b/Paper/gtk-3.0/widgets/separators.css
index e5e72ae..0b6abba 100644
--- a/Paper/gtk-3.0/widgets/separators.css
+++ b/Paper/gtk-3.0/widgets/separators.css
@@ -23,6 +23,7 @@
  
 GtkSeparator,
 .separator,
+.pane-separator,
 .button .separator {
     color: @separator;
 }
@@ -59,7 +60,7 @@ GtkSeparator,
 
 .notebook .pane-separator,
 .notebook .pane-separator:hover {
-    background-color: @hover_background;
+    background-color: @background;
 }
 
 .notebook .pane-separator:backdrop,