diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc
index cc6df341b..29b4c2b97 100644
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -212,7 +212,7 @@
                     ::strokes
                     ::stroke-color         ;; TODO: same thing
                     ::stroke-color-ref-file ;;
-                    ::stroke-color-ref-i    ;;
+                    ::stroke-color-ref-id   ;;
                     ::stroke-opacity        ;;
                     ::stroke-style
                     ::stroke-width
diff --git a/common/src/app/common/types/shape/layout.cljc b/common/src/app/common/types/shape/layout.cljc
index 81ed9f108..8309afa9d 100644
--- a/common/src/app/common/types/shape/layout.cljc
+++ b/common/src/app/common/types/shape/layout.cljc
@@ -39,6 +39,11 @@
                    ::layout-h-orientation
                    ::layout-v-orientation]))
 
+(s/def ::m1 ::us/safe-number)
+(s/def ::m2 ::us/safe-number)
+(s/def ::m3 ::us/safe-number)
+(s/def ::m4 ::us/safe-number)
+
 (s/def ::layout-margin (s/keys :req-un [::m1]
                                :opt-un [::m2 ::m3 ::m4]))
 
diff --git a/common/src/app/common/types/shape/shadow.cljc b/common/src/app/common/types/shape/shadow.cljc
index 839152d0f..e2ffe0c88 100644
--- a/common/src/app/common/types/shape/shadow.cljc
+++ b/common/src/app/common/types/shape/shadow.cljc
@@ -8,9 +8,9 @@
   (:require
    [app.common.spec :as us]
    [app.common.types.color :as ctc]
+   [app.common.types.shape.shadow.color :as-alias shadow-color]
    [clojure.spec.alpha :as s]))
 
-
 ;;; SHADOW EFFECT
 
 (s/def ::id (s/nilable uuid?))
@@ -27,7 +27,7 @@
 (s/def ::file-id (s/nilable uuid?))
 (s/def ::ref-id (s/nilable uuid?))
 
-(s/def :shadow/color
+(s/def ::shadow-color/color
   (s/keys :opt-un [::color
                    ::opacity
                    ::gradient
@@ -37,7 +37,7 @@
 (s/def ::shadow-props
   (s/keys :req-un [::id
                    ::style
-                   ::color
+                   ::shadow-color/color
                    ::offset-x
                    ::offset-y
                    ::blur