diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml
index 9b3781eb9..713207618 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/cn.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "体积"
     ulm_popups_color: "顏色"
     ulm_radar: "雷达"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml
index 443813fe2..044e6a0fc 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/cs.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Hlasitost"
     ulm_popups_color: "Barva"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml
index 1f16b71f2..89bd27ab5 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/da.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volumen"
     ulm_popups_color: "Farve"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml
index 84b40122a..3b34ce4fd 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/de.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Lautstärke"
     ulm_popups_color: "Farbe"
     ulm_radar: "Radar"
+    ulm_popup_total: "Gesamt"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml
index 93d2c3bfa..8892417c9 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/en.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Color"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml
index 84ebd9eeb..72e5d063f 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volumen"
     ulm_popups_color: "Color"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml
index d3f78a6ec..ba720925a 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/fi.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Äänenvoimakkuus"
     ulm_popups_color: "Väri"
     ulm_radar: "Tutka"
+    ulm_popup_total: "Yhteensä"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml
index 966732ccf..4c7597ba1 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/fr.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Couleur"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml
index 89b7327f1..a287730ab 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/it.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Colore"
     ulm_radar: "Radar"
+    ulm_popup_total: "Totale"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml
index ebd499d7d..0d1694285 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/nl.yaml
@@ -14,3 +14,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Kleur"
     ulm_radar: "Radar"
+    ulm_popup_total: "Totaal"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml
index 47e6451dc..221e31348 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/no.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Farge"
     ulm_radar: "Radar"
+    ulm_popup_total: "Totalt"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml
index f6b960552..b099c8d01 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/pl.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Objętość"
     ulm_popups_color: "Kolor"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml
index fc593775b..42b8b89e7 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/pt-BR.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Cor"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml
index a6bb80f45..0dce099b8 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/pt.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Cor"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml
index fae2fe72b..61f788e1d 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/ru.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Объем"
     ulm_popups_color: "Цвет"
     ulm_radar: "Pадар"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml
index 1ec4dcf7f..4fe5afdd0 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/sk.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volume"
     ulm_popups_color: "Farba"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml
index 2d93e8fb4..223eb4b48 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/sv.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Volym"
     ulm_popups_color: "Färg"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml
index 25f8c73b6..0dc826481 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/tr.yaml
@@ -11,3 +11,4 @@ ulm_language_variables:
     ulm_volume: "Cilt"
     ulm_popups_color: "Renk"
     ulm_radar: "Radar"
+    ulm_popup_total: "Total"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_effect_row.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_effect_row.yaml
index 220e35e71..0df7de110 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_effect_row.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_effect_row.yaml
@@ -1,27 +1,6 @@
 ---
 popup_light_effect_row:
