diff --git a/common/src/app/common/types/shape/attrs.cljc b/common/src/app/common/types/shape/attrs.cljc
index 1f787c44a..84fc30f81 100644
--- a/common/src/app/common/types/shape/attrs.cljc
+++ b/common/src/app/common/types/shape/attrs.cljc
@@ -65,6 +65,11 @@
             :layout-padding-type
             :layout-padding
 
+            :layout-grid-dir
+            :layout-justify-items
+            :layout-grid-columns
+            :layout-grid-rows
+
             :layout-item-margin
             :layout-item-margin-type
             :layout-item-h-sizing
diff --git a/frontend/src/app/main/data/workspace/layout.cljs b/frontend/src/app/main/data/workspace/layout.cljs
index 0185c5884..24cfc6779 100644
--- a/frontend/src/app/main/data/workspace/layout.cljs
+++ b/frontend/src/app/main/data/workspace/layout.cljs
@@ -7,6 +7,7 @@
 (ns app.main.data.workspace.layout
   "Workspace layout management events and helpers."
   (:require
+   [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.main.data.events :as ev]
    [app.util.storage :refer [storage]]
@@ -123,7 +124,7 @@
     ev/Event
     (-data [_]
       {::ev/origin "workspace:sidebar"
-       :mode (name mode)})
+       :mode (d/name mode)})
 
     ptk/UpdateEvent
     (update [_ state]
diff --git a/frontend/src/app/main/data/workspace/shape_layout.cljs b/frontend/src/app/main/data/workspace/shape_layout.cljs
index a38962aa9..19e17a5a2 100644
--- a/frontend/src/app/main/data/workspace/shape_layout.cljs
+++ b/frontend/src/app/main/data/workspace/shape_layout.cljs
@@ -211,7 +211,7 @@
   (ptk/reify ::create-shape-layout
     ev/Event
     (-data [_]
-      {:layout (name type)})
+      {:layout (d/name type)})
 
     ptk/WatchEvent
     (watch [_ state _]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
index 3a4413989..da5d9ec05 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
@@ -492,7 +492,7 @@
      [:button {:class (stl/css-case
                        :padding-toggle true
                        :selected (= type :multiple))
-               :data-type (name type)
+               :data-type (d/name type)
                :on-click on-type-change'}
       i/padding-extended-refactor]]))
 
@@ -557,7 +557,7 @@
         :no-validate true
         :placeholder "--"
         :data-type "row-gap"
-        :data-wrap-type (name wrap-type)
+        :data-wrap-type (d/name wrap-type)
         :on-focus on-gap-focus
         :on-change on-change'
         :on-blur on-gap-blur
@@ -576,7 +576,7 @@
         :no-validate true
         :placeholder "--"
         :data-type "column-gap"
-        :data-wrap-type (name wrap-type)
+        :data-wrap-type (d/name wrap-type)
         :on-focus on-gap-focus
         :on-change on-change'
         :on-blur on-gap-blur
@@ -627,7 +627,7 @@
    ::mf/private true}
   [{:keys [is-column value on-change]}]
   (let [type (if ^boolean is-column "column" "row")]
-    [:& radio-buttons {:selected (name value)
+    [:& radio-buttons {:selected (d/name value)
                        :decode-fn keyword
                        :on-change on-change
                        :name (dm/str "flex-align-items-" type)}
@@ -649,7 +649,7 @@
    ::mf/private :obj}
   [{:keys [is-column value on-change]}]
   (let [type (if ^boolean is-column "column" "row")]
-    [:& radio-buttons {:selected (name value)
+    [:& radio-buttons {:selected (d/name value)
                        :on-change on-change
                        :decode-fn keyword
                        :name (dm/str "grid-justify-items-" type)}
@@ -811,7 +811,7 @@
        [:& h/sortable-container {}
         [:div {:class (stl/css :grid-tracks-info-container)}
          (for [[index column] (d/enumerate column-values)]
-           [:& grid-track-info {:key (dm/str index "-" (name type))
+           [:& grid-track-info {:key (dm/str index "-" (d/name type))
                                 :type type
                                 :is-column is-column
                                 :index index