diff --git a/frontend/src/app/util/code_gen/style_css_formats.cljs b/frontend/src/app/util/code_gen/style_css_formats.cljs
index e5e6c9d6b6..ff26757f74 100644
--- a/frontend/src/app/util/code_gen/style_css_formats.cljs
+++ b/frontend/src/app/util/code_gen/style_css_formats.cljs
@@ -25,6 +25,8 @@
    :box-shadow            :shadows
    :filter                :blur
    :gap                   :size-array
+   :row-gap               :size-array
+   :column-gap            :size-array
    :padding               :size-array
    :grid-template-rows    :tracks
    :grid-template-columns :tracks
diff --git a/frontend/src/app/util/code_gen/style_css_values.cljs b/frontend/src/app/util/code_gen/style_css_values.cljs
index 88a274348a..2b35577ad8 100644
--- a/frontend/src/app/util/code_gen/style_css_values.cljs
+++ b/frontend/src/app/util/code_gen/style_css_values.cljs
@@ -9,8 +9,7 @@
   (:require
    [app.common.data.macros :as dm]
    [app.common.geom.matrix :as gmt]
-   ;;[app.common.geom.point :as gpt]
-   ;;[app.common.geom.shapes.points :as gpo]
+   [app.common.geom.shapes :as gsh]
    [app.common.pages.helpers :as cph]
    [app.common.types.shape.layout :as ctl]))
 
@@ -49,11 +48,21 @@
 
 (defn get-shape-position
   [shape objects coord]
-  (let [shape-value (-> shape :selrect coord)
-        parent-value (dm/get-in objects [(:parent-id shape) :selrect coord])]
-    (when-not (or (cph/root-frame? shape)
-                  (ctl/any-layout-immediate-child? objects shape)
-                  (ctl/layout-absolute? shape))
+  (let [
+        parent (get objects (:parent-id shape))
+        parent-value (dm/get-in parent [:selrect coord])
+
+        [selrect _ _]
+        (-> (:points shape)
+            (gsh/transform-points (gsh/center-shape parent) (:transform-inverse parent))
+            (gsh/calculate-geometry))
+
+        ;;shape (gsh/transform-shape)
+        shape-value (get selrect coord)
+        ]
+    (when (and (not (cph/root-frame? shape))
+               (or (not (ctl/any-layout-immediate-child? objects shape))
+                   (ctl/layout-absolute? shape)))
       (- shape-value parent-value))))
 
 #_(defn get-shape-position