update widget names, include colon

5 files changed, 146 insertions, 111 deletions

diff --git a/themes/c64.rasi b/themes/c64.rasi
index 986a473d..8c3c0957 100644
--- a/themes/c64.rasi
+++ b/themes/c64.rasi
@@ -35,27 +35,27 @@
     active-background:           rgba ( 0, 57, 255, 100 % );
     selected-active-background:  rgba ( 79, 128, 255, 100 % );
 }
-#window {
+window {
 	font: "Topaz-8 10";
     background-color: #4E7FFF;
     border:           1;
     padding:          5;
 }
-#mainbox {
+mainbox {
     border:  0;
     padding: 0;
     margin: 40;
     background-color: #003AFF;
 }
-#message {
+message {
     border:       1px dash 0px dash ;
     border-color: @separatorcolor;
     padding:      1px ;
 }
-#textbox {
+textbox {
     text-color: @foreground;
 }
-#listview {
+listview {
     fixed-height: 0;
     border:       0px 0px 0px 0px ;
     border-color: @separatorcolor;
@@ -63,74 +63,81 @@
     scrollbar:    false;
     padding:      5px 5px 5px ;
 }
-#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:        0px ;
     border:       0;
     handle-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button.selected {
+button.selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
+inputbar {
     spacing:    0;
     text-color: @normal-foreground;
     padding:    1px ;
+    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/glue_pro_blue.rasi b/themes/glue_pro_blue.rasi
index 9a3da6c7..4eb777c0 100644
--- a/themes/glue_pro_blue.rasi
+++ b/themes/glue_pro_blue.rasi
@@ -34,24 +34,24 @@
     active-background:           rgba ( 57, 57, 57, 100 % );
     selected-active-background:  rgba ( 38, 139, 210, 100 % );
 }
-#window {
+window {
     background-color: rgba ( 57, 57, 57, 95 % );
     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;
@@ -59,78 +59,85 @@
     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-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button.selected {
+button.selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#button {
+button {
     background-color: @background;
     text-color:       @foreground;
 }
-#inputbar {
+inputbar {
     spacing:    0;
     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/purple.rasi b/themes/purple.rasi
index b0d334f4..ee579cd2 100644
--- a/themes/purple.rasi
+++ b/themes/purple.rasi
@@ -34,24 +34,24 @@
     active-background:           rgba ( 47, 30, 46, 15 % );
     selected-active-background:  rgba ( 129, 91, 164, 33 % );
 }
-#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;
@@ -59,74 +59,81 @@
     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-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button.selected {
+button.selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
+inputbar {
     spacing:    0;
     text-color: @normal-foreground;
     padding:    1px ;
+    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/solarized.rasi b/themes/solarized.rasi
index 5356c509..0de6d2a6 100644
--- a/themes/solarized.rasi
+++ b/themes/solarized.rasi
@@ -34,24 +34,24 @@
     active-background:           rgba ( 0, 43, 55, 100 % );
     selected-active-background:  rgba ( 0, 54, 66, 100 % );
 }
-#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;
@@ -59,74 +59,81 @@
     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-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button.selected {
+button.selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
+inputbar {
     spacing:    0;
     text-color: @normal-foreground;
     padding:    1px ;
+    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/solarized_alternate.rasi b/themes/solarized_alternate.rasi
index 6c6fa7a7..58843149 100644
--- a/themes/solarized_alternate.rasi
+++ b/themes/solarized_alternate.rasi
@@ -34,24 +34,24 @@
     active-background:           rgba ( 0, 43, 55, 100 % );
     selected-active-background:  rgba ( 0, 142, 212, 100 % );
 }
-#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;
@@ -59,74 +59,81 @@
     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-width: 8px ;
     padding:      0;
 }
-#sidebar {
+sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
-#button.selected {
+button.selected {
     background-color: @selected-normal-background;
     text-color:       @selected-normal-foreground;
 }
-#inputbar {
+inputbar {
     spacing:    0;
     text-color: @normal-foreground;
     padding:    1px ;
+    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;
+}