From 17447d76106cdcd3ef16203c486a40e0bd6366db Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 29 Jul 2025 12:48:09 +0200
Subject: [PATCH 1/2] :sparkles: Remove restriction of duplicate bindings on
 mousetrap

---
 frontend/vendor/mousetrap/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/vendor/mousetrap/index.js b/frontend/vendor/mousetrap/index.js
index c1cd8af3d3..06866e6a5b 100644
--- a/frontend/vendor/mousetrap/index.js
+++ b/frontend/vendor/mousetrap/index.js
@@ -845,8 +845,8 @@ function Mousetrap(targetElement) {
     // a callback is added for this key
     self._callbacks[info.key] = self._callbacks[info.key] || [];
 
-    // remove an existing match if there is one
-    _getMatches(info.key, info.modifiers, {type: info.action}, sequenceName, combination, level);
+    // // remove an existing match if there is one
+    // _getMatches(info.key, info.modifiers, {type: info.action}, sequenceName, combination, level);
 
     // add this call back to the array
     // if it is a sequence put it at the beginning

From 36d3d94ec92a626cae5b73c24e82241dd2940d9c Mon Sep 17 00:00:00 2001
From: Eva Marco <eva.marco@kaleidos.net>
Date: Tue, 29 Jul 2025 14:32:06 +0200
Subject: [PATCH 2/2] :bug: Fix X & Y position do not sincronize with tokens
 (#7004)

---
 CHANGES.md                             |  1 +
 common/src/app/common/types/token.cljc | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c993f75721..dcb4ea20b0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -52,6 +52,7 @@
 - Fix change from gradient to solid color [Taiga #11648](https://tree.taiga.io/project/penpot/issue/11648)
 - Fix the context menu always closes after any action [Taiga #11624](https://tree.taiga.io/project/penpot/issue/11624)
 - Fix font selector highlight inconsistency when using keyboard navigation [Taiga #11668](https://tree.taiga.io/project/penpot/issue/11668)
+- Fix X & Y position do not sincronize with tokens [Taiga #11617](https://tree.taiga.io/project/penpot/issue/11617)
 
 ## 2.8.1 (Unreleased)
 
diff --git a/common/src/app/common/types/token.cljc b/common/src/app/common/types/token.cljc
index afd7279808..57b3bd3b08 100644
--- a/common/src/app/common/types/token.cljc
+++ b/common/src/app/common/types/token.cljc
@@ -128,6 +128,15 @@
 
 (def dimensions-keys (schema-keys schema:dimensions))
 
+(def ^:private schema:axis
+  [:map
+   [:x {:optional true} token-name-ref]
+   [:y {:optional true} token-name-ref]])
+
+(def axis-keys (schema-keys schema:axis))
+
+
+
 (def ^:private schema:rotation
   [:map
    [:rotation {:optional true} token-name-ref]])
@@ -165,6 +174,7 @@
                          opacity-keys
                          spacing-keys
                          dimensions-keys
+                         axis-keys
                          rotation-keys
                          typography-keys
                          number-keys))
@@ -216,7 +226,8 @@
      (opacity-keys shape-attr) #{shape-attr}
      (spacing-keys shape-attr) #{shape-attr}
      (rotation-keys shape-attr) #{shape-attr}
-     (number-keys shape-attr) #{shape-attr})))
+     (number-keys shape-attr) #{shape-attr}
+     (axis-keys shape-attr) #{shape-attr})))
 
 (defn token-attr->shape-attr
   [token-attr]