diff --git a/Official Themes/gruvbox-common.rasi b/Official Themes/gruvbox-common.rasi
new file mode 100644
index 0000000..f7a168d
--- /dev/null
+++ b/Official Themes/gruvbox-common.rasi	
@@ -0,0 +1,127 @@
+/* ==========================================================================
+   File: gruvbox-common.rasi
+   Desc: Shared rules between all gruvbox themes
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 06:06:47 PST -0800
+   ========================================================================== */
+
+window {
+    background-color: @background;
+    border:           2;
+    padding:          2;
+}
+
+mainbox {
+    border:  0;
+    padding: 0;
+}
+
+message {
+    border:       2px 0 0;
+    border-color: @separatorcolor;
+    padding:      1px;
+}
+
+textbox {
+    highlight:  @highlight;
+    text-color: @foreground;
+}
+
+listview {
+    border:       2px solid 0 0;
+    padding:      2px 0 0;
+    border-color: @separatorcolor;
+    spacing:      2px;
+    scrollbar:    @scrollbar;
+}
+
+element {
+    border:  0;
+    padding: 2px;
+}
+
+element.normal.normal {
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
+}
+
+element.normal.urgent {
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}
+
+element.normal.active {
+    background-color: @active-background;
+    text-color:       @active-foreground;
+}
+
+element.selected.normal {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+
+element.selected.urgent {
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
+}
+
+element.selected.active {
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
+}
+
+element.alternate.normal {
+    background-color: @alternate-normal-background;
+    text-color:       @alternate-normal-foreground;
+}
+
+element.alternate.urgent {
+    background-color: @alternate-urgent-background;
+    text-color:       @alternate-urgent-foreground;
+}
+
+element.alternate.active {
+    background-color: @alternate-active-background;
+    text-color:       @alternate-active-foreground;
+}
+
+scrollbar {
+    width:        4px;
+    border:       0;
+    handle-color: @scrollbar-handle;
+    handle-width: 8px;
+    padding:      0;
+}
+
+sidebar {
+    border:       2px 0 0;
+    border-color: @separatorcolor;
+}
+
+inputbar {
+    spacing:    0;
+    text-color: @normal-foreground;
+    padding:    2px;
+    children:   [ prompt, textbox-prompt-sep, entry, case-indicator ];
+}
+
+case-indicator,
+entry,
+prompt,
+button {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+
+button.selected {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+
+textbox-prompt-sep {
+    expand:     false;
+    str:        ":";
+    text-color: @normal-foreground;
+    margin:     0 0.3em 0 0;
+}
diff --git a/Official Themes/gruvbox-dark-hard.rasi b/Official Themes/gruvbox-dark-hard.rasi
index a2b0ea6..f09507e 100644
--- a/Official Themes/gruvbox-dark-hard.rasi	
+++ b/Official Themes/gruvbox-dark-hard.rasi	
@@ -1,140 +1,62 @@
-/*********************************************************
- *  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
- **********************************************************/
+/* ==========================================================================
+   Rofi color theme
+
+   Based on the Gruvbox color scheme for Vim by morhetz
+   https://github.com/morhetz/gruvbox
+
+   File: gruvbox-dark-hard.rasi
+   Desc: Gruvbox dark (hard contrast) color theme for Rofi
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 06:04:26 PST -0800
+   ========================================================================== */
 
 * {
-    selected-normal-foreground:  rgba ( 251, 241, 199, 100 % );
-    foreground:                  rgba ( 235, 219, 178, 100 % );
+    /* Theme settings */
+    highlight: bold italic;
+    scrollbar: true;
+
+    /* Gruvbox dark colors */
+    gruvbox-dark-bg0-hard:     #1d2021;
+    gruvbox-dark-bg0:          #282828;
+    gruvbox-dark-bg2:          #504945;
+    gruvbox-dark-fg0:          #fbf1c7;
+    gruvbox-dark-fg1:          #ebdbb2;
+    gruvbox-dark-red-dark:     #cc241d;
+    gruvbox-dark-red-light:    #fb4934;
+    gruvbox-dark-yellow-dark:  #d79921;
+    gruvbox-dark-yellow-light: #fabd2f;
+    gruvbox-dark-gray:         #a89984;
+
+    /* Theme colors */
+    background:                  @gruvbox-dark-bg0-hard;
+    background-color:            @background;
+    foreground:                  @gruvbox-dark-fg1;
+    border-color:                @gruvbox-dark-gray;
+    separatorcolor:              @border-color;
+    scrollbar-handle:            @border-color;
+
+    normal-background:           @background;
     normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 40, 40, 40, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 29, 32, 33, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 29, 32, 33, 100 % );
-    alternate-urgent-background: rgba ( 204, 36, 29, 100 % );
-    active-foreground:           rgba ( 29, 32, 33, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 29, 32, 33, 100 % );
-    alternate-active-background: rgba ( 215, 153, 33, 100 % );
-    background:                  rgba ( 29, 32, 33, 100 % );
-    bordercolor:                 rgba ( 168, 153, 132, 100 % );
+    alternate-normal-background: @gruvbox-dark-bg0;
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 29, 32, 33, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 80, 73, 69, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 168, 153, 132, 100 % );
-    urgent-background:           rgba ( 204, 36, 29, 100 % );
-    selected-urgent-background:  rgba ( 251, 73, 52, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
+    selected-normal-background:  @gruvbox-dark-bg2;
+    selected-normal-foreground:  @gruvbox-dark-fg0;
+
+    active-background:           @gruvbox-dark-yellow-dark;
+    active-foreground:           @background;
+    alternate-active-background: @active-background;
     alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 215, 153, 33, 100 % );
-    selected-active-background:  rgba ( 250, 189, 47, 100 % );
-}
-#window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-#element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-#element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-#element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-#element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-#scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    selected-active-background:  @gruvbox-dark-yellow-light;
+    selected-active-foreground:  @active-foreground;
+
+    urgent-background:           @gruvbox-dark-red-dark;
+    urgent-foreground:           @background;
+    alternate-urgent-background: @urgent-background;
+    alternate-urgent-foreground: @urgent-foreground;
+    selected-urgent-background:  @gruvbox-dark-red-light;
+    selected-urgent-foreground:  @urgent-foreground;
 }
+
+@import "gruvbox-common.rasi"
+
diff --git a/Official Themes/gruvbox-dark-soft.rasi b/Official Themes/gruvbox-dark-soft.rasi
index 91bdff6..d080824 100644
--- a/Official Themes/gruvbox-dark-soft.rasi	
+++ b/Official Themes/gruvbox-dark-soft.rasi	
@@ -1,139 +1,62 @@
-/*********************************************************
- *  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:12:10 PDT *0700
- **********************************************************/
+/* ==========================================================================
+   Rofi color theme
+
+   Based on the Gruvbox color scheme for Vim by morhetz
+   https://github.com/morhetz/gruvbox
+
+   File: gruvbox-dark-soft.rasi
+   Desc: Gruvbox dark (soft contrast) color theme for Rofi
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 06:04:37 PST -0800
+   ========================================================================== */
+
 * {
-    selected-normal-foreground:  rgba ( 251, 241, 199, 100 % );
-    foreground:                  rgba ( 235, 219, 178, 100 % );
+    /* Theme settings */
+    highlight: bold italic;
+    scrollbar: true;
+
+    /* Gruvbox dark colors */
+    gruvbox-dark-bg0-soft:     #32302f;
+    gruvbox-dark-bg1:          #3c3836;
+    gruvbox-dark-bg3:          #665c54;
+    gruvbox-dark-fg0:          #fbf1c7;
+    gruvbox-dark-fg1:          #ebdbb2;
+    gruvbox-dark-red-dark:     #cc241d;
+    gruvbox-dark-red-light:    #fb4934;
+    gruvbox-dark-yellow-dark:  #d79921;
+    gruvbox-dark-yellow-light: #fabd2f;
+    gruvbox-dark-gray:         #a89984;
+
+    /* Theme colors */
+    background:                  @gruvbox-dark-bg0-soft;
+    background-color:            @background;
+    foreground:                  @gruvbox-dark-fg1;
+    border-color:                @gruvbox-dark-gray;
+    separatorcolor:              @border-color;
+    scrollbar-handle:            @border-color;
+
+    normal-background:           @background;
     normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 60, 56, 54, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 50, 48, 47, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 50, 48, 47, 100 % );
