diff --git a/advanced/esphome/nspanel_esphome_addon_climate_base.yaml b/advanced/esphome/nspanel_esphome_addon_climate_base.yaml
index cedac89..512fd1c 100644
--- a/advanced/esphome/nspanel_esphome_addon_climate_base.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_climate_base.yaml
@@ -11,8 +11,8 @@
 substitutions:
   ### Local thermostat defaults ###
   # https://esphome.io/components/climate/thermostat.html
-  heater_relay: "0" # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
-  cooler_relay: "0" # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
+  heater_relay: "0"  # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
+  cooler_relay: "0"  # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
   min_off_time: "300"
   min_run_time: "300"
   min_idle_time: "30"
@@ -35,9 +35,8 @@ climate:
     visual:
       min_temperature: ${temp_min} ${temp_units}
       max_temperature: ${temp_max} ${temp_units}
-      #temperature_step: ${temp_step} ${temp_units}
       temperature_step:
-        target_temperature: 0.5 #This is hard coded for now as ESPHome isn't supporting a substitution here. In contact with support.
+        target_temperature: 0.5  # This is hard coded for now as ESPHome isn't supporting a substitution here. In contact with support.
         current_temperature: 0.1
     idle_action:
       - switch.turn_off: relay_${heater_relay}
diff --git a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
index 7250539..1354cbc 100644
--- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -64,7 +64,7 @@ display:
     exit_reparse_on_start: true
 
 script:
-  - id: upload_tft_nextion #NOT IN USE FOR NOW
+  - id: upload_tft_nextion  # NOT IN USE FOR NOW
     mode: single
     parameters:
       url: string
diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml
index 79c29f4..0d75800 100644
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
@@ -856,10 +856,6 @@ globals:
     initial_value: 'false'
 
   ##### Date/time formats #####
-  #- id: mui_date_format
-  #  type: std::string
-  #  restore_value: no
-  #  initial_value: '"%A, %d.%m"'
   - id: home_date_color
     type: uint
     restore_value: true
@@ -867,7 +863,7 @@ globals:
 
   - id: mui_time_format
     type: std::string
-    restore_value: no
+    restore_value: false
     initial_value: '"%H:%M"'
   - id: home_time_color
     type: uint
@@ -918,7 +914,7 @@ globals:
 
   - id: page_names
     type: std::vector<std::string>
-    restore_value: no
+    restore_value: false
     initial_value:
       '{
         "home",
@@ -1041,7 +1037,7 @@ binary_sensor:
               component: "hw_bt_right"
               command: "short_click"
       - timing: *hold_to_restart-timing
-        then: #Restart the panel
+        then:  # Restart the panel
           - button.press: restart_nspanel
 
   ##### Restart NSPanel Button - Setting Page #####
@@ -1414,24 +1410,9 @@ text_sensor:
   - name: ${device_name} Current page
     id: current_page
     platform: template
-    #platform: nextion
-    #nextion_id: disp1
-    #component_name: currentpage
     icon: mdi:tablet-dashboard
     internal: false
     disabled_by_default: false
-    #filters:
-    #  - lambda: |-
-    #      x = x.c_str();
-    #      x.shrink_to_fit();
-    #      return x;
-    #on_value:
-    #  then:
-    #    - lambda: |-
-    #        static const char *const TAG = "text_sensor.current_page";
-    #        // Construct new page
-    #        ESP_LOGV(TAG, "Construct new page");
-    #        page_changed->execute(x.c_str());
 
   - name: ${device_name} Notification Label
     platform: template
diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 67cf386..06952cf 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -1,3 +1,4 @@
+---
 packages:
   core_package: !include advanced/esphome/nspanel_esphome_core.yaml
   upload_tft_package: !include advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
diff --git a/nspanel_esphome_addon_climate_cool.yaml b/nspanel_esphome_addon_climate_cool.yaml
index 9caa42d..bc2aff3 100644
--- a/nspanel_esphome_addon_climate_cool.yaml
+++ b/nspanel_esphome_addon_climate_cool.yaml
@@ -11,7 +11,7 @@
 substitutions:
   ### Local thermostat defaults ###
   # https://esphome.io/components/climate/thermostat.html
-  cooler_relay: "0" # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
+  cooler_relay: "0"  # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
   # https://esphome.io/components/climate/index.html#base-climate-configuration
   temp_min: "15"
   temp_max: "45"
diff --git a/nspanel_esphome_addon_climate_heat.yaml b/nspanel_esphome_addon_climate_heat.yaml
index df89a6f..6882417 100644
--- a/nspanel_esphome_addon_climate_heat.yaml
+++ b/nspanel_esphome_addon_climate_heat.yaml
@@ -11,7 +11,7 @@
 substitutions:
   ### Local thermostat defaults ###
   # https://esphome.io/components/climate/thermostat.html
-  heater_relay: "0" # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
+  heater_relay: "0"  # Select 1 for "Relay 1", 2 for "Relay 2" or "0" to a dummy switch/disabled
   # https://esphome.io/components/climate/index.html#base-climate-configuration
   temp_min: "5"
   temp_max: "25"