diff --git a/configuration/automations/office-blinds.yaml b/configuration/automations/office-blinds.yaml
index 8edb0d0..bc7f37d 100644
--- a/configuration/automations/office-blinds.yaml
+++ b/configuration/automations/office-blinds.yaml
@@ -1,5 +1,5 @@
-- id: office-blinds-button-up
-  alias: '[Office Blinds] Up'
+- id: office-blinds-button-down
+  alias: '[Office Blinds] Down'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
       domain: zha
@@ -9,33 +9,23 @@
   action:
     - choose:
         - conditions:
-            - condition: or
-              conditions:
-                - condition: state
-                  entity_id: cover.office_blinds
-                  state: 'closing'
-                - condition: state
-                  entity_id: cover.office_blinds
-                  state: 'opening'
-          sequence:
-            - service: cover.stop_cover
+            - condition: numeric_state
               entity_id: cover.office_blinds
-        - conditions:
-          - condition: or
-            conditions:
-              - condition: state
-                entity_id: cover.office_blinds
-                state: 'closed'
-              - condition: state
-                entity_id: cover.office_blinds
-                state: 'open'
+              attribute: current_position
+              below: 51
           sequence:
             - service: cover.close_cover
               entity_id: cover.office_blinds
+      default:
+        - service: cover.set_cover_position
+          data:
+            position: 50
+          target:
+            entity_id: cover.office_blinds
   mode: single
 
-- id: office-blinds-button-down
-  alias: '[Office Blinds] Down'
+- id: office-blinds-button-up
+  alias: '[Office Blinds] Up'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
       domain: zha
@@ -45,27 +35,47 @@
   action:
     - choose:
         - conditions:
-            - condition: or
-              conditions:
-                - condition: state
-                  entity_id: cover.office_blinds
-                  state: 'closing'
-                - condition: state
-                  entity_id: cover.office_blinds
-                  state: 'opening'
-          sequence:
-            - service: cover.stop_cover
+            - condition: numeric_state
               entity_id: cover.office_blinds
-        - conditions:
-            - condition: or
-              conditions:
-                - condition: state
-                  entity_id: cover.office_blinds
-                  state: 'closed'
-                - condition: state
-                  entity_id: cover.office_blinds
-                  state: 'open'
+              attribute: current_position
+              above: 49
           sequence:
             - service: cover.open_cover
               entity_id: cover.office_blinds
+      default:
+        - service: cover.set_cover_position
+          data:
+            position: 50
+          target:
+            entity_id: cover.office_blinds
+  mode: single
+
+- id: office-blinds-button-down-all
+  alias: '[Office Blinds] Down All'
+  trigger:
+    - device_id: a47c928b108240ed8866f9f7a70bc844
+      domain: zha
+      platform: device
+      type: remote_button_long_press
+      subtype: dim_up
+  action:
+    - service: cover.close_cover
+      entity_id:
+        - cover.dining_blinds
+        - cover.office_blinds
+  mode: single
+
+- id: office-blinds-button-up-all
+  alias: '[Office Blinds] Up All'
+  trigger:
+    - device_id: a47c928b108240ed8866f9f7a70bc844
+      domain: zha
+      platform: device
+      type: remote_button_long_press
+      subtype: dim_down
+  action:
+    - service: cover.open_cover
+      entity_id:
+        - cover.dining_blinds
+        - cover.office_blinds
   mode: single