diff --git a/automations/files/automations/3d-printer.yaml b/automations/files/automations/3d-printer.yaml
index c0f01e3..2d4a9cc 100644
--- a/automations/files/automations/3d-printer.yaml
+++ b/automations/files/automations/3d-printer.yaml
@@ -18,8 +18,8 @@
       state: 'off'
   action:
     - service: switch.turn_off
-      data: { }
       entity_id: switch.3d_printer_switch
+
 - id: 3dprinter-on
   alias: '[3D Printer] Turn on'
   mode: single
diff --git a/automations/files/automations/alarm-clock.yaml b/automations/files/automations/alarm-clock.yaml
index 3fa7e5c..3286765 100644
--- a/automations/files/automations/alarm-clock.yaml
+++ b/automations/files/automations/alarm-clock.yaml
@@ -5,21 +5,6 @@
     - platform: time
       at: input_datetime.alarm
   action:
-#    - service: light.turn_on
-#      data:
-#        kelvin: 2000
-#        brightness: 1
-#      entity_id:
-#        - light.bedroom_1
-#        - light.bedroom_2
-#    - service: light.turn_on
-#      data:
-#        kelvin: 5300
-#        transition: 1800
-#        brightness: 255
-#      entity_id:
-#        - light.bedroom_1
-#        - light.bedroom_2
     - service: cover.open_cover
       target:
         entity_id: cover.bedroom_blind
diff --git a/automations/files/automations/bathroom-button.yaml b/automations/files/automations/bathroom-button.yaml
index 319e3c4..1d5429a 100644
--- a/automations/files/automations/bathroom-button.yaml
+++ b/automations/files/automations/bathroom-button.yaml
@@ -6,7 +6,6 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_on
-  condition: []
   action:
     - service: light.toggle
       data:
diff --git a/automations/files/automations/bathroom-mirror-button.yaml b/automations/files/automations/bathroom-mirror-button.yaml
index f174aa7..32d1e7e 100644
--- a/automations/files/automations/bathroom-mirror-button.yaml
+++ b/automations/files/automations/bathroom-mirror-button.yaml
@@ -24,40 +24,3 @@
       data:
         entity_id: light.bathroom_mirror_lights
   mode: single
-#- id: button-bathroom-hold-on
-#  alias: Button Hold On computer cave
-#  trigger:
-#    - platform: event
-#      event_type: zha_event
-#      event_data:
-#        device_id: 4d5298037e93ba11438409bff01b5005
-#        command: move_with_on_off
-#  condition: []
-#  action:
-#    - service: light.turn_on
-#      data:
-#        entity_id:
-#          - light.tv_left
-#          - light.tv_middle
-#          - light.tv_right
-#  mode: single
-#- id: button-bathroom-hold-off
-#  alias: Button Hold Off computer cave
-#  trigger:
-#    - platform: event
-#      event_type: zha_event
-#      event_data:
-#        device_id: 4d5298037e93ba11438409bff01b5005
-#        command: move
-#        args:
-#          - 1
-#          - 83
-#  condition: []
-#  action:
-#    - service: light.turn_off
-#      data:
-#        entity_id:
-#          - light.tv_left
-#          - light.tv_middle
-#          - light.tv_right
-#  mode: single
\ No newline at end of file
diff --git a/automations/files/automations/bathroom-music-button.yaml b/automations/files/automations/bathroom-music-button.yaml
index b172177..5deda48 100644
--- a/automations/files/automations/bathroom-music-button.yaml
+++ b/automations/files/automations/bathroom-music-button.yaml
@@ -44,6 +44,7 @@
       data:
         media_content_id: https://open.spotify.com/playlist/71mXIu6HcdVj3fAMduaHop
         media_content_type: music
+
 - id: bathroom-music-button-pause
   alias: '[Bathroom] Music button - play/pause'
   description: ''
diff --git a/automations/files/automations/bathroom-shower-motion.yaml b/automations/files/automations/bathroom-shower-motion.yaml
index cf2af29..6f22566 100644
--- a/automations/files/automations/bathroom-shower-motion.yaml
+++ b/automations/files/automations/bathroom-shower-motion.yaml
@@ -9,6 +9,7 @@
   action:
     - service: light.turn_on
       entity_id: light.shower_lights
+
 - id: bathroom-shower-motion-off
   alias: '[Bathroom] Shower Motion Off'
   mode: restart
diff --git a/automations/files/automations/bedroom-button.yaml b/automations/files/automations/bedroom-button.yaml
index 2d0429a..8255118 100644
--- a/automations/files/automations/bedroom-button.yaml
+++ b/automations/files/automations/bedroom-button.yaml
@@ -12,6 +12,7 @@
       data:
         entity_id: light.bedroom_lights
   mode: single
+
 - id: bedroom-button-turn-off
   alias: '[Bedroom] Button Turn Off'
   trigger:
@@ -25,6 +26,7 @@
       data:
         entity_id: light.bedroom_lights
   mode: single
+
 - id: bedroom-button-dim-up
   alias: '[Bedroom] Button Dim Up'
   trigger:
@@ -39,6 +41,7 @@
         brightness_step_pct: 10
         entity_id: light.bedroom_lights
   mode: single
+
 - id: bedroom-button-dim-down
   alias: '[Bedroom] Button Dim Down'
   trigger:
@@ -47,13 +50,13 @@
       platform: device
       type: remote_button_short_press
       subtype: dim_down
-  condition: [ ]
   action:
     - service: light.turn_on
       data:
         brightness_step_pct: -10
         entity_id: light.bedroom_lights
   mode: single
+
 # Double click
 - id: bedroom-button-dim-up-double
   alias: '[Bedroom] Button Dim Up Double'
@@ -70,6 +73,7 @@
         kelvin: 3200
         entity_id: light.bedroom_lights
   mode: single
+
 - id: bedroom-button-dim-down-double
   alias: '[Bedroom] Button Dim Up'
   trigger:
diff --git a/automations/files/automations/bedroom-motion.yaml b/automations/files/automations/bedroom-motion.yaml
index 23eb572..8aa11dc 100644
--- a/automations/files/automations/bedroom-motion.yaml
+++ b/automations/files/automations/bedroom-motion.yaml
@@ -19,6 +19,7 @@
       data:
         brightness_pct: 60
         kelvin: 2000
+
 - id: bedroom-motion-off
   alias: '[Bedroom] Motion Off'
   mode: restart
diff --git a/automations/files/automations/computer-button.yaml b/automations/files/automations/computer-button.yaml
index 393e155..f9e320a 100644
--- a/automations/files/automations/computer-button.yaml
+++ b/automations/files/automations/computer-button.yaml
@@ -11,6 +11,7 @@
       data:
         entity_id: light.desk_lightbar
   mode: single
+
 - id: button-computer-cave-off
   alias: '[Computer Cave] Button Off'
   trigger:
@@ -24,6 +25,7 @@
       data:
         entity_id: light.desk_lightbar
   mode: single
+
 - id: button-computer-cave-hold-on
   alias: '[Computer Cave] Button Hold On'
   trigger:
@@ -37,6 +39,7 @@
       data:
         entity_id: light.tv_lights
   mode: single
+
 - id: button-computer-cave-hold-off
   alias: '[Computer Cave] Button Hold Off'
   trigger:
diff --git a/automations/files/automations/hallway-motion.yaml b/automations/files/automations/hallway-motion.yaml
index 2b73fcd..d32827b 100644
--- a/automations/files/automations/hallway-motion.yaml
+++ b/automations/files/automations/hallway-motion.yaml
@@ -16,6 +16,7 @@
       data:
         brightness_pct: 100
         kelvin: 3200
+
 - id: hallway-motion-night
   alias: '[Hallway] Motion Night'
   mode: restart
@@ -37,6 +38,7 @@
           - 255
           - 0
           - 0
+
 - id: hallway-motion-off
   alias: '[Hallway] Motion Off'
   mode: restart
diff --git a/automations/files/automations/kitchen-button.yaml b/automations/files/automations/kitchen-button.yaml
index 28a0a63..a221acc 100644
--- a/automations/files/automations/kitchen-button.yaml
+++ b/automations/files/automations/kitchen-button.yaml
@@ -14,8 +14,8 @@
     - service: light.turn_on
       target:
         entity_id: light.kitchen_lights
-- id: kitchen-button-2
-#  Upper right
+
+- id: kitchen-button-2 # Upper right
   alias: '[Kitchen] Button 2'
   description: ''
   mode: single
@@ -29,8 +29,8 @@
     - service: light.turn_on
       target:
         entity_id: light.hallway_light
-- id: kitchen-button-3
-#  Lower left
+
+- id: kitchen-button-3 # Lower left
   alias: '[Kitchen] Button 3'
   description: ''
   mode: single
