Merge pull request #927 from JaKooLit/development

Merge Development to main branch for release 

12 files changed, 66 insertions, 52 deletions

diff --git a/config/rofi/themes/KooL_style-1.rasi b/config/rofi/themes/KooL_style-1.rasi
index 89bb959e..0e2eb709 100644
--- a/config/rofi/themes/KooL_style-1.rasi
+++ b/config/rofi/themes/KooL_style-1.rasi
@@ -25,7 +25,7 @@ configuration {
     background-alt:              @color1;
     selected:                    @color12;
     active:                      @color11;
-    urgent:                      red;
+    urgent:                      @color13;
 
     text-selected:               @background;
     text-color:                  @foreground;
diff --git a/config/rofi/themes/KooL_style-13-Vertical.rasi b/config/rofi/themes/KooL_style-13-Vertical.rasi
index 1e7f8337..850b564c 100644
--- a/config/rofi/themes/KooL_style-13-Vertical.rasi
+++ b/config/rofi/themes/KooL_style-13-Vertical.rasi
@@ -25,7 +25,7 @@ configuration {
     background-alt:              @color10;
     selected:                    @color12;
     active:                      @color11;
-    urgent:                      red;
+    urgent:                      @color13;
 
     text-selected:               @background;
     text-color:                  @foreground;
diff --git a/config/rofi/themes/KooL_style-14.rasi b/config/rofi/themes/KooL_style-14.rasi
index a766cb96..fddf18bd 100644
--- a/config/rofi/themes/KooL_style-14.rasi
+++ b/config/rofi/themes/KooL_style-14.rasi
@@ -19,7 +19,7 @@ configuration {
     background-alt:              @color0;
     selected:                    @color13;
     active:                      @color12;
-    urgent:                      #8E3596;
+    urgent:                      @color13;
 }
 
 /*****----- Main Window -----*****/
diff --git a/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi b/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi
index 4efe106c..542f3a1f 100644
--- a/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi
+++ b/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi
@@ -23,10 +23,10 @@ configuration {
 /* ---- Global Properties ---- */
 * {
 
-    background-alt:              @selected-active-background; // Buttons background
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
+    background-alt:              @color0; // neutral background
+    selected:                    @color12; // accent
+    active:                      @color11; // secondary
+    urgent:                      @color13; // alert
 
     text-selected:               @background;
     text-color:                  @foreground;
@@ -150,7 +150,7 @@ button {
 }
 button selected {
     background-color:            @selected;
-    text-color:                  @text-selected;
+    text-color:                  @background;
 }
 
 /* ---- Scrollbar ---- */
@@ -191,8 +191,8 @@ element selected.normal {
     border:                      0px 3px 0px 3px;
     border-radius:               16px;
     border-color:                @selected;
-    background-color:            transparent;
-    text-color:                  @background-alt;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 
 element selected.urgent {
diff --git a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi
index 7e771105..37e515a9 100644
--- a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi
+++ b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi
@@ -26,7 +26,7 @@ configuration {
     background-alt: @color7;
     selected:       @color12;
     active:         @color11;
-    urgent:         red;
+    urgent:         @color13;
     
     border-color:                @selected;
     handle-color:                @selected;
diff --git a/config/rofi/themes/KooL_style-4.rasi b/config/rofi/themes/KooL_style-4.rasi
index ea7b1977..b1859c37 100644
--- a/config/rofi/themes/KooL_style-4.rasi
+++ b/config/rofi/themes/KooL_style-4.rasi
@@ -22,12 +22,13 @@ configuration {
 
 /*****----- Global Properties -----*****/
 * {
-    background-alt: @color1;
+    background-alt: @color0;
+    /* selected uses color12, active uses color11 (match other working styles) */
     selected:       @color12;
     active:         @color11;
-    urgent:         #F7768E;
+    urgent:         @color13;
     
-    border-color:                @color11;
+    border-color:                @active;
     handle-color:                @selected;
     background-color:            @background;
     foreground-color:            @foreground;
@@ -38,12 +39,13 @@ configuration {
     urgent-foreground:           @background;
     active-background:           @active;
     active-foreground:           @background;
+    /* force selection to use the selected accent, not imported selected-* values */
     selected-normal-background:  @selected;
     selected-normal-foreground:  @background;
-    selected-urgent-background:  @active;
+    selected-urgent-background:  @selected;
     selected-urgent-foreground:  @background;
-    selected-active-background:  @urgent;
-    selected-active-foreground:  @color12;
+    selected-active-background:  @selected;
+    selected-active-foreground:  @background;
     alternate-normal-background: @background;
     alternate-normal-foreground: @foreground;
     alternate-urgent-background: @urgent;
@@ -219,16 +221,16 @@ element normal.active {
 
 element-text selected,
 element selected.normal {
-    background-color:            @selected-normal-background;
-    text-color:                  @selected-normal-foreground;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 element selected.urgent {
-    background-color:            @selected-urgent-background;
-    text-color:                  @selected-urgent-foreground;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 element selected.active {
-    background-color:            @selected-active-background;
-    text-color:                  @selected-active-foreground;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 element alternate.normal {
     background-color:            @alternate-normal-background;
@@ -285,8 +287,8 @@ button selected {
     border:                      2px 0px 2px 2px;
     border-radius:               6px;
     border-color:                @border-color;
-    background-color:            @selected-normal-foreground;
-    text-color:                  @selected-normal-background;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 
 /*****----- Message -----*****/
diff --git a/config/rofi/themes/KooL_style-5.rasi b/config/rofi/themes/KooL_style-5.rasi
index 94555ebb..72ec7675 100644
--- a/config/rofi/themes/KooL_style-5.rasi
+++ b/config/rofi/themes/KooL_style-5.rasi
@@ -26,7 +26,7 @@ configuration {
     background-alt:              @color1;
     selected:                    @color12;
     active:                      @color11;
-    urgent:                      red;
+    urgent:                      @color13;
 
     text-selected:               @background;
     text-color:                  @foreground;
@@ -140,10 +140,9 @@ button {
 
 button selected {
     background-color:          @selected;
-    text-color:                @foreground;
+    text-color:                @background;
     border:                    1px;
     border-color:              transparent;
-	
 }
 
 /* ---- Listview ---- */
@@ -203,8 +202,8 @@ element normal.active {
 
 element-text selected,
 element selected.normal {
-    background-color:           @active;
-    text-color:                 inherit;
+    background-color:           @selected;
+    text-color:                 @background;
 }
 
 element selected.urgent {
diff --git a/config/rofi/themes/KooL_style-6.rasi b/config/rofi/themes/KooL_style-6.rasi
index c0b1eaa6..a25eaa19 100644
--- a/config/rofi/themes/KooL_style-6.rasi
+++ b/config/rofi/themes/KooL_style-6.rasi
@@ -26,7 +26,7 @@ configuration {
     background-alt:              @color1;
     selected:                    @color12;
     active:                      @color11;
-    urgent:                      red;
+    urgent:                      @color13;
 
     text-selected:               @background;
     text-color:                  @foreground;
@@ -145,8 +145,8 @@ button {
     cursor:                      pointer;
 }
 button selected {
-    background-color:            @active;
-    text-color:                  @text-selected;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 
 
@@ -169,23 +169,28 @@ element normal.urgent {
     text-color:                  @foreground;
 }
 
-element-text selected,
+/* Separate rules so selected text does not paint a second background */
+element-text selected {
+    background-color:            transparent;
+    text-color:                  @background;
+}
+
 element normal.active {
     background-color:            @active;
     text-color:                  @foreground;
 }
 
 element selected.normal {
-    background-color:            @color11;
-    text-color:                  @text-selected;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 // Adapt rofi theme
 element alternate.normal {
diff --git a/config/rofi/themes/KooL_style-7.rasi b/config/rofi/themes/KooL_style-7.rasi
index b1a1a9a9..bea2ba47 100644
--- a/config/rofi/themes/KooL_style-7.rasi
+++ b/config/rofi/themes/KooL_style-7.rasi
@@ -23,10 +23,11 @@ configuration {
 
 /*****----- Global Properties -----*****/
 * {
-    background-alt:              @color1;
+    background-alt:              @color0;
+    /* selected uses color12, active uses color11 (match other working styles) */
     selected:                    @color12;
     active:                      @color11;
-    urgent:                      #8E3596;
+    urgent:                      @color13;
 }
 
 /*****----- Main Window -----*****/
@@ -153,8 +154,8 @@ element normal.normal {
 element-text selected,
 element selected.normal {
 	border-radius:               30px;
-    background-color:            @color11;
-    text-color:                  @foreground;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 element-icon {
     padding:                     0px;
diff --git a/config/rofi/themes/KooL_style-8.rasi b/config/rofi/themes/KooL_style-8.rasi
index e0ca3208..a3dea01a 100644
--- a/config/rofi/themes/KooL_style-8.rasi
+++ b/config/rofi/themes/KooL_style-8.rasi
@@ -23,6 +23,13 @@ configuration {
 /* ---- Global Properties ---- */
 * {
 
+    /* Define palette mappings used below */
+    selected:      @color12;   /* accent */
+    active:        @color11;   /* secondary */
+    urgent:        @color13;   /* alerts */
+    text-selected: @background; /* readable over accent */
+    text-color:    @foreground;
+
     border-width: 2px;
     border-radius: 12px;
 }
@@ -131,8 +138,8 @@ button {
 }
 
 button selected {
-    background-color:            @color12;
-    text-color:                  @foreground;
+    background-color:            @selected;
+    text-color:                  @background;
 }
 
 /* ---- Scrollbar ---- */
@@ -156,8 +163,8 @@ element {
 
 element-text selected,
 element selected.normal {
-    background-color:            @color11;
-    text-color:                  @foreground;
+    background-color:            @selected;
+    text-color:                  @background;
     border-radius:               1.5em;
 }
 
diff --git a/config/rofi/themes/KooL_style-9.rasi b/config/rofi/themes/KooL_style-9.rasi
index 6b1346f6..dc50f941 100644
--- a/config/rofi/themes/KooL_style-9.rasi
+++ b/config/rofi/themes/KooL_style-9.rasi
@@ -23,7 +23,7 @@ configuration {
 /*****----- Global Properties -----*****/
 * {    
     BG:    @background;
-    BGA:   @color11;
+    BGA:   @color12;
     FG:    @foreground;
     FGA:   #F28FADff;
     BDR:   @color12;
diff --git a/config/rofi/themes/saint-rofi.rasi b/config/rofi/themes/saint-rofi.rasi
index e85c678f..27fdea13 100644
--- a/config/rofi/themes/saint-rofi.rasi
+++ b/config/rofi/themes/saint-rofi.rasi
@@ -23,7 +23,7 @@ configuration {
     background-alt:          @color1;
     selected:                @color12;
     active:                  @color11;
-    urgent:                  red;
+    urgent:                  @color13;
     text-selected:           @background;
     text-color:              @foreground;
     border-color:            @selected;
@@ -143,8 +143,8 @@ element normal.active {
 }
 
 element selected.normal {
-    background-color:        @color11;
-    text-color:              @text-selected;
+    background-color:            @selected;
+    text-color:              @background;
 }
 element selected.urgent {
     background-color:        @urgent;