-  show_icon: false
-  show_name: true
-  show_label: false
-  extra_styles: |
-    ha-card:hover {
-      background-color: var(--primary-background-color);
-    }
-  styles:
-    grid:
-      - grid-template-areas: "n"
-    card:
-      - padding: "2px 0px"
-      - height: "42px"
-      - border-radius: "10px"
-      - width: "40vh"
-    name:
-      - align-self: "center"
-      - justify-self: "start"
-      - font-weight: "bold"
-      - font-size: "14px"
-      - margin-left: "12px"
-      - margin-right: "12px"
+  template: "popup_row_layout"
   name: >
     [[[
       var name = entity.attributes.effect_list[variables.ulm_popup_light_effect_entity_idx];
@@ -32,7 +11,10 @@ popup_light_effect_row:
       value: "[[[ return entity.attributes.effect == entity.attributes.effect_list[variables.ulm_popup_light_effect_entity_idx]; ]]]"
       styles:
         card:
-          - background-color: "rgba(var(--color-theme),0.2)"
+          - background-color: "rgba(var(--color-blue),0.1)"
+          - border: "none"
+        name:
+          - color: "rgba(var(--color-blue),1)"
   tap_action:
     action: "call-service"
     service: "light.turn_on"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_palette_row.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_palette_row.yaml
index 27ea51373..ca4f4cbde 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_palette_row.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_light_palette_row.yaml
@@ -1,27 +1,6 @@
 ---
 popup_light_palette_row:
-  show_icon: false
-  show_name: true
-  show_label: false
-  extra_styles: |
-    ha-card:hover {
-      background-color: var(--primary-background-color);
-    }
-  styles:
-    grid:
-      - grid-template-areas: "n"
-    card:
-      - padding: "2px 0px"
-      - height: "42px"
-      - border-radius: "10px"
-      - width: "40vh"
-    name:
-      - align-self: "center"
-      - justify-self: "start"
-      - font-weight: "bold"
-      - font-size: "14px"
-      - margin-left: "12px"
-      - margin-right: "12px"
+  template: "popup_row_layout"
   name: >
     [[[
       var name = entity.attributes.options[variables.ulm_popup_light_palette_entity_idx];
@@ -32,7 +11,10 @@ popup_light_palette_row:
       value: "[[[ return entity.state == entity.attributes.options[variables.ulm_popup_light_palette_entity_idx]; ]]]"
       styles:
         card:
-          - background-color: "rgba(var(--color-theme),0.2)"
+          - background-color: "rgba(var(--color-blue),0.1)"
+          - border: "none"
+        name:
+          - color: "rgba(var(--color-blue),1)"
   tap_action:
     action: "call-service"
     service: "select.select_option"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_media_player_row.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_media_player_row.yaml
index 88b64b6ad..3b1f4f478 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_media_player_row.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_media_player_row.yaml
@@ -1,27 +1,6 @@
 ---
 popup_media_player_row:
-  show_icon: false
-  show_name: true
-  show_label: false
-  extra_styles: |
-    ha-card:hover {
-      background-color: var(--primary-background-color);
-    }
-  styles:
-    grid:
-      - grid-template-areas: "n"
-    card:
-      - padding: "2px 0px"
-      - height: "42px"
-      - border-radius: "10px"
-      - width: "40vh"
-    name:
-      - align-self: "center"
-      - justify-self: "start"
-      - font-weight: "bold"
-      - font-size: "14px"
-      - margin-left: "12px"
-      - margin-right: "12px"
+  template: "popup_row_layout"
   name: >
     [[[
       var name = entity.attributes.source_list[variables.ulm_popup_media_entity_idx];
@@ -32,7 +11,10 @@ popup_media_player_row:
       value: "[[[ return entity.attributes.source == entity.attributes.source_list[variables.ulm_popup_media_entity_idx]; ]]]"
       styles:
         card:
-          - background-color: "rgba(var(--color-theme),0.2)"
+          - background-color: "rgba(var(--color-blue),0.1)"
+          - border: "none"
+        name:
+          - color: "rgba(var(--color-blue),1)"
   tap_action:
     action: "call-service"
     service: "media_player.select_source"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_row_layout.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_row_layout.yaml
new file mode 100644
index 000000000..d111d3a94
--- /dev/null
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popup_layouts/popup_row_layout.yaml
@@ -0,0 +1,25 @@
+---
+popup_row_layout:
+  show_icon: false
+  show_name: true
+  show_label: false
+  extra_styles: |
+    ha-card:hover {
+      background-color: var(--primary-background-color);
+    }
+  styles:
+    grid:
+      - grid-template-areas: "n"
+    card:
+      - padding: "2px 12px"
+      - height: "42px"
+      - background: "none"
+      - border: "1px rgba(var(--color-theme),0.2) solid"
+      - width: "40vh"
+    name:
+      - align-self: "center"
+      - justify-self: "center"
+      - font-weight: "bold"
+      - font-size: "14px"
+      - text-transform: "capitalize"
+      - color: "rgba(var(--color-theme),0.5)"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_light_effect.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_light_effect.yaml
index 1f04dc375..5030f469d 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_light_effect.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_light_effect.yaml
@@ -1,6 +1,8 @@
 ---
 popup_light_effect:
-  template: "popup_light_brightness"
+  template:
+    - "popup_light_brightness"
+    - "ulm_language_variables"
   styles:
     grid:
       - grid-template-areas: >
@@ -219,10 +221,10 @@ popup_light_effect:
         entity: "[[[ return entity.entity_id; ]]]"
         icon: "mdi:auto-fix"
         name: "[[[ return hass.resources[hass['language']]['ui.card.light.effect']; ]]]"
-        label: "[[[ return 'total: ' + entity?.attributes?.effect_list?.length ]]]"
+        label: "[[[ return variables.ulm_popup_total + ': ' + entity?.attributes?.effect_list?.length ]]]"
         styles:
           card:
-            - padding-bottom: "12px"
+            - margin-bottom: "12px"
             - background: "none"
           img_cell:
             - background: "var(--card-background-color)"
@@ -234,15 +236,12 @@ popup_light_effect:
         type: "custom:button-card"
         template:
           - "icon_info"
-          - "ulm_language_variables"
-        variables:
-          ulm_card_light_color_palette: "[[[ return variables?.ulm_card_light_color_palette ]]]"
         icon: "mdi:palette"
-        name: "[[[ return variables?.ulm_popups_color; ]]]"
-        label: "[[[ return 'total: ' + states[variables?.ulm_card_light_color_palette]?.attributes?.options?.length ]]]"
+        name: "[[[ return variables.ulm_popups_color; ]]]"
+        label: "[[[ return variables.ulm_popup_total + ': ' + states[variables?.ulm_card_light_color_palette]?.attributes?.options?.length ]]]"
         styles:
           card:
-            - padding-bottom: "12px"
+            - margin-bottom: "12px"
             - background: "none"
           img_cell:
             - background: "var(--card-background-color)"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_media_player_source.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_media_player_source.yaml
index 49038ff78..7d894be58 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_media_player_source.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/popup_templates/popups/popup_media_player_source.yaml
@@ -20,14 +20,14 @@ popup_media_player_source:
         - overflow-x: "hidden"
         - justify-self: "center"
         - align-self: "start"
-        - max-height: "56vh"
+        - height: "56vh"
         - padding-bottom: "12px"
         - max-width: "42vh"
   extra_styles: |
     @media (max-width: 800px) {
       #container {
         grid-template-areas: "header" "content3" "footer" !important;
-        grid-template-rows: 16vh max-content 14vh !important;
+        grid-template-rows: 16vh 56vh 14vh !important;
         grid-template-columns: 1fr !important;
       }
       #content1 {