-    alternate-urgent-background: rgba ( 204, 36, 29, 100 % );
-    active-foreground:           rgba ( 50, 48, 47, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 50, 48, 47, 100 % );
-    alternate-active-background: rgba ( 215, 153, 33, 100 % );
-    background:                  rgba ( 50, 48, 47, 100 % );
-    bordercolor:                 rgba ( 168, 153, 132, 100 % );
+    alternate-normal-background: @gruvbox-dark-bg1;
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 50, 48, 47, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 102, 92, 84, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 168, 153, 132, 100 % );
-    urgent-background:           rgba ( 204, 36, 29, 100 % );
-    selected-urgent-background:  rgba ( 251, 73, 52, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
+    selected-normal-background:  @gruvbox-dark-bg3;
+    selected-normal-foreground:  @gruvbox-dark-fg0;
+
+    active-background:           @gruvbox-dark-yellow-dark;
+    active-foreground:           @background;
+    alternate-active-background: @active-background;
     alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 215, 153, 33, 100 % );
-    selected-active-background:  rgba ( 250, 189, 47, 100 % );
-}
-#window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-#element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-#element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-#element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-#element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-#scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    selected-active-background:  @gruvbox-dark-yellow-light;
+    selected-active-foreground:  @active-foreground;
+
+    urgent-background:           @gruvbox-dark-red-dark;
+    urgent-foreground:           @background;
+    alternate-urgent-background: @urgent-background;
+    alternate-urgent-foreground: @urgent-foreground;
+    selected-urgent-background:  @gruvbox-dark-red-light;
+    selected-urgent-foreground:  @urgent-foreground;
 }
+
+@import "gruvbox-common.rasi"
+
diff --git a/Official Themes/gruvbox-dark.rasi b/Official Themes/gruvbox-dark.rasi
index 90e4f0b..6bec127 100644
--- a/Official Themes/gruvbox-dark.rasi	
+++ b/Official Themes/gruvbox-dark.rasi	
@@ -1,139 +1,62 @@
-/*********************************************************
- *  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:12:10 PDT *0700
- **********************************************************/
+/* ==========================================================================
+   Rofi color theme
+
+   Based on the Gruvbox color scheme for Vim by morhetz
+   https://github.com/morhetz/gruvbox
+
+   File: gruvbox-dark.rasi
+   Desc: Gruvbox dark color theme for Rofi
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 04:08:43 PST -0800
+   ========================================================================== */
+
 * {
-    selected-normal-foreground:  rgba ( 251, 241, 199, 100 % );
-    foreground:                  rgba ( 235, 219, 178, 100 % );
+    /* Theme settings */
+    highlight: bold italic;
+    scrollbar: true;
+
+    /* Gruvbox dark colors */
+    gruvbox-dark-bg0:          #282828;
+    gruvbox-dark-bg0-soft:     #32302f;
+    gruvbox-dark-bg3:          #665c54;
+    gruvbox-dark-fg0:          #fbf1c7;
+    gruvbox-dark-fg1:          #ebdbb2;
+    gruvbox-dark-red-dark:     #cc241d;
+    gruvbox-dark-red-light:    #fb4934;
+    gruvbox-dark-yellow-dark:  #d79921;
+    gruvbox-dark-yellow-light: #fabd2f;
+    gruvbox-dark-gray:         #a89984;
+
+    /* Theme colors */
+    background:                  @gruvbox-dark-bg0;
+    background-color:            @background;
+    foreground:                  @gruvbox-dark-fg1;
+    border-color:                @gruvbox-dark-gray;
+    separatorcolor:              @border-color;
+    scrollbar-handle:            @border-color;
+
+    normal-background:           @background;
     normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 50, 48, 47, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 40, 40, 40, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 40, 40, 40, 100 % );
