diff --git a/configuration/automations/3d-printer.yaml b/configuration/automations/3d-printer.yaml
index fe647d7..7d6deac 100644
--- a/configuration/automations/3d-printer.yaml
+++ b/configuration/automations/3d-printer.yaml
@@ -1,4 +1,4 @@
-- id: 3dprinter-off
+- id: 3dprinter_off
   alias: '[3D Printer] Turn off'
   mode: single
   trigger:
@@ -19,7 +19,7 @@
     - service: light.turn_off
       entity_id: light.3d_printer_light
 
-- id: 3dprinter-on
+- id: 3dprinter_on
   alias: '[3D Printer] Turn on'
   mode: single
   trigger:
@@ -30,7 +30,7 @@
   action:
     - service: rest_command.octoprint_connect
 
-- id: 3dprinter-notify
+- id: 3dprinter_notify
   alias: '[3D Printer] Notify'
   mode: single
   trigger:
@@ -61,7 +61,7 @@
           images:
             - "/config/www/cctv/3d_printer.jpg"
 
-- id: 3dprinter-button
+- id: 3dprinter_button
   alias: '[3D Printer] button'
   mode: single
   trigger:
@@ -101,7 +101,7 @@
             - service: light.turn_off
               entity_id: light.3d_printer_light
 
-- id: 3dprinter-schedule
+- id: 3dprinter_schedule
   alias: '[3D Printer] Schedule turn on'
   description: ''
   mode: single
@@ -117,7 +117,7 @@
     - service: light.turn_off
       entity_id: light.3d_printer_light
 
-- id: 3dprinter-fan-on
+- id: 3dprinter_fan_on
   alias: '[3D Printer] Fan on'
   mode: single
   trigger:
@@ -133,7 +133,7 @@
       target:
         entity_id: switch.3d_printer_enclosure_fan_on_off
 
-- id: 3dprinter-fan-off
+- id: 3dprinter_fan_off
   alias: '[3D Printer] Fan off'
   mode: single
   trigger:
@@ -149,7 +149,7 @@
       target:
         entity_id: switch.3d_printer_enclosure_fan_on_off
 
-- id: 3dprinter-pause-notify
+- id: 3dprinter_pause_notify
   alias: '[3D Printer] Notify about paused print'
   mode: single
   trigger:
diff --git a/configuration/automations/ac.yaml b/configuration/automations/ac.yaml
index f0b3167..9a328f4 100644
--- a/configuration/automations/ac.yaml
+++ b/configuration/automations/ac.yaml
@@ -1,4 +1,4 @@
-- id: ac-turn-on
+- id: ac_turn_on
   alias: '[AC] Computer cave too hot'
   description: ''
   mode: single
@@ -38,7 +38,7 @@
               data:
                 temperature: "{{ state_attr('climate.ac', 'temperature') -1 }} "
 
-- id: ac-turn-off
+- id: ac_turn_off
   alias: '[AC] Turn off when windows are open'
   mode: single
   trigger:
diff --git a/configuration/automations/alarm-clock.yaml b/configuration/automations/alarm-clock.yaml
index 1e2ced4..852fd80 100644
--- a/configuration/automations/alarm-clock.yaml
+++ b/configuration/automations/alarm-clock.yaml
@@ -1,4 +1,4 @@
-- id: alarm-clock-automation
+- id: alarm_clock_automation
   alias: '[Alarm-Clock] Wakeup automation'
   trigger:
     - platform: calendar
diff --git a/configuration/automations/alarm-door-relock.yaml b/configuration/automations/alarm-door-relock.yaml
index 835feb8..76e73d6 100644
--- a/configuration/automations/alarm-door-relock.yaml
+++ b/configuration/automations/alarm-door-relock.yaml
@@ -1,4 +1,4 @@
-- id: vacation-door-lock
+- id: vacation_door_lock
   alias: "[Alarm] Door relock"
   trigger:
     - platform: state
diff --git a/configuration/automations/alarm-notify-guest.yaml b/configuration/automations/alarm-notify-guest.yaml
index b0bdd95..802eed7 100644
--- a/configuration/automations/alarm-notify-guest.yaml
+++ b/configuration/automations/alarm-notify-guest.yaml
@@ -1,4 +1,4 @@
-- id: alarm-notify-guest
+- id: alarm_notify_guest
   alias: '[Alarm] Notify about guest'
   description: ''
   mode: single
diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index 733f582..64537c2 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -1,4 +1,4 @@
-- id: alarm-away-hallway
+- id: alarm_away_hallway
   alias: '[Alarm] Trigger alarm when not at home - Hallway camera'
   trigger:
     # Use hallway motion sensor
@@ -62,7 +62,7 @@
           images:
             - "/config/www/cctv/hallway.mp4"
 
-- id: alarm-away-living-roomn
+- id: alarm_away_living_roomn
   alias: '[Alarm] Trigger alarm when not at home (Living Room)'
   trigger:
     # Use motion sensors
@@ -141,7 +141,7 @@
             - "/config/www/cctv/living_room.mp4"
 
 
-- id: alarm-away-bedroom
+- id: alarm_away_bedroom
   alias: '[Alarm] Trigger alarm when not at home (Bedroom)'
   trigger:
     # Use motion sensors
@@ -190,7 +190,7 @@
           images:
             - "/config/www/cctv/bedroom.mp4"
 
-- id: alarm-away-remaining
+- id: alarm_away_remaining
   alias: '[Alarm] Trigger alarm when not at home'
   trigger:
     # Use motion sensors
@@ -222,7 +222,7 @@
         data:
           url:  "/lovelace-tablet/security"
 
-- id: alarm-away-test-vibration
+- id: alarm_away_test_vibration
   alias: '[Alarm] Window vibration test'
   trigger:
     - platform: state
@@ -244,7 +244,7 @@
           entity_id: camera.living_room
           url:  "/lovelace-tablet/security"
 
-- id: alarm-night
+- id: alarm_night
   alias: '[Alarm] Trigger alarm at night'
   trigger:
     - platform: state
@@ -280,7 +280,7 @@
         data:
           url:  "/lovelace-tablet/security"
 
-- id: alarm-arm-away
+- id: alarm_arm_away
   alias: '[Alarm] Arm away'
   trigger:
     - platform: zone
@@ -291,7 +291,7 @@
     - service: alarm_control_panel.alarm_arm_away
       entity_id: alarm_control_panel.home_alarm
 
-- id: alarm-pending
+- id: alarm_pending
   alias: '[Alarm] Send notification when alarm triggered'
   trigger:
     - platform: state
@@ -307,7 +307,7 @@
     - service: switch.turn_on
       entity_id: switch.siren_switch
 
-- id: alarm-triggered
+- id: alarm_triggered
   alias: '[Alarm] Turn on alarm'
   trigger:
     - platform: state
