From 5255afcda3f1dfdd1a8a892bb645984528126256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mu=C3=B1oz?= <raul@mothership.com>
Date: Sat, 11 Jan 2025 18:57:15 +0100
Subject: [PATCH] Horizontal menus for arpeggiator's randomizer submenu (#3238)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prefer the 7SEG string for the horizontal menu titles

* Horizontal menus for arpeggiator’s randomizer, and fixed documentation

* format

* Change docs

* Format

* Revert setting 7Seg name as the default name for horizontal menus

* Change order of LFO params to match grid shortcuts

* Put arp params in groups and add them to the grid shortcuts as horizontal menus

* Update menu hierarchies

* Fixed menus for all types: sound, midi, cv, drums

* format

* Format

* Added Randomizer to “Mode” shortcut, visible when horizontal menus are on

* format
---
 docs/features/arpeggiator.md                  |  76 ++++---
 docs/menu_hierarchies.md                      | 209 +++++++++++-------
 src/deluge/gui/l10n/english.json              |  10 +-
 src/deluge/gui/l10n/g_english.cpp             |   9 +-
 src/deluge/gui/l10n/g_seven_segment.cpp       |   8 +-
 src/deluge/gui/l10n/seven_segment.json        |   8 +-
 src/deluge/gui/l10n/strings.h                 |   1 +
 .../arp_unpatched_param.h}                    |  10 +-
 .../gui/menu_item/arpeggiator/chord_type.h    |   3 +
 .../arpeggiator/midi_cv/arp_integer.h         |  34 +++
 .../arpeggiator/midi_cv/bass_probability.h    |   7 +-
 .../arpeggiator/midi_cv/chord_polyphony.h     |   7 +-
 .../arpeggiator/midi_cv/chord_probability.h   |   7 +-
 .../gui/menu_item/arpeggiator/midi_cv/gate.h  |  10 +-
 .../arpeggiator/midi_cv/note_probability.h    |  10 +-
 .../arpeggiator/midi_cv/ratchet_amount.h      |  10 +-
 .../arpeggiator/midi_cv/ratchet_probability.h |  10 +-
 .../gui/menu_item/arpeggiator/midi_cv/rate.h  |  10 +-
 .../menu_item/arpeggiator/midi_cv/rhythm.h    |  38 +++-
 .../arpeggiator/midi_cv/sequence_length.h     |  10 +-
 .../arpeggiator/midi_cv/spread_gate.h         |  10 +-
 .../arpeggiator/midi_cv/spread_octave.h       |   7 +-
 .../arpeggiator/midi_cv/spread_velocity.h     |   7 +-
 src/deluge/gui/menu_item/arpeggiator/mode.h   |   2 +-
 .../gui/menu_item/arpeggiator/note_mode.h     |   3 +
 .../gui/menu_item/arpeggiator/octave_mode.h   |   3 +
 .../menu_item/arpeggiator/randomizer_lock.h   |   4 +-
 src/deluge/gui/menu_item/arpeggiator/rate.h   |   3 +-
 src/deluge/gui/menu_item/arpeggiator/rhythm.h |  34 ++-
 .../gui/menu_item/arpeggiator/step_repeat.h   |   3 +
 src/deluge/gui/menu_item/submenu.cpp          |   2 +-
 src/deluge/gui/menu_item/sync_level.cpp       |   2 +-
 src/deluge/gui/ui/menus.cpp                   | 111 ++++++----
 src/deluge/gui/ui/menus.h                     |   2 +
 src/deluge/gui/ui/sound_editor.cpp            |   1 +
 src/deluge/modulation/arpeggiator.cpp         |   2 +-
 36 files changed, 413 insertions(+), 270 deletions(-)
 rename src/deluge/gui/menu_item/{unpatched_param/sound_unpatched_param.h => arpeggiator/arp_unpatched_param.h} (76%)
 create mode 100644 src/deluge/gui/menu_item/arpeggiator/midi_cv/arp_integer.h

diff --git a/docs/features/arpeggiator.md b/docs/features/arpeggiator.md
index ec9563a228..633b564397 100644
--- a/docs/features/arpeggiator.md
+++ b/docs/features/arpeggiator.md
@@ -24,10 +24,14 @@ Now the menu options are the following:
 - **`Enabled (ON)`**: enables the arpeggiator, that is, it internally sets `Mode` to `Arpeggiator`. In the future, this will
   be replaced by the `Mode` setting, which will have other modes other than `Arpeggiator`.
 
-### Rate
-The following parameters define the rate, that is, the speed of the notes:
-- **`Sync`**: allows you to set the synced rate between `Off`, `2-Bar`, ..., `128th` notes.
-- **`Rate`**: manually sets a sync rate when `Sync` is set to `Off`.
+### Basic parameters
+The following parameters define the basic parameters of the arpeggiator:
+- **`Gate`**: This changes the length of the note, as a relative percentage of the time window set between this note and the next.
+  A gate of 25 will make the notes last for 50% of the available time window. It can be **automated** and **learned** to
+  golden knobs and MIDI CC (not automatable in MIDI clips).
+- **`Sync`**: allows you to set the synced rate between `Off`, `2-Bar`, ..., `128th` notes, etc.
+- **`Rate`**: manually sets a sync rate when `Sync` is set to `Off`. It can be **automated** and **learned** to
+  golden knobs and MIDI CC (not automatable in MIDI clips).
 
 ### Pattern
 The following parameters will define the pattern of the arpeggio, by ordering the notes you have played, adding extra octaves,
@@ -42,12 +46,15 @@ setting how many times they are repeated, and setting the direction in which the
       the old `Both` mode.
     - `Random (RAND)` will choose a random octave every time the Notes pattern has played.
       Tip: Set also Note Mode to Random to have the equivalent to the old `Random` mode.
+- **`Chord Simulator (CSIM)`**: is only available for Kit Rows. This allows you to simulate a chord so you
+  can use `Note Mode` on the Kit Row. It will take the base pitch of the sample and add extra "notes" to
+  the sequence by pitching the sample up several semitones to form a chord.
 - **`Note Mode (NMOD)`**:
     - `Up (UP)` will walk the notes up.
     - `Down (DOWN)` will walk the notes down. Tip: this mode also works in conjunction with Octave Mode
       Alternate, which will walk all the notes and octaves all the way down, and then up reversing it.
     - `Up & Down (UPDN)` will walk the notes up and down, repeating the highest and lowest notes.
-    - `As played (PLAY)` will walk the notes in the same order that they were played. Tip: this mode
+    - `Played Order (PLAY)` will walk the notes in the same order that they were played. Tip: this mode
       also works in conjunction with Octave Mode Alternate, which will walk all the notes and octaves
       all the way up (with notes as played), and then down reversing the order of played notes.
       Note: this produces the same effect as Up for Kit Rows.
@@ -55,17 +62,11 @@ setting how many times they are repeated, and setting the direction in which the
       different than Random, then the pattern will play, in the same octave, the same number of random
       notes as notes are in the held chord and then move to a different octave based on the Octave Mode.
       Tip: Set also Octave Mode to Random to have the equivalent to the old `Random` mode.
-- **`Chord Simulator (CHRD)`**: is only available for Kit Rows. This allows you to simulate a chord so you
-  can use `Note Mode` on the Kit Row.
 - **`Step Repeat (REPE)`**: allows you to set how many times the same note in the pattern is repeated
-  before moving on to the next note of the pattern.
-
-### Automatable parameters
-All the following parameters define other aspects of the arpeggiator and can be **automated** and **learned** to golden knobs and MIDI CC:
-- **`Gate`**: This changes the length of the note, as a relative percentage of the time window set between this note and the next.
-  A gate of 25 will make the notes last for 50% of the available time window.
+  before moving on to the next one.
 - **`Rhythm (RHYT)`**: This parameter will play silences in some of the steps. This menu option shows zeroes and dashes,
-  "0" means "play note", and "-" means "don't play note" (or play a silence). The available options are:
+  "0" means "play note", and "-" means "don't play note" (or play a silence). It can be **automated** and **learned** to
+  golden knobs and MIDI CC (not automatable in MIDI clips). The available options are:
   <details>
   <summary>Rhythm Options</summary>
     <ul>
@@ -127,36 +128,39 @@ All the following parameters define other aspects of the arpeggiator and can be
   - If set to a value higher than zero, the pattern will play up to the set number of steps, and then
     reset itself to start from the beginning. Tip: You can use this in combination with the Rhythm
     parameter to create longer and more complex rhythm patterns.
-- **`Chord Polyphony (POLY)`**: is not available for Kit Rows. This will set the maximum number of notes that will play at the same time when a
-  step is played as a chord. Increase parameter `Chord Probability` to make some steps play a chord instead
-  of a single note. Values range from no chord, to 5th, to triad (3rd + 5th), to seventh chord (3rd + 5th + 7th).
-- **`Ratchet Amount (RATC)`**: A ratchet is when a note repeats itself several times in the same time interval
-  that the original note has to play. This will set the maximum number of notes that a single step can have (each step will
-  randomize the number of ratchet notes between 1 and this maximum value set). Ratchet bursts can contain 2, 4 or 8 notes.
+  - It can be **automated** and **learned** to golden knobs and MIDI CC (not automatable in MIDI clips).
 
 ### Randomizer
-The following parameters are also **automatable** and **learnable** to golden knobs and MIDI CC, and they define how probable a value is to change on each step:
+The following parameters are all **automatable** and **learnable** to golden knobs and MIDI CC (not in MIDI clips), and they define how probable a value is to change on each step:
 - **`Randomizer (RAND)`**:
-  - **`Ratchet Probability (RATC)`**: This sets how likely a step is to be ratcheted. The ratchet amount is randomized on each step between 1 and
-    the maximum value set with the `Ratchet Amount` parameter within the `Limits` group.
-  - **`Note Probability (NOTE)`**: It applies a probability for notes to play or not (after Rhythm has been evalutated,
-    that is, only for note steps, not for silent steps).
-  - **`Bass Probability (BASS)`**: It applies a chance of replacing the current note to be played with the lowest note of the played notes.
-    The higher the value, the more likely that the note played is the bass note of the arpeggiated chord.
-    This can be used as a performance tool to open up or close the arpeggio pitch range.
-  - **`Chord Probability (CHRD)`**: is not available for Kit Rows. This paramater will allow you to control the chance of a note to play, at the same time, itself and the following notes in the available
-    notes set, like a chord.
-  - **`Octave Spread (OCTA)`**: The note will get a change in pitch of a random amount of octaves, going from 0 up to a maximum of +3 octaves.
-  - **`Gate Spread (GATE)`**: The gate of the arp step will get a random **positive** or **negative** deviation from the base gate.
-  - **`Velocity Spread (VELO)`**: The velocity of the arp step will get a random **positive** or **negative** deviation from the base velocity.
-    Note: you can find this parameter also at the root level of the sound menu, under `Randomizer`, because this parameter affects
-    both sequenced notes and arpeggiated notes.
-  - **`Lock (LOCK)`**: this flag will lock the current set of randomized values for the arpeggiator, so the sequence has a repeatable pattern.
+  - **`Lock Randomizer (LOCK)`**: this flag will lock the current set of randomized values for the arpeggiator, so the sequence has a repeatable pattern.
     - Tip 1: In case you have drone notes, make use of the `Sequence Length` parameter to further adjust the repeated sequence.
     - Tip 2: If you want to re-roll the dice for a parameter, slightly change its value and a new set of random values will be
     generated and locked.
     - Tip 3: If you want some parameters to be locked, but not others, add some automation variation in the clip to those,
     so the dice is re-rolled and hence you always get fresh new random values for them, while the others have fixed values.
+  - **`Octave Spread (OCTA)`**: The note will get a change in pitch of a random amount of octaves, going from 0 up to a maximum of +3 octaves.
+  - **`Gate Spread (GATE)`**: The gate of the arp step will get a random **positive** or **negative** deviation from the base gate.
+  - **`Velocity Spread (VELO)`**: The velocity of the arp step will get a random **positive** or **negative** deviation from the base velocity.
+    Note: you can find this parameter also at the root level of the sound menu, under `Randomizer`, because this parameter affects
+    both sequenced notes and arpeggiated notes.
+  - **`Ratchet Amount (RATC)`**: A ratchet is when a note repeats itself several times in the same time interval
+    that the original note has to play. This will set the maximum number of notes that a single step can have (each step will
+    pick a random number of ratchet notes between 1 and this maximum value set). Ratchet bursts can contain 2, 4 or 8 notes.
+    By increasing this parameter, it is more likely that bigger ratchet bursts can occur.
+  - **`Ratchet Probability (RPRO)`**: This sets how likely a step is to be ratcheted. The ratchet amount is randomized on each step
+    between 1 and the maximum value set with the `Ratchet Amount` parameter.
+  - **`Chord Polyphony (CHRD)`**: is not available for Kit Rows. This will set the maximum number of notes that will play at the same time
+    when a step is played as a chord. Increase parameter `Chord Probability` to make some steps play a chord instead
+    of a single note. Values range from no chord, to 5th, to triad (3rd + 5th), to seventh chord (3rd + 5th + 7th) as the maximum size of
+    a chord. By increasing this parameter, it is more likely that bigger chords can occur.
+  - **`Chord Probability (CPRO)`**: is not available for Kit Rows. This paramater will allow you to control the chance of a note to play
+    as a chord. The size of the chord is determined by the `Chord Polyphony` parameter.
+  - **`Note Probability (NOTE)`**: It applies a probability for notes to play or not (after Rhythm has been evalutated,
+    that is, only for `note` steps, not for `silent` steps).
+  - **`Bass Probability (BASS)`**: It applies a chance of replacing the current note to be played with the lowest note of arpeggiator
+    pattern. The higher the value, the more likely that the note played is the bass note of the arpeggiated chord.
+    This can be used as a performance tool to open up or close the arpeggio's pitch range.
 
 ### MPE
 This submenu contains parameters that are useful if you have an MPE controller connected to the Deluge:
diff --git a/docs/menu_hierarchies.md b/docs/menu_hierarchies.md
index 63aa4aaf17..a3a80e86f7 100644
--- a/docs/menu_hierarchies.md
+++ b/docs/menu_hierarchies.md
@@ -671,8 +671,10 @@ The Sound menu contains the following menu hierarchy:
 <details><summary>Arpeggiator (ARPE)</summary>
 
 	- Enabled (ON)
-	- Sync
-	NOTE: These options can change depending on how your default resolution is set
+	- Basic
+		- Gate
+		- Sync
+		NOTE: These options can change depending on how your default resolution is set
 
 			- Off
 			- 2-Bar
@@ -702,36 +704,36 @@ The Sound menu contains the following menu hierarchy:
 			- 32nd-DTTED
 			- 64th-DTTED
 			- 128th-DTTED
-	- Rate
-	- Octaves (OCTA)
-	- Octave Mode (OMOD)
-		- Up
-		- Down
-		- Up & Down (UPDN)
-		- Alternate (ALT)
-		- Random (RAND)
-	- Note Mode (NMOD)
-		- Up
-		- Down
-		- Up & Down (UPDN)
-		- As Played (PLAY)
-		- Random (RAND)
-	- Chord Simulator (CHRD) (NOTE: Available only in Kit Rows)
-	- Step Repeat (REPE)
-	- Gate
-	- Rhythm (RHYT)
-	- Sequence Length (LENG)
-	- Chord Polyphony (POLY) (NOTE: NOT available for Sound Kit Rows)
-	- Ratchet Amount (RATC)
+		- Rate
+	- Pattern
+		- Octaves (OCTA)
+		- Octave Mode (OMOD)
+			- Up
+			- Down
+			- Up & Down (UPDN)
+			- Alternate (ALT)
+			- Random (RAND)
+		- Chord Simulator (CSIM) (NOTE: Available only in Kit Rows)
+		- Note Mode (NMOD)
+			- Up
+			- Down
+			- Up & Down (UPDN)
+			- Played Order (PLAY)
+			- Random (RAND)
+		- Step Repeat (REPE)
+		- Rhythm (RHYT)
+		- Sequence Length (LENG)
 	- Randomizer
-		- Ratchet Probability (RPRO)
-		- Note Probability (PROB)
-		- Bass Probability (BASS)
-		- Chord Probability (CHRD) (NOTE: NOT available for Sound Kit Rows)
+		- Lock Randomizer (LOCK)
 		- Octave Spread (OCTA)
 		- Gate Spread (GATE)
 		- Velocity Spread (VELO)
-		- Lock (LOCK)
+		- Ratchet Amount (RATC)
+		- Ratchet Probability (RPRO)
+		- Chord Polyphony (CHRD) (NOTE: NOT available for Sound Kit Rows)
+		- Chord Probability (CPRO) (NOTE: NOT available for Sound Kit Rows)
+		- Note Probability (NOTE)
+		- Bass Probability (BASS)
 	- MPE
 		- Velocity (VELO)
 			- Disabled (OFF)
@@ -1000,7 +1002,6 @@ The Sound menu contains the following menu hierarchy:
 		- Saw
 		- S&H (S H)
 		- Random Walk (RWLK)
-	- Rate
 	- Sync
 	NOTE: These options can change depending on how your default resolution is set
 
@@ -1032,6 +1033,7 @@ The Sound menu contains the following menu hierarchy:
 		- 32nd-DTTED
 		- 64th-DTTED
 		- 128th-DTTED
+	- Rate
 </details>
 <details><summary>LFO2 </summary>
 
@@ -1042,6 +1044,37 @@ The Sound menu contains the following menu hierarchy:
 		- Saw
 		- S&H (S H)
 		- Random Walk (RWLK)
+	- Sync
+	NOTE: These options can change depending on how your default resolution is set
+
+		- Off
+		- 2-Bar
+		- 1-Bar
+		- 2nd-Notes
+		- 4th-Notes
+		- 8th-Notes
+		- 16th-Notes
+		- 32nd-Notes
+		- 64th-Notes
+		- 128th-Notes
+		- 2-Bar-TPLTS
+		- 1-Bar-TPLTS
+		- 2nd-TPLTS
+		- 4th-TPLTS
+		- 8th-TPLTS
+		- 16th-TPLTS
+		- 32nd-TPLTS
+		- 64th-TPLTS
+		- 128th-TPLTS
+		- 2-Bar-DTTED
+		- 1-Bar-DTTED
+		- 2nd-DTTED
+		- 4th-DTTED
+		- 8th-DTTED
+		- 16th-DTTED
+		- 32nd-DTTED
+		- 64th-DTTED
+		- 128th-DTTED
 	- Rate
 </details>
 <details><summary>Voice (VOIC) </summary>
@@ -1269,8 +1302,10 @@ The MIDI menu contains the following menu hierarchy:
 <details><summary>Arpeggiator (ARPE)</summary>
 
 	- Enabled (ON)
-	- Sync
-	NOTE: These options can change depending on how your default resolution is set
+	- Basic
+		- Gate
+		- Sync
+		NOTE: These options can change depending on how your default resolution is set
 
 			- Off
 			- 2-Bar
@@ -1300,36 +1335,36 @@ The MIDI menu contains the following menu hierarchy:
 			- 32nd-DTTED
 			- 64th-DTTED
 			- 128th-DTTED
-	- Rate
-	- Octaves (OCTA)
-	- Octave Mode (OMOD)
-		- Up
-		- Down
-		- Up & Down (UPDN)
-		- Alternate (ALT)
-		- Random (RAND)
-	- Note Mode (NMOD)
-		- Up
-		- Down
-		- Up & Down (UPDN)
-		- As Played (PLAY)
-		- Random (RAND)
-	- Chord Simulator (CHRD) (NOTE: Available only in Kit Rows)
-	- Step Repeat (REPE)
-	- Gate
-	- Rhythm (RHYT)
-	- Sequence Length (LENG)
-	- Chord Polyphony (POLY) (NOTE: NOT available for Midi Kit Rows)
-	- Ratchet Amount (RATC)
+		- Rate
+	- Pattern
+		- Octaves (OCTA)
+		- Octave Mode (OMOD)
+			- Up
+			- Down
+			- Up & Down (UPDN)
+			- Alternate (ALT)
+			- Random (RAND)
+		- Chord Simulator (CSIM) (NOTE: Available only in Kit Rows)
+		- Note Mode (NMOD)
+			- Up
+			- Down
+			- Up & Down (UPDN)
+			- Played Order (PLAY)
+			- Random (RAND)
+		- Step Repeat (REPE)
+		- Rhythm (RHYT)
+		- Sequence Length (LENG)
 	- Randomizer
-		- Ratchet Probability (RPRO)
-		- Note Probability (PROB)
-		- Bass Probability (BASS)
-		- Chord Probability (CHRD) (NOTE: NOT available for Midi Kit Rows)
+		- Lock Randomizer (LOCK)
 		- Octave Spread (OCTA)
 		- Gate Spread (GATE)
 		- Velocity Spread (VELO)
-		- Lock (LOCK)
+		- Ratchet Amount (RATC)
+		- Ratchet Probability (RPRO)
+		- Chord Polyphony (CHRD) (NOTE: NOT available for Midi Kit Rows)
+		- Chord Probability (CPRO) (NOTE: NOT available for Midi Kit Rows)
+		- Note Probability (NOTE)
+		- Bass Probability (BASS)
 	- MPE
 		- Velocity (VELO)
 			- Disabled (OFF)
@@ -1374,9 +1409,11 @@ The CV menu contains the following menu hierarchy:
 <details><summary>Arpeggiator (ARPE)</summary>
 
 	- Enabled (ON)
-	- Sync
-	NOTE: These options can change depending on how your default resolution is set
-
+	- Basic
+		- Gate
+		- Sync
+		NOTE: These options can change depending on how your default resolution is set
+		
 			- Off
 			- 2-Bar
 			- 1-Bar
@@ -1405,36 +1442,36 @@ The CV menu contains the following menu hierarchy:
 			- 32nd-DTTED
 			- 64th-DTTED
 			- 128th-DTTED
-	- Rate
-	- Octaves (OCTA) (NOTE: NOT available for Gate Kit Rows)
-	- Octave Mode (OMOD) (NOTE: NOT available for Gate Kit Rows)
-		- Up
-		- Down
-		- Up & Down (UPDN)
-		- Alternate (ALT)
-		- Random (RAND)
-	- Note Mode (NMOD) (NOTE: NOT available for Gate Kit Rows)
-		- Up
-		- Down
-		- Up & Down (UPDN)
-		- As Played (PLAY)
-		- Random (RAND)
-	- Chord Simulator (CHRD) (NOTE: NOT available for Gate Kit Rows)
-	- Step Repeat (REPE) (NOTE: NOT available for Gate Kit Rows)
-	- Gate
-	- Rhythm (RHYT)
-	- Sequence Length (LENG)
-	- Chord Polyphony (POLY) (NOTE: NOT available for Gate Kit Rows)
-	- Ratchet Amount (RATC)
+		- Rate
+	- Pattern
+		- Octaves (OCTA) (NOTE: NOT available for Gate Kit Rows)
+		- Octave Mode (OMOD) (NOTE: NOT available for Gate Kit Rows)
+			- Up
+			- Down
+			- Up & Down (UPDN)
+			- Alternate (ALT)
+			- Random (RAND)
+		- Chord Simulator (CSIM) (NOTE: NOT available for Gate Kit Rows)
+		- Note Mode (NMOD) (NOTE: NOT available for Gate Kit Rows)
+			- Up
+			- Down
+			- Up & Down (UPDN)
+			- Played Order (PLAY)
+			- Random (RAND)
+		- Step Repeat (REPE) (NOTE: NOT available for Gate Kit Rows)
+		- Rhythm (RHYT)
+		- Sequence Length (LENG)
 	- Randomizer
-		- Ratchet Probability (RPRO)
-		- Note Probability (PROB)
-		- Bass Probability (BASS) (NOTE: NOT available for Gate Kit Rows)
-		- Chord Probability (CHRD) (NOTE: NOT available for Gate Kit Rows)
+		- Lock Randomizer (LOCK)
 		- Octave Spread (OCTA) (NOTE: NOT available for Gate Kit Rows)
 		- Gate Spread (GATE)
 		- Velocity Spread (VELO) (NOTE: NOT available for Gate Kit Rows)
-		- Lock (LOCK)
+		- Ratchet Amount (RATC)
+		- Ratchet Probability (RPRO)
+		- Chord Polyphony (CHRD) (NOTE: NOT available for Gate Kit Rows)
+		- Chord Probability (CPRO) (NOTE: NOT available for Gate Kit Rows)
+		- Note Probability (NOTE)
+		- Bass Probability (BASS) (NOTE: NOT available for Gate Kit Rows)
 	- MPE (NOTE: NOT available for Gate Kit Rows)
 		- Velocity (VELO)
 			- Disabled (OFF)
diff --git a/src/deluge/gui/l10n/english.json b/src/deluge/gui/l10n/english.json
index 2494c78367..e627557537 100644
--- a/src/deluge/gui/l10n/english.json
+++ b/src/deluge/gui/l10n/english.json
@@ -134,8 +134,6 @@
         "STRING_FOR_MODFX_DEPTH": "MOD-FX depth",
         "STRING_FOR_MODFX_RATE": "MOD-FX rate",
 
-        "STRING_FOR_ARP_GATE_MENU_TITLE": "Arp. gate",
-
         "STRING_FOR_PORTAMENTO": "PORTAMENTO",
 
         "STRING_FOR_STUTTER": "STUTTER",
@@ -198,7 +196,7 @@
         "STRING_FOR_RANDOM": "Random",
         "STRING_FOR_CUSTOM": "Custom",
         "STRING_FOR_UP_DOWN": "Up & Down",
-        "STRING_FOR_AS_PLAYED": "As played",
+        "STRING_FOR_AS_PLAYED": "Played Order",
         "STRING_FOR_ALTERNATE": "Alternate",
         "STRING_FOR_ARP": "Arpeggiator",
         "STRING_FOR_SEQUENCE": "Sequencer",
@@ -417,7 +415,7 @@
         "STRING_FOR_CHORD_PROBABILITY": "Chord Probability",
         "STRING_FOR_RATCHET_PROBABILITY": "Ratchet Probability",
         "STRING_FOR_SEQUENCE_LENGTH": "Sequence Length",
-        "STRING_FOR_RANDOMIZER_LOCK": "Lock",
+        "STRING_FOR_RANDOMIZER_LOCK": "Lock Randomizer",
         "STRING_FOR_SPREAD_VELOCITY": "Velocity Spread",
         "STRING_FOR_SPREAD_GATE": "Gate Spread",
         "STRING_FOR_SPREAD_OCTAVE": "Octave Spread",
@@ -558,6 +556,7 @@
         "STRING_FOR_MODE": "MODE",
         "STRING_FOR_ARPEGGIATOR": "ARPEGGIATOR",
         "STRING_FOR_RANDOMIZER": "RANDOMIZER",
+        "STRING_FOR_PATTERN": "PATTERN",
         "STRING_FOR_POLYPHONY": "POLYPHONY",
         "STRING_FOR_MAX_VOICES": "MAX VOICES",
         "STRING_FOR_PRIORITY": "PRIORITY",
@@ -693,8 +692,9 @@
         "STRING_FOR_SAMP_INTERP_MENU_TITLE": "Samp* interp.",
         "STRING_FOR_OSC_P_WIDTH_MENU_TITLE": "Osc* p. width",
         "STRING_FOR_OSC_R_PHASE_MENU_TITLE": "Osc* r. phase",
+        "STRING_FOR_ARP_GATE_MENU_TITLE": "Arp gate",
         "STRING_FOR_ARP_PRESET_MENU_TITLE": "Arp preset",
-        "STRING_FOR_ARP_RANDOMIZER_LOCK_TITLE": "Arp rand lock",
+        "STRING_FOR_ARP_RANDOMIZER_LOCK_TITLE": "Arp lock rand",
         "STRING_FOR_ARP_MODE_MENU_TITLE": "Arp enabled",
         "STRING_FOR_ARP_SYNC_MENU_TITLE": "Arp sync",
         "STRING_FOR_ARP_OCTAVES_MENU_TITLE": "Arp octaves",