-    alternate-urgent-background: rgba ( 204, 36, 29, 100 % );
-    active-foreground:           rgba ( 40, 40, 40, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 40, 40, 40, 100 % );
-    alternate-active-background: rgba ( 215, 153, 33, 100 % );
-    background:                  rgba ( 40, 40, 40, 100 % );
-    bordercolor:                 rgba ( 168, 153, 132, 100 % );
+    alternate-normal-background: @gruvbox-dark-bg0-soft;
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 40, 40, 40, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 102, 92, 84, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 168, 153, 132, 100 % );
-    urgent-background:           rgba ( 204, 36, 29, 100 % );
-    selected-urgent-background:  rgba ( 251, 73, 52, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
+    selected-normal-background:  @gruvbox-dark-bg3;
+    selected-normal-foreground:  @gruvbox-dark-fg0;
+
+    active-background:           @gruvbox-dark-yellow-dark;
+    active-foreground:           @background;
+    alternate-active-background: @active-background;
     alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 215, 153, 33, 100 % );
-    selected-active-background:  rgba ( 250, 189, 47, 100 % );
-}
-#window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-#element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-#element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-#element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-#element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-#scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    selected-active-background:  @gruvbox-dark-yellow-light;
+    selected-active-foreground:  @active-foreground;
+
+    urgent-background:           @gruvbox-dark-red-dark;
+    urgent-foreground:           @background;
+    alternate-urgent-background: @urgent-background;
+    alternate-urgent-foreground: @urgent-foreground;
+    selected-urgent-background:  @gruvbox-dark-red-light;
+    selected-urgent-foreground:  @urgent-foreground;
 }
+
+@import "gruvbox-common.rasi"
+
diff --git a/Official Themes/gruvbox-light-hard.rasi b/Official Themes/gruvbox-light-hard.rasi
index 2db85cb..e0efe33 100644
--- a/Official Themes/gruvbox-light-hard.rasi	
+++ b/Official Themes/gruvbox-light-hard.rasi	
@@ -1,140 +1,62 @@
-/*******************
- * 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
- */
+/* ==========================================================================
+   Rofi color theme
+
+   Based on the Gruvbox color scheme for Vim by morhetz
+   https://github.com/morhetz/gruvbox
+
+   File: gruvbox-light-hard.rasi
+   Desc: Gruvbox light (hard contrast) color theme for Rofi
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 06:04:48 PST -0800
+   ========================================================================== */
 
 * {
-    selected-normal-foreground:  rgba ( 40, 40, 40, 100 % );
-    foreground:                  rgba ( 60, 56, 54, 100 % );
+    /* Theme settings */
+    highlight: bold italic;
+    scrollbar: true;
+
+    /* Gruvbox light colors */
+    gruvbox-light-bg0-hard:     #f9f5d7;
+    gruvbox-light-bg0:          #fbf1c7;
+    gruvbox-light-bg1:          #ebdbb2;
+    gruvbox-light-fg0:          #282828;
+    gruvbox-light-fg1:          #3c3836;
+    gruvbox-light-red-dark:     #9d0006;
+    gruvbox-light-red-light:    #cc241d;
+    gruvbox-light-yellow-dark:  #b57614;
+    gruvbox-light-yellow-light: #d79921;
+    gruvbox-light-gray:         #7c6f64;
+
+    /* Theme colors */
+    background:                  @gruvbox-light-bg0-hard;
+    background-color:            @background;
+    foreground:                  @gruvbox-light-fg1;
+    border-color:                @gruvbox-light-gray;
+    separatorcolor:              @border-color;
+    scrollbar-handle:            @border-color;
+
+    normal-background:           @background;
     normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 251, 241, 199, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 253, 244, 193, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 253, 244, 193, 100 % );
-    alternate-urgent-background: rgba ( 204, 36, 29, 100 % );
-    active-foreground:           rgba ( 253, 244, 193, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 253, 244, 193, 100 % );
-    alternate-active-background: rgba ( 181, 118, 20, 100 % );
-    background:                  rgba ( 249, 245, 215, 100 % );
-    bordercolor:                 rgba ( 124, 111, 100, 100 % );
+    alternate-normal-background: @gruvbox-light-bg0;
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 249, 245, 215, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 235, 219, 178, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 124, 111, 100, 100 % );
-    urgent-background:           rgba ( 204, 36, 29, 100 % );
-    selected-urgent-background:  rgba ( 251, 73, 52, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
+    selected-normal-background:  @gruvbox-light-bg1;
+    selected-normal-foreground:  @gruvbox-light-fg0;
+
+    active-background:           @gruvbox-light-yellow-dark;
+    active-foreground:           @background;
+    alternate-active-background: @active-background;
     alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 181, 118, 20, 100 % );
