diff --git a/.prettierrc b/.prettierrc
index 456bf2ce1..b0c885617 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -18,6 +18,14 @@
             "options": {
                 "tabWidth": 2
             }
+        },
+        {
+            "files": "src/locales/*.json",
+            "options": {
+                "plugins": ["prettier-plugin-sort-json"],
+                "jsonRecursiveSort": true,
+                "jsonSortOrder": "{ \"placeThisFirst\": null, \"/^[a-zA-Z0-9]/\": \"caseInsensitiveNumeric\"  }"
+            }
         }
     ]
 }
diff --git a/package-lock.json b/package-lock.json
index 255490f1d..cc060d99e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,7 +75,8 @@
                 "eslint-plugin-vue": "^9.0.0",
                 "postcss": "^8.4.31",
                 "postcss-nesting": "^12.0.1",
-                "prettier": "^3.0.0",
+                "prettier": "^3.3.3",
+                "prettier-plugin-sort-json": "^4.0.0",
                 "sass": "~1.32",
                 "start-server-and-test": "^2.0.5",
                 "typescript": "^4.5.5",
@@ -8052,9 +8053,9 @@
             }
         },
         "node_modules/prettier": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-            "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+            "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
             "dev": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
@@ -8066,6 +8067,18 @@
                 "url": "https://github.com/prettier/prettier?sponsor=1"
             }
         },
+        "node_modules/prettier-plugin-sort-json": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/prettier-plugin-sort-json/-/prettier-plugin-sort-json-4.0.0.tgz",
+            "integrity": "sha512-zV5g+bWFD2zAqyQ8gCkwUTC49o9FxslaUdirwivt5GZHcf57hCocavykuyYqbExoEsuBOg8IU36OY7zmVEMOWA==",
+            "dev": true,
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "prettier": "^3.0.0"
+            }
+        },
         "node_modules/pretty-bytes": {
             "version": "5.6.0",
             "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
diff --git a/package.json b/package.json
index 65de31342..c97fef7c1 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,8 @@
         "eslint-plugin-vue": "^9.0.0",
         "postcss": "^8.4.31",
         "postcss-nesting": "^12.0.1",
-        "prettier": "^3.0.0",
+        "prettier": "^3.3.3",
+        "prettier-plugin-sort-json": "^4.0.0",
         "sass": "~1.32",
         "start-server-and-test": "^2.0.5",
         "typescript": "^4.5.5",
diff --git a/src/components/console/ConsoleTableEntry.vue b/src/components/console/ConsoleTableEntry.vue
index e00ff72c2..f8d14f631 100644
--- a/src/components/console/ConsoleTableEntry.vue
+++ b/src/components/console/ConsoleTableEntry.vue
@@ -1,7 +1,13 @@
 <template>
     <v-row :class="entryStyle">
         <v-col class="col-auto pr-0 text--disabled console-time">{{ entryFormatTime }}</v-col>
-        <v-col :class="messageClass" style="min-width: 0" @click.capture="commandClick" v-html="event.formatMessage" />
+        <v-col
+            v-if="!rawOutput"
+            :class="messageClass"
+            style="min-width: 0"
+            @click.capture="commandClick"
+            v-html="event.formatMessage" />
+        <v-col v-else :class="messageClass" style="min-width: 0" @click.capture="commandClick" v-text="event.message" />
     </v-row>
 </template>
 
@@ -38,6 +44,10 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) {
         return classes
     }
 