diff --git a/src/deluge/gui/l10n/g_english.cpp b/src/deluge/gui/l10n/g_english.cpp
index 6284b24060..80f768fffe 100644
--- a/src/deluge/gui/l10n/g_english.cpp
+++ b/src/deluge/gui/l10n/g_english.cpp
@@ -118,7 +118,6 @@ PLACE_SDRAM_DATA Language english{
         {STRING_FOR_MODFX_FEEDBACK, "MOD-FX feedback"},
         {STRING_FOR_MODFX_DEPTH, "MOD-FX depth"},
         {STRING_FOR_MODFX_RATE, "MOD-FX rate"},
-        {STRING_FOR_ARP_GATE_MENU_TITLE, "Arp. gate"},
         {STRING_FOR_PORTAMENTO, "PORTAMENTO"},
         {STRING_FOR_STUTTER, "STUTTER"},
         {STRING_FOR_STUTTER_RATE, "Stutter Rate"},
@@ -170,7 +169,7 @@ PLACE_SDRAM_DATA Language english{
         {STRING_FOR_RANDOM, "Random"},
         {STRING_FOR_CUSTOM, "Custom"},
         {STRING_FOR_UP_DOWN, "Up & Down"},
-        {STRING_FOR_AS_PLAYED, "As played"},
+        {STRING_FOR_AS_PLAYED, "Played Order"},
         {STRING_FOR_ALTERNATE, "Alternate"},
         {STRING_FOR_ARP, "Arpeggiator"},
         {STRING_FOR_SEQUENCE, "Sequencer"},
@@ -376,7 +375,7 @@ PLACE_SDRAM_DATA Language english{
         {STRING_FOR_CHORD_PROBABILITY, "Chord Probability"},
         {STRING_FOR_RATCHET_PROBABILITY, "Ratchet Probability"},
         {STRING_FOR_SEQUENCE_LENGTH, "Sequence Length"},
-        {STRING_FOR_RANDOMIZER_LOCK, "Lock"},
+        {STRING_FOR_RANDOMIZER_LOCK, "Lock Randomizer"},
         {STRING_FOR_SPREAD_VELOCITY, "Velocity Spread"},
         {STRING_FOR_SPREAD_GATE, "Gate Spread"},
         {STRING_FOR_SPREAD_OCTAVE, "Octave Spread"},
@@ -511,6 +510,7 @@ PLACE_SDRAM_DATA Language english{
         {STRING_FOR_MODE, "MODE"},
         {STRING_FOR_ARPEGGIATOR, "ARPEGGIATOR"},
         {STRING_FOR_RANDOMIZER, "RANDOMIZER"},
+        {STRING_FOR_PATTERN, "PATTERN"},
         {STRING_FOR_POLYPHONY, "POLYPHONY"},
         {STRING_FOR_MAX_VOICES, "MAX VOICES"},
         {STRING_FOR_PRIORITY, "PRIORITY"},
@@ -646,8 +646,9 @@ PLACE_SDRAM_DATA Language english{
         {STRING_FOR_SAMP_INTERP_MENU_TITLE, "Samp* interp."},
         {STRING_FOR_OSC_P_WIDTH_MENU_TITLE, "Osc* p. width"},
         {STRING_FOR_OSC_R_PHASE_MENU_TITLE, "Osc* r. phase"},
+        {STRING_FOR_ARP_GATE_MENU_TITLE, "Arp gate"},
         {STRING_FOR_ARP_PRESET_MENU_TITLE, "Arp preset"},
-        {STRING_FOR_ARP_RANDOMIZER_LOCK_TITLE, "Arp rand lock"},
+        {STRING_FOR_ARP_RANDOMIZER_LOCK_TITLE, "Arp lock rand"},
         {STRING_FOR_ARP_MODE_MENU_TITLE, "Arp enabled"},
         {STRING_FOR_ARP_SYNC_MENU_TITLE, "Arp sync"},
         {STRING_FOR_ARP_OCTAVES_MENU_TITLE, "Arp octaves"},
diff --git a/src/deluge/gui/l10n/g_seven_segment.cpp b/src/deluge/gui/l10n/g_seven_segment.cpp
index 6d0d0c38fa..a5581f7d8a 100644
--- a/src/deluge/gui/l10n/g_seven_segment.cpp
+++ b/src/deluge/gui/l10n/g_seven_segment.cpp
@@ -272,13 +272,13 @@ PLACE_SDRAM_DATA Language seven_segment{
         {STRING_FOR_RHYTHM, "RHYT"},
         {STRING_FOR_NOTE_PROBABILITY, "NOTE"},
         {STRING_FOR_OCTAVE_MODE, "OMOD"},
-        {STRING_FOR_CHORD_SIMULATOR, "CHRD"},
+        {STRING_FOR_CHORD_SIMULATOR, "CSIM"},
         {STRING_FOR_NOTE_MODE, "NMOD"},
         {STRING_FOR_NUMBER_OF_RATCHETS, "RATC"},
         {STRING_FOR_BASS_PROBABILITY, "BASS"},
-        {STRING_FOR_CHORD_POLYPHONY, "POLY"},
-        {STRING_FOR_CHORD_PROBABILITY, "CHRD"},
-        {STRING_FOR_RATCHET_PROBABILITY, "RATC"},
+        {STRING_FOR_CHORD_POLYPHONY, "CHRD"},
+        {STRING_FOR_CHORD_PROBABILITY, "CPRO"},
+        {STRING_FOR_RATCHET_PROBABILITY, "RPRO"},
         {STRING_FOR_SEQUENCE_LENGTH, "LENG"},
         {STRING_FOR_AMOUNT_LEVEL, "AMOUNT"},
         {STRING_FOR_SHAPE, "TYPE"},
diff --git a/src/deluge/gui/l10n/seven_segment.json b/src/deluge/gui/l10n/seven_segment.json
index 84931b2169..c9a261e81b 100644
--- a/src/deluge/gui/l10n/seven_segment.json
+++ b/src/deluge/gui/l10n/seven_segment.json
@@ -281,13 +281,13 @@
         "STRING_FOR_RHYTHM": "RHYT",
         "STRING_FOR_NOTE_PROBABILITY": "NOTE",
         "STRING_FOR_OCTAVE_MODE": "OMOD",
-        "STRING_FOR_CHORD_SIMULATOR": "CHRD",
+        "STRING_FOR_CHORD_SIMULATOR": "CSIM",
         "STRING_FOR_NOTE_MODE": "NMOD",
         "STRING_FOR_NUMBER_OF_RATCHETS": "RATC",
         "STRING_FOR_BASS_PROBABILITY": "BASS",
-        "STRING_FOR_CHORD_POLYPHONY": "POLY",
-        "STRING_FOR_CHORD_PROBABILITY": "CHRD",
-        "STRING_FOR_RATCHET_PROBABILITY": "RATC",
+        "STRING_FOR_CHORD_POLYPHONY": "CHRD",
+        "STRING_FOR_CHORD_PROBABILITY": "CPRO",
+        "STRING_FOR_RATCHET_PROBABILITY": "RPRO",
         "STRING_FOR_SEQUENCE_LENGTH": "LENG",
         "STRING_FOR_AMOUNT_LEVEL": "AMOUNT",
         "STRING_FOR_SHAPE": "TYPE",
diff --git a/src/deluge/gui/l10n/strings.h b/src/deluge/gui/l10n/strings.h
index acd36975fb..49ee08abf2 100644
--- a/src/deluge/gui/l10n/strings.h
+++ b/src/deluge/gui/l10n/strings.h
@@ -544,6 +544,7 @@ enum class String : size_t {
 	STRING_FOR_PRESET,
 	STRING_FOR_ARPEGGIATOR,
 	STRING_FOR_RANDOMIZER,
+	STRING_FOR_PATTERN,
 	STRING_FOR_POLYPHONY,
 	STRING_FOR_PORTAMENTO,
 	STRING_FOR_PRIORITY,
diff --git a/src/deluge/gui/menu_item/unpatched_param/sound_unpatched_param.h b/src/deluge/gui/menu_item/arpeggiator/arp_unpatched_param.h
similarity index 76%
rename from src/deluge/gui/menu_item/unpatched_param/sound_unpatched_param.h
rename to src/deluge/gui/menu_item/arpeggiator/arp_unpatched_param.h
index 2701bccd80..6522c03c22 100644
--- a/src/deluge/gui/menu_item/unpatched_param/sound_unpatched_param.h
+++ b/src/deluge/gui/menu_item/arpeggiator/arp_unpatched_param.h
@@ -19,20 +19,26 @@
 #include "gui/ui/sound_editor.h"
 
 namespace deluge::gui::menu_item::arpeggiator {
-class OnlyForSoundUnpatchedParam final : public UnpatchedParam {
+class ArpSoundUnpatchedParam final : public UnpatchedParam {
 public:
 	using UnpatchedParam::UnpatchedParam;
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return !soundEditor.editingCVOrMIDIClip() && !soundEditor.editingNonAudioDrumRow();
 	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
 };
 
-class OnlyForNonKitSoundUnpatchedParam final : public UnpatchedParam {
+class ArpNonKitSoundUnpatchedParam final : public UnpatchedParam {
 public:
 	using UnpatchedParam::UnpatchedParam;
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return !soundEditor.editingCVOrMIDIClip() && !soundEditor.editingKit();
 	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
 };
 
 } // namespace deluge::gui::menu_item::arpeggiator
diff --git a/src/deluge/gui/menu_item/arpeggiator/chord_type.h b/src/deluge/gui/menu_item/arpeggiator/chord_type.h
index 602ae85a74..1726912a65 100644
--- a/src/deluge/gui/menu_item/arpeggiator/chord_type.h
+++ b/src/deluge/gui/menu_item/arpeggiator/chord_type.h
@@ -38,6 +38,9 @@ class ChordType : public Selection {
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return soundEditor.editingKit() && !soundEditor.editingGateDrumRow();
 	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
 
 	deluge::vector<std::string_view> getOptions(OptType optType) override {
 		(void)optType;
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/arp_integer.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/arp_integer.h
new file mode 100644
index 0000000000..e4c4849351
--- /dev/null
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/arp_integer.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014-2023 Synthstrom Audible Limited
+ *
+ * This file is part of The Synthstrom Audible Deluge Firmware.
+ *
+ * The Synthstrom Audible Deluge Firmware is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "gui/menu_item/integer.h"
+#include "gui/ui/sound_editor.h"
+
+namespace deluge::gui::menu_item::arpeggiator::midi_cv {
+class ArpNonSoundInteger : public Integer {
+public:
+	using Integer::Integer;
+	[[nodiscard]] int32_t getMinValue() const override { return kMinMenuValue; }
+	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
+	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
+		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
+	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
+};
+} // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/bass_probability.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/bass_probability.h
index 75919e313f..af4cf11265 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/bass_probability.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/bass_probability.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class BassProbability final : public Integer {
+class BassProbability final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->bassProbability));
 	}
@@ -32,7 +32,6 @@ class BassProbability final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->bassProbability = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingMidiDrumRow();
 	}
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_polyphony.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_polyphony.h
index b03c5d9d52..5583ad4be2 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_polyphony.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_polyphony.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class ChordPolyphony final : public Integer {
+class ChordPolyphony final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->chordPolyphony));
 	}
@@ -32,7 +32,6 @@ class ChordPolyphony final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->chordPolyphony = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return soundEditor.editingCVOrMIDIClip();
 	}
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_probability.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_probability.h
index 43d0099753..2d03438c6e 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_probability.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/chord_probability.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class ChordProbability final : public Integer {
+class ChordProbability final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->chordProbability));
 	}
@@ -32,7 +32,6 @@ class ChordProbability final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->chordProbability = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return soundEditor.editingCVOrMIDIClip();
 	}
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/gate.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/gate.h
index 4e08a54d2b..17c031434f 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/gate.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/gate.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class Gate final : public Integer {
+class Gate final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForStandardMenuItem(soundEditor.currentArpSettings->gate));
 	}
@@ -32,9 +32,5 @@ class Gate final : public Integer {
 		int32_t value = computeFinalValueForStandardMenuItem(this->getValue());
 		soundEditor.currentArpSettings->gate = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/note_probability.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/note_probability.h
index 275f791d85..d2ff7c6995 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/note_probability.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/note_probability.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class NoteProbability final : public Integer {
+class NoteProbability final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->noteProbability));
 	}
