diff --git a/config/lovelace/advanced_dashboard/00_home.yaml b/config/lovelace/advanced_dashboard/00_home.yaml
index 50f1a75..f940a27 100644
--- a/config/lovelace/advanced_dashboard/00_home.yaml
+++ b/config/lovelace/advanced_dashboard/00_home.yaml
@@ -95,8 +95,6 @@ cards:
 
         - type: vertical-stack
           cards:
-            - type: entities
-              entities: [sensor.at_desk]
             - type: entities
               title: Quarantine
               icon: mdi:biohazard
diff --git a/config/lovelace/home_dashboard/hallway_dashboard.yaml b/config/lovelace/home_dashboard/hallway_dashboard.yaml
index a7f970c..e1414dc 100644
--- a/config/lovelace/home_dashboard/hallway_dashboard.yaml
+++ b/config/lovelace/home_dashboard/hallway_dashboard.yaml
@@ -43,7 +43,7 @@
                 name: Front door
               - type: custom:button-card
                 template: [default, with_state_indicator]
-                entity: binary_sensor.hallway_motion_occupancy
+                entity: group.hallway_motion
                 name: Motion
                 variables:
                   state_indicator_id: automation.lighting_hallway_motion_on
diff --git a/config/lovelace/home_dashboard/kitchen_dashboard.yaml b/config/lovelace/home_dashboard/kitchen_dashboard.yaml
index 790d36d..5652c6c 100644
--- a/config/lovelace/home_dashboard/kitchen_dashboard.yaml
+++ b/config/lovelace/home_dashboard/kitchen_dashboard.yaml
@@ -113,7 +113,7 @@
                   normal_value: 1000
               - type: custom:button-card
                 template: [default, with_state_indicator]
-                entity: binary_sensor.hallway_motion_occupancy
+                entity: group.hallway_motion
                 name: Hallway
                 variables:
                   state_indicator_id: automation.lighting_hallway_motion_on
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index 2313223..b418f46 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -124,7 +124,7 @@
                   - player: media_player.living_room
                   - player_name: Living room
           - type: vertical-stack
-            title: Camera
+          title: Camera
             cards:
               - type: picture-glance
                 camera_image: camera.mercury_amcrest_1
@@ -141,17 +141,13 @@
                 template: default
                 entity: binary_sensor.living_room_right_window
                 name: Window
-              - type: custom:button-card
-                template: default
-                entity: binary_sensor.trisensor_motion
-                name: Desk
               - type: custom:button-card
                 template: default
                 entity: binary_sensor.multisensor_motion
                 name: Door
               - type: custom:button-card
                 template: [default, with_state_indicator]
-                entity: binary_sensor.hallway_motion_occupancy
+                entity: group.hallway_motion
                 name: Hallway
                 variables:
                   state_indicator_id: automation.lighting_hallway_motion_on
@@ -160,11 +156,11 @@
             template: climate_card
             variables:
               - title: "Climate"
-              - main_entity: sensor.trisensor_temperature
-              - left_entity: sensor.multisensor_6_temperature
-              - left_name: Temperature (6)
-              - right_entity: sensor.multisensor_6_relative_humidity
-              - right_name: Humidity (6)
+              - main_entity: sensor.multisensor_6_temperature
+              - left_entity: sensor.multisensor_6_relative_humidity
+              - left_name: Humidity (6)
+              - right_entity: sensor.multisensor_6_luminance
+              - right_name: Luminance (6)
 
           - type: custom:button-card
             template: [regular, progress]
diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml
index 986e95a..cf4bcd4 100644
--- a/config/lovelace/home_dashboard/main_dashboard.yaml
+++ b/config/lovelace/home_dashboard/main_dashboard.yaml
@@ -224,10 +224,6 @@
                         template: default
                         entity: binary_sensor.multisensor_motion
                         name: Living room
-                      - type: custom:button-card
-                        template: default
-                        entity: binary_sensor.trisensor_motion
-                        name: Desk
                       - type: custom:button-card
                         template: [default, with_state_indicator]
                         entity: binary_sensor.kitchen_motion_occupancy
@@ -236,7 +232,7 @@
                           state_indicator_id: automation.lighting_kitchen_motion_on
                       - type: custom:button-card
                         template: [default, with_state_indicator]
-                        entity: binary_sensor.hallway_motion_occupancy
+                        entity: group.hallway_motion
                         name: Hallway
                         variables:
                           state_indicator_id: automation.lighting_hallway_motion_on
diff --git a/config/packages/modules/lighting/areas/hallway.yaml b/config/packages/modules/lighting/areas/hallway.yaml
index 61cd834..2ff2927 100644
--- a/config/packages/modules/lighting/areas/hallway.yaml
+++ b/config/packages/modules/lighting/areas/hallway.yaml
@@ -2,7 +2,7 @@ automation:
   - alias: Lighting · Hallway · Motion On
     trigger:
       platform: state
-      entity_id: binary_sensor.hallway_motion_occupancy
+      entity_id: group.hallway_motion
       to: "on"
     condition:
       condition: state
@@ -33,15 +33,13 @@ automation:
               - light.osram_1
               - light.browser_hallway
             data:
-              brightness_pct: 13
+              brightness_pct: 1
 
   - alias: Lighting · Hallway · Motion Off
     trigger:
       platform: state
-      entity_id: binary_sensor.hallway_motion_occupancy
+      entity_id: group.hallway_motion
       to: "off"
-      for:
-        minutes: 5
     action:
       - choose:
         # Day Mode
diff --git a/config/packages/modules/presence.yaml b/config/packages/modules/presence.yaml
index d9d6a26..5a0f2a1 100644
--- a/config/packages/modules/presence.yaml
+++ b/config/packages/modules/presence.yaml
@@ -60,17 +60,15 @@ binary_sensor:
         device_class: motion
         value_template: "{{ is_state('sensor.multisensor_6_burglar', '8') }}"
 
+
+group:
+  hallway_motion:
+    name: Hallway Motion
+    entities:
+      - binary_sensor.hallway_motion_occupancy
+      - binary_sensor.trisensor_motion
+
 sensor:
-  - platform: history_stats
-    name: At Desk
-    entity_id: binary_sensor.trisensor_sensor
-    state: "on"
-    type: ratio
-    duration:
-      minutes: 5
-    end: '{{ now() }}'
-
-
   - platform: history_stats
     name: Quarantined percent
     entity_id: device_tracker.carbon
@@ -177,3 +175,6 @@ homeassistant:
 
     automation.presence_arrival_detecion:
       icon: mdi:account-plus-outline
+
+    group.hallway_motion:
+      icon: mdi:motion-sensor