diff --git a/.gitignore b/.gitignore
index 886c4ca..a2f66b4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Ignore everything globally
 .DS_Store
+._*
 custom_components/
 blueprints/
 dwains-dashboard/
diff --git a/.env.infrastructure.example b/docker/.env.infrastructure.example
similarity index 100%
rename from .env.infrastructure.example
rename to docker/.env.infrastructure.example
diff --git a/docker-compose.yml b/docker/docker-compose.homeassistant.yml
similarity index 100%
rename from docker-compose.yml
rename to docker/docker-compose.homeassistant.yml
diff --git a/docker-compose.infrastructure.yml b/docker/docker-compose.infrastructure.yml
similarity index 100%
rename from docker-compose.infrastructure.yml
rename to docker/docker-compose.infrastructure.yml
diff --git a/docker/docker-compose.unifi.yml b/docker/docker-compose.unifi.yml
new file mode 100644
index 0000000..5503eef
--- /dev/null
+++ b/docker/docker-compose.unifi.yml
@@ -0,0 +1,8 @@
+services:
+  unifi:
+    container_name: jacobalberty-unifi-1
+    image: jacobalberty/unifi:latest
+    restart: always
+    network_mode: host
+    volumes:
+      - /volume1/docker/unifi:/var/lib/unifi
diff --git a/include/scripts/monthly_scene.yaml b/include/scripts/monthly_scene.yaml
index 43b2462..d90f8d4 100644
--- a/include/scripts/monthly_scene.yaml
+++ b/include/scripts/monthly_scene.yaml
@@ -24,12 +24,6 @@ monthly_standard_colors:
         color_name: 'Gold'
         brightness_pct: 100
         transition: 300
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Gold'
-        brightness_pct: 80
-        transition: 300      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -63,12 +57,6 @@ monthly_valentine_colors:
         color_name: 'Crimson'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Crimson'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -102,12 +90,6 @@ monthly_mardi_gras_colors:
         color_name: 'Purple'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Green'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -141,12 +123,6 @@ monthly_pi_colors:
         rgb_color: [3,14,159]
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        rgb_color: [3,14,159]
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -180,12 +156,6 @@ monthly_st_patty_colors:
         color_name: 'Green'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Green'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -219,12 +189,6 @@ monthly_easter_colors:
         color_name: 'Yellow'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        rgb_color: [255,193,204]
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -258,12 +222,6 @@ monthly_starwars_colors:
         rgb_color: [204,0,0]       
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        rgb_color: [245,245,245]
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -297,12 +255,6 @@ monthly_cinco_de_mayo_colors:
         rgb_color: [204,0,0]
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        rgb_color: [245,245,245]
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -336,12 +288,6 @@ monthly_mothers_day_colors:
         rgb_color: [244,187,255]
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        rgb_color: [244,187,255]
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -375,12 +321,6 @@ monthly_fathers_day_colors:
         color_name: 'Orange'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Blue'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -414,12 +354,6 @@ monthly_halloween_colors:
         rgb_color: [235,97,35]
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        rgb_color: [235,97,35]
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -453,12 +387,6 @@ monthly_thanksgiving_colors:
         color_name: 'Orange'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Orange'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -492,12 +420,6 @@ monthly_christmas_colors:
         color_name: 'Red'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Green'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord
@@ -531,12 +453,6 @@ monthly_new_years_day_colors:
         color_name: 'Blue'
         brightness_pct: 100
         transition: 900
-    - service: light.turn_on
-      data:
-        entity_id: light.syd
-        color_name: 'Yellow'
-        brightness_pct: 100
-        transition: 900      
     - service: light.turn_on
       data:
         entity_id: light.spisebord