@@ -32,9 +32,5 @@ class NoteProbability final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->noteProbability = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_amount.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_amount.h
index bf60d6f315..da93e4cf1d 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_amount.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_amount.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class RatchetAmount final : public Integer {
+class RatchetAmount final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->ratchetAmount));
 	}
@@ -32,9 +32,5 @@ class RatchetAmount final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->ratchetAmount = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_probability.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_probability.h
index 19a2bd3540..56a4643f8a 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_probability.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/ratchet_probability.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class RatchetProbability final : public Integer {
+class RatchetProbability final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->ratchetProbability));
 	}
@@ -32,9 +32,5 @@ class RatchetProbability final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->ratchetProbability = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/rate.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/rate.h
index 1985408247..6cfe659353 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/rate.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/rate.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class Rate final : public Integer {
+class Rate final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForStandardMenuItem(soundEditor.currentArpSettings->rate));
 	}
@@ -32,9 +32,9 @@ class Rate final : public Integer {
 		int32_t value = computeFinalValueForStandardMenuItem(this->getValue());
 		soundEditor.currentArpSettings->rate = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
+		return (soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow())
+		       && soundEditor.currentArpSettings->syncLevel == SYNC_LEVEL_NONE;
 	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/rhythm.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/rhythm.h
index c89cb7dd2e..139de8ce17 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/rhythm.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/rhythm.h
@@ -16,7 +16,7 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "hid/display/oled.h"
@@ -24,9 +24,9 @@
 #include "modulation/arpeggiator_rhythms.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class Rhythm final : public Integer {
+class Rhythm final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->rhythm));
 	}
@@ -34,10 +34,6 @@ class Rhythm final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->rhythm = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxPresetArpRhythm; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 
 	void drawValue() override { display->setScrollingText(arpRhythmPatternNames[this->getValue()]); }
 
@@ -47,5 +43,33 @@ class Rhythm final : public Integer {
 		canvas.drawStringCentred(arpRhythmPatternNames[this->getValue()], yPixel + OLED_MAIN_TOPMOST_PIXEL, textWidth,
 		                         textHeight);
 	}
+
+	void renderInHorizontalMenu(int32_t startX, int32_t width, int32_t startY, int32_t height) override {
+		deluge::hid::display::oled_canvas::Canvas& image = deluge::hid::display::OLED::main;
+
+		renderColumnLabel(startX, width, startY);
+
+		// Render current value
+
+		DEF_STACK_STRING_BUF(shortOpt, kShortStringBufferSize);
+		if (soundEditor.editingKit() && !soundEditor.editingGateDrumRow()) {
+			shortOpt.append(arpRhythmPatternNames[this->getValue()]);
+		}
+		else {
+			char name[12];
+			// Index:Name
+			snprintf(name, sizeof(name), "%d: %s", this->getValue(), arpRhythmPatternNames[this->getValue()]);
+			shortOpt.append(name);
+		}
+		int32_t pxLen;
+		// Trim characters from the end until it fits.
+		while ((pxLen = image.getStringWidthInPixels(shortOpt.c_str(), kTextSpacingY)) >= width) {
+			shortOpt.truncate(shortOpt.size() - 1);
+		}
+		// Padding to center the string. If we can't center exactly, 1px right is better than 1px left.
+		int32_t pad = (width + 1 - pxLen) / 2;
+		image.drawString(shortOpt.c_str(), startX + pad, startY + kTextSpacingY + 2, kTextSpacingX, kTextSpacingY, 0,
+		                 startX + width - kTextSpacingX);
+	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/sequence_length.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/sequence_length.h
index e10450c1aa..a64401824a 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/sequence_length.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/sequence_length.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class SequenceLength final : public Integer {
+class SequenceLength final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->sequenceLength));
 	}
@@ -32,9 +32,5 @@ class SequenceLength final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->sequenceLength = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_gate.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_gate.h
index da4cad672f..72f9bbc799 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_gate.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_gate.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class SpreadGate final : public Integer {
+class SpreadGate final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->spreadGate));
 	}
@@ -32,9 +32,5 @@ class SpreadGate final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->spreadGate = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
-	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingNonAudioDrumRow();
-	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator::midi_cv
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_octave.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_octave.h
index 96be45e042..bf7d1f0229 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_octave.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_octave.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class SpreadOctave final : public Integer {
+class SpreadOctave final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->spreadOctave));
 	}
@@ -32,7 +32,6 @@ class SpreadOctave final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->spreadOctave = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingMidiDrumRow();
 	}
diff --git a/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_velocity.h b/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_velocity.h
index 9e346e0651..0f307f6053 100644
--- a/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_velocity.h
+++ b/src/deluge/gui/menu_item/arpeggiator/midi_cv/spread_velocity.h
@@ -16,15 +16,15 @@
  */
 #pragma once
 #include "definitions_cxx.hpp"
