diff --git a/sites/org/pages/docs/index.mjs b/sites/org/pages/docs/index.mjs
index c9f93b30ea8..bb1c69035d2 100644
--- a/sites/org/pages/docs/index.mjs
+++ b/sites/org/pages/docs/index.mjs
@@ -2,7 +2,7 @@
 import { useApp } from 'site/hooks/useApp.mjs'
 // Dependencies
 import Head from 'next/head'
-import mdxLoader from 'shared/mdx/loader'
+import { mdxLoader } from 'shared/mdx/loader.mjs'
 // Components
 import { PageWrapper } from 'site/components/wrappers/page.mjs'
 import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs'
diff --git a/sites/shared/components/json.mjs b/sites/shared/components/json.mjs
index 79856896ec6..e4579a6c208 100644
--- a/sites/shared/components/json.mjs
+++ b/sites/shared/components/json.mjs
@@ -1,5 +1,5 @@
 import React from 'react'
-import Highlight from 'shared/components/mdx/highlight.mjs'
+import { Highlight } from 'shared/components/mdx/highlight.mjs'
 import hljs from 'highlight.js/lib/common'
 
 export const Json = (props) => {
diff --git a/sites/shared/components/mdx/examples.mjs b/sites/shared/components/mdx/examples.mjs
index 54e62f01322..1545abc6935 100644
--- a/sites/shared/components/mdx/examples.mjs
+++ b/sites/shared/components/mdx/examples.mjs
@@ -1,7 +1,7 @@
 import { Examples as Pattern } from '@freesewing/examples'
-import Svg from '../workbench/draft/svg'
-import Defs from '../workbench/draft/defs'
-import Stack from '../workbench/draft/stack'
+import { Svg } from '../workbench/draft/svg'
+import { Defs } from '../workbench/draft/defs'
+import { Stack } from '../workbench/draft/stack'
 import { useGist } from 'shared/hooks/useGist'
 import Md from 'react-markdown'
 
diff --git a/sites/shared/components/mdx/tabbed-example.mjs b/sites/shared/components/mdx/tabbed-example.mjs
index 80648d9c1d5..51c10ad082e 100644
--- a/sites/shared/components/mdx/tabbed-example.mjs
+++ b/sites/shared/components/mdx/tabbed-example.mjs
@@ -4,9 +4,9 @@ import { pluginBundle } from '@freesewing/plugin-bundle'
 import { pluginFlip } from '@freesewing/plugin-flip'
 import { pluginGore } from '@freesewing/plugin-gore'
 import { Design } from '@freesewing/core'
-import Svg from '../workbench/draft/svg'
-import Defs from '../workbench/draft/defs'
-import Stack from '../workbench/draft/stack'
+import { Svg } from '../workbench/draft/svg'
+import { Defs } from '../workbench/draft/defs'
+import { Stack } from '../workbench/draft/stack'
 import { useGist } from 'shared/hooks/useGist'
 import yaml from 'js-yaml'
 
diff --git a/sites/shared/components/yaml.mjs b/sites/shared/components/yaml.mjs
index 30a1fbd5386..3a76c3324c8 100644
--- a/sites/shared/components/yaml.mjs
+++ b/sites/shared/components/yaml.mjs
@@ -1,5 +1,5 @@
 import React from 'react'
-import Highlight from 'shared/components/mdx/highlight.js'
+import { Highlight } from 'shared/components/mdx/highlight.mjs'
 import hljs from 'highlight.js/lib/common'
 import yaml from 'js-yaml'
 
diff --git a/sites/shared/hooks/useGist.mjs b/sites/shared/hooks/useGist.mjs
index da1f1a36fb8..556e30d9ebe 100644
--- a/sites/shared/hooks/useGist.mjs
+++ b/sites/shared/hooks/useGist.mjs
@@ -3,13 +3,13 @@ import set from 'lodash.set'
 import unset from 'lodash.unset'
 import cloneDeep from 'lodash.clonedeep'
 import { useLocalStorage } from './useLocalStorage'
-import { defaultSettings } from 'shared/components/workbench/default-settings.mjs'
+import { defaultGist as baseGist } from 'shared/components/workbench/gist.mjs'
 
 // Generates a default design gist to start from
 export const defaultGist = (design, locale = 'en') => {
   const gist = {
     design,
-    ...defaultSettings,
+    ...baseGist,
     _state: { view: 'draft' },
   }
   if (locale) gist.locale = locale