diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py
index 1bc2e3bc..f6c4774b 100644
--- a/apps/nspanel-lovelace-ui/luibackend/config.py
+++ b/apps/nspanel-lovelace-ui/luibackend/config.py
@@ -109,6 +109,7 @@ class LuiBackendConfig(object):
         'dateFormatBabel': "full",
         'dateFormat': "%A, %d. %B %Y",
         'weather': 'weather.example',
+        'weatherUnit': '°C',
         'weatherOverrideForecast1': None,
         'weatherOverrideForecast2': None,
         'weatherOverrideForecast3': None,
diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index cbbe532b..1964f147 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -75,6 +75,9 @@ class LuiController(object):
             brightness = kwargs['value']
         self._send_mqtt_msg(f"dimmode,{brightness}")
 
+    def weather_update(self, kwargs):
+        self._pages_gen.update_screensaver_weather()
+        
     def calc_current_screensaver_brightness(self):
         current_screensaver_brightness = 20
         # set brightness of screensaver
@@ -96,11 +99,6 @@ class LuiController(object):
                 current_screensaver_brightness = sorted_timesets[-1]["value"]
         return current_screensaver_brightness
 
-    def weather_update(self, kwargs):
-        we_name = self._config.get("weather")
-        unit    = "°C"
-        self._pages_gen.update_screensaver_weather(kwargs={"weather": we_name, "unit": unit})
-
     def register_callbacks(self):
         items = self._config.get_root_page().get_all_item_names()
         LOGGER.debug(f"Registering callbacks for the following items: {items}")
@@ -139,9 +137,7 @@ class LuiController(object):
             return
             
         if button_type == "sleepReached":
-            #self._pages_gen.generate_screensaver_page(kwargs={"weather": we_name, "unit": unit})
-            self._pages_gen.page_type("screensaver")
-            self.weather_update("")
+            self._pages_gen.generate_screensaver_page()
             return
 
         if button_type == "bExit":
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 1ebf0fdc..ed57e62a 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -57,12 +57,12 @@ class LuiPagesGen(object):
     
     def generate_screensaver_page(self):
         self.page_type("screensaver")
-        #self.update_screensaver_weather("")
+        self.update_screensaver_weather("")
         
-    def update_screensaver_weather(self, kwargs):
+    def update_screensaver_weather(self):
         global babel_spec
-        we_name = kwargs['weather']
-        unit = kwargs['unit']
+        we_name = self._config.get("weather")
+        unit = self._config.get("weatherUnit")
 
         if self._ha_api.entity_exists(we_name):
             we = self._ha_api.get_entity(we_name)