diff --git a/Makefile.am b/Makefile.am
index afa7d4cd..a273caa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,15 +127,22 @@ README.html: README.md
 ###
 themedir=$(pkgdatadir)/themes/
 theme_DATA=\
-		   themes/Arc.theme\
-		   themes/DarkBlue.theme\
 		   themes/android_notification.theme\
+		   themes/Arc.theme\
 		   themes/blor.theme\
 		   themes/blue.theme\
 		   themes/c64.theme\
-		   themes/purple.theme\
-		   themes/lb.theme\
+		   themes/DarkBlue.theme\
 		   themes/glue_pro_blue.theme\
+		   themes/gruvbox-dark-hard.theme\
+		   themes/gruvbox-dark-soft.theme\
+		   themes/gruvbox-dark.theme\
+		   themes/gruvbox-light-hard.theme\
+		   themes/gruvbox-light-soft.theme\
+		   themes/gruvbox-light.theme\
+		   themes/lb.theme\
+		   themes/Paper.theme\
+		   themes/purple.theme\
 		   themes/solarized.theme\
 		   themes/solarized_alternate.theme
 
diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
index e5a176c7..8faafc82 100755
--- a/script/rofi-theme-selector
+++ b/script/rofi-theme-selector
@@ -106,6 +106,7 @@ function select_theme ()
 {
     local MORE_FLAGS=(-dmenu -format i -no-custom -p Theme -markup -config ${TMP_CONFIG_FILE} -i)
     MORE_FLAGS+=(-kb-custom-1 "Alt-a")
+    MORE_FLAGS+=(-u 2,3 -a 4,5 )
     local CUR="default"
     while true
     do
diff --git a/themes/Paper.theme b/themes/Paper.theme
new file mode 100644
index 00000000..be1056e7
--- /dev/null
+++ b/themes/Paper.theme
@@ -0,0 +1,15 @@
+! ------------------------------------------------------------------------------
+! ROFI Color theme
+! User: qball
+! ------------------------------------------------------------------------------
+! "Color scheme for normal row" Set from: File
+rofi.color-normal:                   argb:0f5f5f5, #002b36, #d0d0d0, #4271ae, #f5f5f5
+! "Color scheme for urgent row" Set from: File
+rofi.color-urgent:                   #f5f5f5, #d75f00, #d0d0d0, #d75f00, #f5f5f5
+! "Color scheme for active row" Set from: File
+rofi.color-active:                   #f5f5f5, #005f87, #d0d0d0, #005f87, #f5f5f5
+! "Color scheme window" Set from: File
+rofi.color-window:                   #f5f5f5, #444444, #444444
+! "Separator style (none, dash, solid)" Set from: File
+rofi.separator-style:                solid
+rofi.hide-scrollbar:                 false
diff --git a/themes/gruvbox-dark-hard.theme b/themes/gruvbox-dark-hard.theme
new file mode 100644
index 00000000..51b592d1
--- /dev/null
+++ b/themes/gruvbox-dark-hard.theme
@@ -0,0 +1,23 @@
+!-------------------------------------------------------------------------------
+! Rofi color theme
+!
+! Based on the Gruvbox color scheme for Vim by morhetz
+! https://github.com/morhetz/gruvbox
+!
+! File: gruvbox-dark-hard.theme
+! Desc: Gruvbox dark (hard contrast) color theme for Rofi
+! Author: bardisty <b@bah.im>
+! Source: https://github.com/bardisty/gruvbox-rofi
+! Modified: Sat Oct 22 2016 03:12:10 PDT -0700
+!-------------------------------------------------------------------------------
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+!                  bg       border   separator
+rofi.color-window: #1d2021, #a89984, #a89984
+
+!                  bg       fg       bg-alt   hl-bg    hl-fg
+rofi.color-normal: #1d2021, #ebdbb2, #282828, #504945, #fbf1c7
+rofi.color-active: #d79921, #1d2021, #d79921, #fabd2f, #1d2021
+rofi.color-urgent: #cc241d, #1d2021, #cc241d, #fb4934, #1d2021
diff --git a/themes/gruvbox-dark-soft.theme b/themes/gruvbox-dark-soft.theme
new file mode 100644
index 00000000..cc8c232a
--- /dev/null
+++ b/themes/gruvbox-dark-soft.theme
@@ -0,0 +1,23 @@
+!-------------------------------------------------------------------------------
+! Rofi color theme
+!
+! Based on the Gruvbox color scheme for Vim by morhetz
+! https://github.com/morhetz/gruvbox
+!
+! File: gruvbox-dark-soft.theme
+! Desc: Gruvbox dark (soft contrast) color theme for Rofi
+! Author: bardisty <b@bah.im>
+! Source: https://github.com/bardisty/gruvbox-rofi
+! Modified: Sat Oct 22 2016 03:11:49 PDT -0700
+!-------------------------------------------------------------------------------
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+!                  bg       border   separator
+rofi.color-window: #32302f, #a89984, #a89984
+
+!                  bg       fg       bg-alt   hl-bg    hl-fg
+rofi.color-normal: #32302f, #ebdbb2, #3c3836, #665c54, #fbf1c7
+rofi.color-active: #d79921, #32302f, #d79921, #fabd2f, #32302f
+rofi.color-urgent: #cc241d, #32302f, #cc241d, #fb4934, #32302f
diff --git a/themes/gruvbox-dark.theme b/themes/gruvbox-dark.theme
new file mode 100644
index 00000000..0d488f05
--- /dev/null
+++ b/themes/gruvbox-dark.theme
@@ -0,0 +1,23 @@
+!-------------------------------------------------------------------------------
+! Rofi color theme
+!
+! Based on the Gruvbox color scheme for Vim by morhetz
+! https://github.com/morhetz/gruvbox
+!
+! File: gruvbox-dark.theme
+! Desc: Gruvbox dark color theme for Rofi
+! Author: bardisty <b@bah.im>
+! Source: https://github.com/bardisty/gruvbox-rofi
+! Modified: Sat Oct 22 2016 03:11:40 PDT -0700
+!-------------------------------------------------------------------------------
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+!                  bg       border   separator
+rofi.color-window: #282828, #a89984, #a89984
+
+!                  bg       fg       bg-alt   hl-bg    hl-fg
+rofi.color-normal: #282828, #ebdbb2, #32302f, #665c54, #fbf1c7
+rofi.color-active: #d79921, #282828, #d79921, #fabd2f, #282828
+rofi.color-urgent: #cc241d, #282828, #cc241d, #fb4934, #282828
diff --git a/themes/gruvbox-light-hard.theme b/themes/gruvbox-light-hard.theme
new file mode 100644
index 00000000..4bb3eef4
--- /dev/null
+++ b/themes/gruvbox-light-hard.theme
@@ -0,0 +1,23 @@
+!-------------------------------------------------------------------------------
+! Rofi color theme
+!
+! Based on the Gruvbox color scheme for Vim by morhetz
+! https://github.com/morhetz/gruvbox
+!
+! File: gruvbox-light-hard.theme
+! Desc: Gruvbox light (hard contrast) color theme for Rofi
+! Author: bardisty <b@bah.im>
+! Source: https://github.com/bardisty/gruvbox-rofi
+! Modified: Sat Oct 22 2016 03:11:32 PDT -0700
+!-------------------------------------------------------------------------------
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+!                  bg       border   separator
+rofi.color-window: #f9f5d7, #7c6f64, #7c6f64
+
+!                  bg       fg       bg-alt   hl-bg    hl-fg
+rofi.color-normal: #f9f5d7, #3c3836, #fbf1c7, #ebdbb2, #282828
+rofi.color-active: #b57614, #fdf4c1, #b57614, #d79921, #fdf4c1
+rofi.color-urgent: #cc241d, #fdf4c1, #cc241d, #fb4934, #fdf4c1
diff --git a/themes/gruvbox-light-soft.theme b/themes/gruvbox-light-soft.theme
new file mode 100644
index 00000000..869465bb
--- /dev/null
+++ b/themes/gruvbox-light-soft.theme
@@ -0,0 +1,23 @@
+!-------------------------------------------------------------------------------
+! Rofi color theme
+!
+! Based on the Gruvbox color scheme for Vim by morhetz
+! https://github.com/morhetz/gruvbox
+!
+! File: gruvbox-light-soft.theme
+! Desc: Gruvbox light (soft contrast) color theme for Rofi
+! Author: bardisty <b@bah.im>
+! Source: https://github.com/bardisty/gruvbox-rofi
+! Modified: Sat Oct 22 2016 03:11:25 PDT -0700
+!-------------------------------------------------------------------------------
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+!                  bg       border   separator
+rofi.color-window: #f2e5bc, #7c6f64, #7c6f64
+
+!                  bg       fg       bg-alt   hl-bg    hl-fg
+rofi.color-normal: #f2e5bc, #3c3836, #ebdbb2, #d5c4a1, #282828
+rofi.color-active: #b57614, #f2e5bc, #b57614, #d79921, #f2e5bc
+rofi.color-urgent: #cc241d, #f2e5bc, #cc241d, #fb4934, #f2e5bc
diff --git a/themes/gruvbox-light.theme b/themes/gruvbox-light.theme
new file mode 100644
index 00000000..c2af019f
--- /dev/null
+++ b/themes/gruvbox-light.theme
@@ -0,0 +1,23 @@
+!-------------------------------------------------------------------------------
+! Rofi color theme
+!
+! Based on the Gruvbox color scheme for Vim by morhetz
+! https://github.com/morhetz/gruvbox
+!
+! File: gruvbox-light.theme
+! Desc: Gruvbox light color theme for rofi
+! Author: bardisty <b@bah.im>
+! Source: https://github.com/bardisty/gruvbox-rofi
+! Modified: Sat Oct 22 2016 03:11:11 PDT -0700
+!-------------------------------------------------------------------------------
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+!                  bg       border   separator
+rofi.color-window: #fbf1c7, #7c6f64, #7c6f64
+
+!                  bg       fg       bg-alt   hl-bg    hl-fg
+rofi.color-normal: #fbf1c7, #3c3836, #f2e5bc, #d5c4a1, #282828
+rofi.color-active: #b57614, #fbf1c7, #b57614, #d79921, #fbf1c7
+rofi.color-urgent: #cc241d, #fbf1c7, #cc241d, #fb4934, #fbf1c7