diff --git a/client/src/graphs/collab/collabTag.ts b/client/src/graphs/collab/collabTag.ts
index 03694f7a..8761fac0 100644
--- a/client/src/graphs/collab/collabTag.ts
+++ b/client/src/graphs/collab/collabTag.ts
@@ -1,7 +1,9 @@
 import colors from '@colors';
 import type { Collaborator, CollaboratorMap } from '@graph/collab/types';
-import { type CircleSchema, circle } from '@shape/shapes/circle';
-import { type RectSchema, rect } from '@shape/shapes/rect';
+import { circle } from '@shape/shapes/circle';
+import type { CircleSchema } from '@shape/shapes/circle/types';
+import { rect } from '@shape/shapes/rect';
+import type { RectSchema } from '@shape/shapes/rect/types';
 
 import type { Ref } from 'vue';
 
diff --git a/client/src/graphs/plugins/annotations/index.ts b/client/src/graphs/plugins/annotations/index.ts
index 6469db30..ad919251 100644
--- a/client/src/graphs/plugins/annotations/index.ts
+++ b/client/src/graphs/plugins/annotations/index.ts
@@ -2,9 +2,9 @@ import type { BaseGraph } from '@graph/base';
 import type { GraphMouseEvent } from '@graph/base/types';
 import { useNonNullGraphColors } from '@graph/themes/useGraphColors';
 import type { Aggregator } from '@graph/types';
-import type { WithId } from '@shape/cacher';
 import { circle } from '@shape/shapes/circle';
-import type { ScribbleSchema } from '@shape/shapes/scribble';
+import type { ScribbleSchema } from '@shape/shapes/scribble/types';
+import type { WithId } from '@shape/types';
 import type { Coordinate } from '@shape/types/utility';
 import colors from '@utils/colors';
 import type { Color } from '@utils/colors';
diff --git a/client/src/graphs/plugins/annotations/types.ts b/client/src/graphs/plugins/annotations/types.ts
index 836bc45b..0e70f7ef 100644
--- a/client/src/graphs/plugins/annotations/types.ts
+++ b/client/src/graphs/plugins/annotations/types.ts
@@ -1,4 +1,4 @@
-import type { ScribbleSchema } from '@shape/shapes/scribble';
+import type { ScribbleSchema } from '@shape/shapes/scribble/types';
 
 /**
  * a scribble that is on the graph as an annotation
diff --git a/client/src/graphs/themes/types.ts b/client/src/graphs/themes/types.ts
index 898c6b00..3444bca3 100644
--- a/client/src/graphs/themes/types.ts
+++ b/client/src/graphs/themes/types.ts
@@ -1,7 +1,7 @@
 import type { NodeAnchor } from '@graph/plugins/anchors/types';
 import type { SupportedNodeShapes } from '@graph/schematics/node';
 import type { EdgeGetterOrValue, GNode, NodeGetterOrValue } from '@graph/types';
-import type { FontWeight } from '@shape/types/utility';
+import type { FontWeight } from '@shape/text/types';
 import type {
   MaybeGetter,
   MaybeGetterParams,
diff --git a/client/src/products/binary-trees/ui/AddNodePanel.vue b/client/src/products/binary-trees/ui/AddNodePanel.vue
index 93f4bf17..58936bc3 100644
--- a/client/src/products/binary-trees/ui/AddNodePanel.vue
+++ b/client/src/products/binary-trees/ui/AddNodePanel.vue
@@ -14,7 +14,7 @@
   const getNumbers = () => {
     const treeArr = props.tree.tree
       .toArray()
-      .filter((num) => num !== undefined);
+      .filter((num): num is number => num !== undefined);
 
     if (treeArr.length === 0) return [1, 2, 3, 4, 5];
     const min = Math.min(...treeArr);
diff --git a/client/src/shapes/animation/timeline/compile.ts b/client/src/shapes/animation/timeline/compile.ts
index 9f51c2d0..6e4579c0 100644
--- a/client/src/shapes/animation/timeline/compile.ts
+++ b/client/src/shapes/animation/timeline/compile.ts
@@ -200,10 +200,10 @@ export const compileTimeline = (timeline: Timeline<any>): CompiledTimeline => {
         };
       });
 
-      // @ts-expect-error could make TS happy, but would make this verbose unfortunately
       return interpolation.fn(
         keyframes,
         getDefaultEasing(propName),
+        // @ts-expect-error could make TS happy, but would make this verbose unfortunately
         rawPropVal,
       )(progress);
     };
diff --git a/client/src/utils/localStorage.ts b/client/src/utils/localStorage.ts
index 005287b3..316bd184 100644
--- a/client/src/utils/localStorage.ts
+++ b/client/src/utils/localStorage.ts
@@ -1,5 +1,4 @@
-import type { Camera } from '@canvas/camera';
-import type { MagicCanvasOptions } from '@canvas/index';
+import type { MagicCanvasOptions } from '@canvas/types';
 // @typescript-eslint/no-unused-vars reports unused even if referenced in jsdoc
 /* eslint-disable */
 import type { Graph } from '@graph/types';