diff --git a/packages/builder/src/stores/builder/preview.ts b/packages/builder/src/stores/builder/preview.ts
index 87b2b9355e..a0b72559aa 100644
--- a/packages/builder/src/stores/builder/preview.ts
+++ b/packages/builder/src/stores/builder/preview.ts
@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
 import { BudiStore } from "../BudiStore"
+import { PreviewDevice } from "@budibase/types"
 
-type PreviewDevice = "desktop" | "tablet" | "mobile"
 type PreviewEventHandler = (name: string, payload?: any) => void
 type ComponentContext = Record<string, any>
 
diff --git a/packages/client/src/components/Block.svelte b/packages/client/src/components/Block.svelte
index 48c11f152a..24e010f3d9 100644
--- a/packages/client/src/components/Block.svelte
+++ b/packages/client/src/components/Block.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext, onDestroy, onMount, setContext } from "svelte"
-  import { builderStore } from "stores/builder.js"
+  import { builderStore } from "@/stores/builder"
   import { blockStore } from "stores/blocks"
 
   const component = getContext("component")
diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte
index 7ac0532dca..ded79b4dd9 100644
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@@ -2,7 +2,7 @@
   import Field from "./Field.svelte"
   import { CoreDropzone, ProgressCircle, Helpers } from "@budibase/bbui"
   import { getContext, onMount, onDestroy } from "svelte"
-  import { builderStore } from "stores/builder.js"
+  import { builderStore } from "@/stores/builder"
   import { processStringSync } from "@budibase/string-templates"
 
   export let datasourceId
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.ts
similarity index 87%
rename from packages/client/src/stores/builder.js
rename to packages/client/src/stores/builder.ts
index 1ae7d3a670..2a5d616f39 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.ts
@@ -2,9 +2,29 @@ import { writable, get } from "svelte/store"
 import { API } from "api"
 import { devToolsStore } from "./devTools.js"
 import { eventStore } from "./events.js"
+import { PreviewDevice } from "@budibase/types"
+
+interface BuilderStore {
+  inBuilder: boolean
+  screen: string | null
+  selectedComponentId: string | null
+  editMode: boolean
+  previewId: string | null
+  theme: string | null
+  customTheme: string | null
+  previewDevice: PreviewDevice
+  navigation: string | null
+  hiddenComponentIds: []
+  usedPlugins: string | null
+  eventResolvers: {}
+  metadata: string | null
+  snippets: string | null
+  componentErrors: {}
+  layout: null
+}
 
 const createBuilderStore = () => {
-  const initialState = {
+  const initialState: BuilderStore = {
     inBuilder: false,
     screen: null,
     selectedComponentId: null,
@@ -26,7 +46,7 @@ const createBuilderStore = () => {
   }
   const store = writable(initialState)
   const actions = {
-    selectComponent: id => {
+    selectComponent: (id: string) => {
       if (id === get(store).selectedComponentId) {
         return
       }