diff --git a/configuration/automations/bathroom-lights.yaml b/configuration/automations/bathroom-lights.yaml
index 0ceb9a8..6b41702 100644
--- a/configuration/automations/bathroom-lights.yaml
+++ b/configuration/automations/bathroom-lights.yaml
@@ -1,4 +1,4 @@
-- id: button-lights-on
+- id: button_lights_on
   alias: '[Bathroom] Lights On'
   trigger:
     - platform: state
@@ -11,7 +11,7 @@
     - service: script.bathroom_lights_on
   mode: single
 
-- id: bathroom-lights-off
+- id: bathroom_lights_off
   alias: '[Bathroom] Lights Off'
   mode: restart
   trigger:
@@ -37,7 +37,7 @@
   action:
     - service: script.bathroom_lights_off
 
-- id: button-bathroom-on-off
+- id: button_bathroom_on_off
   alias: '[Bathroom] Button On/Off'
   trigger:
     - device_id: 36bf09a72c8115dd3afd832e83cf38ea
diff --git a/configuration/automations/bathroom-mirror-button.yaml b/configuration/automations/bathroom-mirror-button.yaml
index 0966031..ced598b 100644
--- a/configuration/automations/bathroom-mirror-button.yaml
+++ b/configuration/automations/bathroom-mirror-button.yaml
@@ -1,4 +1,4 @@
-- id: bathroom-mirror-lights
+- id: bathroom_mirror_lights
   alias: '[Bathroom] Mirror Button Lights toggle'
   trigger:
     - device_id: ea9d3cc90cf5da1108925e50489efce9
@@ -10,7 +10,7 @@
     - service: script.bathroom_mirror_lights_toggle
   mode: single
 
-- id: bathroom-mirror-button-vacuum
+- id: bathroom_mirror_button_vacuum
   alias: '[Bathroom] Mirror Button Vacuum'
   trigger:
     - device_id: ea9d3cc90cf5da1108925e50489efce9
@@ -33,7 +33,7 @@
               target:
                 entity_id: vacuum.valetudo_valetudos5
 
-- id: bathroom-mirror-button-automations-off
+- id: bathroom_mirror_button_automations_off
   alias: '[Bathroom] Mirror Button Automations'
   trigger:
     - device_id: ea9d3cc90cf5da1108925e50489efce9
diff --git a/configuration/automations/bathroom-music-button.yaml b/configuration/automations/bathroom-music-button.yaml
index 000f18d..0be223a 100644
--- a/configuration/automations/bathroom-music-button.yaml
+++ b/configuration/automations/bathroom-music-button.yaml
@@ -1,4 +1,4 @@
-- id: bathroom-music-button-next
+- id: bathroom_music_button_next
   alias: '[Bathroom] Music button - next'
   mode: single
   trigger:
@@ -21,7 +21,7 @@
       target:
         entity_id: media_player.bathroom
 
-- id: bathroom-music-play-playlist
+- id: bathroom_music_play_playlist
   alias: '[Bathroom] Play playlist'
   mode: single
   trigger:
@@ -42,7 +42,7 @@
         shuffle: true
     - service: script.bathroom_music_play
 
-- id: bathroom-music-button-play
+- id: bathroom_music_button_play
   alias: '[Bathroom] Music button - play'
   mode: single
   trigger:
@@ -65,7 +65,7 @@
   action:
     - service: script.bathroom_music_play
 
-- id: bathroom-music-button-pause
+- id: bathroom_music_button_pause
   alias: '[Bathroom] Music button - play/pause'
   description: ''
   mode: single
diff --git a/configuration/automations/bathroom-shower-motion.yaml b/configuration/automations/bathroom-shower-motion.yaml
index 12ffc63..ccab748 100644
--- a/configuration/automations/bathroom-shower-motion.yaml
+++ b/configuration/automations/bathroom-shower-motion.yaml
@@ -1,4 +1,4 @@
-- id: bathroom-shower-motion-on
+- id: bathroom_shower_motion_on
   alias: '[Bathroom] Shower Motion On'
   mode: restart
   trigger:
@@ -24,7 +24,7 @@
               target:
                 entity_id: media_player.bathroom
 
-- id: bathroom-shower-motion-off
+- id: bathroom_shower_motion_off
   alias: '[Bathroom] Shower Motion Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/bathroom-toothbrush.yaml b/configuration/automations/bathroom-toothbrush.yaml
index 0292844..485f0e4 100644
--- a/configuration/automations/bathroom-toothbrush.yaml
+++ b/configuration/automations/bathroom-toothbrush.yaml
@@ -1,4 +1,4 @@
-- id: bathroom-toothbrush-on
+- id: bathroom_toothbrush_on
   alias: '[Bathroom] Toothbrush on'
   mode: single
   trigger:
@@ -11,7 +11,7 @@
     - service: script.bathroom_mirror_lights_on
     - service: script.bathroom_music_on
 
-- id: bathroom-toothbrush-picked-up
+- id: bathroom_toothbrush_picked_up
   alias: '[Bathroom] Toothbrush picked-up'
   mode: single
   trigger:
diff --git a/configuration/automations/bathroom-washing-machine.yaml b/configuration/automations/bathroom-washing-machine.yaml
index fe194fb..5e3e3a1 100644
--- a/configuration/automations/bathroom-washing-machine.yaml
+++ b/configuration/automations/bathroom-washing-machine.yaml
@@ -1,4 +1,4 @@
-- id: washing-machine-notification
+- id: washing_machine_notification
   alias: '[Washing Machine] Washing notification'
   mode: single
   trigger:
@@ -35,7 +35,7 @@
                   duration: 30
                   color: black
 
-- id: washing-machine-taken
+- id: washing_machine_taken
   alias: '[Washing Machine] Laundry taken out'
   mode: single
   trigger:
diff --git a/configuration/automations/bedroom-ac.yaml b/configuration/automations/bedroom-ac.yaml
index ce9cbb4..bed1519 100644
--- a/configuration/automations/bedroom-ac.yaml
+++ b/configuration/automations/bedroom-ac.yaml
@@ -1,4 +1,4 @@
-- id: bedroom-ac-turn-on
+- id: bedroom_ac_turn_on
   alias: '[AC][Bedroom] Turn on AC when it is hot in bedroom'
   mode: single
   trigger:
@@ -30,7 +30,7 @@
               data:
                 temperature: "{{ state_attr('climate.ac', 'temperature') -1 }} "
 
-- id: bedroom-ac-turn-off
+- id: bedroom_ac_turn_off
   alias: '[AC][Bedroom] Turn off AC when it is cold in bedroom'
   trigger:
     - platform: numeric_state
diff --git a/configuration/automations/bedroom-bed-button.yaml b/configuration/automations/bedroom-bed-button.yaml
index 14c0ed8..c9a765f 100644
--- a/configuration/automations/bedroom-bed-button.yaml
+++ b/configuration/automations/bedroom-bed-button.yaml
@@ -1,4 +1,4 @@
-- id: bedroom-bed-lamp
+- id: bedroom_bed_lamp
   alias: '[Bedroom] Bed Button Lamp'
   trigger:
     - device_id: 0d584dbfe721e00880b38c4dfc1c108e
