diff --git a/esphome/esphome_smarttherm.yaml b/esphome/esphome_smarttherm.yaml
index 5914d74..8f5f8d5 100644
--- a/esphome/esphome_smarttherm.yaml
+++ b/esphome/esphome_smarttherm.yaml
@@ -3,24 +3,11 @@
 substitutions:
   unit_name: "smarttherm"
 
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  fast_connect: true
-  reboot_timeout: 0s
-
-  ap:
-    ssid: ${unit_name} Fallback Hotspot
-    password: !secret fallback_password
-
-captive_portal:
-
-ota:
-  password: !secret ota_password
-
 # native api of ESPHome
 #api:
-#  password: !secret api_password
+#  reboot_timeout: 60min
+#  encryption:
+#    key: !secret encryption_key
 
 # or mqtt (my choice)
  mqtt:
@@ -54,25 +41,28 @@ output:
     id: pwm_output
 
 switch:
-  - platform: gpio
-    pin: D4
-    id: onboard_led
-    inverted: True
-    internal: True
-
   - platform: template
     name: ${unit_name}_heating
     id: heating
     entity_category: config
-    restore_state: True
+    restore_mode: RESTORE_DEFAULT_OFF
+    icon: "mdi:water-boiler"
     optimistic: True
     turn_on_action:
-      - switch.turn_on: onboard_led
+      - light.turn_on: onboard_led
       - script.execute: set_pwm_level_from_slider
     turn_off_action:
-      - switch.turn_off: onboard_led
+      - light.turn_off: onboard_led
       - script.execute: set_pwm_low_level
 
+light:
+  - platform: status_led
+    id: onboard_led
+    internal: True
+    pin:
+      number: D4
+      inverted: true
+
 script:
   - id: set_pwm_level_from_slider
     then:
@@ -106,6 +96,7 @@ number:
     mode: slider
     optimistic: True
     entity_category: config
+    icon: "mdi:gas-burner"
     on_value:
       then:
       - sensor.template.publish:
@@ -175,6 +166,7 @@ binary_sensor:
         pullup: True
     name: ${unit_name}_active
     id: power_active
+    device_class: power
     filters: # debounce
       - delayed_on: 5s
       - delayed_off: 5s