diff --git a/bedroom-lightstrips.yaml b/bedroom-lightstrips.yaml
index bc92c4f..1122b54 100644
--- a/bedroom-lightstrips.yaml
+++ b/bedroom-lightstrips.yaml
@@ -3,11 +3,10 @@ esphome:
   
 esp8266:
   board: nodemcuv2
-  framework:
-    version: 2.7.4
 
 logger:
   level: INFO
+  baud_rate: 0
 
 ota:
   password: "69ad39126b95f706a401f48614a8404d"
@@ -24,38 +23,75 @@ mqtt:
   topic_prefix: esphome/bedroom-lightstrips
 
 light:
-  - platform: fastled_spi
-    name: "Full LED Strip"
-    id: fullstrip
-    chipset: SK9822
-    rgb_order: BGR
-    data_pin: D5
-    clock_pin: D6
-    num_leds: 116
+  - platform: neopixelbus
+    name: "Under Bed Lights"
+    id: underbedlights
+    internal: true
+    variant: WS2812X
+    pin: GPIO3
+    num_leds: 104
+
   - platform: partition
     name: "Jason's Under Bed Lights"
+    id: jasonsunderbedlights
     segments:
-      - id: fullstrip
+      - id: underbedlights
         from: 0
-        to: 57
+        to: 51
     effects:
       - addressable_rainbow
       - addressable_color_wipe
       - addressable_scan
       - addressable_twinkle
+      - addressable_random_twinkle
       - addressable_fireworks
       - addressable_flicker
+
   - platform: partition
     name: "Flo's Under Bed Lights"
+    id: flosunderbedlights
     segments:
-      - id: fullstrip
-        from: 58
-        to: 115
+      - id: underbedlights
+        from: 52
+        to: 103
         reversed: true
     effects:
       - addressable_rainbow
       - addressable_color_wipe
       - addressable_scan
       - addressable_twinkle
+      - addressable_random_twinkle
       - addressable_fireworks
-      - addressable_flicker
\ No newline at end of file
+      - addressable_flicker
+
+
+  - platform: neopixelbus
+    name: "Headboard Lights"
+    id: headboardlights
+    variant: WS2812X
+    pin: GPIO1
+    num_leds: 46
+    effects:
+      - addressable_rainbow
+      - addressable_color_wipe
+      - addressable_scan
+      - addressable_twinkle
+      - addressable_random_twinkle
+      - addressable_fireworks
+      - addressable_flicker
+
+
+  - platform: neopixelbus
+    name: "Tree Lights"
+    id: treelights
+    variant: WS2812X
+    pin: GPIO2
+    num_leds: 50
+    effects:
+      - addressable_rainbow
+      - addressable_color_wipe
+      - addressable_scan
+      - addressable_twinkle
+      - addressable_random_twinkle
+      - addressable_fireworks
+      - addressable_flicker