diff --git a/Official Themes/Adapta-Nokto.rasi b/Official Themes/Adapta-Nokto.rasi
index bc69bb1..4d4fb43 100644
--- a/Official Themes/Adapta-Nokto.rasi	
+++ b/Official Themes/Adapta-Nokto.rasi	
@@ -107,7 +107,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Arc-Dark.rasi b/Official Themes/Arc-Dark.rasi
index 5f5cf39..b134520 100644
--- a/Official Themes/Arc-Dark.rasi	
+++ b/Official Themes/Arc-Dark.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Arc.rasi b/Official Themes/Arc.rasi
index 7d06575..0368224 100644
--- a/Official Themes/Arc.rasi	
+++ b/Official Themes/Arc.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/DarkBlue.rasi b/Official Themes/DarkBlue.rasi
index ef073f3..b9165ee 100644
--- a/Official Themes/DarkBlue.rasi	
+++ b/Official Themes/DarkBlue.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Indego.rasi b/Official Themes/Indego.rasi
index 5381a0a..2c3e75f 100644
--- a/Official Themes/Indego.rasi	
+++ b/Official Themes/Indego.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Monokai.rasi b/Official Themes/Monokai.rasi
index c8d3c5f..201b593 100644
--- a/Official Themes/Monokai.rasi	
+++ b/Official Themes/Monokai.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Paper.rasi b/Official Themes/Paper.rasi
index 41f4f41..532c771 100644
--- a/Official Themes/Paper.rasi	
+++ b/Official Themes/Paper.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/Pop-Dark.rasi b/Official Themes/Pop-Dark.rasi
index 81425fa..a187414 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;
 }
-#sidebar {
+#mode-switcher {
     border: 1px dash 0px 0px ;
 }
 #button selected {
diff --git a/Official Themes/android_notification.rasi b/Official Themes/android_notification.rasi
index 856da89..aae77fd 100644
--- a/Official Themes/android_notification.rasi	
+++ b/Official Themes/android_notification.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/arthur.rasi b/Official Themes/arthur.rasi
index db57659..233e052 100644
--- a/Official Themes/arthur.rasi	
+++ b/Official Themes/arthur.rasi	
@@ -78,7 +78,7 @@ configuration {
     color: @magenta;
     background-color: @transparent;
     spacing: 0;
-    children:  [vertb, mainbox];
+    children:  [mainbox];
     orientation: horizontal;
 }
 
@@ -164,13 +164,13 @@ configuration {
 
 #vertb {
     expand: false;
-    children: [ dummy0, sidebar, dummy1  ];
+    children: [ dummy0, mode-switcher, dummy1  ];
 }
 #dummy0,  dummy1 {
     expand: true;
 }
 
-#sidebar {
+#mode-switcher {
     expand: false;
     orientation: vertical;
     spacing: 0px;
diff --git a/Official Themes/blue.rasi b/Official Themes/blue.rasi
index 17cbdfc..893781b 100644
--- a/Official Themes/blue.rasi	
+++ b/Official Themes/blue.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/c64.rasi b/Official Themes/c64.rasi
index ef99ba4..f921026 100644
--- a/Official Themes/c64.rasi	
+++ b/Official Themes/c64.rasi	
@@ -109,7 +109,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/dmenu.rasi b/Official Themes/dmenu.rasi
index 40f3bda..0b23ea2 100644
--- a/Official Themes/dmenu.rasi	
+++ b/Official Themes/dmenu.rasi	
@@ -10,9 +10,6 @@
     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 fa46e08..39a9a38 100644
--- a/Official Themes/glue_pro_blue.rasi	
+++ b/Official Themes/glue_pro_blue.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/lb.rasi b/Official Themes/lb.rasi
index bbbec82..66ea9d0 100644
--- a/Official Themes/lb.rasi	
+++ b/Official Themes/lb.rasi	
@@ -106,7 +106,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/paper-float.rasi b/Official Themes/paper-float.rasi
index d9b62c7..bc1940c 100644
--- a/Official Themes/paper-float.rasi	
+++ b/Official Themes/paper-float.rasi	
@@ -106,7 +106,7 @@
     background-color: #F5F5F500;
 }
 
-#sidebar {
+#mode-switcher {
     border: 2px;
     padding: 0.5em 1em;
     background-color: @grey;
diff --git a/Official Themes/purple.rasi b/Official Themes/purple.rasi
index f85e657..d4b1ffd 100644
--- a/Official Themes/purple.rasi	
+++ b/Official Themes/purple.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/sidebar.rasi b/Official Themes/sidebar.rasi
index 1d71a9b..51b406b 100644
--- a/Official Themes/sidebar.rasi	
+++ b/Official Themes/sidebar.rasi	
@@ -42,24 +42,18 @@
     highlight:     bold #ffffff;
 }
 #window {
-    fullscreen: true;
+    height:   100%;
+    width: 30em;
     location: west;
     anchor:   west;
     border:  0px 2px 0px 0px;
     text-color: @lightwhite;
-
-    orientation: horizontal;
-    children: [mainbox, dummy];
 }
 
-#dummy {
-    expand: true;
-}
-
-#sidebar {
+#mode-switcher {
     border: 2px 0px 0px 0px;
     background-color: @lightblack;
-    padding: 10px;
+    padding: 4px;
 }
 #button selected {
     border-color: @lightgreen;
@@ -75,7 +69,7 @@
     border: 0px 0px 2px 0px;
 }
 #mainbox {
-    expand: false;
+    expand: true;
     background-color: #1c1c1cee;
     spacing: 1em;
 }
diff --git a/Official Themes/solarized.rasi b/Official Themes/solarized.rasi
index 34ce0b1..340471e 100644
--- a/Official Themes/solarized.rasi	
+++ b/Official Themes/solarized.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
diff --git a/Official Themes/solarized_alternate.rasi b/Official Themes/solarized_alternate.rasi
index 886248c..456ef30 100644
--- a/Official Themes/solarized_alternate.rasi	
+++ b/Official Themes/solarized_alternate.rasi	
@@ -105,7 +105,7 @@
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+#mode-switcher {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }