diff --git a/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-t1-wireless-mini-switch.png b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-t1-wireless-mini-switch.png
new file mode 100644
index 00000000..7084ad39
Binary files /dev/null and b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-t1-wireless-mini-switch.png differ
diff --git a/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-t1-wireless-mini-switch.yaml b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-t1-wireless-mini-switch.yaml
new file mode 100644
index 00000000..70af6729
--- /dev/null
+++ b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-t1-wireless-mini-switch.yaml
@@ -0,0 +1,38 @@
+name: Aqara T1 Wireless Mini Switch
+service: Zigbee2MQTT
+event_type: mqtt
+mqtt_topic_format: zigbee2mqtt/+/action
+buttons:
+  - actions:
+      - title: press
+        conditions:
+          - key: payload
+            value: single
+      - title: press 2x
+        conditions:
+          - key: payload
+            value: double
+      - title: press 3x
+        conditions:
+          - key: payload
+            value: triple
+      - title: press 4x
+        conditions:
+          - key: payload
+            value: quadruple
+      - title: press 5x
+        conditions:
+          - key: payload
+            value: quintuple
+      - title: hold
+        conditions:
+          - key: payload
+            value: hold
+      - title: hold (released)
+        conditions:
+          - key: payload
+            value: release
+      - title: press many times
+        conditions:
+          - key: payload
+            value: many
diff --git a/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch-gyroscope.png b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch-gyroscope.png
new file mode 100644
index 00000000..7084ad39
Binary files /dev/null and b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch-gyroscope.png differ
diff --git a/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch-gyroscope.yaml b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch-gyroscope.yaml
new file mode 100644
index 00000000..a67f349f
--- /dev/null
+++ b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch-gyroscope.yaml
@@ -0,0 +1,26 @@
+name: Aqara Wireless Mini Switch WXKG12LM (with gyroscope)
+service: Zigbee2MQTT
+event_type: mqtt
+mqtt_topic_format: zigbee2mqtt/+/action
+buttons:
+  - actions:
+      - title: press
+        conditions:
+          - key: payload
+            value: single
+      - title: press 2x
+        conditions:
+          - key: payload
+            value: double
+      - title: hold
+        conditions:
+          - key: payload
+            value: hold
+      - title: hold (released)
+        conditions:
+          - key: payload
+            value: release
+      - title: shake
+        conditions:
+          - key: payload
+            value: shake
diff --git a/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch.yaml b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch.yaml
index cb294161..ccc81a9c 100644
--- a/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch.yaml
+++ b/custom_components/switch_manager/blueprints/zigbee2mqtt-aqara-wireless-mini-switch.yaml
@@ -1,26 +1,34 @@
-name: Aqara Wireless Mini Switch
-service: Zigbee2MQTT
-event_type: mqtt
-mqtt_topic_format: zigbee2mqtt/+/action
-buttons:
-  - actions:
-      - title: press
-        conditions:
-          - key: payload
-            value: single
-      - title: press 2x
-        conditions:
-          - key: payload
-            value: double
-      - title: hold
-        conditions:
-          - key: payload
-            value: hold
-      - title: hold (released)
-        conditions:
-          - key: payload
-            value: release
-      - title: shake
-        conditions:
-          - key: payload
-            value: shake
+name: Aqara Wireless Mini Switch WXKG11LM
+service: Zigbee2MQTT
+event_type: mqtt
+mqtt_topic_format: zigbee2mqtt/+/action
+buttons:
+  - actions:
+      - title: press
+        conditions:
+          - key: payload
+            value: single
+      - title: press 2x
+        conditions:
+          - key: payload
+            value: double
+      - title: press 3x
+        conditions:
+          - key: payload
+            value: triple
+      - title: press 4x
+        conditions:
+          - key: payload
+            value: quadruple
+      - title: hold
+        conditions:
+          - key: payload
+            value: hold
+      - title: hold (released)
+        conditions:
+          - key: payload
+            value: release
+      - title: shake
+        conditions:
+          - key: payload
+            value: shake