diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 0798916..e94f919 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -5,13 +5,9 @@
 ##### For normal use with the Blueprint, no changes are necessary.                              #####
 #####################################################################################################
 
-
 substitutions:
-##### ADVANCED CONFIGURATION - Please change this on your ESPHome yaml when needed #####
+  # Defaults
   verbose_log: "false"
-  wifi_hidden: "false"
-  time_source: "homeassistant" # Either "homeassistant" or "sntp" are supported
-##### END OF ADVANCED CONFIGURATION ####################################################
 
   ##### DON'T CHANGE THIS #####
   version: "4.0 dev"
@@ -24,8 +20,8 @@ wifi:
     - id: wifi_default
       ssid: ${wifi_ssid}
       password: ${wifi_password}
-      hidden: ${wifi_hidden}
   power_save_mode: none
+  fast_connect: true
   ap:
     ssid: "${device_name}"
     password: ${wifi_password}
@@ -80,8 +76,8 @@ uart:
 
 ##### Keeps time display updated #####
 time:
-  - platform: ${time_source}
-    id: time_provider
+  - id: time_provider
+    platform: homeassistant
     on_time:
       - seconds: 0
         then:
@@ -132,6 +128,7 @@ button:
 ##### START - API CONFIGURATION #####
 api:
   id: api_server
+  reboot_timeout: 0s
 
   services: