diff --git a/editor/components/figma/screen-importer.tsx b/editor/components/figma/screen-importer.tsx
index f6734a6b..348f6fb2 100644
--- a/editor/components/figma/screen-importer.tsx
+++ b/editor/components/figma/screen-importer.tsx
@@ -1,17 +1,14 @@
-import React, { useEffect, useState } from "react";
-import { api } from "@bridged.xyz/design-sdk/lib/figma-remote";
+import React, { useState } from "react";
+import { remote, utils, nodes } from "@design-sdk/figma";
+import { convert } from "@design-sdk/figma";
 import { utils_figma } from "../../utils";
-import { utils, convert } from "@bridged.xyz/design-sdk";
-import { mapFigmaRemoteToFigma } from "@bridged.xyz/design-sdk/lib/figma-remote/mapper";
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes";
 import { UserInputCache } from "../../utils/user-input-value-cache";
-import * as figrem from "@bridged.xyz/design-sdk/lib/figma-remote/types";
 
-export type OnImportedCallback = (reflect: ReflectSceneNode) => void;
-type _OnRemoteLoadedCallback = (reflect: figrem.Node) => void;
+export type OnImportedCallback = (reflect: nodes.ReflectSceneNode) => void;
+type _OnRemoteLoadedCallback = (reflect: remote.types.Node) => void;
 
 async function fetchTarget(file: string, node: string) {
-  const client = api.Client({
+  const client = remote.api.Client({
     personalAccessToken: utils_figma.figmaPersonalAccessToken(),
   });
 
@@ -27,7 +24,7 @@ async function fetchTarget(file: string, node: string) {
 
 async function fetchDemo() {
   const _nid = utils_figma.FIGMA_BRIDGED_DEMO_APP_ENTRY_NODE_ID;
-  const client = api.Client({
+  const client = remote.api.Client({
     personalAccessToken: utils_figma.figmaPersonalAccessToken(),
   });
 
@@ -46,11 +43,11 @@ async function fetchDemo() {
 }
 
 export function FigmaScreenImporter(props: { onImported: OnImportedCallback }) {
-  const [reflect, setReflect] = useState<ReflectSceneNode>();
+  const [reflect, setReflect] = useState<nodes.ReflectSceneNode>();
 
-  const handleLocalDataLoad = (d: figrem.Node) => {
+  const handleLocalDataLoad = (d: remote.types.Node) => {
     console.log("api raw", d);
-    const _mapped = mapFigmaRemoteToFigma(d as any);
+    const _mapped = remote.mapper.mapFigmaRemoteToFigma(d as any);
     console.log("mapped", _mapped);
     const _converted = convert.intoReflectNode(_mapped);
     console.log("converted", _converted);
@@ -85,7 +82,7 @@ function _DefaultImporterSegment(props: { onLoaded: _OnRemoteLoadedCallback }) {
   const handleOnLoadDefaultDesignClick = () => {
     fetchDemo().then((d) => {
       // it's okay to force cast here. since the typings are the same (following official figma remote api spec)
-      props.onLoaded(d as figrem.Node);
+      props.onLoaded(d as remote.types.Node);
     });
   };
 
@@ -111,7 +108,7 @@ function _UrlImporterSegment(props: { onLoaded: _OnRemoteLoadedCallback }) {
     UserInputCache.set(_FIGMA_FILE_URL_IMPORT_INPUT_CACHE_KEY, urlInput);
     const q = utils.figmaApi.parseFileAndNodeIdFromUrl_Figma(urlInput);
     fetchTarget(q.file, q.node).then((d) => {
-      props.onLoaded(d as figrem.Node);
+      props.onLoaded(d as remote.types.Node);
     });
   };
 
diff --git a/editor/next.config.js b/editor/next.config.js
index 88617853..99f30c90 100644
--- a/editor/next.config.js
+++ b/editor/next.config.js
@@ -5,7 +5,10 @@ const withTM = require("next-transpile-modules")([
   "@designto/web",
   "@designto/react",
   "@bridged.xyz/flutter-builder",
-  "@bridged.xyz/design-sdk",
+  "@design-sdk/core",
+  "@design-sdk/universal",
+  "@design-sdk/figma",
+  "@design-sdk/sketch",
   "@reflect-ui/core",
   "@reflect-ui/detection",
 ]);
diff --git a/editor/pages/_development/figma.tsx b/editor/pages/_development/figma.tsx
index b00ca53c..27108987 100644
--- a/editor/pages/_development/figma.tsx
+++ b/editor/pages/_development/figma.tsx
@@ -1,13 +1,18 @@
-import React, { useEffect, useState } from "react";
-import { figmacomp, canvas, code, runner } from "../../components";
 import dynamic from "next/dynamic";
-import { flutter } from "@designto/code";
-import { composeAppWithHome } from "@bridged.xyz/flutter-builder/dist/lib/composer";
-import { utils_dart } from "../../utils";
+import React, { useEffect, useState } from "react";
 import styled from "@emotion/styled";
+import { figmacomp, canvas, runner } from "../../components";
+import { flutter } from "@designto/code";
+import { composeAppWithHome } from "@bridged.xyz/flutter-builder";
 import { features, types, hosting } from "@bridged.xyz/base-sdk";
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectSceneNode } from "@design-sdk/core/nodes";
+import { utils_dart } from "../../utils";
 import { nanoid } from "nanoid";
+import { MainImageRepository } from "@design-sdk/core/assets-repository";
+import { ImageRepositories } from "@design-sdk/figma/asset-repository";
+
+// set image repo for figma platform
+MainImageRepository.instance = new ImageRepositories();
 
 const CodemirrorEditor = dynamic(
   import("../../components/code-editor/code-mirror"),
diff --git a/package.json b/package.json
index 077d9652..4f3894f4 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,8 @@
     "workspaces": [
         "editor",
         "packages/*",
-        "packages/coli/packages/*"
+        "packages/design-sdk/*",
+        "packages/coli/packages/*",
+        "packages/coli-web-builder/*"
     ]
 }
\ No newline at end of file
diff --git a/packages/coli b/packages/coli
index 398e147f..b78dff71 160000
--- a/packages/coli
+++ b/packages/coli
@@ -1 +1 @@
-Subproject commit 398e147f0a6fd86ccc2ffc005a77197c3d524b7f
+Subproject commit b78dff715d77e574f7ad3908af57bd62ac6b6aab
diff --git a/packages/coli-web-builder b/packages/coli-web-builder
index acabcb30..bd06bc9f 160000
--- a/packages/coli-web-builder
+++ b/packages/coli-web-builder
@@ -1 +1 @@
-Subproject commit acabcb30aec0567c93db635cf012007c1ad7b61b
+Subproject commit bd06bc9faba9af76e8e8d676a43540b47b25d67d
diff --git a/packages/design-sdk b/packages/design-sdk
index 2c6e087c..b453a2f4 160000
--- a/packages/design-sdk
+++ b/packages/design-sdk
@@ -1 +1 @@
-Subproject commit 2c6e087c3a6abded0648f3719d22cdeb1f49f100
+Subproject commit b453a2f4869872038ce9cb4e9dbd0e27265e4f25
diff --git a/packages/designto-clean/index.ts b/packages/designto-clean/index.ts
index 218f5fd2..125fdea3 100644
--- a/packages/designto-clean/index.ts
+++ b/packages/designto-clean/index.ts
@@ -1,4 +1,4 @@
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectSceneNode } from "@design-sdk/core/nodes";
 import { ReflectLintFeedback } from "@reflect-ui/lint/lib/feedbacks/feedback";
 import { DefaultSeectionLintRunner } from "@reflect-ui/lint/lib/linter";
 
diff --git a/packages/designto-code/flutter/wrappers/container.wrap.ts b/packages/designto-code/flutter/wrappers/container.wrap.ts
new file mode 100644
index 00000000..46678c06
--- /dev/null
+++ b/packages/designto-code/flutter/wrappers/container.wrap.ts
@@ -0,0 +1,109 @@
+import { convertToSize } from "../convert";
+import {
+  ReflectRectangleNode,
+  ReflectEllipseNode,
+  ReflectFrameNode,
+  ReflectGroupNode,
+} from "@design-sdk/core/nodes";
+import { makeEdgeInsets } from "../make";
+import { array } from "@reflect-ui/uiutils";
+import {
+  Container,
+  Widget,
+  EdgeInsetsGeometry,
+  Padding,
+  Alignment,
+  AlignmentGeometry,
+  Color,
+  BoxDecoration,
+  Size,
+} from "@bridged.xyz/flutter-builder";
+import { makeBoxDecoration } from "../make/box-decoration.make";
+import { roundDouble } from "../convert/double.convert";
+
+export function wrapWithContainer(
+  node:
+    | ReflectRectangleNode
+    | ReflectEllipseNode
+    | ReflectFrameNode
+    | ReflectGroupNode,
+  child?: Widget,
+  options?: { size: Size }
+): Widget {
+  // ignore the view when size is zero or less
+  // while technically it shouldn't get less than 0, due to rounding errors,
+  // it can get to values like: -0.000004196293048153166
+  if (node.width <= 0 || node.height <= 0) {
+    return child;
+  }
+
+  // ignore for Groups
+  const propBoxDecoration =
+    node instanceof ReflectGroupNode ? undefined : makeBoxDecoration(node);
+  // if option passed, use option's value
+  const propSize = array.filters.notEmpty(options?.size)
+    ? options.size
+    : convertToSize(node);
+  console.log("propSize", propSize);
+
+  // todo Image, Gradient & multiple fills
+
+  let propPadding: EdgeInsetsGeometry;
+  if (node instanceof ReflectFrameNode) {
+    propPadding = makeEdgeInsets(node);
+  }
+
+  if (propSize || propBoxDecoration) {
+    // Container is a container if [propSize] or [propBoxDecoration] are set.
+    // console.log("wrapping with container. child - ", child)
+    return new Container({
+      width: roundDouble(propSize.width),
+      height: roundDouble(propSize.height),
+      child: child,
+      padding: propPadding,
+      decoration:
+        propBoxDecoration instanceof BoxDecoration
+          ? propBoxDecoration
+          : undefined,
+      color: propBoxDecoration instanceof Color ? propBoxDecoration : undefined,
+    });
+  } else if (propPadding) {
+    // console.log("wrapping with padding")
+    return new Padding({
+      padding: propPadding,
+      child: child,
+    });
+    // if there is just a padding, add Padding
+  } else {
+    return child;
+  }
+}
+
+type GradientDirection = {
+  begin: AlignmentGeometry;
+  end: AlignmentGeometry;
+};
+
+export function gradientDirection(angle: number): GradientDirection {
+  switch (
+    array.nearestValue(angle, [-180, -135, -90, -45, 0, 45, 90, 135, 180])
+  ) {
+    case 0:
+      return { begin: Alignment.centerLeft, end: Alignment.centerRight };
+    case 45:
+      return { begin: Alignment.topLeft, end: Alignment.bottomRight };
+    case 90:
+      return { begin: Alignment.topCenter, end: Alignment.bottomCenter };
+    case 135:
+      return { begin: Alignment.topRight, end: Alignment.bottomLeft };
+    case -45:
+      return { begin: Alignment.bottomLeft, end: Alignment.topRight };
+    case -90:
+      return { begin: Alignment.bottomCenter, end: Alignment.topCenter };
+    case -135:
+      return { begin: Alignment.bottomRight, end: Alignment.topLeft };
+    default:
+      // when 180 or -180
+      return { begin: Alignment.centerRight, end: Alignment.centerLeft };
+  }
+}
diff --git a/packages/designto-code/package.json b/packages/designto-code/package.json
index c05f20a2..9055a996 100644
--- a/packages/designto-code/package.json
+++ b/packages/designto-code/package.json
@@ -8,7 +8,7 @@
         "@designto/flutter": "0.0.1",
         "@designto/react": "0.0.0",
         "@designto/web": "0.0.0",
-        "@bridged.xyz/design-sdk": "^0.1.0",
+        "@design-sdk/universal": "0.0.0",
         "@reflect-ui/detection": "0.1.1",
         "@bridged.xyz/flutter-builder": "^1.23.0-7.0.pre.42"
     },
diff --git a/packages/designto-code/proc/index.ts b/packages/designto-code/proc/index.ts
index 15778126..bd3680e6 100644
--- a/packages/designto-code/proc/index.ts
+++ b/packages/designto-code/proc/index.ts
@@ -1,4 +1,4 @@
-import { repo_assets } from "@bridged.xyz/design-sdk";
+import { repo_assets } from "@design-sdk/core";
 
 export abstract class BuildProcess {
   readonly id: string;
diff --git a/packages/designto-flutter/builders/default.builder.ts b/packages/designto-flutter/builders/default.builder.ts
index fd06f5a8..67647fa4 100644
--- a/packages/designto-flutter/builders/default.builder.ts
+++ b/packages/designto-flutter/builders/default.builder.ts
@@ -4,7 +4,7 @@ import {
   ReflectFrameNode,
   ReflectGroupNode,
   ReflectTextNode,
-} from "@bridged.xyz/design-sdk/lib/nodes/types";
+} from "@design-sdk/core/nodes";
 
 import { Size, Widget } from "@bridged.xyz/flutter-builder";
 import { wrapWithContainer } from "../wrappers/container.wrap";
diff --git a/packages/designto-flutter/builders/text.builder.ts b/packages/designto-flutter/builders/text.builder.ts
index 9e22afe6..7950b626 100755
--- a/packages/designto-flutter/builders/text.builder.ts
+++ b/packages/designto-flutter/builders/text.builder.ts
@@ -1,4 +1,4 @@
-import { ReflectTextNode } from "@bridged.xyz/design-sdk/lib/nodes/types";
+import { ReflectTextNode } from "@design-sdk/core/nodes";
 import { SizedBox, Text, Widget } from "@bridged.xyz/flutter-builder";
 import { makeText } from "../make/text.make";
 import { WidgetBuilder } from "./default.builder";
diff --git a/packages/designto-flutter/convert/size.convert.ts b/packages/designto-flutter/convert/size.convert.ts
index daae943b..f3a134d6 100755
--- a/packages/designto-flutter/convert/size.convert.ts
+++ b/packages/designto-flutter/convert/size.convert.ts
@@ -1,5 +1,5 @@
-import { nodeWidthHeight } from "@bridged.xyz/design-sdk/lib/utils/node-width-height";
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes/types";
+import { nodeWidthHeight } from "@design-sdk/core/utils/node-width-height";
+import { ReflectSceneNode } from "@design-sdk/core/nodes";
 import { double, Size } from "@bridged.xyz/flutter-builder";
 import { roundNumber } from "@reflect-ui/uiutils";
 
diff --git a/packages/designto-flutter/index.ts b/packages/designto-flutter/index.ts
index 7a0dd32a..1a6f0c34 100755
--- a/packages/designto-flutter/index.ts
+++ b/packages/designto-flutter/index.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import { TextBuilder, WidgetBuilder } from "./builders";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { makeSafelyAsStackList } from "./utils/make-as-safe-list";
diff --git a/packages/designto-flutter/interpreter/action.interpret.ts b/packages/designto-flutter/interpreter/action.interpret.ts
index fb7e43d9..02b80bae 100644
--- a/packages/designto-flutter/interpreter/action.interpret.ts
+++ b/packages/designto-flutter/interpreter/action.interpret.ts
@@ -1,4 +1,4 @@
-import { Figma } from "@bridged.xyz/design-sdk";
+import { Figma } from "@design-sdk/figma";
 // interpret https://www.figma.com/plugin-docs/api/Action/
 export function isRouteAction(reaction: Figma.Reaction) {
   const validTrigger =
diff --git a/packages/designto-flutter/interpreter/context.ts b/packages/designto-flutter/interpreter/context.ts
index ccc74856..e69de29b 100644
--- a/packages/designto-flutter/interpreter/context.ts
+++ b/packages/designto-flutter/interpreter/context.ts
@@ -1,6 +0,0 @@
-import { ConstraintNode } from "@bridged.xyz/design-sdk/lib/utils/types"
-
-function constraints(node: ConstraintNode) {
-    // node.constraints.horizontal.
-    // node.constraints.vertical
-}
\ No newline at end of file
diff --git a/packages/designto-flutter/interpreter/corner.interpret.ts b/packages/designto-flutter/interpreter/corner.interpret.ts
index 102fbaa9..a674bf6d 100644
--- a/packages/designto-flutter/interpreter/corner.interpret.ts
+++ b/packages/designto-flutter/interpreter/corner.interpret.ts
@@ -1,4 +1,4 @@
-import { ReflectRectangleNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectRectangleNode } from "@design-sdk/core/nodes";
 import {
   BorderRadiusGeometry,
   BorderRadius,
diff --git a/packages/designto-flutter/interpreter/gradient.interpret.ts b/packages/designto-flutter/interpreter/gradient.interpret.ts
index 26abde7d..ecb1679e 100644
--- a/packages/designto-flutter/interpreter/gradient.interpret.ts
+++ b/packages/designto-flutter/interpreter/gradient.interpret.ts
@@ -1,9 +1,9 @@
 import { Gradient, LinearGradient, Color } from "@bridged.xyz/flutter-builder";
 import { roundNumber } from "@reflect-ui/uiutils";
-import { color_utils } from "@bridged.xyz/design-sdk";
+import { color_utils } from "@design-sdk/core";
+import { GradientPaint } from "@design-sdk/figma";
 import { makeColorFromRGBO } from "../make/color.make";
 import { interpretGradientDirection } from "./gradient-direction.interpret";
-import { GradientPaint } from "@bridged.xyz/design-sdk/lib/figma/types/v1";
 
 export function interpretGradient(gradient: GradientPaint): Gradient {
   // TODO Handle transform percisely.
diff --git a/packages/designto-flutter/interpreter/icon.interpreter.ts b/packages/designto-flutter/interpreter/icon.interpreter.ts
index 03b150d0..4dfdbfed 100644
--- a/packages/designto-flutter/interpreter/icon.interpreter.ts
+++ b/packages/designto-flutter/interpreter/icon.interpreter.ts
@@ -1,6 +1,6 @@
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectSceneNode } from "@design-sdk/core/nodes";
 import { Icons, IconData } from "@bridged.xyz/flutter-builder";
-import { repo_assets } from "@bridged.xyz/design-sdk";
+import { repo_assets } from "@design-sdk/core";
 
 export function interpretIcon(
   node: ReflectSceneNode
@@ -19,7 +19,7 @@ export function interpretIcon(
     );
   }
 
-  const asset = repo_assets.ImageRepositories.current.addImage({
+  const asset = repo_assets.MainImageRepository.instance.current.addImage({
     key: node.id,
     hash: null,
   });
diff --git a/packages/designto-flutter/interpreter/illust.interpret.ts b/packages/designto-flutter/interpreter/illust.interpret.ts
index f8b2dad2..fa71dd86 100644
--- a/packages/designto-flutter/interpreter/illust.interpret.ts
+++ b/packages/designto-flutter/interpreter/illust.interpret.ts
@@ -1,10 +1,9 @@
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes";
-import { repo_assets } from "@bridged.xyz/design-sdk";
+import { repo_assets, nodes } from "@design-sdk/core";
 
 export function interpretIllust(
-  node: ReflectSceneNode
+  node: nodes.ReflectSceneNode
 ): repo_assets.TemporaryImageAsset {
-  const asset = repo_assets.ImageRepositories.current.addImage({
+  const asset = repo_assets.MainImageRepository.instance.current.addImage({
     key: node.id,
     hash: undefined,
   });
diff --git a/packages/designto-flutter/interpreter/image.interpret.ts b/packages/designto-flutter/interpreter/image.interpret.ts
index 63af0ec9..e14072ac 100644
--- a/packages/designto-flutter/interpreter/image.interpret.ts
+++ b/packages/designto-flutter/interpreter/image.interpret.ts
@@ -1,14 +1,12 @@
-import { ReflectDefaultShapeMixin } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectDefaultShapeMixin } from "@design-sdk/core/nodes";
 import { ImageProvider, NetworkImage } from "@bridged.xyz/flutter-builder";
 import {
   retrieveImageFill,
   retrievePrimaryImageFill,
-} from "@bridged.xyz/design-sdk/lib/utils/retrieve-image-fills";
-import { repo_assets } from "@bridged.xyz/design-sdk";
+} from "@design-sdk/core/utils/retrieve-image-fills";
+import { repo_assets } from "@design-sdk/core";
 import { currentBuildingNodeId } from "..";
-import { Figma } from "@bridged.xyz/design-sdk/lib/figma";
-
-// TODO - make this non async. It's too costly. generate preview image url local algorythm, upload syncronously.
+import { Figma } from "@design-sdk/figma";
 
 /**
  * finds the primary image in shape node, upload it to temporary hosting. returns the ImageProvider with hosted image.
@@ -33,10 +31,12 @@ export function interpretImageFills(
     image = retrieveImageFill(fills as Figma.ImagePaint);
   }
 
-  const hostedImage = repo_assets.ImageRepositories.current.addImage({
-    key: currentBuildingNodeId,
-    hash: image?.hash,
-  });
+  const hostedImage = repo_assets.MainImageRepository.instance.current.addImage(
+    {
+      key: currentBuildingNodeId,
+      hash: image?.hash,
+    }
+  );
 
   // this will give image provider `Image.network("https://domain.com/image.png")`
   return new NetworkImage(hostedImage.url);
diff --git a/packages/designto-flutter/interpreter/main-axis-size.interpret.ts b/packages/designto-flutter/interpreter/main-axis-size.interpret.ts
index 37413781..4b13c4e4 100644
--- a/packages/designto-flutter/interpreter/main-axis-size.interpret.ts
+++ b/packages/designto-flutter/interpreter/main-axis-size.interpret.ts
@@ -1,4 +1,4 @@
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectSceneNode } from "@design-sdk/core/nodes";
 import { MainAxisSize } from "@bridged.xyz/flutter-builder";
 
 export function interpretMainAxisSize(node: ReflectSceneNode): MainAxisSize {
diff --git a/packages/designto-flutter/interpreter/rect.interpret.ts b/packages/designto-flutter/interpreter/rect.interpret.ts
index 25106728..a59ec07d 100644
--- a/packages/designto-flutter/interpreter/rect.interpret.ts
+++ b/packages/designto-flutter/interpreter/rect.interpret.ts
@@ -8,13 +8,13 @@ import { makeColorFromRGBO } from "../make/color.make";
 import { interpretGradient } from "./gradient.interpret";
 import { interpretRectCorner } from "./corner.interpret";
 import { roundNumber } from "@reflect-ui/uiutils";
-import { ReflectRectangleNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectRectangleNode } from "@design-sdk/core/nodes";
 import {
   GradientPaint,
   ImagePaint,
   Paint,
   SolidPaint,
-} from "@bridged.xyz/design-sdk/lib/figma/types/v1";
+} from "@design-sdk/figma";
 export function interpretRect(rect: ReflectRectangleNode): Container {
   const fills = rect.fills as Array<Paint>;
   const fillsCount = fills.length;
diff --git a/packages/designto-flutter/make/border-radius.make.ts b/packages/designto-flutter/make/border-radius.make.ts
index 8da11401..ecbba0a8 100644
--- a/packages/designto-flutter/make/border-radius.make.ts
+++ b/packages/designto-flutter/make/border-radius.make.ts
@@ -2,7 +2,7 @@ import * as flutter from "@bridged.xyz/flutter-builder";
 import {
   ReflectEllipseNode,
   IReflectCornerMixin,
-} from "@bridged.xyz/design-sdk/lib/nodes/types";
+} from "@design-sdk/core/nodes";
 import { interpretRadius } from "../interpreter/radius.interpret";
 import * as core from "@reflect-ui/core";
 
diff --git a/packages/designto-flutter/make/border-side.make.ts b/packages/designto-flutter/make/border-side.make.ts
index e62a5d74..ef554770 100644
--- a/packages/designto-flutter/make/border-side.make.ts
+++ b/packages/designto-flutter/make/border-side.make.ts
@@ -1,4 +1,4 @@
-import { ReflectDefaultShapeMixin } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectDefaultShapeMixin } from "@design-sdk/core/nodes";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { roundNumber } from "@reflect-ui/uiutils";
 import { makeColor } from "./color.make";
diff --git a/packages/designto-flutter/make/border.make.ts b/packages/designto-flutter/make/border.make.ts
index 94c14024..a8997664 100644
--- a/packages/designto-flutter/make/border.make.ts
+++ b/packages/designto-flutter/make/border.make.ts
@@ -2,7 +2,7 @@ import * as flutter from "@bridged.xyz/flutter-builder";
 import {
   ReflectDefaultShapeMixin,
   ReflectSceneNode,
-} from "@bridged.xyz/design-sdk/lib/nodes/types";
+} from "@design-sdk/core/nodes";
 import { roundNumber } from "@reflect-ui/uiutils";
 import { makeColor } from "./color.make";
 
diff --git a/packages/designto-flutter/make/box-decoration.make.ts b/packages/designto-flutter/make/box-decoration.make.ts
index 59256ca3..fbc86077 100644
--- a/packages/designto-flutter/make/box-decoration.make.ts
+++ b/packages/designto-flutter/make/box-decoration.make.ts
@@ -1,5 +1,6 @@
-import { nodes } from "@bridged.xyz/design-sdk";
-import { retrieveFill } from "@bridged.xyz/design-sdk/lib/utils";
+import { nodes } from "@design-sdk/core";
+import { Figma } from "@design-sdk/figma";
+import { retrieveFill } from "@design-sdk/core/utils";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { interpretGradient } from "../interpreter/gradient.interpret";
 import { interpretImageFills } from "../interpreter/image.interpret";
@@ -7,7 +8,6 @@ import { makeBorderRadius } from "./border-radius.make";
 import { makeBorder } from "./border.make";
 import { makeBoxShadow } from "./box-shadow.make";
 import { makeColorFromRGBO } from "./color.make";
-import { Figma } from "@bridged.xyz/design-sdk";
 
 export function makeBoxDecoration(
   node:
diff --git a/packages/designto-flutter/make/box-shadow.make.ts b/packages/designto-flutter/make/box-shadow.make.ts
index f1e40718..991a6cb9 100644
--- a/packages/designto-flutter/make/box-shadow.make.ts
+++ b/packages/designto-flutter/make/box-shadow.make.ts
@@ -1,8 +1,8 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { ReflectSceneNode } from "@bridged.xyz/design-sdk/lib/nodes/types";
+import { ReflectSceneNode } from "@design-sdk/core/nodes";
+import { Figma } from "@design-sdk/figma";
 import { roundNumber } from "@reflect-ui/uiutils";
 import { makeColorFromRGBO } from "./color.make";
-import { Figma } from "@bridged.xyz/design-sdk";
 
 export function makeBoxShadow(
   node: ReflectSceneNode
diff --git a/packages/designto-flutter/make/color.make.ts b/packages/designto-flutter/make/color.make.ts
index 6f0243de..2320164f 100644
--- a/packages/designto-flutter/make/color.make.ts
+++ b/packages/designto-flutter/make/color.make.ts
@@ -1,5 +1,5 @@
-import { Figma } from "@bridged.xyz/design-sdk";
-import { retrieveFill } from "@bridged.xyz/design-sdk/lib/utils";
+import { Figma } from "@design-sdk/figma";
+import { retrieveFill } from "@design-sdk/core/utils";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { converters } from "@reflect-ui/core/lib";
 
diff --git a/packages/designto-flutter/make/column-row.make.ts b/packages/designto-flutter/make/column-row.make.ts
index 8c49fd00..18d7211b 100644
--- a/packages/designto-flutter/make/column-row.make.ts
+++ b/packages/designto-flutter/make/column-row.make.ts
@@ -1,4 +1,4 @@
-import { ReflectFrameNode } from "@bridged.xyz/design-sdk/lib/nodes";
+import { ReflectFrameNode } from "@design-sdk/core/nodes";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { Axis as ReflectAxis } from "@reflect-ui/core/lib";
 import { interpretCrossAxisAlignment } from "../interpreter/cross-axis-alignment.interpret";
diff --git a/packages/designto-flutter/make/divider.make.ts b/packages/designto-flutter/make/divider.make.ts
index 29815724..5033ef3c 100644
--- a/packages/designto-flutter/make/divider.make.ts
+++ b/packages/designto-flutter/make/divider.make.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { makeColor } from "./color.make";
 
diff --git a/packages/designto-flutter/make/edge-insets.make.ts b/packages/designto-flutter/make/edge-insets.make.ts
index 7b4dd749..8c5be960 100755
--- a/packages/designto-flutter/make/edge-insets.make.ts
+++ b/packages/designto-flutter/make/edge-insets.make.ts
@@ -1,5 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
-import { utils } from "@bridged.xyz/design-sdk";
+import { nodes, utils } from "@design-sdk/core";
 import * as flutter from "@bridged.xyz/flutter-builder";
 
 // This must happen before Stack or after the Positioned, but not before.
diff --git a/packages/designto-flutter/make/icon.make.ts b/packages/designto-flutter/make/icon.make.ts
index 4b5dd236..9ecb32d3 100644
--- a/packages/designto-flutter/make/icon.make.ts
+++ b/packages/designto-flutter/make/icon.make.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { makeColor } from ".";
 import { interpretIcon } from "../interpreter/icon.interpreter";
diff --git a/packages/designto-flutter/make/image.make.ts b/packages/designto-flutter/make/image.make.ts
index dc440c46..969de517 100644
--- a/packages/designto-flutter/make/image.make.ts
+++ b/packages/designto-flutter/make/image.make.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { interpretIllust } from "../interpreter/illust.interpret";
 
diff --git a/packages/designto-flutter/make/routes.make.ts b/packages/designto-flutter/make/routes.make.ts
index 63606d4c..37a2a566 100644
--- a/packages/designto-flutter/make/routes.make.ts
+++ b/packages/designto-flutter/make/routes.make.ts
@@ -1,6 +1,6 @@
 import { detectIf } from "@reflect-ui/detection";
 import { isRouteAction } from "../interpreter/action.interpret";
-import { Figma } from "@bridged.xyz/design-sdk";
+import { Figma } from "@design-sdk/figma";
 export function makeRoutes(): Array<string> {
   const routes = Array<string>();
   const allScreenReactions = fetchAllActionsGlobal({
diff --git a/packages/designto-flutter/make/shape.make.ts b/packages/designto-flutter/make/shape.make.ts
index 4a79da69..709d2f87 100644
--- a/packages/designto-flutter/make/shape.make.ts
+++ b/packages/designto-flutter/make/shape.make.ts
@@ -1,5 +1,5 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import { makeBorderRadius } from "./border-radius.make";
 import { makeColor } from "./color.make";
 
diff --git a/packages/designto-flutter/make/text-style.make.ts b/packages/designto-flutter/make/text-style.make.ts
index 4abe30cb..d7c9f0d7 100644
--- a/packages/designto-flutter/make/text-style.make.ts
+++ b/packages/designto-flutter/make/text-style.make.ts
@@ -1,8 +1,8 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
 import * as core from "@reflect-ui/core";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import { makeColor } from ".";
-import { TextStyleRepository } from "@bridged.xyz/design-sdk/lib/figma";
+import { TextStyleRepository } from "@design-sdk/figma";
 
 /**
  * get the code of Text#style (text-style) via the name of the defined textstyle.
diff --git a/packages/designto-flutter/make/text-theme.make.ts b/packages/designto-flutter/make/text-theme.make.ts
index 5e37a47d..85c4440e 100644
--- a/packages/designto-flutter/make/text-theme.make.ts
+++ b/packages/designto-flutter/make/text-theme.make.ts
@@ -1,7 +1,4 @@
-import {
-  TextStyleRepository,
-  TextThemeStyles,
-} from "@bridged.xyz/design-sdk/lib/figma";
+import { TextStyleRepository, TextThemeStyles } from "@design-sdk/figma";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { makeTextStyleFromDesign } from "./text-style.make";
 
diff --git a/packages/designto-flutter/make/text.make.ts b/packages/designto-flutter/make/text.make.ts
index 995001e0..b52ed026 100644
--- a/packages/designto-flutter/make/text.make.ts
+++ b/packages/designto-flutter/make/text.make.ts
@@ -1,5 +1,5 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/figma";
 import { makeTextStyle } from "./text-style.make";
 import { interpretTextAlign } from "../interpreter/text-align.interpreter";
 import { string_utils } from "@designto/token";
diff --git a/packages/designto-flutter/wrappers/container.wrap.ts b/packages/designto-flutter/wrappers/container.wrap.ts
index 83c0d147..494d386a 100755
--- a/packages/designto-flutter/wrappers/container.wrap.ts
+++ b/packages/designto-flutter/wrappers/container.wrap.ts
@@ -1,5 +1,5 @@
 import { convertToSize } from "../convert";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import { makeEdgeInsets } from "../make";
 import { array } from "@reflect-ui/uiutils";
 import * as flutter from "@bridged.xyz/flutter-builder";
diff --git a/packages/designto-flutter/wrappers/material.wrap.ts b/packages/designto-flutter/wrappers/material.wrap.ts
index 10f94579..d15b42d1 100755
--- a/packages/designto-flutter/wrappers/material.wrap.ts
+++ b/packages/designto-flutter/wrappers/material.wrap.ts
@@ -1,5 +1,5 @@
 import { convertToSize } from "../convert/size.convert";
-import { Figma, nodes } from "@bridged.xyz/design-sdk";
+import { Figma, nodes } from "@design-sdk/figma";
 import { converters } from "@reflect-ui/core/lib";
 import * as flutter from "@bridged.xyz/flutter-builder";
 import { makeColor } from "../make/color.make";
diff --git a/packages/designto-flutter/wrappers/opacity.wrap.ts b/packages/designto-flutter/wrappers/opacity.wrap.ts
index a37194fc..d86e6361 100644
--- a/packages/designto-flutter/wrappers/opacity.wrap.ts
+++ b/packages/designto-flutter/wrappers/opacity.wrap.ts
@@ -1,5 +1,5 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 
 /**
  * Wrap widget with opacity if possible
diff --git a/packages/designto-flutter/wrappers/padding.wrap.ts b/packages/designto-flutter/wrappers/padding.wrap.ts
index 09c07807..58afa782 100644
--- a/packages/designto-flutter/wrappers/padding.wrap.ts
+++ b/packages/designto-flutter/wrappers/padding.wrap.ts
@@ -1,5 +1,5 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import { makeEdgeInsets } from "../make/edge-insets.make";
 
 export function wrapWithPadding(
diff --git a/packages/designto-flutter/wrappers/positioned.wrap.ts b/packages/designto-flutter/wrappers/positioned.wrap.ts
index f6088bb3..2c4dc734 100755
--- a/packages/designto-flutter/wrappers/positioned.wrap.ts
+++ b/packages/designto-flutter/wrappers/positioned.wrap.ts
@@ -1,6 +1,5 @@
-import { nodes } from "@bridged.xyz/design-sdk";
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { utils } from "@bridged.xyz/design-sdk";
+import { utils, nodes } from "@design-sdk/core";
 import { roundNumber } from "@reflect-ui/uiutils";
 import { makeSaflyAsSingle } from "../utils/make-as-safe-single";
 export function wrapWithPositioned(
diff --git a/packages/designto-flutter/wrappers/rotation.wrap.ts b/packages/designto-flutter/wrappers/rotation.wrap.ts
index 2adc3d62..4a367f1d 100644
--- a/packages/designto-flutter/wrappers/rotation.wrap.ts
+++ b/packages/designto-flutter/wrappers/rotation.wrap.ts
@@ -1,5 +1,5 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 
 /**
  * https://api.flutter.dev/flutter/widgets/Transform-class.html
diff --git a/packages/designto-flutter/wrappers/visibility.wrap.ts b/packages/designto-flutter/wrappers/visibility.wrap.ts
index f4e046bf..974a1366 100644
--- a/packages/designto-flutter/wrappers/visibility.wrap.ts
+++ b/packages/designto-flutter/wrappers/visibility.wrap.ts
@@ -1,5 +1,5 @@
 import * as flutter from "@bridged.xyz/flutter-builder";
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 
 /**
  * Wrap widget with visibility if possible
diff --git a/packages/designto-token/container/index.ts b/packages/designto-token/container/index.ts
index 8f344d1a..18bb8bbe 100644
--- a/packages/designto-token/container/index.ts
+++ b/packages/designto-token/container/index.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import * as core from "@reflect-ui/core";
 
 export function fromRectangle(
diff --git a/packages/designto-token/layout/index.ts b/packages/designto-token/layout/index.ts
index 7363aef0..358cb68a 100644
--- a/packages/designto-token/layout/index.ts
+++ b/packages/designto-token/layout/index.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import * as core from "@reflect-ui/core";
 
 function fromFrame(frame: nodes.ReflectFrameNode): core.LayoutRepresntatives {
diff --git a/packages/designto-token/main.ts b/packages/designto-token/main.ts
index d41da6e4..6b2782f7 100644
--- a/packages/designto-token/main.ts
+++ b/packages/designto-token/main.ts
@@ -1,4 +1,4 @@
-import { nodes } from "@bridged.xyz/design-sdk";
+import { nodes } from "@design-sdk/core";
 import { fromRectangle } from "./container";
 
 function row() {
diff --git a/packages/reflect-detection b/packages/reflect-detection
index 566bc02d..38d142b1 160000
--- a/packages/reflect-detection
+++ b/packages/reflect-detection
@@ -1 +1 @@
-Subproject commit 566bc02d62efeda0b3318cd9ebb4a9a26bbb90fe
+Subproject commit 38d142b1260d302bfd816d83772a1d3b0d6fd275