diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 8188cbf..970d24b 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -1289,22 +1289,16 @@ number:
     optimistic: true
     set_action:
       then:
-        - if:
-            condition:
-              - binary_sensor.is_on: nextion_init
-            then:
-              - if:
-                  condition:
-                    - not:
-                      - text_sensor.state: # Is sleeping?
-                          id: current_page
-                          state: 'screensaver'
-                  then:
-                    - lambda: 'id(disp1).set_backlight_brightness(x/100);'
-              - lambda: 'id(disp1).send_command_printf("brightness=%i", int(x));'
-        - globals.set:
-            id: display_brightness_global
-            value: !lambda 'return int(x);'
+        - lambda: |-
+            id(display_brightness_global) = int(x);
+            id(disp1).send_command_printf("brightness=%i", int(x));
+            id(disp1).set_component_text_printf("settings.a03", "%i", int(x));
+            id(disp1).send_command_printf("settings.brightslider.val=%i", int(x));
+            if (id(current_page).state != "screensaver")
+              {
+                id(disp1).set_backlight_brightness(x/100);
+                id(disp1).send_command_printf("home.dimtimer.en=1");
+              }
 
   ##### SCREEN BRIGHTNESS DIMMED DOWN #####
   - platform: template
@@ -1319,10 +1313,11 @@ number:
     optimistic: true
     set_action:
       then:
-        - lambda: 'id(disp1).send_command_printf("brightness_dim=%i", int(x));'
-        - globals.set:
-            id: display_dim_brightness_global
-            value: !lambda 'return int(x);'
+        - lambda: |-
+            id(display_dim_brightness_global) = int(x);
+            id(disp1).send_command_printf("brightness_dim=%i", int(x));
+            id(disp1).set_component_text_printf("settings.a04", "%i", int(x));
+            id(disp1).send_command_printf("settings.dimslider.val=%i", int(x));
 
   ##### Temperature Correction #####
   - platform: template