diff --git a/lovelace/dashboard/hello_world.yaml b/lovelace/dashboard/hello_world.yaml
index b4a18f2..6a50dff 100755
--- a/lovelace/dashboard/hello_world.yaml
+++ b/lovelace/dashboard/hello_world.yaml
@@ -22,20 +22,16 @@
       template: card_person
       entity: device_tracker.pfsense_blutwurst1_de_galaxy_s21_ultra_5g_blutwurst1_de
       variables:
-        ulm_card_person_entity: device_tracker.pfsense_blutwurst1_de_galaxy_s21_ultra_5g_blutwurst1_de
+        ulm_card_person_entity: person.hansen
         ulm_card_person_use_entity_picture: true
         ulm_card_person_icon: mdi:face-man
-        #ulm_card_person_zone1: zone.home
-        #ulm_address: sensor.s10_mike_gegeocodeerde_locatie
     - type: "custom:button-card"
       template: card_person
-      entity: person.toni
+      entity: device_tracker.pfsense_blutwurst1_de_tonis_iphone_blutwurst1_de
       variables:
         ulm_card_person_entity: person.toni
         ulm_card_person_use_entity_picture: true
         ulm_card_person_icon: mdi:face-woman
-        #ulm_card_person_zone1: zone.home
-        #ulm_address: sensor.s10_mike_gegeocodeerde_locatie
 
 
 - type: custom:weather-card
diff --git a/lovelace/dashboard/lights.yaml b/lovelace/dashboard/lights.yaml
index cc66186..129d2fb 100755
--- a/lovelace/dashboard/lights.yaml
+++ b/lovelace/dashboard/lights.yaml
@@ -1,3 +1,8 @@
+- type: 'custom:button-card'
+  template: card_title
+  name: Adaptive
+  label: Bulbs
+
 - type: horizontal-stack
   cards:
     - type: "custom:button-card"
@@ -19,15 +24,6 @@
         ulm_card_light_force_background_color: true
         ulm_card_light_name: Bedroom
         ulm_card_light_enable_collapse: true
-    - type: "custom:button-card"
-      template: card_light
-      entity: light.ikea_of_sweden_tradfri_driver_10w_light
-      variables:
-        ulm_card_light_enable_slider: true
-        ulm_card_light_enable_color: true
-        ulm_card_light_force_background_color: true
-        ulm_card_light_name: Office Led
-        ulm_card_light_enable_collapse: true
 
 - type: "horizontal-stack"
   cards:
diff --git a/packages/light/motion.yaml b/packages/light/motion.yaml
new file mode 100755
index 0000000..3111c59
--- /dev/null
+++ b/packages/light/motion.yaml
@@ -0,0 +1,40 @@
+automation:  
+  - alias: hallway_light_motion_on
+    trigger:
+      - device_id: 1cccd1925a81dead19688129d2306f79
+        entity_id: binary_sensor.hallway_motion_iaszone
+        domain: binary_sensor
+        platform: device
+        type: motion
+    condition:
+      condition: or
+      conditions: 
+        - condition: sun
+          before: sunrise
+        - condition: sun
+          after: sunset
+    action:
+      - type: turn_on
+        device_id: a1865e6541efc7167ba2b21c6e005147
+        entity_id: light.hallway_switch_lamp
+        domain: light
+  
+  - alias: hallway_light_motion_off
+    trigger:
+      - device_id: 1cccd1925a81dead19688129d2306f79
+        entity_id: binary_sensor.hallway_motion_iaszone
+        domain: binary_sensor
+        platform: device
+        type: no_motion
+    condition:
+      condition: or
+      conditions: 
+        - condition: sun
+          before: sunrise
+        - condition: sun
+          after: sunset
+    action:
+      - type: turn_off
+        device_id: a1865e6541efc7167ba2b21c6e005147
+        entity_id: light.hallway_switch_lamp
+        domain: light
\ No newline at end of file