@@ -9,7 +9,7 @@
   action:
     - service: script.bedroom_bed_lamp_toggle
 
-- id: bedroom-bed-sleep-morning
+- id: bedroom_bed_sleep_morning
   alias: '[Bedroom] Bed Sleep/Morning'
   trigger:
     - device_id: 0d584dbfe721e00880b38c4dfc1c108e
diff --git a/configuration/automations/bedroom-bed-motion.yaml b/configuration/automations/bedroom-bed-motion.yaml
index 0533e22..907af2f 100644
--- a/configuration/automations/bedroom-bed-motion.yaml
+++ b/configuration/automations/bedroom-bed-motion.yaml
@@ -1,4 +1,4 @@
-- id: bedroom-bed-motion-night
+- id: bedroom_bed_motion_night
   alias: '[Bedroom] Bed motion night'
   mode: single
   trigger:
@@ -22,7 +22,7 @@
                   - 0
                   - 0
 
-- id: bedroom-bed-motion-off
+- id: bedroom_bed_motion_off
   alias: '[Bedroom] Bed motion Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/bedroom-blinds.yaml b/configuration/automations/bedroom-blinds.yaml
index 269ea97..e2506f5 100644
--- a/configuration/automations/bedroom-blinds.yaml
+++ b/configuration/automations/bedroom-blinds.yaml
@@ -1,4 +1,4 @@
-- id: bedroom-blinds-button-up
+- id: bedroom_blinds_button_up
   alias: '[Bedroom Blinds] Up'
   trigger:
     - device_id: c90f649df514f80d36ca1a8fde308867
@@ -34,7 +34,7 @@
               entity_id: cover.bedroom_blinds
   mode: single
 
-- id: bedroom-blinds-button-down
+- id: bedroom_blinds_button_down
   alias: '[Bedroom Blinds] Down'
   trigger:
     - device_id: c90f649df514f80d36ca1a8fde308867
diff --git a/configuration/automations/bedroom-button.yaml b/configuration/automations/bedroom-button.yaml
index 1d0d8c7..35b4ec4 100644
--- a/configuration/automations/bedroom-button.yaml
+++ b/configuration/automations/bedroom-button.yaml
@@ -1,5 +1,5 @@
 # Single click
-- id: bedroom-button-turn-on
+- id: bedroom_button_turn_on
   alias: '[Bedroom] Button Turn On'
   mode: single
   trigger:
@@ -11,7 +11,7 @@
   action:
     - service: script.bedroom_lights_on
 
-- id: bedroom-button-turn-off
+- id: bedroom_button_turn_off
   alias: '[Bedroom] Button Turn Off'
   mode: single
   trigger:
@@ -23,7 +23,7 @@
   action:
     - service: script.bedroom_all_lights_off
 
-- id: bedroom-button-dim-up
+- id: bedroom_button_dim_up
   alias: '[Bedroom] Button Dim Up'
   mode: single
   trigger:
@@ -38,7 +38,7 @@
         brightness_step_pct: 10
         entity_id: light.bedroom_lights
 
-- id: bedroom-button-dim-down
+- id: bedroom_button_dim_down
   alias: '[Bedroom] Button Dim Down'
   mode: single
   trigger:
@@ -54,7 +54,7 @@
         entity_id: light.bedroom_lights
 
 # Double click
-- id: bedroom-button-dim-up-double
+- id: bedroom_button_dim_up_double
   alias: '[Bedroom] Button Dim Up Double'
   mode: single
   trigger:
@@ -70,8 +70,8 @@
         kelvin: 3200
         entity_id: light.bedroom_lights
 
-- id: bedroom-button-dim-down-double
-  alias: '[Bedroom] Button Dim Up'
+- id: bedroom_button_dim_down_double
+  alias: '[Bedroom] Button Dim Down double'
   mode: single
   trigger:
     - device_id: 15b083b6b5e2acb5d37fbbfbfc76281f
@@ -87,7 +87,7 @@
         entity_id: light.bedroom_lights
 
 # Held
-- id: bedroom-button-turn-on-held
+- id: bedroom_button_turn_on_held
   alias: '[Bedroom] Button Blinds up'
   mode: single
   trigger:
@@ -100,7 +100,7 @@
     - service: cover.open_cover
       entity_id: cover.bedroom_blinds
 
-- id: bedroom-button-turn-off-held
+- id: bedroom_button_turn_off_held
   alias: '[Bedroom] Button Blinds down'
   mode: single
   trigger:
diff --git a/configuration/automations/bedroom-humidifier.yaml b/configuration/automations/bedroom-humidifier.yaml
index c7797f1..acf367b 100644
--- a/configuration/automations/bedroom-humidifier.yaml
+++ b/configuration/automations/bedroom-humidifier.yaml
@@ -1,4 +1,4 @@
-- id: humidifier_on
+- id: bedroom_humidifier_on
   alias: '[Bedroom] Turn on humidifier'
   mode: single
   trigger:
@@ -18,8 +18,8 @@
   action:
     - service: script.humidifier_on
 
-- id: humidifier_off
-  alias: '[Bedroom] Turn on humidifier'
+- id: bedroom_humidifier_off
+  alias: '[Bedroom] Turn off humidifier'
   mode: single
   trigger:
     - platform: numeric_state
diff --git a/configuration/automations/bedroom-motion.yaml b/configuration/automations/bedroom-motion.yaml
index c286a6f..5dc054b 100644
--- a/configuration/automations/bedroom-motion.yaml
+++ b/configuration/automations/bedroom-motion.yaml
@@ -1,4 +1,4 @@
-- id: bedroom-motion-dark
+- id: bedroom_motion_dark
   alias: '[Bedroom] Motion day dark'
   mode: single
   trigger:
@@ -19,7 +19,7 @@
   action:
     - service: script.bedroom_lights_on
 
-- id: bedroom-motion-off
+- id: bedroom_motion_off
   alias: '[Bedroom] Motion Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/bedroom-tv.yaml b/configuration/automations/bedroom-tv.yaml
index fb077e3..263ac02 100644
--- a/configuration/automations/bedroom-tv.yaml
+++ b/configuration/automations/bedroom-tv.yaml
@@ -1,4 +1,4 @@
-- id: bedroom-tv-on
+- id: bedroom_tv_on
   alias: '[Bedroom] TV On'
   trigger:
     - platform: state
@@ -11,7 +11,7 @@
   action:
     - service: script.bedroom_tv_scene
 
-- id: bedroom-tv-off
+- id: bedroom_tv_off
   alias: '[Bedroom] TV Off'
   trigger:
     - platform: state
@@ -24,7 +24,7 @@
   action:
     - service: script.bedroom_tv_off_scene
 
-- id: bedroom-tv-turn-off-at-night
+- id: bedroom_tv_turn_off_at_night
   alias: '[Bedroom] TV turn off at night'
   mode: single
   trigger:
@@ -35,7 +35,7 @@
       target:
         entity_id: media_player.bedroom_tv
 
-- id: bedroom-tv-off-at-night
+- id: bedroom_tv_off_at_night
   alias: '[Bedroom] TV stay off at night'
   mode: single
   trigger:
diff --git a/configuration/automations/behaviour-put-laundry-away.yaml b/configuration/automations/behaviour-put-laundry-away.yaml
index 37377c7..9b9a456 100644
--- a/configuration/automations/behaviour-put-laundry-away.yaml
+++ b/configuration/automations/behaviour-put-laundry-away.yaml
@@ -1,4 +1,4 @@
-- id: behaviour-put-laundry-away
+- id: behaviour_put_laundry_away
   alias: "[Behaviour] Put laundry away"
   mode: single
   trigger:
@@ -17,7 +17,7 @@
       target:
         entity_id: input_boolean.put_laundry_away
 
-- id: behaviour-put-laundry-away-reminder
+- id: behaviour_put_laundry_away_reminder
   alias: "[Behaviour] Put laundry away reminder"
   trigger:
     - platform: state
diff --git a/configuration/automations/calendar.yaml b/configuration/automations/calendar.yaml
index 16e8980..4f3d4b3 100644
--- a/configuration/automations/calendar.yaml
+++ b/configuration/automations/calendar.yaml
@@ -1,4 +1,4 @@
-- id: calendar-coffee-machine-off
+- id: calendar_coffee_machine_off
   alias: "[Calendar] Coffee machine off"
   mode: single
   trigger:
@@ -21,7 +21,7 @@
       target:
         entity_id: switch.coffee_machine_on_off
 
-- id: calendar-coffee-machine-on
+- id: calendar_coffee_machine_on
   alias: "[Calendar] Coffee machine on"
   mode: single
   trigger:
@@ -37,7 +37,7 @@
       target:
         entity_id: switch.coffee_machine_on_off
 
-- id: calendar-before-wakeup
+- id: calendar_before_wakeup
   alias: "[Calendar] Before wakeup"
   mode: single
   trigger:
diff --git a/configuration/automations/camera.yaml b/configuration/automations/camera.yaml
index 5302372..29a67f7 100644
--- a/configuration/automations/camera.yaml
+++ b/configuration/automations/camera.yaml
@@ -29,7 +29,7 @@
           url:
             _: "/lovelace-tablet/security"
 
-- id: camera-hallway-notification
+- id: camera_hallway_notification
   alias: '[Camera] Hallway notification'
   mode: single
   trigger:
@@ -56,7 +56,7 @@
           url:
             _: "/lovelace-tablet/security"
 
-- id: camera-hallway-person-notification
+- id: camera_hallway_person_notification
   alias: '[Camera] Hallway person detected'
   mode: single
   trigger:
@@ -77,7 +77,7 @@
           url:
             _: "/lovelace-tablet/security"
 
-- id: camera-livingroom-person-notification
+- id: camera_livingroom_person_notification
   alias: '[Camera] Living Room person detected'
   mode: single
   trigger:
diff --git a/configuration/automations/computer-button.yaml b/configuration/automations/computer-button.yaml
index 82cfac6..a4f2075 100644
--- a/configuration/automations/computer-button.yaml
+++ b/configuration/automations/computer-button.yaml
@@ -1,4 +1,4 @@
-- id: office-button-light-toggle
+- id: office_button_light_toggle
   alias: '[Office] Button Light'
   mode: single
   trigger:
@@ -10,7 +10,7 @@
   action:
     - service: script.office_lights_toggle
 
-- id: office-button-wol
+- id: office_button_wol
   alias: '[Office] Button WoL'
   trigger:
     - device_id: 5b972523e427721ec88e095994f7cc16
diff --git a/configuration/automations/dining-blinds.yaml b/configuration/automations/dining-blinds.yaml
index 95c85e6..c61bee1 100644
--- a/configuration/automations/dining-blinds.yaml
+++ b/configuration/automations/dining-blinds.yaml
@@ -1,4 +1,4 @@
-- id: button-dining-blinds-up
+- id: button_dining_blinds_up
   alias: '[Dining Blinds] Up'
   trigger:
     - device_id: 6818c2a8921603a8a04e6c6f4d45a8ec
@@ -34,7 +34,7 @@
               entity_id: cover.dining_blinds
   mode: single
 
-- id: button-dining-blinds-down
+- id: button_dining_blinds_down
   alias: '[Dining Blinds] Down'
   trigger:
     - device_id: 6818c2a8921603a8a04e6c6f4d45a8ec
diff --git a/configuration/automations/front-door-doorbell.yaml b/configuration/automations/front-door-doorbell.yaml
index dfed3a3..3c6b4ba 100644
--- a/configuration/automations/front-door-doorbell.yaml
+++ b/configuration/automations/front-door-doorbell.yaml
@@ -1,4 +1,4 @@
-- id: front-door-doorbell
+- id: front_door_doorbell
   alias: '[Front door] Doorbell'
   mode: restart
   trigger:
diff --git a/configuration/automations/front-door.yaml b/configuration/automations/front-door.yaml
index 880f651..bdea1b4 100644
--- a/configuration/automations/front-door.yaml
+++ b/configuration/automations/front-door.yaml
@@ -1,4 +1,4 @@
-- id: front-door-open-notify
+- id: front_door_open_notify
   alias: '[INFO] Front door left open'
   mode: single
   trigger:
@@ -18,7 +18,7 @@
             - action: LOCK_DOOR
               title: Lock door
 
-- id: front-door-open-close
+- id: front_door_open_close
   alias: '[Front Door] Open door'
   mode: single
   trigger:
@@ -30,7 +30,7 @@
   action:
     - service: script.hallway_lights_on
 
-- id: front-door-invalid-state
+- id: front_door_invalid_state
   alias: '[Front Door] Notify about wrong state'
   mode: single
   trigger:
diff --git a/configuration/automations/hallway-lock-button.yaml b/configuration/automations/hallway-lock-button.yaml
index 735a20f..63266c2 100644
--- a/configuration/automations/hallway-lock-button.yaml
+++ b/configuration/automations/hallway-lock-button.yaml
@@ -1,4 +1,4 @@
-- id: hallway-front-door-button-lock
+- id: hallway_front_door_button_lock
   alias: '[Front Door] Button Lock'
   trigger:
     - device_id: d30d25752f5e6741eb8d9562f5b44897
@@ -21,7 +21,7 @@
       target:
         entity_id: lock.front_door_lock_doorlock
 
-- id: hallway-front-door-button-unlock
+- id: hallway_front_door_button_unlock
   alias: '[Front Door] Button Unlock'
   trigger:
     - device_id: d30d25752f5e6741eb8d9562f5b44897
