diff --git a/Official Themes/gruvbox-common.inc b/Official Themes/gruvbox-common.inc
new file mode 100644
index 0000000..f7a168d
--- /dev/null
+++ b/Official Themes/gruvbox-common.inc	
@@ -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 f09507e..fdd9018 100644
--- a/Official Themes/gruvbox-dark-hard.rasi	
+++ b/Official Themes/gruvbox-dark-hard.rasi	
@@ -58,5 +58,5 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.rasi"
+@import "gruvbox-common.inc"
 
diff --git a/Official Themes/gruvbox-dark-soft.rasi b/Official Themes/gruvbox-dark-soft.rasi
index d080824..4f91844 100644
--- a/Official Themes/gruvbox-dark-soft.rasi	
+++ b/Official Themes/gruvbox-dark-soft.rasi	
@@ -58,5 +58,5 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.rasi"
+@import "gruvbox-common.inc"
 
diff --git a/Official Themes/gruvbox-dark.rasi b/Official Themes/gruvbox-dark.rasi
index 6bec127..945d4a7 100644
--- a/Official Themes/gruvbox-dark.rasi	
+++ b/Official Themes/gruvbox-dark.rasi	
@@ -58,5 +58,4 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.rasi"
-
+@import "gruvbox-common.inc"
diff --git a/Official Themes/gruvbox-light-hard.rasi b/Official Themes/gruvbox-light-hard.rasi
index e0efe33..bfb02c5 100644
--- a/Official Themes/gruvbox-light-hard.rasi	
+++ b/Official Themes/gruvbox-light-hard.rasi	
@@ -58,5 +58,5 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.rasi"
+@import "gruvbox-common.inc"
 
diff --git a/Official Themes/gruvbox-light-soft.rasi b/Official Themes/gruvbox-light-soft.rasi
index 43ddb6b..35a2a4b 100644
--- a/Official Themes/gruvbox-light-soft.rasi	
+++ b/Official Themes/gruvbox-light-soft.rasi	
@@ -58,5 +58,5 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.rasi"
+@import "gruvbox-common.inc"
 
diff --git a/Official Themes/gruvbox-light.rasi b/Official Themes/gruvbox-light.rasi
index f804156..eb7acd7 100644
--- a/Official Themes/gruvbox-light.rasi	
+++ b/Official Themes/gruvbox-light.rasi	
@@ -58,5 +58,5 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.rasi"
+@import "gruvbox-common.inc"