diff --git a/app/web/src/components/CadPackage/CadPackage.tsx b/app/web/src/components/CadPackage/CadPackage.tsx
index f05cd9e..ab58580 100644
--- a/app/web/src/components/CadPackage/CadPackage.tsx
+++ b/app/web/src/components/CadPackage/CadPackage.tsx
@@ -1,5 +1,9 @@
-import { ideTypeNameMap } from 'src/helpers/hooks/useIdeContext'
-import type { CadPackage as CadPackageType } from 'src/helpers/hooks/useIdeState'
+export type CadPackageType = 'openscad' | 'cadquery' | 'jscad'
+
+export const ideTypeNameMap = {
+  openscad: 'OpenSCAD',
+  cadquery: 'CadQuery',
+}
 
 interface CadPackageProps {
   cadPackage: CadPackageType
diff --git a/app/web/src/components/EncodedUrl/ExternalScript.tsx b/app/web/src/components/EncodedUrl/ExternalScript.tsx
index 018c050..99687dd 100644
--- a/app/web/src/components/EncodedUrl/ExternalScript.tsx
+++ b/app/web/src/components/EncodedUrl/ExternalScript.tsx
@@ -1,5 +1,6 @@
 import { useState } from 'react'
-import { useIdeContext, ideTypeNameMap } from 'src/helpers/hooks/useIdeContext'
+import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
+import { ideTypeNameMap } from 'src/components/CadPackage/CadPackage'
 import OutBound from 'src/components/OutBound/OutBound'
 import { prepareEncodedUrl, makeExternalUrl } from './helpers'
 import { copyTextToClipboard } from 'src/helpers/clipboard'
diff --git a/app/web/src/components/IdeEditor/IdeEditor.tsx b/app/web/src/components/IdeEditor/IdeEditor.tsx
index 9c1d0ae..97b9060 100644
--- a/app/web/src/components/IdeEditor/IdeEditor.tsx
+++ b/app/web/src/components/IdeEditor/IdeEditor.tsx
@@ -4,7 +4,7 @@ import { makeCodeStoreKey, requestRender } from 'src/helpers/hooks/useIdeState'
 import Editor, { useMonaco } from '@monaco-editor/react'
 import { theme } from 'src/../config/tailwind.config'
 import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
-import type { CadPackage as CadPackageType } from 'src/helpers/hooks/useIdeState'
+import type { CadPackageType } from 'src/components/CadPackage/CadPackage'
 
 const colors = theme.extend.colors
 
diff --git a/app/web/src/components/NavPlusButton/NavPlusButton.tsx b/app/web/src/components/NavPlusButton/NavPlusButton.tsx
index d17e1d2..4763e68 100644
--- a/app/web/src/components/NavPlusButton/NavPlusButton.tsx
+++ b/app/web/src/components/NavPlusButton/NavPlusButton.tsx
@@ -1,12 +1,12 @@
 import { Link, routes } from '@redwoodjs/router'
 import Svg from 'src/components/Svg/Svg'
 import { Popover } from '@headlessui/react'
-import type { CadPackage } from 'src/helpers/hooks/useIdeState'
+import type { CadPackageType } from 'src/components/CadPackage/CadPackage'
 
 const menuOptions: {
   name: string
   sub: string
-  ideType: CadPackage
+  ideType: CadPackageType
 }[] = [
   {
     name: 'OpenSCAD',
diff --git a/app/web/src/helpers/cadPackages/index.ts b/app/web/src/helpers/cadPackages/index.ts
index 90223a0..372a39a 100644
--- a/app/web/src/helpers/cadPackages/index.ts
+++ b/app/web/src/helpers/cadPackages/index.ts
@@ -1,11 +1,11 @@
 import { DefaultKernelExport } from './common'
-import type { CadPackage } from 'src/helpers/hooks/useIdeState'
+import type { CadPackageType } from 'src/components/CadPackage/CadPackage'
 
 import openscad from './openScad/openScadController'
 import cadquery from './cadQueryController'
 import jscad from './jsCad/jsCadController'
 
-export const cadPackages: { [key in CadPackage]: DefaultKernelExport } = {
+export const cadPackages: { [key in CadPackageType]: DefaultKernelExport } = {
   openscad,
   cadquery,
   jscad,
diff --git a/app/web/src/helpers/hooks/useIdeContext.ts b/app/web/src/helpers/hooks/useIdeContext.ts
index 7724243..d2429fa 100644
--- a/app/web/src/helpers/hooks/useIdeContext.ts
+++ b/app/web/src/helpers/hooks/useIdeContext.ts
@@ -17,8 +17,3 @@ export const IdeContext = createContext<IdeContextType>({
 export function useIdeContext() {
   return useContext(IdeContext)
 }
-
-export const ideTypeNameMap = {
-  openscad: 'OpenSCAD',
-  cadquery: 'CadQuery',
-}
diff --git a/app/web/src/helpers/hooks/useIdeState.ts b/app/web/src/helpers/hooks/useIdeState.ts
index f4a3d2b..8945841 100644
--- a/app/web/src/helpers/hooks/useIdeState.ts
+++ b/app/web/src/helpers/hooks/useIdeState.ts
@@ -13,10 +13,9 @@ function withThunk(dispatch, getState) {
       ? actionOrThunk(dispatch, getState)
       : dispatch(actionOrThunk)
 }
+import { CadPackageType } from 'src/components/CadPackage/CadPackage'
 
-export type CadPackage = 'openscad' | 'cadquery' | 'jscad'
-
-const initCodeMap: { [key in CadPackage]: string } = {
+const initCodeMap: { [key in CadPackageType]: string } = {
   openscad: `// involute donut
 
 // ^ first comment is used for download title (i.e "involute-donut.stl")
@@ -97,7 +96,7 @@ interface XYZ {
 }
 
 export interface State {
-  ideType: 'INIT' | CadPackage
+  ideType: 'INIT' | CadPackageType
   consoleMessages: { type: 'message' | 'error'; message: string; time: Date }[]
   code: string
   objectData: {