diff --git a/configuration/automations/hallway.yaml b/configuration/automations/hallway.yaml
index a707a92..7a02ce6 100644
--- a/configuration/automations/hallway.yaml
+++ b/configuration/automations/hallway.yaml
@@ -1,4 +1,4 @@
-- id: hallway-button
+- id: hallway_button
   alias: '[Hallway] Button single press'
   mode: single
   trigger:
@@ -10,7 +10,7 @@
   action:
     - service: script.hallway_lights_toggle
 
-- id: hallway-button-double
+- id: hallway_button_double
   alias: '[Hallway] Button double press'
   mode: single
   trigger:
@@ -22,7 +22,7 @@
   action:
     - service: script.leave_home
 
-- id: hallway-motion-on
+- id: hallway_motion_on
   alias: '[Hallway] Motion On'
   mode: restart
   trigger:
@@ -39,7 +39,7 @@
   action:
     - service: script.hallway_lights_on
 
-- id: hallway-motion-off
+- id: hallway_motion_off
   alias: '[Hallway] Motion Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/home-music.yaml b/configuration/automations/home-music.yaml
index 50a6e1d..352c4d5 100644
--- a/configuration/automations/home-music.yaml
+++ b/configuration/automations/home-music.yaml
@@ -1,4 +1,4 @@
-- id: ra-music-bathroom-arrive
+- id: ra_music_bathroom_arrive
   alias: '[RA] Bathroom arrive'
   mode: single
   trigger:
@@ -18,7 +18,7 @@
       target:
         entity_id: media_player.bathroom
 
-- id: ra-music-bathroom-leave
+- id: ra_music_bathroom_leave
   alias: '[RA] Bathroom leave'
   mode: single
   trigger:
@@ -37,7 +37,7 @@
       target:
         entity_id: media_player.bathroom
 
-- id: ra-music-bedroom-arrive
+- id: ra_music_bedroom_arrive
   alias: '[RA] Bedroom arrive'
   mode: single
   trigger:
@@ -57,7 +57,7 @@
       target:
         entity_id: media_player.bedroom
 
-- id: ra-music-bedroom-leave
+- id: ra_music_bedroom_leave
   alias: '[RA] Bedroom leave'
   mode: single
   trigger:
diff --git a/configuration/automations/info-battery.yaml b/configuration/automations/info-battery.yaml
index bfe3324..357bcd4 100644
--- a/configuration/automations/info-battery.yaml
+++ b/configuration/automations/info-battery.yaml
@@ -1,4 +1,4 @@
-- id: info-battery-notice
+- id: info_battery_notice
   alias: '[INFO] Battery notice'
   mode: single
   trigger:
diff --git a/configuration/automations/info-leak.yaml b/configuration/automations/info-leak.yaml
index d646b2a..7ef7066 100644
--- a/configuration/automations/info-leak.yaml
+++ b/configuration/automations/info-leak.yaml
@@ -1,4 +1,4 @@
-- id: info-leak-notice
+- id: info_leak_notice
   alias: '[INFO] Leak notice'
   mode: single
   trigger:
@@ -41,7 +41,7 @@
         target: [ "1109936159951441960" ]
     - service: script.cctv_snapshot_all
 
-- id: info-leak-cleared-notice
+- id: info_leak_cleared_notice
   alias: '[INFO] Leak cleared notice'
   mode: single
   trigger:
@@ -76,7 +76,7 @@
           {{ state_attr(trigger.entity_id, 'friendly_name') }}
         target: [ "1109936159951441960" ]
 
-- id: info-smoke-notice
+- id: info_smoke_notice
   alias: '[INFO] Smoke notice'
   mode: single
   trigger:
@@ -107,8 +107,8 @@
         target: [ "1109936159951441960" ]
     - service: script.cctv_snapshot_all
 
-- id: info-smoke-cleared-notice
-  alias: '[INFO] Smoke notice'
+- id: info_smoke_cleared_notice
+  alias: '[INFO] Smoke cleared notice'
   mode: single
   trigger:
     - platform: state
diff --git a/configuration/automations/info-plants.yaml b/configuration/automations/info-plants.yaml
index b94ee25..48fb5be 100644
--- a/configuration/automations/info-plants.yaml
+++ b/configuration/automations/info-plants.yaml
@@ -1,4 +1,4 @@
-- id: info-plants
+- id: info_plants
   alias: '[INFO] Water plants'
   mode: single
   trigger:
diff --git a/configuration/automations/info-slow-link.yaml b/configuration/automations/info-slow-link.yaml
index 7463a78..433118d 100644
--- a/configuration/automations/info-slow-link.yaml
+++ b/configuration/automations/info-slow-link.yaml
@@ -1,4 +1,4 @@
-- id: info-slow-eth0
+- id: info_slow_eth0
   alias: '[Notify] Slow eth0 link'
   mode: single
   trigger:
@@ -10,7 +10,7 @@
       data:
         message: Internet link fell down to 100 Mbit
 
-- id: info-slow-eth4
+- id: info_slow_eth4
   alias: '[Notify] Slow eth4 link - WiFi'
   mode: single
   trigger:
diff --git a/configuration/automations/info-unavailable-notice.yaml b/configuration/automations/info-unavailable-notice.yaml
index dac3e5e..07f16ef 100644
--- a/configuration/automations/info-unavailable-notice.yaml
+++ b/configuration/automations/info-unavailable-notice.yaml
@@ -1,4 +1,4 @@
-- id: info-unavailable-notice
+- id: info_unavailable_notice
   alias: '[INFO] Unavailable notice'
   description: ''
   mode: single
diff --git a/configuration/automations/intercom.yaml b/configuration/automations/intercom.yaml
index 414c2dc..3f2f429 100644
--- a/configuration/automations/intercom.yaml
+++ b/configuration/automations/intercom.yaml
@@ -1,4 +1,4 @@
-- id: intercom-button
+- id: intercom_button
   alias: '[Intercom] Button'
   mode: single
   trigger:
diff --git a/configuration/automations/ios.yaml b/configuration/automations/ios.yaml
index d64852f..e36fe55 100644
--- a/configuration/automations/ios.yaml
+++ b/configuration/automations/ios.yaml
@@ -1,4 +1,4 @@
-- id: ios-door-lock
+- id: ios_door_lock
   alias: '[ios] Door Lock'
   mode: single
   trigger:
@@ -25,7 +25,7 @@
             target:
               entity_id: lock.front_door_lock_doorlock
 
-- id: ios-intercom-button
+- id: ios_intercom_button
   alias: '[ios] Intercom button'
   mode: single
   trigger:
@@ -38,7 +38,7 @@
       target:
         entity_id: input_boolean.intercom_button
 
-- id: ios-good-night
+- id: ios_good_night
   alias: '[ios] Good Night'
   mode: single
   trigger:
@@ -49,7 +49,7 @@
   action:
     - service: script.good_night
 
-- id: ios-good-morning
+- id: ios_good_morning
   alias: '[ios] Good Morning'
   mode: single
   trigger:
@@ -60,7 +60,7 @@
   action:
     - service: script.good_morning
 
-- id: ios-leave-home
+- id: ios_leave_home
   alias: '[ios] Leave Home'
   mode: single
   trigger:
@@ -71,7 +71,7 @@
   action:
     - service: script.leave_home
 
-- id: ios-arrive-home
+- id: ios_arrive_home
   alias: '[ios] Arrive Home'
   mode: single
   trigger:
diff --git a/configuration/automations/kitchen-button.yaml b/configuration/automations/kitchen-button.yaml
index b52ba59..ab8a963 100644
--- a/configuration/automations/kitchen-button.yaml
+++ b/configuration/automations/kitchen-button.yaml
@@ -1,5 +1,5 @@
 # Kitchen button
-- id: kitchen-button-1 #  Upper Left
+- id: kitchen_button_1 #  Upper Left
   alias: '[Kitchen] Button 1'
   description: ''
   mode: single
@@ -12,7 +12,7 @@
   action:
     - service: script.kitchen_lights_on
 
-- id: kitchen-button-2 # Upper right
+- id: kitchen_button_2 # Upper right
   alias: '[Kitchen] Button 2'
   description: ''
   mode: single
@@ -25,7 +25,7 @@
   action:
     - service: script.hallway_lights_on
 
-- id: kitchen-button-3 # Lower left
+- id: kitchen_button_3 # Lower left
   alias: '[Kitchen] Button 3'
   description: ''
   mode: single
@@ -38,7 +38,7 @@
   action:
     - service: script.kitchen_lights_off
 
-- id: kitchen-button-4 # Lower Right
+- id: kitchen_button_4 # Lower Right
   alias: '[Kitchen] Button 4'
   description: ''
   mode: single
@@ -56,7 +56,7 @@
       target:
         entity_id: light.hallway_lightstrip
 
-- id: kitchen-button-2-held #  Upper right
+- id: kitchen_button_2-held #  Upper right
   alias: '[Kitchen] Button 2 Hold'
   description: ''
   mode: single
@@ -73,7 +73,7 @@
       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
@@ -91,7 +91,7 @@
         brightness_step_pct: -10
 
 # Kitchen sink button
-- id: kitchen-sink-button
+- id: kitchen_sink_button
   alias: '[Kitchen] Sink Button'
   trigger:
     - device_id: 1610374adcb5c5c1a763616a57411eac
@@ -136,7 +136,7 @@
                         kelvin: 3200
   mode: single
 
-- id: kitchen-sink-button-hold
+- id: kitchen_sink_button_hold
   alias: '[Kitchen] Sink Button Hold'
   trigger:
     - device_id: 1610374adcb5c5c1a763616a57411eac
diff --git a/configuration/automations/kitchen-freezer.yaml b/configuration/automations/kitchen-freezer.yaml
index a26efd2..fa366db 100644
--- a/configuration/automations/kitchen-freezer.yaml
+++ b/configuration/automations/kitchen-freezer.yaml
@@ -1,4 +1,4 @@
-- id: kitchen-freezer-open
+- id: kitchen_freezer_open
   alias: '[Kitchen] Freezer open'
   mode: single
   trigger:
diff --git a/configuration/automations/kitchen-motion.yaml b/configuration/automations/kitchen-motion.yaml
index 0cd6737..a09d8c4 100644
--- a/configuration/automations/kitchen-motion.yaml
+++ b/configuration/automations/kitchen-motion.yaml
@@ -1,4 +1,4 @@
-- id: kitchen-lights-on
+- id: kitchen_lights_on
   alias: '[Kitchen] Lights On'
   mode: single
   trigger:
@@ -21,7 +21,7 @@
           sequence:
             - service: script.kitchen_lights_on
 
-- id: kitchen-lights-off
+- id: kitchen_lights_off
   alias: '[Kitchen] Lights Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/living-room-button.yaml b/configuration/automations/living-room-button.yaml
index 5576776..94d9404 100644
--- a/configuration/automations/living-room-button.yaml
+++ b/configuration/automations/living-room-button.yaml
@@ -1,5 +1,5 @@
 # Living Room button
-- id: living-room-button-1 #  Upper Left
+- id: living_room_button_1 #  Upper Left
   alias: '[Living Room] Button 1 - Office Light'
   description: ''
   mode: single
@@ -12,7 +12,7 @@
   action:
     - service: script.table_lights_toggle
 
-- id: living-room-button-2 #  Upper right
+- id: living_room_button_2 #  Upper right
   alias: '[Living Room] Button 2 - Couch Light'
   description: ''
   mode: single
@@ -25,7 +25,7 @@
   action:
     - service: script.living_room_lights_toggle
 
-- id: living-room-button-3 #  Middle left
+- id: living_room_button_3 #  Middle left
   alias: '[Living Room] Button 3 - AndroidTV'
   description: ''
   mode: single
@@ -50,7 +50,7 @@
           sequence:
             - service: script.tv_atv
 
-- id: living-room-button-4 #  Middle right
+- id: living_room_button_4 #  Middle right
   alias: '[Living Room] Button 4 - Xbox'
   description: ''
   mode: single
@@ -75,7 +75,7 @@
           sequence:
             - service: script.tv_xbox
 
-- id: living-room-button-5 #  Bottom left
+- id: living_room_button_5 #  Bottom left
   alias: '[Living Room] Button 5 - Nintendo Swithc'
   description: ''
   mode: single
@@ -100,7 +100,7 @@
           sequence:
             - service: script.tv_nintendo_switch
 
-- id: living-room-button-6 #  Bottom right
+- id: living_room_button_6 #  Bottom right
   alias: '[Living Room] Button 6 - Playstation4'
   description: ''
   mode: single
@@ -125,7 +125,7 @@
           sequence:
             - service: script.tv_ps4
 
-- id: living-room-tv-off
+- id: living_room_tv_off
   alias: '[Living Room] Turn TV Off'
   mode: single
   trigger:
diff --git a/configuration/automations/living-room-presence.yaml b/configuration/automations/living-room-presence.yaml
index be93ee3..6408888 100644
--- a/configuration/automations/living-room-presence.yaml
+++ b/configuration/automations/living-room-presence.yaml
@@ -1,4 +1,4 @@
-- id: living-room-lights-on
+- id: living_room_lights_on
   alias: '[Living Room] Lights On'
   mode: single
   trigger:
@@ -14,7 +14,7 @@
           sequence:
             - service: script.living_room_lights_on
 
-- id: living-room-lights-off
+- id: living_room_lights_off
   alias: '[Living Room] Lights Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/living-room-tv-automations.yaml b/configuration/automations/living-room-tv-automations.yaml
index 735374b..5034690 100644
--- a/configuration/automations/living-room-tv-automations.yaml
+++ b/configuration/automations/living-room-tv-automations.yaml
@@ -1,4 +1,4 @@
-- id: living-room-tv-volume-notification
+- id: living_room_tv_volume_notification
   alias: '[Living Room][TV] Volume notification'
   mode: single
   trigger:
@@ -19,7 +19,7 @@
           duration: 1
           color: black
 
-- id: living-room-tv-suspend-pc
+- id: living_room_tv_suspend_pc
   alias: '[Living Room][TV] When turned on suspend PC'
   description: ''
   mode: single
@@ -31,7 +31,7 @@
   action:
     - service: script.pc_sleep
 
-- id: living-room-tv-update-harmony-mode
+- id: living_room_tv_update_harmony_mode
   alias: '[Living Room][TV] Update harmony mode'
   mode: single
   trigger:
diff --git a/configuration/automations/nfc.yaml b/configuration/automations/nfc.yaml
index 6104563..24b5616 100644
--- a/configuration/automations/nfc.yaml
+++ b/configuration/automations/nfc.yaml
@@ -1,4 +1,4 @@
-- id: nfc-frontdoor
+- id: nfc_frontdoor
   alias: '[NFC] Front door'
   trigger:
     - platform: tag
diff --git a/configuration/automations/office-blinds.yaml b/configuration/automations/office-blinds.yaml
index d5893ac..4401d49 100644
--- a/configuration/automations/office-blinds.yaml
+++ b/configuration/automations/office-blinds.yaml
@@ -1,4 +1,4 @@
-- id: office-blinds-button-down
+- id: office_blinds_button_down
   alias: '[Office Blinds] Down'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
@@ -10,7 +10,7 @@
     - service: script.office_blinds_down
   mode: single
 
-- id: office-blinds-button-up
+- id: office_blinds_button_up
   alias: '[Office Blinds] Up'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
@@ -22,7 +22,7 @@
     - service: script.office_blinds_up
   mode: single
 
-- id: office-blinds-button-down-all
+- id: office_blinds_button_down_all
   alias: '[Office Blinds] Down All'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
@@ -37,7 +37,7 @@
         - cover.office_blinds
   mode: single
 
-- id: office-blinds-button-up-all
+- id: office_blinds_button_up_all
   alias: '[Office Blinds] Up All'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
diff --git a/configuration/automations/office-brightness.yaml b/configuration/automations/office-brightness.yaml
index 3977d73..35473da 100644
--- a/configuration/automations/office-brightness.yaml
+++ b/configuration/automations/office-brightness.yaml
@@ -1,4 +1,4 @@
-- id: office-brightness-dark
+- id: office_brightness_dark
   alias: '[Brightness] Dark - close covers'
   mode: single
   trigger:
@@ -20,7 +20,7 @@
           - cover.office_blinds
           - cover.dining_blinds
 
-- id: office-brightness-dark-lights-on
+- id: office_brightness_dark_lights_on
   alias: '[Brightness] Dark - turn on lights'
   mode: single
   trigger:
@@ -52,7 +52,7 @@
   action:
     - service: script.office_lights_on
 
-- id: office-brightness-ok-lights-off
+- id: office_brightness_ok_lights_off
   alias: '[Brightness] Dark - turn off lights'
   mode: single
   trigger:
@@ -70,7 +70,7 @@
   action:
     - service: script.office_lights_off
 
-- id: office-brightness-ok
+- id: office_brightness_ok
   alias: '[Brightness] OK - open covers'
   mode: single
   trigger:
@@ -130,7 +130,7 @@
               - cover.dining_blinds
         - service: script.office_blinds_up
 
-- id: office-brightness-bright
+- id: office_brightness_bright
   alias: '[Brightness] Bright - close covers'
   mode: single
   trigger:
diff --git a/configuration/automations/office-leak.yaml b/configuration/automations/office-leak.yaml
index d82af46..cca4848 100644
--- a/configuration/automations/office-leak.yaml
+++ b/configuration/automations/office-leak.yaml
@@ -1,4 +1,4 @@
-- id: office-leak
+- id: office_leak
   alias: '[Office] leak detected'
   mode: restart
   trigger:
diff --git a/configuration/automations/office-presence.yaml b/configuration/automations/office-presence.yaml
index d9473a3..cb721e4 100644
--- a/configuration/automations/office-presence.yaml
+++ b/configuration/automations/office-presence.yaml
@@ -1,4 +1,4 @@
-- id: office-lights-on
+- id: office_lights_on
   alias: '[Office] Lights On'
   mode: single
   trigger:
@@ -14,7 +14,7 @@
           sequence:
             - service: script.office_lights_on
 
-- id: office-lights-off
+- id: office_lights_off
   alias: '[Office] Lights Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/presence.yaml b/configuration/automations/presence.yaml
index 01081ea..c5bbe80 100644
--- a/configuration/automations/presence.yaml
+++ b/configuration/automations/presence.yaml
@@ -1,4 +1,4 @@
-- id: presence-arrive
+- id: presence_arrive
   alias: '[Presence] Arrive Home'
   trigger:
     - platform: state
@@ -21,7 +21,7 @@
             - action: UNLOCK_DOOR
               title: Unlock door
 
-- id: presence-leave
+- id: presence_leave
   alias: '[Presence] Leave Home'
   trigger:
     - platform: state
diff --git a/configuration/automations/rack.yaml b/configuration/automations/rack.yaml
index 02a158d..8ec184f 100644
--- a/configuration/automations/rack.yaml
+++ b/configuration/automations/rack.yaml
@@ -1,4 +1,4 @@
-- id: rack-printer-button
+- id: rack_printer_button
   alias: '[Rack] Printer toggle button'
   trigger:
     - device_id: 0c23a8e92f43f628e584dc1805c6915e
diff --git a/configuration/automations/steam.yaml b/configuration/automations/steam.yaml
index 3df072e..da3da45 100644
--- a/configuration/automations/steam.yaml
+++ b/configuration/automations/steam.yaml
@@ -1,4 +1,4 @@
-- id: steam-hue-sync-racing
+- id: steam_hue_sync_racing
   alias: '[Steam] Set Hue sync to racing profile'
   mode: single
   trigger:
@@ -41,7 +41,7 @@
           - automation.brightness_very_bright
           - automation.brightness_very_bright_2
 
-- id: steam-hue-sync-normal
+- id: steam_hue_sync_normal
   alias: '[Steam] Set hue sync back'
   trigger:
     - platform: state
diff --git a/configuration/automations/table-presence.yaml b/configuration/automations/table-presence.yaml
index 832b555..7ee4529 100644
--- a/configuration/automations/table-presence.yaml
+++ b/configuration/automations/table-presence.yaml
@@ -1,4 +1,4 @@
-- id: table-lights-on
+- id: table_lights_on
   alias: '[Table] Lights On'
   mode: single
   trigger:
@@ -14,7 +14,7 @@
           sequence:
             - service: script.table_lights_on
 
-- id: table-lights-off
+- id: table_lights_off
   alias: '[Table] Lights Off'
   mode: restart
   trigger:
