diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI
index 1651d90d..b4859f0e 100644
Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ
diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft
index 9e50ac53..7881b0ca 100644
Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ
diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI
index e9a7d0aa..fe84c0e4 100644
Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ
diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft
index 7a10c3ba..8c9696b3 100644
Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index aa2c3f96..6b69852e 100644
Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ
diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index a09094c8..b51c85d0 100644
Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index c6c4e34e..a4109d50 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -142,24 +142,22 @@ class LuiPagesGen(object):
                 up = name if name is not None else entity.attributes.friendly_name
                 icon = get_icon_id_ha("sensor", state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon)
                 if "color" in wOF:
-                    theme = {}
-                    shift = int(self._config._config_screensaver.raw_config.get("alternativeLayout", False))
-                    overwrite = wOF.get("color")
-                    if type(overwrite) is list:
-                        color = overwrite
-                    if type(overwrite) is dict:
-                        state = entity.state
-                        for overwrite_state, overwrite_val in overwrite.items():
-                            if overwrite_state == state:
+                    if theme is None:
+                        theme = {}
+                    color = wOF.get("color")
+                    if type(color) is dict:
+                        for overwrite_state, overwrite_val in color.items():
+                            if overwrite_state == entity.state:
                                 color = overwrite_val
-                    if i+shift == 1:
+                    if i == 1:
                         theme["tF1Icon"] = color
-                    elif i+shift == 2:
+                    elif i == 2:
                         theme["tF2Icon"] = color
-                    elif i+shift == 3:
+                    elif i == 3:
                         theme["tF3Icon"] = color
-                    elif i+shift == 4:
+                    elif i == 4:
                         theme["tF4Icon"] = color
+
                 unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
                 down = f"{entity.state} {unit_of_measurement}"
             weather_res+=f"~{up}~{icon}~{down}"
diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
index 3da4f968..48463842 100644
--- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
+++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
@@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
 
         controller = LuiController(self, cfg, send_mqtt_msg)
         
-        desired_display_firmware_version = 40
-        version     = "v3.3.0"
+        desired_display_firmware_version = 41
+        version     = "v3.3.1"
         
         model       = cfg.get("model")
         if model == "us-l":