-    selected-active-background:  rgba ( 215, 153, 33, 100 % );
-}
-#window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-#element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-#element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-#element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-#element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-#scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    selected-active-background:  @gruvbox-light-yellow-light;
+    selected-active-foreground:  @active-foreground;
+
+    urgent-background:           @gruvbox-light-red-dark;
+    urgent-foreground:           @background;
+    alternate-urgent-background: @urgent-background;
+    alternate-urgent-foreground: @urgent-foreground;
+    selected-urgent-background:  @gruvbox-light-red-light;
+    selected-urgent-foreground:  @urgent-foreground;
 }
+
+@import "gruvbox-common.rasi"
+
diff --git a/Official Themes/gruvbox-light-soft.rasi b/Official Themes/gruvbox-light-soft.rasi
index bfb083c..43ddb6b 100644
--- a/Official Themes/gruvbox-light-soft.rasi	
+++ b/Official Themes/gruvbox-light-soft.rasi	
@@ -1,139 +1,62 @@
-/*******************
- * 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:32 PDT -0700
- */
+/* ==========================================================================
+   Rofi color theme
+
+   Based on the Gruvbox color scheme for Vim by morhetz
+   https://github.com/morhetz/gruvbox
+
+   File: gruvbox-light-soft.rasi
+   Desc: Gruvbox light (soft contrast) color theme for Rofi
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 06:05:38 PST -0800
+   ========================================================================== */
+
 * {
-    selected-normal-foreground:  rgba ( 40, 40, 40, 100 % );
-    foreground:                  rgba ( 60, 56, 54, 100 % );
+    /* Theme settings */
+    highlight: bold italic;
+    scrollbar: true;
+
+    /* Gruvbox light colors */
+    gruvbox-light-bg0-soft:     #f2e5bc;
+    gruvbox-light-bg1:          #ebdbb2;
+    gruvbox-light-bg2:          #d5c4a1;
+    gruvbox-light-fg0:          #282828;
+    gruvbox-light-fg1:          #3c3836;
+    gruvbox-light-red-dark:     #9d0006;
+    gruvbox-light-red-light:    #cc241d;
+    gruvbox-light-yellow-dark:  #b57614;
+    gruvbox-light-yellow-light: #d79921;
+    gruvbox-light-gray:         #7c6f64;
+
+    /* Theme colors */
+    background:                  @gruvbox-light-bg0-soft;
+    background-color:            @background;
+    foreground:                  @gruvbox-light-fg1;
+    border-color:                @gruvbox-light-gray;
+    separatorcolor:              @border-color;
+    scrollbar-handle:            @border-color;
+
+    normal-background:           @background;
     normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 235, 219, 178, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 242, 229, 188, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 242, 229, 188, 100 % );
-    alternate-urgent-background: rgba ( 204, 36, 29, 100 % );
-    active-foreground:           rgba ( 242, 229, 188, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 242, 229, 188, 100 % );
-    alternate-active-background: rgba ( 181, 118, 20, 100 % );
-    background:                  rgba ( 242, 229, 188, 100 % );
-    bordercolor:                 rgba ( 124, 111, 100, 100 % );
+    alternate-normal-background: @gruvbox-light-bg1;
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 242, 229, 188, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 213, 196, 161, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 124, 111, 100, 100 % );
-    urgent-background:           rgba ( 204, 36, 29, 100 % );
-    selected-urgent-background:  rgba ( 251, 73, 52, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
+    selected-normal-background:  @gruvbox-light-bg2;
+    selected-normal-foreground:  @gruvbox-light-fg0;
+
+    active-background:           @gruvbox-light-yellow-dark;
+    active-foreground:           @background;
+    alternate-active-background: @active-background;
     alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 181, 118, 20, 100 % );