diff --git a/configuration/automations/ups.yaml b/configuration/automations/ups.yaml
index 15058af..607d5b0 100644
--- a/configuration/automations/ups.yaml
+++ b/configuration/automations/ups.yaml
@@ -1,4 +1,4 @@
-- id: ups-discharging
+- id: ups_discharging
   alias: '[UPS] Discharging'
   mode: single
   trigger:
@@ -19,7 +19,7 @@
           @everyone
         target: [ "1109936159951441960" ]
 
-- id: ups-charging
+- id: ups_charging
   alias: '[UPS] Charging'
   mode: single
   trigger:
@@ -40,7 +40,7 @@
           @everyone
         target: [ "1109936159951441960" ]
 
-- id: ups-power-back
+- id: ups_power_back
   alias: '[UPS] Power back'
   mode: single
   trigger:
@@ -61,7 +61,7 @@
           @everyone
         target: [ "1109936159951441960" ]
 
-- id: ups-battery-under-100
+- id: ups_battery_under_100
   alias: '[UPS] Battery Under 100%'
   mode: single
   trigger:
@@ -82,7 +82,7 @@
           @everyone
         target: [ "1109936159951441960" ]
 
-- id: ups-battery-under-50
+- id: ups_battery_under_50
   alias: '[UPS] Battery Under 50%'
   mode: single
   trigger:
@@ -103,7 +103,7 @@
           @everyone
         target: [ "1109936159951441960" ]
 
-- id: ups-battery-under-10
+- id: ups_battery_under_10
   alias: '[UPS] Battery Under 10%'
   mode: single
   trigger:
diff --git a/configuration/automations/vacation-alarm-disarm-andrzej.yaml b/configuration/automations/vacation-alarm-disarm-andrzej.yaml
index 92458d4..260355a 100644
--- a/configuration/automations/vacation-alarm-disarm-andrzej.yaml
+++ b/configuration/automations/vacation-alarm-disarm-andrzej.yaml
@@ -1,4 +1,4 @@
-- id: alarm-disarm-andrzej
+- id: alarm_disarm_andrzej
   alias: "[Alarm][Vacation] Disarm Andrzej arrive"
   mode: single
   trigger:
@@ -10,7 +10,7 @@
   action:
     - service: script.arrive_home
 
-- id: alarm-arm-andrzej
+- id: alarm_arm_andrzej
   alias: "[Alarm][Vacation] Arm Andrzej arrive"
   mode: single
   trigger:
diff --git a/configuration/automations/vacation.yaml b/configuration/automations/vacation.yaml
index 25bf758..698d75d 100644
--- a/configuration/automations/vacation.yaml
+++ b/configuration/automations/vacation.yaml
@@ -1,4 +1,4 @@
-- id: vacation-enable
+- id: vacation_enable
   alias: '[Vacation] mode enabled'
   trigger:
     - platform: state
@@ -21,7 +21,7 @@
         restore_states: True
         random: 300
 
-- id: vacation-disable
+- id: vacation_disable
   alias: '[Vacation] mode disabled'
   trigger:
     - platform: state
diff --git a/configuration/automations/vacuum.yaml b/configuration/automations/vacuum.yaml
index a61f952..6f83323 100644
--- a/configuration/automations/vacuum.yaml
+++ b/configuration/automations/vacuum.yaml
@@ -24,7 +24,7 @@
       entity_id: vacuum.valetudo_valetudos5
   mode: single
 
-- id: vacuum-finish
+- id: vacuum_finish
   alias: '[Vacuum] After cleaning'
   trigger:
     - platform: state
@@ -46,7 +46,7 @@
             - service: alarm_control_panel.alarm_arm_away
               entity_id: alarm_control_panel.home_alarm
 
-- id: vacuum-daily-reset
+- id: vacuum_daily_reset
   alias: '[Vacuum] Reset daily cleaning'
   trigger:
     - platform: time
@@ -56,7 +56,7 @@
       target:
         entity_id: input_boolean.vacuum_vacuumed_today
 
-- id: vacuum-clean-sensors
+- id: vacuum_clean_sensors
   alias: '[Vacuum] Clean sensors'
   mode: single
   trigger:
@@ -75,7 +75,7 @@
       data:
         message: Clean sensors
 
-- id: vacuum-buy-main-brush
+- id: vacuum_buy_main_brush
   alias: '[Vacuum] Buy main brush'
   mode: single
   trigger:
@@ -91,7 +91,7 @@
         data:
           url: "https://allegro.pl/listing?string=roborock+s5+szczotka"
 
-- id: vacuum-change-main-brush
+- id: vacuum_change_main_brush
   alias: '[Vacuum] Change main brush'
   mode: single
   trigger:
@@ -110,7 +110,7 @@
       data:
         message: "Main brush has {{ states('sensor.valetudo_valetudos5_main_brush') }}  minutes of lifetime change it"
 
-- id: vacuum-buy-side-brush
+- id: vacuum_buy_side_brush
   alias: '[Vacuum] Buy side brush'
   mode: single
   trigger:
@@ -126,7 +126,7 @@
         data:
           url: "https://allegro.pl/listing?string=roborock+s5+szczotka"
 
-- id: vacuum-change-side-brush
+- id: vacuum_change_side_brush
   alias: '[Vacuum] Change side brush'
   mode: single
   trigger:
@@ -145,7 +145,7 @@
       data:
         message: "Side brush has {{ states('sensor.valetudo_valetudos5_right_brush') }}  minutes of lifetime change it"
 
-- id: vacuum-buy-filter
+- id: vacuum_buy_filter
   alias: '[Vacuum] Buy filter'
   mode: single
   trigger:
@@ -161,7 +161,7 @@
         data:
           url: "https://allegro.pl/listing?string=roborock+s5+filtr"
 
-- id: vacuum-change-filter
+- id: vacuum_change_filter
   alias: '[Vacuum] Change filter'
   mode: single
   trigger:
diff --git a/configuration/automations/work.yaml b/configuration/automations/work.yaml
index 8978003..5155588 100644
--- a/configuration/automations/work.yaml
+++ b/configuration/automations/work.yaml
@@ -1,4 +1,4 @@
-- id: work-work-start-warning-bathroom
+- id: work_work_start_warning_bathroom
   alias: '[Work] Work start warning'
   trigger:
     - platform: time
@@ -55,7 +55,7 @@
       entity_id: light.bathroom_color_zha_group_0x0007
   mode: single
 
-- id: work-daily-off
+- id: work_daily_off
   alias: '[Work] Daily notification off'
   trigger:
     - platform: time
@@ -73,7 +73,7 @@
       entity_id: light.desk_lightbar_ambilight
   mode: single
 
-- id: work-finished
+- id: work_finished
   alias: '[Work] Notify when finished work'
   trigger:
     - platform: state
@@ -114,7 +114,7 @@
       entity_id: light.office_light_up
   mode: single
 
-- id: work-cool-down-home
+- id: work_cool_down_home
   alias: '[Work] Cool down home after leaving work'
   mode: single
   trigger: