diff --git a/automations/files/configuration.yaml b/automations/files/configuration.yaml
index 6168185..6b63775 100644
--- a/automations/files/configuration.yaml
+++ b/automations/files/configuration.yaml
@@ -60,7 +60,6 @@ calendar:
     username: pgrondek
     password: !secret nextcloud_token
 
-
 spotcast:
   sp_dc: !secret spotcast_sp_dc
   sp_key: !secret spotcast_sp_key
@@ -143,6 +142,7 @@ light:
     entities:
       - light.bedroom_1
       - light.bedroom_2
+
 vacuum:
   - platform: xiaomi_miio
     host: 192.168.60.7
@@ -180,6 +180,7 @@ ble_monitor:
       mac: 'C4:7C:8D:6C:59:D5'
     - name: 'Living Room Plant'
       mac: 'C4:7C:8D:6C:59:D0'
+
 sensor:
   # Living Room Air Purifier
   - platform: template
diff --git a/automations/vars/main.yaml b/automations/vars/main.yaml
index e3a4b77..01ed5eb 100644
--- a/automations/vars/main.yaml
+++ b/automations/vars/main.yaml
@@ -1,46 +1,20 @@
 ---
 # vars file for automations
 lights:
-  - entityId: light.tv_left
-    name: TV Left
-  - entityId: light.tv_middle
-    name: TV Middle
-  - entityId: light.tv_right
-    name: TV Right
+  - entityId: light.bathroom_lights
+    name: Bathroom Lights
+  - entityId: light.computer_lights
+    name: Computer Lights
+  - entityId: light.kitchen_lights
+    name: Kitchen Lights
+  - entityId: light.shower_lights
+    name: Shower Lights
+  - entityId: light.tv_lights
+    name: TV Lights
+  - entityId: light.computer_computer_cave_background
+    name: Computer Computer Cave Background
   - entityId: light.couch_lamp
     name: Couch lamp
-  - entityId: light.kitchen_01
-    name: Kitchen 01
-  - entityId: light.kitchen_02
-    name: Kitchen 02
-  - entityId: light.kitchen_03
-    name: Kitchen 03
-  - entityId: light.kitchen_04
-    name: Kitchen 04
-  - entityId: light.kitchen_05
-    name: Kitchen 05
-  - entityId: light.kitchen_06
-    name: Kitchen 06
-  - entityId: light.kitchen_07
-    name: Kitchen 07
-  - entityId: light.kitchen_08
-    name: Kitchen 08
-  - entityId: light.kitchen_09
-    name: Kitchen 09
-  - entityId: light.kitchen_10
-    name: Kitchen 10
-  - entityId: light.kitchen_11
-    name: Kitchen 11
-  - entityId: light.kitchen_12
-    name: Kitchen 12
-  - entityId: light.kitchen_13
-    name: Kitchen 13
-  - entityId: light.kitchen_14
-    name: Kitchen 14
-  - entityId: light.computer_left
-    name: Computer left
-  - entityId: light.computer_right
-    name: Computer right
 airPurifiers:
   - entityId: fan.xiaomi_miio_device
     componentId: xiaomi_miio_device