diff --git a/config/common/components.external.yaml b/config/common/components.external.yaml
new file mode 100644
index 0000000..3b9adfb
--- /dev/null
+++ b/config/common/components.external.yaml
@@ -0,0 +1,9 @@
+substitutions:
+  ext_comp_repo_ref: develop
+
+external_components:
+  - source:
+      type: git
+      url: https://github.com/FutureProofHomes/Satellite1-ESPHome
+      ref: ${ext_comp_repo_ref}
+    components: [ i2s_audio, satellite1, memory_flasher, tas2780, pcm5122, fusb302b ]
diff --git a/config/common/debug.yaml b/config/common/debug.yaml
index 7c55816..e7aca20 100644
--- a/config/common/debug.yaml
+++ b/config/common/debug.yaml
@@ -1,18 +1,6 @@
-
-external_components:
-  - source:
-      type: local
-      path: ../esphome/components
-    components: [ version ]
-
 debug:
   update_interval: 5s
 
-logger:
-  deassert_rts_dtr: true
-  hardware_uart : USB_SERIAL_JTAG
-  level: debug
-
 # # OPTIONAL Persist logs to a an MQTT broker so you can go back in time and inspect them.  Read more here: https://esphome.io/components/mqtt.html
 # mqtt:
 #   broker: homeassistant.local
diff --git a/config/common/developer.yaml b/config/common/developer.yaml
index b90370b..42b4104 100644
--- a/config/common/developer.yaml
+++ b/config/common/developer.yaml
@@ -3,8 +3,9 @@
 
 external_components:  
   - source:
-      type: local
-      path: ../esphome/components
+      type: git
+      url: https://github.com/FutureProofHomes/Satellite1-ESPHome
+      ref: develop
     components: [ udp_stream ]
 
 
diff --git a/config/satellite1.base.yaml b/config/satellite1.base.yaml
index 69ef4a5..fe4de5c 100644
--- a/config/satellite1.base.yaml
+++ b/config/satellite1.base.yaml
@@ -12,6 +12,7 @@ substitutions:
   project_name: Satellite1
   component_name: Core
   
+  esp32_fw_version: dev
   xmos_fw_version: "v1.0.1"
   built_for_core_hw_version: "v1.0.0-beta.1"
   built_for_hat_hw_version: "v1.0.0-beta.1"
@@ -41,6 +42,10 @@ esphome:
   friendly_name: ${friendly_name}
   min_version: 2024.12.2
   
+  project:
+    name: ${company_name}.${project_name}
+    version: ${esp32_fw_version}
+  
   on_boot:
     - priority: 375
       then:
@@ -72,6 +77,7 @@ ota:
 
 dashboard_import:
   package_import_url: github://futureproofhomes/satellite1-esphome/config/satellite1.yaml@develop
+  import_full_config: true
 
 
 packages:
diff --git a/config/satellite1.yaml b/config/satellite1.yaml
index 43481f5..47f0ae1 100644
--- a/config/satellite1.yaml
+++ b/config/satellite1.yaml
@@ -1,26 +1,53 @@
 substitutions:
-  company_name: FutureProofHomes
-  project_name: Satellite1
+  name: satellite1
+  friendly_name: Satellite1
+  xmos_fw_version: "v1.0.1"
   
-  esp32_fw_version: dev
-
-packages:
-  fph-satellite1: !include satellite1.base.yaml
+  # OPTIONALLY, set the log level to debug, info, warn, error
+  log_level: debug
 
 esphome:
-  project:
-    name: ${company_name}.${project_name}
-    version: ${esp32_fw_version}
+  name: ${name}
+  name_add_mac_suffix: true
+  friendly_name: ${friendly_name}
 
+packages:
+  FutureProofHomes.Satellite1: 
+    url: https://github.com/futureproofhomes/satellite1-esphome
+    ref: develop
+    refresh: 1s  
+    files: 
+    # Main config files, don't remove
+    - config/satellite1.base.yaml
+    - config/common/components.external.yaml
+    
+    ## OPTIONALLY, uncomment if you have the smaller LD2410 mmWave sensor connected to your HAT.
+    #- config/common/mmwave_ld2410.yaml    
+    
+    ## OPTIONALLY, uncomment if you have the larger LD2450 mmWave sensor connected to your HAT.
+    #- config/common/mmwave_ld2450.yaml
 
-external_components:
-  - source:
-      type: git
-      url: https://github.com/FutureProofHomes/Satellite1-ESPHome
-      ref: develop
-    components: [ i2s_audio, satellite1, memory_flasher, tas2780, pcm5122, fusb302b ]
-  
+    ## OPTIONALLY, uncomment if want extra memory, wifi and xmos control of the device.
+    #- config/common/debug.yaml 
+      
 logger:
-  deassert_rts_dtr: true
-  hardware_uart : USB_SERIAL_JTAG
-  level: debug
\ No newline at end of file
+  level: ${log_level}
+
+## OPTIONALLY, enable transport encryption for the API layer by uncommenting the following lines 
+## and replacing "REPLACE_BY_32_BIT_RANDOM_KEY" with a 32-character random key.
+## For more information, refer to the ESPHome documentation:
+## https://esphome.io/components/api.html
+## Note: The documentation also provides a tool to generate a random key
+
+#api:
+#  encryption:
+#    key: REPLACE_BY_32_BIT_RANDOM_KEY
+
+## OPTIONALLY, override the default Wi-Fi credentials provisioned on the Satellite1 device 
+## during setup by using your Wi-Fi credentials stored in the `secrets.yaml` file of the 
+## ESPHome dashboard. Uncomment the below lines to enable this feature, allowing you 
+## to manage Wi-Fi credentials centrally for all your devices.
+
+#wifi:
+#  ssid: !secret wifi_ssid
+#  password: !secret wifi_password
\ No newline at end of file