diff --git a/src/components/inputs/MacroButton.vue b/src/components/inputs/MacroButton.vue
index 89586f774..873d4cb21 100644
--- a/src/components/inputs/MacroButton.vue
+++ b/src/components/inputs/MacroButton.vue
@@ -59,7 +59,7 @@
                     <v-icon>{{ mdiMenuDown }}</v-icon>
                 </v-btn>
                 <v-dialog v-model="paramsDialog">
-                    <panel :title="macro.name" :card-class="`macro-params-mobile-${macro.name}`" :margin-bottom="0">
+                    <panel :title="macro.name" :card-class="`macro-params-mobile-${macro.name}`" :margin-bottom="false">
                         <template #buttons>
                             <v-btn icon tile @click="paramsDialog = false">
                                 <v-icon>{{ mdiCloseThick }}</v-icon>
@@ -101,6 +101,8 @@ import BaseMixin from '@/components/mixins/base'
 import { GuiMacrosStateMacrogroupMacro } from '@/store/gui/macros/types'
 import { mdiCloseThick, mdiMenuDown, mdiRefresh } from '@mdi/js'
 import Panel from '@/components/ui/Panel.vue'
+import { TranslateResult } from 'vue-i18n'
+import { PrinterStateMacro } from '@/store/printer/types'
 
 interface param {
     type: 'int' | 'double' | 'string' | null
@@ -128,13 +130,13 @@ export default class MacroButton extends Mixins(BaseMixin) {
     private paramsDialog = false
 
     @Prop({ required: true })
-    declare readonly macro: GuiMacrosStateMacrogroupMacro
+    declare readonly macro: GuiMacrosStateMacrogroupMacro | PrinterStateMacro
 
     @Prop({ default: 'primary' })
     declare readonly color: string
 
     @Prop({ default: null })
-    declare readonly alias: string
+    declare readonly alias: string | TranslateResult
 
     @Prop({ default: false })
     declare readonly disabled: boolean
diff --git a/src/components/inputs/NumberInput.vue b/src/components/inputs/NumberInput.vue
index e0c6ee546..5b36dbdec 100644
--- a/src/components/inputs/NumberInput.vue
+++ b/src/components/inputs/NumberInput.vue
@@ -53,6 +53,7 @@ import Component from 'vue-class-component'
 import { Mixins, Prop, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { mdiChevronDown, mdiChevronUp, mdiRestart } from '@mdi/js'
+import { TranslateResult } from 'vue-i18n'
 
 @Component
 export default class NumberInput extends Mixins(BaseMixin) {
@@ -65,48 +66,23 @@ export default class NumberInput extends Mixins(BaseMixin) {
     private invalidChars: string[] = ['e', 'E', '+']
 
     // input field name and identifier
-    @Prop({ type: String, required: true })
-    declare readonly label: string
-
-    @Prop({ type: String, required: true })
-    declare readonly param: string
-
+    @Prop({ required: true }) declare readonly label: TranslateResult | string
+    @Prop({ type: String, required: true }) declare readonly param: string
     // props defining incoming data
-    @Prop({ type: Number, required: true })
-    declare readonly target: number
-
-    @Prop({ type: Number, required: false })
-    declare readonly defaultValue: number
-
+    @Prop({ type: Number, required: true }) declare readonly target: number
+    @Prop({ type: Number, required: false }) declare readonly defaultValue: number
     // props for internal processing
-    @Prop({ type: Number, required: true })
-    declare readonly min: number
-
-    @Prop({ type: Number, default: null })
-    declare readonly max: number | null
-
-    @Prop({ type: Number, required: true })
-    declare readonly dec: number
-
-    @Prop({ type: Number, required: false, default: 1 })
-    declare readonly step: number
-
-    @Prop({ type: String, required: false })
-    declare readonly unit: string
-
+    @Prop({ type: Number, required: true }) declare readonly min: number
+    @Prop({ default: null }) declare readonly max: number | null
+    @Prop({ type: Number, required: true }) declare readonly dec: number
+    @Prop({ type: Number, required: false, default: 1 }) declare readonly step: number
+    @Prop({ type: String, required: false }) declare readonly unit: string
     // spinner related props
-    @Prop({ type: Boolean, required: false, default: false })
-    declare readonly hasSpinner: boolean
-
-    @Prop({ type: Number, required: false, default: 1 })
-    declare readonly spinnerFactor: number
-
+    @Prop({ type: Boolean, required: false, default: false }) declare readonly hasSpinner: boolean
+    @Prop({ type: Number, required: false, default: 1 }) declare readonly spinnerFactor: number
     // props for general internal behaviour
-    @Prop({ type: Boolean, required: false, default: false })
-    declare readonly disabled: boolean
-
-    @Prop({ type: Boolean, required: false, default: false })
-    declare readonly outputErrorMsg: boolean
+    @Prop({ type: Boolean, required: false, default: false }) declare readonly disabled: boolean
+    @Prop({ type: Boolean, required: false, default: false }) declare readonly outputErrorMsg: boolean
 
     created(): void {
         this.value = this.target.toString()
diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts
index 8bc9ce571..cabb2b14e 100644
--- a/src/components/mixins/base.ts
+++ b/src/components/mixins/base.ts
@@ -47,6 +47,10 @@ export default class BaseMixin extends Vue {
         return this.klipperReadyForGui && ['printing', 'paused'].includes(this.printer_state)
     }
 
+    get printerIsPrintingOnly() {
+        return this.klipperReadyForGui && this.printer_state === 'printing'
+    }
+
     get printerPowerDevice(): string {
         let deviceName = this.$store.state.gui.uiSettings.powerDeviceName ?? null
         if (deviceName === null) deviceName = 'printer'
diff --git a/src/components/mixins/extruder.ts b/src/components/mixins/extruder.ts
new file mode 100644
index 000000000..1b4f5c6a1
--- /dev/null
+++ b/src/components/mixins/extruder.ts
@@ -0,0 +1,40 @@
+import Vue from 'vue'
+import { Component } from 'vue-property-decorator'
+@Component
+export default class ExtruderMixin extends Vue {
+    get activeExtruder(): string {
+        return this.$store.state.printer.toolhead?.extruder
+    }
+
+    get activeExtruderSettings(): any {
+        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]
+    }
+
+    get filamentDiameter(): number {
+        return this.activeExtruderSettings?.filament_diameter ?? 1.75
+    }
+
+    get nozzleDiameter(): number {
+        return this.activeExtruderSettings?.nozzle_diameter ?? 0.4
+    }
+
+    get feedamount(): number {
+        return parseFloat(this.$store.state.gui.control.extruder.feedamount)
+    }
+
+    get feedrate(): number {
+        return parseFloat(this.$store.state.gui.control.extruder.feedrate)
+    }
+
+    get extrudeFactor() {
+        return this.$store.state.printer?.gcode_move?.extrude_factor ?? 1
+    }
+
+    get extrudePossible(): boolean {
+        return this.$store.getters['printer/getExtrudePossible']
+    }
+
+    get minExtrudeTemp(): number {
+        return this.activeExtruderSettings?.min_extrude_temp ?? 170
+    }
+}
diff --git a/src/components/panels/Extruder/EstimatedExtrusionOutput.vue b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
new file mode 100644
index 000000000..251cf1f23
--- /dev/null
+++ b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
@@ -0,0 +1,42 @@
+<template>
+    <v-container v-if="showEstimatedExtrusion" class="pa-0 ma-0 pb-1">
+        <div style="font-size: 0.8em" class="text--disabled text-caption font-weight-light d-flex justify-center">
+            <span>
+                {{ $t('Panels.ExtruderControlPanel.EstimatedExtrusion') }} ~ {{ extrudedLength }} mm @
+                {{ volumetricFlow }} mm³/s -
+                <v-icon x-small style="opacity: 0.4; margin-top: -2px">
+                    {{ mdiDiameterVariant }}
+                </v-icon>
+                {{ nozzleDiameter }} mm
+            </span>
+        </div>
+    </v-container>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiDiameterVariant } from '@mdi/js'
+import ExtruderMixin from '@/components/mixins/extruder'
+
+@Component({})
+export default class PressureAdvanceSettings extends Mixins(BaseMixin, ExtruderMixin) {
+    mdiDiameterVariant = mdiDiameterVariant
+
+    get showEstimatedExtrusion() {
+        return this.$store.state.gui.control.extruder.showEstimatedExtrusionInfo ?? true
+    }
+
+    get extrudedLength(): number {
+        return Math.round(
+            this.feedamount *
+                this.extrudeFactor *
+                (Math.pow(this.filamentDiameter, 2) / Math.pow(this.nozzleDiameter, 2))
+        )
+    }
+
+    get volumetricFlow(): number {
+        return Math.round(Math.pow(this.filamentDiameter / 2, 2) * Math.PI * this.feedrate * 10) / 10
+    }
+}
+</script>
diff --git a/src/components/panels/Extruder/ExtruderControlPanelControl.vue b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
new file mode 100644
index 000000000..23afad0a0
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
@@ -0,0 +1,320 @@
+<template>
+    <responsive :breakpoints="{ large: (el) => el.width >= 640 }">
+        <template #default="{ el }">
+            <v-container>
+                <v-row>
+                    <v-col>
+                        <number-input
+                            :label="$t('Panels.ExtruderControlPanel.FilamentLength')"
+                            param="feedamount"
+                            :target="feedamount"
+                            :disabled="printerIsPrintingOnly"
+                            :output-error-msg="true"
+                            :has-spinner="true"
+                            :spinner-factor="100"
+                            :step="0.01"
+                            :min="0.01"
+                            :max="maxExtrudeOnlyDistance"
+                            :dec="2"
+                            unit="mm"
+                            :submit-on-blur="true"
+                            @submit="setFeedamount" />
+                        <v-item-group class="_btn-group pt-3">
+                            <v-btn
+                                v-for="value in feedamountsSorted"
+                                :key="value"
+                                :disabled="printerIsPrintingOnly"
+                                dense
+                                class="_btn-qs flex-grow-1 px-0"
+                                @click="setFeedamount({ value })">
+                                {{ value }}
+                            </v-btn>
+                        </v-item-group>
+                    </v-col>
+                    <v-col>
+                        <number-input
+                            :label="$t('Panels.ExtruderControlPanel.ExtrusionFeedrate')"
+                            param="feedrate"
+                            :target="feedrate"
+                            :disabled="printerIsPrintingOnly"
+                            :has-spinner="true"
+                            :output-error-msg="true"
+                            :spinner-factor="100"
+                            :step="0.01"
+                            :min="0.01"
+                            :max="null"
+                            :dec="2"
+                            type="number"
+                            unit="mm/s"
+                            @submit="setFeedrate" />
+                        <v-item-group class="_btn-group pt-3">
+                            <v-btn
+                                v-for="value in feedratesSorted"
+                                :key="value"
+                                :disabled="printerIsPrintingOnly"
+                                dense
+                                class="_btn-qs flex-grow-1 px-0"
+                                @click="setFeedrate({ value })">
+                                {{ value }}
+                            </v-btn>
+                        </v-item-group>
+                    </v-col>
+                    <!-- EXTRUDE AND RETRACT BUTTON LARGE SIZED PANEL -->
+                    <v-col v-if="el.is.large" class="col-3 d-flex align-center flex-column justify-center">
+                        <!-- RETRACT -->
+                        <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                            <template #activator="{ on }">
+                                <div class="mb-4" v-on="on">
+                                    <v-btn
+                                        :loading="loadings.includes('btnRetract')"
+                                        :disabled="!extrudePossible || tooLargeExtrusion || printerIsPrintingOnly"
+                                        small
+                                        class="_btn-extruder-cmd"
+                                        @click="sendRetract()">
+                                        <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
+                                        {{ $t('Panels.ExtruderControlPanel.Retract') }}
+                                    </v-btn>
+                                </div>
+                            </template>
+                            <span v-show="!extrudePossible">
+                                {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                {{ minExtrudeTemp }} °C
+                            </span>
+                            <span v-show="tooLargeExtrusion">
+                                {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Requested') }}: {{ feedamount * extrudeFactor }} mm
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                            </span>
+                        </v-tooltip>
+                        <!-- EXTRUDE  -->
+                        <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                            <template #activator="{ on }">
+                                <div v-on="on">
+                                    <v-btn
+                                        :loading="loadings.includes('btnDetract')"
+                                        :disabled="!extrudePossible || tooLargeExtrusion || printerIsPrintingOnly"
+                                        small
+                                        class="_btn-extruder-cmd"
+                                        @click="sendExtrude()">
+                                        <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
+                                        {{ $t('Panels.ExtruderControlPanel.Extrude') }}
+                                    </v-btn>
+                                </div>
+                            </template>
+                            <span v-show="!extrudePossible">
+                                {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                {{ minExtrudeTemp }} °C
+                            </span>
+                            <span v-show="tooLargeExtrusion">
+                                {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Requested') }}: {{ feedamount * extrudeFactor }} mm
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                            </span>
+                        </v-tooltip>
+                    </v-col>
+                </v-row>
+                <!-- EXTRUDE AND RETRACT BUTTON SMALL AND MEDIUM SIZED PANEL -->
+                <v-row v-if="!el.is.large">
+                    <v-col class="pa-0">
+                        <div class="d-flex justify-space-around">
+                            <div class="d-flex align-center">
+                                <!-- RETRACT -->
+                                <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                                    <template #activator="{ on }">
+                                        <div class="pt-1 pb-2 px-3" v-on="on">
+                                            <v-btn
+                                                :loading="loadings.includes('btnRetract')"
+                                                :disabled="
+                                                    !extrudePossible || tooLargeExtrusion || printerIsPrintingOnly
+                                                "
+                                                small
+                                                class="_btn-extruder-cmd"
+                                                @click="sendRetract()">
+                                                <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
+                                                {{ $t('Panels.ExtruderControlPanel.Retract') }}
+                                            </v-btn>
+                                        </div>
+                                    </template>
+                                    <span v-show="!extrudePossible">
+                                        {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                        {{ minExtrudeTemp }} °C
+                                    </span>
+                                    <span v-show="tooLargeExtrusion">
+                                        {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Requested') }}:
+                                        {{ feedamount * extrudeFactor }} mm
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                                    </span>
+                                </v-tooltip>
+                                <!-- EXTRUDE  -->
+                                <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                                    <template #activator="{ on }">
+                                        <div class="pt-1 pb-2 px-3" v-on="on">
+                                            <v-btn
+                                                :loading="loadings.includes('btnDetract')"
+                                                :disabled="
+                                                    !extrudePossible || tooLargeExtrusion || printerIsPrintingOnly
+                                                "
+                                                small
+                                                class="_btn-extruder-cmd"
+                                                @click="sendExtrude()">
+                                                <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
+                                                {{ $t('Panels.ExtruderControlPanel.Extrude') }}
+                                            </v-btn>
+                                        </div>
+                                    </template>
+                                    <span v-show="!extrudePossible">
+                                        {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                        {{ minExtrudeTemp }} °C
+                                    </span>
+                                    <span v-show="tooLargeExtrusion">
+                                        {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Requested') }}:
+                                        {{ feedamount * extrudeFactor }} mm
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                                    </span>
+                                </v-tooltip>
+                            </div>
+                        </div>
+                    </v-col>
+                </v-row>
+            </v-container>
+        </template>
+    </responsive>
+</template>
+
+<script lang="ts">
+import { mdiArrowDownBold, mdiArrowUpBold, mdiPrinter3dNozzle } from '@mdi/js'
+import { Component, Mixins, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import NumberInput from '@/components/inputs/NumberInput.vue'
+import Responsive from '@/components/ui/Responsive.vue'
+import ToolSlider from '@/components/inputs/ToolSlider.vue'
+import ExtruderMixin from '@/components/mixins/extruder'
+
+@Component({
+    components: {
+        NumberInput,
+        Responsive,
+        ToolSlider,
+    },
+})
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ExtruderMixin) {
+    mdiArrowDownBold = mdiArrowDownBold
+    mdiArrowUpBold = mdiArrowUpBold
+    mdiPrinter3dNozzle = mdiPrinter3dNozzle
+
+    get feedamounts(): number[] {
+        return this.$store.state.gui.control.extruder?.feedamounts ?? []
+    }
+
+    get feedrates(): number[] {
+        return this.$store.state.gui.control.extruder?.feedrates ?? []
+    }
+
+    get feedamountsSorted(): number[] {
+        return [...this.feedamounts].sort((a, b) => {
+            return b - a
+        })
+    }
+
+    get feedratesSorted(): number[] {
+        return [...this.feedrates].sort((a, b) => {
+            return b - a
+        })
+    }
+
+    setFeedamount(params: { value: number }): void {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedamount', value: params.value })
+    }
+
+    setFeedrate(params: { value: number }): void {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedrate', value: params.value })
+    }
+
+    get maxExtrudeOnlyDistance(): number {
+        return this.activeExtruderSettings?.max_extrude_only_distance ?? 50
+    }
+
+    get tooLargeExtrusion(): boolean {
+        return this.feedamount * this.extrudeFactor > this.maxExtrudeOnlyDistance
+    }
+
+    @Watch('maxExtrudeOnlyDistance', { immediate: true })
+    onMaxExtrudeOnlyDistanceChange(): void {
+        /**
+         * If, while switching from ex. A to ex. B, the feedamount
+         * from ex. an exceeds the maxExtrudeOnlyDistance of ex. B,
+         * set the feedamount to maxExtrudeOnlyDistance of ex. B
+         */
+        if (this.feedamount > this.maxExtrudeOnlyDistance) {
+            this.setFeedamount({ value: this.maxExtrudeOnlyDistance })
+        }
+    }
+
+    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' })
+    }
+
+    sendExtrude(): 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: 'btnDetract' })
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+._btn-group {
+    border-radius: 4px;
+    display: inline-flex;
+    flex-wrap: nowrap;
+    max-width: 100%;
+    min-width: 100%;
+    width: 100%;
+
+    .v-btn {
+        border-radius: 0;
+        border-color: rgba(255, 255, 255, 0.12);
+        border-style: solid;
+        border-width: thin;
+        box-shadow: none;
+        height: 28px;
+        opacity: 0.8;
+        min-width: auto !important;
+    }
+
+    .v-btn:first-child {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    .v-btn:last-child {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+
+    .v-btn:not(:first-child) {
+        border-left-width: 0;
+    }
+}
+
+._btn-qs {
+    font-size: 0.8rem !important;
+    max-height: 24px;
+}
+
+._btn-extruder-cmd {
+    min-width: 135px !important;
+}
+</style>
diff --git a/src/components/panels/Extruder/ExtruderControlPanelTools.vue b/src/components/panels/Extruder/ExtruderControlPanelTools.vue
new file mode 100644
index 000000000..0fde2067c
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderControlPanelTools.vue
@@ -0,0 +1,162 @@
+<template>
+    <v-container v-if="toolchangeMacros.length > 1" class="pl-6 pr-6 pt-6 pb-0 mb-3">
+        <v-row v-for="(row, index) in wrappedToolchangeMacros" :key="index">
+            <v-item-group class="_btn-group py-0 mb-3">
+                <v-btn
+                    v-for="tool in row"
+                    :key="tool.name"
+                    :disabled="isPrinting"
+                    :loading="loadings.includes(tool.name.toLowerCase())"
+                    class="flex-grow-1 px-0"
+                    :style="{
+                        'background-color': tool.active
+                            ? homedAxes.includes('xyz')
+                                ? primaryColor
+                                : warningColor
+                            : '',
+                        color: tool.active ? primaryTextColor : '',
+                    }"
+                    dense
+                    @click="doSend(tool.name)">
+                    <span
+                        v-if="tool.color != null"
+                        class="_extruderColorState mr-1"
+                        :style="{
+                            'border-color': tool.active ? primaryTextColor : '',
+                            'background-color': '#' + tool.color,
+                        }"></span>
+                    {{ tool.name }}
+                </v-btn>
+            </v-item-group>
+        </v-row>
+    </v-container>
+</template>
+
+<script lang="ts">
+import { mdiPrinter3dNozzle } from '@mdi/js'
+import { Component, Mixins } from 'vue-property-decorator'
+import { PrinterStateToolchangeMacro } from '@/store/printer/types'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
+
+@Component({})
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin) {
+    mdiPrinter3dNozzle = mdiPrinter3dNozzle
+
+    get macros() {
+        return this.$store.getters['printer/getMacros']
+    }
+
+    get toolchangeMacros(): PrinterStateToolchangeMacro[] {
+        const tools: PrinterStateToolchangeMacro[] = []
+        this.macros
+            .filter((macro: any) => macro.name.toUpperCase().match(/^T\d+/))
+            .forEach((macro: any) =>
+                tools.push({
+                    name: macro.name,
+                    active: macro.variables.active ?? false,
+                    color: macro.variables.color ?? macro.variables.colour ?? null,
+                })
+            )
+        return tools.sort((a, b) => {
+            const numberA = parseInt(a.name.slice(1))
+            const numberB = parseInt(b.name.slice(1))
+
+            return numberA - numberB
+        })
+    }
+
+    get wrappedToolchangeMacros(): any[] {
+        const rows: any[] = []
+
+        let maxCols = 6
+        let rowIndex = 0
+        let row: PrinterStateToolchangeMacro[] = []
+        rows.push(row)
+        for (const macro of this.toolchangeMacros) {
+            if (rows[rowIndex].length == maxCols) {
+                rowIndex = rowIndex + 1
+                let row: PrinterStateToolchangeMacro[] = []
+                rows.push(row)
+            }
+            rows[rowIndex].push(macro)
+        }
+
+        return rows
+    }
+
+    get isPrinting(): boolean {
+        return ['printing'].includes(this.printer_state)
+    }
+
+    get primaryColor(): string {
+        return this.$store.state.gui.uiSettings.primary
+    }
+
+    get primaryTextColor(): string {
+        let splits = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(this.primaryColor)
+        if (splits) {
+            const r = parseInt(splits[1], 16) * 0.2126
+            const g = parseInt(splits[2], 16) * 0.7152
+            const b = parseInt(splits[3], 16) * 0.0722
+            const perceivedLightness = (r + g + b) / 255
+
+            return perceivedLightness > 0.7 ? '#222' : '#fff'
+        }
+
+        return '#ffffff'
+    }
+
+    get warningColor(): string {
+        return this.$vuetify?.theme?.currentTheme?.warning?.toString() ?? '#ff8300'
+    }
+
+    doSend(gcode: string): void {
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: gcode.toLowerCase() })
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+._extruderColorState {
+    width: 15px;
+    height: 15px;
+    border-radius: 50%;
+    border: 1px solid lightgray;
+}
+
+._btn-group {
+    border-radius: 4px;
+    display: inline-flex;
+    flex-wrap: nowrap;
+    max-width: 100%;
+    min-width: 100%;
+    width: 100%;
+
+    .v-btn {
+        border-radius: 0;
+        border-color: rgba(255, 255, 255, 0.12);
+        border-style: solid;
+        border-width: thin;
+        box-shadow: none;
+        height: 28px;
+        opacity: 0.8;
+        min-width: auto !important;
+    }
+
+    .v-btn:first-child {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    .v-btn:last-child {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+
+    .v-btn:not(:first-child) {
+        border-left-width: 0;
+    }
+}
+</style>
diff --git a/src/components/panels/Extruder/ExtruderControlPanelToolsItem.vue b/src/components/panels/Extruder/ExtruderControlPanelToolsItem.vue
new file mode 100644
index 000000000..937b7ae89
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderControlPanelToolsItem.vue
@@ -0,0 +1,45 @@
+<template>
+    <v-btn
+        :class="buttonClass"
+        :disabled="printerIsPrintingOnly"
+        :style="buttonStyle"
+        dense
+        class="flex-grow-1 px-0"
+        @click="doSend(macro.name)">
+        {{ macro.name }}
+    </v-btn>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { PrinterStateMacro } from '@/store/printer/types'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
+
+@Component({
+    components: {},
+})
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin) {
+    @Prop({ type: Object }) macro!: PrinterStateMacro
+
+    get active() {
+        return this.macro.variables.active ?? false
+    }
+
+    get color() {
+        return this.macro.variables.color ?? this.macro.variables.colour ?? null
+    }
+
+    get buttonClass() {
+        return {
+            'primary--text': this.active,
+        }
+    }
+
+    get buttonStyle() {
+        return {
+            'background-color': '#' + this.color,
+        }
+    }
+}
+</script>
diff --git a/src/components/panels/Extruder/ExtrusionFactorSettings.vue b/src/components/panels/Extruder/ExtrusionFactorSettings.vue
new file mode 100644
index 000000000..0766e7ccf
--- /dev/null
+++ b/src/components/panels/Extruder/ExtrusionFactorSettings.vue
@@ -0,0 +1,27 @@
+<template>
+    <v-container class="pb-1">
+        <tool-slider
+            :label="$t('Panels.ExtruderControlPanel.ExtrusionFactor')"
+            :icon="mdiPrinter3dNozzleOutline"
+            :target="extrudeFactor"
+            :min="1"
+            :max="200"
+            :multi="100"
+            :step="1"
+            :has-input-field="true"
+            command="M221"
+            attribute-name="S" />
+    </v-container>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiPrinter3dNozzleOutline } from '@mdi/js'
+import ExtruderMixin from '@/components/mixins/extruder'
+
+@Component({})
+export default class PressureAdvanceSettings extends Mixins(BaseMixin, ExtruderMixin) {
+    mdiPrinter3dNozzleOutline = mdiPrinter3dNozzleOutline
+}
+</script>
diff --git a/src/components/panels/Extruder/FirmwareRetractionSettings.vue b/src/components/panels/Extruder/FirmwareRetractionSettings.vue
new file mode 100644
index 000000000..9e42f99a8
--- /dev/null
+++ b/src/components/panels/Extruder/FirmwareRetractionSettings.vue
@@ -0,0 +1,148 @@
+<template>
+    <div v-if="existsFirmwareRetraction">
+        <v-divider />
+        <v-container>
+            <responsive
+                :breakpoints="{
+                    small: (el) => el.width <= 350,
+                }">
+                <template #default="{ el }">
+                    <v-row>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.RetractLength')"
+                                param="RETRACT_LENGTH"
+                                :target="retractLength"
+                                :default-value="defaultRetractLength"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="10"
+                                :step="0.01"
+                                :min="0"
+                                :max="null"
+                                :dec="2"
+                                unit="mm"
+                                @submit="sendCmd" />
+                        </v-col>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.RetractSpeed')"
+                                param="RETRACT_SPEED"
+                                :target="retractSpeed"
+                                :default-value="defaultRetractSpeed"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="5"
+                                :step="1"
+                                :min="1"
+                                :max="null"
+                                :dec="0"
+                                unit="mm/s"
+                                @submit="sendCmd" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="
+                                    $t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.UnretractExtraLength')
+                                "
+                                param="UNRETRACT_EXTRA_LENGTH"
+                                :target="unretractExtraLength"
+                                :default-value="defaultUnretractExtraLength"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="10"
+                                :step="0.01"
+                                :min="0"
+                                :max="null"
+                                :dec="2"
+                                unit="mm"
+                                @submit="sendCmd" />
+                        </v-col>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.UnretractSpeed')"
+                                param="UNRETRACT_SPEED"
+                                :target="unretractSpeed"
+                                :default-value="defaultUnretractSpeed"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="5"
+                                :step="1"
+                                :min="1"
+                                :max="null"
+                                :dec="0"
+                                unit="mm/s"
+                                @submit="sendCmd" />
+                        </v-col>
+                    </v-row>
+                </template>
+            </responsive>
+        </v-container>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import { Debounce } from 'vue-debounce-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import NumberInput from '@/components/inputs/NumberInput.vue'
+import Responsive from '@/components/ui/Responsive.vue'
+import ControlMixin from '@/components/mixins/control'
+
+@Component({
+    components: { Panel, NumberInput, Responsive },
+})
+export default class FirmwareRetractionSettings extends Mixins(BaseMixin, ControlMixin) {
+    get retractLength(): number {
+        return Math.floor((this.$store.state.printer?.firmware_retraction?.retract_length ?? 0) * 100) / 100
+    }
+
+    get retractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.firmware_retraction?.retract_speed ?? 20)
+    }
+
+    get unretractExtraLength(): number {
+        return Math.floor((this.$store.state.printer?.firmware_retraction?.unretract_extra_length ?? 0) * 100) / 100
+    }
+
+    get unretractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.firmware_retraction?.unretract_speed ?? 10)
+    }
+
+    get defaultRetractLength(): number {
+        return (
+            Math.floor(
+                (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_length ?? 0) * 100
+            ) / 100
+        )
+    }
+
+    get defaultRetractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_speed ?? 20)
+    }
+
+    get defaultUnretractExtraLength(): number {
+        return (
+            Math.floor(
+                (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_extra_length ?? 0) *
+                    100
+            ) / 100
+        )
+    }
+
+    get defaultUnretractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_speed ?? 0)
+    }
+
+    @Debounce(500)
+    sendCmd(params: { name: string; value: number }): void {
+        const gcode = `SET_RETRACTION ${params.name}=${params.value}`
+
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
+}
+</script>
diff --git a/src/components/panels/Extruder/PressureAdvanceSettings.vue b/src/components/panels/Extruder/PressureAdvanceSettings.vue
new file mode 100644
index 000000000..32ac28ef6
--- /dev/null
+++ b/src/components/panels/Extruder/PressureAdvanceSettings.vue
@@ -0,0 +1,144 @@
+<template>
+    <div v-if="show">
+        <v-divider />
+        <v-container>
+            <responsive
+                :breakpoints="{
+                    small: (el) => el.width <= 350,
+                    medium: (el) => el.width > 350 && el.width <= 500,
+                }">
+                <template #default="{ el }">
+                    <v-row>
+                        <v-col v-if="allExtruders.length > 1" :class="{ 'col-12': el.is.small || el.is.medium }">
+                            <div class="d-flex align-center">
+                                <v-btn
+                                    v-if="selectedExtruder !== activeExtruder"
+                                    icon
+                                    plain
+                                    @click="resetToActiveExtruder">
+                                    <v-icon>{{ mdiRestart }}</v-icon>
+                                </v-btn>
+                                <v-select
+                                    v-model="selectedExtruder"
+                                    :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.Extruder')"
+                                    :items="allExtruders"
+                                    :value="activeExtruder"
+                                    hide-details
+                                    outlined
+                                    dense />
+                            </div>
+                        </v-col>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.Advance')"
+                                param="ADVANCE"
+                                :target="pressureAdvance"
+                                :default-value="defaultPressureAdvance"
+                                :extruder="selectedExtruder"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :min="0"
+                                :max="null"
+                                :step="0.001"
+                                :dec="3"
+                                unit="s"
+                                @submit="sendCmd" />
+                        </v-col>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.SmoothTime')"
+                                param="SMOOTH_TIME"
+                                :target="smoothTime"
+                                :default-value="defaultSmoothTime"
+                                :extruder="selectedExtruder"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="10"
+                                :min="0"
+                                :max="0.2"
+                                :step="0.001"
+                                :dec="3"
+                                unit="s"
+                                @submit="sendCmd" />
+                        </v-col>
+                    </v-row>
+                </template>
+            </responsive>
+        </v-container>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import { Debounce } from 'vue-debounce-decorator'
+import BaseMixin from '@/components/mixins/base'
+import NumberInput from '@/components/inputs/NumberInput.vue'
+import Panel from '@/components/ui/Panel.vue'
+import Responsive from '@/components/ui/Responsive.vue'
+import { mdiRestart } from '@mdi/js'
+
+@Component({
+    components: { NumberInput, Panel, Responsive },
+})
+export default class PressureAdvanceSettings extends Mixins(BaseMixin) {
+    mdiRestart = mdiRestart
+
+    private extruders: string[] = []
+    private selectedExtruder = ''
+
+    resetToActiveExtruder(): void {
+        this.selectedExtruder = this.$store.state.printer.toolhead?.extruder
+    }
+
+    get show(): boolean {
+        return !(this.$store.getters['printer/getExtruderSteppers'].length > 0)
+    }
+
+    get allExtruders(): string[] {
+        Object.keys(this.$store.state.printer).forEach((e) => {
+            if (e.startsWith('extruder') && !this.extruders.includes(e)) this.extruders.push(e)
+        })
+        this.extruders.length === 1 ? this.resetToActiveExtruder() : {}
+
+        return this.extruders
+    }
+
+    get activeExtruder(): string {
+        this.resetToActiveExtruder()
+        return this.$store.state.printer.toolhead?.extruder
+    }
+
+    get pressureAdvance(): number {
+        return Math.floor((this.$store.state.printer?.[this.selectedExtruder]?.pressure_advance ?? 0) * 1000) / 1000
+    }
+
+    get smoothTime(): number {
+        return Math.floor((this.$store.state.printer?.[this.selectedExtruder]?.smooth_time ?? 0.04) * 1000) / 1000
+    }
+
+    get defaultPressureAdvance(): number {
+        return (
+            Math.floor(
+                (this.$store.state.printer.configfile?.settings?.[this.selectedExtruder]?.pressure_advance ?? 0) * 1000
+            ) / 1000
+        )
+    }
+
+    get defaultSmoothTime(): number {
+        return (
+            Math.floor(
+                (this.$store.state.printer.configfile?.settings?.[this.selectedExtruder]
+                    ?.pressure_advance_smooth_time ?? 0.04) * 1000
+            ) / 1000
+        )
+    }
+
+    @Debounce(500)
+    sendCmd(params: { name: string; value: number }): void {
+        const gcode = `SET_PRESSURE_ADVANCE EXTRUDER=${this.selectedExtruder} ${params.name}=${params.value}`
+
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
+}
+</script>
diff --git a/src/components/panels/ExtruderControlPanel.vue b/src/components/panels/ExtruderControlPanel.vue
index a47aa76e0..ff2395c9b 100644
--- a/src/components/panels/ExtruderControlPanel.vue
+++ b/src/components/panels/ExtruderControlPanel.vue
@@ -1,10 +1,11 @@
 <template>
     <panel
-        v-if="klipperReadyForGui && extruders.length"
+        v-if="showPanel"
         :icon="mdiPrinter3dNozzle"
-        :title="$t('Panels.ExtruderControlPanel.Headline').toString()"
+        :title="$t('Panels.ExtruderControlPanel.Headline')"
         :collapsible="true"
-        card-class="extruder-control-panel">
+        card-class="extruder-control-panel"
+        class="pb-1">
         <!-- PANEL-HEADER 3-DOT-MENU -->
         <template #buttons>
             <v-menu v-if="showFilamentMacros" :offset-y="true" :close-on-content-click="false" left>
@@ -21,8 +22,8 @@
                                 <div v-on="on">
                                     <macro-button
                                         :macro="unloadFilamentMacro"
-                                        :alias="$t('Panels.ExtruderControlPanel.UnloadFilament').toString()"
-                                        :disabled="!canExecuteUnloadMacro || isPrinting"
+                                        :alias="$t('Panels.ExtruderControlPanel.UnloadFilament')"
+                                        :disabled="!canExecuteUnloadMacro || printerIsPrintingOnly"
                                         color="#272727" />
                                 </div>
                             </template>
@@ -39,8 +40,8 @@
                                 <div v-on="on">
                                     <macro-button
                                         :macro="loadFilamentMacro"
-                                        :alias="$t('Panels.ExtruderControlPanel.LoadFilament').toString()"
-                                        :disabled="!canExecuteLoadMacro || isPrinting"
+                                        :alias="$t('Panels.ExtruderControlPanel.LoadFilament')"
+                                        :disabled="!canExecuteLoadMacro || printerIsPrintingOnly"
                                         color="#272727" />
                                 </div>
                             </template>
@@ -53,355 +54,55 @@
                 </v-list>
             </v-menu>
         </template>
-        <responsive :breakpoints="{ large: (el) => el.width >= 640 }">
-            <template #default="{ el }">
-                <!-- TOOL SELECTOR BUTTONS -->
-                <v-container v-if="toolchangeMacros.length > 1" class="pl-6 pr-6 pt-6 pb-0 mb-3">
-                    <v-row v-for="(row, index) in wrappedToolchangeMacros" :key="index">
-                        <v-item-group class="_btn-group py-0 mb-3">
-                            <v-btn
-                                v-for="tool in row"
-                                :key="tool.name"
-                                :disabled="isPrinting"
-                                :loading="loadings.includes(tool.name.toLowerCase())"
-                                class="flex-grow-1 px-0"
-                                :style="{
-                                    'background-color': tool.active
-                                        ? homedAxes.includes('xyz')
-                                            ? primaryColor
-                                            : warningColor
-                                        : '',
-                                    color: tool.active ? primaryTextColor : '',
-                                }"
-                                dense
-                                @click="doSend(tool.name)">
-                                <span
-                                    v-if="tool.color != null"
-                                    class="_extruderColorState mr-1"
-                                    :style="{
-                                        'border-color': tool.active ? primaryTextColor : '',
-                                        'background-color': '#' + tool.color,
-                                    }"></span>
-                                {{ !isIdex ? tool.name : tool.title == null ? tool.name : tool.title }}
-                            </v-btn>
-                        </v-item-group>
-                    </v-row>
-                </v-container>
-                <!-- EXTRUSION FACTOR SLIDER -->
-                <v-container class="pb-1">
-                    <tool-slider
-                        :label="$t('Panels.ExtruderControlPanel.ExtrusionFactor').toString()"
-                        :icon="mdiPrinter3dNozzleOutline"
-                        :target="extrudeFactor"
-                        :min="1"
-                        :max="200"
-                        :multi="100"
-                        :step="1"
-                        :has-input-field="true"
-                        command="M221"
-                        attribute-name="S"></tool-slider>
-                </v-container>
-                <!-- PRESSURE ADVANCE SETTINGS -->
-                <template v-if="!(extruderSteppers.length > 0)">
-                    <v-divider></v-divider>
-                    <pressure-advance-settings></pressure-advance-settings>
-                </template>
-                <!-- FIRMWARE RETRACTION SETTINGS -->
-                <template v-if="existsFirmwareRetraction">
-                    <v-divider></v-divider>
-                    <firmware-retraction-settings></firmware-retraction-settings>
-                </template>
-                <v-divider class="pb-1"></v-divider>
-                <!-- EXTRUDER INPUTS AND QUICKSELECTS -->
-                <v-container>
-                    <v-row>
-                        <v-col>
-                            <number-input
-                                :label="$t('Panels.ExtruderControlPanel.FilamentLength').toString()"
-                                param="feedamount"
-                                :target="feedamount"
-                                :disabled="isPrinting"
-                                :output-error-msg="true"
-                                :has-spinner="true"
-                                :spinner-factor="100"
-                                :step="0.01"
-                                :min="0.01"
-                                :max="maxExtrudeOnlyDistance"
-                                :dec="2"
-                                unit="mm"
-                                :submit-on-blur="true"
-                                @submit="setFeedamount"></number-input>
-                            <v-item-group class="_btn-group pt-3">
-                                <v-btn
-                                    v-for="value in feedamountsSorted"
-                                    :key="value"
-                                    :disabled="isPrinting"
-                                    dense
-                                    class="_btn-qs flex-grow-1 px-0"
-                                    @click="setFeedamount({ value })">
-                                    {{ value }}
-                                </v-btn>
-                            </v-item-group>
-                        </v-col>
-                        <v-col>
-                            <number-input
-                                :label="$t('Panels.ExtruderControlPanel.ExtrusionFeedrate').toString()"
-                                param="feedrate"
-                                :target="feedrate"
-                                :disabled="isPrinting"
-                                :has-spinner="true"
-                                :output-error-msg="true"
-                                :spinner-factor="100"
-                                :step="0.01"
-                                :min="0.01"
-                                :max="null"
-                                :dec="2"
-                                type="number"
-                                unit="mm/s"
-                                @submit="setFeedrate"></number-input>
-                            <v-item-group class="_btn-group pt-3">
-                                <v-btn
-                                    v-for="value in feedratesSorted"
-                                    :key="value"
-                                    :disabled="isPrinting"
-                                    dense
-                                    class="_btn-qs flex-grow-1 px-0"
-                                    @click="setFeedrate({ value })">
-                                    {{ value }}
-                                </v-btn>
-                            </v-item-group>
-                        </v-col>
-                        <!-- EXTRUDE AND RETRACT BUTTON LARGE SIZED PANEL -->
-                        <v-col v-if="el.is.large" class="col-3 d-flex align-center flex-column justify-center">
-                            <!-- RETRACT -->
-                            <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                <template #activator="{ on }">
-                                    <div class="mb-4" v-on="on">
-                                        <v-btn
-                                            :loading="loadings.includes('btnRetract')"
-                                            :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                            small
-                                            class="_btn-extruder-cmd"
-                                            @click="sendRetract()">
-                                            <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
-                                            {{ $t('Panels.ExtruderControlPanel.Retract') }}
-                                        </v-btn>
-                                    </div>
-                                </template>
-                                <span v-show="!extrudePossible">
-                                    {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                    {{ minExtrudeTemp }} °C
-                                </span>
-                                <span v-show="tooLargeExtrusion">
-                                    {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                    {{ feedamount * extrudeFactor }} mm
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
-                                </span>
-                            </v-tooltip>
-                            <!-- EXTRUDE  -->
-                            <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                <template #activator="{ on }">
-                                    <div v-on="on">
-                                        <v-btn
-                                            :loading="loadings.includes('btnDetract')"
-                                            :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                            small
-                                            class="_btn-extruder-cmd"
-                                            @click="sendExtrude()">
-                                            <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
-                                            {{ $t('Panels.ExtruderControlPanel.Extrude') }}
-                                        </v-btn>
-                                    </div>
-                                </template>
-                                <span v-show="!extrudePossible">
-                                    {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                    {{ minExtrudeTemp }} °C
-                                </span>
-                                <span v-show="tooLargeExtrusion">
-                                    {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                    {{ feedamount * extrudeFactor }} mm
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
-                                </span>
-                            </v-tooltip>
-                        </v-col>
-                    </v-row>
-                    <!-- EXTRUDE AND RETRACT BUTTON SMALL AND MEDIUM SIZED PANEL -->
-                    <v-row v-if="!el.is.large" :class="{ 'pb-1': !showEstimatedExtrusion }">
-                        <v-col class="pa-0">
-                            <div class="d-flex justify-space-around">
-                                <div class="d-flex align-center">
-                                    <!-- RETRACT -->
-                                    <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                        <template #activator="{ on }">
-                                            <div class="pt-1 pb-2 px-3" v-on="on">
-                                                <v-btn
-                                                    :loading="loadings.includes('btnRetract')"
-                                                    :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                                    small
-                                                    class="_btn-extruder-cmd"
-                                                    @click="sendRetract()">
-                                                    <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
-                                                    {{ $t('Panels.ExtruderControlPanel.Retract') }}
-                                                </v-btn>
-                                            </div>
-                                        </template>
-                                        <span v-show="!extrudePossible">
-                                            {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                            {{ minExtrudeTemp }} °C
-                                        </span>
-                                        <span v-show="tooLargeExtrusion">
-                                            {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                            {{ feedamount * extrudeFactor }} mm
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Allowed') }}:
-                                            {{ maxExtrudeOnlyDistance }} mm
-                                        </span>
-                                    </v-tooltip>
-                                    <!-- EXTRUDE  -->
-                                    <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                        <template #activator="{ on }">
-                                            <div class="pt-1 pb-2 px-3" v-on="on">
-                                                <v-btn
-                                                    :loading="loadings.includes('btnDetract')"
-                                                    :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                                    small
-                                                    class="_btn-extruder-cmd"
-                                                    @click="sendExtrude()">
-                                                    <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
-                                                    {{ $t('Panels.ExtruderControlPanel.Extrude') }}
-                                                </v-btn>
-                                            </div>
-                                        </template>
-                                        <span v-show="!extrudePossible">
-                                            {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                            {{ minExtrudeTemp }} °C
-                                        </span>
-                                        <span v-show="tooLargeExtrusion">
-                                            {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                            {{ feedamount * extrudeFactor }} mm
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Allowed') }}:
-                                            {{ maxExtrudeOnlyDistance }} mm
-                                        </span>
-                                    </v-tooltip>
-                                </div>
-                            </div>
-                        </v-col>
-                    </v-row>
-                </v-container>
-                <!-- EXTRUSION ESTIMATION NOTE -->
-                <v-container v-if="showEstimatedExtrusion" class="pa-0 ma-0 pb-2">
-                    <div
-                        v-if="filamentDiameter && nozzleDiameter"
-                        style="font-size: 0.8em"
-                        class="text--disabled text-caption font-weight-light d-flex justify-center">
-                        <span>
-                            {{ $t('Panels.ExtruderControlPanel.EstimatedExtrusion') }} ~ {{ extrudedLength }} mm @
-                            {{ volumetricFlow }} mm³/s -
-                            <v-icon x-small style="opacity: 0.4; margin-top: -2px">
-                                {{ mdiDiameterVariant }}
-                            </v-icon>
-                            {{ nozzleDiameter }} mm
-                        </span>
-                    </div>
-                </v-container>
-            </template>
-        </responsive>
+        <!-- TOOL SELECTOR BUTTONS -->
+        <extruder-control-panel-tools />
+        <!-- EXTRUSION FACTOR SLIDER -->
+        <extrusion-factor-settings />
+        <!-- PRESSURE ADVANCE SETTINGS -->
+        <pressure-advance-settings />
+        <!-- FIRMWARE RETRACTION SETTINGS -->
+        <firmware-retraction-settings />
+        <v-divider class="pb-1" />
+        <!-- EXTRUDER INPUTS AND QUICKSELECTS -->
+        <extruder-control-panel-control />
+        <!-- EXTRUSION ESTIMATION NOTE -->
+        <estimated-extrusion-output />
     </panel>
 </template>
 
 <script lang="ts">
-import {
-    mdiArrowDownBold,
-    mdiArrowUpBold,
-    mdiPrinter3dNozzle,
-    mdiPrinter3dNozzleOutline,
-    mdiDotsVertical,
-    mdiDiameterVariant,
-} from '@mdi/js'
-import { Component, Mixins, Watch } from 'vue-property-decorator'
-import {
-    PrinterStateExtruder,
-    PrinterStateExtruderStepper,
-    PrinterStateMacro,
-    PrinterStateToolchangeMacro,
-} from '@/store/printer/types'
-import BaseMixin from '../mixins/base'
-import ControlMixin from '../mixins/control'
-import NumberInput from '@/components/inputs/NumberInput.vue'
+import { mdiPrinter3dNozzle, mdiDotsVertical } from '@mdi/js'
+import { Component, Mixins } from 'vue-property-decorator'
+import { PrinterStateExtruder, PrinterStateMacro } from '@/store/printer/types'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
 import Panel from '@/components/ui/Panel.vue'
-import PressureAdvanceSettings from '@/components/panels/ExtruderSettings/PressureAdvanceSettings.vue'
-import FirmwareRetractionSettings from '@/components/panels/ExtruderSettings/FirmwareRetractionSettings.vue'
-import Responsive from '@/components/ui/Responsive.vue'
-import ToolSlider from '@/components/inputs/ToolSlider.vue'
-import TheScrewsTiltAdjustDialog from '../dialogs/TheScrewsTiltAdjustDialog.vue'
+import ExtruderMixin from '@/components/mixins/extruder'
 
 @Component({
     components: {
         Panel,
-        PressureAdvanceSettings,
-        FirmwareRetractionSettings,
-        NumberInput,
-        Responsive,
-        ToolSlider,
     },
 })
-export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin) {
-    mdiArrowUpBold = mdiArrowUpBold
-    mdiArrowDownBold = mdiArrowDownBold
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin, ExtruderMixin) {
     mdiPrinter3dNozzle = mdiPrinter3dNozzle
-    mdiPrinter3dNozzleOutline = mdiPrinter3dNozzleOutline
     mdiDotsVertical = mdiDotsVertical
-    mdiDiameterVariant = mdiDiameterVariant
 
     private heatWaitGcodes = ['printer.extruder.can_extrude', 'TEMPERATURE_WAIT', 'M109']
 
-    get isPrinting(): boolean {
-        return ['printing'].includes(this.printer_state)
+    get showPanel(): boolean {
+        return this.klipperReadyForGui && this.extruders.length > 0
     }
 
     get macros() {
         return this.$store.getters['printer/getMacros']
     }
 
-    get wrappedToolchangeMacros(): any[] {
-        const rows: any[] = []
-
-        let maxCols = 6
-        let rowIndex = 0
-        let row: PrinterStateToolchangeMacro[] = []
-        rows.push(row)
-        for (const macro of this.toolchangeMacros) {
-            if (rows[rowIndex].length == maxCols) {
-                rowIndex = rowIndex + 1
-                let row: PrinterStateToolchangeMacro[] = []
-                rows.push(row)
-            }
-            rows[rowIndex].push(macro)
-        }
-
-        return rows
-    }
-
-    get toolchangeMacros(): PrinterStateToolchangeMacro[] {
-        return this.$store.getters['printer/getToolchangeMacros']
-    }
-
-    get loadFilamentMacro() {
+    get loadFilamentMacro(): PrinterStateMacro | undefined {
         return this.macros.find((macro: PrinterStateMacro) => macro.name.toUpperCase() === 'LOAD_FILAMENT')
     }
 
-    get unloadFilamentMacro() {
+    get unloadFilamentMacro(): PrinterStateMacro | undefined {
         return this.macros.find((macro: PrinterStateMacro) => macro.name.toUpperCase() === 'UNLOAD_FILAMENT')
     }
 
@@ -412,13 +113,13 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin
     get canExecuteLoadMacro(): boolean {
         if (this.extrudePossible) return true
 
-        return this.heatWaitGcodes.some((gcode) => this.loadFilamentMacro.prop.gcode.includes(gcode))
+        return this.heatWaitGcodes.some((gcode) => this.loadFilamentMacro?.prop.gcode.includes(gcode))
     }
 
     get canExecuteUnloadMacro(): boolean {
         if (this.extrudePossible) return true
 
-        return this.heatWaitGcodes.some((gcode) => this.unloadFilamentMacro.prop.gcode.includes(gcode))
+        return this.heatWaitGcodes.some((gcode) => this.unloadFilamentMacro?.prop.gcode.includes(gcode))
     }
 
     get showFilamentMacros(): boolean {
@@ -428,204 +129,5 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin
     get extruders(): PrinterStateExtruder[] {
         return this.$store.getters['printer/getExtruders']
     }
-
-    get extruderSteppers(): PrinterStateExtruderStepper[] {
-        return this.$store.getters['printer/getExtruderSteppers']
-    }
-
-    get activeExtruder(): string {
-        return this.$store.state.printer.toolhead?.extruder
-    }
-
-    get filamentDiameter(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.filament_diameter ?? 1.75
-    }
-
-    get nozzleDiameter(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.nozzle_diameter ?? 0.4
-    }
-
-    get feedamounts(): number[] {
-        return this.$store.state.gui.control.extruder?.feedamounts ?? []
-    }
-
-    get feedrates(): number[] {
-        return this.$store.state.gui.control.extruder?.feedrates ?? []
-    }
-
-    get feedamountsSorted(): number[] {
-        return [...this.feedamounts].sort((a, b) => {
-            return b - a
-        })
-    }
-
-    get feedratesSorted(): number[] {
-        return [...this.feedrates].sort((a, b) => {
-            return b - a
-        })
-    }
-
-    get feedamount(): number {
-        return parseFloat(this.$store.state.gui.control.extruder.feedamount)
-    }
-
-    setFeedamount(params: { value: number }): void {
-        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedamount', value: params.value })
-    }
-
-    get feedrate(): number {
-        return parseFloat(this.$store.state.gui.control.extruder.feedrate)
-    }
-
-    setFeedrate(params: { value: number }): void {
-        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedrate', value: params.value })
-    }
-
-    get extrudePossible(): boolean {
-        return this.$store.getters['printer/getExtrudePossible']
-    }
-
-    get minExtrudeTemp(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.min_extrude_temp ?? 170
-    }
-
-    get maxExtrudeOnlyDistance(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.max_extrude_only_distance ?? 50
-    }
-
-    get tooLargeExtrusion(): boolean {
-        return this.feedamount * this.extrudeFactor > this.maxExtrudeOnlyDistance
-    }
-
-    get extrudedLength(): number {
-        return Math.round(
-            this.feedamount *
-                this.extrudeFactor *
-                (Math.pow(this.filamentDiameter, 2) / Math.pow(this.nozzleDiameter, 2))
-        )
-    }
-
-    get volumetricFlow(): number {
-        return Math.round(Math.pow(this.filamentDiameter / 2, 2) * Math.PI * this.feedrate * 10) / 10
-    }
-
-    get extrudeFactor() {
-        return this.$store.state.printer?.gcode_move?.extrude_factor ?? 1
-    }
-
-    get showEstimatedExtrusion() {
-        return this.$store.state.gui.control.extruder.showEstimatedExtrusionInfo
-    }
-
-    get primaryColor(): string {
-        return this.$store.state.gui.uiSettings.primary
-    }
-
-    get primaryTextColor(): string {
-        let splits = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(this.primaryColor)
-        if (splits) {
-            const r = parseInt(splits[1], 16) * 0.2126
-            const g = parseInt(splits[2], 16) * 0.7152
-            const b = parseInt(splits[3], 16) * 0.0722
-            const perceivedLightness = (r + g + b) / 255
-
-            return perceivedLightness > 0.7 ? '#222' : '#fff'
-        }
-
-        return '#ffffff'
-    }
-
-    get warningColor(): string {
-        return this.$vuetify?.theme?.currentTheme?.warning?.toString() ?? '#ff8300'
-    }
-
-    get isIdex(): boolean {
-        return 'dual_carriage' in this.$store.state.printer
-    }
-
-    get idexMode(): string {
-        return this.$store.state.printer.dual_carriage?.carriage_1?.toString().toLowerCase()
-    }
-
-    @Watch('maxExtrudeOnlyDistance', { immediate: true })
-    onMaxExtrudeOnlyDistanceChange(): void {
-        /**
-         * If, while switching from ex. A to ex. B, the feedamount
-         * from ex. A exceeds the maxExtrudeOnlyDistance of ex. B,
-         * set the feedamount to maxExtrudeOnlyDistance of ex. B
-         */
-        if (this.feedamount > this.maxExtrudeOnlyDistance) {
-            this.setFeedamount({ value: this.maxExtrudeOnlyDistance })
-        }
-    }
-
-    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' })
-    }
-
-    sendExtrude(): 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: 'btnDetract' })
-    }
-
-    doSend(gcode: string): void {
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: gcode.toLowerCase() })
-    }
 }
 </script>
-
-<style lang="scss" scoped>
-._extruderColorState {
-    width: 15px;
-    height: 15px;
-    border-radius: 50%;
-    border: 1px solid lightgray;
-}
-
-._btn-group {
-    border-radius: 4px;
-    display: inline-flex;
-    flex-wrap: nowrap;
-    max-width: 100%;
-    min-width: 100%;
-    width: 100%;
-
-    .v-btn {
-        border-radius: 0;
-        border-color: rgba(255, 255, 255, 0.12);
-        border-style: solid;
-        border-width: thin;
-        box-shadow: none;
-        height: 28px;
-        opacity: 0.8;
-        min-width: auto !important;
-    }
-
-    .v-btn:first-child {
-        border-top-left-radius: inherit;
-        border-bottom-left-radius: inherit;
-    }
-
-    .v-btn:last-child {
-        border-top-right-radius: inherit;
-        border-bottom-right-radius: inherit;
-    }
-
-    .v-btn:not(:first-child) {
-        border-left-width: 0;
-    }
-}
-
-._btn-qs {
-    font-size: 0.8rem !important;
-    max-height: 24px;
-}
-
-._btn-extruder-cmd {
-    min-width: 135px !important;
-}
-</style>
diff --git a/src/components/panels/ToolheadControls/IdexControl.vue b/src/components/panels/ToolheadControls/IdexControl.vue
new file mode 100644
index 000000000..1bc294445
--- /dev/null
+++ b/src/components/panels/ToolheadControls/IdexControl.vue
@@ -0,0 +1,140 @@
+<template>
+    <v-container class="py-0">
+        <v-item-group class="_btn-group py-0">
+            <v-btn
+                class="_btn-qs flex-grow-1 px-1"
+                :disabled="isPrinting || !homedAxes.includes('xyz')"
+                :loading="loadings.includes('idex_single')"
+                :style="{
+                    'background-color': idexMode != 'copy' && idexMode != 'mirror' ? primaryColor : '',
+                    color: idexMode != 'copy' && idexMode != 'mirror' ? primaryTextColor : '',
+                }"
+                dense
+                @click="doSend('IDEX_SINGLE')">
+                {{ $t('Panels.ToolheadControlPanel.SingleMode') }}
+            </v-btn>
+            <v-btn
+                class="_btn-qs flex-grow-1 px-1"
+                :disabled="isPrinting || !homedAxes.includes('xyz')"
+                :loading="loadings.includes('idex_copy')"
+                :style="{
+                    'background-color': idexMode == 'copy' ? primaryColor : '',
+                    color: idexMode == 'copy' ? primaryTextColor : '',
+                }"
+                dense
+                @click="doSend('IDEX_COPY')">
+                {{ $t('Panels.ToolheadControlPanel.CopyMode') }}
+            </v-btn>
+            <v-btn
+                class="_btn-qs flex-grow-1 px-1"
+                :disabled="isPrinting || !homedAxes.includes('xyz')"
+                :loading="loadings.includes('idex_mirror')"
+                :style="{
+                    'background-color': idexMode == 'mirror' ? primaryColor : '',
+                    color: idexMode == 'mirror' ? primaryTextColor : '',
+                }"
+                dense
+                @click="doSend('IDEX_MIRROR')">
+                {{ $t('Panels.ToolheadControlPanel.MirrorMode') }}
+            </v-btn>
+            <v-btn
+                class="_btn-qs flex-grow-1 px-1"
+                :disabled="isPrinting || !homedAxes.includes('xyz') || idexMode == 'copy' || idexMode == 'mirror'"
+                :loading="loadings.includes('idex_park')"
+                dense
+                @click="doSend('IDEX_PARK')">
+                {{ $t('Panels.ToolheadControlPanel.Park') }}
+            </v-btn>
+        </v-item-group>
+    </v-container>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
+
+@Component
+export default class IdexControl extends Mixins(BaseMixin, ControlMixin) {
+    get isPrinting() {
+        return ['printing'].includes(this.printer_state)
+    }
+
+    get homedAxes(): string {
+        return this.$store.state.printer?.toolhead?.homed_axes ?? ''
+    }
+
+    get idexMode(): string {
+        return this.$store.state.printer.dual_carriage?.carriage_1?.toString().toLowerCase()
+    }
+
+    get primaryColor(): string {
+        return this.$store.state.gui.uiSettings.primary
+    }
+
+    get primaryTextColor(): string {
+        let splits = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(this.primaryColor)
+        if (splits) {
+            const r = parseInt(splits[1], 16) * 0.2126
+            const g = parseInt(splits[2], 16) * 0.7152
+            const b = parseInt(splits[3], 16) * 0.0722
+            const perceivedLightness = (r + g + b) / 255
+
+            return perceivedLightness > 0.7 ? '#222' : '#fff'
+        }
+
+        return '#ffffff'
+    }
+
+    doSend(gcode: string): void {
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: gcode.toLowerCase() })
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.v-btn-toggle {
+    width: 100%;
+}
+
+._btn-group {
+    border-radius: 4px;
+    display: inline-flex;
+    flex-wrap: nowrap;
+    max-width: 100%;
+    min-width: 100%;
+    width: 100%;
+
+    .v-btn {
+        border-radius: 0;
+        border-color: rgba(255, 255, 255, 0.12);
+        border-style: solid;
+        border-width: thin;
+        box-shadow: none;
+        height: 28px;
+        opacity: 0.8;
+        min-width: auto !important;
+    }
+
+    .v-btn:first-child {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    .v-btn:last-child {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+
+    .v-btn:not(:first-child) {
+        border-left-width: 0;
+    }
+}
+
+._btn-qs {
+    font-size: 0.8rem !important;
+    font-weight: 400;
+    max-height: 28px;
+}
+</style>
diff --git a/src/locales/es.json b/src/locales/es.json
index c91fedeea..bc53e0f9c 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -21,6 +21,7 @@
             "Never": "nunca",
             "NextReboot": "próximo reinicio",
             "NoNotification": "No hay notificación disponible",
+            "Notifications": "Notificaciones",
             "Remind": "Recordar:"
         },
         "NumberInput": {
@@ -29,6 +30,11 @@
             "NoEmptyAllowedError": "¡No puede estar vacío!"
         },
         "Printers": "Impresoras",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "El caché local necesita ser actualizado. Por favor, haga click en el botón de abajo para actualizar el caché.",
+            "TitleNeedUpdate": "PWA necesita actualizarse",
+            "Update": "actualizar"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "Los núcleos rPi ARM tienen la frecuencia reducida.",
             "DescriptionFrequencyCapped": "La frecuencia máxima de los núcleos rPi ARM está actualmente limitada a 1.2 GHz.",
@@ -51,6 +57,7 @@
             "Complete": "Completado - {filename}",
             "Error": "ERROR",
             "Pause": "Pausar impresión",
+            "PrinterOff": "Impresora Apagada",
             "Printing": "{percent}% impreso - {filename}",
             "PrintingETA": "{percent}% impreso - ETA: {eta} - {filename}"
         },
@@ -106,11 +113,23 @@
             "UpdatingDone": "¡Actualización de {software} realizada!"
         }
     },
+    "BedScrews": {
+        "Abort": "abortar",
+        "Accept": "aceptar",
+        "Adjusted": "ajustar",
+        "Description": "Haz click en <b>AJUSTADO</b> si el tornillo actual ha sido ajustado. Haz click en <b>ACEPTAR</b> para continuar sin ajustar.",
+        "Headline": "Tornillos de la Cama",
+        "ScrewAccepted": "Tornillos aceptados",
+        "ScrewIndex": "Índice de Tornillos",
+        "ScrewName": "Nombre de Tornillo",
+        "ScrewOutput": "{current} de {max}"
+    },
     "ConnectionDialog": {
         "CannotConnectTo": "No se pudo conectar a ({host}) Moonraker.",
         "CheckMoonrakerLog": "Si este mensaje aparece repetidamente, por favor dé un vistazo al archivo de registro ubicado en:",
         "Connecting": "Conectando a {host}",
         "Failed": "Conexión Fallida",
+        "Initializing": "Inicializando",
         "TryAgain": "Intentar nuevamente"
     },
     "Console": {
@@ -148,11 +167,15 @@
         "AreYouSure": "¿Está seguro?",
         "EmergencyStop": "Parada de emergencia",
         "No": "No",
-        "Yes": "Si"
+        "Yes": "Sí"
     },
     "Files": {
+        "AddBatchToQueue": "Añadir lote a la fila",
         "AddToQueue": "Añadir a la fila",
         "AllFiles": "Todos",
+        "BedTemp": "Temp. Cama",
+        "ChamberTemp": "Temp. Cámara",
+        "Count": "Contador",
         "Cancel": "Cancelar",
         "Create": "Crear",
         "CreateNewDirectory": "Crear nuevo directorio",
@@ -161,9 +184,13 @@
         "DeleteDirectory": "Borrar directorio",
         "DeleteDirectoryQuestion": "¿Realmente quiere borrar la carpeta \"{name}\" con todo su contenido?",
         "DeleteSelectedQuestion": "¿Realmente desea eliminar {count} archivos seleccionados?",
+        "DeleteSingleFileQuestion": "¿Realmente quiere eliminar el archivo \"{name}\"?",
         "Download": "Descargar",
+        "Duplicate": "Duplicar",
+        "DuplicateFile": "Duplicar Archivo",
         "EditFile": "Editar archivo",
         "Empty": "Vacío",
+        "ExtruderTemp": "Temp. Extructor",
         "Filament": "Filamento",
         "FilamentName": "Nombre del filamento",
         "FilamentType": "Tipo de filamento",
@@ -174,7 +201,10 @@
         "Free": "Libre",
         "FreeDisk": "Espacio libre en disco",
         "GCodeFiles": "Archivos G-Code",
+        "GcodesRootDirectoryDoesntExists": "No existe un directorio de archivos G-Code. Por favor, habilita la opción \"path\" en la sección [virtual_sdcard] de la configuración de Klipper.",
         "HiddenFiles": "Archivos ocultos",
+        "InvalidNameAlreadyExists": "El nombre ya existe, por favor escoge otro nombre.",
+        "InvalidNameEmpty": "¡La entrada no puede estar vacía!",
         "LastEndTime": "Ultima hora de finalización",
         "LastFilamentUsed": "Ultimo filamento usado",
         "LastModified": "Ultima modificación",
@@ -194,6 +224,8 @@
         "Rename": "Renombrar",
         "RenameDirectory": "Renombrar directorio",
         "RenameFile": "Renombrar archivo",
+        "ScanMeta": "Escanear Metadatos",
+        "ScanMetaSuccess": "Los metadatos de {filename} han sido escaneados de forma exitosa.",
         "Search": "Buscar",
         "SetupCurrentList": "Configurar lista actual",
         "Slicer": "Laminador",
@@ -234,7 +266,9 @@
         "Tracking": "Seguimiento",
         "Transparency": "Transparencia",
         "Ultra": "Ultra",
-        "VoxelMode": "Modo Voxel (ASMBL)"
+        "VoxelMode": "Modo Voxel (ASMBL)",
+        "ShowGCode": "Mostrar G-Code",
+        "CNCMode": "Modo CNC"
     },
     "Heightmap": {
         "Abort": "Abortar",
@@ -247,6 +281,7 @@
             "Max": "Max",
             "Min": "Min",
             "Name": "Nombre",
+            "Range": "Rango",
             "Size": "Tamaño",
             "Variance": "Variación"
         },
