diff --git a/User Themes/fancy.rasi b/User Themes/fancy.rasi
index 177abb5..180116b 100644
--- a/User Themes/fancy.rasi	
+++ b/User Themes/fancy.rasi	
@@ -4,7 +4,7 @@
  */
 
 /* global settings and color variables */
-* { 
+* {
     blue:        #A7c6E2;
     blue-trans:  #A7c6e2aa;
     darkblue:    #005F87;
@@ -27,22 +27,22 @@
     line-style: "none";
 }
 
-#prompt-box {
+prompt-box {
 	background-color: transparent;
 }
 
-#prompt {
+prompt {
 	background-color: transparent;
 	text-color: @white;
 }
 
-#window {
+window {
     border-radius: 10px;
     background-color: @transparent;
     border: 2;
     color: @grey;
 }
-#mainbox {
+mainbox {
     padding: 0px;
     background-color: @blue-trans;
     color: @grey;
@@ -50,13 +50,13 @@
     spacing: 0%;
 }
 
-#listview {
+listview {
     // Looks.
     border-radius: 10px;
     border: 5px 5px 5px 5px;
     padding: 20px 20px 20px 20px;
     margin: 20px 30px 30px 30px;
-    background-color: @orange; 
+    background-color: @orange;
     // Enable scrollbar
     scrollbar: false;
     scrollbar-width: 5px;
@@ -64,58 +64,57 @@
     reverse: false;
     color: #000000;
     spacing: 0.3em;
-
 }
-#scrollbar {
+scrollbar {
     color: @black;
     background-color: @blue;
     padding: 1px;
 }
-#element {
+element {
     border: 0px;
     padding: 0px;
     margin: 0px;
     color: @black;
     background-color: @blue;
 }
-#element.normal.normal {
+element normal.normal {
     color: @black;
     background-color: @orange;
 }
-#element.normal.urgent {
+element normal.urgent {
     color: @urgent;
     background-color: @light-grey;
 }
-#element.normal.active {
+element normal.active {
     color: @active;
     background-color: @light-grey;
 }
-#element.selected.normal {
+element selected.normal {
     border-radius: 0px;
     color: @black;
     background-color: @dark-orange;
 }
-#element.selected.urgent {
+element selected.urgent {
     color: @light-grey;
     background-color: @urgent;
 }
-#element.selected.active {
+element selected.active {
     color: @light-grey;
     background-color: @active;
 }
-#element.alternate.normal {
+element alternate.normal {
     color: @black;
     background-color: @orange;
 }
-#element.alternate.urgent {
+element alternate.urgent {
     color: @urgent;
     background-color: @medium-grey;
 }
-#element.alternate.active {
+element alternate.active {
     color: @active;
     background-color: @medium-grey;
 }
-#inputbar {
+inputbar {
     spacing: 0;
     background-color: #88003300;
     border: 0px 0px 2px 0px;
@@ -126,27 +125,27 @@
     end: false;
 }
 
-#separator {
+separator {
     background-color: @blue;
     color: #00000000;
 }
-#prompt.normal.normal {
+prompt normal.normal {
     background-color: #00000000;
     color: #ffffff;
     padding: 0px;
 }
-#entry.normal.normal {
+entry normal.normal {
     background-color: #00000000;
     color: #ffffff;
     padding: 0px;
 }
-#case-indicator.normal.normal {
+case-indicator normal.normal {
     background-color: #00000000;
     color: #ffffff;
     padding: 0px;
 }
-    
-#message {                                    
+
+message {
 	margin: 30px 30px 30px 30px;
 	padding: 20px 30px 20px 20px;
     padding:      1px ;
@@ -154,7 +153,7 @@
     border: 5px 5px 5px 5px;
 }
 
-#prompt-colon {
+prompt-colon {
     spacing:    0;
     enabled: false;
 }
diff --git a/User Themes/flat-orange.rasi b/User Themes/flat-orange.rasi
index ed70d39..4171276 100644
--- a/User Themes/flat-orange.rasi	
+++ b/User Themes/flat-orange.rasi	
@@ -21,30 +21,30 @@
    background-color: @blackdarkest;
 }
 
-#window {
+window {
    background-color: @blackdarkest;
    anchor: north;
    location: north;
    y-offset: 20%;
 }
 
-#mainbox {
+mainbox {
    background-color: @blackdarkest;
    spacing:0px;
    children: [inputbar, message, sidebar, listview];
 }
 
-#message {
+message {
    padding: 6px 10px;
    background-color:@blackwidget;
 }
 
-#textbox {
+textbox {
    text-color:@darkgray;
    background-color:@blackwidget;
 }
 
-#listview {
+listview {
    fixed-height: false;
    dynamic: true;
    scrollbar: true;
@@ -54,94 +54,93 @@
    background: @blackdarkest;
 }
 
-#element {
+element {
    padding: 2px 15px;
 }
 
-#element.normal.normal {
+element normal.normal {
    padding: 0px 15px;
    background-color: @blackentry;
    text-color: @fgwhite;
 }
 
-#element.normal.urgent {
+element normal.urgent {
    background-color: @blackentry;
    text-color: @urgentcolor;
 }
 
-#element.normal.active {
+element normal.active {
    background-color: @blackentry;
    text-color: @maincolor;
 }
 
-#element.selected.normal {
+element selected.normal {
     background-color: @blackselect;
     text-color:       @fgwhite;
 }
 
-#element.selected.urgent {
+element selected.urgent {
     background-color: @urgentcolor;
     text-color:       @blackdarkest;
 }
 
-#element.selected.active {
+element selected.active {
     background-color: @maincolor;
     text-color:       @blackdarkest;
 }
 
-#element.alternate.normal {
+element alternate.normal {
     background-color: @blackentry;
     text-color:       @fgwhite;
 }
 
-#element.alternate.urgent {
+element alternate.urgent {
     background-color: @blackentry;
     text-color:       @urgentcolor;
 }
 
-#element.alternate.active {
+element alternate.active {
     background-color: @blackentry;
     text-color:       @maincolor;
 }
 
-#scrollbar {
+scrollbar {
    background-color: @blackwidget;
    handle-color: @darkgray;
    handle-width: 15px;
 }
 
-#sidebar {
+sidebar {
    background-color: @blackwidget;
 }
 
-#button {
+button {
    background-color: @blackwidget;
    text-color:       @darkgray;
 }
 
-
-#button.selected {
+button selected {
     text-color:       @maincolor;
 }
 
-#inputbar {
+inputbar {
    background-color: @blackdarkest;
    spacing: 0px;
 }
 
-#prompt {
+prompt {
    padding:6px 9px;
    background-color: @maincolor;
    text-color:@blackwidget;
 }
 
-#entry {
+entry {
    padding:6px 10px;
    background-color:@blackwidget;
    text-color:@fgwhite;
 }
 
-#case-indicator {
+case-indicator {
    padding:6px 10px;
    text-color:@maincolor;
    background-color:@blackwidget;
diff --git a/User Themes/sidetab.rasi b/User Themes/sidetab.rasi
index 5bfd09a..4cc6db4 100644
--- a/User Themes/sidetab.rasi	
+++ b/User Themes/sidetab.rasi	
@@ -31,7 +31,7 @@
    padding:                      0;
 }
 
-#window {
+window {
 	location:    west;
 	anchor:      west;
 	height:      100%;
@@ -40,81 +40,81 @@
 	children:    [mainbox];
 }
 
-#mainbox {
+mainbox {
 	spacing:  0.8em;
 	children: [ entry,listview,sidebar ];
 }
 
-#button { padding: 5px 2px; }
+button { padding: 5px 2px; }
 
-#button selected {
+button selected {
 	background-color: @active-background;
 	text-color:       @background-color;
 }
 
-#inputbar {
+inputbar {
 	padding: 5px;
 	spacing: 5px;
 }
 
-#listview {
+listview {
 	spacing: 0.5em;
 	dynamic: false;
 	cycle:   true;
 }
 
-#element { padding: 10px; }
+element { padding: 10px; }
 
-#entry {
+entry {
 	expand:         false;
 	text-color:     @normal-foreground;
 	vertical-align: 1;
 	padding:        5px;
 }
 
-#element.normal.normal {
+element normal.normal {
   background-color: @normal-background;
   text-color:       @normal-foreground;
 }
 
