diff --git a/build.gradle.kts b/build.gradle.kts
index 8ebf7b29b..7dbff4133 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,8 @@
+import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.changelog.Changelog
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URL
 import java.time.Year
 
@@ -10,18 +12,18 @@ fun properties(key: String) = project.findProperty(key).toString()
 /// Plugins
 plugins {
     // Compilation
-    id("org.jetbrains.kotlin.jvm") version "1.8.22"  // See also `gradle.properties`
-    id("org.jetbrains.intellij") version "1.14.2"
+    id("org.jetbrains.kotlin.jvm") version "1.9.10"  // Use latest version, ignoring `gradle.properties`
+    id("org.jetbrains.intellij") version "1.15.0"
 
     // Tests/coverage
-    id("org.jetbrains.kotlinx.kover") version "0.7.2"
+    id("org.jetbrains.kotlinx.kover") version "0.7.3"
 
     // Static analysis
-    id("io.gitlab.arturbosch.detekt") version "1.23.0"  // See also `gradle.properties`
+    id("io.gitlab.arturbosch.detekt") version "1.23.1"  // See also `gradle.properties`
 
     // Documentation
-    id("org.jetbrains.changelog") version "2.1.0"
-    id("org.jetbrains.dokka") version "1.8.20"
+    id("org.jetbrains.changelog") version "2.2.0"
+    id("org.jetbrains.dokka") version "1.9.0"
 }
 
 
@@ -57,14 +59,14 @@ tasks {
         sourceCompatibility = properties("javaVersion")
         targetCompatibility = properties("javaVersion")
     }
-    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    withType<KotlinCompile> {
         kotlinOptions {
             jvmTarget = properties("javaVersion")
             apiVersion = properties("kotlinApiVersion")
             languageVersion = properties("kotlinVersion")
         }
     }
