diff --git a/config/configuration.yaml b/config/configuration.yaml
index 12364af..feb980f 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -168,4 +168,3 @@ panel_iframe:
 zwave:
   usb_path: /dev/ttyACM1
   # device_config: !include zwave_device_config.yaml
-
diff --git a/config/lovelace/advanced_dashboard/01_new.yaml b/config/lovelace/advanced_dashboard/01_new.yaml
index 66f7744..7598989 100644
--- a/config/lovelace/advanced_dashboard/01_new.yaml
+++ b/config/lovelace/advanced_dashboard/01_new.yaml
@@ -94,4 +94,3 @@ cards:
           average: true
           extrema: true
           fill: true
-
diff --git a/config/lovelace/advanced_dashboard/03_climate.yaml b/config/lovelace/advanced_dashboard/03_climate.yaml
index 5e48d95..f1c7333 100644
--- a/config/lovelace/advanced_dashboard/03_climate.yaml
+++ b/config/lovelace/advanced_dashboard/03_climate.yaml
@@ -67,4 +67,3 @@ cards:
             - main_entity: sensor.guest_bedroom_weather_temperature
             - left_entity: sensor.guest_bedroom_weather_humidity
             - right_entity: sensor.guest_bedroom_weather_pressure
-
diff --git a/config/lovelace/advanced_dashboard/13_dev.yaml b/config/lovelace/advanced_dashboard/13_dev.yaml
index 205f27f..f74ba91 100644
--- a/config/lovelace/advanced_dashboard/13_dev.yaml
+++ b/config/lovelace/advanced_dashboard/13_dev.yaml
@@ -100,5 +100,3 @@ cards:
                 max_count: 2
           - type: custom:folder-card
             entity: sensor.pds
-
-
diff --git a/config/packages/devices/living_room/desk_switch.yaml b/config/packages/devices/living_room/desk_switch.yaml
index 2174d92..2aec8a2 100644
--- a/config/packages/devices/living_room/desk_switch.yaml
+++ b/config/packages/devices/living_room/desk_switch.yaml
@@ -80,4 +80,3 @@ automation:
     action:
       - service: media_player.media_play_pause
         entity_id: media_player.living_room
-
diff --git a/config/packages/modules/climate/climate.yaml b/config/packages/modules/climate/climate.yaml
index a374e63..319ee4f 100644
--- a/config/packages/modules/climate/climate.yaml
+++ b/config/packages/modules/climate/climate.yaml
@@ -21,8 +21,7 @@ sensor:
       - sensor.hallway_weather_humidity
       - sensor.guest_bedroom_weather_humidity
 
-
-sensor:
+  # MQTT
   # Bedroom weather sensor
   - platform: mqtt
     name: "Bedroom weather temperature"
diff --git a/config/packages/modules/lighting/by_rooms/hallway.yaml b/config/packages/modules/lighting/by_rooms/hallway.yaml
index 87dfdc3..78f0583 100644
--- a/config/packages/modules/lighting/by_rooms/hallway.yaml
+++ b/config/packages/modules/lighting/by_rooms/hallway.yaml
@@ -35,9 +35,9 @@ automation:
     condition:
       condition: not
       conditions:
-      - condition: state
-        entity_id: input_select.house_mode
-        state: 'day'
+        - condition: state
+          entity_id: input_select.house_mode
+          state: 'day'
     action:
       - service: light.turn_on
         entity_id: light.light_lohas_6
diff --git a/config/packages/modules/lighting/setup/connectors.yaml b/config/packages/modules/lighting/setup/connectors.yaml
index dbb8cef..dd326fb 100644
--- a/config/packages/modules/lighting/setup/connectors.yaml
+++ b/config/packages/modules/lighting/setup/connectors.yaml
@@ -5,4 +5,3 @@ yeelight:
       name: Bedside
     !secret yeelight_living_room_ip:
       name: Living room Ambient main
-
diff --git a/config/packages/modules/lighting/temperature.yaml b/config/packages/modules/lighting/temperature.yaml
index e33bbef..8e1b53d 100644
--- a/config/packages/modules/lighting/temperature.yaml
+++ b/config/packages/modules/lighting/temperature.yaml
@@ -47,5 +47,6 @@ automation:
       - service: logbook.log
         data_template:
           name: "💡 Lighting Module · "
-          message: "Adjusting temperature - sun changed from {{ trigger.from_state.state }} to {{ trigger.to_state.state }}"
+          message: >-
+            Adjusting temperature - sun changed from {{ trigger.from_state.state }} to {{ trigger.to_state.state }}
           domain: light
diff --git a/config/packages/modules/media/youtube.yaml b/config/packages/modules/media/youtube.yaml
index 4b9655a..56710cb 100644
--- a/config/packages/modules/media/youtube.yaml
+++ b/config/packages/modules/media/youtube.yaml
@@ -91,4 +91,3 @@ automation:
       - service: script.say
         data:
           message: "Just wanted to let you know - a new PDS is available!"
-
diff --git a/config/packages/modules/network.yaml b/config/packages/modules/network.yaml
index d176df9..29b8464 100644
--- a/config/packages/modules/network.yaml
+++ b/config/packages/modules/network.yaml
@@ -33,7 +33,7 @@ pi_hole:
     api_key: !secret pihole_api_key
 
 homekit:
-  safe_mode: True
+  safe_mode: true
   filter:
     include_entities:
       - light.living_room_main
diff --git a/config/packages/modules/speech.yaml b/config/packages/modules/speech.yaml
index 5bfe4f5..c8eb6cc 100644
--- a/config/packages/modules/speech.yaml
+++ b/config/packages/modules/speech.yaml
@@ -32,9 +32,9 @@ script:
       # Don't talk while in night mode.
       - condition: not
         conditions:
-        - condition: state
-          entity_id: input_select.house_mode
-          state: 'night'
+          - condition: state
+            entity_id: input_select.house_mode
+            state: 'night'
       # Combine partials for speech message.
       - service: script.say_discretely
         data_template:
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index e1713f2..5702d17 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -24,4 +24,3 @@ services:
   #   depends_on:
   #     - homeassistant
   #   network_mode: host
-
diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml
index 4ef11c9..01abd44 100644
--- a/zigbee2mqtt/configuration.yaml
+++ b/zigbee2mqtt/configuration.yaml
@@ -62,5 +62,3 @@ devices:
     retain: true
     temperature_precision: 1
     humidity_precision: 1
-
-