Update themes with base16-builder

- support Rofi 1.5
- added base16-icy

156 files changed, 3662 insertions, 3017 deletions

diff --git a/themes/base16-3024.rasi b/themes/base16-3024.rasi
index 82b005a..acfad79 100644
--- a/themes/base16-3024.rasi
+++ b/themes/base16-3024.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-apathy.config b/themes/base16-apathy.config
index f4052d5..e1a4fc1 100644
--- a/themes/base16-apathy.config
+++ b/themes/base16-apathy.config
@@ -1,33 +1,33 @@
 ! Base16 Apathy
 ! Author: Jannik Siebert (https://github.com/janniks)
 
-! base00: #031a16
-! base01: #0b342d
-! base02: #184e45
-! base03: #2b685e
-! base04: #5f9c92
-! base05: #81b5ac
-! base06: #a7cec8
-! base07: #d2e7e4
-! base08: #3e9688
-! base09: #3e7996
-! base0A: #3e4c96
-! base0B: #883e96
-! base0C: #963e4c
-! base0D: #96883e
-! base0E: #4c963e
-! base0F: #3e965b
+! base00: #031A16
+! base01: #0B342D
+! base02: #184E45
+! base03: #2B685E
+! base04: #5F9C92
+! base05: #81B5AC
+! base06: #A7CEC8
+! base07: #D2E7E4
+! base08: #3E9688
+! base09: #3E7996
+! base0A: #3E4C96
+! base0B: #883E96
+! base0C: #963E4C
+! base0D: #96883E
+! base0E: #4C963E
+! base0F: #3E965B
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #0b342d, #0b342d, #031a16
+rofi.color-window:  #0B342D, #0B342D, #031A16
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #0b342d, #81b5ac, #0b342d, #0b342d, #d2e7e4
-rofi.color-active:  #0b342d, #96883e, #0b342d, #0b342d, #96883e
-rofi.color-urgent:  #0b342d, #3e9688, #0b342d, #0b342d, #3e9688
+rofi.color-normal:  #0B342D, #81B5AC, #0B342D, #0B342D, #D2E7E4
+rofi.color-active:  #0B342D, #96883E, #0B342D, #0B342D, #96883E
+rofi.color-urgent:  #0B342D, #3E9688, #0B342D, #0B342D, #3E9688
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-apathy.rasi b/themes/base16-apathy.rasi
index 83887c2..0341101 100644
--- a/themes/base16-apathy.rasi
+++ b/themes/base16-apathy.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-ashes.config b/themes/base16-ashes.config
index 1d626a6..4c64f59 100644
--- a/themes/base16-ashes.config
+++ b/themes/base16-ashes.config
@@ -1,33 +1,33 @@
 ! Base16 Ashes
 ! Author: Jannik Siebert (https://github.com/janniks)
 
-! base00: #1c2023
-! base01: #393f45
-! base02: #565e65
-! base03: #747c84
-! base04: #adb3ba
-! base05: #c7ccd1
-! base06: #dfe2e5
-! base07: #f3f4f5
-! base08: #c7ae95
-! base09: #c7c795
-! base0A: #aec795
-! base0B: #95c7ae
-! base0C: #95aec7
-! base0D: #ae95c7
-! base0E: #c795ae
-! base0F: #c79595
+! base00: #1C2023
+! base01: #393F45
+! base02: #565E65
+! base03: #747C84
+! base04: #ADB3BA
+! base05: #C7CCD1
+! base06: #DFE2E5
+! base07: #F3F4F5
+! base08: #C7AE95
+! base09: #C7C795
+! base0A: #AEC795
+! base0B: #95C7AE
+! base0C: #95AEC7
+! base0D: #AE95C7
+! base0E: #C795AE
+! base0F: #C79595
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #393f45, #393f45, #1c2023
+rofi.color-window:  #393F45, #393F45, #1C2023
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #393f45, #c7ccd1, #393f45, #393f45, #f3f4f5
-rofi.color-active:  #393f45, #ae95c7, #393f45, #393f45, #ae95c7
-rofi.color-urgent:  #393f45, #c7ae95, #393f45, #393f45, #c7ae95
+rofi.color-normal:  #393F45, #C7CCD1, #393F45, #393F45, #F3F4F5
+rofi.color-active:  #393F45, #AE95C7, #393F45, #393F45, #AE95C7
+rofi.color-urgent:  #393F45, #C7AE95, #393F45, #393F45, #C7AE95
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-ashes.rasi b/themes/base16-ashes.rasi
index 9da8a48..6f63cf3 100644
--- a/themes/base16-ashes.rasi
+++ b/themes/base16-ashes.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-cave-light.config b/themes/base16-atelier-cave-light.config
index 788d46f..788d46f 100755..100644
--- a/themes/base16-atelier-cave-light.config
+++ b/themes/base16-atelier-cave-light.config
diff --git a/themes/base16-atelier-cave-light.rasi b/themes/base16-atelier-cave-light.rasi
index 330afdd..8cef62d 100644
--- a/themes/base16-atelier-cave-light.rasi
+++ b/themes/base16-atelier-cave-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-cave.rasi b/themes/base16-atelier-cave.rasi
index e31584d..58daa2a 100644
--- a/themes/base16-atelier-cave.rasi
+++ b/themes/base16-atelier-cave.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-dune-light.config b/themes/base16-atelier-dune-light.config
index 1abde12..1abde12 100755..100644
--- a/themes/base16-atelier-dune-light.config
+++ b/themes/base16-atelier-dune-light.config
diff --git a/themes/base16-atelier-dune-light.rasi b/themes/base16-atelier-dune-light.rasi
index 5f029be..353b174 100644
--- a/themes/base16-atelier-dune-light.rasi
+++ b/themes/base16-atelier-dune-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-dune.rasi b/themes/base16-atelier-dune.rasi
index 33075dd..269ae07 100644
--- a/themes/base16-atelier-dune.rasi
+++ b/themes/base16-atelier-dune.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-estuary-light.config b/themes/base16-atelier-estuary-light.config
index c758b9d..c758b9d 100755..100644
--- a/themes/base16-atelier-estuary-light.config
+++ b/themes/base16-atelier-estuary-light.config
diff --git a/themes/base16-atelier-estuary-light.rasi b/themes/base16-atelier-estuary-light.rasi
index 150ab46..21b58b0 100644
--- a/themes/base16-atelier-estuary-light.rasi
+++ b/themes/base16-atelier-estuary-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-estuary.rasi b/themes/base16-atelier-estuary.rasi
index 84b4456..854926f 100644
--- a/themes/base16-atelier-estuary.rasi
+++ b/themes/base16-atelier-estuary.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-forest-light.config b/themes/base16-atelier-forest-light.config
index 6084be0..6084be0 100755..100644
--- a/themes/base16-atelier-forest-light.config
+++ b/themes/base16-atelier-forest-light.config
diff --git a/themes/base16-atelier-forest-light.rasi b/themes/base16-atelier-forest-light.rasi
index 4a7f8b1..7f4cd73 100644
--- a/themes/base16-atelier-forest-light.rasi
+++ b/themes/base16-atelier-forest-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-forest.rasi b/themes/base16-atelier-forest.rasi
index 03a008a..50b50ce 100644
--- a/themes/base16-atelier-forest.rasi
+++ b/themes/base16-atelier-forest.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-heath-light.config b/themes/base16-atelier-heath-light.config
index 8da5b98..8da5b98 100755..100644
--- a/themes/base16-atelier-heath-light.config
+++ b/themes/base16-atelier-heath-light.config
diff --git a/themes/base16-atelier-heath-light.rasi b/themes/base16-atelier-heath-light.rasi
index 9935a3b..d60e5ac 100644
--- a/themes/base16-atelier-heath-light.rasi
+++ b/themes/base16-atelier-heath-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-heath.rasi b/themes/base16-atelier-heath.rasi
index f4693b9..67ee4ac 100644
--- a/themes/base16-atelier-heath.rasi
+++ b/themes/base16-atelier-heath.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-lakeside-light.config b/themes/base16-atelier-lakeside-light.config
index d2d3bb7..d2d3bb7 100755..100644
--- a/themes/base16-atelier-lakeside-light.config
+++ b/themes/base16-atelier-lakeside-light.config
diff --git a/themes/base16-atelier-lakeside-light.rasi b/themes/base16-atelier-lakeside-light.rasi
index 7891bb1..a1d22f7 100644
--- a/themes/base16-atelier-lakeside-light.rasi
+++ b/themes/base16-atelier-lakeside-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-lakeside.rasi b/themes/base16-atelier-lakeside.rasi
index cd10943..9bb109d 100644
--- a/themes/base16-atelier-lakeside.rasi
+++ b/themes/base16-atelier-lakeside.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-plateau-light.config b/themes/base16-atelier-plateau-light.config
index e477fce..e477fce 100755..100644
--- a/themes/base16-atelier-plateau-light.config
+++ b/themes/base16-atelier-plateau-light.config
diff --git a/themes/base16-atelier-plateau-light.rasi b/themes/base16-atelier-plateau-light.rasi
index 08a900b..d49b6bd 100644
--- a/themes/base16-atelier-plateau-light.rasi
+++ b/themes/base16-atelier-plateau-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-plateau.rasi b/themes/base16-atelier-plateau.rasi
index 5662532..12206eb 100644
--- a/themes/base16-atelier-plateau.rasi
+++ b/themes/base16-atelier-plateau.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-savanna-light.config b/themes/base16-atelier-savanna-light.config
index c06a6b1..c06a6b1 100755..100644
--- a/themes/base16-atelier-savanna-light.config
+++ b/themes/base16-atelier-savanna-light.config
diff --git a/themes/base16-atelier-savanna-light.rasi b/themes/base16-atelier-savanna-light.rasi
index c7f3af9..547a0a5 100644
--- a/themes/base16-atelier-savanna-light.rasi
+++ b/themes/base16-atelier-savanna-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-savanna.rasi b/themes/base16-atelier-savanna.rasi
index 9674354..783087c 100644
--- a/themes/base16-atelier-savanna.rasi
+++ b/themes/base16-atelier-savanna.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-seaside-light.config b/themes/base16-atelier-seaside-light.config
index 36a5faf..36a5faf 100755..100644
--- a/themes/base16-atelier-seaside-light.config
+++ b/themes/base16-atelier-seaside-light.config
diff --git a/themes/base16-atelier-seaside-light.rasi b/themes/base16-atelier-seaside-light.rasi
index 0813bf4..6307e48 100644
--- a/themes/base16-atelier-seaside-light.rasi
+++ b/themes/base16-atelier-seaside-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-seaside.rasi b/themes/base16-atelier-seaside.rasi
index f716240..d2ba1d5 100644
--- a/themes/base16-atelier-seaside.rasi
+++ b/themes/base16-atelier-seaside.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-sulphurpool-light.config b/themes/base16-atelier-sulphurpool-light.config
index 1eae3d0..1eae3d0 100755..100644
--- a/themes/base16-atelier-sulphurpool-light.config
+++ b/themes/base16-atelier-sulphurpool-light.config
diff --git a/themes/base16-atelier-sulphurpool-light.rasi b/themes/base16-atelier-sulphurpool-light.rasi
index 8477ba5..fa0c2ae 100644
--- a/themes/base16-atelier-sulphurpool-light.rasi
+++ b/themes/base16-atelier-sulphurpool-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-atelier-sulphurpool.rasi b/themes/base16-atelier-sulphurpool.rasi
index 64f3ac4..6a0e72e 100644
--- a/themes/base16-atelier-sulphurpool.rasi
+++ b/themes/base16-atelier-sulphurpool.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-bespin.rasi b/themes/base16-bespin.rasi
index a6d5eaf..b1b9a69 100644
--- a/themes/base16-bespin.rasi
+++ b/themes/base16-bespin.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-brewer.rasi b/themes/base16-brewer.rasi
index a05e3d6..9a1a73b 100644
--- a/themes/base16-brewer.rasi
+++ b/themes/base16-brewer.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-bright.rasi b/themes/base16-bright.rasi
index de49d03..8be0d17 100644
--- a/themes/base16-bright.rasi
+++ b/themes/base16-bright.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-brushtrees-dark.config b/themes/base16-brushtrees-dark.config
index a7ff07a..83643a5 100755..100644
--- a/themes/base16-brushtrees-dark.config
+++ b/themes/base16-brushtrees-dark.config
@@ -2,13 +2,13 @@
 ! Author: Abraham White <abelincoln.white@gmail.com>
 
 ! base00: #485867
-! base01: #5a6d7a
-! base02: #6d828e
-! base03: #8299a1
-! base04: #98afb5
-! base05: #b0c5c8
-! base06: #c9dbdc
-! base07: #e3efef
+! base01: #5A6D7A
+! base02: #6D828E
+! base03: #8299A1
+! base04: #98AFB5
+! base05: #B0C5C8
+! base06: #C9DBDC
+! base07: #E3EFEF
 ! base08: #b38686
 ! base09: #d8bba2
 ! base0A: #aab386
@@ -22,12 +22,12 @@
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #5a6d7a, #5a6d7a, #485867
+rofi.color-window:  #5A6D7A, #5A6D7A, #485867
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #5a6d7a, #b0c5c8, #5a6d7a, #5a6d7a, #e3efef
-rofi.color-active:  #5a6d7a, #868cb3, #5a6d7a, #5a6d7a, #868cb3
-rofi.color-urgent:  #5a6d7a, #b38686, #5a6d7a, #5a6d7a, #b38686
+rofi.color-normal:  #5A6D7A, #B0C5C8, #5A6D7A, #5A6D7A, #E3EFEF
+rofi.color-active:  #5A6D7A, #868cb3, #5A6D7A, #5A6D7A, #868cb3
+rofi.color-urgent:  #5A6D7A, #b38686, #5A6D7A, #5A6D7A, #b38686
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-brushtrees-dark.rasi b/themes/base16-brushtrees-dark.rasi
index 2c95608..1524662 100644
--- a/themes/base16-brushtrees-dark.rasi
+++ b/themes/base16-brushtrees-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-brushtrees.config b/themes/base16-brushtrees.config
index cb71b13..b59f926 100755..100644
--- a/themes/base16-brushtrees.config
+++ b/themes/base16-brushtrees.config
@@ -1,13 +1,13 @@
 ! Base16 Brush Trees
 ! Author: Abraham White <abelincoln.white@gmail.com>
 
-! base00: #e3efef
-! base01: #c9dbdc
-! base02: #b0c5c8
-! base03: #98afb5
-! base04: #8299a1
-! base05: #6d828e
-! base06: #5a6d7a
+! base00: #E3EFEF
+! base01: #C9DBDC
+! base02: #B0C5C8
+! base03: #98AFB5
+! base04: #8299A1
+! base05: #6D828E
+! base06: #5A6D7A
 ! base07: #485867
 ! base08: #b38686
 ! base09: #d8bba2
@@ -22,12 +22,12 @@
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #c9dbdc, #c9dbdc, #e3efef
+rofi.color-window:  #C9DBDC, #C9DBDC, #E3EFEF
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #c9dbdc, #6d828e, #c9dbdc, #c9dbdc, #485867
-rofi.color-active:  #c9dbdc, #868cb3, #c9dbdc, #c9dbdc, #868cb3
-rofi.color-urgent:  #c9dbdc, #b38686, #c9dbdc, #c9dbdc, #b38686
+rofi.color-normal:  #C9DBDC, #6D828E, #C9DBDC, #C9DBDC, #485867
+rofi.color-active:  #C9DBDC, #868cb3, #C9DBDC, #C9DBDC, #868cb3
+rofi.color-urgent:  #C9DBDC, #b38686, #C9DBDC, #C9DBDC, #b38686
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-brushtrees.rasi b/themes/base16-brushtrees.rasi
index f733bc4..b1f0c55 100644
--- a/themes/base16-brushtrees.rasi
+++ b/themes/base16-brushtrees.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-chalk.rasi b/themes/base16-chalk.rasi
index 6b82ce7..632ea82 100644
--- a/themes/base16-chalk.rasi
+++ b/themes/base16-chalk.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-circus.config b/themes/base16-circus.config
index 879d081..879d081 100755..100644
--- a/themes/base16-circus.config
+++ b/themes/base16-circus.config
diff --git a/themes/base16-circus.rasi b/themes/base16-circus.rasi
index d217505..03c9a3c 100644
--- a/themes/base16-circus.rasi
+++ b/themes/base16-circus.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-classic-dark.config b/themes/base16-classic-dark.config
index 9c4d233..21de8d1 100755..100644
--- a/themes/base16-classic-dark.config
+++ b/themes/base16-classic-dark.config
@@ -5,18 +5,18 @@
 ! base01: #202020
 ! base02: #303030
 ! base03: #505050
-! base04: #b0b0b0
-! base05: #d0d0d0
-! base06: #e0e0e0
-! base07: #f5f5f5
-! base08: #ac4142
-! base09: #d28445
-! base0A: #f4bf75
-! base0B: #90a959
-! base0C: #75b5aa
-! base0D: #6a9fb5
-! base0E: #aa759f
-! base0F: #8f5536
+! base04: #B0B0B0
+! base05: #D0D0D0
+! base06: #E0E0E0
+! base07: #F5F5F5
+! base08: #AC4142
+! base09: #D28445
+! base0A: #F4BF75
+! base0B: #90A959
+! base0C: #75B5AA
+! base0D: #6A9FB5
+! base0E: #AA759F
+! base0F: #8F5536
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
@@ -25,9 +25,9 @@ rofi.color-enabled: true
 rofi.color-window:  #202020, #202020, #151515
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #202020, #d0d0d0, #202020, #202020, #f5f5f5
-rofi.color-active:  #202020, #6a9fb5, #202020, #202020, #6a9fb5
-rofi.color-urgent:  #202020, #ac4142, #202020, #202020, #ac4142
+rofi.color-normal:  #202020, #D0D0D0, #202020, #202020, #F5F5F5
+rofi.color-active:  #202020, #6A9FB5, #202020, #202020, #6A9FB5
+rofi.color-urgent:  #202020, #AC4142, #202020, #202020, #AC4142
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-classic-dark.rasi b/themes/base16-classic-dark.rasi
index dcb78a0..753d565 100644
--- a/themes/base16-classic-dark.rasi
+++ b/themes/base16-classic-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-classic-light.config b/themes/base16-classic-light.config
index fc6d66e..1931203 100755..100644
--- a/themes/base16-classic-light.config
+++ b/themes/base16-classic-light.config
@@ -1,33 +1,33 @@
 ! Base16 Classic Light
 ! Author: Jason Heeris (http://heeris.id.au)
 
-! base00: #f5f5f5
-! base01: #e0e0e0
-! base02: #d0d0d0
-! base03: #b0b0b0
+! base00: #F5F5F5
+! base01: #E0E0E0
+! base02: #D0D0D0
+! base03: #B0B0B0
 ! base04: #505050
 ! base05: #303030
 ! base06: #202020
 ! base07: #151515
-! base08: #ac4142
-! base09: #d28445
-! base0A: #f4bf75
-! base0B: #90a959
-! base0C: #75b5aa
-! base0D: #6a9fb5
-! base0E: #aa759f
-! base0F: #8f5536
+! base08: #AC4142
+! base09: #D28445
+! base0A: #F4BF75
+! base0B: #90A959
+! base0C: #75B5AA
+! base0D: #6A9FB5
+! base0E: #AA759F
+! base0F: #8F5536
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #e0e0e0, #e0e0e0, #f5f5f5
+rofi.color-window:  #E0E0E0, #E0E0E0, #F5F5F5
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #e0e0e0, #303030, #e0e0e0, #e0e0e0, #151515
-rofi.color-active:  #e0e0e0, #6a9fb5, #e0e0e0, #e0e0e0, #6a9fb5
-rofi.color-urgent:  #e0e0e0, #ac4142, #e0e0e0, #e0e0e0, #ac4142
+rofi.color-normal:  #E0E0E0, #303030, #E0E0E0, #E0E0E0, #151515
+rofi.color-active:  #E0E0E0, #6A9FB5, #E0E0E0, #E0E0E0, #6A9FB5
+rofi.color-urgent:  #E0E0E0, #AC4142, #E0E0E0, #E0E0E0, #AC4142
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-classic-light.rasi b/themes/base16-classic-light.rasi
index d7abe2a..39b6698 100644
--- a/themes/base16-classic-light.rasi
+++ b/themes/base16-classic-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-codeschool.config b/themes/base16-codeschool.config
index 72bd558..d18f792 100644
--- a/themes/base16-codeschool.config
+++ b/themes/base16-codeschool.config
@@ -1,5 +1,5 @@
 ! Base16 Codeschool
-! Author: brettof86
+! Author: blockloop
 
 ! base00: #232c31
 ! base01: #1c3657
diff --git a/themes/base16-codeschool.rasi b/themes/base16-codeschool.rasi
index caf0af7..3dc45dd 100644
--- a/themes/base16-codeschool.rasi
+++ b/themes/base16-codeschool.rasi
@@ -1,6 +1,6 @@
 /**
  * Base16 Codeschool ROFI Color theme
- * User: brettof86
+ * User: blockloop
  * Copyright: Andrea Scarpino
  */
 * {
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-cupcake.config b/themes/base16-cupcake.config
index c82e546..69c2d8a 100644
--- a/themes/base16-cupcake.config
+++ b/themes/base16-cupcake.config
@@ -7,16 +7,16 @@
 ! base03: #bfb9c6
 ! base04: #a59daf
 ! base05: #8b8198
-! base06: #72677e
+! base06: #72677E
 ! base07: #585062
-! base08: #d57e85
-! base09: #ebb790
-! base0A: #dcb16c
-! base0B: #a3b367
-! base0C: #69a9a7
-! base0D: #7297b9
-! base0E: #bb99b4
-! base0F: #baa58c
+! base08: #D57E85
+! base09: #EBB790
+! base0A: #DCB16C
+! base0B: #A3B367
+! base0C: #69A9A7
+! base0D: #7297B9
+! base0E: #BB99B4
+! base0F: #BAA58C
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
@@ -26,8 +26,8 @@ rofi.color-window:  #f2f1f4, #f2f1f4, #fbf1f2
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
 rofi.color-normal:  #f2f1f4, #8b8198, #f2f1f4, #f2f1f4, #585062
-rofi.color-active:  #f2f1f4, #7297b9, #f2f1f4, #f2f1f4, #7297b9
-rofi.color-urgent:  #f2f1f4, #d57e85, #f2f1f4, #f2f1f4, #d57e85
+rofi.color-active:  #f2f1f4, #7297B9, #f2f1f4, #f2f1f4, #7297B9
+rofi.color-urgent:  #f2f1f4, #D57E85, #f2f1f4, #f2f1f4, #D57E85
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-cupcake.rasi b/themes/base16-cupcake.rasi
index 5c3f82b..8ac1764 100644
--- a/themes/base16-cupcake.rasi
+++ b/themes/base16-cupcake.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-cupertino.config b/themes/base16-cupertino.config
index ba1dd61..ba1dd61 100755..100644
--- a/themes/base16-cupertino.config
+++ b/themes/base16-cupertino.config
diff --git a/themes/base16-cupertino.rasi b/themes/base16-cupertino.rasi
index 86e3dcd..f41f6e5 100644
--- a/themes/base16-cupertino.rasi
+++ b/themes/base16-cupertino.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-darktooth.config b/themes/base16-darktooth.config
index 4ec0db7..78b9c0b 100644
--- a/themes/base16-darktooth.config
+++ b/themes/base16-darktooth.config
@@ -1,33 +1,33 @@
 ! Base16 Darktooth
 ! Author: Jason Milkins (https://github.com/jasonm23)
 
-! base00: #1d2021
-! base01: #32302f
+! base00: #1D2021
+! base01: #32302F
 ! base02: #504945
-! base03: #665c54
+! base03: #665C54
 ! base04: #928374
-! base05: #a89984
-! base06: #d5c4a1
-! base07: #fdf4c1
-! base08: #fb543f
-! base09: #fe8625
-! base0A: #fac03b
-! base0B: #95c085
-! base0C: #8ba59b
-! base0D: #0d6678
-! base0E: #8f4673
-! base0F: #a87322
+! base05: #A89984
+! base06: #D5C4A1
+! base07: #FDF4C1
+! base08: #FB543F
+! base09: #FE8625
+! base0A: #FAC03B
+! base0B: #95C085
+! base0C: #8BA59B
+! base0D: #0D6678
+! base0E: #8F4673
+! base0F: #A87322
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #32302f, #32302f, #1d2021
+rofi.color-window:  #32302F, #32302F, #1D2021
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #32302f, #a89984, #32302f, #32302f, #fdf4c1
-rofi.color-active:  #32302f, #0d6678, #32302f, #32302f, #0d6678
-rofi.color-urgent:  #32302f, #fb543f, #32302f, #32302f, #fb543f
+rofi.color-normal:  #32302F, #A89984, #32302F, #32302F, #FDF4C1
+rofi.color-active:  #32302F, #0D6678, #32302F, #32302F, #0D6678
+rofi.color-urgent:  #32302F, #FB543F, #32302F, #32302F, #FB543F
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-darktooth.rasi b/themes/base16-darktooth.rasi
index 52a10a8..bd4c519 100644
--- a/themes/base16-darktooth.rasi
+++ b/themes/base16-darktooth.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-default-dark.rasi b/themes/base16-default-dark.rasi
index 0f6c27f..b36c0ca 100644
--- a/themes/base16-default-dark.rasi
+++ b/themes/base16-default-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-default-light.rasi b/themes/base16-default-light.rasi
index d9acdae..5d9851e 100644
--- a/themes/base16-default-light.rasi
+++ b/themes/base16-default-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-dracula.rasi b/themes/base16-dracula.rasi
index 686838a..20a3e40 100644
--- a/themes/base16-dracula.rasi
+++ b/themes/base16-dracula.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-eighties.rasi b/themes/base16-eighties.rasi
index 42afb5d..0e64c60 100644
--- a/themes/base16-eighties.rasi
+++ b/themes/base16-eighties.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-embers.config b/themes/base16-embers.config
index 946e590..c9076c5 100644
--- a/themes/base16-embers.config
+++ b/themes/base16-embers.config
@@ -1,33 +1,33 @@
 ! Base16 Embers
 ! Author: Jannik Siebert (https://github.com/janniks)
 
-! base00: #16130f
-! base01: #2c2620
-! base02: #433b32
-! base03: #5a5047
-! base04: #8a8075
-! base05: #a39a90
-! base06: #beb6ae
-! base07: #dbd6d1
-! base08: #826d57
+! base00: #16130F
+! base01: #2C2620
+! base02: #433B32
+! base03: #5A5047
+! base04: #8A8075
+! base05: #A39A90
+! base06: #BEB6AE
+! base07: #DBD6D1
+! base08: #826D57
 ! base09: #828257
-! base0A: #6d8257
-! base0B: #57826d
-! base0C: #576d82
-! base0D: #6d5782
-! base0E: #82576d
+! base0A: #6D8257
+! base0B: #57826D
+! base0C: #576D82
+! base0D: #6D5782
+! base0E: #82576D
 ! base0F: #825757
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #2c2620, #2c2620, #16130f
+rofi.color-window:  #2C2620, #2C2620, #16130F
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #2c2620, #a39a90, #2c2620, #2c2620, #dbd6d1
-rofi.color-active:  #2c2620, #6d5782, #2c2620, #2c2620, #6d5782
-rofi.color-urgent:  #2c2620, #826d57, #2c2620, #2c2620, #826d57
+rofi.color-normal:  #2C2620, #A39A90, #2C2620, #2C2620, #DBD6D1
+rofi.color-active:  #2C2620, #6D5782, #2C2620, #2C2620, #6D5782
+rofi.color-urgent:  #2C2620, #826D57, #2C2620, #2C2620, #826D57
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-embers.rasi b/themes/base16-embers.rasi
index e7ac10c..5070342 100644
--- a/themes/base16-embers.rasi
+++ b/themes/base16-embers.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-flat.config b/themes/base16-flat.config
index 9803655..0fb9a5d 100644
--- a/themes/base16-flat.config
+++ b/themes/base16-flat.config
@@ -1,33 +1,33 @@
 ! Base16 Flat
 ! Author: Chris Kempson (http://chriskempson.com)
 
-! base00: #2c3e50
-! base01: #34495e
-! base02: #7f8c8d
-! base03: #95a5a6
-! base04: #bdc3c7
+! base00: #2C3E50
+! base01: #34495E
+! base02: #7F8C8D
+! base03: #95A5A6
+! base04: #BDC3C7
 ! base05: #e0e0e0
 ! base06: #f5f5f5
-! base07: #ecf0f1
-! base08: #e74c3c
-! base09: #e67e22
-! base0A: #f1c40f
-! base0B: #2ecc71
-! base0C: #1abc9c
-! base0D: #3498db
-! base0E: #9b59b6
+! base07: #ECF0F1
+! base08: #E74C3C
+! base09: #E67E22
+! base0A: #F1C40F
+! base0B: #2ECC71
+! base0C: #1ABC9C
+! base0D: #3498DB
+! base0E: #9B59B6
 ! base0F: #be643c
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #34495e, #34495e, #2c3e50
+rofi.color-window:  #34495E, #34495E, #2C3E50
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #34495e, #e0e0e0, #34495e, #34495e, #ecf0f1
-rofi.color-active:  #34495e, #3498db, #34495e, #34495e, #3498db
-rofi.color-urgent:  #34495e, #e74c3c, #34495e, #34495e, #e74c3c
+rofi.color-normal:  #34495E, #e0e0e0, #34495E, #34495E, #ECF0F1
+rofi.color-active:  #34495E, #3498DB, #34495E, #34495E, #3498DB
+rofi.color-urgent:  #34495E, #E74C3C, #34495E, #34495E, #E74C3C
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-flat.rasi b/themes/base16-flat.rasi
index 6d09918..b8254ff 100644
--- a/themes/base16-flat.rasi
+++ b/themes/base16-flat.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-github.rasi b/themes/base16-github.rasi
index 5a4d23a..70e4a62 100644
--- a/themes/base16-github.rasi
+++ b/themes/base16-github.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-google-dark.config b/themes/base16-google-dark.config
index f0b91cc..6a8a0ed 100644
--- a/themes/base16-google-dark.config
+++ b/themes/base16-google-dark.config
@@ -9,14 +9,14 @@
 ! base05: #c5c8c6
 ! base06: #e0e0e0
 ! base07: #ffffff
-! base08: #cc342b
-! base09: #f96a38
-! base0A: #fba922
+! base08: #CC342B
+! base09: #F96A38
+! base0A: #FBA922
 ! base0B: #198844
-! base0C: #3971ed
-! base0D: #3971ed
-! base0E: #a36ac7
-! base0F: #3971ed
+! base0C: #3971ED
+! base0D: #3971ED
+! base0E: #A36AC7
+! base0F: #3971ED
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
@@ -26,8 +26,8 @@ rofi.color-window:  #282a2e, #282a2e, #1d1f21
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
 rofi.color-normal:  #282a2e, #c5c8c6, #282a2e, #282a2e, #ffffff
-rofi.color-active:  #282a2e, #3971ed, #282a2e, #282a2e, #3971ed
-rofi.color-urgent:  #282a2e, #cc342b, #282a2e, #282a2e, #cc342b
+rofi.color-active:  #282a2e, #3971ED, #282a2e, #282a2e, #3971ED
+rofi.color-urgent:  #282a2e, #CC342B, #282a2e, #282a2e, #CC342B
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-google-dark.rasi b/themes/base16-google-dark.rasi
index b4d723c..94a22a9 100644
--- a/themes/base16-google-dark.rasi
+++ b/themes/base16-google-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-google-light.config b/themes/base16-google-light.config
index b07e612..0e0a5bd 100644
--- a/themes/base16-google-light.config
+++ b/themes/base16-google-light.config
@@ -9,14 +9,14 @@
 ! base05: #373b41
 ! base06: #282a2e
 ! base07: #1d1f21
-! base08: #cc342b
-! base09: #f96a38
-! base0A: #fba922
+! base08: #CC342B
+! base09: #F96A38
+! base0A: #FBA922
 ! base0B: #198844
-! base0C: #3971ed
-! base0D: #3971ed
-! base0E: #a36ac7
-! base0F: #3971ed
+! base0C: #3971ED
+! base0D: #3971ED
+! base0E: #A36AC7
+! base0F: #3971ED
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
@@ -26,8 +26,8 @@ rofi.color-window:  #e0e0e0, #e0e0e0, #ffffff
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
 rofi.color-normal:  #e0e0e0, #373b41, #e0e0e0, #e0e0e0, #1d1f21
-rofi.color-active:  #e0e0e0, #3971ed, #e0e0e0, #e0e0e0, #3971ed
-rofi.color-urgent:  #e0e0e0, #cc342b, #e0e0e0, #e0e0e0, #cc342b
+rofi.color-active:  #e0e0e0, #3971ED, #e0e0e0, #e0e0e0, #3971ED
+rofi.color-urgent:  #e0e0e0, #CC342B, #e0e0e0, #e0e0e0, #CC342B
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-google-light.rasi b/themes/base16-google-light.rasi
index 1e57806..2b633ce 100644
--- a/themes/base16-google-light.rasi
+++ b/themes/base16-google-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-grayscale-dark.rasi b/themes/base16-grayscale-dark.rasi
index 415a189..1faddea 100644
--- a/themes/base16-grayscale-dark.rasi
+++ b/themes/base16-grayscale-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-grayscale-light.rasi b/themes/base16-grayscale-light.rasi
index a5728ab..f2f9b01 100644
--- a/themes/base16-grayscale-light.rasi
+++ b/themes/base16-grayscale-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-green-screen.config b/themes/base16-green-screen.config
deleted file mode 100644
index ae6dc24..0000000
--- a/themes/base16-green-screen.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 Green Screen
-! Author: Chris Kempson (http://chriskempson.com)
-
-! base00: #001100
-! base01: #003300
-! base02: #005500
-! base03: #007700
-! base04: #009900
-! base05: #00bb00
-! base06: #00dd00
-! base07: #00ff00
-! base08: #007700
-! base09: #009900
-! base0A: #007700
-! base0B: #00bb00
-! base0C: #005500
-! base0D: #009900
-! base0E: #00bb00
-! base0F: #005500
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #003300, #003300, #001100
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #003300, #00bb00, #003300, #003300, #00ff00
-rofi.color-active:  #003300, #009900, #003300, #003300, #009900
-rofi.color-urgent:  #003300, #007700, #003300, #003300, #007700
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-greenscreen.config b/themes/base16-greenscreen.config
index ae6dc24..ae6dc24 100755..100644
--- a/themes/base16-greenscreen.config
+++ b/themes/base16-greenscreen.config
diff --git a/themes/base16-greenscreen.rasi b/themes/base16-greenscreen.rasi
index e7d73ed..adce612 100644
--- a/themes/base16-greenscreen.rasi
+++ b/themes/base16-greenscreen.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-dark-hard.rasi b/themes/base16-gruvbox-dark-hard.rasi
index b48ea7e..1d1e4d7 100644
--- a/themes/base16-gruvbox-dark-hard.rasi
+++ b/themes/base16-gruvbox-dark-hard.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-dark-medium.rasi b/themes/base16-gruvbox-dark-medium.rasi
index 3aeb2ec..6a0c1ae 100644
--- a/themes/base16-gruvbox-dark-medium.rasi
+++ b/themes/base16-gruvbox-dark-medium.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-dark-pale.rasi b/themes/base16-gruvbox-dark-pale.rasi
index 5b81707..cdc2bfd 100644
--- a/themes/base16-gruvbox-dark-pale.rasi
+++ b/themes/base16-gruvbox-dark-pale.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-dark-soft.rasi b/themes/base16-gruvbox-dark-soft.rasi
index 2fc1246..1147298 100644
--- a/themes/base16-gruvbox-dark-soft.rasi
+++ b/themes/base16-gruvbox-dark-soft.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-light-hard.rasi b/themes/base16-gruvbox-light-hard.rasi
index 0d41f51..64f5576 100644
--- a/themes/base16-gruvbox-light-hard.rasi
+++ b/themes/base16-gruvbox-light-hard.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-light-medium.rasi b/themes/base16-gruvbox-light-medium.rasi
index 20e9a66..82c259c 100644
--- a/themes/base16-gruvbox-light-medium.rasi
+++ b/themes/base16-gruvbox-light-medium.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-gruvbox-light-soft.rasi b/themes/base16-gruvbox-light-soft.rasi
index f9687df..cd2fb76 100644
--- a/themes/base16-gruvbox-light-soft.rasi
+++ b/themes/base16-gruvbox-light-soft.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-harmonic-dark.config b/themes/base16-harmonic-dark.config
index 95bbb34..95bbb34 100755..100644
--- a/themes/base16-harmonic-dark.config
+++ b/themes/base16-harmonic-dark.config
diff --git a/themes/base16-harmonic-dark.rasi b/themes/base16-harmonic-dark.rasi
index 84afb74..7720c8f 100644
--- a/themes/base16-harmonic-dark.rasi
+++ b/themes/base16-harmonic-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-harmonic-light.config b/themes/base16-harmonic-light.config
index 74b8634..74b8634 100755..100644
--- a/themes/base16-harmonic-light.config
+++ b/themes/base16-harmonic-light.config
diff --git a/themes/base16-harmonic-light.rasi b/themes/base16-harmonic-light.rasi
index c0367d8..06af81d 100644
--- a/themes/base16-harmonic-light.rasi
+++ b/themes/base16-harmonic-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-harmonic16-dark.config b/themes/base16-harmonic16-dark.config
deleted file mode 100644
index 95bbb34..0000000
--- a/themes/base16-harmonic16-dark.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 Harmonic16 Dark
-! Author: Jannik Siebert (https://github.com/janniks)
-
-! base00: #0b1c2c
-! base01: #223b54
-! base02: #405c79
-! base03: #627e99
-! base04: #aabcce
-! base05: #cbd6e2
-! base06: #e5ebf1
-! base07: #f7f9fb
-! base08: #bf8b56
-! base09: #bfbf56
-! base0A: #8bbf56
-! base0B: #56bf8b
-! base0C: #568bbf
-! base0D: #8b56bf
-! base0E: #bf568b
-! base0F: #bf5656
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #223b54, #223b54, #0b1c2c
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #223b54, #cbd6e2, #223b54, #223b54, #f7f9fb
-rofi.color-active:  #223b54, #8b56bf, #223b54, #223b54, #8b56bf
-rofi.color-urgent:  #223b54, #bf8b56, #223b54, #223b54, #bf8b56
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-harmonic16-light.config b/themes/base16-harmonic16-light.config
deleted file mode 100644
index 74b8634..0000000
--- a/themes/base16-harmonic16-light.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 Harmonic16 Light
-! Author: Jannik Siebert (https://github.com/janniks)
-
-! base00: #f7f9fb
-! base01: #e5ebf1
-! base02: #cbd6e2
-! base03: #aabcce
-! base04: #627e99
-! base05: #405c79
-! base06: #223b54
-! base07: #0b1c2c
-! base08: #bf8b56
-! base09: #bfbf56
-! base0A: #8bbf56
-! base0B: #56bf8b
-! base0C: #568bbf
-! base0D: #8b56bf
-! base0E: #bf568b
-! base0F: #bf5656
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #e5ebf1, #e5ebf1, #f7f9fb
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #e5ebf1, #405c79, #e5ebf1, #e5ebf1, #0b1c2c
-rofi.color-active:  #e5ebf1, #8b56bf, #e5ebf1, #e5ebf1, #8b56bf
-rofi.color-urgent:  #e5ebf1, #bf8b56, #e5ebf1, #e5ebf1, #bf8b56
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-hopscotch.rasi b/themes/base16-hopscotch.rasi
index 15754e0..9a14a0e 100644
--- a/themes/base16-hopscotch.rasi
+++ b/themes/base16-hopscotch.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-icy.config b/themes/base16-icy.config
new file mode 100644
index 0000000..3745fdb
--- /dev/null
+++ b/themes/base16-icy.config
@@ -0,0 +1,33 @@
+! Base16 Icy Dark
+! Author: icyphox (https://icyphox.ga)
+
+! base00: #021012
+! base01: #031619
+! base02: #041f23
+! base03: #052e34
+! base04: #064048
+! base05: #095b67
+! base06: #0c7c8c
+! base07: #109cb0
+! base08: #16c1d9
+! base09: #b3ebf2
+! base0A: #80deea
+! base0B: #4dd0e1
+! base0C: #26c6da
+! base0D: #00bcd4
+! base0E: #00acc1
+! base0F: #0097a7
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+! Property Name     BG       Border   Separator
+rofi.color-window:  #031619, #031619, #021012
+
+! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
+rofi.color-normal:  #031619, #095b67, #031619, #031619, #109cb0
+rofi.color-active:  #031619, #00bcd4, #031619, #031619, #00bcd4
+rofi.color-urgent:  #031619, #16c1d9, #031619, #031619, #16c1d9
+
+! Set the desired separator style
+rofi.separator-style: solid
diff --git a/themes/base16-icy.rasi b/themes/base16-icy.rasi
new file mode 100644
index 0000000..a6b8e6c
--- /dev/null
+++ b/themes/base16-icy.rasi
@@ -0,0 +1,143 @@
+/**
+ * Base16 Icy Dark ROFI Color theme
+ * User: icyphox (https://icyphox.ga)
+ * Copyright: Andrea Scarpino
+ */
+* {
+    selected-normal-foreground:  @lightbg;
+    foreground:                  rgba ( 9, 91, 103, 100 % );
+    normal-foreground:           @foreground;
+    alternate-normal-background: @lightbg;
+    red:                         rgba ( 22, 193, 217, 100 % );
+    selected-urgent-foreground:  @background;
+    blue:                        rgba ( 0, 188, 212, 100 % );
+    urgent-foreground:           @red;
+    alternate-urgent-background: @lightbg;
+    active-foreground:           @blue;
+    lightbg:                     rgba ( 3, 22, 25, 100 % );
+    selected-active-foreground:  @background;
+    alternate-active-background: @lightbg;
+    background:                  rgba ( 2, 16, 18, 100 % );
+    alternate-normal-foreground: @foreground;
+    normal-background:           @background;
+    lightfg:                     rgba ( 12, 124, 140, 100 % );
+    selected-normal-background:  @lightfg;
+    border-color:                @foreground;
+    spacing:                     2;
+    separatorcolor:              @foreground;
+    urgent-background:           @background;
+    selected-urgent-background:  @red;
+    alternate-urgent-foreground: @red;
+    background-color:            rgba ( 2, 16, 18, 0 % );
+    alternate-active-foreground: @blue;
+    active-background:           @background;
+    selected-active-background:  @blue;
+}
+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-color: @normal-foreground;
+    handle-width: 8px ;
+    padding:      0;
+}
+sidebar {
+    border:       2px dash 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:    0px;
+    text-color: @normal-foreground;
+    padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+case-indicator {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+entry {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+prompt {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-ir-black.config b/themes/base16-ir-black.config
deleted file mode 100644
index b5fddca..0000000
--- a/themes/base16-ir-black.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 IR Black
-! Author: Timothée Poisot (http://timotheepoisot.fr)
-
-! base00: #000000
-! base01: #242422
-! base02: #484844
-! base03: #6c6c66
-! base04: #918f88
-! base05: #b5b3aa
-! base06: #d9d7cc
-! base07: #fdfbee
-! base08: #ff6c60
-! base09: #e9c062
-! base0A: #ffffb6
-! base0B: #a8ff60
-! base0C: #c6c5fe
-! base0D: #96cbfe
-! base0E: #ff73fd
-! base0F: #b18a3d
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #242422, #242422, #000000
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #242422, #b5b3aa, #242422, #242422, #fdfbee
-rofi.color-active:  #242422, #96cbfe, #242422, #242422, #96cbfe
-rofi.color-urgent:  #242422, #ff6c60, #242422, #242422, #ff6c60
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-irblack.config b/themes/base16-irblack.config
index b5fddca..b5fddca 100755..100644
--- a/themes/base16-irblack.config
+++ b/themes/base16-irblack.config
diff --git a/themes/base16-irblack.rasi b/themes/base16-irblack.rasi
index 1ea1973..bb5f639 100644
--- a/themes/base16-irblack.rasi
+++ b/themes/base16-irblack.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-isotope.rasi b/themes/base16-isotope.rasi
index 848aa6a..370a116 100644
--- a/themes/base16-isotope.rasi
+++ b/themes/base16-isotope.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-london-tube.config b/themes/base16-london-tube.config
deleted file mode 100644
index 8e3fbb4..0000000
--- a/themes/base16-london-tube.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 London Tube
-! Author: Jan T. Sott
-
-! base00: #231f20
-! base01: #1c3f95
-! base02: #5a5758
-! base03: #737171
-! base04: #959ca1
-! base05: #d9d8d8
-! base06: #e7e7e8
-! base07: #ffffff
-! base08: #ee2e24
-! base09: #f386a1
-! base0A: #ffd204
-! base0B: #00853e
-! base0C: #85cebc
-! base0D: #009ddc
-! base0E: #98005d
-! base0F: #b06110
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #1c3f95, #1c3f95, #231f20
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #1c3f95, #d9d8d8, #1c3f95, #1c3f95, #ffffff
-rofi.color-active:  #1c3f95, #009ddc, #1c3f95, #1c3f95, #009ddc
-rofi.color-urgent:  #1c3f95, #ee2e24, #1c3f95, #1c3f95, #ee2e24
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-macintosh.rasi b/themes/base16-macintosh.rasi
index b178453..0f727d8 100644
--- a/themes/base16-macintosh.rasi
+++ b/themes/base16-macintosh.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-marrakesh.rasi b/themes/base16-marrakesh.rasi
index 3c0172d..8d0b876 100644
--- a/themes/base16-marrakesh.rasi
+++ b/themes/base16-marrakesh.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-materia.config b/themes/base16-materia.config
index f64b741..c77bdf1 100644
--- a/themes/base16-materia.config
+++ b/themes/base16-materia.config
@@ -2,32 +2,32 @@
 ! Author: Defman21
 
 ! base00: #263238
-! base01: #2c393f
-! base02: #37474f
+! base01: #2C393F
+! base02: #37474F
 ! base03: #707880
-! base04: #c9ccd3
-! base05: #cdd3de
-! base06: #d5dbe5
-! base07: #ffffff
-! base08: #ec5f67
-! base09: #ea9560
-! base0A: #ffcc00
-! base0B: #8bd649
-! base0C: #80cbc4
-! base0D: #89ddff
-! base0E: #82aaff
-! base0F: #ec5f67
+! base04: #C9CCD3
+! base05: #CDD3DE
+! base06: #D5DBE5
+! base07: #FFFFFF
+! base08: #EC5F67
+! base09: #EA9560
+! base0A: #FFCC00
+! base0B: #8BD649
+! base0C: #80CBC4
+! base0D: #89DDFF
+! base0E: #82AAFF
+! base0F: #EC5F67
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #2c393f, #2c393f, #263238
+rofi.color-window:  #2C393F, #2C393F, #263238
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #2c393f, #cdd3de, #2c393f, #2c393f, #ffffff
-rofi.color-active:  #2c393f, #89ddff, #2c393f, #2c393f, #89ddff
-rofi.color-urgent:  #2c393f, #ec5f67, #2c393f, #2c393f, #ec5f67
+rofi.color-normal:  #2C393F, #CDD3DE, #2C393F, #2C393F, #FFFFFF
+rofi.color-active:  #2C393F, #89DDFF, #2C393F, #2C393F, #89DDFF
+rofi.color-urgent:  #2C393F, #EC5F67, #2C393F, #2C393F, #EC5F67
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-materia.rasi b/themes/base16-materia.rasi
index b2fdea1..0b66a14 100644
--- a/themes/base16-materia.rasi
+++ b/themes/base16-materia.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-material-darker.config b/themes/base16-material-darker.config
index 65af95c..afde39b 100755..100644
--- a/themes/base16-material-darker.config
+++ b/themes/base16-material-darker.config
@@ -4,19 +4,19 @@
 ! base00: #212121
 ! base01: #303030
 ! base02: #353535
-! base03: #4a4a4a
-! base04: #b2ccd6
-! base05: #eeffff
-! base06: #eeffff
-! base07: #ffffff
-! base08: #f07178
-! base09: #f78c6c
-! base0A: #ffcb6b
-! base0B: #c3e88d
-! base0C: #89ddff
-! base0D: #82aaff
-! base0E: #c792ea
-! base0F: #ff5370
+! base03: #4A4A4A
+! base04: #B2CCD6
+! base05: #EEFFFF
+! base06: #EEFFFF
+! base07: #FFFFFF
+! base08: #F07178
+! base09: #F78C6C
+! base0A: #FFCB6B
+! base0B: #C3E88D
+! base0C: #89DDFF
+! base0D: #82AAFF
+! base0E: #C792EA
+! base0F: #FF5370
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
@@ -25,9 +25,9 @@ rofi.color-enabled: true
 rofi.color-window:  #303030, #303030, #212121
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #303030, #eeffff, #303030, #303030, #ffffff
-rofi.color-active:  #303030, #82aaff, #303030, #303030, #82aaff
-rofi.color-urgent:  #303030, #f07178, #303030, #303030, #f07178
+rofi.color-normal:  #303030, #EEFFFF, #303030, #303030, #FFFFFF
+rofi.color-active:  #303030, #82AAFF, #303030, #303030, #82AAFF
+rofi.color-urgent:  #303030, #F07178, #303030, #303030, #F07178
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-material-darker.rasi b/themes/base16-material-darker.rasi
index d71c284..81920c0 100644
--- a/themes/base16-material-darker.rasi
+++ b/themes/base16-material-darker.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-material-lighter.config b/themes/base16-material-lighter.config
index 33fc608..d0d2ff2 100755..100644
--- a/themes/base16-material-lighter.config
+++ b/themes/base16-material-lighter.config
@@ -1,33 +1,33 @@
 ! Base16 Material Lighter
 ! Author: Nate Peterson
 
-! base00: #fafafa
-! base01: #e7eaec
-! base02: #cceae7
-! base03: #ccd7da
-! base04: #8796b0
-! base05: #80cbc4
-! base06: #80cbc4
-! base07: #ffffff
-! base08: #ff5370
-! base09: #f76d47
-! base0A: #ffb62c
-! base0B: #91b859
-! base0C: #39adb5
-! base0D: #6182b8
-! base0E: #7c4dff
-! base0F: #e53935
+! base00: #FAFAFA
+! base01: #E7EAEC
+! base02: #CCEAE7
+! base03: #CCD7DA
+! base04: #8796B0
+! base05: #80CBC4
+! base06: #80CBC4
+! base07: #FFFFFF
+! base08: #FF5370
+! base09: #F76D47
+! base0A: #FFB62C
+! base0B: #91B859
+! base0C: #39ADB5
+! base0D: #6182B8
+! base0E: #7C4DFF
+! base0F: #E53935
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #e7eaec, #e7eaec, #fafafa
+rofi.color-window:  #E7EAEC, #E7EAEC, #FAFAFA
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #e7eaec, #80cbc4, #e7eaec, #e7eaec, #ffffff
-rofi.color-active:  #e7eaec, #6182b8, #e7eaec, #e7eaec, #6182b8
-rofi.color-urgent:  #e7eaec, #ff5370, #e7eaec, #e7eaec, #ff5370
+rofi.color-normal:  #E7EAEC, #80CBC4, #E7EAEC, #E7EAEC, #FFFFFF
+rofi.color-active:  #E7EAEC, #6182B8, #E7EAEC, #E7EAEC, #6182B8
+rofi.color-urgent:  #E7EAEC, #FF5370, #E7EAEC, #E7EAEC, #FF5370
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-material-lighter.rasi b/themes/base16-material-lighter.rasi
index fa00660..b7f80fa 100644
--- a/themes/base16-material-lighter.rasi
+++ b/themes/base16-material-lighter.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-material-palenight.config b/themes/base16-material-palenight.config
index b3a63f6..c563a5f 100755..100644
--- a/themes/base16-material-palenight.config
+++ b/themes/base16-material-palenight.config
@@ -1,33 +1,33 @@
 ! Base16 Material Palenight
 ! Author: Nate Peterson
 
-! base00: #292d3e
+! base00: #292D3E
 ! base01: #444267
-! base02: #32374d
-! base03: #676e95
-! base04: #8796b0
-! base05: #959dcb
-! base06: #959dcb
-! base07: #ffffff
-! base08: #f07178
-! base09: #f78c6c
-! base0A: #ffcb6b
-! base0B: #c3e88d
-! base0C: #89ddff
-! base0D: #82aaff
-! base0E: #c792ea
-! base0F: #ff5370
+! base02: #32374D
+! base03: #676E95
+! base04: #8796B0
+! base05: #959DCB
+! base06: #959DCB
+! base07: #FFFFFF
+! base08: #F07178
+! base09: #F78C6C
+! base0A: #FFCB6B
+! base0B: #C3E88D
+! base0C: #89DDFF
+! base0D: #82AAFF
+! base0E: #C792EA
+! base0F: #FF5370
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #444267, #444267, #292d3e
+rofi.color-window:  #444267, #444267, #292D3E
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #444267, #959dcb, #444267, #444267, #ffffff
-rofi.color-active:  #444267, #82aaff, #444267, #444267, #82aaff
-rofi.color-urgent:  #444267, #f07178, #444267, #444267, #f07178
+rofi.color-normal:  #444267, #959DCB, #444267, #444267, #FFFFFF
+rofi.color-active:  #444267, #82AAFF, #444267, #444267, #82AAFF
+rofi.color-urgent:  #444267, #F07178, #444267, #444267, #F07178
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-material-palenight.rasi b/themes/base16-material-palenight.rasi
index 4ef65fd..2cc20c5 100644
--- a/themes/base16-material-palenight.rasi
+++ b/themes/base16-material-palenight.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-material.config b/themes/base16-material.config
index 9c2526d..40deef0 100755..100644
--- a/themes/base16-material.config
+++ b/themes/base16-material.config
@@ -2,32 +2,32 @@
 ! Author: Nate Peterson
 
 ! base00: #263238
-! base01: #2e3c43
+! 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
+! 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
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #2e3c43, #2e3c43, #263238
+rofi.color-window:  #2E3C43, #2E3C43, #263238
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #2e3c43, #eeffff, #2e3c43, #2e3c43, #ffffff
-rofi.color-active:  #2e3c43, #82aaff, #2e3c43, #2e3c43, #82aaff
-rofi.color-urgent:  #2e3c43, #f07178, #2e3c43, #2e3c43, #f07178
+rofi.color-normal:  #2E3C43, #EEFFFF, #2E3C43, #2E3C43, #FFFFFF
+rofi.color-active:  #2E3C43, #82AAFF, #2E3C43, #2E3C43, #82AAFF
+rofi.color-urgent:  #2E3C43, #F07178, #2E3C43, #2E3C43, #F07178
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-material.rasi b/themes/base16-material.rasi
index bf85594..e627c8d 100644
--- a/themes/base16-material.rasi
+++ b/themes/base16-material.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-mellow-purple.config b/themes/base16-mellow-purple.config
index 36054af..0b63162 100755..100644
--- a/themes/base16-mellow-purple.config
+++ b/themes/base16-mellow-purple.config
@@ -2,7 +2,7 @@
 ! Author: gidsi
 
 ! base00: #1e0528
-! base01: #1a092d
+! base01: #1A092D
 ! base02: #331354
 ! base03: #320f55
 ! base04: #873582
@@ -22,12 +22,12 @@
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #1a092d, #1a092d, #1e0528
+rofi.color-window:  #1A092D, #1A092D, #1e0528
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #1a092d, #ffeeff, #1a092d, #1a092d, #f8c0ff
-rofi.color-active:  #1a092d, #550068, #1a092d, #1a092d, #550068
-rofi.color-urgent:  #1a092d, #00d9e9, #1a092d, #1a092d, #00d9e9
+rofi.color-normal:  #1A092D, #ffeeff, #1A092D, #1A092D, #f8c0ff
+rofi.color-active:  #1A092D, #550068, #1A092D, #1A092D, #550068
+rofi.color-urgent:  #1A092D, #00d9e9, #1A092D, #1A092D, #00d9e9
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-mellow-purple.rasi b/themes/base16-mellow-purple.rasi
index b708c4c..ebb946d 100644
--- a/themes/base16-mellow-purple.rasi
+++ b/themes/base16-mellow-purple.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-mexico-light.rasi b/themes/base16-mexico-light.rasi
index 525aa4c..11ae009 100644
--- a/themes/base16-mexico-light.rasi
+++ b/themes/base16-mexico-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-mocha.config b/themes/base16-mocha.config
index 30bffb3..438e387 100644
--- a/themes/base16-mocha.config
+++ b/themes/base16-mocha.config
@@ -1,7 +1,7 @@
 ! Base16 Mocha
 ! Author: Chris Kempson (http://chriskempson.com)
 
-! base00: #3b3228
+! base00: #3B3228
 ! base01: #534636
 ! base02: #645240
 ! base03: #7e705a
@@ -22,7 +22,7 @@
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #534636, #534636, #3b3228
+rofi.color-window:  #534636, #534636, #3B3228
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
 rofi.color-normal:  #534636, #d0c8c6, #534636, #534636, #f5eeeb
diff --git a/themes/base16-mocha.rasi b/themes/base16-mocha.rasi
index ec93f3d..d7ffa50 100644
--- a/themes/base16-mocha.rasi
+++ b/themes/base16-mocha.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-monokai.rasi b/themes/base16-monokai.rasi
index 135d2dd..9d54b53 100644
--- a/themes/base16-monokai.rasi
+++ b/themes/base16-monokai.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-nord.config b/themes/base16-nord.config
index 63b58ec..9e39a59 100644
--- a/themes/base16-nord.config
+++ b/themes/base16-nord.config
@@ -1,33 +1,33 @@
 ! Base16 Nord
 ! Author: arcticicestudio
 
-! base00: #2e3440
-! base01: #3b4252
-! base02: #434c5e
-! base03: #4c566a
-! base04: #d8dee9
-! base05: #e5e9f0
-! base06: #eceff4
-! base07: #8fbcbb
-! base08: #88c0d0
-! base09: #81a1c1
-! base0A: #5e81ac
-! base0B: #bf616a
-! base0C: #d08770
-! base0D: #ebcb8b
-! base0E: #a3be8c
-! base0F: #b48ead
+! base00: #2E3440
+! base01: #3B4252
+! base02: #434C5E
+! base03: #4C566A
+! base04: #D8DEE9
+! base05: #E5E9F0
+! base06: #ECEFF4
+! base07: #8FBCBB
+! base08: #88C0D0
+! base09: #81A1C1
+! base0A: #5E81AC
+! base0B: #BF616A
+! base0C: #D08770
+! base0D: #EBCB8B
+! base0E: #A3BE8C
+! base0F: #B48EAD
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #3b4252, #3b4252, #2e3440
+rofi.color-window:  #3B4252, #3B4252, #2E3440
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #3b4252, #e5e9f0, #3b4252, #3b4252, #8fbcbb
-rofi.color-active:  #3b4252, #ebcb8b, #3b4252, #3b4252, #ebcb8b
-rofi.color-urgent:  #3b4252, #88c0d0, #3b4252, #3b4252, #88c0d0
+rofi.color-normal:  #3B4252, #E5E9F0, #3B4252, #3B4252, #8FBCBB
+rofi.color-active:  #3B4252, #EBCB8B, #3B4252, #3B4252, #EBCB8B
+rofi.color-urgent:  #3B4252, #88C0D0, #3B4252, #3B4252, #88C0D0
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-nord.rasi b/themes/base16-nord.rasi
index 5af22b6..e51e26b 100644
--- a/themes/base16-nord.rasi
+++ b/themes/base16-nord.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-ocean.rasi b/themes/base16-ocean.rasi
index 9c7d610..80990ae 100644
--- a/themes/base16-ocean.rasi
+++ b/themes/base16-ocean.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-oceanicnext.config b/themes/base16-oceanicnext.config
index 779cbae..f29c838 100644
--- a/themes/base16-oceanicnext.config
+++ b/themes/base16-oceanicnext.config
@@ -1,33 +1,33 @@
 ! Base16 OceanicNext
 ! Author: https://github.com/voronianski/oceanic-next-color-scheme
 
-! base00: #1b2b34
-! base01: #343d46
-! base02: #4f5b66
-! base03: #65737e
-! base04: #a7adba
-! base05: #c0c5ce
-! base06: #cdd3de
-! base07: #d8dee9
-! base08: #ec5f67
-! base09: #f99157
-! base0A: #fac863
-! base0B: #99c794
-! base0C: #5fb3b3
-! base0D: #6699cc
-! base0E: #c594c5
-! base0F: #ab7967
+! base00: #1B2B34
+! base01: #343D46
+! base02: #4F5B66
+! base03: #65737E
+! base04: #A7ADBA
+! base05: #C0C5CE
+! base06: #CDD3DE
+! base07: #D8DEE9
+! base08: #EC5f67
+! base09: #F99157
+! base0A: #FAC863
+! base0B: #99C794
+! base0C: #5FB3B3
+! base0D: #6699CC
+! base0E: #C594C5
+! base0F: #AB7967
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #343d46, #343d46, #1b2b34
+rofi.color-window:  #343D46, #343D46, #1B2B34
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #343d46, #c0c5ce, #343d46, #343d46, #d8dee9
-rofi.color-active:  #343d46, #6699cc, #343d46, #343d46, #6699cc
-rofi.color-urgent:  #343d46, #ec5f67, #343d46, #343d46, #ec5f67
+rofi.color-normal:  #343D46, #C0C5CE, #343D46, #343D46, #D8DEE9
+rofi.color-active:  #343D46, #6699CC, #343D46, #343D46, #6699CC
+rofi.color-urgent:  #343D46, #EC5f67, #343D46, #343D46, #EC5f67
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-oceanicnext.rasi b/themes/base16-oceanicnext.rasi
index 4125a0d..8a3d95f 100644
--- a/themes/base16-oceanicnext.rasi
+++ b/themes/base16-oceanicnext.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-one-light.config b/themes/base16-one-light.config
index 76da780..76da780 100755..100644
--- a/themes/base16-one-light.config
+++ b/themes/base16-one-light.config
diff --git a/themes/base16-one-light.rasi b/themes/base16-one-light.rasi
index 2600e45..fbc6a7b 100644
--- a/themes/base16-one-light.rasi
+++ b/themes/base16-one-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-onedark.rasi b/themes/base16-onedark.rasi
index a56450a..92f6911 100644
--- a/themes/base16-onedark.rasi
+++ b/themes/base16-onedark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-paraiso.rasi b/themes/base16-paraiso.rasi
index 3c2dda7..7d9daef 100644
--- a/themes/base16-paraiso.rasi
+++ b/themes/base16-paraiso.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-phd.rasi b/themes/base16-phd.rasi
index d7459ec..a2c50f1 100644
--- a/themes/base16-phd.rasi
+++ b/themes/base16-phd.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-pico.rasi b/themes/base16-pico.rasi
index 3e41584..7003cb1 100644
--- a/themes/base16-pico.rasi
+++ b/themes/base16-pico.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-pop.rasi b/themes/base16-pop.rasi
index 17dc476..958ffd9 100644
--- a/themes/base16-pop.rasi
+++ b/themes/base16-pop.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-porple.config b/themes/base16-porple.config
index acad9d3..acad9d3 100755..100644
--- a/themes/base16-porple.config
+++ b/themes/base16-porple.config
diff --git a/themes/base16-porple.rasi b/themes/base16-porple.rasi
index 2681a9f..a0c8a29 100644
--- a/themes/base16-porple.rasi
+++ b/themes/base16-porple.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-railscasts.rasi b/themes/base16-railscasts.rasi
index 0a9b317..8fb14cb 100644
--- a/themes/base16-railscasts.rasi
+++ b/themes/base16-railscasts.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-rebecca.rasi b/themes/base16-rebecca.rasi
index 7a85f61..55519d6 100644
--- a/themes/base16-rebecca.rasi
+++ b/themes/base16-rebecca.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-seti-ui.config b/themes/base16-seti-ui.config
deleted file mode 100644
index 8073863..0000000
--- a/themes/base16-seti-ui.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 Seti UI
-! Author: 
-
-! base00: #151718
-! base01: #8ec43d
-! base02: #3B758C
-! base03: #41535B
-! base04: #43a5d5
-! base05: #d6d6d6
-! base06: #eeeeee
-! base07: #ffffff
-! base08: #Cd3f45
-! base09: #db7b55
-! base0A: #e6cd69
-! base0B: #9fca56
-! base0C: #55dbbe
-! base0D: #55b5db
-! base0E: #a074c4
-! base0F: #8a553f
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #8ec43d, #8ec43d, #151718
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #8ec43d, #d6d6d6, #8ec43d, #8ec43d, #ffffff
-rofi.color-active:  #8ec43d, #55b5db, #8ec43d, #8ec43d, #55b5db
-rofi.color-urgent:  #8ec43d, #Cd3f45, #8ec43d, #8ec43d, #Cd3f45
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-seti.config b/themes/base16-seti.config
index e003c4a..acc6222 100755..100644
--- a/themes/base16-seti.config
+++ b/themes/base16-seti.config
@@ -3,13 +3,13 @@
 
 ! base00: #151718
 ! base01: #282a2b
-! base02: #3b758c
-! base03: #41535b
+! base02: #3B758C
+! base03: #41535B
 ! base04: #43a5d5
 ! base05: #d6d6d6
 ! base06: #eeeeee
 ! base07: #ffffff
-! base08: #cd3f45
+! base08: #Cd3f45
 ! base09: #db7b55
 ! base0A: #e6cd69
 ! base0B: #9fca56
@@ -27,7 +27,7 @@ rofi.color-window:  #282a2b, #282a2b, #151718
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
 rofi.color-normal:  #282a2b, #d6d6d6, #282a2b, #282a2b, #ffffff
 rofi.color-active:  #282a2b, #55b5db, #282a2b, #282a2b, #55b5db
-rofi.color-urgent:  #282a2b, #cd3f45, #282a2b, #282a2b, #cd3f45
+rofi.color-urgent:  #282a2b, #Cd3f45, #282a2b, #282a2b, #Cd3f45
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-seti.rasi b/themes/base16-seti.rasi
index 7321bee..fa65296 100644
--- a/themes/base16-seti.rasi
+++ b/themes/base16-seti.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-shapeshifter.rasi b/themes/base16-shapeshifter.rasi
index 674d67f..2a0d388 100644
--- a/themes/base16-shapeshifter.rasi
+++ b/themes/base16-shapeshifter.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-solar-flare.config b/themes/base16-solar-flare.config
deleted file mode 100644
index 13cb137..0000000
--- a/themes/base16-solar-flare.config
+++ /dev/null
@@ -1,33 +0,0 @@
-! Base16 Solar Flare
-! Author: Chuck Harmston (https://chuck.harmston.ch)
-
-! base00: #18262F
-! base01: #222E38
-! base02: #586875
-! base03: #667581
-! base04: #85939E
-! base05: #A6AFB8
-! base06: #E8E9ED
-! base07: #F5F7FA
-! base08: #EF5253
-! base09: #E66B2B
-! base0A: #E4B51C
-! base0B: #7CC844
-! base0C: #52CBB0
-! base0D: #33B5E1
-! base0E: #A363D5
-! base0F: #D73C9A
-
-! Enable the extended coloring options
-rofi.color-enabled: true
-
-! Property Name     BG       Border   Separator
-rofi.color-window:  #222E38, #222E38, #18262F
-
-! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #222E38, #A6AFB8, #222E38, #222E38, #F5F7FA
-rofi.color-active:  #222E38, #33B5E1, #222E38, #222E38, #33B5E1
-rofi.color-urgent:  #222E38, #EF5253, #222E38, #222E38, #EF5253
-
-! Set the desired separator style
-rofi.separator-style: solid
diff --git a/themes/base16-solarflare.config b/themes/base16-solarflare.config
index a87d818..13cb137 100755..100644
--- a/themes/base16-solarflare.config
+++ b/themes/base16-solarflare.config
@@ -1,33 +1,33 @@
 ! Base16 Solar Flare
 ! Author: Chuck Harmston (https://chuck.harmston.ch)
 
-! base00: #18262f
-! base01: #222e38
+! base00: #18262F
+! base01: #222E38
 ! base02: #586875
 ! base03: #667581
-! base04: #85939e
-! base05: #a6afb8
-! base06: #e8e9ed
-! base07: #f5f7fa
-! base08: #ef5253
-! base09: #e66b2b
-! base0A: #e4b51c
-! base0B: #7cc844
-! base0C: #52cbb0
-! base0D: #33b5e1
-! base0E: #a363d5
-! base0F: #d73c9a
+! base04: #85939E
+! base05: #A6AFB8
+! base06: #E8E9ED
+! base07: #F5F7FA
+! base08: #EF5253
+! base09: #E66B2B
+! base0A: #E4B51C
+! base0B: #7CC844
+! base0C: #52CBB0
+! base0D: #33B5E1
+! base0E: #A363D5
+! base0F: #D73C9A
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #222e38, #222e38, #18262f
+rofi.color-window:  #222E38, #222E38, #18262F
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #222e38, #a6afb8, #222e38, #222e38, #f5f7fa
-rofi.color-active:  #222e38, #33b5e1, #222e38, #222e38, #33b5e1
-rofi.color-urgent:  #222e38, #ef5253, #222e38, #222e38, #ef5253
+rofi.color-normal:  #222E38, #A6AFB8, #222E38, #222E38, #F5F7FA
+rofi.color-active:  #222E38, #33B5E1, #222E38, #222E38, #33B5E1
+rofi.color-urgent:  #222E38, #EF5253, #222E38, #222E38, #EF5253
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-solarflare.rasi b/themes/base16-solarflare.rasi
index f708982..438c262 100644
--- a/themes/base16-solarflare.rasi
+++ b/themes/base16-solarflare.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-solarized-dark.rasi b/themes/base16-solarized-dark.rasi
index 7686333..98c9c7a 100644
--- a/themes/base16-solarized-dark.rasi
+++ b/themes/base16-solarized-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-solarized-light.rasi b/themes/base16-solarized-light.rasi
index 325e782..e632bf5 100644
--- a/themes/base16-solarized-light.rasi
+++ b/themes/base16-solarized-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-spacemacs.rasi b/themes/base16-spacemacs.rasi
index 5ec0715..53e7d09 100644
--- a/themes/base16-spacemacs.rasi
+++ b/themes/base16-spacemacs.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-summerfruit-dark.config b/themes/base16-summerfruit-dark.config
index c21a5aa..74be359 100644
--- a/themes/base16-summerfruit-dark.config
+++ b/themes/base16-summerfruit-dark.config
@@ -5,18 +5,18 @@
 ! base01: #202020
 ! base02: #303030
 ! base03: #505050
-! base04: #b0b0b0
-! base05: #d0d0d0
-! base06: #e0e0e0
-! base07: #ffffff
-! base08: #ff0086
-! base09: #fd8900
-! base0A: #aba800
-! base0B: #00c918
-! base0C: #1faaaa
-! base0D: #3777e6
-! base0E: #ad00a1
-! base0F: #cc6633
+! base04: #B0B0B0
+! base05: #D0D0D0
+! base06: #E0E0E0
+! base07: #FFFFFF
+! base08: #FF0086
+! base09: #FD8900
+! base0A: #ABA800
+! base0B: #00C918
+! base0C: #1FAAAA
+! base0D: #3777E6
+! base0E: #AD00A1
+! base0F: #CC6633
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
@@ -25,9 +25,9 @@ rofi.color-enabled: true
 rofi.color-window:  #202020, #202020, #151515
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #202020, #d0d0d0, #202020, #202020, #ffffff
-rofi.color-active:  #202020, #3777e6, #202020, #202020, #3777e6
-rofi.color-urgent:  #202020, #ff0086, #202020, #202020, #ff0086
+rofi.color-normal:  #202020, #D0D0D0, #202020, #202020, #FFFFFF
+rofi.color-active:  #202020, #3777E6, #202020, #202020, #3777E6
+rofi.color-urgent:  #202020, #FF0086, #202020, #202020, #FF0086
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-summerfruit-dark.rasi b/themes/base16-summerfruit-dark.rasi
index 0809fc8..b35abfa 100644
--- a/themes/base16-summerfruit-dark.rasi
+++ b/themes/base16-summerfruit-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-summerfruit-light.config b/themes/base16-summerfruit-light.config
index 99dfdc6..fc1179f 100644
--- a/themes/base16-summerfruit-light.config
+++ b/themes/base16-summerfruit-light.config
@@ -1,33 +1,33 @@
 ! Base16 Summerfruit Light
 ! Author: Christopher Corley (http://christop.club/)
 
-! base00: #ffffff
-! base01: #e0e0e0
-! base02: #d0d0d0
-! base03: #b0b0b0
+! base00: #FFFFFF
+! base01: #E0E0E0
+! base02: #D0D0D0
+! base03: #B0B0B0
 ! base04: #000000
 ! base05: #101010
 ! base06: #151515
 ! base07: #202020
-! base08: #ff0086
-! base09: #fd8900
-! base0A: #aba800
-! base0B: #00c918
-! base0C: #1faaaa
-! base0D: #3777e6
-! base0E: #ad00a1
-! base0F: #cc6633
+! base08: #FF0086
+! base09: #FD8900
+! base0A: #ABA800
+! base0B: #00C918
+! base0C: #1FAAAA
+! base0D: #3777E6
+! base0E: #AD00A1
+! base0F: #CC6633
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #e0e0e0, #e0e0e0, #ffffff
+rofi.color-window:  #E0E0E0, #E0E0E0, #FFFFFF
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #e0e0e0, #101010, #e0e0e0, #e0e0e0, #202020
-rofi.color-active:  #e0e0e0, #3777e6, #e0e0e0, #e0e0e0, #3777e6
-rofi.color-urgent:  #e0e0e0, #ff0086, #e0e0e0, #e0e0e0, #ff0086
+rofi.color-normal:  #E0E0E0, #101010, #E0E0E0, #E0E0E0, #202020
+rofi.color-active:  #E0E0E0, #3777E6, #E0E0E0, #E0E0E0, #3777E6
+rofi.color-urgent:  #E0E0E0, #FF0086, #E0E0E0, #E0E0E0, #FF0086
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-summerfruit-light.rasi b/themes/base16-summerfruit-light.rasi
index f222234..5e4a3a3 100644
--- a/themes/base16-summerfruit-light.rasi
+++ b/themes/base16-summerfruit-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-tomorrow-night.rasi b/themes/base16-tomorrow-night.rasi
index 9740c79..b4ac8b7 100644
--- a/themes/base16-tomorrow-night.rasi
+++ b/themes/base16-tomorrow-night.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-tomorrow.rasi b/themes/base16-tomorrow.rasi
index f5d876f..7841f5b 100644
--- a/themes/base16-tomorrow.rasi
+++ b/themes/base16-tomorrow.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-tube.config b/themes/base16-tube.config
index 8e3fbb4..8e3fbb4 100755..100644
--- a/themes/base16-tube.config
+++ b/themes/base16-tube.config
diff --git a/themes/base16-tube.rasi b/themes/base16-tube.rasi
index 9be57d7..62c6f56 100644
--- a/themes/base16-tube.rasi
+++ b/themes/base16-tube.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-twilight.rasi b/themes/base16-twilight.rasi
index b317b98..1bf964a 100644
--- a/themes/base16-twilight.rasi
+++ b/themes/base16-twilight.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-unikitty-dark.rasi b/themes/base16-unikitty-dark.rasi
index a54667d..d8b27da 100644
--- a/themes/base16-unikitty-dark.rasi
+++ b/themes/base16-unikitty-dark.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-unikitty-light.rasi b/themes/base16-unikitty-light.rasi
index bbdb8ba..4ceae01 100644
--- a/themes/base16-unikitty-light.rasi
+++ b/themes/base16-unikitty-light.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-woodland.rasi b/themes/base16-woodland.rasi
index 26fcdef..3c38f2d 100644
--- a/themes/base16-woodland.rasi
+++ b/themes/base16-woodland.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-xcode-dusk.config b/themes/base16-xcode-dusk.config
index 2b394a0..6a99120 100755..100644
--- a/themes/base16-xcode-dusk.config
+++ b/themes/base16-xcode-dusk.config
@@ -1,33 +1,33 @@
 ! Base16 XCode Dusk
 ! Author: Elsa Gonsiorowski (https://github.com/gonsie)
 
-! base00: #282b35
-! base01: #3d4048
-! base02: #53555d
-! base03: #686a71
-! base04: #7e8086
+! base00: #282B35
+! base01: #3D4048
+! base02: #53555D
+! base03: #686A71
+! base04: #7E8086
 ! base05: #939599
-! base06: #a9aaae
-! base07: #bebfc2
-! base08: #b21889
-! base09: #786dc5
+! base06: #A9AAAE
+! base07: #BEBFC2
+! base08: #B21889
+! base09: #786DC5
 ! base0A: #438288
-! base0B: #df0002
-! base0C: #00a0be
-! base0D: #790ead
-! base0E: #b21889
-! base0F: #c77c48
+! base0B: #DF0002
+! base0C: #00A0BE
+! base0D: #790EAD
+! base0E: #B21889
+! base0F: #C77C48
 
 ! Enable the extended coloring options
 rofi.color-enabled: true
 
 ! Property Name     BG       Border   Separator
-rofi.color-window:  #3d4048, #3d4048, #282b35
+rofi.color-window:  #3D4048, #3D4048, #282B35
 
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
-rofi.color-normal:  #3d4048, #939599, #3d4048, #3d4048, #bebfc2
-rofi.color-active:  #3d4048, #790ead, #3d4048, #3d4048, #790ead
-rofi.color-urgent:  #3d4048, #b21889, #3d4048, #3d4048, #b21889
+rofi.color-normal:  #3D4048, #939599, #3D4048, #3D4048, #BEBFC2
+rofi.color-active:  #3D4048, #790EAD, #3D4048, #3D4048, #790EAD
+rofi.color-urgent:  #3D4048, #B21889, #3D4048, #3D4048, #B21889
 
 ! Set the desired separator style
 rofi.separator-style: solid
diff --git a/themes/base16-xcode-dusk.rasi b/themes/base16-xcode-dusk.rasi
index e486865..7acb1d1 100644
--- a/themes/base16-xcode-dusk.rasi
+++ b/themes/base16-xcode-dusk.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}
diff --git a/themes/base16-zenburn.config b/themes/base16-zenburn.config
index 18ab045..18ab045 100755..100644
--- a/themes/base16-zenburn.config
+++ b/themes/base16-zenburn.config
diff --git a/themes/base16-zenburn.rasi b/themes/base16-zenburn.rasi
index e9262b3..922d148 100644
--- a/themes/base16-zenburn.rasi
+++ b/themes/base16-zenburn.rasi
@@ -33,24 +33,24 @@
     active-background:           @background;
     selected-active-background:  @blue;
 }
-#window {
+window {
     background-color: @background;
     border:           1;
     padding:          5;
 }
-#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:       2px dash 0px 0px ;
     border-color: @separatorcolor;
@@ -58,79 +58,86 @@
     scrollbar:    true;
     padding:      2px 0px 0px ;
 }
-#element {
+element {
     border:  0;
     padding: 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-color: @normal-foreground;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button {
+button {
     spacing:    0;
     text-color: @normal-foreground;
 }
-#button.selected {
+button selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
-    spacing:    0;
+inputbar {
+    spacing:    0px;
     text-color: @normal-foreground;
     padding:    1px ;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
-#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;
 }
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em ;
+    text-color: inherit;
+}