@@ -255,6 +290,10 @@
         "ErrorKlipperNotReady": "Klipper no disponible. Mapa de altura deshabilitado.",
         "Flat": "Plana",
         "Heightmap": "Mapa de altura",
+        "InvalidNameAlreadyExists": "El nombre del perfil ya existe, por favor escoge otro nombre de perfil.",
+        "InvalidNameAscii": "El nombre es inválido. Solo caracteres ascii son permitidos.",
+        "InvalidNameEmpty": "¡La entrada no puede estar vacía!",
+        "InvalidNameReserved": "El perfil 'default' está reservado, por favor escoge otro nombre de perfil.",
         "Later": "Más tarde",
         "Mesh": "Malla",
         "Name": "Nombre",
@@ -281,8 +320,10 @@
         "AvgPrinttime": "Tiempo promedio de imp.",
         "Cancel": "Cancelar",
         "CreateNote": "Crear Nota",
+        "Chart": "Gráfico",
         "Delete": "Eliminar",
         "DeleteSelectedQuestion": "¿Está seguro de que desea eliminar los {count} trabajos seleccionados?",
+        "DeleteSingleJobQuestion": "¿Está seguro de que desea eliminar este trabajo?",
         "Details": "Detalles",
         "EditNote": "Editar Nota",
         "Empty": "Vacío",