@@ -44,8 +44,8 @@
     - service: light.turn_off
       target:
         entity_id: light.kitchen_lights
-- id: kitchen-button-4
-#  Lower Right
+
+- id: kitchen-button-4 # Lower Right
   alias: '[Kitchen] Button 4'
   description: ''
   mode: single
@@ -59,8 +59,8 @@
     - service: light.turn_off
       target:
         entity_id: light.hallway_light
-- id: kitchen-button-2-held
-  #  Upper right
+
+- id: kitchen-button-2-held #  Upper right
   alias: '[Kitchen] Button 2 Hold'
   description: ''
   mode: single
@@ -76,8 +76,8 @@
         entity_id: light.hallway_light
       data:
         brightness_step_pct: 10
-- id: kitchen-button-4-held
-  #  Upper right
+
+- id: kitchen-button-4-held #  Upper right
   alias: '[Kitchen] Button 4 Hold'
   description: ''
   mode: single
@@ -103,12 +103,12 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_on
-  condition: [ ]
   action:
     - service: light.turn_on
       data:
         entity_id: light.kitchen_sink_lighstrip
   mode: single
+
 - id: kitchen-sink-button-off
   alias: '[Kitchen] Sink Button Off'
   trigger:
@@ -117,12 +117,12 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_off
-  condition: [ ]
   action:
     - service: light.turn_off
       data:
         entity_id: light.kitchen_sink_lighstrip
   mode: single
+
 - id: kitchen-sink-button-hold-on
   alias: '[Kitchen] Sink Button Hold On'
   trigger:
@@ -131,12 +131,12 @@
       event_data:
         device_id: a47c928b108240ed8866f9f7a70bc844
         command: move_with_on_off
-  condition: [ ]
   action:
     - service: light.turn_on
       data:
         entity_id: light.kitchen_lights
   mode: single
+
 - id: kitchen-sink-button-hold-off
   alias: '[Kitchen] Sink Button Hold Off'
   trigger:
@@ -148,7 +148,6 @@
         args:
           - 1
           - 83
-  condition: [ ]
   action:
     - service: light.turn_off
       data:
diff --git a/automations/files/automations/kitchen-motion.yaml b/automations/files/automations/kitchen-motion.yaml
index 11d528d..f6e99f8 100644
--- a/automations/files/automations/kitchen-motion.yaml
+++ b/automations/files/automations/kitchen-motion.yaml
@@ -19,6 +19,7 @@
       data:
         brightness_pct: 90
         kelvin: 2000
+
 - id: kitchen-motion-night
   alias: '[Kitchen] Motion night'
   mode: single
@@ -37,6 +38,7 @@
       data:
         brightness_pct: 5
         kelvin: 2000
+
 - id: kitchen-motion-off
   alias: '[Kitchen] Motion Off'
   mode: restart
diff --git a/automations/files/automations/modes.yaml b/automations/files/automations/modes.yaml
index 89cfc15..9826ed4 100644
--- a/automations/files/automations/modes.yaml
+++ b/automations/files/automations/modes.yaml
@@ -7,6 +7,7 @@
     - service: input_boolean.turn_on
       entity_id: input_boolean.sleep_mode
   mode: single
+
 - id: sleep_off
   alias: Turn off sleep time
   trigger:
diff --git a/automations/files/automations/tv-automations.yaml b/automations/files/automations/tv-automations.yaml
index 3219ee8..8ac15e7 100644
--- a/automations/files/automations/tv-automations.yaml
+++ b/automations/files/automations/tv-automations.yaml
@@ -18,6 +18,7 @@
         data:
           duration: 1
           color: black
+
 - id: tv-suspend-pc
   alias: '[TV] When turned on suspend PC'
   description: ''
diff --git a/automations/files/automations/vacuum.yaml b/automations/files/automations/vacuum.yaml
index 8cb28f4..ed6c80a 100644
--- a/automations/files/automations/vacuum.yaml
+++ b/automations/files/automations/vacuum.yaml
@@ -5,7 +5,6 @@
       entity_id: device_tracker.sm_g965f
       zone: zone.home
       event: leave
-  condition: []
   action:
     - service: vacuum.start
       entity_id: vacuum.robot_vacuum
@@ -18,7 +17,6 @@
       entity_id: device_tracker.sm_g965f
       zone: zone.home
       event: enter
-  condition: []
   action:
     - service: vacuum.pause
       entity_id: vacuum.robot_vacuum