diff --git a/packages/calamares-extensions/config/modules/partition.conf b/packages/calamares-extensions/config/modules/partition.conf
index c13f0f8..3b38994 100644
--- a/packages/calamares-extensions/config/modules/partition.conf
+++ b/packages/calamares-extensions/config/modules/partition.conf
@@ -1,104 +1,16 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 #
-
-# Options for EFI system partition.
-#
-# - *mountPoint*
-#   This setting specifies the mount point of the EFI system partition. Some
-#   distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS,
-#   etc.) use just /boot.
-#
-#   Defaults to "/boot/efi", may be empty (but weird effects ensue)
-# - *recommendedSize*
-#   This optional setting specifies the size of the EFI system partition.
-#   If nothing is specified, the default size of 300MiB will be used.
-#   When writing quantities here, M is treated as MiB, and if you really
-#   want one-million (10^6) bytes, use MB.
-# - *minimumSize*
-#   This optional setting specifies the absolute minimum size of the EFI
-#   system partition. If nothing is specified, the *recommendedSize*
-#   is used instead.
-# - *label*
-#   This optional setting specifies the name of the EFI system partition (see
-#   PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
-#   If nothing is specified, the partition name is left unset.
-#
-# Going below the *recommended* size is allowed, but the user will
-# get a warning that it might not work. Going below the *minimum*
-# size is not allowed and the user will be told it will not work.
-#
-# Both quantities must be at least 32MiB, this is enforced by the EFI
-# spec. If minimum is not specified, it defaults to the recommended
-# size. Distro's that allow more user latitude can set the minimum lower.
 efi:
-    mountPoint:         "/boot"
-    recommendedSize:    512MiB
-    label:              "EFI"
-
-# In autogenerated partitioning, allow the user to select a swap size?
-# If there is exactly one choice, no UI is presented, and the user
-# cannot make a choice -- this setting is used. If there is more than
-# one choice, a UI is presented.
-#
-# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
-# to values of *userSwapChoices* as follows:
-#    - *neverCreateSwap* is true, means [none]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
-#
-# Autogenerated swap sizes are as follows:
-#    - *suspend*: Swap is always at least total memory size,
-#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
-#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
-#      swap is the size of main memory.
-#    - *small*: Follows the rules above, but Swap is at
-#      most 8GiB, and no more than 10% of available disk.
-# In both cases, a fudge factor (usually 10% extra) is applied so that there
-# is some space for administrative overhead (e.g. 8 GiB swap will allocate
-# 8.8GiB on disk in the end).
-#
-# If *file* is enabled here, make sure to have the *fstab* module
-# as well (later in the exec phase) so that the swap file is
-# actually created.
+  mountPoint: "/boot"
+  recommendedSize: 1024MiB
+  label: "EFI"
 userSwapChoices:
-    - suspend   # At least main memory size
-
-# This optional setting specifies the name of the swap partition (see
-# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
-# If nothing is specified, the partition name is left unset.
-# swapPartitionName:      swap
-
-# This setting specifies the LUKS generation (i.e LUKS1, LUKS2) used internally by
-# cryptsetup when creating an encrypted partition.
-#
-# This option is set to luks1 by default, as grub doesn't support LUKS2 + Argon2id
-# currently. On the other hand grub does support LUKS2 with PBKDF2 and could therefore be
-# also set to luks2. Also there are some patches for grub and Argon2.
-# See: https://aur.archlinux.org/packages/grub-improved-luks2-git
-#
-# Choices: luks1, luks2 (in addition, "luks" means "luks1")
-#
-# The default is luks1
-#
+  - suspend
 luksGeneration: luks2
-
-# Correctly draw nested (e.g. logical) partitions as such.
-drawNestedPartitions:   false
-
-# Show/hide partition labels on manual partitioning page.
+drawNestedPartitions: false
 alwaysShowPartitionLabels: true
-
-# Allow manual partitioning.
-#
-# When set to false, this option hides the "Manual partitioning" button,
-# limiting the user's choice to "Erase", "Replace" or "Alongside".
-# This can be useful when using a custom partition layout we don't want
-# the user to modify.
-#
-# If nothing is specified, manual partitioning is enabled.
-allowManualPartitioning:   false
-
+allowManualPartitioning: false
 # Initial selection on the Choice page
 #
 # There are four radio buttons (in principle: erase, replace, alongside, manual),
@@ -110,46 +22,13 @@ allowManualPartitioning:   false
 # The default is "none"
 #
 initialPartitioningChoice: erase
-#
-# Similarly, some of the installation choices may offer a choice of swap;
-# the available choices depend on *userSwapChoices*, above, and this
-# setting can be used to pick a specific one.
-#
-# The default is "none" (no swap) if that is one of the enabled options, otherwise
-# one of the items from the options.
 initialSwapChoice: suspend
-
-# Requirement for partition table type
-#
-# Restrict the installation on disks that match the type of partition
-# tables that are specified.
-#
-# Possible values: msdos, gpt. Names are case-sensitive and defined by KPMCore.
-#
-# If nothing is specified, Calamares defaults to both "msdos" and "gpt".
-#
 requiredPartitionTableType: gpt
-
-# Partition layout.
-#
-# This optional setting specifies a custom partition layout.
-#
-# If nothing is specified, the default partition layout is a single partition
-# for root that uses 100% of the space and uses the filesystem defined by
-# defaultFileSystemType.
-#
-# Note: the EFI system partition is prepend automatically to the layout if
-# needed; the swap partition is appended to the layout if enabled (small of
-# suspend).
-#
-# Otherwise, the partition layout is defined as follow:
-#
 partitionLayout:
     - filesystem: "ext4"
       noEncrypt: false
       mountPoint: "/"
       size: 100%
-
 enableLuksAutomatedPartitioning: true
 # FIXME(m): This does not seem to work
 preCheckEncryption: true