@@ -329,8 +370,10 @@
             "in_progress": "En progreso",
             "klippy_disconnect": "Klippy desconectado",
             "klippy_shutdown": "Klippy apagado",
+            "Others": "Otros",
             "server_exit": "salida del servidor"
         },
+        "Table": "Tabla",
         "TitleExportHistory": "Exportar historial",
         "TitleRefreshHistory": "Actualizar historial",
         "TitleSettings": "Configuración",
@@ -342,6 +385,11 @@
     },
     "JobQueue": {
         "AllJobs": "Todas las tareas",
+        "ChangeCount": "Cambiar contador",
+        "Cancel": "Cancelar",
+        "Count": "Contador",
+        "InvalidCountEmpty": "¡La entrada no puede estar vacía!",
+        "InvalidCountGreaterZero": "¡La entrada debe ser mayor que 0!",
         "Empty": "Vacía",
         "JobQueue": "Cola de tareas",
         "Jobs": "Tareas",
@@ -354,6 +402,7 @@
             "AllFiles": "Todos",
             "Cancel": "Cancelar",
             "ConfigFiles": "Archivos de configuración",
+            "ConfigRootDirectoryDoesntExists": "Ningún directorio encontrado. Por favor habilita la opción \"config_path\" en la sección [file_manager] de la configuración de Moonraker.",
             "Create": "Crear",
             "CreateDirectory": "Crear directorio",
             "CreateFile": "Crear archivo",
@@ -362,7 +411,10 @@
             "DeleteDirectory": "Eliminar carpeta",
             "DeleteDirectoryQuestion": "¿Realmente quiere eliminar \"{name}\" con todo su contenido?",
             "DeleteSelectedQuestion": "¿Eliminar {count} elementos seleccionados?",
+            "DeleteSingleFileQuestion": "¿Realmente quieres borrar el archivo \"{name}\"?",
             "Download": "Descargar",
+            "Duplicate": "Duplicar",
+            "DuplicateFile": "Duplicar Archivo",
             "EditFile": "Editar archivo",
             "Empty": "Vacío",
             "Files": "Archivos",
@@ -393,7 +445,13 @@
             "TRIGGERED": "ACTIVADO"
         },
         "LogfilesPanel": {
-            "Logfiles": "Archivos de registro"
+            "Accept": "Aceptar",
+            "Cancel": "Cancelar",
+            "Logfiles": "Archivos de registro",
+            "Rollover": "Registros de Rotación",
+            "RolloverDescription": "Por favor seleciona los registros que deben ser reseteados:",
+            "RolloverToastSuccessful": "El registro de \"{name}\" ha sido reseteado exitosamente",
+            "RolloverToastFailed": "Registros de rotación de \"{name}\": {message}"
         },
         "SystemPanel": {
             "Constants": "Constantes",
@@ -421,29 +479,56 @@
             }
         },
         "UpdatePanel": {
-            "CheckForUpdates": "Verificar actualizaciones",
-            "Commits": "Actualizaciones",
-            "CommitsAvailable": "Sin actualizaciones disponibles | {count} actualización disponible | {count} actualizaciones disponibles",
-            "CommitsOnDate": "Generado el {date}",
-            "CommittedDaysAgo": "Generado hace {days} día/s",
-            "CommittedHoursAgo": "Generado hace {hours} horas",
-            "CommittedOnDate": "Generado el {date}",
-            "CommittedYesterday": "Generado ayer",
-            "Detached": "desvinculada",
-            "Dirty": "sucia",
-            "ERROR": "ERROR",
+            "Abort": "Abortar",
+            "AreYouSure": "¿Estás seguro?",
+            "CheckForUpdates": "Comprobar actualizaciones",
+            "Close": "Cerrar",
+            "CommitHistory": "Historial de Commits",
+            "Commits": "Commits",
+            "CommitsAvailable": "no hay commits disponibles | {count} commit disponible | {count} commits disponibles",
+            "CommitsOnDate": "Commits en {date}",
+            "CommittedDaysAgo": "Hizo commits hace {days} días",
+            "CommittedHoursAgo": "Hizo commits hace {hours} horas",
+            "CommittedOnDate": "Hizo commits el día {date}",
+            "CommittedYesterday": "Hizo commits ayer",
+            "Corrupt": "corrupto",
+            "ConfigChanges": "Configurar Cambios",
+            "CountPackagesCanBeUpgraded": "{count} paquetes pueden ser actualizados",
+            "Detached": "separado",
+            "Dirty": "sucio",
+            "GenericUpdateQuestion": "Comprueba el historial de commits (si está disponible) y la página de GitHub de este proyecto para ver si es necesario hacer algún ajuste manual con el fin de poder implementar la actualización",
+            "GitHubPage": "Página de GitHub",
+            "HardRecovery": "Hard Recovery",
+            "InitUpdateManager": "El Mánager de Actualizaciones no ha sido iniciado. Esto suele pasar cuando inicias el sistema por primera vez. Por favor haz click en el botón de refrescar para iniciar todos los componentes.",
             "Invalid": "inválido",
-            "OSPackages": "Paquetes del SO",
-            "PackagesCanBeUpgraded": "paquete/s puede/n actualizarse",
+            "IUnderstandTheRisks": "Entiendo los riesgos",
+            "LinkToGithub": "Link a GitHub",
+            "KlipperUpdateQuestionFirmware": "Esto va a actualizar el software cliente de Klipper. Tal vez se necesite resetear las placas de control que ejecuten Klipper con el firmware compilado antes de que la máquina pueda volver a funcionar.",
+            "KlipperUpdateQuestionConfig": "This update may also contain changes to config parameters that would need to be modified in the printer.cfg file, see the change log for details.",
+            "MoonrakerUpdateQuestion": "This will update the Moonraker API. Changes to the moonraker.conf file may be required to continue using the machine.",
+            "MoreCommitsInfo": "A maximum of 30 commits can be displayed here. To see all commits, please click on the following link:",
+            "OSPackages": "Paquetes del sistema",
+            "SoftRecovery": "Recuperación Suave",
+            "StartUpdate": "Empezar Actualización",
             "System": "Sistema",
-            "Unknown": "Desconocido",
-            "Update": "Actualizar",
-            "UpdateAll": "Actualizar todo",
-            "UpdateManager": "Gestor de actualizaciones",
-            "Upgrade": "Actualizar",
-            "UpToDate": "Al día"
+            "ThesePackagesCanBeUpgrade": "Estos paquetes del sistema puede ser actualizados:",
+            "Unknown": "desconocido",
+            "Update": "actualizar",
+            "UpdateAll": "actualizar todos los componentes",
+            "UpdateManager": "Mánager de actualizaciones",
+            "UpdateWarning": "Aviso de actualización: {name}",
+            "Upgrade": "mejorar",
+            "UpgradeableSystemPackages": "Paquetes del Sistema Mejorables",
+            "UpToDate": "al día",
+            "WebClientUpdateQuestion": "En algunos casos la actualización del cliente web podría tener cambios que podrían causar incompatibilidad. Consulte las notas de la versión para obtener más información."
         }
     },
