diff --git a/Paper/gtk-2.0/Apps/firefox.rc b/Paper/gtk-2.0/Apps/firefox.rc
new file mode 100644
index 0000000..329b281
--- /dev/null
+++ b/Paper/gtk-2.0/Apps/firefox.rc
@@ -0,0 +1,30 @@
+# ==============================================================================
+# FIREFOX SPECIFIC SETTINGS
+# ==============================================================================
+
+style "ff-default" {
+	GtkCheckButton::indicator-size = 14
+
+	engine "murrine" {
+		reliefstyle = 0
+	}
+}
+
+widget	"MozillaGtkWidget*Toolbar*"		style	"toolbar"
+#widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
+
+widget	"MozillaGtkWidget*"	style	"ff-default"
+
+# ------------------------------------------------------------------------------
+# Some Firefox (3.0/3.5) GTK widgets hierarchy (maybe useful for someone)
+# ------------------------------------------------------------------------------
+
+# Top toolbars (and maybe others)
+#widget	"MozillaGtkWidget.GtkFixed.GtkHandleBox.GtkToolbar"	style	"theme-dark-toolbar"
+
+# Findbar entry, gecko (all html) entry
+#widget	"MozillaGtkWidget.GtkFixed.GtkEntry"	style	"theme-dark-entry"
+
+# ALL buttons
+#widget	"MozillaGtkWidget.GtkFixed.GtkButton"	style	"theme-dark-button"
+
diff --git a/Paper/gtk-2.0/gtkrc b/Paper/gtk-2.0/gtkrc
index a24c8d0..6e3616a 100644
--- a/Paper/gtk-2.0/gtkrc
+++ b/Paper/gtk-2.0/gtkrc
@@ -2330,6 +2330,7 @@ widget "gtk-tooltip*"           style "tooltips"
 include "Apps/apps.rc"
 include "Apps/chrome.rc"
 include "Apps/eclipse.rc"
+include "Apps/firefox.rc"
 include "Apps/gimp.rc"
 include "Apps/libreoffice.rc"
 include "Apps/panel.rc"
diff --git a/Paper/gtk-3.0/apps/gnome-disks.css b/Paper/gtk-3.0/apps/gnome-disks.css
index 107082c..845e115 100644
--- a/Paper/gtk-3.0/apps/gnome-disks.css
+++ b/Paper/gtk-3.0/apps/gnome-disks.css
@@ -33,12 +33,6 @@ GduWindow .header-bar:backdrop {
     background-color: shade(@disks,0.9);
 }
 