-    withType<io.gitlab.arturbosch.detekt.Detekt> {
+    withType<Detekt> {
         jvmTarget = properties("javaVersion")
     }
 
@@ -136,7 +138,7 @@ tasks {
 
     // Documentation
     dokkaHtml.configure {
-        notCompatibleWithConfigurationCache("Not sure why")
+        notCompatibleWithConfigurationCache("cf. https://github.com/Kotlin/dokka/issues/1217")
 
         pluginsMapConfiguration.set(
             mapOf(
diff --git a/gradle.properties b/gradle.properties
index 7b457e0ab..1ad74a934 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,40 +3,43 @@ group=com.fwdekker
 version=3.0.0-beta.3
 
 # Compatibility
-# * If latest is 20xx.y, then support at least [20xx-1].[y+1]
-#   e.g., if latest is 2020.3, support at least 2019.4 (aka 2020.1).
-#   See also https://data.services.jetbrains.com/products?fields=name,releases.version,releases.build&code=IC,CL.
-# * For `intellijVersion`, use the oldest supported version, because that's what the plugin will be compiled against.
-pluginSinceBuild=222.0
-intellijVersion=2022.2
-pluginVerifierIdeVersions=IC-2022.2.5, IC-2022.3.3, IC-2023.1.3, CL-2022.2.5, CL-2022.3.3, CL-2023.1.4
+# * `pluginSinceBuild`:
+#     If latest is 20xx.y, then support at least [20xx-1].[y+1]. For example, if latest is 2020.3, support at least
+#     2019.4 (aka 2020.1).
+# * `intellijVersion`:
+#     Use the oldest supported version, because that's what the plugin will be compiled against.
+# * `pluginVerifierIdeVersions`:
+#     For every supported version minor release, include both the IC and the CL release with the highest patch version
+#     See also https://data.services.jetbrains.com/products?fields=name,releases.version,releases.build&code=IC,CL.
+pluginSinceBuild=223.0
+intellijVersion=2022.3
+pluginVerifierIdeVersions=IC-2022.3.3, IC-2023.1.5, IC-2023.2.2, CL-2022.3.3, CL-2023.1.5, CL-2023.2.2
 
 # Targets
-# * Java
-#   * Java version should be the one used by the oldest Randomness-supported version of IntelliJ, as listed in
-#     https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#intellij-platform-based-products-of-recent-ide-versions
+# * Java:
+#     Java version should be the one used by the oldest Randomness-supported version of IntelliJ. See also
+#     https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#intellij-platform-based-products-of-recent-ide-versions.
 #
 # * Kotlin
 #   * `kotlinVersion` is the same as `kotlinApiVersion`.
-#   * Kotlin should also be updated in `plugins` block.
-#   * Kotlin version should be bundled stdlib version of oldest supported IntelliJ version listed in
-#     https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+#   * Kotlin version should be bundled stdlib version of oldest supported IntelliJ version. See also
+#     https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library.
 javaVersion=17
-kotlinVersion=1.6
-kotlinApiVersion=1.6
+kotlinVersion=1.7
+kotlinApiVersion=1.7
 
 # Dependencies
 # * Detekt should also be updated in `plugins` block.
 # * RgxGen should also be updated in `StringSchemeEditor` link.
 assertjSwingVersion=3.17.1
 dateparserVersion=1.0.11
-detektVersion=1.23.0
+detektVersion=1.23.1
 emojiVersion=5.1.1
-junitVersion=5.9.3
-junitRunnerVersion=1.9.3
-kotestVersion=5.6.2
+junitVersion=5.10.0
+junitRunnerVersion=1.10.0
+kotestVersion=5.7.2
 rgxgenVersion=1.4
-uuidGeneratorVersion=3.3.0
+uuidGeneratorVersion=4.3.0
 
 # Gradle
 org.gradle.caching=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dba0b0839..7bb2df6ba 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/src/main/kotlin/com/fwdekker/randomness/PopupAction.kt b/src/main/kotlin/com/fwdekker/randomness/PopupAction.kt
index 4b75ae9c6..37663ff6e 100644
--- a/src/main/kotlin/com/fwdekker/randomness/PopupAction.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/PopupAction.kt
@@ -106,7 +106,7 @@ class PopupAction : AnAction(Icons.RANDOMNESS) {
          * @param event carries contextual information
          */
         override fun getChildren(event: AnActionEvent?) =
-            PersistentSettings.default.state.templates.map { TemplateGroupAction(it) }.toTypedArray<AnAction>() +
+            Settings.DEFAULT.templates.map { TemplateGroupAction(it) }.toTypedArray<AnAction>() +
                 Separator() +
                 TemplateSettingsAction()
     }
@@ -121,7 +121,7 @@ class PopupAction : AnAction(Icons.RANDOMNESS) {
          * @param event carries contextual information
          */
         override fun getChildren(event: AnActionEvent?) =
-            PersistentSettings.default.state.templates.map { TemplateSettingsAction(it) }.toTypedArray<AnAction>() +
+            Settings.DEFAULT.templates.map { TemplateSettingsAction(it) }.toTypedArray<AnAction>() +
                 Separator() +
                 TemplateSettingsAction()
     }
diff --git a/src/main/kotlin/com/fwdekker/randomness/State.kt b/src/main/kotlin/com/fwdekker/randomness/State.kt
index a3fdac798..81b4f6ea5 100644
--- a/src/main/kotlin/com/fwdekker/randomness/State.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/State.kt
@@ -25,7 +25,7 @@ abstract class State {
      * @see applyContext
      */
     @get:Transient
-    var context: Box<Settings> = Box({ PersistentSettings.default.state })
+    var context: Box<Settings> = Box({ Settings.DEFAULT })
         protected set
 
 
diff --git a/src/main/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditor.kt b/src/main/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditor.kt
index deb254ab4..dbff9880c 100644
--- a/src/main/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditor.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditor.kt
@@ -7,11 +7,12 @@ import com.fwdekker.randomness.array.ArrayDecorator.Companion.MIN_MIN_COUNT
 import com.fwdekker.randomness.array.ArrayDecorator.Companion.PRESET_AFFIX_DECORATOR_DESCRIPTORS
 import com.fwdekker.randomness.array.ArrayDecorator.Companion.PRESET_SEPARATORS
 import com.fwdekker.randomness.ui.JIntSpinner
+import com.fwdekker.randomness.ui.LiteralPredicate
 import com.fwdekker.randomness.ui.UIConstants
 import com.fwdekker.randomness.ui.bindCurrentText
 import com.fwdekker.randomness.ui.bindIntValue
 import com.fwdekker.randomness.ui.bindSpinners
-import com.fwdekker.randomness.ui.indentedRowRange
+import com.fwdekker.randomness.ui.decoratedRowRange
 import com.fwdekker.randomness.ui.isEditable
 import com.fwdekker.randomness.ui.loadMnemonic
 import com.fwdekker.randomness.ui.withFixedWidth
@@ -19,11 +20,12 @@ import com.fwdekker.randomness.ui.withName
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.dsl.builder.BottomGap
 import com.intellij.ui.dsl.builder.Cell
-import com.intellij.ui.dsl.builder.TopGap
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.selected
+import com.intellij.ui.layout.ComponentPredicate
 import com.intellij.ui.layout.and
+import com.intellij.ui.layout.or
 import com.intellij.ui.layout.selected
 import javax.swing.JCheckBox
 
@@ -32,20 +34,18 @@ import javax.swing.JCheckBox
  * Component for editing an [ArrayDecorator].
  *
  * @param scheme the scheme to edit
- * @property embedded `true` if the editor is embedded, which means that no titled separator is shown at the top, and
- * the user cannot disable the array decorator; [apply] always enables the array decorator.
+ * @property embedded `true` if the editor is embedded, which means that no titled separator is shown at the top,
+ * components are additionally indented, and the user cannot disable the array decorator; does not affect the value of
+ * [ArrayDecorator.enabled]
  */
 class ArrayDecoratorEditor(
     scheme: ArrayDecorator,
     private val embedded: Boolean = false,
 ) : SchemeEditor<ArrayDecorator>(scheme) {
     override val rootComponent = panel {
-        separator(Bundle("array.title"))
-            .topGap(TopGap.MEDIUM)
-            .visible(!embedded)
-
-        indentedRowRange(indented = !embedded) {
+        decoratedRowRange(title = if (!embedded) Bundle("array.title") else null, indent = !embedded) {
             lateinit var enabledCheckBox: Cell<JCheckBox>
+            lateinit var isEnabled: ComponentPredicate
 
             row {
                 checkBox(Bundle("array.ui.enabled"))
@@ -53,9 +53,10 @@ class ArrayDecoratorEditor(
                     .withName("arrayEnabled")
                     .bindSelected(scheme::enabled)
                     .also { enabledCheckBox = it }
+                    .also { isEnabled = enabledCheckBox.selected.or(LiteralPredicate(embedded)) }
             }.visible(!embedded)
 
-            indentedRowRange(indented = !embedded) {
+            decoratedRowRange(indent = !embedded) {
                 lateinit var minCountSpinner: JIntSpinner
                 lateinit var maxCountSpinner: JIntSpinner
 
@@ -86,7 +87,7 @@ class ArrayDecoratorEditor(
                         .also { separatorEnabledCheckBox = it.component }
 
                     cell(ComboBox(PRESET_SEPARATORS))
-                        .enabledIf(enabledCheckBox.selected.and(separatorEnabledCheckBox.selected))
+                        .enabledIf(isEnabled.and(separatorEnabledCheckBox.selected))
                         .isEditable(true)
                         .withName("arraySeparator")
                         .bindCurrentText(scheme::separator)
@@ -96,14 +97,14 @@ class ArrayDecoratorEditor(
                     AffixDecoratorEditor(
                         scheme.affixDecorator,
                         PRESET_AFFIX_DECORATOR_DESCRIPTORS,
-                        enabledIf = enabledCheckBox.selected,
+                        enabledIf = isEnabled,
                         enableMnemonic = false,
                         namePrefix = "array",
                     )
                         .also { decoratorEditors += it }
                         .let { cell(it.rootComponent) }
                 }
-            }.enabledIf(enabledCheckBox.selected)
+            }.enabledIf(isEnabled)
         }
     }
 
diff --git a/src/main/kotlin/com/fwdekker/randomness/string/StringSchemeEditor.kt b/src/main/kotlin/com/fwdekker/randomness/string/StringSchemeEditor.kt
index d9e36554e..f5ac2146d 100644
--- a/src/main/kotlin/com/fwdekker/randomness/string/StringSchemeEditor.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/string/StringSchemeEditor.kt
@@ -12,7 +12,6 @@ import com.fwdekker.randomness.ui.withName
 import com.fwdekker.randomness.ui.withSimpleRenderer
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.dsl.builder.BottomGap
-import com.intellij.ui.dsl.builder.EMPTY_LABEL
 import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.bindText
@@ -38,14 +37,14 @@ class StringSchemeEditor(scheme: StringScheme = StringScheme()) : SchemeEditor<S
                 browserLink(Bundle("string.ui.value.pattern_help"), Bundle("string.ui.value.pattern_help_url"))
             }
 
-            row(EMPTY_LABEL) {
+            row("") {
                 checkBox(Bundle("string.ui.value.is_regex_option"))
                     .loadMnemonic()
                     .withName("isRegex")
                     .bindSelected(scheme::isRegex)
             }
 
-            row(EMPTY_LABEL) {
+            row("") {
                 checkBox(Bundle("string.ui.value.remove_look_alike"))
                     .loadMnemonic()
                     .withName("removeLookAlikeCharacters")
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt
index 22e34c30f..71b5202f2 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt
@@ -1,6 +1,6 @@
 package com.fwdekker.randomness.template
 
-import com.fwdekker.randomness.PersistentSettings
+import com.fwdekker.randomness.Settings
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.impl.DynamicActionConfigurationCustomizer
 
@@ -11,17 +11,17 @@ import com.intellij.openapi.actionSystem.impl.DynamicActionConfigurationCustomiz
  * @property getTemplates Shorthand to return all the user's stored [Template]s.
  */
 open class TemplateActionLoader(
-    private val getTemplates: () -> List<Template> = { PersistentSettings.default.state.templates },
+    private val getTemplates: () -> List<Template> = { Settings.DEFAULT.templates },
 ) : DynamicActionConfigurationCustomizer {
     /**
-     * Registers the actions for all [Template]s in the user's [PersistentSettings] using [actionManager].
+     * Registers the actions for all [Template]s in the user's [Settings] using [actionManager].
      */
     override fun registerActions(actionManager: ActionManager) {
         getTemplates().forEach { registerAction(actionManager, it) }
     }
 
     /**
-     * Unregisters the actions of all [Template]s in the user's [PersistentSettings] using [actionManager].
+     * Unregisters the actions of all [Template]s in the user's [Settings] using [actionManager].
      */
     override fun unregisterActions(actionManager: ActionManager) {
         getTemplates().forEach { unregisterAction(actionManager, it) }
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt
index 8c9d7d394..f922e52f9 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt
@@ -162,7 +162,7 @@ class TemplateInsertAction(
         /**
          * Saves the [editor]'s state.
          */
-        override fun apply() = Unit
+        override fun apply() = editor.apply()
 
         /**
          * Returns [text].
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt
index 8849894ae..da378a9d6 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt
@@ -12,6 +12,7 @@ import com.fwdekker.randomness.word.WordScheme
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionToolbarPosition
 import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.ui.popup.ListSeparator
@@ -126,7 +127,7 @@ class TemplateJTree(
 
 
     init {
-        TreeSpeedSearch(this) { path -> path.path.filterIsInstance<Scheme>().joinToString { it.name } }
+        TreeSpeedSearch(this, true) { path -> path.path.filterIsInstance<Scheme>().joinToString { it.name } }
 
         emptyText.text = Bundle("template_list.ui.empty")
         isRootVisible = false
@@ -164,12 +165,12 @@ class TemplateJTree(
             .setScrollPaneBorder(JBUI.Borders.empty())
             .disableAddAction()
             .disableRemoveAction()
-            .addExtraAction(AddButton())
-            .addExtraAction(RemoveButton())
-            .addExtraAction(CopyButton())
-            .addExtraAction(UpButton())
-            .addExtraAction(DownButton())
-            .addExtraAction(ResetButton())
+            .addExtraAction(AddButton() as AnAction)
+            .addExtraAction(RemoveButton() as AnAction)
+            .addExtraAction(CopyButton() as AnAction)
+            .addExtraAction(UpButton() as AnAction)
+            .addExtraAction(DownButton() as AnAction)
+            .addExtraAction(ResetButton() as AnAction)
             .setButtonComparator(
                 Bundle("shared.action.add"),
                 Bundle("shared.action.edit"),
@@ -407,10 +408,7 @@ class TemplateJTree(
          */
         override fun actionPerformed(event: AnActionEvent) =
             JBPopupFactory.getInstance()
-                .createListPopup(
-                    if (selectedNodeNotRoot == null) DefaultTemplatesPopupStep()
-                    else MainPopupStep()
-                )
+                .createListPopup(MainPopupStep(templatesOnly = selectedNodeNotRoot == null))
                 .show(preferredPopupPoint)
 
 
@@ -421,8 +419,9 @@ class TemplateJTree(
          *
          * @param schemes the schemes that can be inserted
          */
-        private abstract inner class AddSchemePopupStep(schemes: List<Scheme>) :
-            BaseListPopupStep<Scheme>(null, schemes) {
+        private abstract inner class AbstractPopupStep(
+            schemes: List<Scheme>,
+        ) : BaseListPopupStep<Scheme>(null, schemes) {
             /**
              * Returns [value]'s icon.
              */
@@ -450,6 +449,7 @@ class TemplateJTree(
                 return null
             }
 
+
             /**
              * Returns `true`.
              */
@@ -463,15 +463,22 @@ class TemplateJTree(
 
         /**
          * The top-level [PopupStep], which includes the default templates and various reference types.
+         *
+         * @property templatesOnly `true` if and only if non-[Template] schemes cannot be inserted.
          */
-        private inner class MainPopupStep : AddSchemePopupStep(POPUP_STEP_SCHEMES) {
+        private inner class MainPopupStep(private val templatesOnly: Boolean) : AbstractPopupStep(POPUP_STEP_SCHEMES) {
             override fun onChosen(value: Scheme?, finalChoice: Boolean) =
                 when (value) {
-                    POPUP_STEP_SCHEMES[0] -> DefaultTemplatesPopupStep()
+                    POPUP_STEP_SCHEMES[0] -> TemplatesPopupStep()
                     POPUP_STEP_SCHEMES[POPUP_STEP_SCHEMES.size - 1] -> ReferencesPopupStep()
                     else -> super.onChosen(value, finalChoice)
                 }
 
+            /**
+             * Returns `true` if and only if [value] is a [Template] or [templatesOnly] is `false`.
+             */
+            override fun isSelectable(value: Scheme?) = value is Template || !templatesOnly
+
             /**
              * Returns `true` if and only if [value] equals the [Template] or [TemplateReference] entry.
              */
@@ -489,8 +496,8 @@ class TemplateJTree(
         /**
          * A [PopupStep] that shows only the default templates.
          */
-        private inner class DefaultTemplatesPopupStep :
-            AddSchemePopupStep(listOf(Template("Empty")) + TemplateList.DEFAULT_TEMPLATES)
+        private inner class TemplatesPopupStep :
+            AbstractPopupStep(listOf(Template("Empty")) + TemplateList.DEFAULT_TEMPLATES)
 
         /**
          * A [PopupStep] that contains a [TemplateReference] for each [Template] that can currently be referenced from
@@ -498,8 +505,8 @@ class TemplateJTree(
          *
          * Ineligible [Template]s are automatically filtered out.
          */
-        private inner class ReferencesPopupStep : AddSchemePopupStep(
-            currentSettings.templateList.templates
+        private inner class ReferencesPopupStep : AbstractPopupStep(
+            currentSettings.templates
                 .filter { selectedTemplate!!.canReference(it) }
                 .map { TemplateReference(it.uuid) }
         )
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditor.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditor.kt
index 13b8e4eb1..3c119a55c 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditor.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditor.kt
@@ -32,7 +32,7 @@ class TemplateReferenceEditor(scheme: TemplateReference) : SchemeEditor<Template
                     .onResetThis { cell ->
                         cell.component.removeAllItems()
 
-                        (+scheme.context).templateList.templates
+                        (+scheme.context).templates
                             .filter { scheme.canReference(it) }
                             .forEach { cell.component.addItem(it) }
                     }
diff --git a/src/main/kotlin/com/fwdekker/randomness/ui/InterfaceBuilderHelpers.kt b/src/main/kotlin/com/fwdekker/randomness/ui/InterfaceBuilderHelpers.kt
index b9614a6c1..d73b3fe97 100644
--- a/src/main/kotlin/com/fwdekker/randomness/ui/InterfaceBuilderHelpers.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/ui/InterfaceBuilderHelpers.kt
@@ -4,6 +4,7 @@ import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.dsl.builder.Cell
 import com.intellij.ui.dsl.builder.Panel
+import com.intellij.ui.dsl.builder.TopGap
 import com.intellij.ui.dsl.builder.columns
 import com.intellij.ui.dsl.builder.toMutableProperty
 import com.intellij.ui.layout.ComponentPredicate
@@ -20,11 +21,15 @@ import kotlin.reflect.KMutableProperty0
 
 
 /**
- * Creates and returns a range of rows from [spec], which is indented if and only if [indented] is `true`.
+ * Creates and returns a range of rows from [init], headed by an underlined [title] if and only if [title] is not
+ * `null`, and indented if and only if [indent] is `true`.
  */
-fun Panel.indentedRowRange(indented: Boolean, spec: Panel.() -> Unit) =
-    if (indented) indent(spec)
-    else rowsRange(spec)
+fun Panel.decoratedRowRange(title: String? = null, indent: Boolean, init: Panel.() -> Unit) =
+    when {
+        title != null -> rowsRange { group(title, indent = indent, init = init).topGap(TopGap.MEDIUM) }
+        indent -> indent(init)
+        else -> rowsRange(init)
+    }
 
 
 /**
@@ -119,6 +124,15 @@ fun <E> Cell<ComboBox<E>>.withSimpleRenderer(toString: (E) -> String = { it.toSt
 }
 
 
+/**
+ * A predicate that always returns [output].
+ */
+class LiteralPredicate(private val output: Boolean) : ComponentPredicate() {
+    override fun addListener(listener: (Boolean) -> Unit) = Unit
+
+    override fun invoke() = output
+}
+
 /**
  * Returns a [ComponentPredicate] that evaluates [lambda] on the value of this [JIntSpinner].
  */
diff --git a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
index c71242ac4..986e0bf36 100644
--- a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
@@ -17,6 +17,8 @@ import com.intellij.ui.TitledSeparator
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row
+import io.kotest.matchers.collections.beEmpty
+import io.kotest.matchers.should
 import org.assertj.swing.edt.FailOnThreadViolationRepaintManager
 import org.assertj.swing.fixture.Containers.showInFrame
 import org.assertj.swing.fixture.FrameFixture
@@ -67,7 +69,7 @@ object ArrayDecoratorEditorTest : FunSpec({
                 editor = guiGet { ArrayDecoratorEditor(scheme, embedded = true) }
                 frame = showInFrame(editor.rootComponent)
 
-                frame.panel(matcher(TitledSeparator::class.java)).requireNotVisible()
+                frame.robot().finder().findAll(matcher(TitledSeparator::class.java)) should beEmpty()
             }
         }
     }
@@ -88,14 +90,14 @@ object ArrayDecoratorEditorTest : FunSpec({
                 frame.spinner("arrayMinCount").requireEnabled()
             }
 
-            test("keeps components visible if the editor is embedded") {
+            test("remains disabled and is disconnected from inputs if the editor is embedded") {
                 frame.cleanUp()
+                scheme.enabled = false
                 editor = guiGet { ArrayDecoratorEditor(scheme, embedded = true) }
                 frame = showInFrame(editor.rootComponent)
 
                 // This special matcher does not require the component to be visible
-                frame.checkBox(matcher(JCheckBox::class.java) { it.name == "arrayEnabled" }).requireSelected()
-
+                frame.checkBox(matcher(JCheckBox::class.java) { it.name == "arrayEnabled" }).requireNotSelected()
                 frame.spinner("arrayMinCount").requireEnabled()
             }
         }
@@ -181,6 +183,13 @@ object ArrayDecoratorEditorTest : FunSpec({
         editorFieldsTestFactory(
             { editor },
             mapOf(
+                "enabled" to {
+                    row(
+                        frame.checkBox("arrayEnabled").isSelectedProp(),
+                        editor.scheme::enabled.prop(),
+                        false,
+                    )
+                },
                 "minCount" to {
                     row(
                         frame.spinner("arrayMinCount").valueProp(),
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateListEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateListEditorTest.kt
index 893163a57..bef1c0aef 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateListEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateListEditorTest.kt
@@ -176,7 +176,7 @@ object TemplateListEditorTest : FunSpec({
             test("selects the indicated template") {
                 guiRun { frame.tree().target().selectionRows = intArrayOf(4) }
 
-                editor.queueSelection = context.templateList.templates[1].uuid
+                editor.queueSelection = context.templates[1].uuid
                 guiRun { editor.reset() }
 
                 frame.tree().target().selectionRows!! shouldContainExactly arrayOf(3)
@@ -185,7 +185,7 @@ object TemplateListEditorTest : FunSpec({
             test("selects the indicated scheme") {
                 guiRun { frame.tree().target().selectionRows = intArrayOf(2) }
 
-                editor.queueSelection = context.templateList.templates[1].schemes[0].uuid
+                editor.queueSelection = context.templates[1].schemes[0].uuid
                 guiRun { editor.reset() }
 
                 frame.tree().target().selectionRows!! shouldContainExactly arrayOf(4)
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt
index 58c499cd6..f30ab8597 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt
@@ -248,7 +248,12 @@ object TemplateReferenceTest : FunSpec({
                     row({ reference.also { it.capitalization = CapitalizationMode.UPPER } }, "TEXT0"),
                 "applies decorators in order affix, array" to
                     row(
-                        { reference.also { it.affixDecorator.enabled = true; it.arrayDecorator.enabled = true } },
+                        {
+                            reference.also {
+                                it.affixDecorator.enabled = true
+                                it.arrayDecorator.enabled = true
+                            }
+                        },
                         "[text0, text1, text2]",
                     ),
             )