-#include "gui/menu_item/integer.h"
+#include "gui/menu_item/arpeggiator/midi_cv/arp_integer.h"
 #include "gui/menu_item/value_scaling.h"
 #include "gui/ui/sound_editor.h"
 #include "model/song/song.h"
 
 namespace deluge::gui::menu_item::arpeggiator::midi_cv {
-class SpreadVelocity final : public Integer {
+class SpreadVelocity final : public ArpNonSoundInteger {
 public:
-	using Integer::Integer;
+	using ArpNonSoundInteger::ArpNonSoundInteger;
 	void readCurrentValue() override {
 		this->setValue(computeCurrentValueForUnsignedMenuItem(soundEditor.currentArpSettings->spreadVelocity));
 	}
@@ -32,7 +32,6 @@ class SpreadVelocity final : public Integer {
 		int32_t value = computeFinalValueForUnsignedMenuItem(this->getValue());
 		soundEditor.currentArpSettings->spreadVelocity = value;
 	}
-	[[nodiscard]] int32_t getMaxValue() const override { return kMaxMenuValue; }
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return soundEditor.editingCVOrMIDIClip() || soundEditor.editingMidiDrumRow();
 	}
diff --git a/src/deluge/gui/menu_item/arpeggiator/mode.h b/src/deluge/gui/menu_item/arpeggiator/mode.h
index 69ea0f5f76..4bedf60bc2 100644
--- a/src/deluge/gui/menu_item/arpeggiator/mode.h
+++ b/src/deluge/gui/menu_item/arpeggiator/mode.h
@@ -68,7 +68,7 @@ class Mode final : public Selection {
 		using enum l10n::String;
 		return {
 		    l10n::getView(STRING_FOR_OFF), //<
-		    l10n::getView(STRING_FOR_ARP), //<
+		    l10n::getView(STRING_FOR_ON),  //<
 		};
 	}
 
diff --git a/src/deluge/gui/menu_item/arpeggiator/note_mode.h b/src/deluge/gui/menu_item/arpeggiator/note_mode.h
index 90ce916c20..e717276955 100644
--- a/src/deluge/gui/menu_item/arpeggiator/note_mode.h
+++ b/src/deluge/gui/menu_item/arpeggiator/note_mode.h
@@ -35,6 +35,9 @@ class NoteMode : public Selection {
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return !soundEditor.editingGateDrumRow();
 	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
 
 	deluge::vector<std::string_view> getOptions(OptType optType) override {
 		(void)optType;
diff --git a/src/deluge/gui/menu_item/arpeggiator/octave_mode.h b/src/deluge/gui/menu_item/arpeggiator/octave_mode.h
index 59535021db..10adb8ad2b 100644
--- a/src/deluge/gui/menu_item/arpeggiator/octave_mode.h
+++ b/src/deluge/gui/menu_item/arpeggiator/octave_mode.h
@@ -35,6 +35,9 @@ class OctaveMode : public Selection {
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return !soundEditor.editingGateDrumRow();
 	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
 
 	deluge::vector<std::string_view> getOptions(OptType optType) override {
 		(void)optType;
diff --git a/src/deluge/gui/menu_item/arpeggiator/randomizer_lock.h b/src/deluge/gui/menu_item/arpeggiator/randomizer_lock.h
index a7243290f7..225d7b2847 100644
--- a/src/deluge/gui/menu_item/arpeggiator/randomizer_lock.h
+++ b/src/deluge/gui/menu_item/arpeggiator/randomizer_lock.h
@@ -35,8 +35,8 @@ class RandomizerLock final : public Selection {
 		(void)optType;
 		using enum l10n::String;
 		return {
-		    l10n::getView(STRING_FOR_DISABLED), //<
-		    l10n::getView(STRING_FOR_ENABLED),  //<
+		    l10n::getView(STRING_FOR_OFF), //<
+		    l10n::getView(STRING_FOR_ON),  //<
 		};
 	}
 
diff --git a/src/deluge/gui/menu_item/arpeggiator/rate.h b/src/deluge/gui/menu_item/arpeggiator/rate.h
index 1886a9dc29..4c5ba888dc 100644
--- a/src/deluge/gui/menu_item/arpeggiator/rate.h
+++ b/src/deluge/gui/menu_item/arpeggiator/rate.h
@@ -23,7 +23,8 @@ class Rate final : public patched_param::Integer {
 public:
 	using patched_param::Integer::Integer;
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
-		return !soundEditor.editingCVOrMIDIClip() && !soundEditor.editingNonAudioDrumRow();
+		return !soundEditor.editingCVOrMIDIClip() && !soundEditor.editingNonAudioDrumRow()
+		       && soundEditor.currentArpSettings->syncLevel == SYNC_LEVEL_NONE;
 	}
 };
 
diff --git a/src/deluge/gui/menu_item/arpeggiator/rhythm.h b/src/deluge/gui/menu_item/arpeggiator/rhythm.h
index 12c2e34147..e19fbba59a 100644
--- a/src/deluge/gui/menu_item/arpeggiator/rhythm.h
+++ b/src/deluge/gui/menu_item/arpeggiator/rhythm.h
@@ -20,6 +20,7 @@
 #include "hid/display/display.h"
 #include "hid/display/oled.h"
 #include "modulation/arpeggiator_rhythms.h"
+#include <sys/_intsup.h>
 
 namespace deluge::gui::menu_item::arpeggiator {
 class Rhythm final : public UnpatchedParam {
@@ -33,13 +34,42 @@ class Rhythm final : public UnpatchedParam {
 
 	void drawInteger(int32_t textWidth, int32_t textHeight, int32_t yPixel) override {
 		char name[12];
-		deluge::hid::display::oled_canvas::Canvas& canvas = hid::display::OLED::main;
-
 		// Index: Name
 		snprintf(name, sizeof(name), "%d: %s", this->getValue(), arpRhythmPatternNames[this->getValue()]);
+
+		deluge::hid::display::oled_canvas::Canvas& canvas = hid::display::OLED::main;
 		canvas.drawStringCentred(name, yPixel + OLED_MAIN_TOPMOST_PIXEL, textWidth, textHeight);
 	}
 
+	void renderInHorizontalMenu(int32_t startX, int32_t width, int32_t startY, int32_t height) override {
+		deluge::hid::display::oled_canvas::Canvas& image = deluge::hid::display::OLED::main;
+
+		renderColumnLabel(startX, width, startY);
+
+		// Render current value
+
+		DEF_STACK_STRING_BUF(shortOpt, kShortStringBufferSize);
+		if (soundEditor.editingKit() && !soundEditor.editingGateDrumRow()) {
+			shortOpt.append(arpRhythmPatternNames[this->getValue()]);
+		}
+		else {
+			char name[12];
+			// Index:Name
+			snprintf(name, sizeof(name), "%d: %s", this->getValue(), arpRhythmPatternNames[this->getValue()]);
+			shortOpt.append(name);
+		}
+
+		int32_t pxLen;
+		// Trim characters from the end until it fits.
+		while ((pxLen = image.getStringWidthInPixels(shortOpt.c_str(), kTextSpacingY)) >= width) {
+			shortOpt.truncate(shortOpt.size() - 1);
+		}
+		// Padding to center the string. If we can't center exactly, 1px right is better than 1px left.
+		int32_t pad = (width + 1 - pxLen) / 2;
+		image.drawString(shortOpt.c_str(), startX + pad, startY + kTextSpacingY + 2, kTextSpacingX, kTextSpacingY, 0,
+		                 startX + width - kTextSpacingX);
+	}
+
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return !soundEditor.editingCVOrMIDIClip() && !soundEditor.editingNonAudioDrumRow();
 	}
diff --git a/src/deluge/gui/menu_item/arpeggiator/step_repeat.h b/src/deluge/gui/menu_item/arpeggiator/step_repeat.h
index 32e6052f1b..bec26646b9 100644
--- a/src/deluge/gui/menu_item/arpeggiator/step_repeat.h
+++ b/src/deluge/gui/menu_item/arpeggiator/step_repeat.h
@@ -29,5 +29,8 @@ class StepRepeat final : public Integer {
 	bool isRelevant(ModControllableAudio* modControllable, int32_t whichThing) override {
 		return !soundEditor.editingGateDrumRow();
 	}
+	void getColumnLabel(StringBuf& label) override {
+		label.append(deluge::l10n::getView(deluge::l10n::built_in::seven_segment, this->name).data());
+	}
 };
 } // namespace deluge::gui::menu_item::arpeggiator
diff --git a/src/deluge/gui/menu_item/submenu.cpp b/src/deluge/gui/menu_item/submenu.cpp
index b4a92da834..7d4a7e7ff6 100644
--- a/src/deluge/gui/menu_item/submenu.cpp
+++ b/src/deluge/gui/menu_item/submenu.cpp
@@ -118,7 +118,7 @@ void Submenu::drawHorizontalMenu() {
 	}
 
 	int32_t boxHeight = OLED_MAIN_VISIBLE_HEIGHT - baseY;
-	int32_t boxWidth = OLED_MAIN_WIDTH_PIXELS / pageSize;
+	int32_t boxWidth = OLED_MAIN_WIDTH_PIXELS / std::min<int32_t>(nTotal - pageStart, 4);
 
 	// Render the page
 	for (size_t n = 0; n < pageSize && it != items.end(); n++) {
diff --git a/src/deluge/gui/menu_item/sync_level.cpp b/src/deluge/gui/menu_item/sync_level.cpp
index 57cdba8fbc..31821c4cac 100644
--- a/src/deluge/gui/menu_item/sync_level.cpp
+++ b/src/deluge/gui/menu_item/sync_level.cpp
@@ -25,7 +25,7 @@ namespace deluge::gui::menu_item {
 
 void SyncLevel::drawValue() {
 	if (this->getValue() == 0) {
-		display->setText(l10n::get(l10n::String::STRING_FOR_DISABLED));
+		display->setText(l10n::get(l10n::String::STRING_FOR_OFF));
 	}
 	else {
 		StringBuf buffer{shortStringBuffer, kShortStringBufferSize};
diff --git a/src/deluge/gui/ui/menus.cpp b/src/deluge/gui/ui/menus.cpp
index df00ceed5a..b5aa6fc55b 100644
--- a/src/deluge/gui/ui/menus.cpp
+++ b/src/deluge/gui/ui/menus.cpp
@@ -1,5 +1,6 @@
 #include "gui/l10n/strings.h"
 #include "gui/menu_item/active_scales.h"
+#include "gui/menu_item/arpeggiator/arp_unpatched_param.h"
 #include "gui/menu_item/arpeggiator/chord_type.h"
 #include "gui/menu_item/arpeggiator/midi_cv/bass_probability.h"
 #include "gui/menu_item/arpeggiator/midi_cv/chord_polyphony.h"
@@ -187,7 +188,6 @@
 #include "gui/menu_item/unison/stereoSpread.h"
 #include "gui/menu_item/unpatched_param.h"
 #include "gui/menu_item/unpatched_param/pan.h"
-#include "gui/menu_item/unpatched_param/sound_unpatched_param.h"
 #include "gui/menu_item/unpatched_param/updating_reverb_params.h"
 #include "gui/menu_item/voice/polyphony.h"
 #include "gui/menu_item/voice/priority.h"
@@ -233,62 +233,87 @@ arpeggiator::NoteModeFromOctaveMode arpeggiator::arpNoteModeFromOctaveModeMenu{S
 arpeggiator::ChordType arpChordSimulatorMenuKit{STRING_FOR_CHORD_SIMULATOR, STRING_FOR_ARP_CHORD_SIMULATOR_MENU_TITLE};
 arpeggiator::StepRepeat arpStepRepeatMenu{STRING_FOR_STEP_REPEAT, STRING_FOR_ARP_STEP_REPEAT_MENU_TITLE};
 // Note and rhythm settings
-arpeggiator::OnlyForSoundUnpatchedParam arpGateMenu{STRING_FOR_GATE, STRING_FOR_ARP_GATE_MENU_TITLE,
-                                                    params::UNPATCHED_ARP_GATE};
+arpeggiator::ArpSoundUnpatchedParam arpGateMenu{STRING_FOR_GATE, STRING_FOR_ARP_GATE_MENU_TITLE,
+                                                params::UNPATCHED_ARP_GATE};
 arpeggiator::midi_cv::Gate arpGateMenuMIDIOrCV{STRING_FOR_GATE, STRING_FOR_ARP_GATE_MENU_TITLE};
 arpeggiator::Rhythm arpRhythmMenu{STRING_FOR_RHYTHM, STRING_FOR_ARP_RHYTHM_MENU_TITLE, params::UNPATCHED_ARP_RHYTHM};
 arpeggiator::midi_cv::Rhythm arpRhythmMenuMIDIOrCV{STRING_FOR_RHYTHM, STRING_FOR_ARP_RHYTHM_MENU_TITLE};
-arpeggiator::OnlyForNonKitSoundUnpatchedParam arpChordPolyphonyMenu{
+arpeggiator::ArpNonKitSoundUnpatchedParam arpChordPolyphonyMenu{
     STRING_FOR_CHORD_POLYPHONY, STRING_FOR_ARP_CHORD_POLYPHONY_MENU_TITLE, params::UNPATCHED_ARP_CHORD_POLYPHONY};
 arpeggiator::midi_cv::ChordPolyphony arpChordPolyphonyMenuMIDIOrCV{STRING_FOR_CHORD_POLYPHONY,
                                                                    STRING_FOR_ARP_CHORD_POLYPHONY_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpSequenceLengthMenu{
+arpeggiator::ArpSoundUnpatchedParam arpSequenceLengthMenu{
     STRING_FOR_SEQUENCE_LENGTH, STRING_FOR_ARP_SEQUENCE_LENGTH_MENU_TITLE, params::UNPATCHED_ARP_SEQUENCE_LENGTH};
 arpeggiator::midi_cv::SequenceLength arpSequenceLengthMenuMIDIOrCV{STRING_FOR_SEQUENCE_LENGTH,
                                                                    STRING_FOR_ARP_SEQUENCE_LENGTH_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpRatchetAmountMenu{
+arpeggiator::ArpSoundUnpatchedParam arpRatchetAmountMenu{
     STRING_FOR_NUMBER_OF_RATCHETS, STRING_FOR_ARP_RATCHETS_MENU_TITLE, params::UNPATCHED_ARP_RATCHET_AMOUNT};
 arpeggiator::midi_cv::RatchetAmount arpRatchetAmountMenuMIDIOrCV{STRING_FOR_NUMBER_OF_RATCHETS,
                                                                  STRING_FOR_ARP_RATCHETS_MENU_TITLE};
 // Randomizer
 arpeggiator::RandomizerLock arpRandomizerLockMenu{STRING_FOR_RANDOMIZER_LOCK, STRING_FOR_ARP_RANDOMIZER_LOCK_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpNoteProbabilityMenu{
+arpeggiator::ArpSoundUnpatchedParam arpNoteProbabilityMenu{
     STRING_FOR_NOTE_PROBABILITY, STRING_FOR_ARP_NOTE_PROBABILITY_MENU_TITLE, params::UNPATCHED_ARP_NOTE_PROBABILITY};
 arpeggiator::midi_cv::NoteProbability arpNoteProbabilityMenuMIDIOrCV{STRING_FOR_NOTE_PROBABILITY,
                                                                      STRING_FOR_ARP_NOTE_PROBABILITY_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpBassProbabilityMenu{
+arpeggiator::ArpSoundUnpatchedParam arpBassProbabilityMenu{
     STRING_FOR_BASS_PROBABILITY, STRING_FOR_ARP_BASS_PROBABILITY_MENU_TITLE, params::UNPATCHED_ARP_BASS_PROBABILITY};
 arpeggiator::midi_cv::BassProbability arpBassProbabilityMenuMIDIOrCV{STRING_FOR_BASS_PROBABILITY,
                                                                      STRING_FOR_ARP_BASS_PROBABILITY_MENU_TITLE};
-arpeggiator::OnlyForNonKitSoundUnpatchedParam arpChordProbabilityMenu{
+arpeggiator::ArpNonKitSoundUnpatchedParam arpChordProbabilityMenu{
     STRING_FOR_CHORD_PROBABILITY, STRING_FOR_ARP_CHORD_PROBABILITY_MENU_TITLE, params::UNPATCHED_ARP_CHORD_PROBABILITY};
 arpeggiator::midi_cv::ChordProbability arpChordProbabilityMenuMIDIOrCV{STRING_FOR_CHORD_PROBABILITY,
                                                                        STRING_FOR_ARP_CHORD_PROBABILITY_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpRatchetProbabilityMenu{STRING_FOR_RATCHET_PROBABILITY,
-                                                                  STRING_FOR_ARP_RATCHET_PROBABILITY_MENU_TITLE,
-                                                                  params::UNPATCHED_ARP_RATCHET_PROBABILITY};
+arpeggiator::ArpSoundUnpatchedParam arpRatchetProbabilityMenu{STRING_FOR_RATCHET_PROBABILITY,
+                                                              STRING_FOR_ARP_RATCHET_PROBABILITY_MENU_TITLE,
+                                                              params::UNPATCHED_ARP_RATCHET_PROBABILITY};
 arpeggiator::midi_cv::RatchetProbability arpRatchetProbabilityMenuMIDIOrCV{
     STRING_FOR_RATCHET_PROBABILITY, STRING_FOR_ARP_RATCHET_PROBABILITY_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpSpreadVelocityMenu{
+arpeggiator::ArpSoundUnpatchedParam arpSpreadVelocityMenu{
     STRING_FOR_SPREAD_VELOCITY, STRING_FOR_ARP_SPREAD_VELOCITY_MENU_TITLE, params::UNPATCHED_SPREAD_VELOCITY};
 arpeggiator::midi_cv::SpreadVelocity arpSpreadVelocityMenuMIDIOrCV{STRING_FOR_SPREAD_VELOCITY,
                                                                    STRING_FOR_ARP_SPREAD_VELOCITY_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpSpreadGateMenu{STRING_FOR_SPREAD_GATE, STRING_FOR_ARP_SPREAD_GATE_MENU_TITLE,
-                                                          params::UNPATCHED_ARP_SPREAD_GATE};
+arpeggiator::ArpSoundUnpatchedParam arpSpreadGateMenu{STRING_FOR_SPREAD_GATE, STRING_FOR_ARP_SPREAD_GATE_MENU_TITLE,
+                                                      params::UNPATCHED_ARP_SPREAD_GATE};
 arpeggiator::midi_cv::SpreadGate arpSpreadGateMenuMIDIOrCV{STRING_FOR_SPREAD_GATE,
                                                            STRING_FOR_ARP_SPREAD_GATE_MENU_TITLE};
-arpeggiator::OnlyForSoundUnpatchedParam arpSpreadOctaveMenu{
+arpeggiator::ArpSoundUnpatchedParam arpSpreadOctaveMenu{
     STRING_FOR_SPREAD_OCTAVE, STRING_FOR_ARP_SPREAD_OCTAVE_MENU_TITLE, params::UNPATCHED_ARP_SPREAD_OCTAVE};
 arpeggiator::midi_cv::SpreadOctave arpSpreadOctaveMenuMIDIOrCV{STRING_FOR_SPREAD_OCTAVE,
                                                                STRING_FOR_ARP_SPREAD_OCTAVE_MENU_TITLE};
 
+// Arp: Basic
+HorizontalMenu arpBasicMenu{STRING_FOR_BASIC,
+                            {// Gate
+                             &arpGateMenu, &arpGateMenuMIDIOrCV,
+                             // Sync
+                             &arpSyncMenu, &arpRateMenu, &arpRateMenuMIDIOrCV}};
+// Arp: Pattern
+HorizontalMenu arpPatternMenu{
+    STRING_FOR_PATTERN,
+    {// Pattern
+     &arpOctavesMenu, &arpOctaveModeMenu, &arpChordSimulatorMenuKit, &arpNoteModeMenu, &arpStepRepeatMenu,
+     // Note and rhythm settings
+     &arpRhythmMenu, &arpRhythmMenuMIDIOrCV, &arpSequenceLengthMenu, &arpSequenceLengthMenuMIDIOrCV}};
 // Arp: Randomizer
-Submenu arpRandomizerMenu{STRING_FOR_RANDOMIZER,
-                          {&arpRatchetProbabilityMenu, &arpRatchetProbabilityMenuMIDIOrCV, &arpNoteProbabilityMenu,
-                           &arpNoteProbabilityMenuMIDIOrCV, &arpBassProbabilityMenu, &arpBassProbabilityMenuMIDIOrCV,
-                           &arpChordProbabilityMenu, &arpChordProbabilityMenuMIDIOrCV, &arpSpreadOctaveMenu,
-                           &arpSpreadOctaveMenuMIDIOrCV, &arpSpreadGateMenu, &arpSpreadGateMenuMIDIOrCV,
-                           &arpSpreadVelocityMenu, &arpSpreadVelocityMenuMIDIOrCV, &arpRandomizerLockMenu}};
+HorizontalMenu arpRandomizerMenu{STRING_FOR_RANDOMIZER,
+                                 {// Lock
+                                  &arpRandomizerLockMenu,
+                                  // Spreads
+                                  &arpSpreadOctaveMenu, &arpSpreadOctaveMenuMIDIOrCV, &arpSpreadGateMenu,
+                                  &arpSpreadGateMenuMIDIOrCV, &arpSpreadVelocityMenu, &arpSpreadVelocityMenuMIDIOrCV,
+                                  // Ratchets
+                                  &arpRatchetAmountMenu, &arpRatchetAmountMenuMIDIOrCV, &arpRatchetProbabilityMenu,
+                                  &arpRatchetProbabilityMenuMIDIOrCV,
+                                  // Chords
+                                  &arpChordPolyphonyMenu, &arpChordPolyphonyMenuMIDIOrCV, &arpChordProbabilityMenu,
+                                  &arpChordProbabilityMenuMIDIOrCV,
+                                  // Note
+                                  &arpNoteProbabilityMenu, &arpNoteProbabilityMenuMIDIOrCV,
+                                  // Bass
+                                  &arpBassProbabilityMenu, &arpBassProbabilityMenuMIDIOrCV}};
+// Arp: Preset and Randomizer
+HorizontalMenu arpPresetAndRandomizerMenu{STRING_FOR_ARPEGGIATOR, {&arpPresetModeMenu, &arpRandomizerMenu}};
 // Global: Randomizer
 Submenu globalRandomizerMenu{STRING_FOR_RANDOMIZER, {&arpSpreadVelocityMenu, &arpSpreadVelocityMenuMIDIOrCV}};
 // Arp: MPE
@@ -300,27 +325,10 @@ Submenu arpMenu{
     {
         // Mode
         &arpModeMenu,
-        // Sync
-        &arpSyncMenu,
-        &arpRateMenu,
-        &arpRateMenuMIDIOrCV,
+        // Basic
+        &arpBasicMenu,
         // Pattern
-        &arpOctavesMenu,
-        &arpOctaveModeMenu,
-        &arpNoteModeMenu,
-        &arpChordSimulatorMenuKit,
-        &arpStepRepeatMenu,
-        // Note and rhythm settings
-        &arpGateMenu,
-        &arpGateMenuMIDIOrCV,
-        &arpRhythmMenu,
-        &arpRhythmMenuMIDIOrCV,
-        &arpSequenceLengthMenu,
-        &arpSequenceLengthMenuMIDIOrCV,
-        &arpChordPolyphonyMenu,
-        &arpChordPolyphonyMenuMIDIOrCV,
-        &arpRatchetAmountMenu,
-        &arpRatchetAmountMenuMIDIOrCV,
+        &arpPatternMenu,
         // Randomizer
         &arpRandomizerMenu,
         // MPE
@@ -355,14 +363,14 @@ lfo::Type lfo1TypeMenu{STRING_FOR_SHAPE, STRING_FOR_LFO1_TYPE, LFO1_ID};
 lfo::Rate lfo1RateMenu{STRING_FOR_RATE, STRING_FOR_LFO1_RATE, params::GLOBAL_LFO_FREQ, LFO1_ID};
 lfo::Sync lfo1SyncMenu{STRING_FOR_SYNC, STRING_FOR_LFO1_SYNC, LFO1_ID};
 
-HorizontalMenu lfo1Menu{STRING_FOR_LFO1, {&lfo1TypeMenu, &lfo1RateMenu, &lfo1SyncMenu}};
+HorizontalMenu lfo1Menu{STRING_FOR_LFO1, {&lfo1TypeMenu, &lfo1SyncMenu, &lfo1RateMenu}};
 
 // LFO2 menu ---------------------------------------------------------------------------------
 lfo::Type lfo2TypeMenu{STRING_FOR_SHAPE, STRING_FOR_LFO2_TYPE, LFO2_ID};
 lfo::Rate lfo2RateMenu{STRING_FOR_RATE, STRING_FOR_LFO2_RATE, params::LOCAL_LFO_LOCAL_FREQ, LFO2_ID};
 lfo::Sync lfo2SyncMenu{STRING_FOR_SYNC, STRING_FOR_LFO2_SYNC, LFO2_ID};
 
-HorizontalMenu lfo2Menu{STRING_FOR_LFO2, {&lfo2TypeMenu, &lfo2RateMenu, &lfo2SyncMenu}};
+HorizontalMenu lfo2Menu{STRING_FOR_LFO2, {&lfo2TypeMenu, &lfo2SyncMenu, &lfo2RateMenu}};
 
 // Mod FX ----------------------------------------------------------------------------------
 mod_fx::Type modFXTypeMenu{STRING_FOR_TYPE, STRING_FOR_MODFX_TYPE};
@@ -791,9 +799,20 @@ const MenuItem* midiOrCVParamShortcuts[kDisplayHeight] = {
     nullptr,
     nullptr,
 };
+const Submenu* parentsForMidiOrCVParamShortcuts[kDisplayHeight] = {
+    &arpBasicMenu, &arpBasicMenu, &arpBasicMenu, &arpPatternMenu, &arpPresetAndRandomizerMenu,
+    nullptr,       nullptr,       nullptr,
+};
 
 const MenuItem* gateDrumParamShortcuts[8] = {
-    &arpRateMenuMIDIOrCV, &arpSyncMenu, &arpGateMenuMIDIOrCV, nullptr, &arpModeMenu, nullptr, nullptr, nullptr,
+    &arpRateMenuMIDIOrCV,
+    &arpSyncMenu,
+    &arpGateMenuMIDIOrCV,
+    &arpRhythmMenuMIDIOrCV,
+    &arpModeMenu,
+    nullptr,
+    nullptr,
+    nullptr,
 };
 
 // Gate stuff
@@ -1575,7 +1594,7 @@ Submenu* parentsForSoundShortcuts[][kDisplayHeight] = {
     {&env0Menu,               &env0Menu,               &env0Menu,                      &env0Menu,                      &lpfMenu,             &lpfMenu,               &lpfMenu,                 &lpfMenu,                          },
     {&env1Menu,               &env1Menu,               &env1Menu,                      &env1Menu,                      &hpfMenu,             &hpfMenu,               &hpfMenu,                 &hpfMenu,                          },
     {nullptr,                 nullptr,                 nullptr,                        nullptr,                        nullptr,              nullptr,                nullptr,                  nullptr,                           },
-    {nullptr,                 nullptr,                 nullptr,                        nullptr,                        nullptr,              nullptr,                nullptr,                  nullptr,                           },
+    {&arpBasicMenu,           &arpBasicMenu,           &arpBasicMenu,                  &arpPatternMenu,                &arpPresetAndRandomizerMenu, nullptr,         nullptr,                  nullptr,                           },
     {&lfo1Menu,               &lfo1Menu,               &lfo1Menu,                      nullptr,                        nullptr,              nullptr,                nullptr,                  nullptr,                           },
     {&lfo2Menu,               &lfo2Menu,               &lfo2Menu,                      nullptr,                        nullptr,              nullptr,                nullptr,                  nullptr,                           },
     {nullptr,                 nullptr,                 nullptr,                        nullptr,                        nullptr,              nullptr,                nullptr,                  nullptr,                           },
diff --git a/src/deluge/gui/ui/menus.h b/src/deluge/gui/ui/menus.h
index 7e63faab2c..59a502a7d7 100644
--- a/src/deluge/gui/ui/menus.h
+++ b/src/deluge/gui/ui/menus.h
@@ -83,6 +83,8 @@ extern deluge::gui::menu_item::PatchCables patchCablesMenu;
 extern deluge::gui::menu_item::source::patched_param::FM modulatorVolume;
 
 extern MenuItem* midiOrCVParamShortcuts[kDisplayHeight];
+extern deluge::gui::menu_item::Submenu* parentsForMidiOrCVParamShortcuts[kDisplayHeight];
+
 extern MenuItem* gateDrumParamShortcuts[kDisplayHeight];
 extern MenuItem* paramShortcutsForSounds[kDisplayWidth][kDisplayHeight];
 extern MenuItem* paramShortcutsForAudioClips[kDisplayWidth][kDisplayHeight];
diff --git a/src/deluge/gui/ui/sound_editor.cpp b/src/deluge/gui/ui/sound_editor.cpp
index b69272e2da..c70b54df70 100644
--- a/src/deluge/gui/ui/sound_editor.cpp
+++ b/src/deluge/gui/ui/sound_editor.cpp
@@ -1081,6 +1081,7 @@ ActionResult SoundEditor::potentialShortcutPadAction(int32_t x, int32_t y, bool
 						else {
 							item = midiOrCVParamShortcuts[y];
 						}
+						parent = parentsForMidiOrCVParamShortcuts[y];
 					}
 					else if (x == 4) {
 						if (y == 7) {
diff --git a/src/deluge/modulation/arpeggiator.cpp b/src/deluge/modulation/arpeggiator.cpp
index 1ac6481e4c..a96b831f20 100644
--- a/src/deluge/modulation/arpeggiator.cpp
+++ b/src/deluge/modulation/arpeggiator.cpp
@@ -248,7 +248,7 @@ void Arpeggiator::noteOn(ArpeggiatorSettings* settings, int32_t noteCode, int32_
 			arpNote->mpeValues[m] = mpeValues[m];
 		}
 
-		// "AS PLAYED" NOTES
+		// "PLAYED ORDER" NOTES
 
 		// Insert it in notesAsPlayed array
 		notesAsPlayedIndex = notesAsPlayed.getNumElements();