diff --git a/Official Themes/Adapta-Nokto.rasi b/Official Themes/Adapta-Nokto.rasi
index 4d4fb43..bc69bb1 100644
--- a/Official Themes/Adapta-Nokto.rasi	
+++ b/Official Themes/Adapta-Nokto.rasi	
@@ -107,7 +107,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Arc-Dark.rasi b/Official Themes/Arc-Dark.rasi
index b134520..5f5cf39 100644
--- a/Official Themes/Arc-Dark.rasi	
+++ b/Official Themes/Arc-Dark.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Arc.rasi b/Official Themes/Arc.rasi
index 0368224..7d06575 100644
--- a/Official Themes/Arc.rasi	
+++ b/Official Themes/Arc.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/DarkBlue.rasi b/Official Themes/DarkBlue.rasi
index b9165ee..ef073f3 100644
--- a/Official Themes/DarkBlue.rasi	
+++ b/Official Themes/DarkBlue.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Indego.rasi b/Official Themes/Indego.rasi
index 2c3e75f..5381a0a 100644
--- a/Official Themes/Indego.rasi	
+++ b/Official Themes/Indego.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Monokai.rasi b/Official Themes/Monokai.rasi
index 201b593..c8d3c5f 100644
--- a/Official Themes/Monokai.rasi	
+++ b/Official Themes/Monokai.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Paper.rasi b/Official Themes/Paper.rasi
index 532c771..41f4f41 100644
--- a/Official Themes/Paper.rasi	
+++ b/Official Themes/Paper.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Pop-Dark.rasi b/Official Themes/Pop-Dark.rasi
index a187414..81425fa 100644
--- a/Official Themes/Pop-Dark.rasi	
+++ b/Official Themes/Pop-Dark.rasi	
@@ -96,7 +96,7 @@
     text-color: @alternate-active-foreground;
     background-color: @alternate-active-background;
 }
-#mode-switcher {
+#sidebar {
     border: 1px dash 0px 0px ;
 }
 #button selected {
diff --git a/Official Themes/android_notification.rasi b/Official Themes/android_notification.rasi
index aae77fd..856da89 100644
--- a/Official Themes/android_notification.rasi	
+++ b/Official Themes/android_notification.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/arthur.rasi b/Official Themes/arthur.rasi
index 233e052..db57659 100644
--- a/Official Themes/arthur.rasi	
+++ b/Official Themes/arthur.rasi	
@@ -78,7 +78,7 @@ configuration {
     color: @magenta;
     background-color: @transparent;
     spacing: 0;
-    children:  [mainbox];
+    children:  [vertb, mainbox];
     orientation: horizontal;
 }
 
@@ -164,13 +164,13 @@ configuration {
 
 #vertb {
     expand: false;
-    children: [ dummy0, mode-switcher, dummy1  ];
+    children: [ dummy0, sidebar, dummy1  ];
 }
 #dummy0,  dummy1 {
     expand: true;
 }
 
-#mode-switcher {
+#sidebar {
     expand: false;
     orientation: vertical;
     spacing: 0px;
diff --git a/Official Themes/blue.rasi b/Official Themes/blue.rasi
index 893781b..17cbdfc 100644
--- a/Official Themes/blue.rasi	
+++ b/Official Themes/blue.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/c64.rasi b/Official Themes/c64.rasi
index f921026..ef99ba4 100644
--- a/Official Themes/c64.rasi	
+++ b/Official Themes/c64.rasi	
@@ -109,7 +109,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/clerk.rasi b/Official Themes/clerk.rasi
new file mode 100644
index 0000000..3e9d181
--- /dev/null
+++ b/Official Themes/clerk.rasi	
@@ -0,0 +1,187 @@
+/**
+ * User: Rasi
+ * Copyright: Rasmus Steinke
+ */
+
+configuration {
+	width: 1500;
+	lines: 30;
+	monitor: "-5";
+	fixed-num-lines: true;
+	levenshtein-sort: false;
+	threads: 8;
+}
+
+/* global settings and color variables */
+* { 
+    blue:        #A7c6E2;
+    blue-trans:  #A7c6e2aa;
+    darkblue:    #005F87;
+    white:       #FFFFFF;
+    green:       #00330088;
+    black:       #000000;
+    grey:        #444444;
+    orange:      #FFD391;
+    dark-orange: #FFA664;
+    light-grey:  #F5F5F5;
+    medium-grey: #D0D0D0;
+    dark-grey:   #002B36;
+    urgent:      #D75F00;
+    active:      #005F87;
+    transparent: #000000aa;
+    spacing: 0em;
+    font: "Dejavu Sans Mono 14";
+    padding: 0px;
+    background: @transparent;
+    line-style: "none";
+}
+
+#window {
+    border-radius: 10px;
+    background: @transparent;
+    border: 2;
+    foreground: @grey;
+}
+#window.mainbox {
+    padding: 0px;
+    background: @blue-trans;
+    foreground: @grey;
+}
+#window.mainbox.box {
+    border: 2px;
+    spacing: 0%;
+}
+#window.mainbox.listview {
+    // Looks.
+    border-radius: 10px;
+    border: 5px 5px 5px 5px;
+    padding: 20px 20px 20px 20px;
+    margin: 20px 30px 30px 30px;
+    background: @orange; 
+    // Enable scrollbar
+    scrollbar: false;
+    scrollbar-width: 5px;
+    // One column
+    columns: 1;
+    fixed-height: true;
+    reverse: false;
+    foreground: #000000;
+    spacing: 0.3em;
+
+}
+#window.mainbox.listview.scrollbar {
+    foreground: @black;
+    background: @blue;
+    padding: 1px;
+}
+#window.mainbox.listview.element {
+    border: 0px;
+    padding: 0px;
+    margin: 0px;
+    foreground: @black;
+    background: @blue;
+}
+#window.mainbox.listview.element.normal.normal {
+    foreground: @black;
+    background: @orange;
+}
+#window.mainbox.listview.element.normal.urgent {
+    foreground: @urgent;
+    background: @light-grey;
+}
+#window.mainbox.listview.element.normal.active {
+    foreground: @active;
+    background: @light-grey;
+}
+#window.mainbox.listview.element.selected.normal {
+    border-radius: 0px;
+    foreground: @black;
+    background: @dark-orange;
+}
+#window.mainbox.listview.element.selected.urgent {
+    foreground: @light-grey;
+    background: @urgent;
+}
+#window.mainbox.listview.element.selected.active {
+    foreground: @light-grey;
+    background: @active;
+}
+#window.mainbox.listview.element.alternate.normal {
+    foreground: @black;
+    background: @orange;
+}
+#window.mainbox.listview.element.alternate.urgent {
+    foreground: @urgent;
+    background: @medium-grey;
+}
+#window.mainbox.listview.element.alternate.active {
+    foreground: @active;
+    background: @medium-grey;
+}
+#window.mainbox.inputbar {
+    spacing: 0;
+    background: #88003300;
+    border: 0px;
+}
+#window.mainbox.inputbar.box {
+    border: 0px 0px 2px 0px;
+    border-radius: 0px;
+    padding: 5px 10px 5px 35px;
+    background: #00330088;
+    foreground: @black;
+    end: false;
+}
+#window.mainbox.inputbar.normal {
+    foreground: @white;
+    background: @transparent;
+}
+#window.mainbox.inputbar.separator {
+    background: @blue;
+    foreground: #00000000;
+}
+#window.mainbox.inputbar.prompt.normal.normal {
+    background: #00000000;
+    foreground: #ffffff;
+    padding: 0px;
+}
+#window.mainbox.inputbar.entry.normal.normal {
+    background: #00000000;
+    foreground: #ffffff;
+    padding: 0px;
+}
+#window.mainbox.inputbar.case-indicator normal.normal {
+    background: #00000000;
+    foreground: #ffffff;
+    padding: 0px;
+}
+    
+
+#window.mainbox.message.box {
+    index: 3;
+    border-radius: 10px;
+    background: #ffffff; 
+    foreground: @black;
+    padding: 5px 5px 5px 5px;
+    margin: 20px 30px 20px 30px;
+    border: 5px 5px 5px 5px;
+}
+#window.mainbox.message.textbox {
+    foreground: @black;
+    background: #ffffff;
+    margin: 5px 30px 5px 30px;
+    border: 0px;
+}
+#window.mainbox.message.normal {
+    background: #ffffff00;
+    foreground: @black;
+    padding: 0;
+}
+#inputbar {
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+#textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3em 0em 0em ;
+    text-color: @black;
+}
diff --git a/Official Themes/dmenu.rasi b/Official Themes/dmenu.rasi
index 0b23ea2..40f3bda 100644
--- a/Official Themes/dmenu.rasi	
+++ b/Official Themes/dmenu.rasi	
@@ -10,6 +10,9 @@
     font:            "Times New Roman 12";
 }
 
+configuration {
+}
+
 #window {
     anchor:     north;
     location:   north;
diff --git a/Official Themes/glue_pro_blue.rasi b/Official Themes/glue_pro_blue.rasi
index 39a9a38..fa46e08 100644
--- a/Official Themes/glue_pro_blue.rasi	
+++ b/Official Themes/glue_pro_blue.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/gruvbox-common.inc b/Official Themes/gruvbox-common.rasi
similarity index 100%
rename from Official Themes/gruvbox-common.inc
rename to Official Themes/gruvbox-common.rasi
diff --git a/Official Themes/gruvbox-dark-hard.rasi b/Official Themes/gruvbox-dark-hard.rasi
index fdd9018..f09507e 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.inc"
+@import "gruvbox-common.rasi"
 
diff --git a/Official Themes/gruvbox-dark-soft.rasi b/Official Themes/gruvbox-dark-soft.rasi
index 4f91844..d080824 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.inc"
+@import "gruvbox-common.rasi"
 
diff --git a/Official Themes/gruvbox-dark.rasi b/Official Themes/gruvbox-dark.rasi
index 945d4a7..6bec127 100644
--- a/Official Themes/gruvbox-dark.rasi	
+++ b/Official Themes/gruvbox-dark.rasi	
@@ -58,4 +58,5 @@
     selected-urgent-foreground:  @urgent-foreground;
 }
 
-@import "gruvbox-common.inc"
+@import "gruvbox-common.rasi"
+
diff --git a/Official Themes/gruvbox-light-hard.rasi b/Official Themes/gruvbox-light-hard.rasi
index bfb02c5..e0efe33 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.inc"
+@import "gruvbox-common.rasi"
 
diff --git a/Official Themes/gruvbox-light-soft.rasi b/Official Themes/gruvbox-light-soft.rasi
index 35a2a4b..43ddb6b 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.inc"
+@import "gruvbox-common.rasi"
 
diff --git a/Official Themes/gruvbox-light.rasi b/Official Themes/gruvbox-light.rasi
index eb7acd7..f804156 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.inc"
+@import "gruvbox-common.rasi"
 
diff --git a/Official Themes/lb.rasi b/Official Themes/lb.rasi
index 66ea9d0..bbbec82 100644
--- a/Official Themes/lb.rasi	
+++ b/Official Themes/lb.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/paper-float.rasi b/Official Themes/paper-float.rasi
index bc1940c..d9b62c7 100644
--- a/Official Themes/paper-float.rasi	
+++ b/Official Themes/paper-float.rasi	
@@ -106,7 +106,7 @@
     background-color: #F5F5F500;
 }
 
-#mode-switcher {
+#sidebar {
     border: 2px;
     padding: 0.5em 1em;
     background-color: @grey;
diff --git a/Official Themes/purple.rasi b/Official Themes/purple.rasi
index d4b1ffd..f85e657 100644
--- a/Official Themes/purple.rasi	
+++ b/Official Themes/purple.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/sidebar.rasi b/Official Themes/sidebar.rasi
index 51b406b..1d71a9b 100644
--- a/Official Themes/sidebar.rasi	
+++ b/Official Themes/sidebar.rasi	
@@ -42,18 +42,24 @@
     highlight:     bold #ffffff;
 }
 #window {
-    height:   100%;
-    width: 30em;
+    fullscreen: true;
     location: west;
     anchor:   west;
     border:  0px 2px 0px 0px;
     text-color: @lightwhite;
+
+    orientation: horizontal;
+    children: [mainbox, dummy];
 }
 
-#mode-switcher {
+#dummy {
+    expand: true;
+}
+
+#sidebar {
     border: 2px 0px 0px 0px;
     background-color: @lightblack;
-    padding: 4px;
+    padding: 10px;
 }
 #button selected {
     border-color: @lightgreen;
@@ -69,7 +75,7 @@
     border: 0px 0px 2px 0px;
 }
 #mainbox {
-    expand: true;
+    expand: false;
     background-color: #1c1c1cee;
     spacing: 1em;
 }
diff --git a/Official Themes/solarized.rasi b/Official Themes/solarized.rasi
index 340471e..34ce0b1 100644
--- a/Official Themes/solarized.rasi	
+++ b/Official Themes/solarized.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/solarized_alternate.rasi b/Official Themes/solarized_alternate.rasi
index 456ef30..886248c 100644
--- a/Official Themes/solarized_alternate.rasi	
+++ b/Official Themes/solarized_alternate.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#mode-switcher {
+#sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/README.md b/README.md
index d719f97..0079b32 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1 @@
-## Because of lack of time to maintain this repository, its now archived.
-
 ## Official rofi-themes repository
-
-
-When submitting a theme, please include a small copyright header, this way the theme can be included in the official set and shipped with rofi.
diff --git a/User Themes/README.md b/User Themes/README.md
index e723912..3188b55 100644
--- a/User Themes/README.md	
+++ b/User Themes/README.md	
@@ -12,30 +12,3 @@
 
 #### sidetab
 ![sidetab](https://53280.de/rofi/sidetab.png)
-
-#### material
-![material](https://53280.de/rofi/material.png)
-
-#### arc-red-dark
-![arc-red-dark](https://53280.de/rofi/arc-red.png)
-
-#### onedark
-![onedark](https://53280.de/rofi/onedark.png)
-
-#### ribbon
-![ribbon](https://53280.de/rofi/ribbon.png)
-
-#### rezlooks
-![rezlooks](https://53280.de/rofi/rezlooks.png)
-
-#### slate
-![slate](https://53280.de/rofi/slate.png)
-
-#### flamingo
-![flamingo](https://53280.de/rofi/flamingo.png)
-
-#### cloud
-![cloud](https://53280.de/rofi/cloud.png)
-
-#### merah
-![merah](https://raw.githubusercontent.com/ipang-dwi/merah/master/img2.jpg)
diff --git a/User Themes/arc-red-dark.rasi b/User Themes/arc-red-dark.rasi
deleted file mode 100644
index a5f57e2..0000000
--- a/User Themes/arc-red-dark.rasi	
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * ROFI Color theme
- * A red variation of Arc-Dark theme by leofa, based on arc-theme-Red (https://github.com/mclmza/arc-theme-Red)
- * User: wikwg9
- */
-* {
-    selected-normal-foreground:  rgba ( 249, 249, 249, 100 % );
-    foreground:                  rgba ( 196, 203, 212, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 64, 69, 82, 59 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 249, 249, 249, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 204, 102, 102, 100 % );
-    alternate-urgent-background: rgba ( 75, 81, 96, 90 % );
-    active-foreground:           rgba ( 220, 140, 160, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 249, 249, 249, 100 % );
-    alternate-active-background: rgba ( 75, 81, 96, 89 % );
-    background:                  rgba ( 45, 48, 59, 95 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 204, 87, 93, 100 % );
-    border-color:                rgba ( 137, 131, 124, 100 % );
-    spacing:                     2;
-    separatorcolor:              rgba ( 29, 31, 33, 100 % );
-    urgent-background:           rgba ( 29, 31, 33, 17 % );
-    selected-urgent-background:  rgba ( 165, 66, 66, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 29, 31, 33, 17 % );
-    selected-active-background:  rgba ( 204, 87, 93, 100 % );
-}
-#window {
-    background-color: @background;
-    padding:          5;
-}
-#mainbox {
-    border:  0;
-    padding: 0;
-}
-#message {
-    border:       2px 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-#textbox {
-    text-color: @foreground;
-}
-#listview {
-    fixed-height: 0;
-    border:       2px 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    false;
-    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;
-}
-#mode-switcher {
-    border:       2px 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-#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;
-}
-#inputbar {
-    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
-}
-#textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3em 0em 0em ;
-    text-color: @normal-foreground;
-}
diff --git a/User Themes/cloud.rasi b/User Themes/cloud.rasi
deleted file mode 100644
index ca43d61..0000000
--- a/User Themes/cloud.rasi	
+++ /dev/null
@@ -1,166 +0,0 @@
-/**Customized by Rapteon; Date: 2019-01-04**/
-
-/**
-	Hint:
-	Change the values in the first block of variables(below) before...
-	...individually changing values in the components.
-	
-	'lightfg' changes the border color and the text color.
-	'background-color' changes the background color of the floating box.
-	'selected-normal-background' changes the text-color of the focused item.
-	'lightbg' changes the highlight color of the list items.
-**/
-* {
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-active-foreground:  var(blackText);
-    lightfg:                     rgba ( 45, 49, 66, 100 % );
-    separatorcolor:              var(foreground);
-    urgent-foreground:           var(red);
-    alternate-urgent-background: var(lightbg);
-    lightbg:                     rgba ( 176, 215, 255, 100 % );
-    spacing:                     2;
-    border-color:                var(lightfg);
-    normal-background:           var(background);
-    background-color:            rgba ( 255, 255, 255, 100 % );
-    alternate-active-background: var(darkerBlue);
-    active-foreground:           var(lightfg);
-    blue:                        rgba ( 173, 172, 181, 100 % );
-    urgent-background:           var(background);
-    alternate-normal-foreground: var(foreground);
-    selected-active-background:  var(darkerBlue);
-    background:                  rgba ( 0, 0, 0, 0% );
-    selected-normal-foreground:  var(lightfg);
-    active-background:           var(background);
-    alternate-active-foreground: var(blackText);
-    alternate-normal-background: var(background);
-    foreground:                  rgba ( 45, 49, 66, 100 % );
-    selected-urgent-background:  var(red);
-    selected-urgent-foreground:  var(background);
-    normal-foreground:           var(foreground);
-    alternate-urgent-foreground: var(red);
-    selected-normal-background:  var(lightbg);
-    font:                        "DejaVu Sans 12";
-    blackText:			 rgba(0, 0, 0, 100 %);
-}
-window {
-    padding:          5;
-    background-color: var(background);
-    border:           2;
-    border-radius:    12px;
-    fullscreen:	      false;
-    transparency:     "screenshot";
-    width:            30%;
-}
-mainbox {
-    padding: 10;
-    border:  0;
-    border-radius: 10px;
-}
-message {
-    padding:      2px 0px 0px ;
-    border-color: var(separatorcolor);
-    border:       2px dash 0px 0px ;
-    width:        30%;
-    font:         "monospace bold 10";
-}
-textbox {
-    text-color: var(foreground);
-    border-radius:10px;
-    padding: 10px 10px 10px;
-}
-listview {
-    padding:      2px 0px 0px ;
-    scrollbar:    false;
-    border-color: var(separatorcolor);
-    spacing:      2px ;
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    lines:        5;
-}
-element {
-    padding: 1px ;
-    border:  0;
-}
-element normal.normal {
-    background-color: var(normal-background);
-    text-color:       var(normal-foreground);
-}
-element normal.urgent {
-    background-color: var(urgent-background);
-    text-color:       var(urgent-foreground);
-}
-element normal.active {
-    background-color: var(active-background);
-    text-color:       var(active-foreground);
-}
-element selected.normal {
-    background-color: var(selected-normal-background);
-    text-color:       var(selected-normal-foreground);
-}
-element selected.urgent {
-    background-color: var(selected-urgent-background);
-    text-color:       var(selected-urgent-foreground);
-}
-element selected.active {
-    background-color: var(selected-active-background);
-    text-color:       var(selected-active-foreground);
-}
-element alternate.normal {
-    background-color: var(alternate-normal-background);
-    text-color:       var(alternate-normal-foreground);
-}
-element alternate.urgent {
-    background-color: var(alternate-urgent-background);
-    text-color:       var(alternate-urgent-foreground);
-}
-element alternate.active {
-    background-color: var(alternate-active-background);
-    text-color:       var(alternate-active-foreground);
-}
-scrollbar {
-    width:        4px ;
-    padding:      0;
-    handle-width: 8px ;
-    border:       0;
-    handle-color: var(normal-foreground);
-}
-mode-switcher {
-    border-color: var(separatorcolor);
-    border:       2px dash 0px 0px ;
-}
-button {
-    spacing:    0;
-    text-color: var(normal-foreground);
-}
-button selected {
-    background-color: var(selected-normal-background);
-    text-color:       var(selected-normal-foreground);
-}
-inputbar {
-    padding:    1px ;
-    spacing:    0px ;
-    text-color: var(normal-foreground);
-    children:   [ prompt,textbox-prompt-colon,entry,overlay,case-indicator ];
-}
-case-indicator {
-    spacing:    0;
-    text-color: var(normal-foreground);
-}
-entry {
-    spacing:    0;
-    text-color: var(normal-foreground);
-}
-prompt {
-    spacing:    0;
-    text-color: var(normal-foreground);
-}
-textbox-prompt-colon {
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    expand:     false;
-    str:        " > ";
-    text-color: inherit;
-}
-error-message {
-    background-color: rgba ( 0, 0, 0, 0 % );
-    text-color:       var(normal-foreground);
-}
diff --git a/User Themes/flamingo.rasi b/User Themes/flamingo.rasi
deleted file mode 100644
index 35f9997..0000000
--- a/User Themes/flamingo.rasi	
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * User: keystroke3
- * Copyright: keystroke3
- *
- */
-
-configuration {
-	display-drun: "";
-	display-run: "";
-	display-window: "";
-	display-ssh: "~#";
-	show-icons: true;
-	sidebar-mode: false;
-	font: "Source Code Pro 15";
-}
-
-* {
-	text-color: @foreground;
-	active-background: rgb(170, 70, 104);
-	active-foreground: @foreground;
-	normal-background: @background;
-	normal-foreground: @foreground;
-	urgent-background: #9E2A5E;
-	urgent-foreground: @foreground;
-	alternate-active-background: @background;
-	alternate-active-foreground: @foreground;
-	alternate-normal-background: @background;
-	alternate-normal-foreground: @foreground;
-	alternate-urgent-background: @background;
-	alternate-urgent-foreground: @foreground;
-	selected-active-background: #9E2A5E;
-	selected-active-foreground: @foreground;
-	selected-normal-background: rgb(170, 70, 104);
-	selected-normal-foreground: #0c0816;
-	selected-urgent-background: #9D596B;
-	selected-urgent-foreground: @foreground;
-	background-color: #0c0816;
-	background: #D03C6E30;
-	foreground: #8fc5c6;
-	spacing: 0;
-}
-
-window {
-	location: west;
-	anchor: west;
-	height: 70%;
-	width: 25%;
-	orientation: vertical;
-	children: [mainbox];
-	border: 2px 2px 2px 0px;
-	border-color: @active-background;
-	hide-scrollbar: true;
-}
-
-mainbox {
-	spacing: 0.2em;
-	children: [inputbar, listview];
-}
-
-
-
-listview {
-	spacing: 0.6em;
-	dynamic: false;
-	cycle: true;
-	padding: 0px 5px 0px 5px;
-}
-
-inputbar {
-	border-radius: 50%;
-	padding: 5px;
-	border-spacing: 5px 0 0 0;
-	border: 1px;
-	spacing: 10px;
-	margin: 5px 0 10px;
-	border-color: @foreground;
-
-}
-
-entry{
-	padding: 2px;
-}
-
-
-prompt{
-	padding: 5px;
-	background-color: @foreground;
-	text-color: @background-color;
-	border: 1px;
-	border-radius: 50%;
-
-}
-
-
-element {
-	padding: 10px;
-	border-radius: 50%;
-}
-
-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;
-	border-color: @active-background;
-}
-
-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: @normal-background;
-	text-color: @normal-foreground;
-}
-
-element alternate.urgent {
-	background-color: @urgent-background;
-	text-color: @urgent-foreground;
-}
-
-element alternate.active {
-	background-color: @active-background;
-	text-color: @active-foreground;
-}
diff --git a/User Themes/flat-orange.rasi b/User Themes/flat-orange.rasi
index 5ab2f55..4171276 100644
--- a/User Themes/flat-orange.rasi	
+++ b/User Themes/flat-orange.rasi	
@@ -31,7 +31,7 @@ window {
 mainbox {
    background-color: @blackdarkest;
    spacing:0px;
-   children: [inputbar, message, mode-switcher, listview];
+   children: [inputbar, message, sidebar, listview];
 }
 
 message {
@@ -110,7 +110,7 @@ scrollbar {
    handle-width: 15px;
 }
 
-mode-switcher {
+sidebar {
    background-color: @blackwidget;
 }
 
diff --git a/User Themes/material.rasi b/User Themes/material.rasi
deleted file mode 100644
index c2a1b18..0000000
--- a/User Themes/material.rasi	
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * ROFI color theme
- *
- * Based on Base16 Material Color Scheme (https://github.com/ntpeters/base16-materialtheme-scheme)
- *
- * User: Tomaszal
- * Copyright: Tomas Zaluckij
- */
-
-* {
-	base00: #263238;
-	base01: #2E3C43;
-	base02: #314549;
-	base03: #546E7A;
-	base04: #B2CCD6;
-	base05: #EEFFFF;
-	base06: #EEFFFF;
-	base07: #FFFFFF;
-	base08: #F07178;
-	base09: #F78C6C;
-	base0A: #FFCB6B;
-	base0B: #C3E88D;
-	base0C: #89DDFF;
-	base0D: #82AAFF;
-	base0E: #C792EA;
-	base0F: #FF5370;
-
-	/*base0D: #00BCD4;*/
-
-	spacing: 0;
-	background-color: transparent;
-
-	font: "Roboto Mono 13";
-}
-
-window {
-	transparency: "real";
-	/*fullscreen: true;*/
-	background-color: #263238CC; /*base00 + CC (80% opacity)*/
-}
-
-mainbox {
-	children: [inputbar, message, mode-switcher, listview];
-	spacing: 30px;
-	/*margin: 20%;*/
-	padding: 30px 0;
-	border: 1px;
-	border-color: @base0D;
-}
-
-inputbar {
-	padding: 0 30px;
-	children: [prompt, textbox-prompt-colon, entry, case-indicator];
-}
-
-prompt {
-	text-color: @base0D;
-}
-
-textbox-prompt-colon {
-	expand: false;
-	str: ":";
-	margin: 0 1ch 0 0;
-	text-color: @base0D;
-}
-
-entry {
-	text-color: @base07;
-}
-
-case-indicator {
-	text-color: @base0F;
-}
-
-mode-switcher, message {
-	border: 1px 0;
-	border-color: @base0D;
-}
-
-button, textbox {
-	background-color: @base03;
-	text-color: @base07;
-	padding: 5px;
-}
-
-button selected {
-	background-color: @base0D;
-}
-
-listview {
-	scrollbar: true;
-	margin: 0 10px 0 30px;
-}
-
-scrollbar {
-	background-color: @base03;
-	handle-color: @base0D;
-	handle-width: 10px;
-	border: 0 1px;
-	border-color: @base0D;
-	margin: 0 0 0 20px;
-}
-
-element {
-	padding: 5px;
-	highlight: bold underline;
-}
-
-element normal {
-	background-color: transparent;
-}
-
-element selected {
-	background-color: @base0D;
-}
-
-element alternate {
-	/*background-color: @base03;*/
-}
-
-element normal normal, element selected normal, element alternate normal {
-	text-color: @base07;
-}
-
-element normal urgent, element selected urgent, element alternate urgent {
-	text-color: @base0F;
-}
-
-element normal active, element selected active, element alternate active {
-	text-color: @base0B;
-}
diff --git a/User Themes/merah.rasi b/User Themes/merah.rasi
deleted file mode 100644
index 23ac38f..0000000
--- a/User Themes/merah.rasi	
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ================================================
-// theme name : merah
-// by : ipang-dwi - www.firstplato.com
-// based on the Purple official rofi theme
-// ================================================ */
-
-* {
-    font: "Ubuntu Mono Reguler 11";
-    foreground: #f8f8f2;
-    background-color: #282a36;
-    active-background: #b00000;
-    urgent-background: #ff5555;
-    selected-background: @active-background;
-    selected-urgent-background: @urgent-background;
-    selected-active-background: @active-background;
-    separatorcolor: @active-background;
-    bordercolor: @active-background;
-}
-
-#window {
-    background-color: @background;
-    border:           1;
-    border-radius: 6;
-    border-color: @bordercolor;
-    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: @bordercolor;
-    spacing:      2px ;
-    scrollbar:    false;
-    padding:      2px 0px 0px ;
-}
-#element {
-    border:  0;
-    padding: 1px ;
-}
-#element.normal.normal {
-    background-color: @background;
-    text-color:       @foreground;
-}
-#element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-#element.normal.active {
-    background-color: @active-background;
-    text-color:       @foreground;
-}
-#element.selected.normal {
-    background-color: @selected-background;
-    text-color:       @foreground;
-}
-#element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @foreground;
-}
-#element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @foreground;
-}
-#element.alternate.normal {
-    background-color: @background;
-    text-color:       @foreground;
-}
-#element.alternate.urgent {
-    background-color: @urgent-background;
-    text-color:       @foreground;
-}
-#element.alternate.active {
-    background-color: @active-background;
-    text-color:       @foreground;
-}
-#scrollbar {
-    width:        2px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-#sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-#button.selected {
-    background-color: @selected-background;
-    text-color:       @foreground;
-}
-#inputbar {
-    spacing:    0;
-    text-color: @foreground;
-    padding:    1px ;
-}
-#case-indicator {
-    spacing:    0;
-    text-color: @foreground;
-}
-#entry {
-    spacing:    0;
-    text-color: @foreground;
-}
-#prompt {
-    spacing:    0;
-    text-color: @foreground;
-}
-#inputbar {
-    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
-}
-#textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3em 0em 0em ;
-    text-color: @foreground;
-}
diff --git a/User Themes/onedark.rasi b/User Themes/onedark.rasi
deleted file mode 100644
index 51e3774..0000000
--- a/User Themes/onedark.rasi	
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * ROFI One Dark
- *
- * Based on OneDark.vim (https://github.com/joshdick/onedark.vim)
- *
- * Author: Benjamin Stauss
- * User: me-benni
- *
- */
-
-
-* {
-  black:      #000000;
-  red:        #eb6e67;
-  green:      #95ee8f;
-  yellow:     #f8c456;
-  blue:       #6eaafb;
-  mangenta:   #d886f3;
-  cyan:       #6cdcf7;
-  purple:     #985EFF;
-  emphasis:   #50536b;
-  text:       #dfdfdf;
-  text-alt:   #b2b2b2;
-  fg:         #abb2bf;
-  bg:         #282c34;
-
-  spacing: 0;
-  background-color: transparent;
-
-  font: "Knack Nerd Font 14";
-  text-color: @text;
-}
-
-window {
-  transparency: "real";
-  fullscreen: true;
-  background-color: #282c34dd;
-}
-
-mainbox {
-  padding: 30% 30%;
-}
-
-inputbar {
-  margin: 0px 0px 20px 0px;
-  children: [prompt, textbox-prompt-colon, entry, case-indicator];
-}
-
-prompt {
-  text-color: @blue;
-}
-
-textbox-prompt-colon {
-  expand: false;
-  str: ":";
-  text-color: @text-alt;
-}
-
-entry {
-  margin: 0px 10px;
-}
-
-listview {
-  spacing: 5px;
-  dynamic: true;
-  scrollbar: false;
-}
-
-element {
-  padding: 5px;
-  text-color: @text-alt;
-  highlight: bold #95ee8f; /* green */
-  border-radius: 3px;
-}
-
-element selected {
-  background-color: @emphasis;
-  text-color: @text;
-}
-
-element urgent, element selected urgent {
-  text-color: @red;
-}
-
-element active, element selected active {
-  text-color: @purple;
-}
-
-message {
-  padding: 5px;
-  border-radius: 3px;
-  background-color: @emphasis;
-  border: 1px;
-  border-color: @cyan;
-}
-
-button selected {
-  padding: 5px;
-  border-radius: 3px;
-  background-color: @emphasis;
-}
diff --git a/User Themes/oxide.rasi b/User Themes/oxide.rasi
index 028916f..26081ec 100644
--- a/User Themes/oxide.rasi	
+++ b/User Themes/oxide.rasi	
@@ -105,7 +105,7 @@ scrollbar {
     handle-width: 8px;
     padding:      0;
 }
-mode-switcher {
+sidebar {
     border:       2px dash 0px 0px;
     border-color: @separatorcolor;
 }
diff --git a/User Themes/rezlooks.rasi b/User Themes/rezlooks.rasi
deleted file mode 100644
index 44bc933..0000000
--- a/User Themes/rezlooks.rasi	
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * ROFI Color theme
- * User: thorsten
- * Inspired by the rezlooks gtk theme
- */
-* {
-    selected-normal-foreground:  rgba ( 245, 245, 245, 100 % );
-    foreground:                  #3d3d3d;
-    normal-foreground:           @foreground;
-    textbox-background:          rgba( 255, 255, 255, 95% );
-    alternate-normal-background: rgba ( 150, 150, 150, 20%) ;
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 245, 245, 245, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 215, 95, 0, 100 % );
-    alternate-urgent-background: rgba ( 208, 208, 208, 100 % );
-    active-foreground:           #2D661A ;
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 245, 245, 245, 100 % );
-    alternate-active-background: rgba ( 208, 208, 208, 100 % );
-    /*background:                  rgba ( 245, 245, 245, 100 % ); */
-    background:                  #F2F2F2;
-    alternate-normal-foreground: @foreground;
-    dark-border-color:           #8C836E;
-    normal-background:           transparent;
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 152, 177, 127, 100 % );
-    border-color:                rgba ( 80, 80,80, 100%) ;
-    spacing:                     2;
-    separatorcolor:               #D3C8AE;
-    urgent-background:           rgba ( 245, 245, 245, 100 % );
-    selected-urgent-background:  rgba ( 215, 95, 0, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            transparent;
-    alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 245, 245, 245, 100 % );
-    selected-active-background:  #2B591C;
-    font: "Bitstream Vera Sans 8";
-    monospace: "Bitstream Vera Sans Mono 8";
-}
-
-#window {
-    background-color: transparent;
-    border:           1;
-    padding:          0px;
-    spacing: 0;
-    children: [ windowinnerborder ];
-}
-
-#windowinnerborder {
-    border: 3px;
-    border-color: #789C54;
-    children: [ tabcontent ];
-}
-
-#tabcontent {
-    children: [ topborder, mode-switcher, mainbox ];
-    background-color: transparent;
-    spacing: 0;
-    border: 8px;
-    border-color: @background;
-    padding: 0px;
-}
-
-#topborder {
-    border-color: @dark-border-color;
-    expand: false;
-    border: 1px 0px 0px 0px;
-    height: 0px;
-}
-
-#mainbox {
-    background-color: transparent;
-    border:  0;
-    padding: 0px 8px 8px 8px;
-    spacing: 0px;
-    children:   [ inputbarBorder, message, listviewBorder ];
-    margin: 0px;
-    padding: 0px;
-    border: 0px 1px 1px 1px;
-    border-color: @dark-border-color;
-}
-
-#inputbarBorder {
-    border: 8px;
-    border-color: @background;
-    children: [ inputbar ];
-    expand: false;
-}
-
-#listviewBorder {
-    border: 0px 8px 8px 8px;
-    border-color: @background;
-    children: [ listview ];
-    expand: false;
-}
-
-#message {
-    padding:      3px ;
-    border: 0px 8px 8px 8px;
-    border-color: @background;
-    background-color: @background;
-}
-
-#textbox {
-    text-color: @foreground;
-    font: @monospace;
-}
-#listview {
-    fixed-height: 0;
-    border:       1px;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px ;
-    background-color: @textbox-background;
-}
-#element {
-    border:  0;
-    padding: 3px ;
-    font: @monospace;
-}
-#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;
-}
-#mode-switcher {
-    border:       0px 0px 0px 1px;
-    border-color: @dark-border-color;
-    spacing: 0px;
-    padding: 0px 0px 0px 0px;
-}
-#button {
-    margin: 0px 0px 0px 0px;
-    background-color: #DBDBDB;
-    border: 0px 1px 1px 0px;
-    border-color: @dark-border-color;
-    padding: 8px 0px 8px 0px;
-}
-
-#button.selected {
-    margin: 0px 0px 0px 0px;
-    border: 3px 1px 0px 0px;
-    background-color: @background;
-    text-color:       #212121;
-    border-color: @dark-border-color;
-}
-#inputbar {
-    spacing:    0px;
-    text-color: @normal-foreground;
-    padding:    0px ;
-    border-color: @separatorcolor;
-    border: 1px;
-    background-color: transparent;
-}
-
-#case-indicator { padding: 2px; }
-#prompt { padding: 2px 6px; }
-#entry { padding: 2px 6px; }
-
-#case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-    background-color: @textbox-background;
-}
-#entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-    background-color: @textbox-background;
-}
-#prompt {
-    spacing:    0;
-    background-color: @background ;
-    text-color: @normal-foreground;
-    border: 0px 1px 0px 0px;
-    border-color: @separatorcolor;
-    text: @monospace;
-    highlight: bold red;
-}
-#inputbar {
-    children:   [ prompt,entry,case-indicator ];
-}
-
-// vim: ft=css
diff --git a/User Themes/ribbon.rasi b/User Themes/ribbon.rasi
deleted file mode 100644
index 26ac162..0000000
--- a/User Themes/ribbon.rasi	
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * ROFI Color theme
- * User: Rokit
-*/
-
-* {
-  base-bg: #d9d6b7ee;
-  selected-bg: #f7f0ac;
-  base-color: #222222aa;
-  selected-color: #222;
-  border-color: #00000066;
-  transparent: #00000000;
-  text-color: @base-color;
-  font: "Times New Roman 20";
-}
-#window {
-  anchor: south;
-  location: south;
-  width: 100%;
-  background-color: @base-bg;
-  margin: 0px 0px 10% 0px;
-  children: [ horibox ];
-}
-#horibox {
-  background-color: @transparent;
-  orientation: horizontal;
-  children: [ prompt, textbox-prompt-colon, entry, listview ];
-}
-#prompt {
-  text-color: @selected-color;
-  padding: 0.7em 0px 0.7em 10px;
-  background-color: @transparent;
-}
-#textbox-prompt-colon  {
-  expand: false;
-  str: ":";
-  padding: 0.7em 10px 0.7em 0px;
-  text-color: @selected-color;
-  background-color: @transparent;
-}
-#entry {
-  padding: 0.7em;
-  text-color: @selected-color;
-  background-color: #eee;
-  expand: false;
-  width: 10em;
-}
-#listview {
-  background-color: @transparent;
-  layout: horizontal;
-  spacing: 5px;
-  lines: 100;
-}
-#element {
-  background-color: @transparent;
-  padding: 0.7em;
-}
-#element selected {
-  border: 0px 1px;
-  text-color: @selected-color;
-  background-color: @selected-bg;
-}
diff --git a/User Themes/sidetab-adapta.rasi b/User Themes/sidetab-adapta.rasi
deleted file mode 100644
index 84d0295..0000000
--- a/User Themes/sidetab-adapta.rasi	
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * sidetab-adapta theme,
- * based on sidetab theme by deadguy.
- *
- * This theme has been dedicated to the public domain.
- *
- */
-
-configuration {
-        show-icons:   true;
-        sidebar-mode: true;
-}
-
-* {
-        background-color:           #222d32;
-        text-color:                 #ffffff;
-
-        accent-color:               #00bcd4;
-        accent2-color:              #4db6ac;
-        hover-color:                #39454b;
-        urgent-color:               #ff5252;
-        window-color:               #ffffff;
-
-        selected-normal-foreground: @window-color;
-        normal-foreground:          @text-color;
-        selected-normal-background: @hover-color;
-        normal-background:          @background-color;
-
-        selected-urgent-foreground: @background-color;
-        urgent-foreground:          @text-color;
-        selected-urgent-background: @urgent-color;
-        urgent-background:          @background-color;
-
-        selected-active-foreground: @window-color;
-        active-foreground:          @text-color;
-        selected-active-background: @hover-color;
-        active-background:          @accent-color;
-}
-
-#window {
-        anchor:   west;
-        location: west;
-        width:    384px;
-        height:   100%;
-}
-
-#mainbox {
-        children: [ entry, listview, mode-switcher ];
-}
-
-entry {
-        expand: false;
-        margin: 8px;
-}
-
-element {
-        padding: 8px;
-}
-
-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;
-        border:           0 4px solid 0 0;
-        border-color:     @accent2-color;
-}
-
-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: @normal-background;
-        text-color:       @normal-foreground;
-}
-
-element alternate.urgent {
-        background-color: @urgent-background;
-        text-color:       @urgent-foreground;
-}
-
-element alternate.active {
-        background-color: @active-background;
-        text-color:       @active-foreground;
-}
-
-button {
-        padding: 8px;
-}
-
-button selected {
-        background-color: @active-background;
-        text-color:       @background-color;
-}
-
-/* vim: ft=css
diff --git a/User Themes/sidetab.rasi b/User Themes/sidetab.rasi
index 693dbc4..4cc6db4 100644
--- a/User Themes/sidetab.rasi	
+++ b/User Themes/sidetab.rasi	
@@ -1,59 +1,48 @@
-/**
+/*******************************************************************************
+ * ROFI Color theme
  * User: deadguy
  * Copyright: deadguy
- */
-
-configuration {
-	display-drun:    "Activate";
-	display-run:     "Execute";
-	display-window:  "Window";
-	show-icons:      true;
-	sidebar-mode:    true;
-}
+*******************************************************************************/
 
 * {
-	background-color:            #080808;
-	text-color:                  #d3d7cf;
-	selbg:                       #215d9c;
-	actbg:                       #262626;
-	urgbg:                       #e53935;
-	winbg:			     #26c6da;
+    background-color:            #080808;
+    text-color:                  #d3d7cf;
+    selbg:                       #215d9c;
+    actbg:                       #262626;
+    urgbg:                       #e53935;
+    winbg:                       #26c6da;
 
-	selected-normal-foreground:  @winbg;
-	normal-foreground:           @text-color;
-	selected-normal-background:  @actbg;
-	normal-background:           @background-color;
+    selected-normal-foreground:  @winbg;
+    normal-foreground:           @text-color;
+    selected-normal-background:  @actbg;
+    normal-background:           @background-color;
 
-	selected-urgent-foreground:  @background-color;
-	urgent-foreground:           @text-color;
-	selected-urgent-background:  @urgbg;
-	urgent-background:           @background-color;
+    selected-urgent-foreground:  @background-color;
+    urgent-foreground:           @text-color;
+    selected-urgent-background:  @urgbg;
+    urgent-background:           @background-color;
 
-	selected-active-foreground:  @winbg;
-	active-foreground:           @text-color;
-	selected-active-background:  @actbg;
-	active-background:           @selbg;
+    selected-active-foreground:  @winbg;
+    active-foreground:           @text-color;
+    selected-active-background:  @actbg;
+    active-background:           @selbg;
 
-	line-margin:                 2;
-	line-padding:                2;
-	separator-style:             "none";
-	hide-scrollbar:              "true";
-	margin:                      0;
-	padding:                     0;
+   margin:                       0;
+   padding:                      0;
 }
 
 window {
-	location:	 west;
-	anchor:		 west;
-	height:		 100%;
-	width:		 22%;
+	location:    west;
+	anchor:      west;
+	height:      100%;
+	width:       22%;
 	orientation: horizontal;
-	children:	 [mainbox];
+	children:    [mainbox];
 }
 
 mainbox {
 	spacing:  0.8em;
-	children: [ entry,listview,mode-switcher ];
+	children: [ entry,listview,sidebar ];
 }
 
 button { padding: 5px 2px; }
