diff --git a/configs/airootfs/root/configurator b/configs/airootfs/root/configurator
index 17a1e02..f2c32da 100644
--- a/configs/airootfs/root/configurator
+++ b/configs/airootfs/root/configurator
@@ -350,15 +350,7 @@ run_partition_install() {
   local mib=$((1024 * 1024)) gib=$((1024 * 1024 * 1024))
   local ALIGN=$mib
   local EFI_SIZE_B=$((2 * gib))
-  local MIN_TOTAL_B=$((32 * gib))    # 32 GiB minimum for the install
-
-  if (( FREE_SIZE_B < MIN_TOTAL_B )); then
-    gum style --foreground 1 "Free space ($(to_gb $FREE_SIZE_B)) is below the 32GB minimum for Omarchy."
-    gum style "Partition install uses unallocated free space, not a pre-created partition."
-    gum style "Open the partition tool, delete/shrink partitions until the target area says Free space, then leave it unallocated."
-    gum confirm --affirmative "Back" --negative "Back" "Return to installation mode?" >/dev/null 2>&1 || true
-    return 1
-  fi
+  local MIN_ROOT_B=$((32 * gib))    # 32 GiB minimum for the root filesystem
 
   local EFI_START_B=0 EFI_END_B=0 ROOT_START_B ROOT_END_B
   if [[ -z "$shared_esp" ]]; then
@@ -376,6 +368,45 @@ run_partition_install() {
     return 1
   fi
 
+  local ROOT_MAX_B=$((ROOT_END_B - ROOT_START_B))
+  if (( ROOT_MAX_B < MIN_ROOT_B )); then
+    local required_b=$MIN_ROOT_B
+    [[ -z "$shared_esp" ]] && required_b=$((required_b + EFI_SIZE_B))
+    gum style --foreground 1 "Usable root space ($(to_gb $ROOT_MAX_B)) is below the 32GB minimum for Omarchy."
+    gum style "This disk needs at least $(to_gb $required_b) unallocated in this free region."
+    gum style "Open the partition tool, delete/shrink partitions until the target area says Free space, then leave it unallocated."
+    gum confirm --affirmative "Back" --negative "Back" "Return to installation mode?" >/dev/null 2>&1 || true
+    return 1
+  fi
+
+  local ROOT_MAX_GIB=$((ROOT_MAX_B / gib))
+  local ROOT_SIZE_GIB
+  while true; do
+    step "Choose Omarchy size"
+    gum style "Free region: $(to_gb $FREE_START_B) — $(to_gb $FREE_END_B)  ($(to_gb $FREE_SIZE_B))"
+    if [[ -z "$shared_esp" ]]; then
+      gum style "2GiB will be used for a new EFI partition."
+    else
+      gum style "Using existing ESP: $shared_esp"
+    fi
+    gum style "Root filesystem can be 32–${ROOT_MAX_GIB}GiB. Leave the default to use all available space."
+    echo
+
+    ROOT_SIZE_GIB=$(gum input \
+      --value "$ROOT_MAX_GIB" \
+      --placeholder "32-${ROOT_MAX_GIB}" \
+      --prompt.foreground="#845DF9" \
+      --prompt "Omarchy size in GiB> ") || return 1
+
+    if [[ $ROOT_SIZE_GIB =~ ^[0-9]+$ ]] && (( ROOT_SIZE_GIB >= 32 && ROOT_SIZE_GIB <= ROOT_MAX_GIB )); then
+      break
+    fi
+
+    notice "Enter a whole number from 32 to ${ROOT_MAX_GIB}" 1
+  done
+
+  ROOT_END_B=$((ROOT_START_B + ROOT_SIZE_GIB * gib))
+
   step "Proposed layout on $disk"
   gum style "Free region: $(to_gb $FREE_START_B) — $(to_gb $FREE_END_B)  ($(to_gb $FREE_SIZE_B))"
   if [[ -z "$shared_esp" ]]; then
@@ -536,7 +567,7 @@ _EOF_
     "archinstall-language": "English",
     "auth_config": {},
     "audio_config": { "audio": "pipewire" },
-    "bootloader": "Limine",
+    "bootloader_config": { "bootloader": "Limine", "uki": false, "removable": false },
     "custom_commands": [],
     "disk_config": {
         "config_type": "pre_mounted_config",