diff --git a/src/App.vue b/src/App.vue
index ebac3cedc8..51512f8041 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -180,7 +180,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
   }
 
   get progress (): number {
-    const progress = this.$store.getters['printer/getPrintProgress'] as number
+    const progress: number = this.$store.getters['printer/getPrintProgress']
     return Math.floor(progress * 100)
   }
 
@@ -229,35 +229,38 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
       const primaryColor = this.primaryColor
       const secondaryColor = 'rgba(255, 255, 255, 0.10)'
       const canvas = document.createElement('canvas')
-      const context = canvas.getContext('2d') as CanvasRenderingContext2D
-      canvas.width = favIconSize
-      canvas.height = favIconSize
-      const percent = this.progress
-      const centerX = canvas.width / 2
-      const centerY = canvas.height / 2
-      const lineWidth = 8
-      const radius = favIconSize / 2 - lineWidth / 2
-      const startAngle = 1.5 * Math.PI
-      const endAngle = startAngle + (percent * 2 * Math.PI / 100)
-
-      /* Draw the initial gray circle */
-      context.moveTo(centerX, centerY)
-      context.beginPath()
-      context.arc(centerX, centerY, radius, 0, 2 * Math.PI, false)
-      context.strokeStyle = secondaryColor
-      context.lineWidth = lineWidth
-      context.stroke()
-      context.closePath()
-
-      /* Now draw the progress circle */
-      context.moveTo(centerX, centerY)
-      context.beginPath()
-      context.arc(centerX, centerY, radius, startAngle, endAngle, false)
-      context.strokeStyle = primaryColor
-      context.lineWidth = lineWidth
-      context.stroke()
-
-      return canvas.toDataURL('image/png')
+      const context = canvas.getContext('2d')
+
+      if (context) {
+        canvas.width = favIconSize
+        canvas.height = favIconSize
+        const percent = this.progress
+        const centerX = canvas.width / 2
+        const centerY = canvas.height / 2
+        const lineWidth = 8
+        const radius = favIconSize / 2 - lineWidth / 2
+        const startAngle = 1.5 * Math.PI
+        const endAngle = startAngle + (percent * 2 * Math.PI / 100)
+
+        /* Draw the initial gray circle */
+        context.moveTo(centerX, centerY)
+        context.beginPath()
+        context.arc(centerX, centerY, radius, 0, 2 * Math.PI, false)
+        context.strokeStyle = secondaryColor
+        context.lineWidth = lineWidth
+        context.stroke()
+        context.closePath()
+
+        /* Now draw the progress circle */
+        context.moveTo(centerX, centerY)
+        context.beginPath()
+        context.arc(centerX, centerY, radius, startAngle, endAngle, false)
+        context.strokeStyle = primaryColor
+        context.lineWidth = lineWidth
+        context.stroke()
+
+        return canvas.toDataURL('image/png')
+      }
     }
   }
 
@@ -408,7 +411,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
         const files = await getFilesFromDataTransfer(event.dataTransfer)
 
         if (files) {
-          const pathWithRoot = this.$store.getters['files/getCurrentPathByRoot'](root) as string || ''
+          const pathWithRoot: string = this.$store.getters['files/getCurrentPathByRoot'](root) ?? ''
           const path = pathWithRoot === root
             ? ''
             : pathWithRoot.substring(root.length + 1)
diff --git a/src/api/httpClientActions.ts b/src/api/httpClientActions.ts
index 67067066e2..dd17f4546b 100644
--- a/src/api/httpClientActions.ts
+++ b/src/api/httpClientActions.ts
@@ -36,19 +36,19 @@ export const httpClientActions = {
       result: {
         username: string,
         token: string,
-        action: string,
+        action: 'user_jwt_refresh',
         source: string
       }
     }>('/access/refresh_jwt', { refresh_token }, options)
   },
 