+    "ManualProbe": {
+        "Abort": "abortar",
+        "Accept": "aceptar",
+        "Advanced": "Avanzado",
+        "Headline": "Sondeada Manual"
+    },
     "Panels": {
         "ExtruderControlPanel": {
             "Allowed": "Permitida",
@@ -477,10 +562,15 @@
             "WebcamOff": "Apagar"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Por favor comprueba si el servicio de Klipper se está ejecutando y klippy_uds_address está correctamente configurado en moonraker.conf.",
             "FirmwareRestart": "Reiniciar Firmware",
+            "PrinterSwitchedOff": "La impresora está apagada",
+            "PrinterSwitchedOffDescription": "La impresora está actualmente apagada y Klipper no se puede conectar. Para encender la impresora, haz click en el botón de abajo:",
             "KlipperCheck": "Verifique que el servicio Klipper está corriendo y que un  UDS (Unix Domain Socket) esta configurado.",
             "MoonrakerCannotConnect": "¡Moonraker no se pudo conectar a Klipper!",
-            "Restart": "Reiniciar"
+            "PowerOn": "Encender",
+            "Restart": "Reiniciar",
+            "ServiceReports": "reporta {service}"
         },
         "MachineSettingsPanel": {
             "Headline": "Configuración de impresora",
@@ -510,6 +600,12 @@
         },
         "MiscellaneousPanel": {
             "Headline": "Varios",
+            "Light": {
+                "Blue": "azul",
+                "Green": "verde",
+                "Red": "rojo",
+                "White": "blanco"
+            },
             "RunoutSensor": {
                 "Detected": "detectado",
                 "Disabled": "deshabilitado",
@@ -547,6 +643,18 @@
             "Layer": "Capa",
             "Max": "max",
             "ObjectHeight": "Altura del objeto",
+            "PauseAtLayer": {
+                "Abort": "Abortar",
+                "Accept": "Aceptar",
+                "AtLayer": "a La Capa",
+                "Call": "Llamar",
+                "DescriptionPauseAtLayerActive": "Esta función ya está activa y va a llamar \"{call}\" a la capa {layer}. Si vuelves a ejecutar el comando, estas opciones se sobrescribirán.",
+                "DescriptionPauseNextLayerActive": "Esta función ya está activa y llamará \"{call}\" en la siguiente capa.",
+                "Layer": "Capa",
+                "NextLayer": "siguiente Capa",
+                "PauseAtLayer": "Para en la Capa",
+                "Type": "Tipo"
+            },
             "PausePrint": "Pausar impresión",
             "Print": "Imprimir",
             "PrintTime": "Tiempo de impresion",
@@ -571,6 +679,7 @@
                 "Temperature": "temperatura actual"
             },
             "Headline": "Temperaturas",
+            "HideMcuHostSensors": "Ocultar Sensores Host/MCU",
             "Max": "max",
             "Min": "min",
             "Name": "Nombre",
@@ -639,6 +748,7 @@
     },
     "SelectPrinterDialog": {
         "AddPrinter": "Agregar impresora",
+        "AddPrintersToJson": "Por favor, añade Impresoras al config.json.",
         "CannotConnectTo": "No es posible conectarse a {host}.",
         "ChangePrinter": "Cambiar impresora",
         "Connecting": "Conectando a {host}",
@@ -684,6 +794,7 @@
             "Circle": "Círculo",
             "Control": "Control",
             "Cross": "Cruz",
+            "HideDuringPrint": "Ocultar los controles de los ejes durante la impresión",
             "EnableXYHoming": "Habilitar homing X Y combinado ",
             "EstimatedExtrusionInfo": "Mostrar info de extrusion estimada",
             "EstimatedExtrusionInfoDescription": "Mostrar / Ocultar informacion de extrusion estimada basado en la candidad de extrusion y el avance",
@@ -724,7 +835,10 @@
             "KlipperRestartMethod": "Metodo de reinicio de klipper",
             "KlipperRestartMethodDescription": "Elija metodo de reinicio que sera usado cuando editamos configuracion de klipper y presionamos \"Guardar y Reiniciar\"",
             "UseEscToClose": "Use ESC para cerrar",
-            "UseEscToCloseDescription": "Permite que la tecla ESC cierre el editor"
+            "UseEscToCloseDescription": "Permite que la tecla ESC cierre el editor",
+            "TabSize": "Tamaño TAB",
+            "TabSizeDescription": "Ajusta cuántos espacios deben sangrarse para TAB",
+            "Spaces": "Espacios: {count}"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Color de fondo",
@@ -733,21 +847,34 @@
             "GridColor": "Color grilla",
             "MaxFeed": "Alimentación máxima",
             "MinFeed": "Alimentación mínima",
+            "ProgressColor": "Color de Progreso",
             "ShowAxes": "Mostrar ejes"
         },
         "GeneralTab": {
+            "12hours": "12-horas ({time})",
+            "24hours": "24-horas ({time})",
             "Backup": "Backup",
             "BackupDialog": "Elija todas las secciones a las que quiere hacer backup:",
             "CalcEstimateTime": "Cálculo de tiempo estimado",
             "CalcEstimateTimeDescription": "Si se selecciona muchos, un promedio será calculado",
             "CalcEtaTime": "Cálculo de ETA",
-            "CalcEtaTimeDescription": "Para múltiples selecciones, se calculará un promedio",
-            "CannotReadJson": "No se puede leer/analizar el archivo de backup.",
-            "DbConsoleHistory": "Historial de consola",
-            "DbHistoryJobs": "Historial de trabajos",
-            "DbHistoryTotals": "Trabajos totales",
-            "DbTimelapseSettings": "Configuración de Timelapse",
-            "DbView": "Configuraciones de vista",
+            "CalcEtaTimeDescription": "Si se seleccionan varios, se calculará una media",
+            "CalcPrintProgress": "Cálculo del progreso de impresión",
+            "CalcPrintProgressDescription": "Método para calcular el progreso de impresión",
+            "CalcPrintProgressItems": {
+                "Filament": "Filamento",
+                "FileAbsolute": "Posición del archivo (absoluta)",
+                "FileRelative": "Posición del archivo  (relativa)",
+                "Slicer": "Slicer (M73)"
+            },
+            "CannotReadJson": "No se puede leer el archivo de backup.",
+            "DateFormat": "Formato de Fecha",
+            "DbConsoleHistory": "Historial de la Consola",
+            "DbHistoryJobs": "Historial de Trabajos",
+            "DbHistoryTotals": "Historial Totales",
+            "DBNavigation": "Navegación",
+            "DbTimelapseSettings": "Ajustes de Timelapse",
+            "DbView": "Ajustes de Vista",
             "DbWebcams": "Cámaras web",
             "EstimateValues": {
                 "Filament": "Filamento",
@@ -758,11 +885,14 @@
             "FactoryReset": "Restablecimiento de fábrica",
             "General": "General",
             "Language": "Idioma",
+            "MainsailSettingsMoonrakerDb": "Ajustes de Mainsail en Moonraker DB",
             "MoonrakerDb": "Moonraker DB",
             "PrinterName": "Nombre de la impresora",
             "Reset": "Reiniciar",
             "Restore": "Restaurar",
-            "RestoreDialog": "Elija las secciones que quiere restaurar:"
+            "RestoreDialog": "Elija las secciones que quiere restaurar:",
+            "TimeFormat": "Formato de Tiempo",
+            "Everything": "Todo"
         },
         "InterfaceSettings": "Configuración de la interfaz",
         "MacrosTab": {
@@ -801,6 +931,32 @@
             "UnknownGroup": "Grupo desconocido",
             "Warning": "Alerta"
         },
+        "MiscellaneousTab": {
+            "AddGroup": "añadir grupo",
+            "AddPreset": "añadir preset",
+            "Color": "Color",
+            "CreateGroup": "Crear grupo",
+            "CreatePreset": "Crear preset",
+            "End": "Fin",
+            "EndDescription": "Último LED de este grupo.",
+            "Groups": "Grupos",
+            "GroupSubTitle": "Comienzo: {start}, Final: {end}",
+            "LightGroups": "{name} - Grupos",
+            "LightPresets": "{name} - Presets",
+            "Miscellaneous": "Varios",
+            "Name": "Nombre",
+            "NoDevicesFound": "Ningún dispositivo encontrado",
+            "NoGroupFound": "Ningún grupo encontrado",
+            "NoPresetFound": "Ningún preset encontrado",
+            "Presets": "Presets",
+            "Start": "Comenzar",
+            "StartDescription": "Primer LED de este grupo.",
+            "UnableToLoadLight": "No se puede cargar la luz",
+            "UnableToLoadPreset": "No se puede cargar el preset"
+        },
+        "NavigationTab": {
+            "Navigation": "Navegación"
+        },
         "PresetsTab": {
             "AddPreset": "Agregar config. preestablecida",
             "Cooldown": "Enfriamiento",
@@ -825,8 +981,10 @@
             "Hostname": "Nombre del Host",
             "Port": "Puerto",
             "RemotePrinters": "Impresoras remotas",
-            "UpdatePrinter": "Actualizar impresora"
+            "UpdatePrinter": "Actualizar impresora",
+            "UseConfigJson": "InstanceDB = JSON detectado. Por favor, utilice el config.json para modificar la lista de impresoras."
         },
+        "Store": "tienda",
         "TimelapseTab": {
             "Autorender": "Autorrenderizado",
             "AutorenderDescription": "Si está activa, el video del timelapse será renderizado automáticamente al finalizar la impresión.",
@@ -895,37 +1053,60 @@
             "VariableFpsMinDescription": ""
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Diálogo de tornillos de cama",
+            "BedScrewsDialogDescription": "Mostrar diálogo de ayuda para BED_SCREWS_ADJUST.",
             "BoolBigThumbnail": "Miniatura grande",
-            "BoolBigThumbnailDescription": "Muestra una miniatura más grande en el panel de estado durante la impresión.",
-            "BoolHideUploadAndPrintButton": "Ocultar el botón Cargar e Imprimir",
-            "BoolHideUploadAndPrintButtonDescription": "Muestra u Oculta el botón \"Cargar e Imprimir\" en la barra superior.",
-            "ConfirmOnEmergencyStop": "Requerir confirmación en parada de emergencia",
-            "ConfirmOnEmergencyStopDescription": "Muestra una ventana de confirmación en Parada de emergencia.",
-            "ConfirmOnPowerDeviceChange": "Requerir confirmación en cambios de energía de los dispositivos",
-            "ConfirmOnPowerDeviceChangeDescription": "Muestra una ventana de confirmación en los cambios de energía del dispositivo.",
+            "BoolBigThumbnailDescription": "Mostrar una miniatura grande en el panel de estado durante una impresión.",
+            "BoolHideUploadAndPrintButton": "Ocultar botón de Subir e Imprimir",
+            "BoolHideUploadAndPrintButtonDescription": "Mostrar u ocultar el botón de \"Upload and Print\" en la barra de arriba",
+            "ConfirmOnEmergencyStop": "Requerir confirmación en Parada de Emergencia",
+            "ConfirmOnEmergencyStopDescription": "Mostrar un diálogo de confirmación en Parada de Emergencia",
+            "ConfirmOnPowerDeviceChange": "Solicitar confirmación para cambios en Alimentación del Dispositivo",
+            "ConfirmOnPowerDeviceChangeDescription": "Mostrar un diálogo de confirmación en Alimentación del Dispositivo",
+            "DefaultNavigationState": "Estado por defecto de la navegación",
+            "DefaultNavigationStateAlwaysClosed": "siempre cerrado",
+            "DefaultNavigationStateAlwaysOpen": "siempre abierto",
+            "DefaultNavigationStateDescription": "Qué estado debe tener la navegación por defecto.",
+            "DefaultNavigationStateLastState": "último estado",
+            "DisableFanAnimation": "Desactivar la animación del ventilador",
+            "DisableFanAnimationDescription": "Esto puede reducir la carga de su navegador.",
             "DisplayCANCEL_PRINT": "Mostrar CANCEL_PRINT",
-            "DisplayCANCEL_PRINTDescription": "Mostrar el botón CANCEL_PRINT permanentemente - no hay segundo nivel de confirmación.",
-            "GcodeThumbnails": "Miniatura G-Code",
-            "GcodeThumbnailsDescription": "Click en el botón para obtener instrucciones.",
+            "DisplayCANCEL_PRINTDescription": "Muestra el botón CANCEL_PRINT permanentemente - no necesita confirmación de segunda capa.",
+            "GcodeThumbnails": "Miniaturas de G-Code",
+            "GcodeThumbnailsDescription": "Haga clic en el botón para acceder a las instrucciones.",
             "Guide": "Guía",
-            "LockSliders": "Bloquear controles deslizantes en dispositivos táctiles",
-            "LockSlidersDelay": "Retraso de bloqueo control deslizante",
-            "LockSlidersDelayDescription": "Los controles deslizantes se bloquearán después de un retraso determinado. Si se establece en 0 o se deja en blanco, los controles deslizantes sólo se bloquearán al cambiar o recargar la página.",
-            "LockSlidersDescription": "Los controles deslizantes en las pantallas táctiles deben desbloquearse antes de que se permitan los cambios.",
+            "HideSaveConfigButtonForBedMesh": "Ocultar el botón SAVE_CONFIG para los cambios en bed_mesh",
+            "HideSaveConfigButtonForBedMeshDescription": "Ocultar SAVE_CONFIG, si sólo están pendientes de guardar en Klipper los cambios en bed_mesh.",
+            "HideUpdateWarnings": "Ocultar avisos de actualización",
+            "HideUpdateWarningsDescription": "Esta opción ocultará todos los avisos de actualización en el gestor de actualizaciones.",
+            "LockSliders": "Bloquear deslizadores en dispositivos con pantalla táctil",
+            "LockSlidersDelay": "Retraso de bloqueo de deslizadores",
+            "LockSlidersDelayDescription": "Los deslizadores se bloquearán después de un retardo determinado. Si se establece en 0 o se deja en blanco, los deslizadores sólo se bloquearán al cambiar/recargar la página.",
+            "LockSlidersDescription": "Los controles deslizantes de las pantallas táctiles deben desbloquearse antes de permitir cambios.",
             "Logo": "Logo",
-            "NavigationStyle": "Estilo de navegación",
-            "NavigationStyleDescription": "Cambiar la apariencia de navegación",
+            "ManualProbeDialog": "Diálogo Manual del Ayudante de Sonda",
+            "ManualProbeDialogDescription": "Mostrar diálogo de ayuda para PROBE_CALIBRATE o Z_ENDSTOP_CALIBRATE.",
+            "NavigationStyle": "Estilo de Navegación",
+            "NavigationStyleDescription": "Modificar el aspecto de la navegación",
             "NavigationStyleIconsAndText": "Iconos + Texto",
-            "NavigationStyleIconsOnly": "Solamente iconos",
+            "NavigationStyleIconsOnly": "Solo Iconos",
+            "PowerDeviceName": "Dispositivo de alimentación de la impresora",
+            "PowerDeviceNameDescription": "Seleccione qué dispositivo de alimentación Moonraker debe utilizarse para encender la impresora.",
             "Primary": "Primario",
-            "ShowWebcamInNavigation": "Mostrar la cámara web en el menú",
-            "UiSettings": "Interfaz"
+            "ScrewsTiltAdjustDialog": "Diálogo de Ajuste de Inclinación de los Tornillos",
+            "ScrewsTiltAdjustDialogDescription": "Mostrar diálogo de ayuda para SCREWS_TILT_CALCULATE.",
+            "TempchartHeight": "Gráfico de Temperaturas de Altura",
+            "TempchartHeightDescription": "Modifica la altura del gráfico de temperatura en el Cuadro De Mandos.",
+            "UiSettings": "Ajustes de UI"
         },
+        "Update": "actualizar",
         "WebcamsTab": {
             "AddWebcam": "Agregar cámara web",
             "CreateWebcam": "Crear cámara web",
+            "EditCrowsnestConf": "Editar crowsnest.conf",
             "EditWebcam": "Editar cámara web",
             "FlipWebcam": "Voltear la imagen de la cámara web:",
+            "HideFps": "Ocultar contador de FPS",
             "Horizontally": "horizontalmente",
             "IconBed": "Cama",
             "IconCam": "Cámara",
@@ -936,11 +1117,15 @@
             "IconNozzle": "Boquilla",
             "IconPrinter": "Impresora",
             "Ipstream": "Cámara IP",
+            "Hlsstream": "Stream HLS",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "MJPEG-Streamer Adaptativo (experimental)",
+            "JMuxerStream": "stream h264 crudo (jmuxer)",
             "Name": "Nombre",
             "NameAlreadyExists": "El nombre ya existe",
             "Required": "Requerido",
+            "Rotate": "rotar",
             "SaveWebcam": "Guardar cámara web",
             "Service": "Servicio",
             "TargetFPS": "FPS Objetivo",
@@ -949,9 +1134,18 @@
             "UrlStream": "URL Stream",
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "verticalmente",
-            "Webcams": "Cámaras web"
+            "Webcams": "Cámaras web",
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
         }
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "aceptar",
+        "Base": "Base",
+        "ErrorText": "Algo salió mal durante el proceso de sondeo.",
+        "Headline": "Ajuste de inclinación de tornillos",
+        "Retry": "reintentar"
+    },
     "Timelapse": {
         "AllFiles": "Todos",
         "Autorender": "Autorrenderizado",
@@ -962,6 +1156,8 @@
         "Delete": "Eliminar",
         "DeleteDirectory": "Eliminar directorio",
         "DeleteDirectoryQuestion": "¿Está seguro de que desea eliminar la carpeta \"{name}\" con todo su contenido?",
+        "DeleteSelectedQuestion": "¿Realmente quieres borrar {count} archivos selecionados?",
+        "DeleteSingleFileQuestion": "¿Realmente quieres borrar el archivo \"{name}\"?",
         "Download": "Descargar",
         "DuplicateLastframe": "Duplicar último cuadro",
         "Empty": "No se encontró Timelapse finalizado.",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 176cef674..d88139737 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -1,7 +1,7 @@
 {
     "App": {
         "Notifications": {
-            "DependencyDescription": "Aktualna wersja {name} nie wspiera wszystkich funkcji Mainsail. Zaktualizuj {name} conajmniej do wersji {neededVersion}.",
+            "DependencyDescription": "Aktualna wersja {name} nie wspiera wszystkich funkcji Mainsail. Zaktualizuj {name} co najmniej do wersji {neededVersion}.",
             "DependencyName": "Zależność: {name}",
             "DismissAll": "Odrzuć wszystko",
             "KlipperWarnings": {
@@ -869,7 +869,9 @@
             "DateFormat": "Format daty",
             "MainsailSettingsMoonrakerDb": "Ustawienia Mainsail w bazie danych Moonraker",
             "DBNavigation": "Nawigacja",
-            "Everything": "Wszystko"
+            "Everything": "Wszystko",
+            "DbHistoryJobs": "Historia wydruków",
+            "DbHistoryTotals": "Łączna historia"
         },
         "InterfaceSettings": "Ustawienia interfejsu",
         "MacrosTab": {
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index d9d330479..3da6dcbc9 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -772,28 +772,6 @@ export const getters: GetterTree<PrinterState, RootState> = {
         return output
     },
 
-    getToolchangeMacros: (state, getters) => {
-        const macros = getters['getMacros']
-        const tools: PrinterStateToolchangeMacro[] = []
-
-        macros
-            .filter((macro: any) => macro.name.toUpperCase().match(/^T\d+/))
-            .forEach((macro: any) =>
-                tools.push({
-                    name: macro.name,
-                    active: macro.variables.active ?? false,
-                    color: macro.variables.color ?? macro.variables.colour ?? null,
-                })
-            )
-
-        return tools.sort((a, b) => {
-            const numberA = parseInt(a.name.slice(1))
-            const numberB = parseInt(b.name.slice(1))
-
-            return numberA - numberB
-        })
-    },
-
     getKinematics: (state) => {
         if (!state.configfile?.settings?.printer) return false