+    get rawOutput() {
+        return this.$store.state.gui.console.rawOutput ?? false
+    }
+
     commandClick(event: Event) {
         const eventTarget = event.target as Element
         if (eventTarget.localName === 'a' && eventTarget.className.indexOf('command') !== -1) {
diff --git a/src/components/dialogs/TimelapseRenderingsettingsDialog.vue b/src/components/dialogs/TimelapseRenderingsettingsDialog.vue
new file mode 100644
index 000000000..035b84561
--- /dev/null
+++ b/src/components/dialogs/TimelapseRenderingsettingsDialog.vue
@@ -0,0 +1,134 @@
+<template>
+    <v-dialog :value="show" :max-width="700" :max-height="500">
+        <panel
+            :title="$t('Timelapse.RenderSettings')"
+            :icon="mdiTextBoxSearchOutline"
+            card-class="timelapse-rendersettings-dialog-panel"
+            :margin-bottom="false">
+            <template #buttons>
+                <v-btn icon @click="close">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text class="">
+                <v-row>
+                    <v-col class="col-4">
+                        <v-select
+                            v-model="variable_fps"
+                            :label="$t('Timelapse.Type')"
+                            :items="framerateTypeOptions"
+                            outlined
+                            dense
+                            hide-details />
+                    </v-col>
+                    <v-col class="col-4">
+                        <template v-if="variable_fps">
+                            <v-text-field
+                                v-model="variable_fps_min"
+                                :label="$t('Timelapse.MinFramerate')"
+                                type="number"
+                                outlined
+                                dense
+                                hide-details
+                                hide-spin-buttons />
+                            <v-text-field
+                                v-model="variable_fps_max"
+                                :label="$t('Timelapse.MaxFramerate')"
+                                type="number"
+                                outlined
+                                dense
+                                hide-details
+                                hide-spin-buttons
+                                class="mt-3" />
+                            <v-text-field
+                                v-model="targetlength"
+                                :label="$t('Timelapse.Targetlength')"
+                                type="number"
+                                outlined
+                                dense
+                                hide-details
+                                hide-spin-buttons
+                                class="mt-3" />
+                        </template>
+                        <v-text-field
+                            v-else
+                            v-model="output_framerate"
+                            :label="$t('Timelapse.Framerate')"
+                            type="number"
+                            outlined
+                            dense
+                            hide-details
+                            hide-spin-buttons />
+                        <v-text-field
+                            v-model="duplicatelastframe"
+                            :label="$t('Timelapse.DuplicateLastframe')"
+                            type="number"
+                            outlined
+                            dense
+                            hide-details
+                            hide-spin-buttons
+                            class="mt-3" />
+                    </v-col>
+                    <v-col class="col-4">
+                        <v-text-field
+                            v-if="variable_fps"
+                            v-model="variableTargetFps"
+                            :label="$t('Timelapse.TargetFps')"
+                            type="number"
+                            outlined
+                            dense
+                            hide-details
+                            readonly
+                            class="mb-3" />
+                        <v-text-field
+                            v-model="estimatedVideoLength"
+                            :label="$t('Timelapse.EstimatedLength')"
+                            outlined
+                            dense
+                            hide-details
+                            readonly />
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <v-card-actions>
+                <v-spacer />
+                <v-btn text @click="close">{{ $t('Timelapse.Cancel') }}</v-btn>
+                <v-btn text color="primary" @click="startRender">{{ $t('Timelapse.StartRender') }}</v-btn>
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import Panel from '@/components/ui/Panel.vue'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import BaseMixin from '@/components/mixins/base'
+import TimelapseMixin from '@/components/mixins/timelapse'
+import { mdiCloseThick, mdiTextBoxSearchOutline } from '@mdi/js'
+
+@Component({
+    components: { Panel, SettingsRow },
+})
+export default class TimelapseRenderingsettingsDialog extends Mixins(BaseMixin, TimelapseMixin) {
+    mdiCloseThick = mdiCloseThick
+    mdiTextBoxSearchOutline = mdiTextBoxSearchOutline
+
+    @Prop({ type: Boolean, default: false }) show!: boolean
+
+    get framerateTypeOptions() {
+        return [
+            { value: false, text: this.$t('Timelapse.Fixed') },
+            { value: true, text: this.$t('Timelapse.Variable') },
+        ]
+    }
+
+    startRender() {
+        this.$socket.emit('machine.timelapse.render', {})
+        this.close()
+    }
+
+    close() {
+        this.$emit('close')
+    }
+}
+</script>
diff --git a/src/components/mixins/timelapse.ts b/src/components/mixins/timelapse.ts
new file mode 100644
index 000000000..c1ad6be45
--- /dev/null
+++ b/src/components/mixins/timelapse.ts
@@ -0,0 +1,78 @@
+import Component from 'vue-class-component'
+import Vue from 'vue'
+
+@Component
+export default class TimelapseMixin extends Vue {
+    get variable_fps() {
+        return this.$store.state.server.timelapse?.settings?.variable_fps ?? false
+    }
+
+    set variable_fps(newVal) {
+        this.$store.dispatch('server/timelapse/saveSetting', { variable_fps: newVal })
+    }
+
+    get variable_fps_min() {
+        return this.$store.state.server.timelapse?.settings?.variable_fps_min ?? 5
+    }
+
+    set variable_fps_min(newVal) {
+        this.$store.dispatch('server/timelapse/saveSetting', { variable_fps_min: newVal })
+    }
+
+    get variable_fps_max() {
+        return this.$store.state.server.timelapse?.settings?.variable_fps_max ?? 60
+    }
+
+    set variable_fps_max(newVal) {
+        this.$store.dispatch('server/timelapse/saveSetting', { variable_fps_max: newVal })
+    }
+
+    get targetlength() {
+        return this.$store.state.server.timelapse?.settings?.targetlength ?? 10
+    }
+
+    set targetlength(newVal) {
+        this.$store.dispatch('server/timelapse/saveSetting', { targetlength: newVal })
+    }
+
+    get output_framerate() {
+        return this.$store.state.server.timelapse?.settings?.output_framerate ?? 30
+    }
+
+    set output_framerate(newVal) {
+        this.$store.dispatch('server/timelapse/saveSetting', { output_framerate: newVal })
+    }
+
+    get duplicatelastframe() {
+        return this.$store.state.server.timelapse?.settings?.duplicatelastframe ?? 0
+    }
+
+    set duplicatelastframe(newVal) {
+        this.$store.dispatch('server/timelapse/saveSetting', { duplicatelastframe: newVal })
+    }
+
+    get framesCount() {
+        return this.$store.state.server.timelapse?.lastFrame?.count ?? 0
+    }
+
+    get estimatedVideoLength() {
+        let seconds = Math.round((this.framesCount + this.duplicatelastframe) / this.output_framerate)
+
+        if (this.variable_fps) {
+            seconds = Math.round((this.framesCount + this.duplicatelastframe) / this.variableTargetFps)
+            if (seconds < this.targetlength) seconds = this.targetlength
+        }
+
+        return seconds > 60
+            ? Math.floor(seconds / 60) + 'm ' + (seconds - Math.floor(seconds / 60) * 60) + 's'
+            : seconds + 's'
+    }
+
+    get variableTargetFps() {
+        let targetFps = Math.floor(this.framesCount / this.targetlength)
+        targetFps = Math.max(targetFps, this.variable_fps_min)
+        targetFps = Math.min(targetFps, this.variable_fps_max)
+
+        return targetFps
+    }
+}
diff --git a/src/components/panels/Extruder/ExtruderControlPanelControl.vue b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
index fdb7a10a8..b430f68ab 100644
--- a/src/components/panels/Extruder/ExtruderControlPanelControl.vue
+++ b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
@@ -93,7 +93,7 @@
                             <template #activator="{ on }">
                                 <div v-on="on">
                                     <v-btn
-                                        :loading="loadings.includes('btnDetract')"
+                                        :loading="loadings.includes('btnExtrude')"
                                         :disabled="!extrudePossible || tooLargeExtrusion || printerIsPrintingOnly"
                                         small
                                         class="_btn-extruder-cmd"
@@ -157,7 +157,7 @@
                                     <template #activator="{ on }">
                                         <div class="pt-1 pb-2 px-3" v-on="on">
                                             <v-btn
-                                                :loading="loadings.includes('btnDetract')"
+                                                :loading="loadings.includes('btnExtrude')"
                                                 :disabled="
                                                     !extrudePossible || tooLargeExtrusion || printerIsPrintingOnly
                                                 "
@@ -263,15 +263,22 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ExtruderMixi
     }
 
     sendRetract(): void {
-        const gcode = `M83\nG1 E-${this.feedamount} F${this.feedrate * 60}`
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnRetract' })
+        this.sendCommand(this.feedamount * -1, 'btnRetract')
     }
 
     sendExtrude(): void {
-        const gcode = `M83\nG1 E${this.feedamount} F${this.feedrate * 60}`
+        this.sendCommand(this.feedamount, 'btnExtrude')
+    }
+
+    sendCommand(length: number, loading: string): void {
+        const gcode =
+            `SAVE_GCODE_STATE NAME=_ui_extrude\n` +
+            `M83\n` +
+            `G1 E${length} F${this.feedrate * 60}\n` +
+            `RESTORE_GCODE_STATE NAME=_ui_extrude`
+
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnDetract' })
+        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading })
     }
 }
 </script>