-#element.normal.urgent {
+element normal.urgent {
   background-color: @urgent-background;
   text-color:       @urgent-foreground;
 }
 
-#element.normal.active {
+element normal.active {
     background-color: @active-background;
     text-color:       @active-foreground;
 }
 
-#element.selected.normal {
+element selected.normal {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 	border:			  0 5px solid 0 0;
 	border-color:	  @active-background;
 }
 
-#element.selected.urgent {
+element selected.urgent {
     background-color: @selected-urgent-background;
     text-color:       @selected-urgent-foreground;
 }
 
-#element.selected.active {
+element selected.active {
     background-color: @selected-active-background;
     text-color:       @selected-active-foreground;
 }
 
-#element.alternate.normal {
+element alternate.normal {
     background-color: @normal-background;
     text-color:       @normal-foreground;
 }
 
-#element.alternate.urgent {
+element alternate.urgent {
     background-color: @urgent-background;
     text-color:       @urgent-foreground;
 }
 
-#element.alternate.active {
+element alternate.active {
     background-color: @active-background;
     text-color:       @active-foreground;
 }
diff --git a/User Themes/solarized-darker.rasi b/User Themes/solarized-darker.rasi
index 26e9700..041c6c1 100644
--- a/User Themes/solarized-darker.rasi	
+++ b/User Themes/solarized-darker.rasi	
@@ -5,8 +5,8 @@
  ******************************************************************************/
 
 * {
-    /**** Solarized colors **** 
-    * NOTE: I am including all of them even though I am using a sub-set. I keep 
+    /**** Solarized colors ****
+    * NOTE: I am including all of them even though I am using a sub-set. I keep
     * tweaking my theme and having access to all of the colors here is handy. */
 
     base03: #002b36;
@@ -44,7 +44,7 @@
     selected-active-background:  @base02;
     selected-urgent-foreground:  @red;
     selected-urgent-background:  @base02;
-    
+
     alternate-normal-foreground: @foreground;
     alternate-normal-background: @transparent-background;
     alternate-active-foreground: @active-foreground;
@@ -59,24 +59,24 @@
     spacing:                     2;
     background-color:            @transparent-background;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          20;
 }
-#mainbox {
+mainbox {
     border:  0;
     padding: 0;
 }
-#message {
+message {
     border:       1px dash 0px 0px ;
     border-color: @separatorcolor;
     padding:      1px ;
 }
-#textbox {
+textbox {
     text-color: @foreground;
 }
-#listview {
+listview {
     fixed-height: 0;
     border:       1px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -84,74 +84,74 @@
     scrollbar:    false;
     padding:      8px 0px 0px 0px;
 }
-#element {
+element {
     border:  0;
     padding: 1px 0px 1px 1px;
 }
-#element.normal.normal {
+element normal.normal {
     background-color: @normal-background;
     text-color:       @normal-foreground;
 }
-#element.normal.urgent {
+element normal.urgent {
     background-color: @urgent-background;
     text-color:       @urgent-foreground;
 }
-#element.normal.active {
+element normal.active {
     background-color: @active-background;
     text-color:       @active-foreground;
 }
-#element.selected.normal {
+element selected.normal {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#element.selected.urgent {
+element selected.urgent {
     background-color: @selected-urgent-background;
     text-color:       @selected-urgent-foreground;
 }
-#element.selected.active {
+element selected.active {
     background-color: @selected-active-background;
     text-color:       @selected-active-foreground;
 }
-#element.alternate.normal {
+element alternate.normal {
     background-color: @alternate-normal-background;
     text-color:       @alternate-normal-foreground;
 }
-#element.alternate.urgent {
+element alternate.urgent {
     background-color: @alternate-urgent-background;
     text-color:       @alternate-urgent-foreground;
 }
-#element.alternate.active {
+element alternate.active {
     background-color: @alternate-active-background;
     text-color:       @alternate-active-foreground;
 }
-#scrollbar {
+scrollbar {
     width:        4px ;
     border:       0;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
+inputbar {
     spacing:    0;
     text-color: @normal-foreground;
     padding:    1px ;
 }
-#case-indicator {
+case-indicator {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#entry {
+entry {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#prompt {
+prompt {
     spacing:    0;
     text-color: @normal-foreground;
 }