@@ -84,48 +73,50 @@ entry {
 }
 
 element normal.normal {
-	background-color: @normal-background;
-	text-color:       @normal-foreground;
+  background-color: @normal-background;
+  text-color:       @normal-foreground;
 }
 
 element normal.urgent {
-	background-color: @urgent-background;
-	text-color:       @urgent-foreground;
+  background-color: @urgent-background;
+  text-color:       @urgent-foreground;
 }
 
 element normal.active {
-	background-color: @active-background;
-	text-color:       @active-foreground;
+    background-color: @active-background;
+    text-color:       @active-foreground;
 }
 
 element selected.normal {
-	background-color: @selected-normal-background;
-	text-color:       @selected-normal-foreground;
-	border:           0 5px solid 0 0;
-	border-color:	    @active-background;
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+	border:			  0 5px solid 0 0;
+	border-color:	  @active-background;
 }
 
 element selected.urgent {
-	background-color: @selected-urgent-background;
-	text-color:       @selected-urgent-foreground;
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
 }
 
 element selected.active {
-	background-color: @selected-active-background;
-	text-color:       @selected-active-foreground;
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
 }
 
 element alternate.normal {
-	background-color: @normal-background;
-	text-color:       @normal-foreground;
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
 }
 
 element alternate.urgent {
-	background-color: @urgent-background;
-	text-color:       @urgent-foreground;
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
 }
 
 element alternate.active {
-	background-color: @active-background;
-	text-color:       @active-foreground;
+    background-color: @active-background;
+    text-color:       @active-foreground;
 }