diff --git a/src/components/panels/MiniconsolePanel.vue b/src/components/panels/MiniconsolePanel.vue
index 1c5d0daf3..8a5168dc6 100644
--- a/src/components/panels/MiniconsolePanel.vue
+++ b/src/components/panels/MiniconsolePanel.vue
@@ -50,6 +50,13 @@
                             :label="filter.name"
                             @change="toggleFilter(filter)" />
                     </v-list-item>
+                    <v-list-item class="minHeight36">
+                        <v-checkbox
+                            v-model="rawOutput"
+                            class="mt-0"
+                            hide-details
+                            :label="$t('Panels.MiniconsolePanel.RawOutput')" />
+                    </v-list-item>
                 </v-list>
             </v-menu>
         </template>
@@ -204,6 +211,14 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'console.autoscroll', value: newVal })
     }
 
+    get rawOutput(): boolean {
+        return this.$store.state.gui.console.rawOutput ?? false
+    }
+
+    set rawOutput(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'console.rawOutput', value: newVal })
+    }
+
     commandClick(msg: string): void {
         this.gcode = msg
 
diff --git a/src/components/panels/Status/ExcludeObjectDialogMap.vue b/src/components/panels/Status/ExcludeObjectDialogMap.vue
index 2a5a18dcb..b004817f4 100644
--- a/src/components/panels/Status/ExcludeObjectDialogMap.vue
+++ b/src/components/panels/Status/ExcludeObjectDialogMap.vue
@@ -62,8 +62,8 @@
                         hoverName === object.name
                             ? primaryColor
                             : excluded_objects.includes(object.name)
-                            ? '#6668'
-                            : '#bbb'
+                              ? '#6668'
+                              : '#bbb'
                     "
                     @mouseover="showObjectTooltip(object.name)"
                     @mouseout="hideObjectTooltip"
diff --git a/src/components/panels/Timelapse/TimelapseStatusPanel.vue b/src/components/panels/Timelapse/TimelapseStatusPanel.vue
index 2129fc85c..29a3ca7d3 100644
--- a/src/components/panels/Timelapse/TimelapseStatusPanel.vue
+++ b/src/components/panels/Timelapse/TimelapseStatusPanel.vue
@@ -1,223 +1,100 @@
-<style scoped></style>
-
 <template>
-    <div>
-        <v-card class="mb-3">
-            <v-toolbar flat dense>
-                <v-toolbar-title>
-                    <span class="subheading align-baseline">
-                        <v-icon left>{{ mdiInformation }}</v-icon>
-                        {{ $t('Timelapse.Status') }}
-                    </span>
-                </v-toolbar-title>
-            </v-toolbar>
-            <v-row no-gutters>
-                <v-col class="col-12 col-sm-6 col-md-12 pb-3 pb-md-0 text--secondary">
-                    <v-card-text v-if="frameUrl" class="pb-0">
+    <panel :title="$t('Timelapse.Status')" :icon="mdiInformation" card-class="timelapse-status-panel">
+        <v-card-text v-if="framesCount">
+            <v-row v-if="frameUrl">
+                <v-col class="pb-0">
+                    <vue-load-image class="d-flex align-center justify-center">
+                        <img
+                            ref="timelapsePreview"
+                            slot="image"
+                            :src="frameUrl"
+                            :alt="$t('Timelapse.Preview').toString()"
+                            class="w-100"
+                            :style="webcamStyle"
+                            @load="calcRatio" />
+                        <div slot="preloader">
+                            <v-progress-circular indeterminate color="primary" />
+                        </div>
+                        <div slot="error">
+                            <v-icon>{{ mdiFile }}</v-icon>
+                        </div>
+                    </vue-load-image>
+                </v-col>
+            </v-row>
+            <v-row>
+                <v-col class="text--secondary">
+                    <settings-row :title="$t('Timelapse.Frames')" :dynamic-slot-width="true">
+                        {{ framesCount }}
+                    </settings-row>
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Timelapse.EstimatedLength')" :dynamic-slot-width="true">
+                        {{ estimatedVideoLength }}
+                    </settings-row>
+                    <template v-if="!['printing', 'paused'].includes(printer_state)">
+                        <v-divider class="mt-2 mb-4" />
                         <v-row>
-                            <v-col>
-                                <vue-load-image>
-                                    <img
-                                        ref="timelapsePreview"
-                                        slot="image"
-                                        :src="frameUrl"
-                                        :alt="$t('Timelapse.Preview')"
-                                        class="w-100"
-                                        :style="webcamStyle"
-                                        @load="calcRatio" />
-                                    <div slot="preloader">
-                                        <v-progress-circular indeterminate color="primary"></v-progress-circular>
-                                    </div>
-                                    <div slot="error">
-                                        <v-icon>{{ mdiFile }}</v-icon>
-                                    </div>
-                                </vue-load-image>
+                            <v-col class="text-center py-1">
+                                <v-btn
+                                    text
+                                    color="primary"
+                                    :disabled="disableRenderButton"
+                                    @click="boolDialogRendersettings = true">
+                                    {{ $t('Timelapse.Render') }}
+                                </v-btn>
+                                <v-btn
+                                    text
+                                    color="primary"
+                                    :loading="loadings.includes('timelapse_saveframes')"
+                                    @click="saveFrames">
+                                    {{ $t('Timelapse.SaveFrames') }}
+                                </v-btn>
                             </v-col>
                         </v-row>
-                    </v-card-text>
-                </v-col>
-                <v-col
-                    v-if="framesCount > 0"
-                    class="col-12 col-sm-6 col-md-12 pt-3 pt-md-0 text--secondary"
-                    align-self="center">
-                    <v-card-text :class="framesCount ? 'pt-0' : ''">
-                        <template v-if="framesCount > 0">
-                            <settings-row :title="$t('Timelapse.Frames').toString()">
-                                {{ framesCount }}
-                            </settings-row>
-                            <v-divider class="my-2"></v-divider>
-                            <settings-row
-                                :title="$t('Timelapse.EstimatedLength').toString()"
-                                :dynamic-slot-width="true">
-                                {{ estimatedVideoLength }}
-                            </settings-row>
-                        </template>
-                        <template v-if="['printing', 'paused'].includes(printer_state)">
-                            <v-divider class="my-2"></v-divider>
-                            <settings-row :title="$t('Timelapse.Enabled').toString()" :dynamic-slot-width="true">
-                                <v-switch v-model="enabled" hide-details class="mt-0"></v-switch>
-                            </settings-row>
-                            <template v-if="enabled">
-                                <v-divider v-if="framesCount > 0" class="my-2"></v-divider>
-                                <settings-row :title="$t('Timelapse.Autorender').toString()" :dynamic-slot-width="true">
-                                    <v-switch v-model="autorender" hide-details class="mt-0"></v-switch>
-                                </settings-row>
-                            </template>
-                        </template>
-                        <template v-if="framesCount > 0 && !['printing', 'paused'].includes(printer_state)">
-                            <v-divider class="mt-2 mb-4"></v-divider>
-                            <v-row>
-                                <v-col class="text-center">
-                                    <v-btn
-                                        text
-                                        color="primary"
-                                        :disabled="disableRenderButton"
-                                        @click="boolDialogRendersettings = true">
-                                        {{ $t('Timelapse.Render') }}
-                                    </v-btn>
-                                    <v-btn
-                                        text
-                                        color="primary"
-                                        :loading="loadings.includes('timelapse_saveframes')"
-                                        @click="saveFrames">
-                                        {{ $t('Timelapse.SaveFrames') }}
-                                    </v-btn>
-                                </v-col>
-                            </v-row>
-                        </template>
-                    </v-card-text>
-                </v-col>
-                <v-col v-else class="col-12 text--secondary" align-self="center">
-                    <v-card-text class="pt-0 pt-md-3">
-                        <p class="text-center my-0 font-italic">{{ $t('Timelapse.NoActiveTimelapse') }}</p>
-                    </v-card-text>
+                    </template>
                 </v-col>
             </v-row>
-        </v-card>
-        <v-dialog v-model="boolDialogRendersettings" :max-width="700" :max-height="500">
-            <panel
-                :title="$t('Timelapse.RenderSettings').toString()"
-                :icon="mdiTextBoxSearchOutline"
-                card-class="timelapse-rendersettings-dialog"
-                :margin-bottom="false">
-                <template #buttons>
-                    <v-btn icon @click="boolDialogRendersettings = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text class="">
-                    <v-row>
-                        <v-col class="col-4">
-                            <v-select
-                                v-model="variable_fps"
-                                :label="$t('Timelapse.Type')"
-                                :items="framerateTypeOptions"
-                                outlined
-                                dense
-                                hide-details></v-select>
-                        </v-col>
-                        <v-col class="col-4">
-                            <template v-if="variable_fps">
-                                <v-text-field
-                                    v-model="variable_fps_min"
-                                    :label="$t('Timelapse.MinFramerate')"
-                                    type="number"
-                                    outlined
-                                    dense
-                                    hide-details
-                                    hide-spin-buttons></v-text-field>
-                                <v-text-field
-                                    v-model="variable_fps_max"
-                                    :label="$t('Timelapse.MaxFramerate')"
-                                    type="number"
-                                    outlined
-                                    dense
-                                    hide-details
-                                    hide-spin-buttons
-                                    class="mt-3"></v-text-field>
-                                <v-text-field
-                                    v-model="targetlength"
-                                    :label="$t('Timelapse.Targetlength')"
-                                    type="number"
-                                    outlined
-                                    dense
-                                    hide-details
-                                    hide-spin-buttons
-                                    class="mt-3"></v-text-field>
-                            </template>
-                            <template v-else>
-                                <v-text-field
-                                    v-model="output_framerate"
-                                    :label="$t('Timelapse.Framerate')"
-                                    type="number"
-                                    outlined
-                                    dense
-                                    hide-details
-                                    hide-spin-buttons></v-text-field>
-                            </template>
-                            <v-text-field
-                                v-model="duplicatelastframe"
-                                :label="$t('Timelapse.DuplicateLastframe')"
-                                type="number"
-                                outlined
-                                dense
-                                hide-details
-                                hide-spin-buttons
-                                class="mt-3"></v-text-field>
-                        </v-col>
-                        <v-col class="col-4">
-                            <template v-if="variable_fps">
-                                <v-text-field
-                                    v-model="variableTargetFps"
-                                    :label="$t('Timelapse.TargetFps')"
-                                    type="number"
-                                    outlined
-                                    dense
-                                    hide-details
-                                    readonly
-                                    class="mb-3"></v-text-field>
-                            </template>
-                            <v-text-field
-                                v-model="estimatedVideoLength"
-                                :label="$t('Timelapse.EstimatedLength')"
-                                outlined
-                                dense
-                                hide-details
-                                readonly></v-text-field>
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-                <v-card-actions>
-                    <v-spacer></v-spacer>
-                    <v-btn text @click="boolDialogRendersettings = false">{{ $t('Timelapse.Cancel') }}</v-btn>
-                    <v-btn text color="primary" @click="startRender">{{ $t('Timelapse.StartRender') }}</v-btn>
-                </v-card-actions>
-            </panel>
-        </v-dialog>
-    </div>
+        </v-card-text>
+        <v-card-text v-else class="">
+            <p class="text-center my-0 font-italic">{{ $t('Timelapse.NoActiveTimelapse') }}</p>
+        </v-card-text>
+        <v-card-text v-if="['printing', 'paused'].includes(printer_state)" class="pt-0">
+            <v-divider class="mt-0 mb-2" />
+            <settings-row :title="$t('Timelapse.Enabled')" :dynamic-slot-width="true">
+                <v-switch v-model="enabled" hide-details class="mt-0" />
+            </settings-row>
+            <template v-if="enabled">
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Timelapse.Autorender')" :dynamic-slot-width="true">
+                    <v-switch v-model="autorender" hide-details class="mt-0" />
+                </settings-row>
+            </template>
+        </v-card-text>
+        <timelapse-renderingsettings-dialog
+            :show="boolDialogRendersettings"
+            @close="boolDialogRendersettings = false" />
+    </panel>
 </template>
 <script lang="ts">
-import { Component, Mixins } from 'vue-property-decorator'
+import { Component, Mixins, Ref } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import Panel from '@/components/ui/Panel.vue'
-import { mdiFile, mdiInformation, mdiTextBoxSearchOutline, mdiCloseThick } from '@mdi/js'
+import { mdiFile, mdiInformation, mdiCloseThick } from '@mdi/js'
 import WebcamMixin from '@/components/mixins/webcam'
+import TimelapseRenderingsettingsDialog from '@/components/dialogs/TimelapseRenderingsettingsDialog.vue'
+import TimelapseMixin from '@/components/mixins/timelapse'
 @Component({
-    components: { Panel, SettingsRow },
+    components: { TimelapseRenderingsettingsDialog, Panel, SettingsRow },
 })
-export default class TimelapseStatusPanel extends Mixins(BaseMixin, WebcamMixin) {
+export default class TimelapseStatusPanel extends Mixins(BaseMixin, TimelapseMixin, WebcamMixin) {
     mdiInformation = mdiInformation
     mdiFile = mdiFile
     mdiCloseThick = mdiCloseThick
-    mdiTextBoxSearchOutline = mdiTextBoxSearchOutline
 
-    private boolDialogRendersettings = false
-    private scale = 1
+    boolDialogRendersettings = false
+    scale = 1
 
-    declare $refs: {
-        timelapsePreview: HTMLImageElement
-    }
+    @Ref('timelapsePreview') timelapsePreview!: HTMLImageElement
 
     get frameUrl() {
         const frame = this.$store.state.server.timelapse?.lastFrame?.file ?? null
@@ -229,10 +106,6 @@ export default class TimelapseStatusPanel extends Mixins(BaseMixin, WebcamMixin)
         return null
     }
 
-    get framesCount() {
-        return this.$store.state.server.timelapse?.lastFrame?.count ?? 0
-    }
-
     get enabled() {
         return this.$store.state.server.timelapse?.settings?.enabled ?? false
     }
@@ -257,90 +130,16 @@ export default class TimelapseStatusPanel extends Mixins(BaseMixin, WebcamMixin)
         )
     }
 
-    get variable_fps() {
-        return this.$store.state.server.timelapse?.settings?.variable_fps ?? false
-    }
-
-    set variable_fps(newVal) {
-        this.$store.dispatch('server/timelapse/saveSetting', { variable_fps: newVal })
-    }
-
-    get framerateTypeOptions() {
-        return [
-            {
-                value: false,
-                text: this.$t('Timelapse.Fixed'),
-            },
-            {
-                value: true,
-                text: this.$t('Timelapse.Variable'),
-            },
-        ]
-    }
-
-    get variable_fps_min() {
-        return this.$store.state.server.timelapse?.settings?.variable_fps_min ?? 5
-    }
-
-    set variable_fps_min(newVal) {
-        this.$store.dispatch('server/timelapse/saveSetting', { variable_fps_min: newVal })
-    }
-
-    get variable_fps_max() {
-        return this.$store.state.server.timelapse?.settings?.variable_fps_max ?? 60
-    }
-
-    set variable_fps_max(newVal) {
-        this.$store.dispatch('server/timelapse/saveSetting', { variable_fps_max: newVal })
-    }
-
-    get targetlength() {
-        return this.$store.state.server.timelapse?.settings?.targetlength ?? 10
-    }
-
-    set targetlength(newVal) {
-        this.$store.dispatch('server/timelapse/saveSetting', { targetlength: newVal })
-    }
-
-    get output_framerate() {
-        return this.$store.state.server.timelapse?.settings?.output_framerate ?? 30
-    }
-
-    set output_framerate(newVal) {
-        this.$store.dispatch('server/timelapse/saveSetting', { output_framerate: newVal })
-    }
-
-    get duplicatelastframe() {
-        return this.$store.state.server.timelapse?.settings?.duplicatelastframe ?? 0
-    }
-
-    set duplicatelastframe(newVal) {
-        this.$store.dispatch('server/timelapse/saveSetting', { duplicatelastframe: newVal })
+    get disableRenderButton() {
+        return (this.$store.state.server.timelapse?.rendering.status ?? '') === 'running'
     }
 
-    get estimatedVideoLength() {
-        let seconds = Math.round((this.framesCount + this.duplicatelastframe) / this.output_framerate)
-
-        if (this.variable_fps) {
-            seconds = Math.round((this.framesCount + this.duplicatelastframe) / this.variableTargetFps)
-            if (seconds < this.targetlength) seconds = this.targetlength
-        }
-
-        return seconds > 60
-            ? Math.floor(seconds / 60) + 'm ' + (seconds - Math.floor(seconds / 60) * 60) + 's'
-            : seconds + 's'
+    get existsSnapshoturlInMoonrakerConfig() {
+        return 'snapshoturl' in this.$store.state.server.config.orig.timelapse
     }
 
-    get variableTargetFps() {
-        let targetFps = Math.floor(this.framesCount / this.targetlength)
-        targetFps = Math.max(targetFps, this.variable_fps_min)
-        targetFps = Math.min(targetFps, this.variable_fps_max)
-
-        return targetFps
-    }
-
-    get disableRenderButton() {
-        return (this.$store.state.server.timelapse?.rendering.status ?? '') === 'running'
+    get moonrakerTimelapseConfig() {
+        return this.$store.state.server.config.config.timelapse ?? {}
     }
 
     get camId() {
@@ -352,6 +151,20 @@ export default class TimelapseStatusPanel extends Mixins(BaseMixin, WebcamMixin)
     }
 
     get webcamStyle() {
+        // if the snapshoturl is set in moonraker config,
+        // we also use the flip_x and flip_y values from the moonraker config
+        if (this.existsSnapshoturlInMoonrakerConfig) {
+            return {
+                transform: this.generateTransform(
+                    this.moonrakerTimelapseConfig.flip_x ?? false,
+                    this.moonrakerTimelapseConfig.flip_y ?? false,
+                    0
+                ),
+            }
+        }
+
+        if (!this.camSettings) return {}
+
         return {
             transform: this.generateTransform(
                 this.camSettings.flip_horizontal ?? false,
@@ -361,22 +174,15 @@ export default class TimelapseStatusPanel extends Mixins(BaseMixin, WebcamMixin)
         }
     }
 
-    startRender() {
-        this.boolDialogRendersettings = false
-
-        this.$socket.emit('machine.timelapse.render', {})
-    }
-
     saveFrames() {
         this.$socket.emit('machine.timelapse.saveframes', {}, { loading: 'timelapse_saveframes' })
     }
 
     calcRatio() {
-        if (this.$refs.timelapsePreview) {
-            this.scale = this.$refs.timelapsePreview.naturalHeight / this.$refs.timelapsePreview.naturalWidth
-            if (this.scale > 1) {
-                this.scale = this.$refs.timelapsePreview.naturalWidth / this.$refs.timelapsePreview.naturalHeight
-            }
+        this.scale = this.timelapsePreview.naturalHeight / this.timelapsePreview.naturalWidth
+
+        if (this.scale > 1) {
+            this.scale = this.timelapsePreview.naturalWidth / this.timelapsePreview.naturalHeight
         }
     }
 }
diff --git a/src/components/panels/WebcamPanel.vue b/src/components/panels/WebcamPanel.vue
index 652c3e5c8..b0f935cc3 100644
--- a/src/components/panels/WebcamPanel.vue
+++ b/src/components/panels/WebcamPanel.vue
@@ -42,7 +42,7 @@
         <v-card-text v-if="webcams.length" class="px-0 py-0 content d-inline-block">
             <v-row>
                 <v-col class="pb-0" style="position: relative">
-                    <webcam-wrapper :webcam="currentCam" />
+                    <webcam-wrapper :webcam="currentCam" :page="currentPage" />
                 </v-col>
             </v-row>
         </v-card-text>
diff --git a/src/components/settings/Webcams/WebcamForm.vue b/src/components/settings/Webcams/WebcamForm.vue
index 5a43c4fbc..1de588da6 100644
--- a/src/components/settings/Webcams/WebcamForm.vue
+++ b/src/components/settings/Webcams/WebcamForm.vue
@@ -145,7 +145,7 @@
                     </v-row>
                 </v-col>
                 <v-col class="col-12 col-sm-6 text-center" align-self="center">
-                    <webcam-wrapper :webcam="webcam" />
+                    <webcam-wrapper :webcam="webcam" page="settings" />
                 </v-col>
             </v-row>
         </v-card-text>
diff --git a/src/components/webcams/WebcamWrapper.vue b/src/components/webcams/WebcamWrapper.vue
index cd2dfb679..a67f3196a 100644
--- a/src/components/webcams/WebcamWrapper.vue
+++ b/src/components/webcams/WebcamWrapper.vue
@@ -4,13 +4,17 @@
             <v-container v-if="webcams" fluid class="pb-4">
                 <v-row dense>
                     <v-col v-for="gridWebcam in webcams" :key="gridWebcam.name" cols="6">
-                        <webcam-wrapper-item :webcam="gridWebcam" :printer-url="printerUrl" :show-fps="showFps" />
+                        <webcam-wrapper-item
+                            :webcam="gridWebcam"
+                            :printer-url="printerUrl"
+                            :show-fps="showFps"
+                            :page="page" />
                     </v-col>
                 </v-row>
             </v-container>
         </template>
         <template v-else>
-            <webcam-wrapper-item :webcam="webcam" :printer-url="printerUrl" :show-fps="showFps" />
+            <webcam-wrapper-item :webcam="webcam" :printer-url="printerUrl" :show-fps="showFps" :page="page" />
         </template>
     </div>
 </template>
@@ -31,6 +35,7 @@ export default class WebcamWrapper extends Mixins(BaseMixin) {
     @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam
     @Prop({ type: Boolean, default: true }) showFps!: Boolean
     @Prop({ type: String, default: null }) printerUrl!: string | null
+    @Prop({ type: String, default: null }) page!: string | null
 
     get webcams(): GuiWebcamStateWebcam[] {
         return this.$store.getters['gui/webcams/getWebcams']
diff --git a/src/components/webcams/WebcamWrapperItem.vue b/src/components/webcams/WebcamWrapperItem.vue
index 4e7217ef1..8d95a42f7 100644
--- a/src/components/webcams/WebcamWrapperItem.vue
+++ b/src/components/webcams/WebcamWrapperItem.vue
@@ -25,7 +25,7 @@
             <janus-streamer-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'webrtc-mediamtx'">
-            <webrtc-media-m-t-x-async :cam-settings="webcam" :printer-url="printerUrl" />
+            <webrtc-media-m-t-x-async :cam-settings="webcam" :printer-url="printerUrl" :page="page" />
         </template>
         <template v-else-if="service === 'webrtc-go2rtc'">
             <webrtc-go2rtc-async :cam-settings="webcam" :printer-url="printerUrl" />
@@ -61,6 +61,7 @@ export default class WebcamWrapperItem extends Mixins(BaseMixin) {
     @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam
     @Prop({ type: Boolean, default: true }) showFps!: Boolean
     @Prop({ default: null }) printerUrl!: string | null
+    @Prop({ type: String, default: null }) page!: string | null
 
     get service() {
         return this.webcam?.service ?? 'unknown'
diff --git a/src/components/webcams/streamers/WebrtcMediaMTX.vue b/src/components/webcams/streamers/WebrtcMediaMTX.vue
index 189e9e18e..f5eff6f20 100644
--- a/src/components/webcams/streamers/WebrtcMediaMTX.vue
+++ b/src/components/webcams/streamers/WebrtcMediaMTX.vue
@@ -33,6 +33,7 @@ interface OfferData {
 export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
     @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
     @Prop({ default: null }) readonly printerUrl!: string | null
+    @Prop({ type: String, default: null }) readonly page!: string | null
     @Ref() declare video: HTMLVideoElement
 
     pc: RTCPeerConnection | null = null
@@ -48,10 +49,6 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
     }
     RESTART_PAUSE = 2000
 
-    mounted() {
-        this.start()
-    }
-
     // stop the video and close the streams if the component is going to be destroyed so we don't leave hanging streams
     beforeDestroy() {
         this.terminate()
@@ -73,16 +70,9 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
     get url() {
         let baseUrl = this.camSettings.stream_url
         if (!baseUrl.endsWith('/')) baseUrl += '/'
+        baseUrl += 'whep'
 
-        try {
-            baseUrl = new URL('whep', baseUrl).toString()
-
-            return this.convertUrl(baseUrl, this.printerUrl)
-        } catch (e) {
-            this.log('invalid baseURL', baseUrl)
-
-            return null
-        }
+        return this.convertUrl(baseUrl, this.printerUrl)
     }
 
     // stop and restart the video if the url changes
@@ -93,11 +83,13 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
     }
 
     get expanded(): boolean {
+        if (this.page !== 'dashboard') return true
+
         return this.$store.getters['gui/getPanelExpand']('webcam-panel', this.viewport) ?? false
     }
 
-    // start or stop the video when the expand state changes
-    @Watch('expanded')
+    // start or stop the video when the expanded state changes
+    @Watch('expanded', { immediate: true })
     expandChanged(newExpanded: boolean): void {
         if (!newExpanded) {
             this.terminate()
@@ -198,7 +190,13 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
         return frag
     }
 
-    start() {
+    async start() {
+        // clear any potentially open restart timeout
+        if (this.restartTimeout !== null) {
+            clearTimeout(this.restartTimeout)
+            this.restartTimeout = null
+        }
+
         // stop if url is not valid
         if (this.url === null) {
             this.log('invalid url')
@@ -209,17 +207,22 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
 
         this.log('requesting ICE servers from ' + this.url)
 
-        fetch(this.url, {
-            method: 'OPTIONS',
-        })
-            .then((res) => this.onIceServers(res))
-            .catch((err) => {
-                this.log('error: ' + err)
+        try {
+            const res = await fetch(this.url, { method: 'OPTIONS' })
+            if (res.status !== 204) {
+                this.log('error: Received bad status code:', res.status)
                 this.scheduleRestart()
-            })
+                return
+            }
+
+            await this.onIceServers(res)
+        } catch (err) {
+            this.log('error: Cannot connect to backend')
+            this.scheduleRestart()
+        }
     }
 
-    onIceServers(res: Response) {
+    async onIceServers(res: Response) {
         const iceServers = this.linkToIceServers(res.headers.get('Link'))
         this.log('ice servers:', iceServers)
 
@@ -242,51 +245,57 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
             this.video.srcObject = evt.streams[0]
         }
 
-        this.pc.createOffer().then((offer) => this.onLocalOffer(offer))
+        const offer = await this.pc.createOffer()
+        await this.onLocalOffer(offer)
     }
 
     // eslint-disable-next-line no-undef
-    onLocalOffer(offer: RTCSessionDescriptionInit) {
-        this.offerData = this.parseOffer(offer.sdp ?? '')
-        this.pc?.setLocalDescription(offer)
-
-        fetch(this.url ?? '', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/sdp',
-            },
-            body: offer.sdp,
-        })
-            .then((res) => {
-                if (res.status !== 201) throw new Error('bad status code')
-                this.eTag = res.headers.get('ETag')
-                const location = res.headers.get('Location') ?? ''
-                this.sessionUuid = location?.substring(location.lastIndexOf('/') + 1) ?? null
-
-                // fallback for MediaMTX v1.0.x with broken ETag header
-                if (res.headers.has('E-Tag')) this.eTag = res.headers.get('E-Tag')
-
-                return res.text()
-            })
-            .then((sdp) => {
-                this.onRemoteAnswer(
-                    new RTCSessionDescription({
-                        type: 'answer',
-                        sdp,
-                    })
-                )
+    async onLocalOffer(offer: RTCSessionDescriptionInit) {
+        try {
+            const res = await fetch(this.url ?? '', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/sdp' },
+                body: offer.sdp,
             })
-            .catch((err) => {
-                this.log(err)
+
+            if (res.status !== 201) {
+                this.log('error: Received bad status code:', res.status)
                 this.scheduleRestart()
-            })
+                return
+            }
+
+            this.offerData = this.parseOffer(offer.sdp ?? '')
+            this.pc?.setLocalDescription(offer)
+
+            this.eTag = res.headers.get('ETag')
+            const location = res.headers.get('Location') ?? ''
+            this.sessionUuid = location?.substring(location.lastIndexOf('/') + 1) ?? null
+
+            // fallback for MediaMTX v1.0.x with broken ETag header
+            if (res.headers.has('E-Tag')) this.eTag = res.headers.get('E-Tag')
+
+            const sdp = await res.text()
+            this.onRemoteAnswer(
+                new RTCSessionDescription({
+                    type: 'answer',
+                    sdp,
+                })
+            )
+        } catch (err: any) {
+            this.log(err?.message ?? err ?? 'unknown error')
+            this.scheduleRestart()
+        }
     }
 
     onRemoteAnswer(answer: RTCSessionDescription) {
         if (this.restartTimeout !== null) return
 
-        // this.pc.setRemoteDescription(new RTCSessionDescription(answer));
-        this.pc?.setRemoteDescription(answer)
+        try {
+            this.pc?.setRemoteDescription(answer)
+        } catch (err: any) {
+            this.log(err)
+            this.scheduleRestart()
+        }
 
         if (this.queuedCandidates.length !== 0) {
             this.sendLocalCandidates(this.queuedCandidates)
@@ -319,7 +328,7 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
         }
     }
 
-    sendLocalCandidates(candidates: RTCIceCandidate[]) {
+    async sendLocalCandidates(candidates: RTCIceCandidate[]) {
         if (this.sessionUuid === null) {
             this.log('Session-UUID is null')
             this.scheduleRestart()
@@ -328,29 +337,31 @@ export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
         }
 
         const url = (this.url ?? '') + '/' + this.sessionUuid
-        fetch(url, {
-            method: 'PATCH',
-            headers: {
-                'Content-Type': 'application/trickle-ice-sdpfrag',
-                'If-Match': this.eTag,
-                // eslint-disable-next-line no-undef
-            } as HeadersInit,
-            body: this.generateSdpFragment(this.offerData, candidates),
-        })
-            .then((res) => {
-                switch (res.status) {
-                    case 204:
-                        break
-                    case 404:
-                        throw new Error('stream not found')
-                    default:
-                        throw new Error(`bad status code ${res.status}`)
-                }
+        try {
+            const res = await fetch(url, {
+                method: 'PATCH',
+                headers: {
+                    'Content-Type': 'application/trickle-ice-sdpfrag',
+                    'If-Match': this.eTag,
+                    // eslint-disable-next-line no-undef
+                } as HeadersInit,
+                body: this.generateSdpFragment(this.offerData, candidates),
             })
-            .catch((err) => {
-                this.log(err)
+
+            if (res.status === 204) return
+
+            if (res.status === 404) {
+                this.log('stream not found')
                 this.scheduleRestart()
-            })
+                return
+            }
+
+            this.log(`bad status code ${res.status}`)
+            this.scheduleRestart()
+        } catch (err: any) {
+            this.log(err)
+            this.scheduleRestart()
+        }
     }
 
     terminate() {
diff --git a/src/locales/da.json b/src/locales/da.json
index 35e9a865d..6c8049e9d 100644
--- a/src/locales/da.json
+++ b/src/locales/da.json
@@ -990,7 +990,6 @@
             "DbHistoryTotals": "Totalhistorik",
             "DbMaintenance": "Vedligeholdelse",
             "DbNavigation": "Navigation",
-            "DBNavigation": "Navigation",
             "DbTimelapseSettings": "Timelapse indstillinger",
             "DbView": "Vis indstillinger",
             "EstimateValues": {
diff --git a/src/locales/en.json b/src/locales/en.json
index b6c137a17..002e964e7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -669,6 +669,7 @@
             "Headline": "Console",
             "HideTemperatures": "Hide temperatures",
             "HideTimelapse": "Hide Timelapse",
+            "RawOutput": "RAW-Output (for debugging)",
             "SendCode": "Send code...",
             "SetupConsole": "Setup Console"
         },
diff --git a/src/locales/es.json b/src/locales/es.json
index 7261fdcd7..a71309968 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -1001,7 +1001,6 @@
             "DbHistoryTotals": "Historial Totales",
             "DbMaintenance": "Mantenimiento",
             "DbNavigation": "Navegación",
-            "DBNavigation": "Navegación",
             "DbTimelapseSettings": "Ajustes de Timelapse",
             "DbView": "Ajustes de Vista",
             "DbWebcams": "Cámaras web",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 87901bd98..9ee45b299 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -931,7 +931,7 @@
             "DbConsoleHistory": "Historique de la console",
             "DbHistoryJobs": "Historique des travaux",
             "DbHistoryTotals": "Historique Totaux",
-            "DBNavigation": "Navigation",
+            "DbNavigation": "Navigation",
             "DbTimelapseSettings": "Réglages Timelapse",
             "DbView": "Voir les paramètres",
             "EstimateValues": {
diff --git a/src/locales/it.json b/src/locales/it.json
index d4a2267fd..cf4572474 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -922,7 +922,7 @@
             "DbConsoleHistory": "Cronologia Console",
             "DbHistoryJobs": "Cronologia Lavori",
             "DbHistoryTotals": "Cronologia Totali",
-            "DBNavigation": "Navigazione",
+            "DbNavigation": "Navigazione",
             "DbTimelapseSettings": "Impostazioni Timelapse",
             "DbView": "Vedi Impostazioni ",
             "EstimateValues": {
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 7887bada8..844439810 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -906,7 +906,7 @@
             "DbConsoleHistory": "Historia Konsoli",
             "DbHistoryJobs": "Historia wydruków",
             "DbHistoryTotals": "Łączna historia",
-            "DBNavigation": "Nawigacja",
+            "DbNavigation": "Nawigacja",
             "DbTimelapseSettings": "Ustawienia timelapse",
             "DbView": "Ustawienia",
             "EstimateValues": {
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 95b7a368d..a5628c716 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -944,7 +944,7 @@
             "DbConsoleHistory": "История консоли",
             "DbHistoryJobs": "История заданий",
             "DbHistoryTotals": "Всего заданий",
-            "DBNavigation": "Навигация",
+            "DbNavigation": "Навигация",
             "DbTimelapseSettings": "Настройки таймлапса",
             "DbView": "Настройки отображения",
             "EstimateValues": {
diff --git a/src/locales/se.json b/src/locales/se.json
index ec8607981..851b3200d 100644
--- a/src/locales/se.json
+++ b/src/locales/se.json
@@ -922,7 +922,7 @@
             "DbConsoleHistory": "Konsolhistorik",
             "DbHistoryJobs": "Jobbhistorik",
             "DbHistoryTotals": "Historik totalt",
-            "DBNavigation": "Navigering",
+            "DbNavigation": "Navigering",
             "DbTimelapseSettings": "Timelapse inställningar",
             "DbView": "Visa inställningar",
             "EstimateValues": {
diff --git a/src/pages/Console.vue b/src/pages/Console.vue
index a37067bcb..39a5da20b 100644
--- a/src/pages/Console.vue
+++ b/src/pages/Console.vue
@@ -71,6 +71,13 @@
                                 :label="filter.name"
                                 @change="toggleFilter(filter)" />
                         </v-list-item>
+                        <v-list-item class="minHeight36">
+                            <v-checkbox
+                                v-model="rawOutput"
+                                class="mt-0"
+                                hide-details
+                                :label="$t('Panels.MiniconsolePanel.RawOutput')" />
+                        </v-list-item>
                     </v-list>
                 </v-menu>
             </v-col>
@@ -193,6 +200,14 @@ export default class PageConsole extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'console.autoscroll', value: newVal })
     }
 
+    get rawOutput(): boolean {
+        return this.$store.state.gui.console.rawOutput ?? false
+    }
+
+    set rawOutput(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'console.rawOutput', value: newVal })
+    }
+
     commandClick(msg: string): void {
         this.gcode = msg
 
diff --git a/src/pages/Webcam.vue b/src/pages/Webcam.vue
index 884a2f63e..fd45bba24 100644
--- a/src/pages/Webcam.vue
+++ b/src/pages/Webcam.vue
@@ -4,7 +4,7 @@
     <div>
         <v-row>
             <v-col col-12>
-                <webcam-panel current-page="page"></webcam-panel>
+                <webcam-panel current-page="page" />
             </v-col>
         </v-row>
     </div>
diff --git a/src/store/gui/console/index.ts b/src/store/gui/console/index.ts
index b152a5c7e..d8e6e31c8 100644
--- a/src/store/gui/console/index.ts
+++ b/src/store/gui/console/index.ts
@@ -13,6 +13,7 @@ export const getDefaultState = (): GuiConsoleState => {
         height: 300,
         autoscroll: true,
         consolefilters: {},
+        rawOutput: false,
     }
 }
 
diff --git a/src/store/gui/console/types.ts b/src/store/gui/console/types.ts
index 35e63cda8..6e487f9f3 100644
--- a/src/store/gui/console/types.ts
+++ b/src/store/gui/console/types.ts
@@ -9,6 +9,7 @@ export interface GuiConsoleState {
     consolefilters: {
         [key: string]: GuiConsoleStateFilter
     }
+    rawOutput: boolean
 }
 
 export interface GuiConsoleStateFilter {