diff --git a/configuration/configuration.yaml b/configuration/configuration.yaml
index 2b1ac07..0000761 100644
--- a/configuration/configuration.yaml
+++ b/configuration/configuration.yaml
@@ -1,8 +1,97 @@
 # Configure a default setup of Home Assistant (frontend, api, etc)
-default_config:
-
+automation: !include_dir_merge_list automations/
+#cloud:
+config:
+counter:
+dhcp:
+energy:
+frontend:
+history:
+http:
+  use_x_forwarded_for: true
+  trusted_proxies:
+    - 192.168.50.100
+    - 192.168.50.101
+    - 192.168.50.102
+    - 192.168.50.103
+  ip_ban_enabled: true
+  login_attempts_threshold: 5
+image:
+input_boolean:
+input_datetime:
+input_number:
+  # Living Room
+  living_room_air_purifier_favorite_level:
+    name: "Favorite level"
+    initial: 0
+    min: 0
+    max: 14
+    step: 1
+    icon: "mdi:weather-windy"
+  # Bedroom
+  bedroom_air_purifier_favorite_level:
+    name: "Favorite level"
+    initial: 0
+    min: 0
+    max: 14
+    step: 1
+    icon: "mdi:weather-windy"
+  living_room_air_purifier_fan_level:
+    name: "Fan level"
+    initial: 1
+    min: 1
+    max: 3
+    step: 1
+    icon: "mdi:weather-windy"
+input_select:
+  # Living Room
+  living_room_air_purifier_mode:
+    name: Mode
+    options:
+      - Auto
+      - Silent
+      - Favorite
+      - Fan
+    icon: "mdi:animation-outline"
+  # Bedroom
+  bedroom_air_purifier_mode:
+    name: Mode
+    options:
+      - Auto
+      - Silent
+      - Favorite
+      - Fan
+    icon: "mdi:animation-outline"
+  home_mode:
+    name: Home mode
+    options:
+      - Day
+      - Night
+      - Party
+      - Away
+    icon: "mdi:home"
+input_text:
+logbook:
+network:
+map:
+media_source:
+mobile_app:
+my:
+person:
 recorder:
   db_url: !secret postgres_url
+scene: !include scenes.yaml
+script: !include scripts.yaml
+ssdp:
+stream:
+sun:
+system_health:
+#tag:
+timer:
+updater:
+webhook:
+zeroconf:
+zone:
 
 # Text to speech
 tts:
@@ -11,9 +100,6 @@ tts:
     base_url: http://192.168.60.100:8123
 
 group: !include groups.yaml
-automation: !include_dir_merge_list automations/
-script: !include scripts.yaml
-scene: !include scenes.yaml
 
 zha:
   zigpy_config:
@@ -408,16 +494,6 @@ binary_sensor:
     platform: ping
     host: 192.168.60.14
 
-http:
-  use_x_forwarded_for: true
-  trusted_proxies:
-    - 192.168.50.100
-    - 192.168.50.101
-    - 192.168.50.102
-    - 192.168.50.103
-  ip_ban_enabled: true
-  login_attempts_threshold: 5
-
 switch:
   - platform: zoneminder
     command_on: Modect
@@ -517,59 +593,6 @@ cover:
       - cover.computer_cave_blind_left
       - cover.computer_cave_blind_right
 
-input_select:
-  # Living Room
-  living_room_air_purifier_mode:
-    name: Mode
-    options:
-      - Auto
-      - Silent
-      - Favorite
-      - Fan
-    icon: "mdi:animation-outline"
-  # Bedroom
-  bedroom_air_purifier_mode:
-    name: Mode
-    options:
-      - Auto
-      - Silent
-      - Favorite
-      - Fan
-    icon: "mdi:animation-outline"
-  home_mode:
-    name: Home mode
-    options:
-      - Day
-      - Night
-      - Party
-      - Away
-    icon: "mdi:home"
-
-input_number:
-  # Living Room
-  living_room_air_purifier_favorite_level:
-    name: "Favorite level"
-    initial: 0
-    min: 0
-    max: 14
-    step: 1
-    icon: "mdi:weather-windy"
-  # Bedroom
-  bedroom_air_purifier_favorite_level:
-    name: "Favorite level"
-    initial: 0
-    min: 0
-    max: 14
-    step: 1
-    icon: "mdi:weather-windy"
-  living_room_air_purifier_fan_level:
-    name: "Fan level"
-    initial: 1
-    min: 1
-    max: 3
-    step: 1
-    icon: "mdi:weather-windy"
-
 template:
   - sensor:
       - name: "3d Printer kWh"