diff --git a/src/components/inputs/MacroButton.vue b/src/components/inputs/MacroButton.vue
index 9819a25c6f..a92a01e27e 100644
--- a/src/components/inputs/MacroButton.vue
+++ b/src/components/inputs/MacroButton.vue
@@ -5,7 +5,7 @@
             :color="color"
             :class="paramArray.length ? 'macroWithParameters' : ''"
             :loading="loadings.includes('macro_' + macro.name)"
-            :disabled="disabled"
+            :disabled="disabled || paramsRequired"
             @click="doSendMacro(macro.name)">
             {{ alias ? alias : macro.name.replace(/_/g, ' ') }}
         </v-btn>
@@ -24,28 +24,53 @@
                 </template>
                 <v-card :max-width="paramsOverlayWidth">
                     <v-card-text class="py-2">
-                        <v-row class="my-2">
-                            <v-col v-for="(name, key) in paramArray" :key="'param_' + key" :cols="paramCssCols">
-                                <v-text-field
-                                    v-model="params[name].value"
-                                    :label="name"
-                                    :placeholder="params[name].default"
-                                    :persistent-placeholder="true"
-                                    hide-details
-                                    outlined
-                                    dense
-                                    clearable
-                                    :clear-icon="mdiRefresh"
-                                    @keyup.enter="sendWithParams"></v-text-field>
-                            </v-col>
-                        </v-row>
-                        <v-row class="my-2">
-                            <v-col class="py-0">
-                                <v-btn color="primary" class="text-uppercase" block @click="sendWithParams">
-                                    {{ $t('Panels.MacrosPanel.Send') }}
-                                </v-btn>
-                            </v-col>
-                        </v-row>
+                        <v-form ref="form">
+                            <v-row class="my-2">
+                                <v-col v-for="(param, key) in paramArray" :key="'param_' + key" :cols="paramCssCols">
+                                    <v-select
+                                        v-if="param.type == 'select'"
+                                        v-model="param.value"
+                                        :label="param.name"
+                                        :items="param.hints?.options"
+                                        hide-details
+                                        outlined
+                                        clearable
+                                        :clear-icon="mdiRefresh"
+                                        dense></v-select>
+                                    <v-checkbox
+                                        v-else-if="param.type == 'checkbox'"
+                                        v-model="param.value"
+                                        :label="param.name"
+                                        :true-value="(param.hints?.options ?? [])[0] ?? 1"
+                                        :false-value="(param.hints?.options ?? [])[1] ?? 0"
+                                        hide-details
+                                        outlined
+                                        dense></v-checkbox>
+                                    <v-text-field
+                                        v-else
+                                        v-model="param.value"
+                                        :label="param.name"
+                                        :rules="param.rules"
+                                        :type="param.fieldType"
+                                        :placeholder="param.default ?? ''"
+                                        :persistent-placeholder="true"
+                                        hide-details
+                                        hide-spin-buttons
+                                        outlined
+                                        dense
+                                        clearable
+                                        :clear-icon="mdiRefresh"
+                                        @keyup.enter="sendWithParams"></v-text-field>
+                                </v-col>
+                            </v-row>
+                            <v-row class="my-2">
+                                <v-col class="py-0">
+                                    <v-btn color="primary" class="text-uppercase" block @click="sendWithParams">
+                                        {{ $t('Panels.MacrosPanel.Send') }}
+                                    </v-btn>
+                                </v-col>
+                            </v-row>
+                        </v-form>
                     </v-card-text>
                 </v-card>
             </v-menu>
@@ -60,33 +85,58 @@
                 </v-btn>
                 <v-dialog v-model="paramsDialog">
                     <panel :title="macro.name" :card-class="`macro-params-mobile-${macro.name}`" :margin-bottom="0">
-                        <template #buttons>
-                            <v-btn icon tile @click="paramsDialog = false">
-                                <v-icon>{{ mdiCloseThick }}</v-icon>
-                            </v-btn>
-                        </template>
-                        <v-card-text>
-                            <v-row>
-                                <v-col v-for="(name, key) in paramArray" :key="'param_mobile_' + key" :cols="6">
-                                    <v-text-field
-                                        v-model="params[name].value"
-                                        :label="name"
-                                        :placeholder="params[name].default"
-                                        :persistent-placeholder="true"
-                                        hide-details
-                                        outlined
-                                        dense
-                                        clearable
-                                        :clear-icon="mdiRefresh"
-                                        @keyup.enter="sendWithParams"></v-text-field>
-                                </v-col>
-                            </v-row>
-                        </v-card-text>
-                        <v-card-actions class="px-4 pb-4">
-                            <v-btn color="primary" class="text-uppercase" block @click="sendWithParams">
-                                {{ $t('Panels.MacrosPanel.Send') }}
-                            </v-btn>
-                        </v-card-actions>
+                        <v-form ref="form">
+                            <template #buttons>
+                                <v-btn icon tile @click="paramsDialog = false">
+                                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                                </v-btn>
+                            </template>
+                            <v-card-text>
+                                <v-row>
+                                    <v-col v-for="(param, key) in paramArray" :key="'param_mobile_' + key" :cols="6">
+                                        <v-select
+                                            v-if="value.type == 'select'"
+                                            v-model="param.value"
+                                            :label="param.name"
+                                            :items="param.hints?.options"
+                                            hide-details
+                                            outlined
+                                            clearable
+                                            :clear-icon="mdiRefresh"
+                                            dense></v-select>
+                                        <v-checkbox
+                                            v-else-if="param.type == 'checkbox'"
+                                            v-model="param.value"
+                                            :label="param.name"
+                                            :true-value="param.hints?.options[0] ?? 1"
+                                            :false-value="param.hints?.options[1] ?? 0"
+                                            hide-details
+                                            outlined
+                                            dense></v-checkbox>
+                                        <v-text-field
+                                            v-else
+                                            v-model="param.value"
+                                            :label="param.name"
+                                            :rules="param.rules"
+                                            :type="param.fieldType"
+                                            :placeholder="param.default ?? ''"
+                                            :persistent-placeholder="true"
+                                            hide-spin-buttons
+                                            hide-details
+                                            outlined
+                                            dense
+                                            clearable
+                                            :clear-icon="mdiRefresh"
+                                            @keyup.enter="sendWithParams"></v-text-field>
+                                    </v-col>
+                                </v-row>
+                            </v-card-text>
+                            <v-card-actions class="px-4 pb-4">
+                                <v-btn color="primary" class="text-uppercase" block @click="sendWithParams">
+                                    {{ $t('Panels.MacrosPanel.Send') }}
+                                </v-btn>
+                            </v-card-actions>
+                        </v-form>
                     </panel>
                 </v-dialog>
             </template>
@@ -96,20 +146,18 @@
 
 <script lang="ts">
 import Component from 'vue-class-component'
-import { Mixins, Prop, Watch } from 'vue-property-decorator'
+import { Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
 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 { PrinterStateMacroParam } from '@/store/printer/types'
 
-interface param {
-    type: 'int' | 'double' | 'string' | null
-    default: string | number | null
-    value: string | number | null
-}
-
-interface params {
-    [key: string]: param
+interface NamedUiParam extends PrinterStateMacroParam {
+    value?: string | number | null
+    name: string
+    fieldType?: string | null
+    rules: any[] | undefined
 }
 
 @Component({
@@ -123,10 +171,58 @@ export default class MacroButton extends Mixins(BaseMixin) {
     mdiMenuDown = mdiMenuDown
     mdiRefresh = mdiRefresh
 
-    private paramArray: string[] = []
-    private params: params = {}
+    private params: { [key: string]: PrinterStateMacroParam } = {}
     private paramsDialog = false
 
+    get paramArray(): NamedUiParam[] {
+        // Sort first with parameters that need values, then alphabetically.
+        let params = this.params
+        let paramList: string[] = Object.keys(params)
+        paramList.sort()
+
+        function makeRules(param: PrinterStateMacroParam): any[] {
+            let check_range = function (value: string, option: string, compare: Function): boolean {
+                let test = (param.hints ?? {})[option]
+                if (test == null || !value) return true
+
+                if (param.type == 'int') {
+                    return compare(value - test)
+                }
+                if (param.type == 'float') return compare(parseFloat(value) - test)
+                return compare(value.length - test)
+            }
+            return [
+                (v: string) => !v || param.type != 'float' || !Number.isNaN(parseFloat(v)),
+                (v: string) => !v || param.type != 'int' || Number.isInteger(parseFloat(v)),
+                (v: string) => check_range(v, 'max', (d) => d <= 0),
+                (v: string) => check_range(v, 'min', (d) => d >= 0),
+                (v: string) => check_range(v, 'below', (d) => d < 0),
+                (v: string) => check_range(v, 'above', (d) => d > 0),
+                (v: string) => !!v || !!param?.default || !param?.hints?.required,
+            ]
+        }
+
+        let hasHints: boolean = this.klipperMacro.variables?.front_end_hints
+        return paramList.map((name) => ({
+            ...{
+                name: name,
+                fieldType: ['int', 'float'].includes(params[name].type) ? 'number' : null,
+                rules: hasHints ? makeRules(params[name]) : undefined,
+                value: ['select', 'checkbox'].includes(params[name].type ?? '')
+                    ? String(params[name].default ?? '')
+                    : null,
+            },
+            ...params[name],
+        }))
+    }
+
+    get paramsRequired(): boolean {
+        for (const [, param] of Object.entries(this.params)) {
+            if (param?.hints?.required && !param?.default) return true
+        }
+        return false
+    }
+
     @Prop({ required: true })
     declare readonly macro: GuiMacrosStateMacrogroupMacro
 
@@ -139,6 +235,9 @@ export default class MacroButton extends Mixins(BaseMixin) {
     @Prop({ default: false })
     declare readonly disabled: boolean
 
+    @Ref('form')
+    declare readonly form
+
     get klipperMacro() {
         return this.$store.getters['printer/getMacro'](this.macro.name)
     }
@@ -165,27 +264,13 @@ export default class MacroButton extends Mixins(BaseMixin) {
         return 200 * this.paramCols
     }
 
-    @Watch('klipperMacro')
+    @Watch('klipperMacro', { deep: true, immediate: true })
     klipperMacroChange() {
         this.refreshParams()
     }
 
     refreshParams() {
-        this.paramArray.splice(0, this.paramArray.length)
-        this.params = {}
-
-        if (this.klipperMacro?.params !== null) {
-            Object.keys(this.klipperMacro.params).forEach((name: string) => {
-                if (!name.startsWith('_')) {
-                    this.paramArray.push(name)
-                    this.params[name] = {
-                        type: this.klipperMacro.params[name].type,
-                        default: this.klipperMacro.params[name].default,
-                        value: '',
-                    }
-                }
-            })
-        }
+        this.$set(this, 'params', this.klipperMacro?.params ?? {})
     }
 
     doSendMacro(gcode: string) {
@@ -197,11 +282,16 @@ export default class MacroButton extends Mixins(BaseMixin) {
     }
 
     sendWithParams() {
+        if (!this.form.validate()) return
         let params: string[] = []
-        this.paramArray.forEach((paramname: string) => {
-            if (this.params[paramname].value !== null && this.params[paramname].value !== '') {
-                let tmp: string = paramname
-                tmp += this.isGcodeStyle ? this.params[paramname].value : `=${this.params[paramname].value}`
+        this.paramArray.forEach((param) => {
+            if (
+                param.value !== null &&
+                param.value !== '' &&
+                (!['select', 'checkbox'].includes(param.type) || param.value !== param.default)
+            ) {
+                let tmp: string = param.name
+                tmp += this.isGcodeStyle ? param.value : `=${param.value}`
 
                 params.push(tmp)
             }
@@ -210,10 +300,6 @@ export default class MacroButton extends Mixins(BaseMixin) {
         const gcode = this.macro.name + ' ' + params.join(' ')
         this.doSendMacro(gcode)
     }
-
-    mounted() {
-        this.refreshParams()
-    }
 }
 </script>
 
diff --git a/src/components/panels/MacrosPanel.vue b/src/components/panels/MacrosPanel.vue
index c87ac43868..7d4848c158 100644
--- a/src/components/panels/MacrosPanel.vue
+++ b/src/components/panels/MacrosPanel.vue
@@ -40,7 +40,13 @@ export default class MacrosPanel extends Mixins(BaseMixin) {
     get macros() {
         const macros = this.$store.getters['printer/getMacros']
 
-        return macros.filter((macro: PrinterStateMacro) => !this.hiddenMacros.includes(macro.name.toLowerCase()))
+        return macros.filter(
+            (macro: PrinterStateMacro) => !macro.hidden && !this.hiddenMacros.includes(macro.name.toLowerCase())
+        )
+    }
+
+    get macroState() {
+        return this.$store.getters['printer/getMacro'](this.macro.name)
     }
 }
 </script>
diff --git a/src/plugins/helpers.ts b/src/plugins/helpers.ts
index 7f4c89b313..c0ed40da2c 100644
--- a/src/plugins/helpers.ts
+++ b/src/plugins/helpers.ts
@@ -189,9 +189,9 @@ export function formatTime(date: Date): string {
     return hours + ':' + minutes + ':' + seconds
 }
 
-export function getMacroParams(macro: { gcode: string }): PrinterStateMacroParams {
+export function getMacroParamsFromConfig(macro: { gcode: string }): PrinterStateMacroParams {
     const paramRegex =
-        /{%?.*?params\.([A-Za-z_0-9]+)(?:\|(int|string|double))?(?:\|default\('?"?(.*?)"?'?\))?(?:\|(int|string))?.*?%?}/
+        /{%?.*?params\.([A-Za-z_0-9]+)(?:\|(int|string|float))?(?:\|default\('?"?(.*?)"?'?\))?(?:\|(int|string))?.*?%?}/
 
     let params = paramRegex.exec(macro.gcode)
     let currentMatch = macro.gcode
@@ -201,10 +201,10 @@ export function getMacroParams(macro: { gcode: string }): PrinterStateMacroParam
             ret = {}
         }
         const name = params[1]
-        const t: 'int' | 'string' | 'double' | null = (params[2] ?? params[4] ?? null) as
+        const t: 'int' | 'string' | 'float' | null = (params[2] ?? params[4] ?? null) as
             | 'int'
             | 'string'
-            | 'double'
+            | 'float'
             | null
         const def = params[3] ?? null
         ret[`${name}`] = {
@@ -237,6 +237,25 @@ export function getMacroParams(macro: { gcode: string }): PrinterStateMacroParam
     return ret
 }
 
+export function getMacroParamsFromState(hints: any): PrinterStateMacroParams {
+    if (!hints.params) return null
+    const allowedTypes = ['int', 'float', 'string', 'select', 'checkbox']
+    const newParams: PrinterStateMacroParams = {}
+    Object.keys(hints.params).forEach((name: string) => {
+        newParams![name.toUpperCase()] = {
+            // The type list here is from PrinterStateMacroParam
+            type: !Array.isArray(hints.params[name].type)
+                ? hints.params[name].type
+                : hints.params[name].type.find((type: string) => allowedTypes.includes(type)),
+            default: hints.params[name].default ? String(hints.params[name].default) : null,
+            hints: Object.fromEntries(
+                Object.entries(hints.params[name]).filter(([key]) => !['type', 'default'].includes(key))
+            ),
+        }
+    })
+    return newParams
+}
+
 export function windowBeforeUnloadFunction(e: BeforeUnloadEvent) {
     e.preventDefault()
     e.returnValue = ''
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index c7ffcc3eb0..3bbcf74045 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -24,7 +24,12 @@ import {
     PrinterGetterObject,
     PrinterStateLight,
 } from '@/store/printer/types'
-import { caseInsensitiveSort, formatFrequency, getMacroParams } from '@/plugins/helpers'
+import {
+    caseInsensitiveSort,
+    formatFrequency,
+    getMacroParamsFromState,
+    getMacroParamsFromConfig,
+} from '@/plugins/helpers'
 import { RootState } from '@/store/types'
 import {
     mdiFan,
@@ -168,22 +173,21 @@ export const getters: GetterTree<PrinterState, RootState> = {
         const settings = state.configfile?.settings ?? null
 
         Object.keys(config)
-            .filter((prop) => prop.toLowerCase().startsWith('gcode_macro'))
+            .filter((prop) => prop.startsWith('gcode_macro') && !settings[prop.toLowerCase()]?.rename_existing)
             .forEach((prop) => {
                 const name = prop.replace('gcode_macro ', '')
-                if (name.startsWith('_')) return
+                const variables = state[prop] ?? {}
+                const hints = variables?.front_end_hints
 
                 const propLower = prop.toLowerCase()
                 const propSettings = settings[propLower]
-                if ('rename_existing' in propSettings) return
-
-                const variables = state[prop] ?? {}
 
                 array.push({
                     name,
                     description: settings[propLower].description ?? null,
                     prop: propSettings,
-                    params: getMacroParams(propSettings),
+                    params: hints ? getMacroParamsFromState(hints) : getMacroParamsFromConfig(propSettings),
+                    hidden: hints && 'hidden' in hints ? hints.hidden : name.startsWith('_'),
                     variables,
                 })
             })
diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
index 5c2665e8a3..676b273dac 100644
--- a/src/store/printer/types.ts
+++ b/src/store/printer/types.ts
@@ -180,8 +180,9 @@ export interface PrinterStateBedMesh {
 }
 
 export interface PrinterStateMacroParam {
-    type: 'int' | 'double' | 'string' | null
+    type: 'int' | 'float' | 'string' | 'select' | 'checkbox' | null
     default: string | null
+    hints?: { [key: string]: any }
 }
 
 export type PrinterStateMacroParams = {
@@ -200,6 +201,7 @@ export interface PrinterStateMacro {
         [key: string]: any
     }
     params: PrinterStateMacroParams
+    hidden: boolean
 }
 
 export interface PrinterStateKlipperConfig {