diff --git a/Paper/gtk-2.0/Apps/firefox.rc b/Paper/gtk-2.0/Apps/firefox.rc
index ff86a12..38764a5 100644
--- a/Paper/gtk-2.0/Apps/firefox.rc
+++ b/Paper/gtk-2.0/Apps/firefox.rc
@@ -10,8 +10,8 @@ style "ff-default" {
 	}
 }
 
-#widget	"MozillaGtkWidget*Scrollbar*"		style	"scrollbar"
-#widget	"MozillaGtkWidget*Toolbar*"		style	"toolbar"
+widget	"MozillaGtkWidget*GtkScrollbar*"		style	"scrollbar"
+widget	"MozillaGtkWidget*Toolbar*"		style	"toolbar"
 #widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
 
 widget	"MozillaGtkWidget*"	style	"ff-default"
diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css
index 31df95b..42d627f 100644
--- a/Paper/gtk-3.0/gtk-widgets.css
+++ b/Paper/gtk-3.0/gtk-widgets.css
@@ -72,6 +72,7 @@
 @import url("widgets/color-chooser.css");
 @import url("widgets/column-header.css");
 @import url("widgets/combobox.css");
+@import url("widgets/cursor-handles.css");
 @import url("widgets/destructive-action-buttons.css");
 @import url("widgets/dialogs.css");
 @import url("widgets/dynamic-notebook.css");
diff --git a/Paper/gtk-3.0/widgets/combobox.css b/Paper/gtk-3.0/widgets/combobox.css
index fc4dc42..50cfbb1 100644
--- a/Paper/gtk-3.0/widgets/combobox.css
+++ b/Paper/gtk-3.0/widgets/combobox.css
@@ -1,4 +1,4 @@
-/* Copyright 2014 Sam Hewitt.
+m/* Copyright 2014 Sam Hewitt.
 *
 * This file is part of the Paper GTK theme.
 *
diff --git a/Paper/gtk-3.0/widgets/cursor-handles.css b/Paper/gtk-3.0/widgets/cursor-handles.css
new file mode 100644
index 0000000..087287f
--- /dev/null
+++ b/Paper/gtk-3.0/widgets/cursor-handles.css
@@ -0,0 +1,39 @@
+/* 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/.
+*/
+
+/******************
+ * Cursor Handles *
+ ******************/
+
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none;
+}
+
+.entry.cursor-handle.top,
+.cursor-handle.top {
+    -gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
+}
+
+.entry.cursor-handle.bottom,
+.cursor-handle.bottom {
+    -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/entry.css b/Paper/gtk-3.0/widgets/entry.css
index 06e641a..d52a689 100644
--- a/Paper/gtk-3.0/widgets/entry.css
+++ b/Paper/gtk-3.0/widgets/entry.css
@@ -40,8 +40,9 @@
     box-shadow:none;
 }
 
-.entry:selected {
-    color: @text;
+.entry:selected,
+.entry:selected:focus {
+    color: @base;
     background-color: @selection;
 }
 
diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css
index 4e6ef1f..f8ef828 100644
--- a/Paper/gtk-3.0/widgets/menus.css
+++ b/Paper/gtk-3.0/widgets/menus.css
@@ -107,14 +107,18 @@
     color: @insensitive_text;
 }
 
-/* Arrow color */
-.menuitem.arrow,
+/* Arrows */
+
 .menu .menuitem.arrow {
-    background-color: @base;
-    color: @foreground;
-    border: none;
+    color: @text;
 }
 
+.menu .menuitem.arrow {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+.menu .menuitem.arrow:dir(rtl) {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
 /* Separator color */
 .menuitem.separator {
     padding-left: 2px;
diff --git a/Paper/gtk-3.0/widgets/search-bars.css b/Paper/gtk-3.0/widgets/search-bars.css
index 11ed45a..c559bc4 100644
--- a/Paper/gtk-3.0/widgets/search-bars.css
+++ b/Paper/gtk-3.0/widgets/search-bars.css
@@ -178,6 +178,14 @@
     border: none;
 }
 
+.search-bar .entry:selected,
+.search-bar.toolbar .entry:selected
+.search-bar .entry:selected:focus,
+.search-bar.toolbar .entry:selected:focus {
+    color: @base;
+    background-color: @selection;
+}
+
 .search-bar .entry:active,
 .search-bar .entry:focus,
 .search-bar.toolbar .entry:active,
diff --git a/Paper/gtk-3.0/widgets/selection-mode.css b/Paper/gtk-3.0/widgets/selection-mode.css
index 8904328..2fdbbde 100644
--- a/Paper/gtk-3.0/widgets/selection-mode.css
+++ b/Paper/gtk-3.0/widgets/selection-mode.css
@@ -42,7 +42,11 @@
     border: none;
 }
 
-.selection-mode.header-bar {
+.titlebar.selection-mode .selection-menu .arrow,
+.header-bar.selection-mode .selection-menu .arrow {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    color: alpha(@header_text, 0.5);
+    icon-shadow: none;
 }
 
 .selection-mode.toolbar {