diff --git a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
index 13cb505a6..d838977dd 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
@@ -45,7 +45,6 @@ minimalist-ios-tapbar:
         position: fixed !important;
         margin: 0 !important;
         width: 100%;
-        height: 100% !important;
       }
       .header {
         top: auto !important;
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
index 9e9e51605..c5c45fd6d 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
@@ -39,7 +39,6 @@ minimalist-mobile-tapbar:
         position: fixed !important;
         margin: 0 !important;
         width: 100%;
-        height: 100% !important;
       }
       .header {
         top: auto !important;
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml
index 9c1d529b4..7e7ff4038 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml
@@ -16,7 +16,10 @@ ulm_translation_engine:
       [[[
         if (typeof(entity) !== 'undefined' && entity !== undefined){
           let not_active = ['disarmed','off','closed','not_home','standby','idle','docked','unknown','unavailable','paused']
-          return !not_active.includes(entity.state)
+          function containsNumbers(str) {
+            return /\d/.test(str);
+          }
+          return (!not_active.includes(entity.state) && !containsNumbers(entity.state))
         }
       ]]]
     ulm_translation_hour: >
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml
index 2a4e3fdfa..2a2c4154f 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml
@@ -14,6 +14,7 @@ card_graph:
     ulm_card_graph_points: "0.5"
     ulm_card_graph_group_by: "interval"
     ulm_card_graph_line_width: 5
+    ulm_card_graph_icon_color: ""
   triggers_update: "all"
   custom_fields:
     item1:
@@ -24,7 +25,33 @@ card_graph:
         variables:
           ulm_card_generic_icon: "[[[ return variables.ulm_card_graph_icon; ]]]"
           ulm_card_generic_name: "[[[ return variables.ulm_card_graph_name; ]]]"
-
+        custom_fields:
+          item1:
+            card:
+              type: "custom:button-card"
+              custom_fields:
+                item1:
+                  card:
+                    type: "custom:button-card"
+                    styles:
+                      icon:
+                        - color: >
+                            [[[
+                              var color = variables.ulm_card_graph_icon_color;
+                              if (variables.ulm_card_graph_icon_color){
+                                return 'rgba(var(--color-' + color + '),1)';
+                              }
+                              return 'rgba(var(--color-theme),0.2)';
+                            ]]]
+                      img_cell:
+                        - background-color: >
+                            [[[
+                              var color = variables.ulm_card_graph_icon_color;
+                              if (variables.ulm_card_graph_icon_color){
+                                return 'rgba(var(--color-' + color + '),0.2)';
+                              }
+                              return 'rgba(var(--color-theme),0.05)';
+                            ]]]
     item2:
       card:
         type: "custom:mini-graph-card"
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor.yaml
index c7aa5502f..6e5e65277 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor.yaml
@@ -20,7 +20,7 @@ card_binary_sensor:
         card:
           - background-color: >
               [[[
-                if (variables.ulm_card_binary_sensor_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_binary_sensor_force_background_color) {
                   var color = variables.ulm_card_binary_sensor_color;
                   return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                 }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor_alert.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor_alert.yaml
index b2f3a284b..31024a4bf 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor_alert.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor_alert.yaml
@@ -19,7 +19,7 @@ card_binary_sensor_alert:
         card:
           - background-color: >
               [[[
-                if (variables.ulm_card_binary_sensor_alert_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_binary_sensor_alert_force_background_color) {
                   var color = variables.ulm_card_binary_sensor_alert_color;
                   return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                 }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml
index 2ee02034a..a5ae36a15 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml
@@ -34,7 +34,7 @@ card_cover:
           - background-color: >
               [[[
                   if (variables.ulm_card_cover_color) {
-                    if (variables.ulm_card_cover_force_background_color || hass.themes.darkMode) {
+                    if (variables.ulm_card_cover_force_background_color) {
                       var color = variables.ulm_card_cover_color;
                       return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                     }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_fan.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_fan.yaml
index eeaf6b93a..d5c88ce7d 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_fan.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_fan.yaml
@@ -31,7 +31,7 @@ card_fan:
           - background-color: >
               [[[
                   if (variables.ulm_card_fan_color) {
-                    if (variables.ulm_card_fan_force_background_color || hass.themes.darkMode) {
+                    if (variables.ulm_card_fan_force_background_color) {
                       var color = variables.ulm_card_fan_color;
                       return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                     }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic.yaml
index c819ede52..b476480f9 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic.yaml
@@ -17,7 +17,7 @@ card_generic:
         card:
           - background-color: >
               [[[
-                if (variables.ulm_card_generic_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_generic_force_background_color) {
                   var color = variables.ulm_card_generic_color;
                   return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                 }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic_swap.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic_swap.yaml
index ef1b0e630..b2303f0ad 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic_swap.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic_swap.yaml
@@ -17,7 +17,7 @@ card_generic_swap:
         card:
           - background-color: >
               [[[
-                if (variables.ulm_card_generic_swap_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_generic_swap_force_background_color) {
                   var color = variables.ulm_card_generic_swap_color;
                   return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                 }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_input_boolean.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_input_boolean.yaml
index da2fbee75..cf0c431e3 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_input_boolean.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_input_boolean.yaml
@@ -17,7 +17,7 @@ card_input_boolean:
         card:
           - background-color: >
               [[[
-                if (variables.ulm_card_input_boolean_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_input_boolean_force_background_color) {
                   var color = variables.ulm_card_input_boolean_color;
                   return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                 }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml
index f3a6158e3..95abd3360 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml
@@ -33,12 +33,12 @@ card_light:
         card:
           - background-color: >
               [[[
-                var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                var color_set = (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                 var color = 'rgba(var(--color-' + color_set + '),var(--opacity-bg))'
-                if(variables.ulm_card_light_enable_color){
+                if(variables.ulm_card_light_enable_color && entity.attributes.rgb_color){
                   color = 'rgba(' + color_set + ',var(--opacity-bg))'
                 }
-                if (variables.ulm_card_light_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_light_force_background_color) {
                   return color
                 }
               ]]]
@@ -150,9 +150,9 @@ card_light:
                 icon:
                   - color: >
                       [[[
-                        var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                        var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                         var color = 'rgba(var(--color-' + color_set + '),1)'
-                        if(variables.ulm_card_light_enable_color){
+                        if(variables.ulm_card_light_enable_color && entity.attributes.rgb_color){
                           color = 'rgba(' + color_set + ',1)'
                         }
                         if (entity.state != "on") {
@@ -163,9 +163,9 @@ card_light:
                 img_cell:
                   - background-color: >
                       [[[
-                        var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                        var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                         var color = 'rgba(var(--color-' + color_set + '),0.2)'
-                        if(variables.ulm_card_light_enable_color){
+                        if(variables.ulm_card_light_enable_color && entity.attributes.rgb_color){
                           color = 'rgba(' + color_set + ',0.2)'
                         }
                         if (entity.state != "on") {
@@ -226,9 +226,9 @@ card_light:
         maxSet: "[[[ return variables.ulm_card_light_enable_slider_maxSet ]]]"
         mainSliderColor: >
           [[[
-            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
             var color = 'rgba(var(--color-' + color_set + '),1)'
-            if(variables.ulm_card_light_enable_color){
+            if(variables.ulm_card_light_enable_color && entity.attributes.rgb_color){
               color = 'rgba(' + color_set + ',1)'
             }
             if (entity.state == "unavailable") {
@@ -241,9 +241,9 @@ card_light:
           ]]]
         secondarySliderColor: >
           [[[
-            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
             var color = 'rgba(var(--color-' + color_set + '),0.2)'
-            if(variables.ulm_card_light_enable_color){
+            if(variables.ulm_card_light_enable_color && entity.attributes.rgb_color){
               color = 'rgba(' + color_set + ',0.2)'
             }
             if (entity.state == "unavailable") {
@@ -253,9 +253,9 @@ card_light:
           ]]]
         thumbColor: >
           [[[
-            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
             var color = 'rgba(var(--color-' + color_set + '),1)'
-            if(variables.ulm_card_light_enable_color){
+            if(variables.ulm_card_light_enable_color && entity.attributes.rgb_color){
               color = 'rgba(' + color_set + ',1)'
             }
             if (entity.state == "unavailable") {
@@ -306,9 +306,9 @@ card_light:
                       [[[
                         if (variables.ulm_card_light_force_background_color) {
                           if (entity.state != "off") {
-                            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                             var color = 'rgba(var(--color-' + color_set + '),0.2)'
-                            if (variables.ulm_card_light_enable_color) {
+                            if (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) {
                               color = 'rgba(' + color_set + ',0.2)';
                             }
                             return color;
@@ -320,9 +320,9 @@ card_light:
                       [[[
                         if (variables.ulm_card_light_force_background_color) {
                           if (entity.state != "off") {
-                            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                             var color = 'rgba(var(--color-' + color_set + '),1)';
-                            if (variables.ulm_card_light_enable_color) {
+                            if (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) {
                               color = 'rgba(' + color_set + ',1)';
                             }
                             return color;
@@ -358,9 +358,9 @@ card_light:
                       [[[
                         if (variables.ulm_card_light_force_background_color) {
                           if (entity.state != "off") {
-                            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                             var color = 'rgba(var(--color-' + color_set + '),0.2)'
-                            if (variables.ulm_card_light_enable_color) {
+                            if (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) {
                               color = 'rgba(' + color_set + ',0.2)';
                             }
                             return color;
@@ -372,9 +372,9 @@ card_light:
                       [[[
                         if (variables.ulm_card_light_force_background_color) {
                           if (entity.state != "off") {
-                            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                             var color = 'rgba(var(--color-' + color_set + '),1)';
-                            if (variables.ulm_card_light_enable_color) {
+                            if (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) {
                               color = 'rgba(' + color_set + ',1)';
                             }
                             return color;
@@ -410,9 +410,9 @@ card_light:
                       [[[
                         if (variables.ulm_card_light_force_background_color) {
                           if (entity.state != "off") {
-                            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                             var color = 'rgba(var(--color-' + color_set + '),0.2)'
-                            if (variables.ulm_card_light_enable_color) {
+                            if (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) {
                               color = 'rgba(' + color_set + ',0.2)';
                             }
                             return color;
@@ -424,9 +424,9 @@ card_light:
                       [[[
                         if (variables.ulm_card_light_force_background_color) {
                           if (entity.state != "off") {
-                            var color_set = variables.ulm_card_light_enable_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
+                            var color_set = variables.ulm_card_light_enable_color && entity.attributes.rgb_color ? entity.attributes.rgb_color : variables.ulm_card_light_color;
                             var color = 'rgba(var(--color-' + color_set + '),1)';
-                            if (variables.ulm_card_light_enable_color) {
+                            if (variables.ulm_card_light_enable_color && entity.attributes.rgb_color) {
                               color = 'rgba(' + color_set + ',1)';
                             }
                             return color;
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml
index 614724e9a..fd7516877 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml
@@ -31,7 +31,7 @@ card_media_player:
           - background-color: >
               [[[
                   if (variables.ulm_card_media_player_color) {
-                    if (variables.ulm_card_media_player_force_background_color || hass.themes.darkMode) {
+                    if (variables.ulm_card_media_player_force_background_color) {
                       var color = variables.ulm_card_media_player_color;
                       return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                     }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_power_outlet.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_power_outlet.yaml
index fffbbb6a9..6951fd57a 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_power_outlet.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_power_outlet.yaml
@@ -18,7 +18,7 @@ card_power_outlet:
         card:
           - background-color: >
               [[[
-                if (variables.ulm_card_power_outlet_force_background_color || hass.themes.darkMode) {
+                if (variables.ulm_card_power_outlet_force_background_color) {
                   var color = variables.ulm_card_power_outlet_color;
                   return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                 }
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_vacuum.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_vacuum.yaml
index 88f23381b..2535927f6 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_vacuum.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_vacuum.yaml
@@ -38,7 +38,7 @@ card_vacuum:
           - background-color: >
               [[[
                   if (variables.ulm_card_vacuum_color) {
-                    if (variables.ulm_card_vacuum_force_background_color || hass.themes.darkMode) {
+                    if (variables.ulm_card_vacuum_force_background_color) {
                       var color = variables.ulm_card_vacuum_color;
                       return 'rgba(var(--color-' + color + '),var(--opacity-bg))';
                     }