-    selected-active-background:  rgba ( 215, 153, 33, 100 % );
-}
-#window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-#element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-#element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-#element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-#element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-#scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    selected-active-background:  @gruvbox-light-yellow-light;
+    selected-active-foreground:  @active-foreground;
+
+    urgent-background:           @gruvbox-light-red-dark;
+    urgent-foreground:           @background;
+    alternate-urgent-background: @urgent-background;
+    alternate-urgent-foreground: @urgent-foreground;
+    selected-urgent-background:  @gruvbox-light-red-light;
+    selected-urgent-foreground:  @urgent-foreground;
 }
+
+@import "gruvbox-common.rasi"
+
diff --git a/Official Themes/gruvbox-light.rasi b/Official Themes/gruvbox-light.rasi
index deb3a57..f804156 100644
--- a/Official Themes/gruvbox-light.rasi	
+++ b/Official Themes/gruvbox-light.rasi	
@@ -1,139 +1,62 @@
-/*******************
- * 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:32 PDT -0700
- */
+/* ==========================================================================
+   Rofi color theme
+
+   Based on the Gruvbox color scheme for Vim by morhetz
+   https://github.com/morhetz/gruvbox
+
+   File: gruvbox-light.rasi
+   Desc: Gruvbox light color theme for rofi
+   Author: bardisty <b@bah.im>
+   Source: https://github.com/bardisty/gruvbox-rofi
+   Modified: Mon Feb 12 2018 06:06:06 PST -0800
+   ========================================================================== */
+
 * {
-    selected-normal-foreground:  rgba ( 40, 40, 40, 100 % );
-    foreground:                  rgba ( 60, 56, 54, 100 % );
+    /* Theme settings */
+    highlight: bold italic;
+    scrollbar: true;
+
+    /* Gruvbox light colors */
+    gruvbox-light-bg0:          #fbf1c7;
+    gruvbox-light-bg0-soft:     #f2e5bc;
+    gruvbox-light-bg2:          #d5c4a1;
+    gruvbox-light-fg0:          #282828;
+    gruvbox-light-fg1:          #3c3836;
+    gruvbox-light-gray:         #7c6f64;
+    gruvbox-light-red-dark:     #9d0006;
+    gruvbox-light-red-light:    #cc241d;
+    gruvbox-light-yellow-dark:  #b57614;
+    gruvbox-light-yellow-light: #d79921;
+
+    /* Theme colors */
+    background:                  @gruvbox-light-bg0;
+    background-color:            @background;
+    foreground:                  @gruvbox-light-fg1;
+    border-color:                @gruvbox-light-gray;
+    separatorcolor:              @border-color;
+    scrollbar-handle:            @border-color;
+
+    normal-background:           @background;
     normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 242, 229, 188, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 251, 241, 199, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 251, 241, 199, 100 % );
-    alternate-urgent-background: rgba ( 204, 36, 29, 100 % );
-    active-foreground:           rgba ( 251, 241, 199, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 251, 241, 199, 100 % );
-    alternate-active-background: rgba ( 181, 118, 20, 100 % );
-    background:                  rgba ( 251, 241, 199, 100 % );
-    bordercolor:                 rgba ( 124, 111, 100, 100 % );
+    alternate-normal-background: @gruvbox-light-bg0-soft;
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 251, 241, 199, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 213, 196, 161, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 124, 111, 100, 100 % );
-    urgent-background:           rgba ( 204, 36, 29, 100 % );
-    selected-urgent-background:  rgba ( 251, 73, 52, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
+    selected-normal-background:  @gruvbox-light-bg2;
+    selected-normal-foreground:  @gruvbox-light-fg0;
+
+    active-background:           @gruvbox-light-yellow-dark;
+    active-foreground:           @background;
+    alternate-active-background: @active-background;
     alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 181, 118, 20, 100 % );
-    selected-active-background:  rgba ( 215, 153, 33, 100 % );
-}
-#window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-#element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-#element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-#element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-#element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-#scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    selected-active-background:  @gruvbox-light-yellow-light;
+    selected-active-foreground:  @active-foreground;
+
+    urgent-background:           @gruvbox-light-red-dark;
+    urgent-foreground:           @background;
+    alternate-urgent-background: @urgent-background;
+    alternate-urgent-foreground: @urgent-foreground;
+    selected-urgent-background:  @gruvbox-light-red-light;
+    selected-urgent-foreground:  @urgent-foreground;
 }
+
+@import "gruvbox-common.rasi"
+