diff --git a/config/lovelace/decluttering_templates/cards/philips_airpurifier_card.yaml b/config/lovelace/decluttering_templates/cards/philips_airpurifier_card.yaml
index 81ec86a..76fd3cb 100644
--- a/config/lovelace/decluttering_templates/cards/philips_airpurifier_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/philips_airpurifier_card.yaml
@@ -22,29 +22,8 @@ philips_airpurifier_card:
             tap_action:
               action: call-service
               service: script.purifier_toggle_function
-          - type: custom:button-card
-            template:
-              - small
-              - progress
-              - with_state_indicator
-            entity: sensor.purifier_target_humidity
-            tap_action:
-              action: call-service
-              service: input_select.select_next
-              service_data:
-                entity_id: input_select.purifier_target_humidity
-            show_state: true
-            show_icon: false
-            variables:
-              min_value: 30
-              max_value: 60
-              normal_value: 61
-              high_value: 70
-              state_indicator_id: binary_sensor.purifier_out_of_water
-              state_indicator_size: 5px
-              state_indicator_off_size: 0px
-              state_indicator_on_color: var(--color-red)
-              state_on_indicator_on_color: var(--color-red)
+          - type: custom:decluttering-card
+            template: purifier_target_humidity
 
       - type: entities
         show_header_toggle: false
diff --git a/config/lovelace/decluttering_templates/cards/purfier_target_humidity_card.yaml b/config/lovelace/decluttering_templates/cards/purfier_target_humidity_card.yaml
new file mode 100644
index 0000000..d215f67
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/purfier_target_humidity_card.yaml
@@ -0,0 +1,25 @@
+purifier_target_humidity:
+  card:
+    type: custom:button-card
+    template:
+      - small
+      - progress
+      - with_state_indicator
+    entity: sensor.purifier_target_humidity
+    tap_action:
+      action: call-service
+      service: input_select.select_next
+      service_data:
+        entity_id: input_select.purifier_target_humidity
+    show_state: true
+    show_icon: false
+    variables:
+      min_value: 30
+      max_value: 60
+      normal_value: 61
+      high_value: 61
+      state_indicator_id: binary_sensor.purifier_out_of_water
+      state_indicator_size: 5px
+      state_indicator_off_size: 0px
+      state_indicator_on_color: var(--color-red)
+      state_on_indicator_on_color: var(--color-red)
diff --git a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
index bf16e32..ad2281c 100644
--- a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
@@ -68,29 +68,8 @@
                       state_indicator_off_size: 0px
                       state_indicator_on_color: var(--color-red)
                       state_on_indicator_on_color: var(--color-red)
-                  - type: custom:button-card
-                    template:
-                      - small
-                      - progress
-                      - with_state_indicator
-                    entity: sensor.purifier_target_humidity
-                    tap_action:
-                      action: call-service
-                      service: input_select.select_next
-                      service_data:
-                        entity_id: input_select.purifier_target_humidity
-                    show_state: true
-                    show_icon: false
-                    variables:
-                      min_value: 30
-                      max_value: 60
-                      normal_value: 61
-                      high_value: 70
-                      state_indicator_id: binary_sensor.purifier_out_of_water
-                      state_indicator_size: 5px
-                      state_indicator_off_size: 0px
-                      state_indicator_on_color: var(--color-red)
-                      state_on_indicator_on_color: var(--color-red)
+                  - type: custom:decluttering-card
+                    template: purifier_target_humidity
                   - type: custom:button-card
                     template: default
                     entity: binary_sensor.house_mode
diff --git a/config/packages/modules/climate/purifier.yaml b/config/packages/modules/climate/purifier.yaml
index ad6ce32..fc6a205 100644
--- a/config/packages/modules/climate/purifier.yaml
+++ b/config/packages/modules/climate/purifier.yaml
@@ -147,7 +147,7 @@ script:
     alias: Purifier · Toggle function
     sequence:
       - condition: state
-        entity_id: input_boolean.purifier_out_of_water
+        entity_id: binary_sensor.purifier_out_of_water
         state: 'off'
       - service: philips_airpurifier.set_function
         entity_id: fan.philips_airpurifier
@@ -239,6 +239,7 @@ automation:
         data_template:
           option: "{{ states('sensor.purifier_target_humidity') }}"
       - service: script.purifier_request_update
+
   - alias: Purifier · Turn on · Low humidity
     trigger:
       platform: numeric_state