+
+/* vim:ft=css */
diff --git a/User Themes/slate.rasi b/User Themes/slate.rasi
deleted file mode 100644
index d6d29b3..0000000
--- a/User Themes/slate.rasi	
+++ /dev/null
@@ -1,43 +0,0 @@
-* {
-  background-color: #282C33;
-  border-color: #2e343f;
-  text-color: #8ca0aa;
-  spacing: 0;
-  width: 512px;
-}
-
-inputbar {
-  border: 0 0 1px 0;
-  children: [prompt,entry];
-}
-
-prompt {
-  padding: 16px;
-  border: 0 1px 0 0;
-}
-
-textbox {
-  background-color: #2e343f;
-  border: 0 0 1px 0;
-  border-color: #282C33;
-  padding: 8px 16px;
-}
-
-entry {
-  padding: 16px;
-}
-
-listview {
-  cycle: false;
-  margin: 0 0 -1px 0;
-  scrollbar: false;
-}
-
-element {
-  border: 0 0 1px 0;
-  padding: 16px;
-}
-
-element selected {
-  background-color: #2e343f;
-}
\ No newline at end of file
diff --git a/User Themes/solarized-darker.rasi b/User Themes/solarized-darker.rasi
index 6381958..041c6c1 100644
--- a/User Themes/solarized-darker.rasi	
+++ b/User Themes/solarized-darker.rasi	
@@ -130,7 +130,7 @@ scrollbar {
     handle-width: 8px ;
     padding:      0;
 }
-mode-switcher {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 3ae4e62..0000000
--- a/install.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-xdg=${XDG_DATA_HOME:-${HOME}/.local/share}
-DIRECTORY="${xdg}/rofi/themes/"
-
-if [ ! -d "${DIRECTORY}" ]
-then
-    echo "Creating theme directory: ${DIRECTORY}"
-    mkdir -p "${DIRECTORY}"
-fi
-
-declare -i ia=0
-for themefile in **/*.rasi 
-do
-    if [ -f "${themefile}" ] && [ ${ia} -eq 0 ]
-    then
-        echo "Theme '${themefile}' exists, overwrite? y/N/a(ll)"
-        read answer
-        if [ x$answer = x"y" ]
-        then
-            echo "+Installing '${themefile}'"
-            install "${themefile}" "${DIRECTORY}"
-        elif [ x${answer} = x"a" ]
-        then
-            ia=1
-            echo "+Installing '${themefile}'"
-            install "${themefile}" "${DIRECTORY}"
-        else
-            echo "+Skipping ${themefile}"
-        fi 
-    else
-            echo "+Installing '${themefile}'"
-            install "${themefile}" "${DIRECTORY}"
-    fi
-done