diff --git a/.gitignore b/.gitignore
index 65ff494..498fc9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,10 @@ adb/
 deps/
 tts/
 __pycache__/
-automations.yaml
 custom_components/
 !custom_components/hacs
+include/
+!include/zones.yaml
 secrets.yaml
 home-assistant*.log*
 home-assistant*.db*
diff --git a/configuration.yaml b/configuration.yaml
index eecf88d..ed2221c 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -63,9 +63,6 @@ logger:
 #   - mobile_app
 ###############################################################################
 
-# Automation File for Configuration UI
-automation: !include automations.yaml
-
 # Enable the Configuration UI
 config:
 
@@ -110,7 +107,10 @@ zeroconf:
 # Discover some devices automatically
 discovery:
 
-# Setup Zones
+# Setup Includes for UI
+automation: !include include/automations.yaml
+scene: !include include/scenes.yaml
+script: !include include/scripts.yaml
 zone: !include include/zones.yaml
 
 # Setup InfluxDB Logging
diff --git a/packages/lighting/main.yaml b/packages/lighting/main.yaml
index f165c17..24278b4 100644
--- a/packages/lighting/main.yaml
+++ b/packages/lighting/main.yaml
@@ -4,7 +4,6 @@
 # Automations for Bedroom Nighstand Lamps
 automation:
   - alias: Jen Nighstand Lamp (Package)
-    description: ''
     mode: single
     trigger:
       - device_id: 98d9a86c7838fdbfcbdaeceef9a98f36
@@ -20,7 +19,6 @@ automation:
         domain: light
 
   - alias: J.P. Nighstand Lamp (Package)
-    description: ''
     mode: single
     trigger:
       - device_id: f223ed24fe135bfd6bb7006dddb6b9f8
diff --git a/packages/zones/README.md b/packages/zones/README.md
new file mode 100644
index 0000000..539d065
--- /dev/null
+++ b/packages/zones/README.md
@@ -0,0 +1,3 @@
+# Zones Package
+
+This package contains pre-defined zone definitions.
\ No newline at end of file
diff --git a/packages/zones/main.yaml b/packages/zones/main.yaml
new file mode 100644
index 0000000..8de7f39
--- /dev/null
+++ b/packages/zones/main.yaml
@@ -0,0 +1,22 @@
+# Zones Package
+
+# -----------------------------------------------------------------------------
+# Zone Overrides
+zone:
+  - name: Home
+    latitude: !secret home_latitude
+    longitude: !secret home_longitude
+    radius: 25
+    icon: mdi:home
+
+  - name: !secret jp_work_name
+    latitude: !secret jp_work_latitude
+    longitude: !secret jp_work_longitude
+    radius: 250
+    icon: mdi:briefcase
+
+  - name: !secret jen_work_name
+    latitude: !secret jen_work_latitude
+    longitude: !secret jen_work_longitude
+    radius: 250
+    icon: mdi:briefcase