diff --git a/include/automations/lys_badevaerelse.yaml b/include/automations/lys_badevaerelse.yaml
index 68bf818..b456ffe 100644
--- a/include/automations/lys_badevaerelse.yaml
+++ b/include/automations/lys_badevaerelse.yaml
@@ -7,6 +7,12 @@
       entity_id: binary_sensor.badevaerelse_bevaegelse
       to: "on"
 
+  condition:
+    # Spring over hvis manuel tilstand er aktiv – Hue-knap styrer lyset
+    - condition: state
+      entity_id: input_boolean.badevaerelse_manuel_tilstand
+      state: "off"
+
   action:
     - choose:
         # Arbejdsdag dagtid (06:00–22:00)
@@ -62,11 +68,91 @@
   action:
     - delay:
         minutes: >
-          {{ states('input_number.badevaerelse_timeout_day') | int if is_dag
-             else states('input_number.badevaerelse_timeout_night') | int }}
+          {% if is_state('input_boolean.badevaerelse_manuel_tilstand', 'on') %}
+            10
+          {% elif is_dag %}
+            {{ states('input_number.badevaerelse_timeout_day') | int }}
+          {% else %}
+            {{ states('input_number.badevaerelse_timeout_night') | int }}
+          {% endif %}
     - condition: state
       entity_id: binary_sensor.badevaerelse_bevaegelse
       state: "off"
     - service: light.turn_off
       target:
         area_id: badevaerelse
+    - service: input_boolean.turn_off
+      target:
+        entity_id: input_boolean.badevaerelse_manuel_tilstand
+
+- id: badevaerelse_hue_knap
+  alias: Badeværelse Hue knap
+  description: >
+    Hue Tap Switch sætter manuel tilstand og tænder valgt scene.
+    Bevægelses-automatik springes over så længe manuel tilstand er aktiv.
+    Knap 4 slukker lyset og nulstiller til automatisk styring.
+  mode: restart
+
+  trigger:
+    - platform: state
+      entity_id: event.hue_tap_switch_1_button_1
+      id: knap_1
+    - platform: state
+      entity_id: event.hue_tap_switch_1_button_2
+      id: knap_2
+    - platform: state
+      entity_id: event.hue_tap_switch_1_button_3
+      id: knap_3
+    - platform: state
+      entity_id: event.hue_tap_switch_1_button_4
+      id: knap_4
+
+  action:
+    - choose:
+        # Knap 1 – Nat/dæmpet lys
+        - conditions:
+            - condition: trigger
+              id: knap_1
+          sequence:
+            - service: input_boolean.turn_on
+              target:
+                entity_id: input_boolean.badevaerelse_manuel_tilstand
+            - service: scene.turn_on
+              target:
+                entity_id: scene.badevaerelse_nat_2_lys
+
+        # Knap 2 – Fuld lys (klar til brug)
+        - conditions:
+            - condition: trigger
+              id: knap_2
+          sequence:
+            - service: input_boolean.turn_on
+              target:
+                entity_id: input_boolean.badevaerelse_manuel_tilstand
+            - service: scene.turn_on
+              target:
+                entity_id: scene.badevaerelse_klar
+
+        # Knap 3 – Blomstrende forår (medium)
+        - conditions:
+            - condition: trigger
+              id: knap_3
+          sequence:
+            - service: input_boolean.turn_on
+              target:
+                entity_id: input_boolean.badevaerelse_manuel_tilstand
+            - service: scene.turn_on
+              target:
+                entity_id: scene.badevaerelse_blomstrende_forar
+
+        # Knap 4 – Sluk lys + nulstil til automatisk
+        - conditions:
+            - condition: trigger
+              id: knap_4
+          sequence:
+            - service: input_boolean.turn_off
+              target:
+                entity_id: input_boolean.badevaerelse_manuel_tilstand
+            - service: light.turn_off
+              target:
+                area_id: badevaerelse
diff --git a/include/input/boolean/badevaerelse.yaml b/include/input/boolean/badevaerelse.yaml
new file mode 100644
index 0000000..a09d58c
--- /dev/null
+++ b/include/input/boolean/badevaerelse.yaml
@@ -0,0 +1,3 @@
+badevaerelse_manuel_tilstand:
+  name: Badeværelse manuel tilstand
+  initial: off