diff --git a/scenes.yaml b/scenes.yaml
index 643bcbf..3524820 100644
--- a/scenes.yaml
+++ b/scenes.yaml
@@ -1,304 +1,367 @@
-# --------------------  Martin Arbeitszimmer ---------------------------------
-
 - name: Arbeitszimmer Martin Orange
   id: arbeitszimmer_martin_orange
   entities:
     light.arbeitszimmer_martin_deckenlampe:
-      state: off
+      state: false
     light.arbeitszimmer_martin:
-      state: on
+      state: true
       brightness: 229
       color_temp: 484
     light.arbeitszimmer_martin_oben:
-      state: on
+      state: true
       brightness: 216
-      xy_color: [0.569, 0.397]
+      xy_color:
+      - 0.569
+      - 0.397
     light.arbeitszimmer_martin_unten:
-      state: on
+      state: true
       brightness: 214
-      xy_color: [0.2, 0.102]
-
+      xy_color:
+      - 0.2
+      - 0.102
 - name: Arbeitszimmer Martin Blau Grün
   id: arbeitszimmer_martin_blau_grun
   entities:
     light.arbeitszimmer_martin_deckenlampe:
-      state: off
+      state: false
     light.arbeitszimmer_martin:
-      state: on
+      state: true
       brightness: 173
-      xy_color: [0.429, 0.483]
+      xy_color:
+      - 0.429
+      - 0.483
     light.arbeitszimmer_martin_oben:
-      state: on
+      state: true
       brightness: 186
-      xy_color: [0.565,0.398]
+      xy_color:
+      - 0.565
+      - 0.398
     light.arbeitszimmer_martin_unten:
-      state: on
+      state: true
       brightness: 247
-      xy_color: [0.219,0.137]
-
+      xy_color:
+      - 0.219
+      - 0.137
 - name: Arbeitszimmer Martin Hell
   id: arbeitszimmer_martin_hell
   entities:
     light.arbeitszimmer_martin_deckenlampe:
-      state: on
+      state: true
       brightness: 252
     light.arbeitszimmer_martin:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.429, 0.483]
+      xy_color:
+      - 0.429
+      - 0.483
     light.arbeitszimmer_martin_oben:
-      state: on
+      state: true
       brightness: 247
-      xy_color: [0.44, 0.485]
+      xy_color:
+      - 0.44
+      - 0.485
     light.arbeitszimmer_martin_unten:
-      state: on
+      state: true
       brightness: 249
-      xy_color: [0.219, 0.137]
-
-
-
-# --------------------  Wohnbereich -----------------------------------------
-
-
+      xy_color:
+      - 0.219
+      - 0.137
 - name: Wohnbereich Orange
   id: wohnbereich_orange
   entities:
     light.kuche_deckenlampe:
-      state: on
+      state: true
       brightness: 38
     light.wohnzimmer_deckenlampe:
-      state: on
+      state: true
       brightness: 38
     light.esszimmer_deckenlampe_west:
-      state: on
+      state: true
       brightness: 38
     light.esszimmer_deckenlampe_mitte:
-      state: on
+      state: true
       brightness: 38
     light.esszimmer_schrankleuchte:
-      state: off
+      state: false
     light.kuche_links:
-      state: on
+      state: true
       brightness: 153
-      xy_color: [0.54, 0.435]
+      xy_color:
+      - 0.54
+      - 0.435
     light.kuche_rechts:
-      state: on
+      state: true
       brightness: 242
-      xy_color: [0.557, 0.396]
+      xy_color:
+      - 0.557
+      - 0.396
     light.kuche_vorne:
-      state: on
+      state: true
       color_temp: 477
       brightness: 114
     light.wohnzimmer_kugel:
-      state: on
+      state: true
       brightness: 229
       color_temp: 492
     light.wohnzimmer_stehlampe:
-      state: on
+      state: true
       brightness: 191
       color_temp: 428
     light.wohnzimmer_stehlampe_oben:
-      state: on
+      state: true
       brightness: 127
       color_temp: 492
     light.wohnzimmer_regal_rechts:
-      state: on
+      state: true
       brightness: 191
-      xy_color: [0.618, 0.366]
+      xy_color:
+      - 0.618
+      - 0.366
     light.wohnzimmer_regal_links:
-      state: on
+      state: true
       brightness: 191
-      xy_color: [0.53, 0.443]
-
+      xy_color:
+      - 0.53
+      - 0.443
 - name: Wohnbereich Blau Grün
   id: wohnberech_blau_grun
   entities:
     light.kuche_deckenlampe:
-      state: on
+      state: true
       brightness: 38
     light.wohnzimmer_deckenlampe:
-      state: on
+      state: true
       brightness: 51
     light.esszimmer_deckenlampe_west:
-      state: on
+      state: true
       brightness: 38
     light.esszimmer_deckenlampe_mitte:
-      state: on
+      state: true
       brightness: 38
     light.esszimmer_schrankleuchte:
-      state: off
+      state: false
     light.kuche_links:
-      state: on
+      state: true
       brightness: 198
-      xy_color: [0.156, 0.218]
+      xy_color:
+      - 0.156
+      - 0.218
     light.kuche_rechts:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.171, 0.353]
+      xy_color:
+      - 0.171
+      - 0.353
     light.kuche_vorne:
-      state: on
+      state: true
       brightness: 130
-      xy_color: [0.158, 0.053]
+      xy_color:
+      - 0.158
+      - 0.053
     light.wohnzimmer_kugel:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.46, 0.408]
+      xy_color:
+      - 0.46
+      - 0.408
     light.wohnzimmer_stehlampe:
-      state: on
+      state: true
       brightness: 153
-      xy_color: [0.183, 0.062]
+      xy_color:
+      - 0.183
+      - 0.062
     light.wohnzimmer_stehlampe_oben:
-      state: on
+      state: true
       brightness: 150
-      xy_color: [0.184, 0.068]
+      xy_color:
+      - 0.184
+      - 0.068
     light.wohnzimmer_regal_rechts:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.143, 0.113]
+      xy_color:
+      - 0.143
+      - 0.113
     light.wohnzimmer_regal_links:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.222, 0.636]
-
-
+      xy_color:
+      - 0.222
+      - 0.636
 - name: Wohnbereich Grün
   id: wohnbereich_grun
   entities:
     light.kuche_deckenlampe:
-      state: off
+      state: false
     light.wohnzimmer_deckenlampe:
-      state: off
+      state: false
     light.esszimmer_deckenlampe_west:
-      state: off
+      state: false
     light.esszimmer_deckenlampe_mitte:
-      state: off
+      state: false
     light.esszimmer_schrankleuchte:
-      state: off
+      state: false
     light.kuche_links:
-      state: on
+      state: true
       brightness: 198
-      xy_color: [0.4038, 0.555]
+      xy_color:
+      - 0.4038
+      - 0.555
     light.kuche_rechts:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.4771, 0.4957]
+      xy_color:
+      - 0.4771
+      - 0.4957
     light.kuche_vorne:
-      state: on
+      state: true
       brightness: 130
-      xy_color: [0.1987, 0.5792]
+      xy_color:
+      - 0.1987
+      - 0.5792
     light.wohnzimmer_kugel:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.4084, 0.5168]
+      xy_color:
+      - 0.4084
+      - 0.5168
     light.wohnzimmer_stehlampe:
-      state: on
+      state: true
       brightness: 153
-      xy_color: [0.4084, 0.5168]
+      xy_color:
+      - 0.4084
+      - 0.5168
     light.wohnzimmer_stehlampe_oben:
-      state: on
+      state: true
       brightness: 150
-      xy_color: [0.40, 0.53]
+      xy_color:
+      - 0.4
+      - 0.53
     light.wohnzimmer_regal_rechts:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.1635, 0.3502]
+      xy_color:
+      - 0.1635
+      - 0.3502
     light.wohnzimmer_regal_links:
-      state: on
+      state: true
       brightness: 252
-      xy_color: [0.2075, 0.6584]
-
-
+      xy_color:
+      - 0.2075
+      - 0.6584
 - name: Wohnbereich Hell
   id: wohnbereich_hell
   entities:
     light.esszimmer_deckenlampe_west:
-      state: on
+      state: true
       brightness: 255
     light.wohnzimmer_deckenlampe:
-      state: on
+      state: true
       brightness: 255
     light.kuche_deckenlampe:
-      state: on
+      state: true
       brightness: 255
     light.wohnzimmer_regal_links:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.527, 0.447]
+      xy_color:
+      - 0.527
+      - 0.447
     light.kuche_links:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.537, 0.438]
+      xy_color:
+      - 0.537
+      - 0.438
     light.kuche_rechts:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.557, 0.403]
+      xy_color:
+      - 0.557
+      - 0.403
     light.wohnzimmer_regal_rechts:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.616, 0.371]
+      xy_color:
+      - 0.616
+      - 0.371
     light.wohnzimmer_stehlampe_oben:
-      state: on
+      state: true
       brightness: 255
       color_temp: 492
     light.wohnzimmer_stehlampe:
-      state: on
+      state: true
       brightness: 255
       color_temp: 492
     light.wohnzimmer_kugel:
-      state: on
+      state: true
       brightness: 255
       color_temp: 492
     light.kuche_vorne:
-      state: on
+      state: true
       brightness: 255
       color_temp: 492
-
-
 - name: Wohnbereich Meditation
   id: wohnbereich_meditation
   entities:
     light.kuche_deckenlampe:
-      state: off
+      state: false
     light.wohnzimmer_deckenlampe:
-      state: off
+      state: false
     light.esszimmer_deckenlampe_west:
-      state: off
+      state: false
     light.esszimmer_deckenlampe_mitte:
-      state: off
+      state: false
     light.esszimmer_schrankleuchte:
-      state: off
+      state: false
     light.kuche_links:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.5428, 0.3887]
+      xy_color:
+      - 0.5428
+      - 0.3887
     light.kuche_rechts:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.2927, 0.2242]
+      xy_color:
+      - 0.2927
+      - 0.2242
     light.kuche_vorne:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.6, 0.377]
+      xy_color:
+      - 0.6
+      - 0.377
     light.wohnzimmer_kugel:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.3581, 0.287]
+      xy_color:
+      - 0.3581
+      - 0.287
     light.wohnzimmer_stehlampe:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.3581, 0.287]
+      xy_color:
+      - 0.3581
+      - 0.287
     light.wohnzimmer_stehlampe_oben:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.5993, 0.3765]
+      xy_color:
+      - 0.5993
+      - 0.3765
     light.wohnzimmer_regal_rechts:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.2925, 0.2231]
+      xy_color:
+      - 0.2925
+      - 0.2231
     light.wohnzimmer_regal_links:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.2075, 0.6584]
+      xy_color:
+      - 0.2075
+      - 0.6584
     cover.esszimmer_fenster_rollo:
       state: open
       current_position: 100
@@ -311,61 +374,75 @@
     cover.wohnzimmer_terrassentur_rollo:
       state: open
       current_position: 100
-
-
 - name: Wohnbereich Kuscheln
   id: wohnbereich_kuscheln
   entities:
     light.kuche_deckenlampe:
-      state: off
+      state: false
     light.wohnzimmer_deckenlampe:
-      state: off
+      state: false
     light.esszimmer_deckenlampe_west:
-      state: off
+      state: false
     light.esszimmer_deckenlampe_mitte:
-      state: off
+      state: false
     light.esszimmer_schrankleuchte:
-      state: off
+      state: false
     light.kuche_links:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.5609, 0.4111]
+      xy_color:
+      - 0.5609
+      - 0.4111
     light.kuche_rechts:
-      state: on
+      state: true
       brightness: 190
-      xy_color:  [0.5609, 0.4111]
+      xy_color:
+      - 0.5609
+      - 0.4111
     light.kuche_vorne:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.561, 0.4042]
+      xy_color:
+      - 0.561
+      - 0.4042
     light.wohnzimmer_kugel:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.5609, 0.4042]
+      xy_color:
+      - 0.5609
+      - 0.4042
     light.wohnzimmer_stehlampe:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.5609, 0.4042]
+      xy_color:
+      - 0.5609
+      - 0.4042
     light.wohnzimmer_stehlampe_oben:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.5609, 0.4042]
+      xy_color:
+      - 0.5609
+      - 0.4042
     light.wohnzimmer_regal_rechts:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.5609, 0.4111]
+      xy_color:
+      - 0.5609
+      - 0.4111
     light.wohnzimmer_regal_links:
-      state: on
+      state: true
       brightness: 190
-      xy_color: [0.5609, 0.4111]
-    # Ganglicht
+      xy_color:
+      - 0.5609
+      - 0.4111
     light.gang_bogen:
-      state: on
+      state: true
       brightness: 255
-      xy_color: [0.6313, 0.361]
+      xy_color:
+      - 0.6313
+      - 0.361
     light.gang_licht:
-      state: off
-    # Rollos
+      state: false
     cover.esszimmer_fenster_rollo:
       state: closed
       current_position: 0
@@ -378,140 +455,184 @@
     cover.wohnzimmer_terrassentur_rollo:
       state: closed
       current_position: 0
-
-
-# --------------------  Schlafzimmer -----------------------------------------
-
-- name: Schlafzimmer Bettlicht dunkel
-  id: schlafzimmer_bettlich_dunkel
+- id: schlafzimmer_bettlich_dunkel
+  name: Schlafzimmer Bettlicht dunkel
   entities:
-    light.schlafzimmer_deckenlampe:
-      state: off
-    light.schlafzimmer_schrank:
-      state: off
     light.bett_martin:
-      state: on
       brightness: 5
-      xy_color: [0.502, 0.414]
+      effect: none
+      hs_color:
+      - 10.118
+      - 100
+      rgb_color:
+      - 255
+      - 43
+      - 0
+      state: 'on'
+      xy_color:
+      - 0.689
+      - 0.309
     light.bett_rebecca:
-      state: on
       brightness: 5
-      xy_color: [0.502, 0.414]
+      effect: none
+      hs_color:
+      - 10.118
+      - 100
+      rgb_color:
+      - 255
+      - 43
+      - 0
+      state: 'on'
+      xy_color:
+      - 0.689
+      - 0.309
+    light.schlafzimmer_deckenlampe:
+      state: 'off'
     light.schlafzimmer_fluter:
-      state: off
-
-
+      state: 'off'
+    light.schlafzimmer_schrank:
+      state: 'off'
 - name: Schlafzimmer Orange
   id: schlafzimmer_orange
   entities:
     light.schlafzimmer_deckenlampe:
-      state: off
+      state: false
     light.schlafzimmer_schrank:
-      state: on
+      state: true
       brightness: 81
-      xy_color: [0.502, 0.414]
+      xy_color:
+      - 0.502
+      - 0.414
     light.bett_martin:
-      state: on
+      state: true
       brightness: 81
-      xy_color: [0.502, 0.414]
+      xy_color:
+      - 0.502
+      - 0.414
     light.bett_rebecca:
-      state: on
+      state: true
       brightness: 81
-      xy_color: [0.502, 0.414]
+      xy_color:
+      - 0.502
+      - 0.414
     light.schlafzimmer_fluter:
-      state: on
+      state: true
       brightness: 81
-      xy_color: [0.502, 0.414]
-
-
+      xy_color:
+      - 0.502
+      - 0.414
 - name: Schlafzimmer Rot
   id: schlafzimmer_rot
   entities:
     light.schlafzimmer_deckenlampe:
-      state: off
+      state: false
     light.schlafzimmer_schrank:
-      state: on
+      state: true
       brightness: 146
-      xy_color: [0.584, 0.354]
+      xy_color:
+      - 0.584
+      - 0.354
     light.bett_martin:
-      state: on
+      state: true
       brightness: 198
-      xy_color: [0.584, 0.354]
+      xy_color:
+      - 0.584
+      - 0.354
     light.bett_rebecca:
-      state: on
+      state: true
       brightness: 198
-      xy_color: [0.569, 0.397]
+      xy_color:
+      - 0.569
+      - 0.397
     light.schlafzimmer_fluter:
-      state: on
+      state: true
       brightness: 95
-      xy_color: [0.581, 0.389]
-
-
+      xy_color:
+      - 0.581
+      - 0.389
 - name: Schlafzimmer Blau
   id: schlafzimmer_blau
   entities:
     light.schlafzimmer_deckenlampe:
-      state: off
+      state: false
     light.schlafzimmer_schrank:
-      state: on
+      state: true
       brightness: 58
-      xy_color: [0.442, 0.416]
+      xy_color:
+      - 0.442
+      - 0.416
     light.bett_martin:
-      state: on
+      state: true
       brightness: 254
-      xy_color: [0.191, 0.173]
+      xy_color:
+      - 0.191
+      - 0.173
     light.bett_rebecca:
-      state: on
+      state: true
       brightness: 83
-      xy_color: [0.418, 0.419]
+      xy_color:
+      - 0.418
+      - 0.419
     light.schlafzimmer_fluter:
-      state: on
+      state: true
       brightness: 127
-      xy_color: [0.223, 0.148]
-
-
+      xy_color:
+      - 0.223
+      - 0.148
 - name: Schlafzimmer Ganz Hell
   id: schlafzimmer_ganz_hell
   entities:
     light.schlafzimmer_deckenlampe:
-      state: on
+      state: true
       brightness: 255
     light.schlafzimmer_schrank:
-      state: on
+      state: true
       brightness: 254
-      xy_color: [0.459, 0.408]
+      xy_color:
+      - 0.459
+      - 0.408
     light.bett_martin:
-      state: on
+      state: true
       brightness: 254
-      xy_color: [0.459, 0.408]
+      xy_color:
+      - 0.459
+      - 0.408
     light.bett_rebecca:
-      state: on
+      state: true
       brightness: 254
-      xy_color: [0.459, 0.408]
+      xy_color:
+      - 0.459
+      - 0.408
     light.schlafzimmer_fluter:
-      state: on
+      state: true
       brightness: 254
-      xy_color: [0.459, 0.408]
-
-
-# --------------------- Garten -------------------------------------------------
-
+      xy_color:
+      - 0.459
+      - 0.408
 - name: Garten Savanna
   id: garten_savanna
   entities:
     light.garten_stehleuchte:
-      state: on
+      state: true
       brightness: 205
-      xy_color: [0.465, 0.448]
+      xy_color:
+      - 0.465
+      - 0.448
     light.garten_spot_beet:
-      state: on
+      state: true
       brightness: 205
-      xy_color: [0.532, 0.384]
+      xy_color:
+      - 0.532
+      - 0.384
     light.garten_spot_magnolie:
-      state: on
+      state: true
       brightness: 205
-      xy_color: [0.465, 0.448]
+      xy_color:
+      - 0.465
+      - 0.448
     light.garten_spot_birke:
-      state: on
+      state: true
       brightness: 205
-      xy_color: [0.586, 0.35]
+      xy_color:
+      - 0.586
+      - 0.35