-  accessLoginPost (username: string, password: string, source = 'moonraker', options?: AxiosRequestConfig) {
+  accessLoginPost (username: string, password: string, source: string = 'moonraker', options?: AxiosRequestConfig) {
     return this.post<{
       result: {
         username: string,
         token: string,
         refresh_token: string,
-        action: string,
+        action: 'user_logged_in',
         source: string
       }
     }>('/access/login', {
@@ -62,7 +62,7 @@ export const httpClientActions = {
     return this.post<{
       result: {
         username: string,
-        action: string
+        action: 'user_logged_out'
       }
     }>('access/logout', undefined, options)
   },
@@ -101,8 +101,8 @@ export const httpClientActions = {
         username: string,
         token: string,
         refresh_token: string,
-        action: string,
-        source: string
+        action: 'user_created',
+        source: 'moonraker'
       }
     }>('/access/user', {
       username,
@@ -114,7 +114,7 @@ export const httpClientActions = {
     return this.delete<{
       result: {
         username: string,
-        action: string
+        action: 'user_deleted'
       }
     }>('/access/user', {
       ...options,
@@ -126,7 +126,7 @@ export const httpClientActions = {
     return this.post<{
       result: {
         username: string,
-        action: string
+        action: 'user_password_reset'
       }
     }>('/access/user/password', {
       password,
@@ -193,11 +193,15 @@ export const httpClientActions = {
     return this.postForm<{
       result: {
         item: {
+          modified?: number,
+          size?: number,
+          permissions?: string,
           path: string,
           root: string
         }
         print_started?: boolean,
-        action: string
+        print_queued?: boolean,
+        action: 'create_file'
       }
     }>('/server/files/upload', formData, options)
   },
diff --git a/src/components/common/BedScrewsAdjustDialog.vue b/src/components/common/BedScrewsAdjustDialog.vue
index d856171af6..c9a02ac8ee 100644
--- a/src/components/common/BedScrewsAdjustDialog.vue
+++ b/src/components/common/BedScrewsAdjustDialog.vue
@@ -28,7 +28,7 @@
             hide-details
             dense
             disabled
-            :value="$t('app.general.label.partial_of_total', {partial: currentScrewIndex + 1, total: bedScrews.length})"
+            :value="$t('app.general.label.partial_of_total', {partial: currentScrewIndex + 1, total: totalScrews})"
           />
         </v-col>
       </v-row>
@@ -41,7 +41,7 @@
             hide-details
             dense
             disabled
-            :value="$t('app.general.label.partial_of_total', {partial: acceptedScrews, total: bedScrews.length})"
+            :value="$t('app.general.label.partial_of_total', {partial: acceptedScrews, total: totalScrews})"
           />
         </v-col>
       </v-row>
@@ -52,7 +52,7 @@
       </v-row>
 
       <v-progress-linear
-        :value="acceptedScrews / bedScrews.length * 100"
+        :value="acceptedScrews / totalScrews * 100"
         class="mt-2"
       />
     </v-card-text>
@@ -98,28 +98,24 @@ import type { BedScrews } from '@/store/printer/types'
 
 @Component({})
 export default class BedScrewsAdjustDialog extends Mixins(StateMixin, ToolheadMixin) {
-  get bedScrews (): BedScrews[] {
-    return this.$store.getters['printer/getBedScrews'] as BedScrews[]
-  }
-
-  get bedScrewsAdjust () {
-    return this.$store.state.printer.printer.bed_screws ?? {}
-  }
-
-  get currentState () {
-    return this.bedScrewsAdjust.state
+  get bedScrews (): BedScrews {
+    return this.$store.getters['printer/getBedScrews']
   }
 
   get currentScrewIndex () {
-    return this.bedScrewsAdjust.current_screw
+    return this.bedScrews.current_screw ?? 0
   }
 
   get currentScrewName () {
-    return this.bedScrews[this.currentScrewIndex]?.prettyName
+    return this.bedScrews.screws[this.currentScrewIndex]?.prettyName
   }
 
   get acceptedScrews () {
-    return this.bedScrewsAdjust.accepted_screws
+    return this.bedScrews.accepted_screws ?? 0
+  }
+
+  get totalScrews () {
+    return this.bedScrews.screws.length
   }
 
   get showBedScrewsAdjustDialogAutomatically (): boolean {
diff --git a/src/components/common/ManualProbeDialog.vue b/src/components/common/ManualProbeDialog.vue
index d2d8bc06ab..31544c035e 100644
--- a/src/components/common/ManualProbeDialog.vue
+++ b/src/components/common/ManualProbeDialog.vue
@@ -148,20 +148,16 @@ export default class ManualProbeDialog extends Mixins(StateMixin, ToolheadMixin)
     ].sort((a, b) => b - a)
   }
 
-  get manualProbe () {
-    return this.$store.state.printer.printer.manual_probe
-  }
-
   get zPositionLower () {
-    return this.manualProbe.z_position_lower?.toFixed(3)
+    return this.$store.state.printer.printer.manual_probe?.z_position_lower?.toFixed(3)
   }
 
   get zPosition () {
-    return this.manualProbe.z_position?.toFixed(3)
+    return this.$store.state.printer.printer.manual_probe?.z_position?.toFixed(3)
   }
 
   get zPositionUpper () {
-    return this.manualProbe.z_position_upper?.toFixed(3)
+    return this.$store.state.printer.printer.manual_probe?.z_position_upper?.toFixed(3)
   }
 
   get showManualProbeDialogAutomatically (): boolean {
diff --git a/src/components/common/ScrewsTiltAdjustDialog.vue b/src/components/common/ScrewsTiltAdjustDialog.vue
index c81940cf81..6e7adc70d6 100644
--- a/src/components/common/ScrewsTiltAdjustDialog.vue
+++ b/src/components/common/ScrewsTiltAdjustDialog.vue
@@ -78,7 +78,7 @@ import type { ScrewsTiltAdjust } from '@/store/printer/types'
 @Component({})
 export default class ScrewsTiltAdjustDialog extends Mixins(StateMixin, ToolheadMixin) {
   get screwsTiltAdjust (): ScrewsTiltAdjust {
-    return this.$store.getters['printer/getScrewsTiltAdjust'] as ScrewsTiltAdjust
+    return this.$store.getters['printer/getScrewsTiltAdjust']
   }
 
   get showScrewsTiltAdjustDialogAutomatically (): boolean {
diff --git a/src/components/common/SystemCommands.vue b/src/components/common/SystemCommands.vue
index 984a1107e4..2528f58b37 100644
--- a/src/components/common/SystemCommands.vue
+++ b/src/components/common/SystemCommands.vue
@@ -142,7 +142,7 @@ import type { ServerInfo, ServiceInfo, SystemInfo } from '@/store/server/types'
 @Component({})
 export default class SystemCommands extends Mixins(StateMixin, ServicesMixin) {
   get serverInfo (): ServerInfo {
-    return this.$store.getters['server/getInfo'] as ServerInfo
+    return this.$store.state.server.info
   }
 
   get hosted (): boolean {
@@ -150,22 +150,22 @@ export default class SystemCommands extends Mixins(StateMixin, ServicesMixin) {
   }
 
   get powerDevices (): Device[] {
-    return this.$store.getters['power/getDevices'] as Device[]
+    return this.$store.getters['power/getDevices']
   }
 
   get devicePowerComponentEnabled (): boolean {
-    return this.$store.getters['server/componentSupport']('power') as boolean
+    return this.$store.getters['server/componentSupport']('power')
   }
 
   get services (): ServiceInfo[] {
-    const services = this.$store.getters['server/getServices'] as ServiceInfo[]
+    const services: ServiceInfo[] = this.$store.getters['server/getServices']
 
     return services
       .filter(service => service.name !== 'klipper_mcu')
   }
 
   get systemInfo (): SystemInfo | null {
-    return this.$store.getters['server/getSystemInfo'] as SystemInfo | null
+    return this.$store.state.server.system_info
   }
 
   get canControlHost (): boolean {
diff --git a/src/components/layout/AppBar.vue b/src/components/layout/AppBar.vue
index 819e126eea..170b81e11a 100644
--- a/src/components/layout/AppBar.vue
+++ b/src/components/layout/AppBar.vue
@@ -182,7 +182,7 @@ import ServicesMixin from '@/mixins/services'
 import FilesMixin from '@/mixins/files'
 import BrowserMixin from '@/mixins/browser'
 import { SocketActions } from '@/api/socketActions'
-import type { OutputPin } from '@/store/printer/types'
+import type { KlipperPrinterConfig, OutputPin } from '@/store/printer/types'
 import type { Device } from '@/store/power/types'
 import { encodeGcodeParamValue } from '@/util/gcode-helpers'
 
@@ -212,11 +212,11 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
   }
 
   get saveConfigPending (): boolean {
-    return this.$store.getters['printer/getSaveConfigPending'] as boolean
+    return this.$store.getters['printer/getSaveConfigPending']
   }
 
-  get saveConfigPendingItems (): Record<string, Record<string, string>> {
-    return this.$store.getters['printer/getSaveConfigPendingItems'] as Record<string, Record<string, string>>
+  get saveConfigPendingItems (): KlipperPrinterConfig {
+    return this.$store.getters['printer/getSaveConfigPendingItems']
   }
 
   get showSaveConfigAndRestartForPendingChanges (): boolean {
@@ -263,7 +263,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
 
     switch (type) {
       case 'klipper': {
-        const device = this.$store.getters['printer/getPinByName'](name) as OutputPin | undefined
+        const device: OutputPin | undefined = this.$store.getters['printer/getPinByName'](name)
 
         if (!device) return null
 
@@ -275,7 +275,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
       }
 
       default: {
-        const device = this.$store.getters['power/getDeviceByName'](topNavPowerToggle) as Device | undefined
+        const device: Device | undefined = this.$store.getters['power/getDeviceByName'](topNavPowerToggle)
 
         if (!device) return null
 
diff --git a/src/components/layout/AppToolsDrawer.vue b/src/components/layout/AppToolsDrawer.vue
index 8ad62ce7b8..de720c99c5 100644
--- a/src/components/layout/AppToolsDrawer.vue
+++ b/src/components/layout/AppToolsDrawer.vue
@@ -45,7 +45,7 @@ export default class AppToolsDrawer extends Mixins(StateMixin) {
   }
 
   get serverInfo () {
-    return this.$store.getters['server/getInfo']
+    return this.$store.state.server.info
   }
 
   get hasUpdates (): boolean {
diff --git a/src/components/layout/AppUploadAndPrintBtn.vue b/src/components/layout/AppUploadAndPrintBtn.vue
index 001478a780..ce32ce66c4 100644
--- a/src/components/layout/AppUploadAndPrintBtn.vue
+++ b/src/components/layout/AppUploadAndPrintBtn.vue
@@ -41,7 +41,7 @@ export default class AppUploadAndPrintBtn extends Vue {
   readonly uploadFile!: HTMLInputElement
 
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties']('gcodes') as RootProperties
+    return this.$store.getters['files/getRootProperties']('gcodes')
   }
 
   get accepts () {
diff --git a/src/components/layout/AppUserMenu.vue b/src/components/layout/AppUserMenu.vue
index 0119fb7494..b3cc74cee3 100644
--- a/src/components/layout/AppUserMenu.vue
+++ b/src/components/layout/AppUserMenu.vue
@@ -86,11 +86,12 @@
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
 import { startCase, capitalize } from 'lodash-es'
+import type { AppUser } from '@/store/auth/types'
 
 @Component({})
 export default class AppNotificationMenu extends Vue {
-  get user () {
-    return this.$store.getters['auth/getCurrentUser']
+  get user (): AppUser | null {
+    return this.$store.state.auth.currentUser
   }
 
   get currentUser () {
diff --git a/src/components/settings/GeneralSettings.vue b/src/components/settings/GeneralSettings.vue
index 5f4bfb4fe3..11b67b36d5 100644
--- a/src/components/settings/GeneralSettings.vue
+++ b/src/components/settings/GeneralSettings.vue
@@ -399,7 +399,7 @@ export default class GeneralSettings extends Mixins(StateMixin) {
   }
 
   get printerPowerDevicesList () {
-    const devices = this.$store.getters['power/getDevices'] as Device[]
+    const devices: Device[] = this.$store.getters['power/getDevices']
 
     const deviceEntries = devices.map(device => ({
       text: `${this.$filters.prettyCase(device.device)} (${device.type})`,
@@ -432,7 +432,7 @@ export default class GeneralSettings extends Mixins(StateMixin) {
   }
 
   get topNavPowerToggleDevicesList () {
-    const devices = this.$store.getters['power/getDevices'] as Device[]
+    const devices: Device[] = this.$store.getters['power/getDevices']
     const deviceEntries = devices.length
       ? [
           { header: 'Moonraker' },
@@ -443,7 +443,7 @@ export default class GeneralSettings extends Mixins(StateMixin) {
         ]
       : []
 
-    const pins = this.$store.getters['printer/getPins'] as OutputPin[]
+    const pins: OutputPin[] = this.$store.getters['printer/getPins']
     const pinEntries = pins.length
       ? [
           { header: 'Klipper' },
diff --git a/src/components/settings/PendingChangesDialog.vue b/src/components/settings/PendingChangesDialog.vue
index 0ea7178d20..223607062b 100644
--- a/src/components/settings/PendingChangesDialog.vue
+++ b/src/components/settings/PendingChangesDialog.vue
@@ -20,6 +20,7 @@
 </template>
 
 <script lang="ts">
+import type { KlipperPrinterConfig } from '@/store/printer/types'
 import { Component, Vue, VModel } from 'vue-property-decorator'
 
 @Component({})
@@ -28,7 +29,7 @@ export default class PendingChangesDialog extends Vue {
   open?: boolean
 
   get saveConfigPendingItems () {
-    const saveConfigPendingItems = this.$store.getters['printer/getSaveConfigPendingItems'] as Record<string, Record<string, string>>
+    const saveConfigPendingItems: KlipperPrinterConfig = this.$store.getters['printer/getSaveConfigPendingItems']
 
     const { changed, deleted } = Object.entries(saveConfigPendingItems)
       .reduce((previous, [sectionName, sectionEntries]) => {
diff --git a/src/components/settings/SpoolmanSettings.vue b/src/components/settings/SpoolmanSettings.vue
index 4ea27d65ac..ff218950af 100644
--- a/src/components/settings/SpoolmanSettings.vue
+++ b/src/components/settings/SpoolmanSettings.vue
@@ -148,7 +148,7 @@ export default class SpoolmanSettings extends Mixins(StateMixin) {
   }
 
   get enabledWebcams (): WebcamConfig[] {
-    return this.$store.getters['webcams/getEnabledWebcams'] as WebcamConfig[]
+    return this.$store.getters['webcams/getEnabledWebcams']
   }
 
   get supportedCameras (): Array<{ text?: string, value: string | null, disabled?: boolean }> {
diff --git a/src/components/settings/ToolheadSettings.vue b/src/components/settings/ToolheadSettings.vue
index 464a2ef3e8..73d6342f8d 100644
--- a/src/components/settings/ToolheadSettings.vue
+++ b/src/components/settings/ToolheadSettings.vue
@@ -386,6 +386,7 @@ import { defaultState } from '@/store/config/state'
 import type { VInput } from '@/types'
 import ToolheadMixin from '@/mixins/toolhead'
 import type { ToolheadControlStyle } from '@/store/config/types'
+import type { KlipperPrinterSettings } from '@/store/printer/types'
 
 @Component({
   components: {}
@@ -662,7 +663,9 @@ export default class ToolHeadSettings extends Mixins(ToolheadMixin) {
   }
 
   get printerSupportsForceMove (): boolean {
-    return this.$store.getters['printer/getPrinterSettings']('force_move.enable_force_move') ?? false
+    const printerSettings: KlipperPrinterSettings = this.$store.getters['printer/getPrinterSettings']
+
+    return printerSettings.force_move?.enable_force_move ?? false
   }
 
   get showManualProbeDialogAutomatically (): boolean {
diff --git a/src/components/settings/auth/ApiKeyDialog.vue b/src/components/settings/auth/ApiKeyDialog.vue
index 777afffe69..ff4de6ec1e 100644
--- a/src/components/settings/auth/ApiKeyDialog.vue
+++ b/src/components/settings/auth/ApiKeyDialog.vue
@@ -49,8 +49,8 @@ export default class ApiKeyDialog extends Vue {
   @VModel({ type: Boolean })
   open?: boolean
 
-  get apiKey () {
-    return this.$store.getters['auth/getApiKey']
+  get apiKey (): string {
+    return this.$store.state.auth.apiKey
   }
 
   handleRefreshApiKey () {
diff --git a/src/components/settings/auth/AuthSettings.vue b/src/components/settings/auth/AuthSettings.vue
index de984bffbd..c3239f6649 100644
--- a/src/components/settings/auth/AuthSettings.vue
+++ b/src/components/settings/auth/AuthSettings.vue
@@ -117,13 +117,14 @@ export default class AuthSettings extends Vue {
     open: false
   }
 
-  get users () {
-    return this.$store.getters['auth/getUsers']
+  get users (): AppUser[] {
+    return this.$store.state.auth.users
   }
 
   get currentUser () {
-    const currentUser = this.$store.getters['auth/getCurrentUser']
-    return (currentUser && currentUser.username) ? currentUser.username : ''
+    const currentUser: AppUser | null = this.$store.state.auth.currentUser
+
+    return currentUser?.username ?? ''
   }
 
   handleAddUserDialog () {
diff --git a/src/components/settings/auth/UserPasswordDialog.vue b/src/components/settings/auth/UserPasswordDialog.vue
index f8819d3c90..f3ae791f51 100644
--- a/src/components/settings/auth/UserPasswordDialog.vue
+++ b/src/components/settings/auth/UserPasswordDialog.vue
@@ -61,6 +61,7 @@
 import { httpClientActions } from '@/api/httpClientActions'
 import { Component, Vue, VModel } from 'vue-property-decorator'
 import { EventBus } from '@/eventBus'
+import type { AppUser } from '@/store/auth/types'
 
 @Component({})
 export default class UserPasswordDialog extends Vue {
@@ -73,8 +74,9 @@ export default class UserPasswordDialog extends Vue {
   loading = false
 
   get currentUser () {
-    const currentUser = this.$store.getters['auth/getCurrentUser']
-    return (currentUser && currentUser.username) ? currentUser.username : ''
+    const currentUser: AppUser | null = this.$store.state.auth.currentUser
+
+    return currentUser?.username ?? ''
   }
 
   async handleSave () {
diff --git a/src/components/settings/cameras/CameraSettings.vue b/src/components/settings/cameras/CameraSettings.vue
index 4ae2198bf4..ba429958cf 100644
--- a/src/components/settings/cameras/CameraSettings.vue
+++ b/src/components/settings/cameras/CameraSettings.vue
@@ -113,7 +113,7 @@ export default class CameraSettings extends Vue {
   }
 
   get cameras (): WebcamConfig[] {
-    return this.$store.getters['webcams/getWebcams'] as WebcamConfig[]
+    return this.$store.getters['webcams/getWebcams']
   }
 
   handleEditDialog (camera: WebcamConfig) {
diff --git a/src/components/settings/console/ConsoleFilterDialog.vue b/src/components/settings/console/ConsoleFilterDialog.vue
index 25a6f3a498..44e9b1d439 100644
--- a/src/components/settings/console/ConsoleFilterDialog.vue
+++ b/src/components/settings/console/ConsoleFilterDialog.vue
@@ -121,8 +121,8 @@ export default class ConsoleFilterDialog extends Vue {
     return this.types.find(f => f.value === this.filter?.type) || this.types[0]
   }
 
-  get filters () {
-    return this.$store.getters['console/getFilters']
+  get filters (): ConsoleFilter[] {
+    return this.$store.state.console.consoleFilters
   }
 
   handleSave () {
diff --git a/src/components/settings/console/ConsoleSettings.vue b/src/components/settings/console/ConsoleSettings.vue
index a75da646f2..e66b3454f3 100644
--- a/src/components/settings/console/ConsoleSettings.vue
+++ b/src/components/settings/console/ConsoleSettings.vue
@@ -83,8 +83,8 @@ export default class ConsoleSettings extends Mixins(StateMixin) {
     filter: null
   }
 
-  get filters () {
-    return this.$store.getters['console/getFilters']
+  get filters (): ConsoleFilter[] {
+    return this.$store.state.console.consoleFilters
   }
 
   handleEditFilterDialog (filter: ConsoleFilter | null) {
diff --git a/src/components/settings/macros/MacroSettings.vue b/src/components/settings/macros/MacroSettings.vue
index c295c53370..30ce57d565 100644
--- a/src/components/settings/macros/MacroSettings.vue
+++ b/src/components/settings/macros/MacroSettings.vue
@@ -134,7 +134,7 @@ export default class MacroSettings extends Mixins(StateMixin) {
   }
 
   get categories (): MacroCategory[] {
-    return this.$store.getters['macros/getCategories'] as MacroCategory[]
+    return this.$store.getters['macros/getCategories']
   }
 
   set categories (value: MacroCategory[]) {
diff --git a/src/components/settings/timelapse/TimelapseSettings.vue b/src/components/settings/timelapse/TimelapseSettings.vue
index baa7ebb765..b40ba9b6fc 100644
--- a/src/components/settings/timelapse/TimelapseSettings.vue
+++ b/src/components/settings/timelapse/TimelapseSettings.vue
@@ -154,7 +154,7 @@ export default class TimelapseSettings extends Mixins(StateMixin) {
   }
 
   get cameras (): Array<{ text?: string, value: string, disabled: boolean }> {
-    const cameras = this.$store.getters['webcams/getWebcams'] as WebcamConfig[]
+    const cameras: WebcamConfig[] = this.$store.getters['webcams/getWebcams']
 
     return cameras
       .map(camera => ({
@@ -215,7 +215,7 @@ export default class TimelapseSettings extends Mixins(StateMixin) {
   }
 
   get settings (): TimelapseSettingsType {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettingsType
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
index 97c6f8291b..fb66e9c638 100644
--- a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
+++ b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
@@ -108,7 +108,7 @@ export default class CustomParkPositionSettings extends Mixins(StateMixin) {
   }
 
   get bedSize (): BedSize {
-    const bedSize = this.$store.getters['printer/getBedSize'] as BedSize | undefined
+    const bedSize: BedSize | undefined = this.$store.getters['printer/getBedSize']
 
     return bedSize ?? {
       minX: -Infinity,
@@ -119,7 +119,7 @@ export default class CustomParkPositionSettings extends Mixins(StateMixin) {
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue b/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue
index 80b318a5f4..a523950814 100644
--- a/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue
+++ b/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue
@@ -172,7 +172,7 @@ export default class ParkExtrudeRetractSettings extends Mixins(StateMixin) {
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue b/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue
index 3e36c4ecce..6e634b1b08 100644
--- a/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue
+++ b/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue
@@ -230,7 +230,7 @@ export default class ToolheadParkingSettings extends Mixins(StateMixin) {
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue b/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue
index 55ad2fbced..a1b76d7ff4 100644
--- a/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue
+++ b/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue
@@ -52,7 +52,7 @@ export default class HyperlapseSettings extends Mixins(StateMixin) {
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/widgets/beacon/BeaconCard.vue b/src/components/widgets/beacon/BeaconCard.vue
index 03b305af9d..4dba2a63cc 100644
--- a/src/components/widgets/beacon/BeaconCard.vue
+++ b/src/components/widgets/beacon/BeaconCard.vue
@@ -139,7 +139,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import SaveModelDialog from './SaveModelDialog.vue'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
-import type { BeaconModel, BeaconState } from '@/store/printer/types'
+import type { BeaconModel } from '@/store/printer/types'
 import { encodeGcodeParamValue } from '@/util/gcode-helpers'
 
 @Component({
@@ -156,10 +156,6 @@ export default class BeaconCard extends Mixins(StateMixin, ToolheadMixin) {
   @Prop({ type: Boolean })
   readonly fullscreen?: boolean
 
-  get beacon (): BeaconState {
-    return this.$store.state.printer.printer.beacon
-  }
-
   get beaconModels (): BeaconModel[] {
     return this.$store.getters['printer/getBeaconModels']
   }
@@ -187,18 +183,22 @@ export default class BeaconCard extends Mixins(StateMixin, ToolheadMixin) {
   }
 
   handleOpenSaveDialog () {
+    const existingName = this.$store.state.printer.printer.beacon?.model ?? ''
+
     this.saveDialogState = {
       open: true,
-      existingName: this.beacon.model ?? ''
+      existingName
     }
   }
 
   handleModelSave (config: { name: string; removeDefault: boolean }) {
-    if (config.name !== this.beacon.model) {
+    const modelName = this.$store.state.printer.printer.beacon?.model
+
+    if (config.name !== modelName) {
       this.sendGcode(`BEACON_MODEL_SAVE NAME=${encodeGcodeParamValue(config.name)}`)
     }
-    if (config.removeDefault && this.beacon.model) {
-      this.sendGcode(`BEACON_MODEL_REMOVE NAME=${encodeGcodeParamValue(this.beacon.model)}`)
+    if (config.removeDefault && modelName) {
+      this.sendGcode(`BEACON_MODEL_REMOVE NAME=${encodeGcodeParamValue(modelName)}`)
     }
   }
 }
diff --git a/src/components/widgets/bedmesh/BedMeshCard.vue b/src/components/widgets/bedmesh/BedMeshCard.vue
index b8013e3189..58396a8b1c 100644
--- a/src/components/widgets/bedmesh/BedMeshCard.vue
+++ b/src/components/widgets/bedmesh/BedMeshCard.vue
@@ -225,7 +225,7 @@ export default class BedMeshCard extends Mixins(StateMixin, ToolheadMixin, Brows
 
   // The current processed mesh data, if any.
   get mesh (): AppMeshes {
-    return this.$store.getters['mesh/getCurrentMeshData'] as AppMeshes
+    return this.$store.getters['mesh/getCurrentMeshData']
   }
 
   get canCopyImage () {
diff --git a/src/components/widgets/bedmesh/BedMeshChart.vue b/src/components/widgets/bedmesh/BedMeshChart.vue
index 97095729d9..c3ccb14726 100644
--- a/src/components/widgets/bedmesh/BedMeshChart.vue
+++ b/src/components/widgets/bedmesh/BedMeshChart.vue
@@ -46,7 +46,7 @@ export default class BedMeshChart extends Mixins(BrowserMixin) {
   }
 
   get bedSize (): BedSize | undefined {
-    return this.$store.getters['printer/getBedSize'] as BedSize | undefined
+    return this.$store.getters['printer/getBedSize']
   }
 
   @Watch('flatSurface')
diff --git a/src/components/widgets/bedmesh/BedMeshControls.vue b/src/components/widgets/bedmesh/BedMeshControls.vue
index 2e8b35a627..467682e55c 100644
--- a/src/components/widgets/bedmesh/BedMeshControls.vue
+++ b/src/components/widgets/bedmesh/BedMeshControls.vue
@@ -274,10 +274,10 @@ import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
 import type {
   MeshState,
-  KlipperBedMesh,
   MatrixType,
   BedMeshProfileListEntry
 } from '@/store/mesh/types'
+import type { KlipperPrinterBedMeshState, KlipperPrinterSettings } from '@/store/printer/types'
 import { encodeGcodeParamValue } from '@/util/gcode-helpers'
 
 @Component({
@@ -345,18 +345,19 @@ export default class BedMesh extends Mixins(StateMixin, ToolheadMixin) {
   }
 
   // The current mesh, unprocessed.
-  get currentMesh (): KlipperBedMesh {
+  get currentMesh (): KlipperPrinterBedMeshState | undefined {
     return this.$store.state.printer.printer.bed_mesh
   }
 
   // If we have a mesh loaded.
   get meshLoaded (): boolean {
-    return ('profile_name' in this.currentMesh && this.currentMesh.profile_name.length > 0)
+    return !!this.currentMesh?.profile_name
   }
 
   // If the printer supports QGL
   get printerSupportsQgl (): boolean {
-    const printerSettings = this.$store.getters['printer/getPrinterSettings']()
+    const printerSettings: KlipperPrinterSettings = this.$store.getters['printer/getPrinterSettings']
+
     return 'quad_gantry_level' in printerSettings
   }
 
@@ -396,19 +397,29 @@ export default class BedMesh extends Mixins(StateMixin, ToolheadMixin) {
   }
 
   handleMeshSave (config: { name: string; removeDefault: boolean }) {
-    if (config.name !== this.currentMesh.profile_name) {
+    const profileName = this.currentMesh?.profile_name
+
+    if (config.name !== profileName) {
       this.sendGcode(`BED_MESH_PROFILE SAVE=${encodeGcodeParamValue(config.name)}`)
     }
-    if (config.removeDefault) {
-      this.sendGcode(`BED_MESH_PROFILE REMOVE=${encodeGcodeParamValue(this.currentMesh.profile_name)}`)
+
+    if (config.removeDefault && profileName) {
+      this.sendGcode(`BED_MESH_PROFILE REMOVE=${encodeGcodeParamValue(profileName)}`)
     }
   }
 
   handleOpenSaveDialog () {
-    const profile = this.bedMeshProfiles.find(mesh => mesh.name === this.currentMesh.profile_name)
+    const profileName = this.currentMesh?.profile_name
+
+    if (!profileName) {
+      return
+    }
+
+    const profile = this.bedMeshProfiles.find(mesh => mesh.name === profileName)
+
     this.saveDialogState = {
       open: true,
-      existingName: this.currentMesh.profile_name,
+      existingName: profileName,
       adaptive: profile?.adaptive ?? false
     }
   }
diff --git a/src/components/widgets/camera/CameraCard.vue b/src/components/widgets/camera/CameraCard.vue
index 8e690c6fcb..0364b9b8dd 100644
--- a/src/components/widgets/camera/CameraCard.vue
+++ b/src/components/widgets/camera/CameraCard.vue
@@ -62,7 +62,7 @@ export default class CameraCard extends Mixins(StateMixin) {
   }
 
   get cameras (): WebcamConfig[] {
-    return this.$store.getters['webcams/getVisibleWebcams'] as WebcamConfig[]
+    return this.$store.getters['webcams/getVisibleWebcams']
   }
 
   handleCameraSelect (id: string) {
diff --git a/src/components/widgets/camera/CameraMenu.vue b/src/components/widgets/camera/CameraMenu.vue
index 4f8d614c03..5a4a28c1d7 100644
--- a/src/components/widgets/camera/CameraMenu.vue
+++ b/src/components/widgets/camera/CameraMenu.vue
@@ -59,7 +59,7 @@ import type { WebcamConfig } from '@/store/webcams/types'
 export default class CamerasMenu extends Mixins(StateMixin) {
   get activeCamera () {
     const activeWebcam: string = this.$store.state.webcams.activeWebcam
-    const camera = this.$store.getters['webcams/getWebcamById'](activeWebcam) as WebcamConfig | undefined
+    const camera: WebcamConfig | undefined = this.$store.getters['webcams/getWebcamById'](activeWebcam)
 
     return !camera
       ? this.$t('app.general.btn.all')
@@ -67,7 +67,7 @@ export default class CamerasMenu extends Mixins(StateMixin) {
   }
 
   get enabledWebcams (): WebcamConfig[] {
-    return this.$store.getters['webcams/getEnabledWebcams'] as WebcamConfig[]
+    return this.$store.getters['webcams/getEnabledWebcams']
   }
 
   get availableCameras (): Pick<WebcamConfig, 'uid' | 'name'>[] {
diff --git a/src/components/widgets/console/ConsoleCard.vue b/src/components/widgets/console/ConsoleCard.vue
index bc515ba402..b33ff49198 100644
--- a/src/components/widgets/console/ConsoleCard.vue
+++ b/src/components/widgets/console/ConsoleCard.vue
@@ -146,7 +146,7 @@ export default class ConsoleCard extends Vue {
   scrollingPaused = false
 
   get filters (): ConsoleFilter[] {
-    return this.$store.getters['console/getFilters'] as ConsoleFilter[]
+    return this.$store.state.console.consoleFilters
   }
 
   get hideTempWaits (): boolean {
diff --git a/src/components/widgets/console/ConsoleCommand.vue b/src/components/widgets/console/ConsoleCommand.vue
index 91904f421e..97f55b0107 100644
--- a/src/components/widgets/console/ConsoleCommand.vue
+++ b/src/components/widgets/console/ConsoleCommand.vue
@@ -123,7 +123,7 @@ export default class ConsoleCommand extends Vue {
   }
 
   get availableCommands (): GcodeCommands {
-    return this.$store.getters['printer/getAvailableCommands'] as GcodeCommands
+    return this.$store.getters['printer/getAvailableCommands']
   }
 
   autoComplete () {
diff --git a/src/components/widgets/console/ConsoleItem.vue b/src/components/widgets/console/ConsoleItem.vue
index 9a1eae3514..a6e154a21c 100644
--- a/src/components/widgets/console/ConsoleItem.vue
+++ b/src/components/widgets/console/ConsoleItem.vue
@@ -24,8 +24,8 @@ export default class ConsoleItem extends Vue {
   @Prop({ type: Object, default: () => {} })
   readonly value!: ConsoleEntry
 
-  get knownCommands () {
-    return this.$store.getters['console/getAllKnownCommands'] as GcodeHelp
+  get knownCommands (): GcodeHelp {
+    return this.$store.getters['console/getAllKnownCommands']
   }
 
   get itemMessage () {
diff --git a/src/components/widgets/endstops/EndStopsCard.vue b/src/components/widgets/endstops/EndStopsCard.vue
index 72fca4bdef..191cd7a3bd 100644
--- a/src/components/widgets/endstops/EndStopsCard.vue
+++ b/src/components/widgets/endstops/EndStopsCard.vue
@@ -49,18 +49,22 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import { SocketActions } from '@/api/socketActions'
-import type { Endstop, Probe } from '@/store/printer/types'
+import type { Endstop, KlipperPrinterProbeState } from '@/store/printer/types'
 
 @Component({
   components: {}
 })
 export default class EndStopsCard extends Mixins(StateMixin) {
   get endstops (): Endstop[] {
-    return this.$store.getters['printer/getEndstops'] as Endstop[]
+    return this.$store.getters['printer/getEndstops']
   }
 
-  get probe (): Probe | undefined {
-    return this.$store.getters['printer/getProbe'] as Probe | undefined
+  get hasSteppers () {
+    return this.$store.getters['printer/getSteppers'].length > 0
+  }
+
+  get probe (): KlipperPrinterProbeState | undefined {
+    return this.$store.getters['printer/getProbe']
   }
 
   get endstopsAndProbes () {
@@ -70,7 +74,7 @@ export default class EndStopsCard extends Mixins(StateMixin) {
     if (probe !== undefined) {
       endstopsAndProbes.push({
         name: 'Probe',
-        state: probe.last_query ? 'triggered' : 'open'
+        state: probe.last_query ? 'TRIGGERED' : 'open'
       })
     }
 
@@ -83,7 +87,9 @@ export default class EndStopsCard extends Mixins(StateMixin) {
   }
 
   queryEndstops () {
-    SocketActions.printerQueryEndstops()
+    if (this.hasSteppers) {
+      SocketActions.printerQueryEndstops()
+    }
 
     if (this.probe !== undefined) {
       this.sendGcode('QUERY_PROBE', this.$waits.onQueryProbe)
diff --git a/src/components/widgets/exclude-objects/ExcludeObjects.vue b/src/components/widgets/exclude-objects/ExcludeObjects.vue
index 5881873808..ba47eadbc1 100644
--- a/src/components/widgets/exclude-objects/ExcludeObjects.vue
+++ b/src/components/widgets/exclude-objects/ExcludeObjects.vue
@@ -49,8 +49,8 @@ export default class ExcludeObjects extends Mixins(StateMixin) {
   @Prop({ type: String })
   readonly shapeRendering?: string
 
-  get parts () {
-    return this.$store.getters['printer/getExcludeObjectParts'] as ExcludeObjectPart[]
+  get parts (): ExcludeObjectPart[] {
+    return this.$store.getters['printer/getExcludeObjectParts']
   }
 
   iconClasses (part: ExcludeObjectPart) {
diff --git a/src/components/widgets/exclude-objects/ExcludeObjectsDialog.vue b/src/components/widgets/exclude-objects/ExcludeObjectsDialog.vue
index 8117aa1148..efb60f9c99 100644
--- a/src/components/widgets/exclude-objects/ExcludeObjectsDialog.vue
+++ b/src/components/widgets/exclude-objects/ExcludeObjectsDialog.vue
@@ -54,7 +54,7 @@ export default class ExcludeObjectDialog extends Mixins(StateMixin) {
   open?: boolean
 
   get parts (): ExcludeObjectPart[] {
-    return this.$store.getters['printer/getExcludeObjectParts'] as ExcludeObjectPart[]
+    return this.$store.getters['printer/getExcludeObjectParts']
   }
 
   async cancelObject (name: string) {
diff --git a/src/components/widgets/filesystem/FileEditor.vue b/src/components/widgets/filesystem/FileEditor.vue
index ba672b1ffd..e7c5acce03 100644
--- a/src/components/widgets/filesystem/FileEditor.vue
+++ b/src/components/widgets/filesystem/FileEditor.vue
@@ -54,7 +54,7 @@ export default class FileEditor extends Mixins(BrowserMixin) {
   }
 
   get activeInstance (): InstanceConfig {
-    return this.$store.getters['config/getCurrentInstance'] as InstanceConfig
+    return this.$store.getters['config/getCurrentInstance']
   }
 
   get restoreViewStateStorage (): Storage | undefined {
diff --git a/src/components/widgets/filesystem/FileSystem.vue b/src/components/widgets/filesystem/FileSystem.vue
index 62e47e1b4f..3bfba3e3f0 100644
--- a/src/components/widgets/filesystem/FileSystem.vue
+++ b/src/components/widgets/filesystem/FileSystem.vue
@@ -287,7 +287,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
 
   // Properties of the current root.
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties'](this.currentRoot) as RootProperties
+    return this.$store.getters['files/getRootProperties'](this.currentRoot)
   }
 
   // If this root is available or not.
@@ -440,7 +440,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
     ]
 
     const key = `${this.currentRoot}_${this.name}`
-    const mergedTableHeaders = this.$store.getters['config/getMergedTableHeaders'](headers, key) as AppTableHeader[]
+    const mergedTableHeaders: AppTableHeader[] = this.$store.getters['config/getMergedTableHeaders'](headers, key)
 
     return mergedTableHeaders
   }
@@ -537,7 +537,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
   }
 
   getAllFiles () {
-    const items = this.$store.getters['files/getDirectory'](this.currentPath) as FileBrowserEntry[] | undefined
+    const items: FileBrowserEntry[] | undefined = this.$store.getters['files/getDirectory'](this.currentPath)
 
     return items ?? []
   }
diff --git a/src/components/widgets/filesystem/FileSystemAddMenu.vue b/src/components/widgets/filesystem/FileSystemAddMenu.vue
index 009923e7b0..8969c8b53e 100644
--- a/src/components/widgets/filesystem/FileSystemAddMenu.vue
+++ b/src/components/widgets/filesystem/FileSystemAddMenu.vue
@@ -139,7 +139,7 @@ export default class FileSystemAddMenu extends Mixins(StateMixin) {
   andPrint = false
 
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties'](this.root) as RootProperties
+    return this.$store.getters['files/getRootProperties'](this.root)
   }
 
   get accepts () {
diff --git a/src/components/widgets/filesystem/FileSystemBrowser.vue b/src/components/widgets/filesystem/FileSystemBrowser.vue
index 2a28415b40..399125323a 100644
--- a/src/components/widgets/filesystem/FileSystemBrowser.vue
+++ b/src/components/widgets/filesystem/FileSystemBrowser.vue
@@ -302,7 +302,7 @@ export default class FileSystemBrowser extends Mixins(FilesMixin) {
   }
 
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties'](this.root) as RootProperties
+    return this.$store.getters['files/getRootProperties'](this.root)
   }
 
   get readonly () {
diff --git a/src/components/widgets/filesystem/FileSystemContextMenu.vue b/src/components/widgets/filesystem/FileSystemContextMenu.vue
index 102071f8ee..f8dca3f153 100644
--- a/src/components/widgets/filesystem/FileSystemContextMenu.vue
+++ b/src/components/widgets/filesystem/FileSystemContextMenu.vue
@@ -216,7 +216,7 @@ export default class FileSystemContextMenu extends Mixins(StateMixin, FilesMixin
   readonly positionY!: number
 
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties'](this.root) as RootProperties
+    return this.$store.getters['files/getRootProperties'](this.root)
   }
 
   get canPrint () {
diff --git a/src/components/widgets/filesystem/FileSystemFilterMenu.vue b/src/components/widgets/filesystem/FileSystemFilterMenu.vue
index 18c1654d03..caa5fe86b6 100644
--- a/src/components/widgets/filesystem/FileSystemFilterMenu.vue
+++ b/src/components/widgets/filesystem/FileSystemFilterMenu.vue
@@ -83,7 +83,7 @@ export default class FileSystemFilterMenu extends Vue {
   readonly disabled?: boolean
 
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties'](this.root) as RootProperties
+    return this.$store.getters['files/getRootProperties'](this.root)
   }
 
   get filters (): FileFilter[] {
diff --git a/src/components/widgets/filesystem/FileSystemGoToFileDialog.vue b/src/components/widgets/filesystem/FileSystemGoToFileDialog.vue
index d7dec202e1..631db2a185 100644
--- a/src/components/widgets/filesystem/FileSystemGoToFileDialog.vue
+++ b/src/components/widgets/filesystem/FileSystemGoToFileDialog.vue
@@ -66,7 +66,7 @@ export default class FileSystemGoToFileDialog extends Mixins(StateMixin) {
   loaded = false
 
   get rootFiles (): MoonrakerRootFile[] {
-    return this.$store.getters['files/getRootFiles'](this.root) as MoonrakerRootFile[]
+    return this.$store.getters['files/getRootFiles'](this.root)
   }
 
   get matchedFiles (): File[] {
@@ -96,7 +96,7 @@ export default class FileSystemGoToFileDialog extends Mixins(StateMixin) {
   }
 
   get loading (): boolean {
-    return this.hasWait(`${this.$waits.onFileSystem}/${this.root}/`) as boolean
+    return this.hasWait(`${this.$waits.onFileSystem}/${this.root}/`)
   }
 
   @Watch('loading')
diff --git a/src/components/widgets/filesystem/FileSystemToolbar.vue b/src/components/widgets/filesystem/FileSystemToolbar.vue
index 4c580524e5..00d3e13f69 100644
--- a/src/components/widgets/filesystem/FileSystemToolbar.vue
+++ b/src/components/widgets/filesystem/FileSystemToolbar.vue
@@ -213,7 +213,7 @@ export default class FileSystemToolbar extends Mixins(StatesMixin) {
 
   // Properties of the current root.
   get rootProperties (): RootProperties {
-    return this.$store.getters['files/getRootProperties'](this.root) as RootProperties
+    return this.$store.getters['files/getRootProperties'](this.root)
   }
 
   get thumbnailSize (): number {
diff --git a/src/components/widgets/filesystem/setupMonaco.ts b/src/components/widgets/filesystem/setupMonaco.ts
index c7e36096f9..c23430b8c4 100644
--- a/src/components/widgets/filesystem/setupMonaco.ts
+++ b/src/components/widgets/filesystem/setupMonaco.ts
@@ -117,7 +117,7 @@ async function setupMonaco () {
   })
 
   const app = getVueApp()
-  const klippyApp = app.$store.getters['printer/getKlippyApp'] as KlippyApp
+  const klippyApp: KlippyApp = app.$store.getters['printer/getKlippyApp']
 
   monaco.editor.registerCommand('fluidd_open_docs', (_, service: CodeLensSupportedService, hash: string) => {
     const serviceKey = service.replace(/-/g, '_')
diff --git a/src/components/widgets/gcode-preview/GcodePreview.vue b/src/components/widgets/gcode-preview/GcodePreview.vue
index 9656f1b099..80563e3d9b 100644
--- a/src/components/widgets/gcode-preview/GcodePreview.vue
+++ b/src/components/widgets/gcode-preview/GcodePreview.vue
@@ -326,7 +326,7 @@ import type { BBox, Layer, LayerNr, LayerPaths } from '@/store/gcodePreview/type
 import AppFocusableContainer from '@/components/ui/AppFocusableContainer.vue'
 import ExcludeObjects from '@/components/widgets/exclude-objects/ExcludeObjects.vue'
 import GcodePreviewButton from './GcodePreviewButton.vue'
-import type { AppFile } from '@/store/files/types'
+import type { AppFile, AppFileWithMeta } from '@/store/files/types'
 import type { BedSize } from '@/store/printer/types'
 
 @Component({
@@ -362,7 +362,7 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get filePosition (): number {
-    return this.$store.state.printer.printer.virtual_sdcard.file_position
+    return this.$store.state.printer.printer.virtual_sdcard?.file_position ?? 0
   }
 
   get extrusionLineWidth (): number {
@@ -504,7 +504,11 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get hasExcludeObjectParts (): boolean {
-    return this.$store.getters['printer/getHasExcludeObjectParts'] as boolean
+    return this.$store.getters['printer/getHasExcludeObjectParts']
+  }
+
+  get printerFile (): AppFileWithMeta | undefined {
+    return this.$store.getters['printer/getPrinterFile']
   }
 
   get showExcludeObjects (): boolean {
@@ -518,13 +522,13 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
       return true
     }
 
-    const printerFile: AppFile = this.$store.state.printer.printer.current_file
-
-    if (printerFile.filename) {
-      return `${file.path}/${file.filename}` === `${printerFile.path}/${printerFile.filename}`
-    }
+    const printerFile = this.printerFile
 
-    return false
+    return (
+      printerFile != null &&
+      file.path === printerFile.path &&
+      file.filename === printerFile.filename
+    )
   }
 
   get flipX (): boolean {
@@ -552,11 +556,11 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get hasRoundBed (): boolean {
-    return this.$store.getters['printer/getHasRoundBed'] as boolean
+    return this.$store.getters['printer/getHasRoundBed']
   }
 
   get bedSize (): BedSize {
-    const bedSize = this.$store.getters['printer/getBedSize'] as BedSize | undefined
+    const bedSize: BedSize | undefined = this.$store.getters['printer/getBedSize']
 
     return bedSize ?? {
       minX: 0,
@@ -622,7 +626,7 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
       return this.defaultLayerPaths
     }
 
-    const layer = this.$store.getters['gcodePreview/getLayers'][this.layer] as Layer | undefined
+    const layer: Layer | undefined = this.$store.getters['gcodePreview/getLayers'][this.layer]
 
     if (this.followProgress) {
       const end = this.$store.getters['gcodePreview/getMoveIndexByFilePosition'](this.filePosition)
@@ -650,7 +654,7 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get svgPathNext (): LayerPaths {
-    const layers = this.$store.getters['gcodePreview/getLayers'] as Layer[]
+    const layers: Layer[] = this.$store.getters['gcodePreview/getLayers']
 
     if (this.disabled || this.layer >= layers.length) {
       return this.defaultLayerPaths
@@ -660,15 +664,15 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get svgPathParts (): string[] {
-    return this.$store.getters['gcodePreview/getPartPaths'] as string[]
+    return this.$store.getters['gcodePreview/getPartPaths']
   }
 
   get file (): AppFile | undefined {
-    return this.$store.getters['gcodePreview/getFile'] as AppFile | undefined
+    return this.$store.state.gcodePreview.file
   }
 
   get bounds (): BBox {
-    return this.$store.getters['gcodePreview/getBounds'] as BBox
+    return this.$store.getters['gcodePreview/getBounds']
   }
 
   @Watch('focused')
diff --git a/src/components/widgets/gcode-preview/GcodePreviewCard.vue b/src/components/widgets/gcode-preview/GcodePreviewCard.vue
index 8ee75b33ef..fa5c6b00d8 100644
--- a/src/components/widgets/gcode-preview/GcodePreviewCard.vue
+++ b/src/components/widgets/gcode-preview/GcodePreviewCard.vue
@@ -146,8 +146,8 @@ import FilesMixin from '@/mixins/files'
 import BrowserMixin from '@/mixins/browser'
 import GcodePreview from './GcodePreview.vue'
 import GcodePreviewParserProgressDialog from './GcodePreviewParserProgressDialog.vue'
-import type { AppFile } from '@/store/files/types'
-import type { MinMax } from '@/store/gcodePreview/types'
+import type { AppFile, AppFileWithMeta } from '@/store/files/types'
+import type { MinMax, Move } from '@/store/gcodePreview/types'
 import { getFileDataTransferDataFromDataTransfer, hasFileDataTransferTypeInDataTransfer } from '@/util/file-data-transfer'
 import consola from 'consola'
 import { encodeGcodeParamValue } from '@/util/gcode-helpers'
@@ -199,7 +199,7 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
   @Watch('filePosition')
   onFilePositionChanged () {
     if (this.followProgress) {
-      const moves = this.$store.getters['gcodePreview/getMoves']
+      const moves = this.moves
 
       if (moves.length === 0) {
         return
@@ -235,11 +235,19 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
   }
 
   @Watch('printerFile')
-  onPrintFileChanged () {
+  onPrinterFileChanged (value: AppFileWithMeta | undefined, oldValue: AppFileWithMeta | undefined) {
     if (this.autoLoadOnPrintStart &&
-      this.printerFile &&
+      value != null &&
+      (
+        oldValue == null ||
+        (
+          value.path !== oldValue.path &&
+          value.filename !== oldValue.filename
+        )
+      ) &&
       ['paused', 'printing'].includes(this.printerState) &&
-      !this.printerFileLoaded) {
+      !this.printerFileLoaded
+    ) {
       this.loadCurrent()
     }
   }
@@ -256,15 +264,19 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
   }
 
   get file (): AppFile | undefined {
-    return this.$store.getters['gcodePreview/getFile']
+    return this.$store.state.gcodePreview.file
+  }
+
+  get moves (): Move[] {
+    return this.$store.state.gcodePreview.moves
   }
 
   get fileLoaded (): boolean {
-    return this.$store.getters['gcodePreview/getMoves'].length > 0
+    return this.moves.length > 0
   }
 
   get parserProgress (): number {
-    return this.$store.getters['gcodePreview/getParserProgress']
+    return this.$store.state.gcodePreview.parserProgress
   }
 
   get showParserProgressDialog (): boolean {
@@ -272,7 +284,7 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
   }
 
   get filePosition (): number {
-    return this.$store.state.printer.printer.virtual_sdcard.file_position
+    return this.$store.state.printer.printer.virtual_sdcard?.file_position ?? 0
   }
 
   get fileProgressLayerNr (): number {
@@ -300,7 +312,7 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
   }
 
   get currentLayerMoveRange (): MinMax {
-    const moves = this.$store.getters['gcodePreview/getMoves']
+    const moves = this.moves
 
     if (moves.length === 0) {
       return {
@@ -362,20 +374,23 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
     }
   }
 
-  get printerFile (): AppFile | undefined {
-    const currentFile = this.$store.state.printer.printer.current_file
-
-    if (currentFile.filename) {
-      return currentFile
-    }
+  get printerFile (): AppFileWithMeta | undefined {
+    return this.$store.getters['printer/getPrinterFile']
   }
 
   get printerFileLoaded () {
-    const file = this.$store.getters['gcodePreview/getFile']
+    const file = this.file
     const printerFile = this.printerFile
 
-    if (!file || !printerFile || (file.path + '/' + file.filename) !== (printerFile.path + '/' + printerFile.filename)) {
-      this.followProgress = false
+    if (
+      file == null ||
+      printerFile == null ||
+      file.path !== printerFile.path ||
+      file.filename !== printerFile.filename
+    ) {
+      if (this.followProgress) {
+        this.followProgress = false
+      }
 
       return false
     }
@@ -431,7 +446,7 @@ export default class GcodePreviewCard extends Mixins(StateMixin, FilesMixin, Bro
       const files = getFileDataTransferDataFromDataTransfer(event.dataTransfer, 'jobs')
       const path = files.path ? `gcodes/${files.path}` : 'gcodes'
 
-      const file = this.$store.getters['files/getFile'](path, files.items[0]) as AppFile | undefined
+      const file: AppFile | undefined = this.$store.getters['files/getFile'](path, files.items[0])
 
       if (file) {
         this.loadFile(file)
diff --git a/src/components/widgets/history/JobHistory.vue b/src/components/widgets/history/JobHistory.vue
index 2b0510c905..0f70522aba 100644
--- a/src/components/widgets/history/JobHistory.vue
+++ b/src/components/widgets/history/JobHistory.vue
@@ -209,7 +209,7 @@ export default class JobHistory extends Mixins(FilesMixin) {
       },
     ]
 
-    const mergedTableHeaders = this.$store.getters['config/getMergedTableHeaders'](headers, 'history') as AppTableHeader[]
+    const mergedTableHeaders: AppTableHeader[] = this.$store.getters['config/getMergedTableHeaders'](headers, 'history')
 
     return mergedTableHeaders
   }
@@ -271,7 +271,7 @@ export default class JobHistory extends Mixins(FilesMixin) {
 
   isExpanded (row: HistoryItem) {
     if (this.expanded.length <= 0) return false
-    const r = this.expanded[0] as HistoryItem
+    const r = this.expanded[0]
     return (row.job_id === r.job_id)
   }
 
diff --git a/src/components/widgets/job-queue/JobQueue.vue b/src/components/widgets/job-queue/JobQueue.vue
index 0fd46da362..c7b8986ca4 100644
--- a/src/components/widgets/job-queue/JobQueue.vue
+++ b/src/components/widgets/job-queue/JobQueue.vue
@@ -114,7 +114,7 @@ export default class JobQueue extends Vue {
       }
     ]
 
-    const mergedTableHeaders = this.$store.getters['config/getMergedTableHeaders'](headers, 'job_queue') as AppTableHeader[]
+    const mergedTableHeaders: AppTableHeader[] = this.$store.getters['config/getMergedTableHeaders'](headers, 'job_queue')
 
     return mergedTableHeaders
   }
diff --git a/src/components/widgets/limits/PrinterLimits.vue b/src/components/widgets/limits/PrinterLimits.vue
index c3d9562ed7..f10b5067bf 100644
--- a/src/components/widgets/limits/PrinterLimits.vue
+++ b/src/components/widgets/limits/PrinterLimits.vue
@@ -108,11 +108,16 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import BrowserMixin from '@/mixins/browser'
+import type { KlipperPrinterSettings } from '@/store/printer/types'
 
 @Component({})
 export default class PrinterLimits extends Mixins(StateMixin, BrowserMixin) {
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
+  }
+
   get defaultVelocity (): number {
-    return this.$store.getters['printer/getPrinterSettings']('printer.max_velocity') as number
+    return this.printerSettings.printer?.max_velocity ?? 100
   }
 
   get velocity (): number {
@@ -120,7 +125,7 @@ export default class PrinterLimits extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get defaultAccel (): number {
-    return this.$store.getters['printer/getPrinterSettings']('printer.max_accel')
+    return this.printerSettings.printer?.max_accel ?? 100
   }
 
   get accel (): number {
@@ -128,23 +133,23 @@ export default class PrinterLimits extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get defaultAccelToDecel (): number {
-    const defaultAccelToDecel = this.$store.getters['printer/getPrinterSettings']('printer.max_accel_to_decel') as number | undefined
+    const defaultAccelToDecel = this.printerSettings.printer?.max_accel_to_decel
 
     return defaultAccelToDecel ?? this.defaultAccel / 2
   }
 
-  get accelToDecel (): number | undefined {
+  get accelToDecel (): number | null | undefined {
     return this.$store.state.printer.printer.toolhead.max_accel_to_decel
   }
 
   get defaultMinimumCruiseRatio (): number {
-    const defaultMinimumCruiseRatio = this.$store.getters['printer/getPrinterSettings']('printer.minimum_cruise_ratio') as number | undefined
+    const defaultMinimumCruiseRatio = this.printerSettings.printer?.minimum_cruise_ratio
 
     return Math.round((defaultMinimumCruiseRatio ?? 0.5) * 100)
   }
 
   get minimumCruiseRatio (): number | undefined {
-    const minimumCruiseRatio: number | undefined = this.$store.state.printer.printer.toolhead.minimum_cruise_ratio
+    const minimumCruiseRatio: number | null | undefined = this.$store.state.printer.printer.toolhead.minimum_cruise_ratio
 
     return minimumCruiseRatio != null
       ? Math.round(minimumCruiseRatio * 100)
@@ -152,7 +157,7 @@ export default class PrinterLimits extends Mixins(StateMixin, BrowserMixin) {
   }
 
   get defaultSquareCornerVelocity (): number {
-    return this.$store.getters['printer/getPrinterSettings']('printer.square_corner_velocity') as number || 5
+    return this.printerSettings.printer?.square_corner_velocity ?? 5
   }
 
   get squareCornerVelocity (): number {
diff --git a/src/components/widgets/macros/MacroBtn.vue b/src/components/widgets/macros/MacroBtn.vue
index 66135a516e..4646590aa4 100644
--- a/src/components/widgets/macros/MacroBtn.vue
+++ b/src/components/widgets/macros/MacroBtn.vue
@@ -142,7 +142,7 @@ export default class MacroBtn extends Mixins(StateMixin) {
   }
 
   get klippyApp (): KlippyApp {
-    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
+    return this.$store.getters['printer/getKlippyApp']
   }
 
   get supportsPythonGcodeMacros () {
diff --git a/src/components/widgets/retract/Retract.vue b/src/components/widgets/retract/Retract.vue
index b83fd7bec7..75c4cf27d5 100644
--- a/src/components/widgets/retract/Retract.vue
+++ b/src/components/widgets/retract/Retract.vue
@@ -120,61 +120,63 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import BrowserMixin from '@/mixins/browser'
-import type { KlippyApp } from '@/store/printer/types'
+import type { KlipperPrinterSettings, KlippyApp } from '@/store/printer/types'
 
 @Component({})
 export default class Retract extends Mixins(StateMixin, BrowserMixin) {
-  get retract_length () {
-    return this.$store.state.printer.printer.firmware_retraction.retract_length
+  get retract_length (): number {
+    return this.$store.state.printer.printer.firmware_retraction?.retract_length ?? 0
   }
 
-  get retract_length_max () {
+  get retract_length_max (): number {
     if (this.defaults.retract_length <= 0) return 15
     return Math.round(this.defaults.retract_length * 2 * 100) / 100
   }
 
-  get retract_speed () {
-    return this.$store.state.printer.printer.firmware_retraction.retract_speed
+  get retract_speed (): number {
+    return this.$store.state.printer.printer.firmware_retraction?.retract_speed ?? 0
   }
 
-  get retract_speed_max () {
+  get retract_speed_max (): number {
     if (this.defaults.retract_speed <= 0) return 100
     return Math.round(this.defaults.retract_speed * 2)
   }
 
-  get unretract_speed () {
-    return this.$store.state.printer.printer.firmware_retraction.unretract_speed
+  get unretract_speed (): number {
+    return this.$store.state.printer.printer.firmware_retraction?.unretract_speed ?? 0
   }
 
-  get unretract_speed_max () {
+  get unretract_speed_max (): number {
     if (this.defaults.unretract_speed <= 0) return 100
     return Math.round(this.defaults.unretract_speed * 2)
   }
 
-  get unretract_extra_length () {
-    return this.$store.state.printer.printer.firmware_retraction.unretract_extra_length
+  get unretract_extra_length (): number {
+    return this.$store.state.printer.printer.firmware_retraction?.unretract_extra_length ?? 0
   }
 
-  get unretract_extra_length_max () {
+  get unretract_extra_length_max (): number {
     if (this.defaults.unretract_extra_length <= 0) return 15
     return Math.round(this.defaults.unretract_extra_length * 2 * 100) / 100
   }
 
-  get z_hop_height () {
-    return this.$store.state.printer.printer.firmware_retraction.z_hop_height
+  get z_hop_height (): number {
+    return this.$store.state.printer.printer.firmware_retraction?.z_hop_height ?? 0
   }
 
-  get z_hop_height_max () {
-    if (this.defaults.z_hop_height <= 0) return 2
+  get z_hop_height_max (): number {
+    if (this.defaults.z_hop_height == null || this.defaults.z_hop_height <= 0) return 2
     return Math.round(this.defaults.z_hop_height * 2 * 100) / 100
   }
 
   get defaults () {
-    return this.$store.getters['printer/getPrinterSettings']('firmware_retraction') || {}
+    const printerSettings: KlipperPrinterSettings = this.$store.getters['printer/getPrinterSettings']
+
+    return printerSettings.firmware_retraction!
   }
 
   get klippyApp (): KlippyApp {
-    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
+    return this.$store.getters['printer/getKlippyApp']
   }
 
   get supportsZHopHeight () {
diff --git a/src/components/widgets/sensors/Sensors.vue b/src/components/widgets/sensors/Sensors.vue
index faea2e5166..9bf3f617e0 100644
--- a/src/components/widgets/sensors/Sensors.vue
+++ b/src/components/widgets/sensors/Sensors.vue
@@ -27,7 +27,7 @@ import { Component, Vue } from 'vue-property-decorator'
 @Component({})
 export default class Sensors extends Vue {
   get sensors (): MoonrakerSensor[] {
-    return this.$store.getters['sensors/getSensors'] as MoonrakerSensor[]
+    return this.$store.getters['sensors/getSensors']
   }
 }
 </script>
diff --git a/src/components/widgets/spoolman/QRReader.vue b/src/components/widgets/spoolman/QRReader.vue
index e5a01b9339..567b2f62cc 100644
--- a/src/components/widgets/spoolman/QRReader.vue
+++ b/src/components/widgets/spoolman/QRReader.vue
@@ -124,8 +124,8 @@ export default class QRReader extends Mixins(StateMixin, BrowserMixin) {
     this.processing = false
   }
 
-  get availableSpools () {
-    return this.$store.getters['spoolman/getAvailableSpools']
+  get availableSpools (): Spool[] {
+    return this.$store.state.spoolman.availableSpools
   }
 
   handleCodeFound (code: string) {
diff --git a/src/components/widgets/spoolman/SpoolSelectionDialog.vue b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
index ac788c7d86..c1a8fe58a0 100644
--- a/src/components/widgets/spoolman/SpoolSelectionDialog.vue
+++ b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
@@ -210,6 +210,7 @@ import QrScanner from 'qr-scanner'
 import type { AppTableHeader } from '@/types'
 import getFilePaths from '@/util/get-file-paths'
 import type { DataTableHeader } from 'vuetify'
+import type { KlipperPrinterConfig } from '@/store/printer/types'
 
 @Component({
   components: {
@@ -318,7 +319,7 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
       },
     ]
 
-    const mergedTableHeaders = this.$store.getters['config/getMergedTableHeaders'](headers, 'spoolman') as AppTableHeader[]
+    const mergedTableHeaders: AppTableHeader[] = this.$store.getters['config/getMergedTableHeaders'](headers, 'spoolman')
 
     return mergedTableHeaders
   }
@@ -355,7 +356,7 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
   }
 
   get currentFileName () {
-    return this.filename || this.$store.state.printer.printer.print_stats.filename
+    return this.filename || this.$store.state.printer.printer.print_stats?.filename || ''
   }
 
   get currentFile () {
@@ -368,7 +369,7 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
   }
 
   get enabledWebcams (): WebcamConfig[] {
-    return this.$store.getters['webcams/getEnabledWebcams'] as WebcamConfig[]
+    return this.$store.getters['webcams/getEnabledWebcams']
   }
 
   get availableCameras (): Pick<WebcamConfig, 'uid' | 'name'>[] {
@@ -429,7 +430,8 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
         `SET_GCODE_VARIABLE MACRO=${this.targetMacro} VARIABLE=spool_id VALUE=${this.selectedSpool ?? 'None'}`
       ]
 
-      const supportsSaveVariables = this.$store.getters['printer/getPrinterConfig']('save_variables')
+      const printerConfig: KlipperPrinterConfig = this.$store.getters['printer/getPrinterConfig']
+      const supportsSaveVariables = printerConfig.save_variables
       if (supportsSaveVariables) {
         // persist selected spool across restarts
         commands.push(`SAVE_VARIABLE VARIABLE=${this.targetMacro.toLowerCase()}__spool_id VALUE=${this.selectedSpool ?? 'None'}`)
diff --git a/src/components/widgets/spoolman/SpoolmanCard.vue b/src/components/widgets/spoolman/SpoolmanCard.vue
index 482998fb53..08dd5229b9 100644
--- a/src/components/widgets/spoolman/SpoolmanCard.vue
+++ b/src/components/widgets/spoolman/SpoolmanCard.vue
@@ -206,7 +206,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {
     })
   }
 
-  get selectedCardFields (): string[] {
+  get selectedCardFields (): string[][] {
     const fields = this.$store.state.config.uiSettings.spoolman.selectedCardFields
     const columnCount = fields.length > 1 ? 2 : 1
     const elementsPerColumn = Math.ceil(fields.length / columnCount)
@@ -219,11 +219,11 @@ export default class SpoolmanCard extends Mixins(StateMixin) {
   }
 
   get isConnected (): boolean {
-    return this.$store.getters['spoolman/getConnected']
+    return this.$store.state.spoolman.connected
   }
 
   get targetableMacros (): MacroWithSpoolId[] {
-    const macros = this.$store.getters['macros/getMacros'] as Macro[]
+    const macros: Macro[] = this.$store.getters['macros/getMacros']
 
     return macros
       .filter((macro): macro is MacroWithSpoolId => macro.variables != null && 'spool_id' in macro.variables)
diff --git a/src/components/widgets/stats/PrinterStatsCard.vue b/src/components/widgets/stats/PrinterStatsCard.vue
index 3d9b79aade..a84a31154f 100644
--- a/src/components/widgets/stats/PrinterStatsCard.vue
+++ b/src/components/widgets/stats/PrinterStatsCard.vue
@@ -134,6 +134,7 @@
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator'
 import { SocketActions } from '@/api/socketActions'
+import type { DiskUsage } from '@/store/files/types'
 
 @Component({})
 export default class PrinterStatsCard extends Vue {
@@ -151,8 +152,8 @@ export default class PrinterStatsCard extends Vue {
     return Math.floor((used / total) * 100).toFixed()
   }
 
-  get fileSystemUsage () {
-    return this.$store.getters['files/getUsage']
+  get fileSystemUsage (): DiskUsage {
+    return this.$store.state.files.disk_usage
   }
 
   get supportsHistoryComponent () {
diff --git a/src/components/widgets/status/PauseAtLayerDialog.vue b/src/components/widgets/status/PauseAtLayerDialog.vue
index e9c1ad5894..d6b15f4ed1 100644
--- a/src/components/widgets/status/PauseAtLayerDialog.vue
+++ b/src/components/widgets/status/PauseAtLayerDialog.vue
@@ -115,15 +115,15 @@ export default class PauseAtLayerDialog extends Mixins(StateMixin) {
   }
 
   get setPauseNextLayerMacro () : Macro | undefined {
-    return this.$store.getters['macros/getMacroByName']('SET_PAUSE_NEXT_LAYER') as Macro | undefined
+    return this.$store.getters['macros/getMacroByName']('SET_PAUSE_NEXT_LAYER')
   }
 
   get setPauseAtLayerMacro () : Macro | undefined {
-    return this.$store.getters['macros/getMacroByName']('SET_PAUSE_AT_LAYER') as Macro | undefined
+    return this.$store.getters['macros/getMacroByName']('SET_PAUSE_AT_LAYER')
   }
 
   get setPrintStatsInfoMacro () : Macro | undefined {
-    return this.$store.getters['macros/getMacroByName']('SET_PRINT_STATS_INFO') as Macro | undefined
+    return this.$store.getters['macros/getMacroByName']('SET_PRINT_STATS_INFO')
   }
 
   get printStatsMacroVariables () {
@@ -133,11 +133,11 @@ export default class PauseAtLayerDialog extends Mixins(StateMixin) {
   }
 
   get currentLayer (): number {
-    return this.$store.state.printer.printer.print_stats.info?.current_layer ?? 0
+    return this.$store.state.printer.printer.print_stats?.info?.current_layer ?? 0
   }
 
   get totalLayers (): number {
-    return this.$store.state.printer.printer.print_stats.info?.total_layer ?? 0
+    return this.$store.state.printer.printer.print_stats?.info?.total_layer ?? 0
   }
 
   sendAccept () {
diff --git a/src/components/widgets/status/PauseResumeBtn.vue b/src/components/widgets/status/PauseResumeBtn.vue
index 48c114ad73..efdba6361c 100644
--- a/src/components/widgets/status/PauseResumeBtn.vue
+++ b/src/components/widgets/status/PauseResumeBtn.vue
@@ -83,27 +83,25 @@ import type { Macro } from '@/store/macros/types'
 @Component({})
 export default class PauseResumeBtn extends Mixins(StateMixin) {
   get hasLayersFromPrintStats () {
-    const printStatsInfo = this.$store.state.printer.printer.print_stats.info
-    const layersFromPrintStats = printStatsInfo?.total_layer
-    const layerFromPrintStats = printStatsInfo?.current_layer
+    const { total_layer, current_layer } = this.$store.state.printer.printer.print_stats?.info ?? {}
 
     return (
-      typeof (layersFromPrintStats) === 'number' &&
-      typeof (layerFromPrintStats) === 'number'
+      typeof (total_layer) === 'number' &&
+      typeof (current_layer) === 'number'
     )
   }
 
   get hasPauseAtLayerMacros () {
-    const macro = this.$store.getters['macros/getMacroByName'](
+    const macro: Macro | undefined = this.$store.getters['macros/getMacroByName'](
       'SET_PAUSE_NEXT_LAYER',
       'SET_PAUSE_AT_LAYER'
-    ) as Macro | undefined
+    )
 
     return macro != null
   }
 
   get setPrintStatsInfoMacro (): Macro | undefined {
-    return this.$store.getters['macros/getMacroByName']('SET_PRINT_STATS_INFO') as Macro | undefined
+    return this.$store.getters['macros/getMacroByName']('SET_PRINT_STATS_INFO')
   }
 
   get hasPrintAtLayerMacros () {
diff --git a/src/components/widgets/status/PrinterStatusCard.vue b/src/components/widgets/status/PrinterStatusCard.vue
index 58ddf22e5c..5e2b08d071 100644
--- a/src/components/widgets/status/PrinterStatusCard.vue
+++ b/src/components/widgets/status/PrinterStatusCard.vue
@@ -94,20 +94,19 @@ export default class PrinterStatusCard extends Mixins(StateMixin) {
   }
 
   get collapsable () {
-    const filename = this.$store.state.printer.printer.print_stats.filename
     return (
       this.printerPrinting ||
       this.supportsHistoryComponent ||
-      filename !== ''
+      this.filename !== ''
     )
   }
 
   get filename (): string {
-    return this.$store.state.printer.printer.print_stats.filename
+    return this.$store.state.printer.printer.print_stats?.filename ?? ''
   }
 
   get estimates (): TimeEstimates {
-    return this.$store.getters['printer/getTimeEstimates'] as TimeEstimates
+    return this.$store.getters['printer/getTimeEstimates']
   }
 
   @Watch('filename')
diff --git a/src/components/widgets/status/StatusControls.vue b/src/components/widgets/status/StatusControls.vue
index 1b99777af5..6351624d59 100644
--- a/src/components/widgets/status/StatusControls.vue
+++ b/src/components/widgets/status/StatusControls.vue
@@ -109,15 +109,15 @@ export default class StatusControls extends Mixins(StateMixin) {
   showPauseAtLayerDialog = false
 
   get filename (): string {
-    return this.$store.state.printer.printer.print_stats.filename
+    return this.$store.state.printer.printer.print_stats?.filename ?? ''
   }
 
   get supportsHistoryComponent (): boolean {
-    return this.$store.getters['server/componentSupport']('history') as boolean
+    return this.$store.getters['server/componentSupport']('history')
   }
 
   get hasExcludeObjectParts (): boolean {
-    return this.$store.getters['printer/getHasExcludeObjectParts'] as boolean
+    return this.$store.getters['printer/getHasExcludeObjectParts']
   }
 
   resetFile () {
diff --git a/src/components/widgets/status/StatusTab.vue b/src/components/widgets/status/StatusTab.vue
index ad4d800c05..3c806eb1ca 100644
--- a/src/components/widgets/status/StatusTab.vue
+++ b/src/components/widgets/status/StatusTab.vue
@@ -155,43 +155,43 @@
 
           <!-- After a completed print, with file data and potentially history. -->
           <v-row
-            v-if="overviewVisible"
+            v-if="overviewVisible && printerFile"
             no-gutters
           >
             <v-col>
               <status-label
-                v-if="current_file.history && current_file.history.filament_used"
+                v-if="printerFile.history.filament_used"
                 :label="$t('app.general.label.filament')"
               >
-                <span>{{ $filters.getReadableLengthString(current_file.history.filament_used) }}</span>
+                <span>{{ $filters.getReadableLengthString(printerFile.history.filament_used) }}</span>
               </status-label>
 
               <status-label
-                v-else-if="current_file.filament_total"
+                v-else-if="printerFile.filament_total"
                 :label="$t('app.general.label.filament')"
               >
-                <span>{{ $filters.getReadableLengthString(current_file.filament_total) }}</span>
+                <span>{{ $filters.getReadableLengthString(printerFile.filament_total) }}</span>
               </status-label>
 
               <status-label
-                v-if="current_file.estimated_time"
+                v-if="printerFile.estimated_time"
                 :label="$t('app.general.label.slicer')"
               >
-                <span>{{ $filters.formatCounterSeconds(current_file.estimated_time) }}</span>
+                <span>{{ $filters.formatCounterSeconds(printerFile.estimated_time) }}</span>
               </status-label>
 
               <status-label
-                v-if="current_file.history && current_file.history.print_duration > 0"
+                v-if="printerFile.history.print_duration > 0"
                 :label="$t('app.general.label.actual_time')"
               >
-                <span>{{ $filters.formatCounterSeconds(current_file.history.print_duration) }}</span>
+                <span>{{ $filters.formatCounterSeconds(printerFile.history.print_duration) }}</span>
               </status-label>
 
               <status-label
-                v-if="current_file.history && current_file.history.total_duration > 0"
+                v-if="printerFile.history.total_duration > 0"
                 :label="$t('app.general.label.total')"
               >
-                <span>{{ $filters.formatCounterSeconds(current_file.history.total_duration) }}</span>
+                <span>{{ $filters.formatCounterSeconds(printerFile.history.total_duration) }}</span>
               </status-label>
             </v-col>
           </v-row>
@@ -237,6 +237,7 @@ import ToolheadMixin from '@/mixins/toolhead'
 import FilePreviewDialog from '../filesystem/FilePreviewDialog.vue'
 import type { TimeEstimates } from '@/store/printer/types'
 import type { PrintInProgressLayout } from '@/store/config/types'
+import type { AppFileWithMeta } from '@/store/files/types'
 
 @Component({
   components: {
@@ -261,9 +262,12 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin, ToolheadMi
     return (
       this.printerPrinting ||
       this.message ||
-      (this.current_file && this.current_file.filename) ||
+      this.printerFile != null ||
       this.thumbVisible ||
-      (this.progressVisible && this.$vuetify.breakpoint.mdAndDown)
+      (
+        this.progressVisible &&
+        this.$vuetify.breakpoint.mdAndDown
+      )
     )
   }
 
@@ -283,15 +287,13 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin, ToolheadMi
     // We have a current filename
     return (
       !this.printerPrinting &&
-      this.current_file &&
-      this.current_file.filename
+      this.printerFile != null
     )
   }
 
   get thumbVisible () {
     return (
-      this.current_file &&
-      this.current_file.filename &&
+      this.printerFile != null &&
       this.thumbnail &&
       this.$vuetify.breakpoint.lgAndUp
     )
@@ -301,56 +303,41 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin, ToolheadMi
     return this.$store.state.config.uiSettings.general.printInProgressLayout
   }
 
-  /**
-   * Current file with appended history data if it exists.
-   */
-  get current_file () {
-    let current_file = this.$store.state.printer.printer.current_file
-    if (current_file.job_id) {
-      const history = this.$store.getters['history/getHistoryById'](current_file.job_id)
-      if (history) {
-        current_file = {
-          ...current_file,
-          history
-        }
-      }
-    }
-    return current_file
+  get printerFile (): AppFileWithMeta | undefined {
+    return this.$store.getters['printer/getPrinterFile']
   }
 
   /**
    * Active filename in print_stats
    */
   get filename () {
-    return this.$store.state.printer.printer.print_stats.filename || ''
+    return this.$store.state.printer.printer.print_stats?.filename ?? ''
   }
 
   /**
    * M117 messaging
    */
   get message () {
-    return this.$store.state.printer.printer.display_status.message
+    return this.$store.state.printer.printer.display_status?.message
   }
 
   /**
    * Active thumbnail.
    */
   get thumbnail () {
-    if (
-      this.current_file &&
-      this.current_file.thumbnails
-    ) {
-      const url = this.getThumbUrl(this.current_file, 'gcodes', this.current_file.path, true, this.current_file.modified)
+    if (this.printerFile?.thumbnails) {
+      const url = this.getThumbUrl(this.printerFile, 'gcodes', this.printerFile.path, true, this.printerFile.modified)
+
       return url
     }
   }
 
   get liveVelocity (): number {
-    return this.$store.state.printer.printer.motion_report.live_velocity
+    return this.$store.state.printer.printer.motion_report?.live_velocity ?? 0
   }
 
   get liveExtruderVelocity (): number {
-    return this.$store.state.printer.printer.motion_report.live_extruder_velocity
+    return this.$store.state.printer.printer.motion_report?.live_extruder_velocity ?? 0
   }
 
   get liveFlow (): number {
@@ -361,14 +348,14 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin, ToolheadMi
    * Actual estimates for during a print.
    */
   get estimates (): TimeEstimates {
-    return this.$store.getters['printer/getTimeEstimates'] as TimeEstimates
+    return this.$store.getters['printer/getTimeEstimates']
   }
 
   /**
    * If the user has enabled the history component.
    */
   get supportsHistoryComponent (): boolean {
-    return this.$store.getters['server/componentSupport']('history') as boolean
+    return this.$store.getters['server/componentSupport']('history')
   }
 
   /**
@@ -382,42 +369,31 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin, ToolheadMi
    * The total estimated layer count.
    */
   get layers (): number {
-    return this.$store.getters['printer/getPrintLayers'] as number
+    return this.$store.getters['printer/getPrintLayers']
   }
 
   /**
    * Current estimated layer based on current z pos.
    */
   get layer (): number {
-    return this.$store.getters['printer/getPrintLayer'] as number
+    return this.$store.getters['printer/getPrintLayer']
   }
 
   /**
    * Filament used according to print stats.
    */
   get filamentUsed (): number {
-    const filamentUsed: number | undefined = this.$store.state.printer.printer.print_stats.filament_used
-
-    return filamentUsed ?? 0
-  }
-
-  /**
-   * Total filament according to the current file / slicer.
-   */
-  get filamentTotal (): number {
-    const filamentTotal: number | undefined = this.$store.state.printer.printer.current_file.filament_total
-
-    return filamentTotal || 0
+    return this.$store.state.printer.printer.print_stats?.filament_used ?? 0
   }
 
   async handleViewThumbnail () {
-    const file = this.current_file
-    const thumb = this.getThumb(file, 'gcodes', file.path, true, file.modified)
+    const printerFile = this.printerFile
+    const thumb = printerFile && this.getThumb(printerFile, 'gcodes', printerFile.path, true, printerFile.modified)
 
     if (thumb) {
       this.filePreviewState = {
         open: true,
-        filename: file.filename,
+        filename: printerFile.filename,
         src: thumb.url,
         width: thumb.width
       }
diff --git a/src/components/widgets/system/DiskUsageCard.vue b/src/components/widgets/system/DiskUsageCard.vue
index 0c79915310..0dfb8acf01 100644
--- a/src/components/widgets/system/DiskUsageCard.vue
+++ b/src/components/widgets/system/DiskUsageCard.vue
@@ -62,12 +62,15 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
+import type { SDInfo, SystemInfo } from '@/store/server/types'
+import type { DiskUsage } from '@/store/files/types'
 
 @Component({})
 export default class PrinterStatsCard extends Vue {
   get sdInfo () {
-    const info = this.$store.getters['server/getSystemInfo']
-    return info?.sd_info || {}
+    const info: SystemInfo | null = this.$store.state.server.system_info
+
+    return info?.sd_info || {} as SDInfo
   }
 
   get fileSystemUsedPercent () {
@@ -76,8 +79,8 @@ export default class PrinterStatsCard extends Vue {
     return Math.floor((used / total) * 100).toFixed()
   }
 
-  get fileSystemUsage () {
-    return this.$store.getters['files/getUsage']
+  get fileSystemUsage (): DiskUsage {
+    return this.$store.state.files.disk_usage
   }
 }
 </script>
diff --git a/src/components/widgets/system/McuCard.vue b/src/components/widgets/system/McuCard.vue
index 9112ce7267..6203e0446a 100644
--- a/src/components/widgets/system/McuCard.vue
+++ b/src/components/widgets/system/McuCard.vue
@@ -80,11 +80,11 @@ export default class PrinterStatsCard extends Vue {
   readonly mcu!: MCU
 
   get klippyApp (): KlippyApp {
-    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
+    return this.$store.getters['printer/getKlippyApp']
   }
 
-  get mcuConstants () {
-    return this.mcu.mcu_constants || {} as Record<string, string | number>
+  get mcuConstants (): Record<string, string | number> {
+    return this.mcu.mcu_constants || {}
   }
 
   mcuInformationDialogOpen = false
diff --git a/src/components/widgets/system/SystemOverviewCard.vue b/src/components/widgets/system/SystemOverviewCard.vue
index 806f700000..6cfb1a06f9 100644
--- a/src/components/widgets/system/SystemOverviewCard.vue
+++ b/src/components/widgets/system/SystemOverviewCard.vue
@@ -126,7 +126,7 @@ export default class PrinterStatsCard extends Vue {
   peripheralsDialogOpen = false
 
   get systemInfo (): SystemInfo | null {
-    return this.$store.getters['server/getSystemInfo']
+    return this.$store.state.server.system_info
   }
 
   get cpuInfo () {
@@ -174,7 +174,7 @@ export default class PrinterStatsCard extends Vue {
   }
 
   get canRolloverLogs (): boolean {
-    return this.$store.getters['server/getIsMinApiVersion']('1.0.5') as boolean
+    return this.$store.getters['server/getIsMinApiVersion']('1.0.5')
   }
 }
 </script>
diff --git a/src/components/widgets/system/SystemUsageCard.vue b/src/components/widgets/system/SystemUsageCard.vue
index 2991ff8f3a..67ffd95139 100644
--- a/src/components/widgets/system/SystemUsageCard.vue
+++ b/src/components/widgets/system/SystemUsageCard.vue
@@ -9,9 +9,7 @@
         <klipper-load-chart />
         <moonraker-load-chart />
         <system-memory-chart />
-        <template
-          v-for="(mcu, i) in mcus"
-        >
+        <template v-for="(mcu, i) in mcus">
           <mcu-load-chart
             :key="i"
             :mcu="mcu"
@@ -33,6 +31,8 @@ import SystemMemoryChart from './SystemMemoryChart.vue'
 import KlipperLoadChart from './KlipperLoadChart.vue'
 import MoonrakerLoadChart from './MoonrakerLoadChart.vue'
 import McuLoadChart from './McuLoadChart.vue'
+import type { ServerSystemStat } from '@/store/server/types'
+import type { KlipperPrinterSystemStatsState, MCU } from '@/store/printer/types'
 
 @Component({
   components: {
@@ -44,15 +44,15 @@ import McuLoadChart from './McuLoadChart.vue'
   }
 })
 export default class PrinterStatsCard extends Vue {
-  get procStats () {
-    return this.$store.getters['server/getProcessStats']
+  get procStats (): ServerSystemStat[] {
+    return this.$store.state.server.moonraker_stats
   }
 
-  get systemStats () {
-    return this.$store.getters['printer/getSystemStats']
+  get systemStats (): KlipperPrinterSystemStatsState {
+    return this.$store.state.printer.printer.system_stats
   }
 
-  get mcus () {
+  get mcus (): MCU[] {
     return this.$store.getters['printer/getMcus']
   }
 }
diff --git a/src/components/widgets/thermals/HeaterContextMenu.vue b/src/components/widgets/thermals/HeaterContextMenu.vue
index bf1934971c..cbac8ce4ba 100644
--- a/src/components/widgets/thermals/HeaterContextMenu.vue
+++ b/src/components/widgets/thermals/HeaterContextMenu.vue
@@ -77,7 +77,7 @@ export default class HeaterContextMenu extends Mixins(StateMixin) {
   readonly heater!: Heater
 
   get klippyApp (): KlippyApp {
-    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
+    return this.$store.getters['printer/getKlippyApp']
   }
 
   get heaterIsOn () {
diff --git a/src/components/widgets/thermals/TemperatureTargets.vue b/src/components/widgets/thermals/TemperatureTargets.vue
index 81b9356217..12fcb53952 100644
--- a/src/components/widgets/thermals/TemperatureTargets.vue
+++ b/src/components/widgets/thermals/TemperatureTargets.vue
@@ -362,7 +362,7 @@ export default class TemperatureTargets extends Mixins(StateMixin) {
   }
 
   get heaters (): Heater[] {
-    return this.$store.getters['printer/getHeaters'] as Heater[]
+    return this.$store.getters['printer/getHeaters']
   }
 
   get fans () {
@@ -378,11 +378,11 @@ export default class TemperatureTargets extends Mixins(StateMixin) {
   }
 
   get chartSelectedLegends (): ChartSelectedLegends {
-    return this.$store.getters['charts/getSelectedLegends'] as ChartSelectedLegends
+    return this.$store.state.charts.selectedLegends
   }
 
   get chartData (): ChartData[] {
-    return this.$store.getters['charts/getChartData'] as ChartData[]
+    return this.$store.state.charts.chart
   }
 
   get showRateOfChange (): boolean {
diff --git a/src/components/widgets/thermals/ThermalChart.vue b/src/components/widgets/thermals/ThermalChart.vue
index c747bd6906..7559464be5 100644
--- a/src/components/widgets/thermals/ThermalChart.vue
+++ b/src/components/widgets/thermals/ThermalChart.vue
@@ -22,7 +22,7 @@ import { Component, Watch, Prop, Ref, Mixins } from 'vue-property-decorator'
 import type { ECharts, EChartsOption } from 'echarts'
 import getKlipperType from '@/util/get-klipper-type'
 import BrowserMixin from '@/mixins/browser'
-import type { ChartSelectedLegends } from '@/store/charts/types'
+import type { ChartData, ChartSelectedLegends } from '@/store/charts/types'
 
 @Component({})
 export default class ThermalChart extends Mixins(BrowserMixin) {
@@ -58,16 +58,16 @@ export default class ThermalChart extends Mixins(BrowserMixin) {
     }
   }
 
-  get chartData () {
-    return this.$store.getters['charts/getChartData']
+  get chartData (): ChartData[] {
+    return this.$store.state.charts.chart
   }
 
   get chartableSensors (): string[] {
-    return this.$store.getters['printer/getChartableSensors'] as string[]
+    return this.$store.getters['printer/getChartableSensors']
   }
 
   get chartSelectedLegends (): ChartSelectedLegends {
-    return this.$store.getters['charts/getSelectedLegends'] as ChartSelectedLegends
+    return this.$store.state.charts.selectedLegends
   }
 
   @Watch('chartData')
diff --git a/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue b/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue
index beee672c5f..c1f574256c 100644
--- a/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue
+++ b/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue
@@ -391,11 +391,11 @@ export default class TimelapseRenderSettingsDialog extends Mixins(StateMixin) {
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   get lastFrame (): TimelapseLastFrame | undefined {
-    return this.$store.getters['timelapse/getLastFrame']
+    return this.$store.state.timelapse.lastFrame
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/widgets/timelapse/TimelapseSettingsCard.vue b/src/components/widgets/timelapse/TimelapseSettingsCard.vue
index c33fa3af7b..248fbac48e 100644
--- a/src/components/widgets/timelapse/TimelapseSettingsCard.vue
+++ b/src/components/widgets/timelapse/TimelapseSettingsCard.vue
@@ -54,7 +54,7 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import type { TimelapseSettings } from '@/store/timelapse/types'
+import type { TimelapseLastFrame, TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
 
 @Component({})
@@ -84,11 +84,13 @@ export default class TimelapseSettingsCard extends Mixins(StateMixin) {
   }
 
   get frameCount () {
-    return this.$store.getters['timelapse/getLastFrame']?.count
+    const lastFrame: TimelapseLastFrame | undefined = this.$store.state.timelapse.lastFrame
+
+    return lastFrame?.count
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   subtitleIfBlocked (blocked: boolean): string {
diff --git a/src/components/widgets/timelapse/TimelapseStatusCard.vue b/src/components/widgets/timelapse/TimelapseStatusCard.vue
index 722d076917..2a7ec323bd 100644
--- a/src/components/widgets/timelapse/TimelapseStatusCard.vue
+++ b/src/components/widgets/timelapse/TimelapseStatusCard.vue
@@ -127,19 +127,19 @@ export default class StatusCard extends Mixins(StateMixin, FilesMixin) {
   }
 
   get camera (): WebcamConfig | undefined {
-    return this.$store.getters['webcams/getWebcamById'](this.settings.camera) as WebcamConfig | undefined
+    return this.$store.getters['webcams/getWebcamById'](this.settings.camera)
   }
 
   get settings (): TimelapseSettings {
-    return this.$store.getters['timelapse/getSettings']
+    return this.$store.state.timelapse.settings ?? {} as TimelapseSettings
   }
 
   get lastFrame (): TimelapseLastFrame | undefined {
-    return this.$store.getters['timelapse/getLastFrame']
+    return this.$store.state.timelapse.lastFrame
   }
 
   get renderStatus (): RenderStatus | undefined {
-    return this.$store.getters['timelapse/getRenderStatus']
+    return this.$store.state.timelapse.renderStatus
   }
 
   get renderProgress () {
diff --git a/src/components/widgets/toolhead/ExtruderStepperSync.vue b/src/components/widgets/toolhead/ExtruderStepperSync.vue
index 58a0391ff0..9bb02c65c3 100644
--- a/src/components/widgets/toolhead/ExtruderStepperSync.vue
+++ b/src/components/widgets/toolhead/ExtruderStepperSync.vue
@@ -45,8 +45,8 @@ export default class ExtruderStepperSync extends Mixins(StateMixin) {
   @Prop({ type: Object, required: true })
   readonly extruderStepper!: ExtruderStepper
 
-  get availableExtruders () {
-    return this.$store.getters['printer/getExtruders'] as KnownExtruder[]
+  get availableExtruders (): KnownExtruder[] {
+    return this.$store.getters['printer/getExtruders']
   }
 
   sendSyncExtruderMotion (value: string | null) {
diff --git a/src/components/widgets/toolhead/ExtruderSteppers.vue b/src/components/widgets/toolhead/ExtruderSteppers.vue
index 204bcb8c42..f251c338a9 100644
--- a/src/components/widgets/toolhead/ExtruderSteppers.vue
+++ b/src/components/widgets/toolhead/ExtruderSteppers.vue
@@ -63,8 +63,8 @@ import type { KnownExtruder, ExtruderStepper } from '@/store/printer/types'
 })
 export default class ExtruderSteppers extends Vue {
   get extruderSteppers () {
-    const extruders = this.$store.getters['printer/getExtruders'] as KnownExtruder[]
-    const extruderSteppers = this.$store.getters['printer/getExtruderSteppers'] as ExtruderStepper[]
+    const extruders: KnownExtruder[] = this.$store.getters['printer/getExtruders']
+    const extruderSteppers: ExtruderStepper[] = this.$store.getters['printer/getExtruderSteppers']
 
     return extruderSteppers
       .map(x => {
diff --git a/src/components/widgets/toolhead/ToolChangeCommands.vue b/src/components/widgets/toolhead/ToolChangeCommands.vue
index 26f4b361bc..d42042545b 100644
--- a/src/components/widgets/toolhead/ToolChangeCommands.vue
+++ b/src/components/widgets/toolhead/ToolChangeCommands.vue
@@ -72,7 +72,7 @@ type ToolChangeCommand = {
 @Component({})
 export default class ToolChangeCommands extends Mixins(StateMixin) {
   get availableCommands (): GcodeCommands {
-    return this.$store.getters['printer/getAvailableCommands'] as GcodeCommands
+    return this.$store.getters['printer/getAvailableCommands']
   }
 
   get toolChangeCommands (): ToolChangeCommand[] {
diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
index a07be56af4..f5d820ec86 100644
--- a/src/components/widgets/toolhead/ToolheadCard.vue
+++ b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -140,7 +140,7 @@ import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
 import Toolhead from './Toolhead.vue'
 import type { Macro } from '@/store/macros/types'
-import type { KlippyApp } from '@/store/printer/types'
+import type { KlipperPrinterSettings, KlippyApp } from '@/store/printer/types'
 
 type Tool = {
   name: string,
@@ -160,11 +160,11 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
   readonly menuCollapsed?: boolean
 
   get klippyApp (): KlippyApp {
-    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
+    return this.$store.getters['printer/getKlippyApp']
   }
 
-  get printerSettings () {
-    return this.$store.getters['printer/getPrinterSettings']()
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
   }
 
   get printerSupportsQuadGantryLevel (): boolean {
@@ -216,7 +216,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
       'LOAD_FILAMENT',
       'FILAMENT_LOAD',
       'M701'
-    ) as Macro | undefined
+    )
   }
 
   get unloadFilamentMacro (): Macro | undefined {
@@ -224,7 +224,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
       'UNLOAD_FILAMENT',
       'FILAMENT_UNLOAD',
       'M702'
-    ) as Macro | undefined
+    )
   }
 
   get cleanNozzleMacro (): Macro | undefined {
@@ -234,7 +234,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
       'WIPE_NOZZLE',
       'NOZZLE_WIPE',
       'G12'
-    ) as Macro | undefined
+    )
   }
 
   get availableTools () {
@@ -368,11 +368,11 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
   }
 
   get hasSteppersEnabled (): boolean {
-    return this.$store.getters['printer/getHasSteppersEnabled'] as boolean
+    return this.$store.getters['printer/getHasSteppersEnabled']
   }
 
   get hasRoundBed (): boolean {
-    return this.$store.getters['printer/getHasRoundBed'] as boolean
+    return this.$store.getters['printer/getHasRoundBed']
   }
 
   async toggleForceMove () {
diff --git a/src/components/widgets/toolhead/ToolheadControlBars.vue b/src/components/widgets/toolhead/ToolheadControlBars.vue
index 5ef8f4e2a2..8779335822 100644
--- a/src/components/widgets/toolhead/ToolheadControlBars.vue
+++ b/src/components/widgets/toolhead/ToolheadControlBars.vue
@@ -68,7 +68,7 @@ import type { Stepper } from '@/store/printer/types'
 })
 export default class ToolheadControlBars extends Mixins(StateMixin, ToolheadMixin) {
   get steppers (): Stepper[] {
-    const steppers = this.$store.getters['printer/getSteppers'] as Stepper[]
+    const steppers: Stepper[] = this.$store.getters['printer/getSteppers']
 
     return steppers
       .filter(stepper => stepper.key.startsWith('stepper_'))
diff --git a/src/components/widgets/toolhead/ToolheadControlBarsStepper.vue b/src/components/widgets/toolhead/ToolheadControlBarsStepper.vue
index eaf38d2fb1..e99ac90310 100644
--- a/src/components/widgets/toolhead/ToolheadControlBarsStepper.vue
+++ b/src/components/widgets/toolhead/ToolheadControlBarsStepper.vue
@@ -21,7 +21,7 @@
 <script lang="ts">
 import { Component, Mixins, Prop } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import type { Stepper } from '@/store/printer/types'
+import type { KlipperPrinterSettings, Stepper } from '@/store/printer/types'
 import { encodeGcodeParamValue } from '@/util/gcode-helpers'
 
 @Component({})
@@ -39,9 +39,13 @@ export default class ToolheadControlBarsStepper extends Mixins(StateMixin) {
       : this.$store.state.config.uiSettings.general.defaultToolheadXYSpeed
   }
 
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
+  }
+
   get accel (): number {
     return this.isStepperZ
-      ? this.$store.getters['printer/getPrinterSettings']('printer.max_z_accel')
+      ? this.printerSettings.printer?.max_z_accel ?? 100
       : this.$store.state.printer.printer.toolhead.max_accel
   }
 
diff --git a/src/components/widgets/toolhead/ToolheadControlCircle.vue b/src/components/widgets/toolhead/ToolheadControlCircle.vue
index 145ab3bd33..7c52b64f24 100644
--- a/src/components/widgets/toolhead/ToolheadControlCircle.vue
+++ b/src/components/widgets/toolhead/ToolheadControlCircle.vue
@@ -521,7 +521,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
-import type { BedSize, KlippyApp } from '@/store/printer/types'
+import type { BedSize, KlipperPrinterSettings, KlippyApp } from '@/store/printer/types'
 
 type Axis = 'X' | 'Y' | 'Z'
 
@@ -540,15 +540,15 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
   }
 
   get hasSteppersEnabled (): boolean {
-    return this.$store.getters['printer/getHasSteppersEnabled'] as boolean
+    return this.$store.getters['printer/getHasSteppersEnabled']
   }
 
   get klippyApp (): KlippyApp {
-    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
+    return this.$store.getters['printer/getKlippyApp']
   }
 
-  get printerSettings () {
-    return this.$store.getters['printer/getPrinterSettings']()
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
   }
 
   get printerSupportsQuadGantryLevel (): boolean {
@@ -740,7 +740,7 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
 
     if (this.forceMoveEnabled) {
       const accel = axis === 'Z'
-        ? this.$store.getters['printer/getPrinterSettings']('printer.max_z_accel')
+        ? this.printerSettings.printer?.max_z_accel ?? 100
         : this.$store.state.printer.printer.toolhead.max_accel
       this.sendGcode(`FORCE_MOVE STEPPER=stepper_${axis.toLowerCase()} DISTANCE=${distance} VELOCITY=${rate} ACCEL=${accel}`)
     } else {
@@ -753,7 +753,7 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
   }
 
   get bedSize (): BedSize {
-    const bedSize = this.$store.getters['printer/getBedSize'] as BedSize | undefined
+    const bedSize: BedSize | undefined = this.$store.getters['printer/getBedSize']
 
     return bedSize ?? {
       minX: 0,
diff --git a/src/components/widgets/toolhead/ToolheadControlCross.vue b/src/components/widgets/toolhead/ToolheadControlCross.vue
index 2b3e835b3b..5e8c367257 100644
--- a/src/components/widgets/toolhead/ToolheadControlCross.vue
+++ b/src/components/widgets/toolhead/ToolheadControlCross.vue
@@ -191,6 +191,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
+import type { KlipperPrinterSettings } from '@/store/printer/types'
 
 type Axis = 'X' | 'Y' | 'Z'
 
@@ -198,8 +199,12 @@ type Axis = 'X' | 'Y' | 'Z'
 export default class ToolheadControlCross extends Mixins(StateMixin, ToolheadMixin) {
   moveLength: number | null = null
 
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
+  }
+
   get hasRoundBed (): boolean {
-    return this.$store.getters['printer/getHasRoundBed'] as boolean
+    return this.$store.getters['printer/getHasRoundBed']
   }
 
   get canHomeXY (): boolean {
@@ -250,7 +255,7 @@ export default class ToolheadControlCross extends Mixins(StateMixin, ToolheadMix
 
     if (this.forceMoveEnabled) {
       const accel = axis === 'Z'
-        ? this.$store.getters['printer/getPrinterSettings']('printer.max_z_accel')
+        ? this.printerSettings.printer?.max_z_accel ?? 100
         : this.$store.state.printer.printer.toolhead.max_accel
       this.sendGcode(`FORCE_MOVE STEPPER=stepper_${axis.toLowerCase()} DISTANCE=${distance} VELOCITY=${rate} ACCEL=${accel}`)
     } else {
diff --git a/src/components/widgets/toolhead/ToolheadPosition.vue b/src/components/widgets/toolhead/ToolheadPosition.vue
index a06ba63684..c6307cd374 100644
--- a/src/components/widgets/toolhead/ToolheadPosition.vue
+++ b/src/components/widgets/toolhead/ToolheadPosition.vue
@@ -124,6 +124,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
+import type { KlipperPrinterSettings } from '@/store/printer/types'
 
 type Axis = 'X' | 'Y' | 'Z'
 
@@ -144,7 +145,7 @@ export default class ToolheadPosition extends Mixins(StateMixin, ToolheadMixin)
   }
 
   get livePosition () {
-    return this.$store.state.printer.printer.motion_report.live_position
+    return this.$store.state.printer.printer.motion_report?.live_position ?? [0, 0, 0, 0]
   }
 
   get useGcodeCoords (): boolean {
@@ -175,6 +176,10 @@ export default class ToolheadPosition extends Mixins(StateMixin, ToolheadMixin)
     this.sendGcode(`G9${value}`)
   }
 
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
+  }
+
   moveAxisTo (axis: Axis, pos: number) {
     const axisIndex = axisIndexMap[axis]
     const currentPos = this.useGcodeCoords
@@ -188,7 +193,7 @@ export default class ToolheadPosition extends Mixins(StateMixin, ToolheadMixin)
 
       if (this.forceMoveEnabled) {
         const accel = axis === 'Z'
-          ? this.$store.getters['printer/getPrinterSettings']('printer.max_z_accel')
+          ? this.printerSettings.printer?.max_z_accel ?? 100
           : this.$store.state.printer.printer.toolhead.max_accel
         this.sendGcode(`FORCE_MOVE STEPPER=stepper_${axis.toLowerCase()} DISTANCE=${pos} VELOCITY=${rate} ACCEL=${accel}`)
       } else {
diff --git a/src/components/widgets/toolhead/ZHeightAdjust.vue b/src/components/widgets/toolhead/ZHeightAdjust.vue
index a49da03e75..49b7ba0801 100644
--- a/src/components/widgets/toolhead/ZHeightAdjust.vue
+++ b/src/components/widgets/toolhead/ZHeightAdjust.vue
@@ -174,7 +174,7 @@ export default class ZHeightAdjust extends Mixins(StateMixin) {
   }
 
   get availableCommands (): GcodeCommands {
-    return this.$store.getters['printer/getAvailableCommands'] as GcodeCommands
+    return this.$store.getters['printer/getAvailableCommands']
   }
 
   get hasZOffsetApplyProbe (): boolean {
diff --git a/src/mixins/files.ts b/src/mixins/files.ts
index 6005edd51f..97a8341eaf 100644
--- a/src/mixins/files.ts
+++ b/src/mixins/files.ts
@@ -6,6 +6,7 @@ import { httpClientActions } from '@/api/httpClientActions'
 import type { FileWithPath } from '@/types'
 import consola from 'consola'
 import { v4 as uuidv4 } from 'uuid'
+import type { AppUser } from '@/store/auth/types'
 
 @Component
 export default class FilesMixin extends Vue {
@@ -14,7 +15,9 @@ export default class FilesMixin extends Vue {
   }
 
   get isTrustedUser (): boolean {
-    return this.$store.getters['auth/getCurrentUser']?.username === '_TRUSTED_USER_'
+    const currentUser: AppUser | null = this.$store.state.auth.currentUser
+
+    return currentUser?.username === '_TRUSTED_USER_'
   }
 
   getThumbUrl (meta: KlipperFileMeta, root: string, path: string, large: boolean, date?: number) {
diff --git a/src/mixins/state.ts b/src/mixins/state.ts
index 79d7a9f453..37489b9465 100644
--- a/src/mixins/state.ts
+++ b/src/mixins/state.ts
@@ -7,48 +7,48 @@ import type { Device } from '@/store/power/types'
 @Component
 export default class StateMixin extends Vue {
   get appReady (): boolean {
-    return this.$store.getters['config/getAppReady'] as boolean
+    return this.$store.state.config.appReady
   }
 
   get authenticated (): boolean {
-    return this.$store.getters['auth/getAuthenticated'] as boolean
+    return this.$store.state.auth.authenticated
   }
 
   get socketConnected (): boolean {
-    return this.$store.getters['socket/getConnectionState'] as boolean
+    return this.$store.getters['socket/getConnectionState']
   }
 
   get apiConnected (): boolean {
-    return this.$store.getters['socket/getApiConnected'] as boolean
+    return this.$store.getters['socket/getApiConnected']
   }
 
   get socketConnecting (): boolean {
-    return this.$store.getters['socket/getConnectingState'] as boolean
+    return this.$store.getters['socket/getConnectingState']
   }
 
   get klippyReady (): boolean {
-    return this.$store.getters['printer/getKlippyReady'] as boolean
+    return this.$store.getters['printer/getKlippyReady']
   }
 
   get klippyConnected (): boolean {
-    return this.$store.getters['printer/getKlippyConnected'] as boolean
+    return this.$store.getters['printer/getKlippyConnected']
   }
 
   get hasWarnings (): boolean {
-    return this.$store.getters['printer/getHasWarnings'] as boolean
+    return this.$store.getters['printer/getHasWarnings']
   }
 
   get klippyState (): string {
-    return this.$store.getters['printer/getKlippyState'] as string
+    return this.$store.getters['printer/getKlippyState']
   }
 
   get klippyStateMessage (): string {
-    return this.$store.getters['printer/getKlippyStateMessage'] as string
+    return this.$store.getters['printer/getKlippyStateMessage']
   }
 
   // Return the printer state
   get printerState (): string {
-    return this.$store.getters['printer/getPrinterState'] as string
+    return this.$store.getters['printer/getPrinterState']
   }
 
   // Returns a boolean indicating if the printer is busy.
@@ -82,7 +82,7 @@ export default class StateMixin extends Vue {
 
     const printerPowerDevice: string = this.$store.state.config.uiSettings.general.printerPowerDevice ?? 'printer'
 
-    const device = this.$store.getters['power/getDeviceByName'](printerPowerDevice) as Device | undefined
+    const device: Device | undefined = this.$store.getters['power/getDeviceByName'](printerPowerDevice)
 
     return device?.status === 'off'
   }
@@ -92,21 +92,21 @@ export default class StateMixin extends Vue {
    * Supports a single string or a list of.
    */
   hasWait (wait: string | string[]): boolean {
-    return this.$store.getters['wait/hasWait'](wait) as boolean
+    return this.$store.getters['wait/hasWait'](wait)
   }
 
   /**
    * Indicates if we have any waits.
    */
   get hasWaits (): boolean {
-    return this.$store.getters['wait/hasWaits'] as boolean
+    return this.$store.getters['wait/hasWaits']
   }
 
   /**
    * Indicates if we have any waits prefixed by.
    */
   hasWaitsBy (prefix: string): boolean {
-    return this.$store.getters['wait/hasWaitsBy'](prefix) as boolean
+    return this.$store.getters['wait/hasWaitsBy'](prefix)
   }
 
   /**
@@ -118,7 +118,7 @@ export default class StateMixin extends Vue {
   }
 
   sendMoveGcode (movement: { X?: number, Y?: number, Z?: number }, rate: number, absolute = false, wait?: string) {
-    const macro = this.$store.getters['macros/getMacroByName']('_CLIENT_LINEAR_MOVE') as Macro | undefined
+    const macro: Macro | undefined = this.$store.getters['macros/getMacroByName']('_CLIENT_LINEAR_MOVE')
 
     const paramSeparator = macro
       ? '='
@@ -138,7 +138,7 @@ RESTORE_GCODE_STATE NAME=_ui_movement`
   }
 
   sendExtrudeGcode (amount: number, rate: number, wait?: string) {
-    const macro = this.$store.getters['macros/getMacroByName']('_CLIENT_LINEAR_MOVE') as Macro | undefined
+    const macro: Macro | undefined = this.$store.getters['macros/getMacroByName']('_CLIENT_LINEAR_MOVE')
 
     const gcode = macro
       ? `${macro.name.toUpperCase()} E=${amount} F=${rate * 60}`
diff --git a/src/mixins/toolhead.ts b/src/mixins/toolhead.ts
index bf0493d86f..2e3533b180 100644
--- a/src/mixins/toolhead.ts
+++ b/src/mixins/toolhead.ts
@@ -1,19 +1,19 @@
 import Vue from 'vue'
 import { Component } from 'vue-property-decorator'
-import type { Extruder } from '@/store/printer/types'
+import type { Extruder, KlipperPrinterSettings } from '@/store/printer/types'
 
 @Component
 export default class ToolheadMixin extends Vue {
   get hasExtruder (): boolean {
-    return this.$store.getters['printer/getHasExtruder'] as boolean
+    return this.$store.getters['printer/getHasExtruder']
   }
 
   get hasMultipleExtruders (): boolean {
-    return this.$store.getters['printer/getHasMultipleExtruders'] as boolean
+    return this.$store.getters['printer/getHasMultipleExtruders']
   }
 
   get activeExtruder (): Extruder | undefined {
-    return this.$store.getters['printer/getActiveExtruder'] as Extruder | undefined
+    return this.$store.getters['printer/getActiveExtruder']
   }
 
   get extruderReady (): boolean {
@@ -47,47 +47,53 @@ export default class ToolheadMixin extends Vue {
   }
 
   get allHomed (): boolean {
-    return this.$store.getters['printer/getHomedAxes']('xyz') as boolean
+    return this.$store.getters['printer/getHomedAxes']('xyz')
   }
 
   get xyHomed (): boolean {
-    return this.$store.getters['printer/getHomedAxes']('xy') as boolean
+    return this.$store.getters['printer/getHomedAxes']('xy')
   }
 
   get xHomed (): boolean {
-    return this.$store.getters['printer/getHomedAxes']('x') as boolean
+    return this.$store.getters['printer/getHomedAxes']('x')
   }
 
   get yHomed (): boolean {
-    return this.$store.getters['printer/getHomedAxes']('y') as boolean
+    return this.$store.getters['printer/getHomedAxes']('y')
   }
 
   get zHomed (): boolean {
-    return this.$store.getters['printer/getHomedAxes']('z') as boolean
+    return this.$store.getters['printer/getHomedAxes']('z')
   }
 
   get xHasMultipleSteppers (): boolean {
-    return !!this.$store.getters['printer/getPrinterSettings']('stepper_x1') as boolean
+    const printerSettings: KlipperPrinterSettings = this.$store.getters['printer/getPrinterSettings']
+
+    return printerSettings.stepper_x1 != null
   }
 
   get yHasMultipleSteppers (): boolean {
-    return !!this.$store.getters['printer/getPrinterSettings']('stepper_y1') as boolean
+    const printerSettings: KlipperPrinterSettings = this.$store.getters['printer/getPrinterSettings']
+
+    return printerSettings.stepper_y1 != null
   }
 
   get zHasMultipleSteppers (): boolean {
-    return !!this.$store.getters['printer/getPrinterSettings']('stepper_z1') as boolean
+    const printerSettings: KlipperPrinterSettings = this.$store.getters['printer/getPrinterSettings']
+
+    return printerSettings.stepper_z1 != null
   }
 
   get isManualProbeActive (): boolean {
-    return this.$store.getters['printer/getIsManualProbeActive'] as boolean
+    return this.$store.getters['printer/getIsManualProbeActive']
   }
 
   get isBedScrewsAdjustActive (): boolean {
-    return this.$store.getters['printer/getIsBedScrewsAdjustActive'] as boolean
+    return this.$store.getters['printer/getIsBedScrewsAdjustActive']
   }
 
   get hasScrewsTiltAdjustResults (): boolean {
-    return this.$store.getters['printer/getHasScrewsTiltAdjustResults'] as boolean
+    return this.$store.getters['printer/getHasScrewsTiltAdjustResults']
   }
 
   get manualProbeDialogOpen (): boolean {
diff --git a/src/router/index.ts b/src/router/index.ts
index 6ef922bc5c..e74a7bcf13 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -23,7 +23,7 @@ import Icons from '@/views/Icons.vue'
 Vue.use(VueRouter)
 
 const isAuthenticated = () => (
-  router.app.$store.getters['auth/getAuthenticated'] ||
+  router.app.$store.state.auth.authenticated ||
   !router.app.$store.state.socket.apiConnected
 )
 
diff --git a/src/store/announcements/getters.ts b/src/store/announcements/getters.ts
index 9835ab9976..0b73b9dca9 100644
--- a/src/store/announcements/getters.ts
+++ b/src/store/announcements/getters.ts
@@ -4,6 +4,7 @@ import type { RootState } from '../types'
 
 export const getters: GetterTree<AnnouncementsState, RootState> = {
   getAnnouncements: (state) => {
-    return state.entries.filter(announcement => !announcement.dismissed)
+    return state.entries
+      .filter(announcement => !announcement.dismissed)
   }
 }
diff --git a/src/store/auth/getters.ts b/src/store/auth/getters.ts
index 6636e6ecaf..4dcff8fef7 100644
--- a/src/store/auth/getters.ts
+++ b/src/store/auth/getters.ts
@@ -3,27 +3,4 @@ import type { AuthState } from './types'
 import type { RootState } from '../types'
 
 export const getters: GetterTree<AuthState, RootState> = {
-  getAuthenticated: (state): boolean => {
-    return state.authenticated
-  },
-
-  getCurrentUser: (state) => {
-    return state.currentUser
-  },
-
-  getUsers: (state) => {
-    return state.users
-  },
-
-  getToken: (state) => {
-    return state.token
-  },
-
-  getRefreshToken: (state) => {
-    return state.refresh_token
-  },
-
-  getApiKey: (state) => {
-    return state.apiKey
-  }
 }
diff --git a/src/store/auth/types.ts b/src/store/auth/types.ts
index 8baf89e8ff..9f41024d7c 100644
--- a/src/store/auth/types.ts
+++ b/src/store/auth/types.ts
@@ -12,6 +12,6 @@ export interface AuthState {
 export interface AppUser {
   username: string;
   password?: string;
-  source: 'moonraker' | 'ldap';
-  created_on: number;
+  source: string;
+  created_on?: number;
 }
diff --git a/src/store/charts/getters.ts b/src/store/charts/getters.ts
index d25fa422bb..aafb55358c 100644
--- a/src/store/charts/getters.ts
+++ b/src/store/charts/getters.ts
@@ -7,25 +7,12 @@ import { Globals } from '@/globals'
 import type { EChartsOption } from 'echarts'
 
 export const getters: GetterTree<ChartState, RootState> = {
-  /**
-   * Returns our actual chart data
-   */
-  getChartData: (state) => {
-    return state.chart
-  },
-
-  /**
-   * Returns currently selected legends
-   */
-  getSelectedLegends: (state) => {
-    return state.selectedLegends
-  },
-
   /**
    * Return the charts retention.
    */
-  getChartRetention: (state, getters, rootState, rootGetters) => {
-    const config = rootGetters['server/getConfig']
+  getChartRetention: (state, getters, rootState) => {
+    const config = rootState.server.config
+
     return config.data_store?.temperature_store_size ??
       config.server?.temperature_store_size ??
       Globals.CHART_HISTORY_RETENTION
diff --git a/src/store/config/getters.ts b/src/store/config/getters.ts
index 45bde8eedd..77a45812ec 100644
--- a/src/store/config/getters.ts
+++ b/src/store/config/getters.ts
@@ -9,7 +9,8 @@ import md5 from 'md5'
 
 export const getters: GetterTree<ConfigState, RootState> = {
   getCurrentInstance: (state) => {
-    return state.instances.find(instance => instance.active)
+    return state.instances
+      .find(instance => instance.active)
   },
 
   getInstances: (state) => {
@@ -23,14 +24,6 @@ export const getters: GetterTree<ConfigState, RootState> = {
     return instances
   },
 
-  getHostConfig: (state) => {
-    return state.hostConfig
-  },
-
-  getAppReady: (state) => {
-    return state.appReady
-  },
-
   /**
    * Return temp presets. Ensure we only return a preset
    * for a known heater or fan, incase things change
@@ -75,7 +68,7 @@ export const getters: GetterTree<ConfigState, RootState> = {
   },
 
   getCustomThemeFile: (state, getters, rootState, rootGetters) => (filename: string, extensions: string[]) => {
-    const files = rootGetters['files/getRootFiles']('config') as MoonrakerRootFile[] | undefined
+    const files: MoonrakerRootFile[] | undefined = rootGetters['files/getRootFiles']('config')
 
     if (files) {
       for (const extension of extensions) {
diff --git a/src/store/console/getters.ts b/src/store/console/getters.ts
index 17425f156b..f2211ba949 100644
--- a/src/store/console/getters.ts
+++ b/src/store/console/getters.ts
@@ -20,10 +20,6 @@ export const getters: GetterTree<ConsoleState, RootState> = {
     return items
   },
 
-  getFilters: (state) => {
-    return state.consoleFilters
-  },
-
   getAllKnownCommands: (state): GcodeHelp => {
     const commands: GcodeHelp = {
       TESTZ: '',
diff --git a/src/store/files/actions.ts b/src/store/files/actions.ts
index 23ec832c47..dfab42cde9 100644
--- a/src/store/files/actions.ts
+++ b/src/store/files/actions.ts
@@ -38,19 +38,12 @@ export const actions: ActionTree<FilesState, RootState> = {
   /**
    * If we request the metadata (a file..) then we load and update here.
    */
-  async onFileMetaData ({ commit, rootState }, payload: KlipperFile | KlipperFileWithMeta) {
+  async onFileMetaData ({ commit }, payload: KlipperFile | KlipperFileWithMeta) {
     const root = 'gcodes' // We'd only ever load metadata for gcode files.
     const paths = getFilePaths(payload.filename, root)
 
     if (!paths.filtered) {
       const file = formatAsFile(root, payload)
-      const filepath = (file.path) ? `${file.path}/${file.filename}` : `${file.filename}`
-
-      // If this is an update to the currently printing file, then push it to
-      // current_file.
-      if (filepath === rootState.printer.printer.print_stats.filename) {
-        commit('printer/setSocketNotify', { key: 'current_file', payload: file }, { root: true })
-      }
 
       // Apply the metadata to our specific file.
       const update: FileUpdate = {
diff --git a/src/store/files/getters.ts b/src/store/files/getters.ts
index bb789d8ecb..d0593ec590 100644
--- a/src/store/files/getters.ts
+++ b/src/store/files/getters.ts
@@ -91,8 +91,8 @@ export const getters: GetterTree<FilesState, RootState> = {
   /**
    * Indicates if a root is available.
    */
-  isRootAvailable: (state, getters, rootState) => (r: string) => {
-    return rootState.server.info.registered_directories.includes(r)
+  isRootAvailable: (state, getters, rootState) => (root: string) => {
+    return rootState.server.info.registered_directories.includes(root)
   },
 
   /**
@@ -205,12 +205,5 @@ export const getters: GetterTree<FilesState, RootState> = {
   getLowOnSpace: (state) => {
     // 1073741824 = 1gb
     return state.disk_usage.free < 1073741824
-  },
-
-  /**
-   * Returns curent file system usage.
-   */
-  getUsage: (state) => {
-    return state.disk_usage
   }
 }
diff --git a/src/store/gcodePreview/actions.ts b/src/store/gcodePreview/actions.ts
index 72db58019f..d5de2c50f8 100644
--- a/src/store/gcodePreview/actions.ts
+++ b/src/store/gcodePreview/actions.ts
@@ -26,7 +26,7 @@ export const actions: ActionTree<GcodePreviewState, RootState> = {
     }
   },
 
-  async loadGcode ({ commit, getters, state, rootState, dispatch }, payload: { file: AppFile; gcode: string }) {
+  async loadGcode ({ commit, state, rootState, dispatch }, payload: { file: AppFile; gcode: string }) {
     const worker = new ParseGcodeWorker()
 
     commit('setParserWorker', worker)
@@ -64,7 +64,7 @@ export const actions: ActionTree<GcodePreviewState, RootState> = {
             worker.terminate()
           }
 
-          if (getters.getMoves.length === 0) {
+          if (state.moves.length === 0) {
             commit('clearFile')
           }
 
diff --git a/src/store/gcodePreview/getters.ts b/src/store/gcodePreview/getters.ts
index df9b594b13..23e1109ab4 100644
--- a/src/store/gcodePreview/getters.ts
+++ b/src/store/gcodePreview/getters.ts
@@ -1,33 +1,17 @@
 import type { GetterTree } from 'vuex'
 import type { BBox, GcodePreviewState, Layer, LayerNr, LayerPaths, Move, Part, Point3D } from './types'
 import type { RootState } from '../types'
-import type { AppFile } from '@/store/files/types'
 import { binarySearch, moveToSVGPath } from '@/util/gcode-preview'
 import isKeyOf from '@/util/is-key-of'
 
 export const getters: GetterTree<GcodePreviewState, RootState> = {
-  /**
-   * Returns a collection of all the moves
-   */
-  getMoves: (state): Move[] => {
-    return state.moves
-  },
-
-  getFile: (state): AppFile | undefined => {
-    return state.file
-  },
-
-  getParserProgress: (state): number => {
-    return state.parserProgress
-  },
-
   getLayers: (state, getters, rootState): Layer[] => {
     if (state.layers.length) {
       return state.layers
     }
 
     const output = []
-    const moves = getters.getMoves as Move[]
+    const moves = state.moves
 
     let z = NaN
     let zStart = 0
@@ -74,8 +58,8 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
   },
 
   getBounds: (state, getters): BBox => {
-    let moves = getters.getMoves
-    const layers = getters.getLayers as Layer[]
+    let moves = state.moves
+    const layers: Layer[] = getters.getLayers
 
     // ignore first and last layer (priming and parking)
     const moveRangeStart = layers[layers.length > 1 ? 1 : 0]?.move
@@ -93,7 +77,7 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
       }
     }
 
-    const isFinite = Number.isFinite
+    const isFinite = (x: unknown): x is number => Number.isFinite(x)
     let index = 0
 
     for (; index < moves.length && !Object.values(bounds).every(isFinite); index++) {
@@ -136,9 +120,9 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
     }
   },
 
-  getToolHeadPosition: (state, getters) => (moveIndex: number): Point3D => {
-    const isFinite = Number.isFinite
-    const moves = getters.getMoves
+  getToolHeadPosition: (state) => (moveIndex: number): Point3D => {
+    const isFinite = (x: unknown): x is number => Number.isFinite(x)
+    const moves = state.moves
     const output = {
       x: NaN,
       y: NaN,
@@ -146,16 +130,18 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
     }
 
     for (let i = moveIndex; i >= 0 && (!isFinite(output.x) || !isFinite(output.y) || !isFinite(output.z)); i--) {
-      if (!isFinite(output.x) && moves[i].x !== undefined) {
-        output.x = moves[i].x
+      const move = moves[i]
+
+      if (!isFinite(output.x) && move.x !== undefined) {
+        output.x = move.x
       }
 
-      if (!isFinite(output.y) && moves[i].y !== undefined) {
-        output.y = moves[i].y
+      if (!isFinite(output.y) && move.y !== undefined) {
+        output.y = move.y
       }
 
-      if (!isFinite(output.z) && moves[i].z !== undefined) {
-        output.z = moves[i].z
+      if (!isFinite(output.z) && move.z !== undefined) {
+        output.z = move.z
       }
     }
 
@@ -168,7 +154,7 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
 
   getPaths: (state, getters) => (startMove: number, endMove: number): LayerPaths => {
     const toolhead = getters.getToolHeadPosition(startMove)
-    const moves = getters.getMoves
+    const moves = state.moves
 
     const path: LayerPaths = {
       extrusions: '',
@@ -186,7 +172,7 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
     for (let index = startMove; index <= endMove && index < moves.length; index++) {
       const move = moves[index]
 
-      if (move.e > 0) {
+      if (move.e != null && move.e > 0) {
         if (traveling) {
           path.extrusions += `M${toolhead.x},${toolhead.y}`
           path.extrusionStarts.push({
@@ -205,7 +191,7 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
           traveling = true
         }
 
-        if (move.e < 0) {
+        if (move.e != null && move.e < 0) {
           path.retractions.push({
             x: toolhead.x,
             y: toolhead.y
@@ -226,13 +212,13 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
   },
 
   getLayerPaths: (state, getters) => (layerNr: LayerNr): LayerPaths => {
-    const layers = getters.getLayers as Layer[]
+    const layers: Layer[] = getters.getLayers
 
     return getters.getPaths(layers[layerNr]?.move ?? 0, (layers[layerNr + 1]?.move ?? Infinity) - 1)
   },
 
   getPartPaths: (state, getters): string[] => {
-    const parts = getters.getParts as Part[]
+    const parts: Part[] = getters.getParts
 
     return parts
       .map(part => {
@@ -248,16 +234,16 @@ export const getters: GetterTree<GcodePreviewState, RootState> = {
       })
   },
 
-  getMoveIndexByFilePosition: (state, getters) => (filePosition: number): number => {
+  getMoveIndexByFilePosition: (state) => (filePosition: number): number => {
     if (filePosition <= 0) {
       return 0
     }
 
-    return binarySearch(getters.getMoves, (val: Move) => filePosition - val.filePosition, true)
+    return binarySearch(state.moves, (val: Move) => filePosition - val.filePosition, true)
   },
 
   getLayerNrByFilePosition: (state, getters) => (filePosition: number): LayerNr => {
-    const layers = getters.getLayers as Layer[]
+    const layers: Layer[] = getters.getLayers
 
     for (let i = 0; i < layers.length - 1; i++) {
       if (filePosition < layers[i + 1].filePosition) {
diff --git a/src/store/helpers.ts b/src/store/helpers.ts
index 92722b1e0c..a6108e6f4b 100644
--- a/src/store/helpers.ts
+++ b/src/store/helpers.ts
@@ -1,4 +1,4 @@
-import type { Commit, Dispatch } from 'vuex'
+import type { Dispatch } from 'vuex'
 import type { RootState } from './types'
 import { SocketActions } from '@/api/socketActions'
 import type { AppPushNotification } from './notifications/types'
@@ -16,7 +16,7 @@ export const handleTrinamicDriversChange = (payload: any, state: RootState, disp
     ) {
       const name = nameFromSplit ?? item
 
-      const klippyApp = getters.getKlippyApp as KlippyApp
+      const klippyApp: KlippyApp = getters.getKlippyApp
 
       const notification: AppPushNotification = {
         id: `${item}-otpw`,
@@ -43,20 +43,22 @@ export const handlePrintStateChange = (payload: any, state: RootState, dispatch:
     'print_stats' in payload &&
     'state' in payload.print_stats
   ) {
+    const currentPrintState = state.printer.printer.print_stats?.state
+
     if (
-      state.printer.printer.print_stats.state !== 'printing' &&
+      currentPrintState !== 'printing' &&
       payload.print_stats.state === 'printing'
     ) {
       // This is a new print starting...
       dispatch('printer/onPrintStart', payload, { root: true })
     } else if (
-      state.printer.printer.print_stats.state === 'printing' &&
+      currentPrintState === 'printing' &&
       payload.print_stats.state === 'complete'
     ) {
       // This is a completed print...
       dispatch('printer/onPrintEnd', payload, { root: true })
     } else if (
-      state.printer.printer.print_stats.state === 'printing' &&
+      currentPrintState === 'printing' &&
       payload.print_stats.state === 'standby'
     ) {
       // This is a cancelled print...
@@ -65,21 +67,16 @@ export const handlePrintStateChange = (payload: any, state: RootState, dispatch:
   }
 }
 
-export const handleCurrentFileChange = (payload: any, state: RootState, commit: Commit) => {
+export const handleCurrentFileChange = (payload: any, state: RootState) => {
   if (
     'print_stats' in payload &&
     'filename' in payload.print_stats &&
-    payload.print_stats.filename !== state.printer.printer.print_stats.filename
+    payload.print_stats.filename &&
+    payload.print_stats.filename !== state.printer.printer.print_stats?.filename
   ) {
-    commit('printer/setResetCurrentFile', undefined, { root: true })
-    if (
-      payload.print_stats.filename !== '' &&
-      payload.print_stats.filename !== null
-    ) {
-      // This refreshes the metadata for the current file, which also
-      // ensures we update the current_file with the latest data via
-      // the files/onFileUpdate action.
-      SocketActions.serverFilesMetadata(payload.print_stats.filename)
-    }
+    // This refreshes the metadata for the current file, which also
+    // ensures we update the printer file with the latest data via
+    // the files/onFileUpdate action.
+    SocketActions.serverFilesMetadata(payload.print_stats.filename)
   }
 }
diff --git a/src/store/jobQueue/getters.ts b/src/store/jobQueue/getters.ts
index 317c25ff4d..3e1ae7aef2 100644
--- a/src/store/jobQueue/getters.ts
+++ b/src/store/jobQueue/getters.ts
@@ -3,14 +3,6 @@ import type { JobQueueState } from './types'
 import type { RootState } from '../types'
 
 export const getters: GetterTree<JobQueueState, RootState> = {
-  getQueueState: (state) => {
-    return state.queue_state
-  },
-
-  getQueuedJobs: (state) => {
-    return state.queued_jobs
-  },
-
   getQueuedJob: (state) => (jobId: string) => {
     return state.queued_jobs.findIndex(job => job.job_id === jobId)
   }
diff --git a/src/store/layout/getters.ts b/src/store/layout/getters.ts
index e632e7c60d..19700e495d 100644
--- a/src/store/layout/getters.ts
+++ b/src/store/layout/getters.ts
@@ -3,6 +3,7 @@ import type { LayoutState, LayoutContainer, LayoutConfig } from './types'
 import type { RootState } from '../types'
 import { cloneDeep } from 'lodash-es'
 import vuetify from '@/plugins/vuetify'
+import type { AppUser } from '../auth/types'
 
 export const getters: GetterTree<LayoutState, RootState> = {
   /**
@@ -64,8 +65,9 @@ export const getters: GetterTree<LayoutState, RootState> = {
     }
   },
 
-  getSpecificLayoutName: (state, getters, rootState, rootGetters): string => {
-    const user = rootGetters['auth/getCurrentUser']
+  getSpecificLayoutName: (state, getters, rootState): string => {
+    const user: AppUser | null = rootState.auth.currentUser
+
     if (!user) return 'dashboard'
 
     const size = vuetify.framework.breakpoint.name
diff --git a/src/store/macros/getters.ts b/src/store/macros/getters.ts
index 9f80fb041d..ce6c59b2b8 100644
--- a/src/store/macros/getters.ts
+++ b/src/store/macros/getters.ts
@@ -19,7 +19,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
    */
   getMacros: (state, getters, rootState) => {
     const macros = Object.keys(rootState.printer.printer)
-      .filter(key => key.startsWith('gcode_macro '))
+      .filter((key): key is `gcode_macro ${string}` => key.startsWith('gcode_macro '))
       .map(key => {
         const lowerCaseKey = key.toLowerCase()
         const name = lowerCaseKey.split(' ', 2)[1]
@@ -53,7 +53,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
   },
 
   getMacroByName: (state, getters) => (...names: string[]) => {
-    const macros = getters.getMacros as Macro[]
+    const macros: Macro[] = getters.getMacros
 
     for (const name of names) {
       const lowerCaseName = name.toLowerCase()
@@ -72,11 +72,16 @@ export const getters: GetterTree<MacrosState, RootState> = {
     const categories = [...state.categories, defaultCategory]
 
     return categories
-      .map(({ id, name }) => ({
-        id,
-        name,
-        macros: getters.getMacrosByCategory(id).filter((macro: Macro) => macro.visible) as Macro[]
-      }))
+      .map(({ id, name }) => {
+        const macros: Macro[] = getters.getMacrosByCategory(id)
+          .filter((macro: Macro) => macro.visible)
+
+        return ({
+          id,
+          name,
+          macros
+        })
+      })
       .filter(category => category.macros.length > 0)
   },
 
@@ -89,7 +94,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
       ? '0'
       : categoryId
 
-    const macros = getters.getMacros as Macro[]
+    const macros: Macro[] = getters.getMacros
 
     return macros
       .filter(macro => (
@@ -116,7 +121,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
       .map(category => {
         const { id, name } = category
 
-        const macros = getters.getMacrosByCategory(id) as Macro[]
+        const macros: Macro[] = getters.getMacrosByCategory(id)
         const count = macros.length
         const visible = macros
           .filter(macro => macro.visible)
diff --git a/src/store/mesh/getters.ts b/src/store/mesh/getters.ts
index 09cbe4f563..b5310dab1d 100644
--- a/src/store/mesh/getters.ts
+++ b/src/store/mesh/getters.ts
@@ -2,13 +2,11 @@ import type { GetterTree } from 'vuex'
 import type {
   MeshState,
   AppMeshes,
-  KlipperBedMesh,
-  KlipperBedMeshProfile,
-  LegacyKlipperBedMeshProfile,
   BedMeshProfileListEntry
 } from './types'
 import type { RootState } from '../types'
 import { transformMesh } from '@/util/transform-mesh'
+import type { KlipperPrinterBedMeshProfileState, KlipperPrinterConfig, KlipperPrinterSettings } from '../printer/types'
 
 export const getters: GetterTree<MeshState, RootState> = {
 
@@ -16,21 +14,23 @@ export const getters: GetterTree<MeshState, RootState> = {
    * Has this printer been configured for bed meshes?
    */
   getSupportsBedMesh: (state, getters, rootState, rootGetters) => {
-    return rootGetters['printer/getPrinterSettings']('bed_mesh') !== undefined
+    const printerSettings: KlipperPrinterSettings = rootGetters['printer/getPrinterSettings']
+
+    return printerSettings.bed_mesh != null
   },
 
   getLegacyBedMeshProfiles: (state, getters, rootState, rootGetters) => {
-    const klipperProfiles = {} as Record<string, KlipperBedMeshProfile>
+    const klipperProfiles: Record<string, KlipperPrinterBedMeshProfileState> = {}
 
-    const config = rootGetters['printer/getPrinterConfig']()
+    const config: KlipperPrinterConfig = rootGetters['printer/getPrinterConfig']
     const meshProfileKeys = Object.keys(config)
-      .filter(key => key.startsWith('bed_mesh '))
+      .filter((key): key is `bed_mesh ${string}` => key.startsWith('bed_mesh '))
 
     for (const key of meshProfileKeys) {
       const name = key.split(' ').splice(1).join(' ')
-      const legacyKlipperProfile = config[key] as LegacyKlipperBedMeshProfile
+      const legacyKlipperProfile = config[key]
 
-      const profile: KlipperBedMeshProfile = {
+      const profile: KlipperPrinterBedMeshProfileState = {
         points: legacyKlipperProfile.points.split('\n')
           .filter(x => x.length)
           .map(x => x.split(',').map(Number)),
@@ -56,9 +56,13 @@ export const getters: GetterTree<MeshState, RootState> = {
 
   getBedMeshProfiles: (state, getters, rootState): BedMeshProfileListEntry[] => {
     const profiles: BedMeshProfileListEntry[] = []
-    const bedMesh = rootState.printer.printer.bed_mesh as KlipperBedMesh
+    const bedMesh = rootState.printer.printer.bed_mesh
+
+    if (bedMesh == null) {
+      return []
+    }
 
-    const klipperProfiles = bedMesh.profiles ?? getters.getLegacyBedMeshProfiles as Record<string, KlipperBedMeshProfile>
+    const klipperProfiles: Record<string, KlipperPrinterBedMeshProfileState> = bedMesh.profiles ?? getters.getLegacyBedMeshProfiles
 
     for (const [name, profile] of Object.entries(klipperProfiles)) {
       const points = profile.points.flatMap(x => x)
@@ -100,7 +104,11 @@ export const getters: GetterTree<MeshState, RootState> = {
    * Returns the current mesh, in a usable format for echarts.
    */
   getCurrentMeshData: (state, getters, rootState): AppMeshes => {
-    const bedMesh = rootState.printer.printer.bed_mesh as KlipperBedMesh
+    const bedMesh = rootState.printer.printer.bed_mesh
+
+    if (bedMesh == null) {
+      return {}
+    }
 
     return {
       mesh_matrix: transformMesh(bedMesh, 'mesh_matrix'),
diff --git a/src/store/mesh/types.ts b/src/store/mesh/types.ts
index 14a24c5807..bbdf11f089 100644
--- a/src/store/mesh/types.ts
+++ b/src/store/mesh/types.ts
@@ -9,48 +9,6 @@ export interface MeshState {
 
 export type MatrixType = 'probed_matrix' | 'mesh_matrix'
 
-export interface KlipperBedMesh {
-  profile_name: string;
-  mesh_min?: number[];
-  mesh_max?: number[];
-  probed_matrix?: number[][];
-  mesh_matrix?: number[][];
-  profiles?: Record<string, KlipperBedMeshProfile>
-}
-
-export interface LegacyKlipperBedMeshProfile {
-  version: string;
-  points: string;
-  algo: string;
-  max_x: string;
-  max_y: string;
-  mesh_x_pps: string;
-  mesh_y_pps: string;
-  min_x: string;
-  min_y: string;
-  tension: string;
-  x_count: string;
-  y_count: string;
-}
-
-export interface KlipperBedMeshProfile {
-  points: number[][]
-  mesh_params: KlipperBedMeshProfileMeshParams
-}
-
-export interface KlipperBedMeshProfileMeshParams {
-  algo: string;
-  max_x: number;
-  max_y: number;
-  mesh_x_pps: number;
-  mesh_y_pps: number;
-  min_x: number;
-  min_y: number;
-  tension: number;
-  x_count: number;
-  y_count: number;
-}
-
 export interface BedMeshProfileListEntry {
   name: string;
   active: boolean;
diff --git a/src/store/printer/actions.ts b/src/store/printer/actions.ts
index 475ec6fd06..c93f1faa30 100644
--- a/src/store/printer/actions.ts
+++ b/src/store/printer/actions.ts
@@ -44,7 +44,7 @@ export const actions: ActionTree<PrinterState, RootState> = {
       ? klipperVersion
       : `${klipperVersion}-0`
 
-    const klippyApp = getters['getKlippyApp'] as KlippyApp
+    const klippyApp: KlippyApp = getters['getKlippyApp']
 
     if (
       valid(klipperVersion) &&
@@ -191,7 +191,7 @@ export const actions: ActionTree<PrinterState, RootState> = {
       // Detect a printing state change.
       // We do this prior to commiting the notify so we can
       // compare the before and after.
-      handleCurrentFileChange(payload, rootState, commit)
+      handleCurrentFileChange(payload, rootState)
       handlePrintStateChange(payload, rootState, dispatch)
       handleSystemStatsChange(payload, rootState, commit)
       handleMcuStatsChange(payload, rootState, commit)
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index 59a44277f4..11c6db5e48 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -1,24 +1,24 @@
 import Vue from 'vue'
 import type { GetterTree } from 'vuex'
 import type { RootState } from '../types'
-import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, Probe, ExtruderStepper, Extruder, ExtruderConfig, ProbeName, Stepper, ScrewsTiltAdjustScrew, ScrewsTiltAdjust, BedScrews, BedSize, GcodeCommands, TimeEstimates, BeaconState, KlippyApp, ExcludeObjectPart, ExcludeObjectState } from './types'
-import { capitalize, get } from 'lodash-es'
+import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, ExtruderStepper, Extruder, Stepper, ScrewsTiltAdjustScrew, ScrewsTiltAdjust, BedScrews, BedSize, GcodeCommands, TimeEstimates, KlippyApp, ExcludeObjectPart, KlipperPrinterConfig, KlipperPrinterProbeState, BeaconModel, BedScrewsScrew } from './types'
 import getKlipperType from '@/util/get-klipper-type'
 import i18n from '@/plugins/i18n'
 import type { GcodeHelp } from '../console/types'
-import type { ServerInfo } from '../server/types'
 import { Globals } from '@/globals'
 import isKeyOf from '@/util/is-key-of'
+import getFilePaths from '@/util/get-file-paths'
+import type { AppFileWithMeta } from '../files/types'
 
 export const getters: GetterTree<PrinterState, RootState> = {
 
   /**
    * Indicates if klippy is connected or not.
    */
-  getKlippyReady: (state, getters, rootState, rootGetters): boolean => {
+  getKlippyReady: (state, getters, rootState): boolean => {
     // Valid states are;
     // ready, startup, shutdown, error
-    const serverInfo = rootGetters['server/getInfo'] as ServerInfo
+    const serverInfo = rootState.server.info
 
     return (
       serverInfo.klippy_state === 'ready' &&
@@ -26,22 +26,23 @@ export const getters: GetterTree<PrinterState, RootState> = {
     )
   },
 
-  getKlippyConnected: (state, getters, rootState, rootGetters): boolean => {
-    const serverInfo = rootGetters['server/getInfo'] as ServerInfo
+  getKlippyConnected: (state, getters, rootState): boolean => {
+    const serverInfo = rootState.server.info
 
     return serverInfo.klippy_connected
   },
 
-  getKlippyState: (state, getters, rootState, rootGetters): string => {
-    const serverInfo = rootGetters['server/getInfo'] as ServerInfo
+  getKlippyState: (state, getters, rootState): string => {
+    const serverInfo = rootState.server.info
 
-    return capitalize(serverInfo.klippy_state || '')
+    return Vue.$filters.prettyCase(serverInfo.klippy_state || '')
   },
 
-  getKlippyStateMessage: (state, getters, rootState, rootGetters): string => {
+  getKlippyStateMessage: (state, getters, rootState): string => {
     // If there's absolutely no connection to klipper, then
     // say so.
-    const serverInfo = rootGetters['server/getInfo'] as ServerInfo
+    const serverInfo = rootState.server.info
+
     if (serverInfo.klippy_connected === false) {
       return 'Klippy not connected.'
     }
@@ -73,12 +74,24 @@ export const getters: GetterTree<PrinterState, RootState> = {
     }
   },
 
+  getPrinterFile: (state, getters, rootState, rootGetters) => {
+    const printerFilename = state.printer.print_stats?.filename
+
+    if (printerFilename) {
+      const paths = getFilePaths(printerFilename, 'gcodes')
+
+      const printerFile: AppFileWithMeta | undefined = rootGetters['files/getFile'](paths.rootPath, paths.filename)
+
+      return printerFile
+    }
+  },
+
   /**
    * Returns a string value indicating the state of the printer.
    */
   getPrinterState: (state): string => {
     const state1 = state.printer.idle_timeout.state // printing, ready, idle
-    const state2 = state.printer.print_stats.state // printing, paused, standby, complete, cancelled, error
+    const state2 = state.printer.print_stats?.state // printing, paused, standby, complete, cancelled, error
     // If the idle state says we're printing, but the print_stats say otherwise - then
     // we're probably busy moving the toolhead or doing some other process.
     // Possible values are;
@@ -105,13 +118,15 @@ export const getters: GetterTree<PrinterState, RootState> = {
     }
   },
 
-  getFileRelativePrintProgress: (state): number => {
-    const { gcode_start_byte, gcode_end_byte, path, filename } = state.printer.current_file ?? {}
+  getFileRelativePrintProgress: (state, getters): number => {
+    const { gcode_start_byte, gcode_end_byte } = getters.getPrinterFile ?? {}
     const { file_position, progress } = state.printer.virtual_sdcard ?? {}
 
-    const fullFilename = path ? `${path}/${filename}` : filename
-
-    if (gcode_start_byte && gcode_end_byte && file_position && fullFilename === state.printer.print_stats.filename) {
+    if (
+      gcode_start_byte != null &&
+      gcode_end_byte != null &&
+      file_position != null
+    ) {
       if (file_position <= gcode_start_byte) return 0
       if (file_position >= gcode_end_byte) return 1
 
@@ -129,16 +144,17 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getSlicerPrintProgress: (state): number => {
-    return state.printer.display_status.progress || 0
+    return state.printer.display_status?.progress || 0
   },
 
-  getFilamentPrintProgress: (state) => {
-    const { filament_used, filename: statsFilename } = state.printer.print_stats ?? {}
-    const { filament_total, path, filename } = state.printer.current_file ?? {}
-
-    const fullFilename = path ? `${path}/${filename}` : filename
+  getFilamentPrintProgress: (state, getters) => {
+    const { filament_used } = state.printer.print_stats ?? {}
+    const { filament_total } = getters.getPrinterFile ?? {}
 
-    if (filament_used != null && filament_total && fullFilename === statsFilename) {
+    if (
+      filament_used != null &&
+      filament_total != null
+    ) {
       return filament_used / filament_total
     }
 
@@ -175,73 +191,83 @@ export const getters: GetterTree<PrinterState, RootState> = {
     return printProgress
   },
 
-  getPrintLayers: (state): number => {
-    const layersFromPrintStats = state.printer.print_stats.info?.total_layer
+  getPrintLayers: (state, getters): number => {
+    const layersFromPrintStats = state.printer.print_stats?.info?.total_layer
+
     if (typeof layersFromPrintStats === 'number') {
       return layersFromPrintStats
     }
-    const current_file = state.printer.current_file
-    if ('layer_count' in current_file) {
-      return current_file.layer_count
+
+    const { layer_count, first_layer_height, layer_height, object_height } = getters.getPrinterFile ?? {}
+
+    if (layer_count != null) {
+      return layer_count
     } else if (
-      'first_layer_height' in current_file &&
-      'layer_height' in current_file &&
-      'object_height' in current_file
+      first_layer_height != null &&
+      layer_height != null &&
+      object_height != null
     ) {
-      const lc = Math.ceil((current_file.object_height - current_file.first_layer_height) / current_file.layer_height + 1)
+      const lc = Math.ceil((object_height - first_layer_height) / layer_height + 1)
+
       if (lc > 0) return lc
     }
+
     return 0
   },
 
-  getPrintLayer: (state): number => {
-    const layerFromPrintStats = state.printer.print_stats.info?.current_layer
+  getPrintLayer: (state, getters): number => {
+    const layerFromPrintStats = state.printer.print_stats?.info?.current_layer
+
     if (typeof layerFromPrintStats === 'number') {
       return layerFromPrintStats
     }
-    const current_file = state.printer.current_file
-    const duration = state.printer.print_stats.print_duration || 0
+
+    const { first_layer_height, layer_height } = getters.getPrinterFile ?? {}
+    const duration = state.printer.print_stats?.print_duration ?? 0
     const pos = state.printer.gcode_move.gcode_position
+
     if (
-      current_file &&
       duration > 0 &&
-      'first_layer_height' in current_file &&
-      'layer_height' in current_file &&
+      first_layer_height != null &&
+      layer_height != null &&
+      layer_height > 0 &&
       pos &&
       pos.length >= 3
     ) {
-      const z = state.printer.gcode_move.gcode_position[2]
-      const l = Math.ceil((z - current_file.first_layer_height) / current_file.layer_height + 1)
+      const z = pos[2]
+      const l = Math.ceil((z - first_layer_height) / layer_height + 1)
+
       if (l > 0) return l
     }
     return 0
   },
 
-  getTimeEstimates: (state, getters, rootGetters): TimeEstimates => {
-    const progress = getters.getPrintProgress as number
-    const fileProgress = getters.getFileRelativePrintProgress as number
+  getTimeEstimates: (state, getters, rootState): TimeEstimates => {
+    const progress: number = getters.getPrintProgress
+    const fileProgress: number = getters.getFileRelativePrintProgress
 
-    const totalDuration = state.printer.print_stats?.total_duration as number | undefined ?? 0
-    const printDuration = state.printer.print_stats?.print_duration as number | undefined ?? 0
+    const totalDuration = state.printer.print_stats?.total_duration ?? 0
+    const printDuration = state.printer.print_stats?.print_duration ?? 0
 
     const fileLeft = printDuration > 0 && fileProgress > 0
       ? printDuration / fileProgress - printDuration
       : 0
 
-    const currentFileStatus = state.printer.current_file?.history?.status as string | undefined
-    const currentFileTotalDuration = state.printer.current_file?.history?.total_duration as number | undefined
+    const printerFile: AppFileWithMeta | null = getters.getPrinterFile
+    const { history, estimated_time } = printerFile ?? {}
+
+    const currentFileStatus = history?.status
+    const currentFileTotalDuration = history?.total_duration ?? 0
 
-    const actualLeft = currentFileStatus === 'completed' && currentFileTotalDuration != null
+    const actualLeft = currentFileStatus === 'completed' && currentFileTotalDuration > 0
       ? currentFileTotalDuration - printDuration
       : 0
 
-    const slicerTotal = state.printer.current_file?.estimated_time as number | undefined
-
-    const slicerLeft = slicerTotal != null && slicerTotal > 0
-      ? slicerTotal - printDuration
+    const slicerLeft = estimated_time != null && estimated_time > 0
+      ? estimated_time - printDuration
       : 0
 
-    const printEtaCalculation = rootGetters.config.uiSettings.general.printEtaCalculation
+    const printEtaCalculation = rootState.config.uiSettings.general.printEtaCalculation
 
     const printEtaCalculationResults = printEtaCalculation
       .map(type => {
@@ -278,38 +304,31 @@ export const getters: GetterTree<PrinterState, RootState> = {
     }
   },
 
-  /**
-   * Return system stats
-   */
-  getSystemStats: (state) => {
-    return state.printer.system_stats
-  },
-
   /**
    * Return MCU's and their state
    */
-  getMcus: (state, getters) => {
+  getMcus: (state) => {
     const mcus = Object.keys(state.printer)
-      .filter(key => key.startsWith('mcu'))
+      .filter((key): key is `mcu ${string}` => key.startsWith('mcu'))
       .sort()
       .map((key): MCU => ({
         name: key,
         prettyName: Vue.$filters.prettyCase(key),
         ...state.printer[key],
-        config: getters.getPrinterSettings(key)
+        config: state.printer.configfile.settings[key]
       }))
 
     return mcus
   },
 
   getHasExtruder: (state) => {
-    return state.printer.extruder
+    return state.printer.extruder != null
   },
 
   getHasMultipleExtruders: (state) => {
     return (
-      state.printer.extruder &&
-      state.printer.extruder1
+      state.printer.extruder != null &&
+      state.printer.extruder1 != null
     )
   },
 
@@ -331,22 +350,27 @@ export const getters: GetterTree<PrinterState, RootState> = {
   // Return the current extruder along with its configuration.
   getActiveExtruder: (state, getters) => {
     const name = state.printer.toolhead.extruder || 'extruder'
-    return getters.getExtruderByName(name) as Extruder | undefined
+
+    const extruder: Extruder | undefined = getters.getExtruderByName(name)
+
+    return extruder
   },
 
   // Returns an extruder by name.
-  getExtruderByName: (state, getters) => (name: string) => {
-    const e = state.printer[name] || undefined
-    const c = getters.getPrinterSettings(name) as ExtruderConfig
+  getExtruderByName: (state) => (name: 'extruder' | `extruder${number}`) => {
+    const e = state.printer[name]
+    const c = state.printer.configfile.settings[name]
 
     // If we can't find what we need..
     if (!e || !c) return undefined
 
     // If we have other extruders, they may inherit some properties
     // from the first depending how they're defined.
-    const { min_extrude_temp } = name === 'extruder'
-      ? c
-      : getters.getPrinterSettings('extruder') as ExtruderConfig
+    const min_extrude_temp = (
+      c.min_extrude_temp ??
+      state.printer.configfile.settings.extruder?.min_extrude_temp ??
+      170
+    )
 
     const extruder: Extruder = {
       min_extrude_temp,
@@ -358,16 +382,16 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getExtruderSteppers: (state, getters): ExtruderStepper[] => {
-    const steppers = getters.getSteppers as Stepper[]
+    const steppers: Stepper[] = getters.getSteppers
 
     return steppers
       .filter((stepper): stepper is ExtruderStepper => stepper.key.startsWith('extruder_stepper '))
   },
 
-  getSteppers: (state, getters): Stepper[] => {
+  getSteppers: (state): Stepper[] => {
     const steppers: Stepper[] = []
 
-    const stepperKeys: string[] = state.printer.motion_report.steppers ?? []
+    const stepperKeys: string[] = state.printer.motion_report?.steppers ?? []
 
     for (const item of stepperKeys) {
       const name = item.startsWith('stepper_')
@@ -375,7 +399,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
         : item.split(' ', 2).pop() || ''
 
       const e = state.printer[item]
-      const c = getters.getPrinterSettings(item)
+      const c = state.printer.configfile.settings[item]
 
       steppers.push({
         name,
@@ -391,7 +415,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getHasSteppersEnabled: (state, getters): boolean => {
-    const steppers = getters.getSteppers as Stepper[]
+    const steppers: Stepper[] = getters.getSteppers
 
     return Object.values(steppers)
       .some(stepper => stepper.enabled == null || stepper.enabled)
@@ -417,7 +441,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
 
       if (supportedSensors.includes(type)) {
         const name = nameFromSplit ?? item
-        const sensor = get(state.printer, item, undefined)
+        const sensor = state.printer[item]
         sensors.push({
           name,
           prettyName: Vue.$filters.prettyCase(name),
@@ -430,32 +454,32 @@ export const getters: GetterTree<PrinterState, RootState> = {
 
   getEndstops: (state) => {
     const endstops: Endstop[] = []
-    Object.keys(state.printer.endstops)
+    Object.keys(state.endstops)
       .sort()
       .forEach(key => {
         endstops.push({
           name: key,
-          state: state.printer.endstops[key]
+          state: state.endstops[key]
         })
       })
     return endstops
   },
 
-  getProbe: (state, getters): Probe | undefined => {
-    const probe = state.printer.probe as Probe | undefined
+  getProbe: (state): KlipperPrinterProbeState | undefined => {
+    const probe = state.printer.probe
 
     if (probe && !probe.name) {
       const probeNames = [
         'bltouch',
         'smart_effector',
         'probe'
-      ] as ProbeName[]
+      ]
 
       for (const name of probeNames) {
-        const probeSettings = getters.getPrinterSettings(name)
+        const probeSettings = state.printer.configfile.settings[name]
 
         if (probeSettings?.z_offset !== undefined) {
-          const probeWithName: Probe = {
+          const probeWithName: KlipperPrinterProbeState = {
             ...probe,
             name
           }
@@ -471,8 +495,8 @@ export const getters: GetterTree<PrinterState, RootState> = {
   /**
    * Return available heaters
    */
-  getHeaters: (state, getters): Heater[] => {
-    const heaters = state.printer.heaters.available_heaters || []
+  getHeaters: (state): Heater[] => {
+    const heaters = state.printer.heaters?.available_heaters ?? []
     if (
       heaters.length
     ) {
@@ -480,7 +504,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
       heaters.forEach((e: string) => {
         const heater = state.printer[e]
         if (heater && Object.keys(heater).length > 0) {
-          const config = getters.getPrinterSettings(e)
+          const config = state.printer.configfile.settings[e]
           // Some heater items may have a prefix determining type.
           // Check for these and split as necessary.
           const keys = [
@@ -569,7 +593,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getPinByName: (state, getters) => (name: string) => {
-    const pins = getters.getPins as OutputPin[]
+    const pins: OutputPin[] = getters.getPins
 
     return pins.find(pin => pin.name === name)
   },
@@ -661,7 +685,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
           ? Vue.$colorset.next(getKlipperType(pin), pin)
           : undefined
 
-        const config = getters.getPrinterSettings(pin)
+        const config = state.printer.configfile.settings[pin]
 
         let output: Fan | Led | OutputPin = {
           ...state.printer[pin],
@@ -730,7 +754,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
               })
             : Vue.$filters.prettyCase(name)
           const color = Vue.$colorset.next(getKlipperType(item), item)
-          const config = getters.getPrinterSettings(item)
+          const config = state.printer.configfile.settings[item]
 
           groups[name] = {
             ...state.printer[item],
@@ -806,7 +830,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
         .sort((a, b) => a.localeCompare(b))
     })
 
-    const heaters = [...state.printer.heaters.available_heaters as string[]]
+    const heaters: string[] = [...state.printer.heaters?.available_heaters ?? []]
       .sort((a, b) => a.localeCompare(b))
 
     return [
@@ -815,101 +839,89 @@ export const getters: GetterTree<PrinterState, RootState> = {
     ]
   },
 
-  getBedScrews: (_, getters) => {
-    const config = getters.getPrinterSettings('bed_screws')
-    const screws: BedScrews[] = []
+  getBedScrews: (state): BedScrews => {
+    const config = state.printer.configfile.settings.bed_screws
+    const screws: BedScrewsScrew[] = []
 
     if (config) {
       for (let index = 1; index <= 99; index++) {
-        const key = `screw${index}`
+        const key = `screw${index}` as const
         const coords = config[key]
 
         if (!coords) {
           break
         }
 
-        const fine = config[`screw${index}_fine_adjust`]
         const name = config[`screw${index}_name`]
-        const prettyName = Vue.$filters.prettyCase(name || i18n.t('app.general.label.screw_number', { index: index + 1 }))
+        const prettyName = name
+          ? Vue.$filters.prettyCase(name)
+          : i18n.t('app.general.label.screw_number', { index: index + 1 }).toString()
 
         screws.push({
           key,
           name,
           prettyName,
-          fine,
           x: coords[0],
           y: coords[1]
         })
       }
     }
 
-    return screws
+    return {
+      ...state.printer.bed_screws,
+      screws
+    }
   },
 
-  getScrewsTiltAdjust: (state, getters) => {
-    const config = getters.getPrinterSettings('screws_tilt_adjust')
+  getScrewsTiltAdjust: (state): ScrewsTiltAdjust => {
+    const config = state.printer.configfile.settings.screws_tilt_adjust
     const screws: ScrewsTiltAdjustScrew[] = []
 
-    const { results, ...rest } = state.printer.screws_tilt_adjust
+    const { results, ...rest } = state.printer.screws_tilt_adjust ?? {}
 
-    for (let index = 1; index <= 99; index++) {
-      const key = `screw${index}`
-      const result = results?.[key]
+    if (config) {
+      for (let index = 1; index <= 99; index++) {
+        const key = `screw${index}` as const
+        const result = results?.[key]
 
-      if (!result) {
-        break
-      }
+        if (!result) {
+          break
+        }
 
-      const coords = config[key]
-      const name = config[`${key}_name`]
-      const prettyName = Vue.$filters.prettyCase(name || i18n.t('app.general.label.screw_number', { index: index + 1 }))
-      const [hours, minutes] = result.adjust
-        .split(':')
-        .map(Number)
-      const adjustMinutes = hours * 60 + minutes
+        const coords = config[key]
+        const name = config[`${key}_name`]
+        const prettyName = name
+          ? Vue.$filters.prettyCase(name)
+          : i18n.t('app.general.label.screw_number', { index: index + 1 }).toString()
+        const [hours, minutes] = result.adjust
+          .split(':')
+          .map(Number)
+        const adjustMinutes = hours * 60 + minutes
 
-      screws.push({
-        key,
-        name,
-        prettyName,
-        ...result,
-        adjustMinutes,
-        x: coords[0],
-        y: coords[1]
-      })
+        screws.push({
+          key,
+          name,
+          prettyName,
+          ...result,
+          adjustMinutes,
+          x: coords[0],
+          y: coords[1]
+        })
+      }
     }
 
     return {
       ...rest,
       screws
-    } as ScrewsTiltAdjust
+    }
   },
 
-  /**
-   * Return a required setting from the printer.config object.
-   */
-  getPrinterSettings: (state) => (setting: string) => {
-    if (
-      state.printer &&
-      state.printer.configfile &&
-      state.printer.configfile.settings
-    ) {
-      if (setting) return get(state.printer.configfile.settings, setting.toLowerCase(), undefined)
-      return state.printer.configfile.settings
-    }
-    return undefined
+  getPrinterSettings: (state) => {
+    return state.printer.configfile.settings
   },
 
-  getPrinterConfig: (state) => (config: string) => {
-    if (
-      state.printer &&
-      state.printer.configfile &&
-      state.printer.configfile.config
-    ) {
-      if (config) return get(state.printer.configfile.config, config, undefined)
-      return state.printer.configfile.config
-    }
-    return undefined
+  getPrinterConfig: (state) => {
+    return state.printer.configfile.config
   },
 
   getHasWarnings: (state, getters, rootState) => {
@@ -926,8 +938,8 @@ export const getters: GetterTree<PrinterState, RootState> = {
     )
   },
 
-  getPrinterWarnings: (state, getters) => {
-    const config = getters.getPrinterConfig()
+  getPrinterWarnings: (state) => {
+    const config = state.printer.configfile.config
     const warnings = []
 
     if (config) {
@@ -958,32 +970,28 @@ export const getters: GetterTree<PrinterState, RootState> = {
     return state.printer.configfile?.warnings || []
   },
 
-  getMoonrakerFailedComponents: (state, getters, rootState, rootGetters) => {
-    const serverInfo = rootGetters['server/getInfo'] as ServerInfo
+  getMoonrakerFailedComponents: (state, getters, rootState) => {
+    const serverInfo = rootState.server.info
 
     return serverInfo.failed_components || []
   },
 
-  getMoonrakerWarnings: (state, getters, rootState, rootGetters) => {
-    const serverInfo = rootGetters['server/getInfo'] as ServerInfo
+  getMoonrakerWarnings: (state, getters, rootState) => {
+    const serverInfo = rootState.server.info
 
     return serverInfo.warnings || []
   },
 
   getSaveConfigPending: (state): boolean => {
-    const saveConfigPending = state.printer.configfile?.save_config_pending as boolean | undefined
-
-    return saveConfigPending || false
+    return state.printer.configfile?.save_config_pending || false
   },
 
-  getSaveConfigPendingItems: (state): Record<string, Record<string, string>> => {
-    const saveConfigPendingItems = state.printer.configfile?.save_config_pending_items as Record<string, Record<string, string>> | undefined
-
-    return saveConfigPendingItems || {}
+  getSaveConfigPendingItems: (state): KlipperPrinterConfig => {
+    return state.printer.configfile?.save_config_pending_items || {} as KlipperPrinterConfig
   },
 
-  getHasRoundBed: (_, getters): boolean => {
-    const kinematics = getters.getPrinterSettings('printer.kinematics') || ''
+  getHasRoundBed: (state): boolean => {
+    const kinematics = state.printer.configfile.settings.printer?.kinematics ?? ''
 
     return [
       'delta',
@@ -1015,13 +1023,13 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getAvailableCommands: (state, getters, rootState, rootGetters): GcodeCommands => {
-    const availableCommands = state.printer.gcode.commands as GcodeCommands | null
+    const availableCommands = state.printer.gcode?.commands
 
     if (availableCommands) {
       return availableCommands
     }
 
-    const knownCommands = rootGetters['console/getAllKnownCommands'] as GcodeHelp
+    const knownCommands: GcodeHelp = rootGetters['console/getAllKnownCommands']
 
     return Object.entries(knownCommands)
       .reduce((availableCommands, [key, help]) => {
@@ -1050,15 +1058,19 @@ export const getters: GetterTree<PrinterState, RootState> = {
     )
   },
 
-  getSupportsBeacon: (state, getters) => {
-    return getters.getPrinterSettings('beacon') != null
+  getSupportsBeacon: (state) => {
+    return 'beacon' in state.printer.configfile.settings
   },
 
-  getBeaconModels: (state, getters) => {
-    const beacon = state.printer.beacon as BeaconState
+  getBeaconModels: (state) => {
+    const beacon = state.printer.beacon
 
-    const models = Object.keys(getters.getPrinterSettings())
-      .filter(key => key.startsWith('beacon model '))
+    if (beacon == null) {
+      return []
+    }
+
+    const models: BeaconModel[] = Object.keys(state.printer.configfile.settings)
+      .filter((key): key is `beacon model ${string}` => key.startsWith('beacon model '))
       .map(key => {
         const name = key.substring(13)
 
@@ -1072,7 +1084,13 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getExcludeObjectParts: (state): ExcludeObjectPart[] => {
-    const { objects, current_object, excluded_objects } = state.printer.exclude_object as ExcludeObjectState
+    const exclude_object = state.printer.exclude_object
+
+    if (exclude_object == null) {
+      return []
+    }
+
+    const { objects, current_object, excluded_objects } = exclude_object
 
     return objects
       .map((obj): ExcludeObjectPart => ({
@@ -1083,6 +1101,11 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getHasExcludeObjectParts: (state): boolean => {
-    return state.printer.exclude_object.objects.length > 0
+    const exclude_object = state.printer.exclude_object
+
+    return (
+      exclude_object != null &&
+      exclude_object.objects.length > 0
+    )
   }
 }
diff --git a/src/store/printer/mutations.ts b/src/store/printer/mutations.ts
index 7da8146dde..24eb1767ae 100644
--- a/src/store/printer/mutations.ts
+++ b/src/store/printer/mutations.ts
@@ -2,7 +2,6 @@ import Vue from 'vue'
 import type { MutationTree } from 'vuex'
 import type { PrinterState } from './types'
 import { defaultState } from './state'
-import { consola } from 'consola'
 import { get } from 'lodash-es'
 
 export const mutations: MutationTree<PrinterState> = {
@@ -34,7 +33,7 @@ export const mutations: MutationTree<PrinterState> = {
   },
 
   setQueryEndstops (state, payload) {
-    state.printer.endstops = payload
+    state.endstops = payload
   },
 
   setPrinterObjectList (state, payload) {
@@ -44,17 +43,15 @@ export const mutations: MutationTree<PrinterState> = {
   },
 
   setClearEndStops (state) {
-    state.printer.endstops = {}
+    state.endstops = {}
   },
 
   setClearScrewsTiltAdjust (state) {
-    state.printer.screws_tilt_adjust = {}
-  },
-
-  setResetCurrentFile (state) {
-    const newState = defaultState().printer.current_file
-    consola.debug('resetting current file', newState)
-    Vue.set(state.printer, 'current_file', newState)
+    state.printer.screws_tilt_adjust = {
+      error: false,
+      max_deviation: 0,
+      results: {}
+    }
   },
 
   setSocketNotify (state, payload) {
diff --git a/src/store/printer/state.ts b/src/store/printer/state.ts
index 0abac17ef8..5c474ebbf5 100644
--- a/src/store/printer/state.ts
+++ b/src/store/printer/state.ts
@@ -10,14 +10,18 @@ export const defaultState = (): PrinterState => {
       state: '',
       state_message: ''
     },
+    endstops: {},
     manualProbeDialogOpen: false,
     bedScrewsAdjustDialogOpen: false,
     screwsTiltAdjustDialogOpen: false,
     forceMoveEnabled: false,
     printer: {
-      endstops: {},
       bed_mesh: {
-        profile_name: ''
+        profile_name: '',
+        mesh_min: [0, 0],
+        mesh_max: [0, 0],
+        mesh_matrix: [],
+        probed_matrix: [],
       },
       heaters: {
         available_heaters: [],
@@ -33,46 +37,31 @@ export const defaultState = (): PrinterState => {
           display_status: {},
           'gcode_macro CANCEL_PRINT': {}
         },
-        settings: {
-          bed_mesh: {},
-          fan: {},
-          printer: {
-            max_accel_to_decel: 500,
-            minimum_cruise_ratio: 0.5,
-            max_accel: 1000,
-            max_velocity: 100,
-            square_corner_velocity: 3,
-            kinematics: 'none'
-          },
-          virtual_sdcard: {},
-          pause_resume: {},
-          display_status: {},
-          'gcode_macro cancel_print': {},
-          extruder: {
-            max_extrude_only_velocity: 100,
-            max_extrude_only_distance: 100
-          }
-        }
+        settings: {}
       },
       objects: [],
       idle_timeout: {
-        state: ''
+        state: '',
+        printing_time: 0
       },
       print_stats: {
         state: '',
         print_duration: 0,
         total_duration: 0,
         filament_used: 0,
-        filename: ''
+        filename: '',
+        message: ''
       },
       display_status: {
         progress: 0,
         message: ''
       },
       virtual_sdcard: {
-        file_position: 0,
+        file_path: null,
+        progress: 0,
         is_active: false,
-        progress: 0
+        file_position: 0,
+        file_size: 0
       },
       toolhead: {
         estimated_print_time: 0,
@@ -82,11 +71,12 @@ export const defaultState = (): PrinterState => {
         minimum_cruise_ratio: null,
         max_velocity: 0,
         position: [0, 0, 0, 0],
-        axis_minimum: [],
-        axis_maximum: [],
+        axis_minimum: [0, 0, 0, 0],
+        axis_maximum: [0, 0, 0, 0],
         print_time: 0,
         square_corner_velocity: 0,
-        extruder: ''
+        extruder: '',
+        stalls: 0
       },
       motion_report: {
         live_position: [0, 0, 0, 0],
@@ -99,18 +89,15 @@ export const defaultState = (): PrinterState => {
         unretract_speed: 0,
         retract_speed: 0
       },
-      current_file: {
-        estimated_time: 0,
-        filament_total: 0,
-        thumbnails: []
-      },
-      gcode: {
-        commands: null
-      },
       gcode_move: {
         gcode_position: [0, 0, 0, 0],
-        homing_origin: [],
-        speed: 0
+        homing_origin: [0, 0, 0, 0],
+        speed: 0,
+        absolute_coordinates: false,
+        absolute_extrude: false,
+        extrude_factor: 1,
+        position: [0, 0, 0, 0],
+        speed_factor: 1
       },
       manual_probe: {
         is_active: false,
@@ -124,7 +111,6 @@ export const defaultState = (): PrinterState => {
         current_screw: 0,
         accepted_screws: 0
       },
-      screws_tilt_adjust: {},
       webhooks: {
         state: '',
         state_message: ''
@@ -133,6 +119,11 @@ export const defaultState = (): PrinterState => {
         objects: [],
         excluded_objects: [],
         current_object: null
+      },
+      system_stats: {
+        cputime: 0,
+        memavail: 0,
+        sysload: 0
       }
     }
   }
diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
index 26a406e985..9ff591bdeb 100644
--- a/src/store/printer/types.ts
+++ b/src/store/printer/types.ts
@@ -2,11 +2,12 @@ import type { Globals } from '@/globals'
 
 export interface PrinterState {
   info: PrinterInfo;
+  endstops: Record<string, 'TRIGGERED' | 'open'>
   manualProbeDialogOpen: boolean;
   bedScrewsAdjustDialogOpen: boolean;
   screwsTiltAdjustDialogOpen: boolean;
   forceMoveEnabled: boolean;
-  printer: Record<string, any>;
+  printer: KlipperPrinterState;
 }
 
 export interface PrinterInfo {
@@ -25,30 +26,1015 @@ export interface PrinterInfo {
   app?: string;
 }
 
-export interface KnownExtruder {
+export interface KlipperPrinterState {
+  [key: string]: any;
+
+  // These keys are always available
+
+  objects: string[];
+
+  configfile: KlipperPrinterConfigFileState;
+
+  gcode_move: KlipperPrinterGcodeMoveState;
+
+  idle_timeout: KlipperPrinterIdleTimeoutState;
+
+  system_stats: KlipperPrinterSystemStatsState;
+
+  toolhead: KlipperPrinterToolheadState;
+
+  webhooks: KlipperPrinterWebhookState;
+
+  // These keys might not be available (hence the ?)
+
+  [key: `angle ${string}`]: KlipperPrinterAngleState;
+
+  bed_mesh?: KlipperPrinterBedMeshState;
+
+  bed_screws?: KlipperPrinterBedScrewsState;
+
+  display_status?: KlipperPrinterDisplayStatusState;
+
+  endstop_phase?: KlipperPrinterEndstopPhaseState;
+
+  exclude_object?: KlipperPrinterExcludeObjectState;
+
+  [key: `extruder_stepper ${string}`]: KlipperPrinterExtruderStepperState;
+
+  fan?: KlipperPrinterFanState;
+
+  [key: `${'heater_fan' | 'controller_fan'} ${string}`]: KlipperPrinterFanState;
+
+  [key: `filament_switch_sensor ${string}`]: KlipperPrinterFilamentSwitchSensorState;
+
+  [key: `filament_motion_sensor ${string}`]: KlipperPrinterFilamentMotionSensorState;
+
+  firmware_retraction?: KlipperPrinterFirmwareRetractionState;
+
+  gcode?: KlipperPrinterGcodeState;
+
+  [key: `gcode_button ${string}`]: KlipperPrinterGcodeButtonState;
+
+  [key: `gcode_macro ${string}`]: KlipperPrinterGcodeMacroState;
+
+  hall_filament_width_sensor?: KlipperPrinterHallFilamentWidthSensorState;
+
+  extruder?: KlipperPrinterExtruderState;
+
+  [key: `extruder${number}`]: KlipperPrinterExtruderState;
+
+  heater_bed?: KlipperPrinterHeaterBedState;
+
+  [key: `heater_generic ${string}`]: KlipperPrinterHeaterGenericState;
+
+  heaters?: KlipperPrinterHeatersState;
+
+  [key: `${'led' | 'neopixel' | 'dotstar' | 'pca9533' | 'pca9632'} ${string}`]: KlipperPrinterLedState;
+
+  manual_probe?: KlipperPrinterManualProbeState;
+
+  menu?: KlipperPrinterMenuState;
+
+  mcu?: KlipperPrinterMcuState;
+
+  [key: `mcu ${string}`]: KlipperPrinterMcuState;
+
+  motion_report?: KlipperPrinterMotionReportState;
+
+  [key: `${'output_pin' | 'pwm_tool'} ${string}`]: KlipperPrinterOutputPinState;
+
+  pause_resume?: KlipperPrinterPauseResumeState;
+
+  print_stats?: KlipperPrinterPrintStatsState;
+
+  probe?: KlipperPrinterProbeState;
+
+  bltouch?: KlipperPrinterProbeState;
+
+  [key: `pwm_cycle_time ${string}`]: KlipperPrinterPwmCycleTimeState;
+
+  quad_gantry_level?: KlipperPrinterQuadGantryLevelState;
+
+  query_endstops?: KlipperPrinterQueryEndstopsState;
+
+  screws_tilt_adjust?: KlipperPrinterScrewsTiltAdjustState;
+
+  [key: `servo ${string}`]: KlipperPrinterServoState;
+
+  stepper_enable?: KlipperPrinterStepperEnableState;
+
+  [key: `${'aht10' | 'bme280' | 'htu21d' | 'sht3x' | 'lm75' | 'temperature_host' | 'temperature_combined'} ${string}`]: KlipperPrinterTemperatureSensor2State;
+
+  [key: `temperature_fan ${string}`]: KlipperPrinterTemperatureFanState;
+
+  [key: `temperature_sensor ${string}`]: KlipperPrinterTemperatureSensorState;
+
+  [key: `tmc${'2130' | '2208' | '2209' | '2660' | '2240' | '5160'} ${string}`]: KlipperPrinterTmcState;
+
+  dual_carriage?: KlipperDualCarriageState;
+
+  virtual_sdcard?: KlipperPrinterVirtualSdcardState;
+
+  z_thermal_adjust?: KlipperPrinterZThermalAdjustState;
+
+  z_tilt?: KlipperPrinterZTiltState;
+
+  // These keys are for external modules
+
+  [key: `belay ${string}`]: KlipperPrinterBelayState;
+
+  dockable_probe?: KlipperPrinterDockableProbeState;
+
+  mixing_extruder?: KlipperPrinterMixingExtruderState;
+
+  tools_calibrate?: KlipperPrinterToolsCalibrateState;
+
+  trad_rack?: KlipperPrinterTradRackState;
+
+  beacon?: KlipperPrinterBeaconState;
+}
+
+export interface KlipperPrinterConfigFileState {
+  config: KlipperPrinterConfig;
+  settings: KlipperPrinterSettings;
+  warnings: {
+    type: string;
+    message: string;
+  }[];
+  save_config_pending?: boolean;
+  save_config_pending_items?: KlipperPrinterConfig | null;
+}
+
+export interface KlipperPrinterGcodeMoveState {
+  speed_factor: number;
+  speed: number;
+  extrude_factor: number;
+  absolute_coordinates: boolean;
+  absolute_extrude: boolean;
+  homing_origin: [number, number, number, number];
+  position: [number, number, number, number];
+  gcode_position: [number, number, number, number];
+}
+
+export interface KlipperPrinterIdleTimeoutState {
+  state: string;
+  printing_time: number;
+}
+
+export interface KlipperPrinterSystemStatsState {
+  sysload: number;
+  cputime: number;
+  memavail: number;
+}
+
+export interface KlipperPrinterToolheadState {
+  homed_axes: string;
+  axis_minimum: [number, number, number, number];
+  axis_maximum: [number, number, number, number];
+  print_time: number;
+  stalls: number;
+  estimated_print_time: number;
+  extruder: string;
+  position: [number, number, number, number];
+  max_velocity: number;
+  max_accel: number;
+  max_accel_to_decel?: number | null;
+  minimum_cruise_ratio?: number | null;
+  square_corner_velocity: number;
+  cone_start_z?: number;
+}
+
+export interface KlipperPrinterWebhookState {
+  state: string;
+  state_message: string;
+}
+
+export interface KlipperPrinterAngleState {
+  temperature: number;
+}
+
+export interface KlipperPrinterBedMeshState {
+  profile_name: string;
+  mesh_min: [number, number];
+  mesh_max: [number, number];
+  probed_matrix: number[][];
+  mesh_matrix: number[][];
+  profiles?: Record<string, KlipperPrinterBedMeshProfileState>;
+}
+
+export interface KlipperPrinterBedMeshProfileState {
+  points: number[][];
+  mesh_params: {
+    min_x: number;
+    max_x: number;
+    min_y: number;
+    max_y: number;
+    x_count: number;
+    y_count: number;
+    mesh_x_pps: number;
+    mesh_y_pps: number;
+    algo: string;
+    tension: number;
+  };
+}
+
+export interface KlipperPrinterBedScrewsState {
+  is_active: boolean;
+  state: string | null;
+  current_screw: number;
+  accepted_screws: number;
+}
+
+export interface KlipperPrinterDisplayStatusState {
+  progress: number;
+  message: string | null;
+}
+
+export interface KlipperPrinterEndstopPhaseState {
+  last_home: Record<string, {
+    phase: number;
+    phases: number;
+    mcu_position: number;
+  }>;
+}
+
+export interface KlipperPrinterExcludeObjectState {
+  objects: KlipperPrinterExcludeObjectObjectState[];
+  current_object: string | null;
+  excluded_objects: string[];
+}
+
+export interface KlipperPrinterExcludeObjectObjectState {
   name: string;
-  key: string;
+  polygon?: [number, number][];
+  center?: [number, number] | [number, number, number];
 }
 
-export interface Extruder {
-  config: ExtruderConfig
+export interface KlipperPrinterExtruderStepperState {
+  pressure_advance: number;
+  smooth_time: number;
+  motion_queue?: string | null;
+}
+
+export interface KlipperPrinterFanState {
+  speed: number;
+  rpm: number | null;
+  power?: number;
+  value?: number;
+}
+
+export interface KlipperPrinterFilamentSwitchSensorState {
+  enabled: boolean;
+  filament_detected: boolean;
+}
+
+export interface KlipperPrinterFilamentMotionSensorState {
+  enabled: boolean;
+  filament_detected: boolean;
+}
+
+export interface KlipperPrinterFirmwareRetractionState {
+  retract_length: number;
+  retract_speed: number;
+  unretract_extra_length: number;
+  unretract_speed: number;
+  unretract_length?: number;
+  retract_state?: boolean;
+  z_hop_height?: number;
+  zhop_state?: boolean;
+}
+
+export interface KlipperPrinterGcodeState {
+  commands: GcodeCommands;
+}
+
+export interface KlipperPrinterGcodeButtonState {
+  state: 'PRESSED' | 'RELEASED';
+}
+
+export interface KlipperPrinterGcodeMacroState extends Record<string, any> {
+}
+
+export interface KlipperPrinterHallFilamentWidthSensorState {
+  is_active: boolean;
+  Diameter: number;
+  Raw: number;
+}
+
+export interface KlipperPrinterExtruderState {
   temperature: number;
   target: number;
   power: number;
   can_extrude: boolean;
+  pressure_advance: number;
+  smooth_time: number;
+  motion_queue?: string | null;
+  pid_profile?: string;
+}
+
+export interface KlipperPrinterHeaterBedState {
+  temperature: number;
+  target: number;
+  power: number;
+  pid_profile?: string;
+}
+
+export interface KlipperPrinterHeaterGenericState {
+  temperature: number;
+  target: number;
+  power: number;
+}
+
+export interface KlipperPrinterHeatersState {
+  available_heaters: string[];
+  available_sensors: string[];
+  available_monitors?: string[];
+}
+
+export interface KlipperPrinterLedState {
+  color_data: number[][];
+}
+
+export interface KlipperPrinterManualProbeState {
+  is_active: boolean;
+  z_position: number | null;
+  z_position_lower: number | null;
+  z_position_upper: number | null;
+}
+
+export interface KlipperPrinterMenuState {
+  timeout: number;
+  running: boolean;
+  rows: number;
+  cols: number;
+}
+
+export interface KlipperPrinterMcuState {
+  mcu_version?: string;
+  mcu_build_versions?: string;
+  mcu_constants?: Record<string, string | number>;
+  last_stats?: Record<string, string | number>;
+  app?: string;
+  non_critical_disconnected?: boolean;
+}
+
+export interface KlipperPrinterMotionReportState {
+  live_position: [number, number, number, number];
+  live_velocity: number;
+  live_extruder_velocity: number;
+  steppers?: string[];
+  trapq?: string[];
+}
+
+export interface KlipperPrinterOutputPinState {
+  value: number;
+}
+
+export interface KlipperPrinterPauseResumeState {
+  is_paused: boolean;
+}
+
+export interface KlipperPrinterPrintStatsState {
+  filename: string;
+  total_duration: number;
+  print_duration: number;
+  filament_used: number;
+  state: string;
+  message: string;
+  info?: {
+    total_layer: number | null;
+    current_layer: number | null;
+  }
+}
+
+export interface KlipperPrinterProbeState {
+  name?: string;
+  last_query: boolean;
+  last_z_result: number;
+}
+
+export interface KlipperPrinterPwmCycleTimeState {
+  value: number;
+}
+
+export interface KlipperPrinterQuadGantryLevelState {
+  applied: boolean;
+}
+
+export interface KlipperPrinterQueryEndstopsState {
+  last_query: Record<string, boolean>;
+}
+
+export interface KlipperPrinterScrewsTiltAdjustState {
+  error: boolean;
+  max_deviation: number | null;
+  results: Record<string, {
+    z: number;
+    sign: 'CW' | 'CCW';
+    adjust: string;
+    is_base: boolean;
+  }>
+}
+
+export interface KlipperPrinterServoState {
+  value: number;
+}
+
+export interface KlipperPrinterStepperEnableState {
+  steppers: Record<string, boolean>;
+}
+
+export interface KlipperPrinterTemperatureSensor2State {
+  temperature: number;
+  humidity?: number;
+  pressure?: number;
+  gas?: number;
+}
+
+export interface KlipperPrinterTemperatureFanState {
+  temperature: number;
+  target: number;
+}
+
+export interface KlipperPrinterTemperatureSensorState {
+  temperature: number;
+  measured_min_temp: number;
+  measured_max_temp: number;
+}
+
+export interface KlipperPrinterTmcState {
+  mcu_phase_offset: number;
+  phase_offset_position: number;
+  run_current: number;
+  hold_current: number;
+  drv_status: number | null;
+  temperature: number | null;
+}
+
+export interface KlipperDualCarriageState {
+  carriage_0: 'INACTIVE' | 'ACTIVE';
+  carriage_1: 'INACTIVE' | 'ACTIVE' | 'COPY' | 'MIRROR';
+}
+
+export interface KlipperPrinterVirtualSdcardState {
+  file_path: string | null;
+  progress: number;
+  is_active: boolean;
+  file_position: number;
+  file_size: number;
+}
+
+export interface KlipperPrinterZThermalAdjustState {
+  enabled: boolean;
+  temperature: number;
+  measured_min_temp: number;
+  measured_max_temp: number;
+  current_z_adjust: number;
+  z_adjust_ref_temperature: number;
+}
+
+export interface KlipperPrinterZTiltState {
+  applied: boolean;
+}
+
+export interface KlipperPrinterBelayState {
+  last_state: boolean;
+  enabled: boolean;
+}
+
+export interface KlipperPrinterDockableProbeState {
+  last_status: 'UNKNOWN' | 'ATTACHED' | 'DOCKED'
+}
+
+export interface KlipperPrinterMixingExtruderState {
+  mixing: string;
+  ticks: string;
+}
+
+export interface KlipperPrinterToolsCalibrateState {
+  sensor_location: {
+    x: number;
+    y: number;
+    z: number;
+  } | null;
+  last_result: {
+    x: number;
+    y: number;
+    z: number;
+  } | null;
+  calibration_probe_inactive: boolean;
+}
+
+export interface KlipperPrinterTradRackState {
+  curr_lane: number | null;
+  active_lane: number | null;
+  next_lane: number | null;
+  next_tool: number | null;
+  tool_map: any[];
+  selector_homed: boolean;
+}
+
+export interface KlipperPrinterBeaconState {
+  last_sample?: {
+    time: number;
+    value: number;
+    temp: number;
+    dist?: number | null;
+  } | null;
+  last_received_sample?: {
+    temp: number;
+    clock: number;
+    time: number;
+    data: number;
+    data_smooth: number;
+    freq: number;
+  } | null;
+  last_z_result?: number | null,
+  last_probe_position?: [number, number] | null,
+  last_probe_result?: number | null,
+  last_offset_result?: number | null,
+  last_poke_result?: number | null
+  model?: string | null;
+}
+
+export interface KlipperPrinterConfig extends Record<string, Record<string, string>> {
+}
+
+export interface KlipperPrinterSettings {
+  [key: string]: any;
+
+  mcu?: KlipperPrinterMcuSettings;
+
+  [key: `mcu ${string}`]: KlipperPrinterMcuSettings;
+
+  [key: `tmc${'2130' | '2208' | '2209' | '2660' | '2240' | '5160'} ${string}`]: KlipperPrinterTmcSettings;
+
+  fan?: KlipperPrinterFanSettings;
+
+  [key: `${'heater_fan'} ${string}`]: KlipperPrinterHeaterFanSettings;
+
+  [key: `${'controller_fan'} ${string}`]: KlipperPrinterControllerFanSettings;
+
+  [key: `output_pin ${string}`]: KlipperPrinterOutputPinSettings;
+
+  [key: `${'led' | 'neopixel' | 'dotstar' | 'pca9533' | 'pca9632'} ${string}`]: KlipperPrinterLedSettings;
+
+  [key: `temperature_sensor ${string}`]: KlipperPrinterTemperatureSensorSettings;
+
+  safe_z_home?: KlipperPrinterSafeZHomeSettings;
+
+  z_tilt?: KlipperPrinterZTiltSettings;
+
+  bed_mesh?: KlipperPrinterBedMeshSettings;
+
+  board_pins?: KlipperPrinterBoardPinsSettings;
+
+  [key: `bed_mesh ${string}`]: KlipperPrinterBedMeshModelSettings;
+
+  bed_screws?: KlipperPrinterBedScrewsSettings;
+
+  screws_tilt_adjust?: KlipperPrinterScrewsTiltAdjustSettings;
+
+  firmware_retraction?: KlipperPrinterFirmwareRetractionSettings;
+
+  force_move?: KlipperPrinterForceMoveSettings;
+
+  gcode_arcs?: KlipperPrinterGcodeArcsSettings;
+
+  respond?: KlipperPrinterRespondSettings;
+
+  virtual_sdcard?: KlipperPrinterVirtualSdcardSettings;
+
+  pause_resume?: KlipperPrinterPauseResumeSettings;
+
+  delta_calibrate?: KlipperPrinterDeltaCalibrateSettings;
+
+  [key: `gcode_macro ${string}`]: KlipperPrinterGcodeMacroSettings;
+
+  heater_bed?: KlipperPrinterHeaterBedSettings;
+
+  [key: `verify_heater ${string}`]: KlipperPrinterVerifyHeaterSettings;
+
+  probe?: KlipperPrinterProbeSettings;
+
+  bltouch?: KlipperPrinterProbeSettings;
+
+  input_shaper?: KlipperPrinterInputShaperSettings;
+
+  printer?: KlipperPrinterPrinterSettings;
+
+  [key: `stepper_${string}`]: KlipperPrinterStepperSettings;
+
+  [key: `extruder_stepper ${string}`]: KlipperPrinterExtruderStepperSettings;
+
+  idle_timeout?: KlipperPrinterIdleTimeoutSettings;
+
+  extruder?: KlipperPrinterExtruderSettings;
+
+  [key: `extruder${number}`]: KlipperPrinterExtruderSettings;
+
+  exclude_object?: KlipperPrinterExcludeObjectSettings;
+
+  [key: `endstop_phase ${string}`]: KlipperPrinterEndstopPhaseSettings;
+
+  [key: `display_template ${string}`]: KlipperPrinterDisplayTemplateSettings;
+
+  // These keys are for external modules
+
+  beacon?: KlipperPrinterBeaconSettings;
+
+  [key: `beacon model ${string}`]: KlipperPrinterBeaconModelSettings;
+}
+
+export interface KlipperPrinterMcuSettings {
+  serial: string;
+  baud?: number;
+  restart_method?: string;
+  max_stepper_error: number;
+  is_non_critical?: boolean;
+  reconnect_interval?: number;
+}
+
+export interface KlipperPrinterTmcSettings {
+  cs_pin: string;
+  spi_speed: number;
+  spi_bus: string;
+  rref: number;
+  run_current: number;
+  hold_current: number;
+  interpolate: boolean;
+  [key: `driver_${string}`]: number | boolean;
+}
+
+export interface KlipperPrinterFanSettings {
+  max_power: number;
+  kick_start_time: number;
+  off_below: number;
+  cycle_time: number;
+  hardware_pwm: boolean;
+  shutdown_speed: number;
+  pin: string;
+}
+
+export interface KlipperPrinterHeaterFanSettings {
+  heater: string[];
+  heater_temp: number;
+  max_power: number;
+  kick_start_time: number;
+  off_below: number;
+  cycle_time: number;
+  hardware_pwm: boolean;
+  shutdown_speed: number;
+  pin: string;
+  fan_speed: number;
+}
+
+export interface KlipperPrinterControllerFanSettings {
+  max_power: number;
+  kick_start_time: number;
+  off_below: number;
+  cycle_time: number;
+  hardware_pwm: boolean;
+  shutdown_speed: number;
+  pin: string;
+  fan_speed: number;
+  idle_speed: number;
+  idle_timeout: number;
+  stepper?: string;
+}
+
+export interface KlipperPrinterOutputPinSettings {
+  pwm: boolean;
+  pin: string;
+  cycle_time?: number;
+  hardware_pwm?: boolean;
+  scale?: number;
+  static_value?: number;
+  value: number;
+  shutdown_value: number;
+  maximum_mcu_duration?: number;
+}
+
+export interface KlipperPrinterLedSettings {
+  pin: string;
+  chain_count: number;
+  color_order: string[];
+  initial_red: number;
+  initial_green: number;
+  initial_blue: number;
+  initial_white: number;
+}
+
+export interface KlipperPrinterTemperatureSensorSettings {
+  sensor_type: string;
+  pullup_resistor?: number;
+  inline_resistor?: number;
+  sensor_mcu?: string;
+  i2c_mcu?: string;
+  i2c_speed?: number;
+  i2c_address?: number;
+  i2c_bus?: string;
+  min_temp: number;
+  max_temp: number;
+  gcode_id?: string;
+}
+
+export interface KlipperPrinterSafeZHomeSettings {
+  home_xy_position: [number, number]
+  z_hop: number;
+  z_hop_speed: number;
+  speed: number;
+  move_to_previous: boolean;
+}
+
+export interface KlipperPrinterZTiltSettings {
+  z_positions: [number, number][];
+  retries: number;
+  retry_tolerance: number;
+  points: [number, number][];
+  horizontal_move_z: number;
+  speed: number;
+}
+
+export interface KlipperPrinterBedMeshSettings {
+  adaptive_margin?: number;
+  probe_count: [number, number];
+  mesh_min: [number, number];
+  mesh_max: [number, number];
+  mesh_pps: [number, number];
+  algorithm: string;
+  bicubic_tension?: number;
+  scan_overshoot?: 0;
+  zero_reference_position: [number, number];
+  horizontal_move_z: number;
+  speed: number;
+  fade_start: number;
+  fade_end: number;
+  fade_target: number;
+  split_delta_z: number;
+  move_check_distance: number;
+}
+
+export interface KlipperPrinterBoardPinsSettings {
+  mcu: string[];
+  aliases: [string, string][];
+}
+
+export interface KlipperPrinterBedMeshModelSettings {
+  version: number;
+  points: number[][];
+  min_x: number;
+  max_x: number;
+  min_y: number;
+  max_y: number;
+  x_count: number;
+  y_count: number;
+  mesh_x_pps: number;
+  mesh_y_pps: number;
+  algo: string;
+  tension: number;
+}
+
+export interface KlipperPrinterBedScrewsSettings {
+  [key: `screw${number}`]: [number, number];
+  [key: `screw${number}_name`]: string;
+  [key: `screw${number}_fine_adjust`]: [number, number];
+  speed: number;
+  probe_speed: number;
+  horizontal_move_z: number;
+  probe_height: number;
+}
+
+export interface KlipperPrinterScrewsTiltAdjustSettings {
+  [key: `screw${number}`]: [number, number];
+  [key: `screw${number}_name`]: string;
+  screw_thread: string;
+  horizontal_move_z: number;
+  speed: number;
+  adaptive_horizontal_move_z?: boolean;
+  min_horizontal_move_z?: number;
+  use_probe_xy_offsets?: boolean;
+}
+
+export interface KlipperPrinterFirmwareRetractionSettings {
+  retract_length: number;
+  retract_speed: number;
+  unretract_extra_length: number;
+  unretract_speed: number;
+  z_hop_height?: number;
+  clear_zhop_on_z_moves?: boolean;
+}
+
+export interface KlipperPrinterForceMoveSettings {
+  enable_force_move: boolean;
+}
+
+export interface KlipperPrinterGcodeArcsSettings {
+  resolution: number;
+}
+
+export interface KlipperPrinterRespondSettings {
+  default_type: string;
+  default_prefix: string;
+  enable_respond?: boolean;
+}
+
+export interface KlipperPrinterVirtualSdcardSettings {
+  path: string;
+  on_error_gcode: string;
+  with_subdirs?: boolean;
+}
+
+export interface KlipperPrinterPauseResumeSettings {
+  recover_velocity: number;
+}
+
+export interface KlipperPrinterDeltaCalibrateSettings {
+  radius: number;
+  horizontal_move_z: number;
+  speed: number;
+}
+
+export interface KlipperPrinterGcodeMacroSettings {
+  gcode: string;
+  rename_existing?: string;
+  description: string;
+  [key: `variable_${string}`]: string;
+}
+
+export interface KlipperPrinterHeaterBedSettings {
+  sensor_type: string;
+  pullup_resistor: number;
+  inline_resistor: number;
+  sensor_pin: string;
+  min_temp: number;
+  max_temp: number;
   min_extrude_temp: number;
-  pressure_advance?: number;
-  smooth_time?: number;
+  max_power: number;
+  smooth_time: number;
+  control: string;
+  max_delta?: number;
+  pid_kp: number;
+  pid_ki: number;
+  pid_kd: number;
+  heater_pin: string;
+  pwm_cycle_time: number;
+  pid_version?: number;
 }
 
-export interface ExtruderConfig {
+export interface KlipperPrinterVerifyHeaterSettings {
+  hysteresis: number;
+  max_error: number;
+  heating_gain: number;
+  check_gain_time: number;
+}
+
+export interface KlipperPrinterProbeSettings {
+  z_offset: number;
+  deactivate_on_each_sample: boolean;
+  activate_gcode: string;
+  deactivate_gcode: string;
+  pin: string;
+  x_offset: number;
+  y_offset: number;
+  speed: number;
+  lift_speed: number;
+  samples: number;
+  sample_retract_dist: number;
+  samples_result: string;
+  samples_tolerance: number;
+  samples_tolerance_retries: number;
+}
+
+export interface KlipperPrinterInputShaperSettings {
+  shaper_type: string;
+  shaper_type_x: string;
+  damping_ratio_x: number;
+  shaper_freq_x: number;
+  shaper_type_y: string;
+  damping_ratio_y: number;
+  shaper_freq_y: number;
+}
+
+export interface KlipperPrinterPrinterSettings {
+  kinematics: string;
+  max_velocity: number;
+  max_accel: number;
+  minimum_cruise_ratio?: number;
+  square_corner_velocity?: number;
+  max_z_velocity?: number;
+  max_z_accel?: number;
+  delta_radius?: number;
+  max_accel_to_decel?: number;
+}
+
+export interface KlipperPrinterStepperSettings {
+  step_pin: string;
+  dir_pin: string;
+  rotation_distance: number;
+  microsteps: number;
+  full_steps_per_rotation: number;
+  gear_ratio: [number, number][];
+  enable_pin: string;
+  endstop_pin: string;
+  position_endstop: number;
+  position_min?: number;
+  position_max?: number;
+  homing_speed: number;
+  second_homing_speed: number;
+  homing_retract_speed: number;
+  homing_retract_dist: number;
+  homing_positive_dir: boolean;
+  arm_length?: number;
+  angle?: number;
+  use_sensorless_homing?: boolean;
+  min_home_dist?: number;
+}
+
+export interface KlipperPrinterExtruderStepperSettings {
+  pressure_advance: number;
+  pressure_advance_smooth_time: number;
+  step_pin: string;
+  dir_pin: string;
+  rotation_distance: number;
+  microsteps: number;
+  full_steps_per_rotation: number;
+  gear_ratio: [number, number][];
+  enable_pin: string;
+  extruder?: string | null;
+}
+
+export interface KlipperPrinterIdleTimeoutSettings {
+  timeout: number;
+  gcode: string;
+}
+
+export interface KlipperPrinterExtruderSettings {
+  sensor_type: string;
+  pullup_resistor: number;
+  inline_resistor: number;
+  sensor_pin: string;
+  min_temp: number;
+  max_temp: number;
+  min_extrude_temp: number;
+  max_power: number;
+  smooth_time: number;
+  control: string;
+  max_delta?: number;
+  pid_kp?: number;
+  pid_ki?: number;
+  pid_kd?: number;
+  heater_pin: string;
+  pwm_cycle_time: number;
   nozzle_diameter: number;
   filament_diameter: number;
-  min_extrude_temp: number;
-  max_extrude_only_distance: number;
+  max_extrude_cross_section: number;
   max_extrude_only_velocity: number;
-  pressure_advance?: number;
-  pressure_advance_smooth_time?: number;
+  max_extrude_only_accel: number;
+  max_extrude_only_distance: number;
+  instantaneous_corner_velocity: number;
+  step_pin: string;
+  pressure_advance: number;
+  pressure_advance_smooth_time: number;
+  dir_pin: string;
+  rotation_distance: number;
+  microsteps: number;
+  full_steps_per_rotation: number;
+  gear_ratio: [number, number][];
+  enable_pin: string;
+  pid_version?: number;
+  per_move_pressure_advance?: boolean;
+}
+
+export interface KlipperPrinterExcludeObjectSettings {
+  enable_exclude_object?: boolean;
+}
+
+export interface KlipperPrinterEndstopPhaseSettings {
+  endstop_align_zero: boolean;
+  endstop_accuracy: number;
+}
+
+export interface KlipperPrinterDisplayTemplateSettings {
+  text: string;
+}
+
+export interface KlipperPrinterBeaconSettings extends Record<string, any> {
+}
+
+export interface KlipperPrinterBeaconModelSettings extends Record<string, any> {
+}
+
+// Custom classes start here
+
+export interface KnownExtruder {
+  name: string;
+  key: 'extruder' | `extruder${number}`;
+}
+
+export interface Extruder extends KlipperPrinterExtruderState {
+  config: KlipperPrinterExtruderSettings;
+  min_extrude_temp: number;
 }
 
 export interface ExtruderStepper extends StepperType<ExtruderStepperConfig> {
@@ -63,7 +1049,8 @@ export interface ExtruderStepperConfig {
   pressure_advance_smooth_time?: number;
 }
 
-export interface Stepper extends StepperType {}
+export interface Stepper extends StepperType {
+}
 
 export type StepperType<T = Record<string, any>> = {
   config: T;
@@ -73,16 +1060,10 @@ export type StepperType<T = Record<string, any>> = {
   enabled?: boolean;
 }
 
-export interface MCU {
+export interface MCU extends KlipperPrinterMcuState {
   name: string;
   prettyName: string;
-  last_stats?: Record<string, string | number>;
-  mcu_build_versions?: string;
-  mcu_constants?: Record<string, string | number>;
-  mcu_version?: string;
-  app?: string;
-  non_critical_disconnected?: boolean;
-  config: Record<string, any>;
+  config: KlipperPrinterMcuSettings;
 }
 
 export type OutputType<T = Record<string, any>> = {
@@ -168,29 +1149,22 @@ export interface RunoutSensor {
 
 export interface Endstop {
   name: string;
-  state: string;
+  state: 'TRIGGERED' | 'open';
 }
 
-export interface Probe {
-  last_z_result: number;
-  last_query: boolean;
-  name: ProbeName;
+export interface BedScrews extends Partial<KlipperPrinterBedScrewsState> {
+  screws: BedScrewsScrew[];
 }
 
-export type ProbeName = 'bltouch' | 'smart_effector' | 'probe'
-
-export interface BedScrews {
+export interface BedScrewsScrew {
   key: string;
   name: string;
   prettyName: string;
-  fine: number;
   x: number;
   y: number;
 }
 
-export interface ScrewsTiltAdjust {
-  error: boolean;
-  max_deviation?: number | null;
+export interface ScrewsTiltAdjust extends Partial<Omit<KlipperPrinterScrewsTiltAdjustState, 'results'>> {
   screws: ScrewsTiltAdjustScrew[]
 }
 
@@ -207,45 +1181,6 @@ export interface ScrewsTiltAdjustScrew {
   is_base: boolean;
 }
 
-// printer.mcu[num]
-export interface KlipperMcu {
-  last_stats: KlipperMcuStats;
-  mcu_build_versions: string;
-  mcu_constraints: KlipperMcuConstraints;
-  mcu_version: string;
-}
-
-export interface KlipperMcuStats {
-  bytes_invalid: number;
-  bytes_read: number;
-  bytes_retransmit: number;
-  bytes_write: number;
-  freq: number;
-  mcu_awake: number;
-  mcu_task_avg: number;
-  mcu_task_stddev: number;
-  ready_bytes: number;
-  receive_seq: number;
-  retransmit_seq: number;
-  rto: number;
-  rttvar: number;
-  send_seq: number;
-  srtt: number;
-  stalled_bytes: number;
-}
-
-export interface KlipperMcuConstraints {
-  MCU: string;
-  CLOCK_FREQ: string;
-}
-
-// printers.system_stats
-export interface SystemStats {
-  cputime: number;
-  memavail: number;
-  sysload: number;
-}
-
 export interface BedSize {
   minX: number;
   minY: number;
@@ -253,8 +1188,7 @@ export interface BedSize {
   maxY: number;
 }
 
-export interface GcodeCommands {
-  [key: string]: GcodeCommand
+export interface GcodeCommands extends Record<string, GcodeCommand> {
 }
 
 export interface GcodeCommand {
@@ -271,33 +1205,6 @@ export interface TimeEstimates {
   eta: number;
 }
 
-export interface BeaconState {
-  last_sample?: BeaconLastSample | null;
-  last_received_sample?: BeaconLastReceivedSample | null;
-  last_z_result?: number | null,
-  last_probe_position?: [number, number] | null,
-  last_probe_result?: number | null,
-  last_offset_result?: number | null,
-  last_poke_result?: number | null
-  model?: string | null;
-}
-
-export interface BeaconLastSample {
-  time: number;
-  value: number;
-  temp: number;
-  dist?: number | null;
-}
-
-export interface BeaconLastReceivedSample {
-  temp: number;
-  clock: number;
-  time: number;
-  data: number;
-  data_smooth: number;
-  freq: number;
-}
-
 export interface BeaconModel {
   name: string;
   active: boolean;
@@ -313,19 +1220,7 @@ export interface KlippyApp {
   minVersion: string;
 }
 
-export interface ExcludeObjectState {
-  objects: ExcludeObjectObject[];
-  current_object: string | null;
-  excluded_objects: string[];
-}
-
-export interface ExcludeObjectObject {
-  name: string;
-  polygon?: [number, number][];
-  center?: [number, number] | [number, number, number];
-}
-
-export interface ExcludeObjectPart extends ExcludeObjectObject {
+export interface ExcludeObjectPart extends KlipperPrinterExcludeObjectObjectState {
   isExcluded: boolean;
   isCurrent: boolean;
 }
diff --git a/src/store/server/getters.ts b/src/store/server/getters.ts
index 9676a1ec84..2cd2a0885f 100644
--- a/src/store/server/getters.ts
+++ b/src/store/server/getters.ts
@@ -1,43 +1,15 @@
 import type { GetterTree } from 'vuex'
-import type { ServerInfo, ServerConfig, ServerState, SystemInfo, ServerSystemStat, ServiceInfo, ServiceState } from './types'
+import type { ServerState, ServiceInfo, ServiceState } from './types'
 import type { RootState } from '../types'
 import { Globals } from '@/globals'
 import { gte, valid } from 'semver'
 
 export const getters: GetterTree<ServerState, RootState> = {
-  /**
-   * Get's the current server info
-   */
-  getInfo: (state): ServerInfo => {
-    return state.info
-  },
-
   getIsMinApiVersion: (state) => (minVersion: string) => {
     const apiVersion = state.info.api_version_string
     return apiVersion && valid(apiVersion) && valid(minVersion) && gte(apiVersion, minVersion)
   },
 
-  /**
-   * Gets the current system info
-   */
-  getSystemInfo: (state): SystemInfo | null => {
-    return state.system_info
-  },
-
-  /**
-   * Return server config
-   */
-  getConfig: (state): ServerConfig => {
-    return state.config
-  },
-
-  /**
-   * Return server process stats
-   */
-  getProcessStats: (state): ServerSystemStat[] => {
-    return state.moonraker_stats
-  },
-
   /**
    * Indicates if a component is enabled
    */
diff --git a/src/store/server/types.ts b/src/store/server/types.ts
index 2d1349f73b..09534c46d0 100644
--- a/src/store/server/types.ts
+++ b/src/store/server/types.ts
@@ -8,6 +8,9 @@ export interface ServerState {
   moonraker_stats: ServerSystemStat[];
   throttled_state: ServerThrottledState | null;
   cpu_temp: number | null;
+  system_cpu_usage?: Record<string, number>;
+  system_uptime?: number;
+  websocket_connections?: number;
 }
 
 export interface ServerSystemStat {
diff --git a/src/store/spoolman/actions.ts b/src/store/spoolman/actions.ts
index 415927e675..92c549bd25 100644
--- a/src/store/spoolman/actions.ts
+++ b/src/store/spoolman/actions.ts
@@ -35,8 +35,8 @@ export const actions: ActionTree<SpoolmanState, RootState> = {
     commit('setActiveSpool', payload.spool_id)
   },
 
-  async onSpoolChange ({ commit, getters }, { type, payload }: WebsocketSpoolPayload) {
-    const spools = [...getters.getAvailableSpools as Spool[]]
+  async onSpoolChange ({ commit, state }, { type, payload }: WebsocketSpoolPayload) {
+    const spools = [...state.availableSpools]
 
     switch (type) {
       case 'added': {
@@ -69,13 +69,13 @@ export const actions: ActionTree<SpoolmanState, RootState> = {
     commit('setAvailableSpools', spools)
   },
 
-  async onFilamentChange ({ commit, getters }, { type, payload }: WebsocketFilamentPayload) {
+  async onFilamentChange ({ commit, state }, { type, payload }: WebsocketFilamentPayload) {
     if (type !== 'updated') {
       // we only care about updated filament types
       return
     }
 
-    const spools = [...getters.getAvailableSpools as Spool[]]
+    const spools = [...state.availableSpools]
     for (const spool of spools) {
       if (spool.filament.id === payload.id) {
         spools[spools.indexOf(spool)] = {
@@ -88,13 +88,13 @@ export const actions: ActionTree<SpoolmanState, RootState> = {
     commit('setAvailableSpools', spools)
   },
 
-  async onVendorChange ({ commit, getters }, { type, payload }: WebsocketVendorPayload) {
+  async onVendorChange ({ commit, state }, { type, payload }: WebsocketVendorPayload) {
     if (type !== 'updated') {
       // we only care about updated vendors
       return
     }
 
-    const spools = [...getters.getAvailableSpools as Spool[]]
+    const spools = [...state.availableSpools]
     for (const spool of spools) {
       if (spool.filament.vendor?.id === payload.id) {
         spools[spools.indexOf(spool)] = {
diff --git a/src/store/spoolman/getters.ts b/src/store/spoolman/getters.ts
index 511823380f..5cfb15a67f 100644
--- a/src/store/spoolman/getters.ts
+++ b/src/store/spoolman/getters.ts
@@ -7,23 +7,14 @@ export const getters: GetterTree<SpoolmanState, RootState> = {
     return state.availableSpools.find(spool => spool.id === state.activeSpool)
   },
 
-  getActiveSpoolId: (state) => {
-    return state.activeSpool
-  },
-
-  getAvailableSpools: (state) => {
-    return state.availableSpools
-  },
-
   getSpoolById: (state) => {
     return (id: number) => state.availableSpools.find((spool: Spool) => spool.id === id)
   },
 
-  getConnected: (state) => {
-    return state.connected
-  },
-
   getAvailable: (state) => {
-    return state.connected && state.availableSpools.length
+    return (
+      state.connected &&
+      state.availableSpools.length > 0
+    )
   }
 }
diff --git a/src/store/timelapse/getters.ts b/src/store/timelapse/getters.ts
index 8236227d9d..913bd934e8 100644
--- a/src/store/timelapse/getters.ts
+++ b/src/store/timelapse/getters.ts
@@ -3,19 +3,7 @@ import type { TimelapseSettings, TimelapseState } from './types'
 import type { RootState } from '../types'
 
 export const getters: GetterTree<TimelapseState, RootState> = {
-  getSettings: (state) => {
-    return state.settings
-  },
-
-  getLastFrame: (state) => {
-    return state.lastFrame
-  },
-
-  getRenderStatus: (state) => {
-    return state.renderStatus
-  },
-
-  isBlockedSetting: (state) => {
-    return (setting: keyof TimelapseSettings): boolean => state.settings?.blockedsettings.includes(setting) ?? true
+  isBlockedSetting: (state) => (setting: keyof TimelapseSettings): boolean => {
+    return state.settings?.blockedsettings.includes(setting) ?? true
   }
 }
diff --git a/src/store/webcams/getters.ts b/src/store/webcams/getters.ts
index d9c8802ccc..26db4188d7 100644
--- a/src/store/webcams/getters.ts
+++ b/src/store/webcams/getters.ts
@@ -9,14 +9,14 @@ export const getters: GetterTree<WebcamsState, RootState> = {
   },
 
   getEnabledWebcams: (state, getters) => {
-    const webcams = getters.getWebcams as WebcamConfig[]
+    const webcams: WebcamConfig[] = getters.getWebcams
 
     return webcams
       .filter(webcam => webcam.enabled)
   },
 
   getVisibleWebcams: (state, getters) => {
-    const enabledWebcams = getters.getEnabledWebcams as WebcamConfig[]
+    const enabledWebcams: WebcamConfig[] = getters.getEnabledWebcams
 
     return state.activeWebcam === 'all'
       ? enabledWebcams
diff --git a/src/util/transform-mesh.ts b/src/util/transform-mesh.ts
index 160c609762..1f09fdce61 100644
--- a/src/util/transform-mesh.ts
+++ b/src/util/transform-mesh.ts
@@ -1,6 +1,7 @@
-import type { KlipperBedMesh, ProcessedMesh } from '@/store/mesh/types'
+import type { KlipperPrinterBedMeshState } from '@/store/printer/types'
+import type { ProcessedMesh } from '@/store/mesh/types'
 
-export const transformMesh = (bedMesh: KlipperBedMesh, meshMatrix: 'probed_matrix' | 'mesh_matrix', makeFlat = false): ProcessedMesh => {
+export const transformMesh = (bedMesh: KlipperPrinterBedMeshState, meshMatrix: 'probed_matrix' | 'mesh_matrix', makeFlat = false): ProcessedMesh => {
   const matrix = bedMesh[meshMatrix]
   const coordinates = []
   let min = 0
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index f9ff0392d4..882ed61f85 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -60,6 +60,7 @@ import SpoolmanCard from '@/components/widgets/spoolman/SpoolmanCard.vue'
 import SensorsCard from '@/components/widgets/sensors/SensorsCard.vue'
 import RunoutSensorsCard from '@/components/widgets/runout-sensors/RunoutSensorsCard.vue'
 import BeaconCard from '@/components/widgets/beacon/BeaconCard.vue'
+import type { KlipperPrinterSettings } from '@/store/printer/types'
 
 @Component({
   components: {
@@ -115,6 +116,10 @@ export default class Dashboard extends Mixins(StateMixin) {
     return 12 / this.columnCount
   }
 
+  get printerSettings (): KlipperPrinterSettings {
+    return this.$store.getters['printer/getPrinterSettings']
+  }
+
   get hasCameras (): boolean {
     return this.$store.getters['webcams/getEnabledWebcams'].length > 0
   }
@@ -132,7 +137,7 @@ export default class Dashboard extends Mixins(StateMixin) {
   }
 
   get firmwareRetractionEnabled (): boolean {
-    return 'firmware_retraction' in this.$store.getters['printer/getPrinterSettings']()
+    return 'firmware_retraction' in this.printerSettings
   }
 
   get supportsJobQueue (): boolean {
diff --git a/src/views/FullscreenCamera.vue b/src/views/FullscreenCamera.vue
index c27ee6e6df..6ce7c41e02 100644
--- a/src/views/FullscreenCamera.vue
+++ b/src/views/FullscreenCamera.vue
@@ -25,7 +25,7 @@ export default class FullscreenCamera extends Vue {
 
   created () {
     const cameraId = this.$route.params.cameraId
-    const camera = this.$store.getters['webcams/getWebcamById'](cameraId) as WebcamConfig | undefined
+    const camera: WebcamConfig | undefined = this.$store.getters['webcams/getWebcamById'](cameraId)
 
     this.camera = camera ?? null
   }
diff --git a/src/views/Tune.vue b/src/views/Tune.vue
index bf25709b15..6d56b79639 100644
--- a/src/views/Tune.vue
+++ b/src/views/Tune.vue
@@ -18,7 +18,10 @@
         v-if="supportsBedMesh"
         class="mb-2 mb-sm-4"
       />
-      <end-stops-card class="mb-2 mb-sm-4" />
+      <end-stops-card
+        v-if="supportsEndStops"
+        class="mb-2 mb-sm-4"
+      />
       <runout-sensors-card
         v-if="supportsRunoutSensors"
         fullscreen
@@ -55,6 +58,13 @@ export default class Tune extends Mixins(StateMixin) {
     return this.$store.getters['mesh/getSupportsBedMesh']
   }
 
+  get supportsEndStops () {
+    return (
+      this.$store.getters['printer/getSteppers'].length > 0 ||
+      this.$store.getters['printer/getProbe'] != null
+    )
+  }
+
   get supportsRunoutSensors () {
     return this.$store.getters['printer/getRunoutSensors'].length
   }