diff --git a/.gitignore b/.gitignore
index 695b6036bb..5a1d88c64c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+
+*.tsbuildinfo
diff --git a/src/components/settings/cameras/Cameras.vue b/src/components/settings/cameras/Cameras.vue
index 897b782ff1..374765073c 100644
--- a/src/components/settings/cameras/Cameras.vue
+++ b/src/components/settings/cameras/Cameras.vue
@@ -99,11 +99,9 @@ import { Component, Vue } from 'vue-property-decorator'
 import { CameraConfig } from '@/store/cameras/types'
 import CameraConfigDialog from './CameraConfigDialog.vue'
 import { Globals } from '@/globals'
-import AppSetting from '@/components/ui/AppSetting.vue'
 
 @Component({
   components: {
-    AppSetting,
     CameraConfigDialog
   }
 })
diff --git a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
index 9b5ebf55ac..10d0cd2ab9 100644
--- a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
+++ b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
@@ -53,18 +53,14 @@
 <script lang="ts">
 import { Component, Mixins, Ref } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import CollapsableCard from '@/components/common/CollapsableCard.vue'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { ParkPosition, TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
-import ParkExtrudeRetractSettings from '@/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue'
+import ParkExtrudeRetractSettings from './ParkExtrudeRetractSettings.vue'
 import { VInput } from '@/types'
 
 @Component({
   components: {
-    ParkExtrudeRetractSettings,
-    AppSetting,
-    CollapsableCard
+    ParkExtrudeRetractSettings
   }
 })
 export default class LayerMacroSettings extends Mixins(StateMixin) {
diff --git a/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue b/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue
index 18764e3c90..cce04f7d11 100644
--- a/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue
+++ b/src/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue
@@ -97,18 +97,11 @@
 <script lang="ts">
 import { Component, Mixins, Ref } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import CollapsableCard from '@/components/common/CollapsableCard.vue'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
 import { VInput } from '@/types'
 
-@Component({
-  components: {
-    AppSetting,
-    CollapsableCard
-  }
-})
+@Component({})
 export default class LayerMacroSettings extends Mixins(StateMixin) {
   @Ref('parkRetractDistanceElement')
   readonly parkRetractDistanceElement!: VInput
diff --git a/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue b/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue
index c4cb6a1476..b064158de0 100644
--- a/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue
+++ b/src/components/settings/timelapse/subsettings/ToolheadParkingSettings.vue
@@ -125,18 +125,16 @@
 <script lang="ts">
 import { Component, Mixins, Ref } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { ParkPosition, TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
-import ParkExtrudeRetractSettings from '@/components/settings/timelapse/subsettings/ParkExtrudeRetractSettings.vue'
-import CustomParkPositionSettings from '@/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue'
+import ParkExtrudeRetractSettings from './ParkExtrudeRetractSettings.vue'
+import CustomParkPositionSettings from './CustomParkPositionSettings.vue'
 import { VInput } from '@/types'
 
 @Component({
   components: {
     CustomParkPositionSettings,
-    ParkExtrudeRetractSettings,
-    AppSetting
+    ParkExtrudeRetractSettings
   }
 })
 export default class LayerMacroSettings extends Mixins(StateMixin) {
diff --git a/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue b/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue
index 18a254fdf4..890683d1d8 100644
--- a/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue
+++ b/src/components/settings/timelapse/subsettings/modes/HyperlapseSettings.vue
@@ -28,16 +28,11 @@
 <script lang="ts">
 import { Component, Mixins, Ref } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
 import { VInput } from '@/types'
 
-@Component({
-  components: {
-    AppSetting
-  }
-})
+@Component({})
 export default class HyperlapseSettings extends Mixins(StateMixin) {
   @Ref('hyperlapseCycleElement')
   readonly hyperlapseCycleElement!: VInput
diff --git a/src/components/widgets/bedmesh/BedMeshControls.vue b/src/components/widgets/bedmesh/BedMeshControls.vue
index 7f409051f1..898eb86091 100644
--- a/src/components/widgets/bedmesh/BedMeshControls.vue
+++ b/src/components/widgets/bedmesh/BedMeshControls.vue
@@ -286,12 +286,10 @@ import SaveMeshDialog from './SaveMeshDialog.vue'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
 import { KlipperMesh, ProcessedMesh } from '@/store/mesh/types'
-import ManualProbeDialog from '@/components/common/ManualProbeDialog.vue'
 
 @Component({
   components: {
-    SaveMeshDialog,
-    ManualProbeDialog
+    SaveMeshDialog
   }
 })
 export default class BedMesh extends Mixins(StateMixin, ToolheadMixin) {
diff --git a/src/components/widgets/diagnostics/DiagnosticsCard.vue b/src/components/widgets/diagnostics/DiagnosticsCard.vue
index b13b07b03b..5a0b2092d3 100644
--- a/src/components/widgets/diagnostics/DiagnosticsCard.vue
+++ b/src/components/widgets/diagnostics/DiagnosticsCard.vue
@@ -33,14 +33,10 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from 'vue-property-decorator'
-import CollapsableCard from '@/components/common/CollapsableCard.vue'
 import { DiagnosticsCardConfig } from '@/store/diagnostics/types'
-import AppChart from '@/components/ui/AppChart.vue'
 import { EChartsOption } from 'echarts'
 
-@Component({
-  components: { AppChart, CollapsableCard }
-})
+@Component({})
 export default class DiagnosticsCard extends Vue {
   @Prop({ type: Object, required: true })
   readonly config!: DiagnosticsCardConfig
diff --git a/src/components/widgets/diagnostics/config/AxesConfigStep.vue b/src/components/widgets/diagnostics/config/AxesConfigStep.vue
index ad7fc31550..916ae26c6f 100644
--- a/src/components/widgets/diagnostics/config/AxesConfigStep.vue
+++ b/src/components/widgets/diagnostics/config/AxesConfigStep.vue
@@ -100,11 +100,8 @@
 <script lang="ts">
 import { Component, Vue, Prop } from 'vue-property-decorator'
 import { DiagnosticsCardConfig } from '@/store/diagnostics/types'
-import AppSetting from '@/components/ui/AppSetting.vue'
 
-@Component({
-  components: { AppSetting }
-})
+@Component({})
 export default class AxesConfigStep extends Vue {
   @Prop({ type: Object, required: true })
   readonly config!: DiagnosticsCardConfig
diff --git a/src/components/widgets/diagnostics/config/CardConfigStep.vue b/src/components/widgets/diagnostics/config/CardConfigStep.vue
index 7c29f2f1af..1e605858de 100644
--- a/src/components/widgets/diagnostics/config/CardConfigStep.vue
+++ b/src/components/widgets/diagnostics/config/CardConfigStep.vue
@@ -66,12 +66,9 @@
 <script lang="ts">
 import { Component, Vue, Prop } from 'vue-property-decorator'
 import { DiagnosticsCardConfig } from '@/store/diagnostics/types'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { Icons } from '@/globals'
 
-@Component({
-  components: { AppSetting }
-})
+@Component({})
 export default class CardConfigStep extends Vue {
   @Prop({ type: Object, required: true })
   readonly config!: DiagnosticsCardConfig
diff --git a/src/components/widgets/diagnostics/config/MetricsCollectorConfig.vue b/src/components/widgets/diagnostics/config/MetricsCollectorConfig.vue
index e4a3037509..ca15ed343f 100644
--- a/src/components/widgets/diagnostics/config/MetricsCollectorConfig.vue
+++ b/src/components/widgets/diagnostics/config/MetricsCollectorConfig.vue
@@ -77,12 +77,13 @@
 <script lang="ts">
 import { Component, Vue, Prop, Ref } from 'vue-property-decorator'
 import { Metric } from '@/store/diagnostics/types'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import sandboxedEval from '@/plugins/sandboxedEval'
 import StateExplorer from '@/components/widgets/diagnostics/StateExplorer.vue'
 
 @Component({
-  components: { StateExplorer, AppSetting }
+  components: {
+    StateExplorer
+  }
 })
 export default class MetricsCollectorConfig extends Vue {
   @Prop({ type: Object, required: true })
diff --git a/src/components/widgets/diagnostics/config/MetricsConfigStep.vue b/src/components/widgets/diagnostics/config/MetricsConfigStep.vue
index 31610b91e7..fd65c43343 100644
--- a/src/components/widgets/diagnostics/config/MetricsConfigStep.vue
+++ b/src/components/widgets/diagnostics/config/MetricsConfigStep.vue
@@ -159,12 +159,13 @@
 <script lang="ts">
 import { Component, Vue, Prop } from 'vue-property-decorator'
 import { DiagnosticsCardConfig, Metric } from '@/store/diagnostics/types'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import MetricsCollectorConfig from './MetricsCollectorConfig.vue'
 import { defaultState } from '@/store/layout/state'
 
 @Component({
-  components: { AppSetting, MetricsCollectorConfig }
+  components: {
+    MetricsCollectorConfig
+  }
 })
 export default class MetricsConfigStep extends Vue {
   @Prop({ type: Object, required: true })
diff --git a/src/components/widgets/filesystem/FileSystemToolbar.vue b/src/components/widgets/filesystem/FileSystemToolbar.vue
index 987b4577bc..6d3be4f96a 100644
--- a/src/components/widgets/filesystem/FileSystemToolbar.vue
+++ b/src/components/widgets/filesystem/FileSystemToolbar.vue
@@ -145,11 +145,9 @@ import StatesMixin from '@/mixins/state'
 import FileSystemMenu from './FileSystemMenu.vue'
 import FileSystemFilterMenu from './FileSystemFilterMenu.vue'
 import { AppTableHeader } from '@/types'
-import AppBtnCollapseGroup from '@/components/ui/AppBtnCollapseGroup.vue'
 
 @Component({
   components: {
-    AppBtnCollapseGroup,
     FileSystemMenu,
     FileSystemFilterMenu
   }
diff --git a/src/components/widgets/gcode-preview/GcodePreviewCard.vue b/src/components/widgets/gcode-preview/GcodePreviewCard.vue
index 9bd355569c..60b67684ad 100644
--- a/src/components/widgets/gcode-preview/GcodePreviewCard.vue
+++ b/src/components/widgets/gcode-preview/GcodePreviewCard.vue
@@ -148,15 +148,13 @@ import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import FilesMixin from '@/mixins/files'
 import GcodePreview from './GcodePreview.vue'
-import GcodePreviewControls from '@/components/widgets/gcode-preview/GcodePreviewControls.vue'
+import GcodePreviewControls from './GcodePreviewControls.vue'
+import GcodePreviewParserProgressDialog from './GcodePreviewParserProgressDialog.vue'
 import { AppFile } from '@/store/files/types'
-import GcodePreviewParserProgressDialog from '@/components/widgets/gcode-preview/GcodePreviewParserProgressDialog.vue'
 import { MinMax } from '@/store/gcodePreview/types'
-import AppBtnCollapseGroup from '@/components/ui/AppBtnCollapseGroup.vue'
 
 @Component({
   components: {
-    AppBtnCollapseGroup,
     GcodePreviewParserProgressDialog,
     GcodePreview,
     GcodePreviewControls
diff --git a/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue b/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue
index da26c4dc8e..3acb6a2d24 100644
--- a/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue
+++ b/src/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue
@@ -206,14 +206,11 @@
 import { Component, Prop, Mixins, Ref, VModel } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import { SocketActions } from '@/api/socketActions'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { TimelapseLastFrame, TimelapseSettings } from '@/store/timelapse/types'
 import { defaultWritableSettings } from '@/store/timelapse/state'
 import { VInput } from '@/types'
 
-@Component({
-  components: { AppSetting }
-})
+@Component({})
 export default class TimelapseRenderSettingsDialog extends Mixins(StateMixin) {
   @VModel({ type: Boolean, required: true })
     open!: boolean
diff --git a/src/components/widgets/timelapse/TimelapseSettingsCard.vue b/src/components/widgets/timelapse/TimelapseSettingsCard.vue
index aeef57fa13..1a1a8b24aa 100644
--- a/src/components/widgets/timelapse/TimelapseSettingsCard.vue
+++ b/src/components/widgets/timelapse/TimelapseSettingsCard.vue
@@ -55,13 +55,10 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
 
-@Component({
-  components: { AppSetting }
-})
+@Component({})
 export default class TimelapseSettingsCard extends Mixins(StateMixin) {
   get enabledBlocked () {
     return this.$store.getters['timelapse/isBlockedSetting']('enabled')
diff --git a/src/components/widgets/timelapse/TimelapseStatusCard.vue b/src/components/widgets/timelapse/TimelapseStatusCard.vue
index 594dafb7ba..a6edef1f41 100644
--- a/src/components/widgets/timelapse/TimelapseStatusCard.vue
+++ b/src/components/widgets/timelapse/TimelapseStatusCard.vue
@@ -76,21 +76,13 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import FileSystem from '@/components/widgets/filesystem/FileSystem.vue'
-import CollapsableCard from '@/components/common/CollapsableCard.vue'
-import AppSlider from '@/components/ui/AppSlider.vue'
-import AppSetting from '@/components/ui/AppSetting.vue'
 import { RenderStatus, TimelapseLastFrame, TimelapseSettings } from '@/store/timelapse/types'
 import { SocketActions } from '@/api/socketActions'
-import AppBtn from '@/components/ui/AppBtn.vue'
 import CameraItem from '@/components/widgets/camera/CameraItem.vue'
 
 @Component({
   components: {
     CameraItem,
-    AppBtn,
-    AppSetting,
-    AppSlider,
-    CollapsableCard,
     FileSystem
   }
 })
diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
index 67a5d0b61e..6b5c2aa9bf 100644
--- a/src/components/widgets/toolhead/ToolheadCard.vue
+++ b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -118,15 +118,11 @@
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
-import Toolhead from '@/components/widgets/toolhead/Toolhead.vue'
-import ManualProbeDialog from '@/components/common/ManualProbeDialog.vue'
-import BedScrewsAdjustDialog from '@/components/common/BedScrewsAdjustDialog.vue'
+import Toolhead from './Toolhead.vue'
 
 @Component({
   components: {
-    Toolhead,
-    ManualProbeDialog,
-    BedScrewsAdjustDialog
+    Toolhead
   }
 })
 export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
diff --git a/src/views/Configure.vue b/src/views/Configure.vue
index 8777de71ad..2222193695 100644
--- a/src/views/Configure.vue
+++ b/src/views/Configure.vue
@@ -39,7 +39,6 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import FileSystem from '@/components/widgets/filesystem/FileSystem.vue'
-import SystemControl from '@/components/common/SystemControl.vue'
 
 import SystemOverviewCard from '@/components/widgets/system/SystemOverviewCard.vue'
 import SystemUsageCard from '@/components/widgets/system/SystemUsageCard.vue'
@@ -48,7 +47,6 @@ import DiskUsageCard from '@/components/widgets/system/DiskUsageCard.vue'
 @Component({
   components: {
     FileSystem,
-    SystemControl,
     SystemOverviewCard,
     SystemUsageCard,
     DiskUsageCard
diff --git a/src/views/Diagnostics.vue b/src/views/Diagnostics.vue
index a06efde13b..a65f3a3344 100644
--- a/src/views/Diagnostics.vue
+++ b/src/views/Diagnostics.vue
@@ -79,13 +79,16 @@ import { v4 as uuidv4 } from 'uuid'
 import StateMixin from '@/mixins/state'
 import { DiagnosticsCardConfig, DiagnosticsCardContainer } from '@/store/diagnostics/types'
 import DiagnosticsCard from '@/components/widgets/diagnostics/DiagnosticsCard.vue'
-import CollapsableCard from '@/components/common/CollapsableCard.vue'
 import DiagnosticsCardConfigDialog from '@/components/widgets/diagnostics/DiagnosticsCardConfigDialog.vue'
 import { LayoutConfig } from '@/store/layout/types'
 import { defaultState } from '@/store/layout/state'
 
 @Component({
-  components: { draggable, CollapsableCard, DiagnosticsCard, DiagnosticsCardConfigDialog }
+  components: {
+    draggable,
+    DiagnosticsCard,
+    DiagnosticsCardConfigDialog
+  }
 })
 export default class Diagnostics extends Mixins(StateMixin) {
   dialogState: { active: boolean, card: DiagnosticsCardConfig | null } = {
diff --git a/src/views/History.vue b/src/views/History.vue
index 5fc5d99273..61f4e49781 100644
--- a/src/views/History.vue
+++ b/src/views/History.vue
@@ -11,14 +11,12 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import FileSystem from '@/components/widgets/filesystem/FileSystem.vue'
-import SystemControl from '@/components/common/SystemControl.vue'
 import PrinterStatsCard from '@/components/widgets/stats/PrinterStatsCard.vue'
 import PrinterHistoryCard from '@/components/widgets/history/PrintHistoryCard.vue'
 
 @Component({
   components: {
     FileSystem,
-    SystemControl,
     PrinterStatsCard,
     PrinterHistoryCard
   }
diff --git a/src/views/System.vue b/src/views/System.vue
index c0a7231a9e..6b738f0d4f 100644
--- a/src/views/System.vue
+++ b/src/views/System.vue
@@ -30,7 +30,6 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import FileSystem from '@/components/widgets/filesystem/FileSystem.vue'
-import SystemControl from '@/components/common/SystemControl.vue'
 
 import SystemOverviewCard from '@/components/widgets/system/SystemOverviewCard.vue'
 import McuCard from '@/components/widgets/system/McuCard.vue'
@@ -40,7 +39,6 @@ import DiskUsageCard from '@/components/widgets/system/DiskUsageCard.vue'
 @Component({
   components: {
     FileSystem,
-    SystemControl,
     SystemOverviewCard,
     McuCard,
     SystemUsageCard,
diff --git a/src/views/Timelapse.vue b/src/views/Timelapse.vue
index d07822832c..19010395ac 100644
--- a/src/views/Timelapse.vue
+++ b/src/views/Timelapse.vue
@@ -38,7 +38,6 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import FileSystem from '@/components/widgets/filesystem/FileSystem.vue'
-import CollapsableCard from '@/components/common/CollapsableCard.vue'
 import TimelapseStatusCard from '@/components/widgets/timelapse/TimelapseStatusCard.vue'
 import TimelapseSettingsCard from '@/components/widgets/timelapse/TimelapseSettingsCard.vue'
 import TimelapseRenderSettingsDialog from '@/components/widgets/timelapse/TimelapseRenderSettingsDialog.vue'
@@ -46,7 +45,6 @@ import TimelapseRenderSettingsDialog from '@/components/widgets/timelapse/Timela
 @Component({
   components: {
     TimelapseRenderSettingsDialog,
-    CollapsableCard,
     FileSystem,
     TimelapseStatusCard,
     TimelapseSettingsCard