-GduVolumeGrid .toolbar {
+GduWindow .toolbar {
     background-color: @disks;
 }
-
-GduVolumeGrid,
-GduVolumeGrid * {
-	color: @text;
-}
-
diff --git a/Paper/gtk-3.0/granite-widgets.css b/Paper/gtk-3.0/granite-widgets.css
index 6c94ef2..9585652 100644
--- a/Paper/gtk-3.0/granite-widgets.css
+++ b/Paper/gtk-3.0/granite-widgets.css
@@ -77,7 +77,7 @@ GraniteWidgetsPopOver .button:active:hover {
  * Welcome *
  **********/
 
-GraniteWidgetsWelcome {k
+GraniteWidgetsWelcome {
     background-color: @base;
 }
 
@@ -95,7 +95,7 @@ GraniteWidgetsWelcome .h3 {
  ********/
 
 .panel {
-    background-color: transparent;
+    background: @panel;
     color: #fff;
     font-weight: bold;
 }
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index 94398ed..e5a0ee4 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -28,7 +28,7 @@
 @define-color border #D8D8D8;/* Borders color */
 @define-color separator alpha(#000, 0.2);/* Separator color */
 @define-color text @foreground;/* Text color */
-@define-color panel #576165;/* Panel color */
+@define-color panel #454D50;/* Panel color */
 @define-color header #636E73;/* Header color */
 @define-color backdrop_header #454D50; /* Header backdrop color */
 @define-color header_text #fff;/* Header text color */
diff --git a/Paper/gtk-3.0/widgets/dialogs.css b/Paper/gtk-3.0/widgets/dialogs.css
index 636df27..9a98d1f 100644
--- a/Paper/gtk-3.0/widgets/dialogs.css
+++ b/Paper/gtk-3.0/widgets/dialogs.css
@@ -57,9 +57,16 @@ GtkMessageDialog .titlebar:backdrop {
 }
 
 GtkDialog,
+GtkAboutDialog,
 GtkMessageDialog {
+    color: @text;
     box-shadow: none;
 }
+GtkDialog GtkLabel,
+GtkAboutDialog GtkLabel,
+GtkMessageDialog GtkLabel {
+    color: @text;
+}
 
 GtkDialog .toolbar {
     background-image: none;
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 5a644fb..cdb2ee0 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -53,16 +53,23 @@
     color: @backdrop_header_text;
 }
 
+
 /* Subtitle */
 .header-bar .subtitle {
     font: 9;
-    color: inherit;
 }
 
-.header-bar .subtitle:backdrop {
-    color: inherit;
+.header-bar .subtitle,
+.header-bar .subtitle GtkLabel,
+.header-bar .subtitle GtkImage {
+    color: alpha(@header_text, 0.8);
 }
 
+.header-bar .subtitle:backdrop,
+.header-bar .subtitle:backdrop GtkLabel,
+.header-bar .subtitle:backdrop GtkImage  {
+    color: alpha(@backdrop_header_text,0.8);
+}
 
 /* Separator */
 .header-bar .separator {
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index b052657..a3c34a3 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -137,6 +137,20 @@
     box-shadow:inset 1px 0 0 0 @border;
 }
 
+/* Hover */
+.notebook tab.top:hover {
+    box-shadow:inset 0 -3px 0 0 @border;
+}
+.notebook tab.bottom:hover {
+    box-shadow:inset 0 3px 0 0 @border;
+}
+.notebook tab.left:hover {
+    box-shadow:inset -3px 0 0 0 @border;
+}
+.notebook tab.right:hover {
+    box-shadow:inset 3px 0 0 0 @border;
+}
+
 /* Active */
 .notebook tab.top:active {
     box-shadow:inset 0 -3px 0 0 @selection;
@@ -298,11 +312,25 @@
     border: none;
     background-image: none;
     background: none;
-    border-radius: 16px;
-    padding: 0;
+    border-radius: 4px;
+    padding: 2px;
     box-shadow: none;
 }
 
+
+.notebook tab .button GtkImage {
+    color: @backdrop_text;
+}
+
+.notebook tab .button:hover GtkImage,
+.notebook tab .button:active GtkImage {
+    color: @selection_foreground;
+}
+
+.notebook tab .button:backdrop GtkImage {
+    color: @backdrop_text;
+}
+
 .notebook tab .button:hover {
     color: @foreground;
     background-color: alpha(#000, 0.1);
diff --git a/Paper/gtk-3.0/widgets/scrollbars.css b/Paper/gtk-3.0/widgets/scrollbars.css
index 2e64ef4..47e6613 100644
--- a/Paper/gtk-3.0/widgets/scrollbars.css
+++ b/Paper/gtk-3.0/widgets/scrollbars.css
@@ -70,7 +70,7 @@
 .scrollbar.trough {
     border-radius: 10px;
     background-image: none;
-    background: none;
+    background:@background;
     border-width: 0;
     border-image: none;
 }
diff --git a/Paper/gtk-3.0/widgets/separators.css b/Paper/gtk-3.0/widgets/separators.css
index aa2f498..ec71d38 100644
--- a/Paper/gtk-3.0/widgets/separators.css
+++ b/Paper/gtk-3.0/widgets/separators.css
@@ -21,6 +21,7 @@
  * Separators *
  **************/
  
+GtkSeparator,
 .separator,
 .button .separator {
     color: @separator;
diff --git a/Paper/gtk-3.0/widgets/switches.css b/Paper/gtk-3.0/widgets/switches.css
index 8f652d2..c951eef 100644
--- a/Paper/gtk-3.0/widgets/switches.css
+++ b/Paper/gtk-3.0/widgets/switches.css
@@ -18,13 +18,13 @@
 
 /* Slider colors */
 @define-color slider @background;
-@define-color slider_border alpha(#000, 0.4);
+@define-color slider_border alpha(#000, 0.3);
 @define-color backdrop_slider @backdrop_background;
 @define-color insensitive_slider @insensitive_background;
 
 /* Trough colors */
 @define-color trough shade(@base, 0.8);
-@define-color trough_border alpha(#000, 0.3);
+@define-color trough_border alpha(#000, 0.2);
 @define-color backdrop_trough shade(@backdrop_base, 0.8);
 @define-color insensitive_trough shade(@insensitive_base, 0.8);
 
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index aea581d..df95e4a 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -56,16 +56,25 @@
     font: Bold 11;
 }
 
+/* Subtitle */
 .titlebar .subtitle {
-    color: @header_text;
+    font: 9;
+}
+
+.titlebar .subtitle,
+.titlebar .subtitle GtkLabel,
+.titlebar .subtitle GtkImage {
+    color: alpha(@header_text,0.8);
 }
 
 .titlebar .subtitle:backdrop,
-.titlebar .title:backdrop {
-    color: @backdrop_header_text;
+.titlebar .subtitle:backdrop GtkLabel,
+.titlebar .subtitle:backdrop GtkImage  {
+    color: alpha(@backdrop_header_text,0.8);
 }
 
 
+
 /**********************
  * Header bar buttons *
  **********************/
diff --git a/Paper/gtk-3.0/widgets/toolbars.css b/Paper/gtk-3.0/widgets/toolbars.css
index ce9d79c..46b5fc5 100644
--- a/Paper/gtk-3.0/widgets/toolbars.css
+++ b/Paper/gtk-3.0/widgets/toolbars.css
@@ -172,6 +172,7 @@
 }
 
 /* Images */
+.toolbar GtkImage,
 .toolbar .button GtkImage {
     color: @toolbar_text;
 }
@@ -200,6 +201,7 @@
 }
 
 /* Labels */
+.toolbar GtkLabel
 .toolbar .button GtkLabel {
     color: @toolbar_text;
 }
diff --git a/Paper/gtk-3.0/widgets/views.css b/Paper/gtk-3.0/widgets/views.css
index ade4be7..1f51819 100644
--- a/Paper/gtk-3.0/widgets/views.css
+++ b/Paper/gtk-3.0/widgets/views.css
@@ -23,7 +23,7 @@
 
 .frame {
     background: none;
-    border: 1px solid @border;
+    /*border: 1px solid @border;*/
     color: @foreground;
 }
 
@@ -43,6 +43,21 @@
    border:none;
 }
 
+/*********
+ * Table *
+ *********/
+
+GtkTable {
+    background: none;
+    border: 1px solid @border;
+    color: @text;
+}
+
+GtkTable GtkLabel {
+    color: @text;
+}
+
+
 /********
  * View *
  ********/