diff --git a/tracker/presets/BA/house-bass-organ.yml b/tracker/presets/BA/house-bass-organ.yml
index ce60ecd..9901e6b 100644
--- a/tracker/presets/BA/house-bass-organ.yml
+++ b/tracker/presets/BA/house-bass-organ.yml
@@ -1,5 +1,5 @@
 name: house-bass-organ
-numvoices: 2
+numvoices: 1
 units:
     - id: 231
       parameters: {}
diff --git a/tracker/presets/DR/hihat-open.yml b/tracker/presets/DR/hihat-open.yml
index aa316af..4ddb2e4 100644
--- a/tracker/presets/DR/hihat-open.yml
+++ b/tracker/presets/DR/hihat-open.yml
@@ -1,5 +1,5 @@
 name: hihat-open
-numvoices: 2
+numvoices: 1
 units:
     - id: 19
       parameters: {}
diff --git a/tracker/presets/DR/kick-5.yml b/tracker/presets/DR/kick-5.yml
index 5ba4430..f0fa276 100644
--- a/tracker/presets/DR/kick-5.yml
+++ b/tracker/presets/DR/kick-5.yml
@@ -1,6 +1,6 @@
 name: kick-5
 comment: 'Suggested note: C-3'
-numvoices: 2
+numvoices: 1
 units:
     - id: 285
       parameters: {}
diff --git a/tracker/presets/DR/snare-edm-3.yml b/tracker/presets/DR/snare-edm-3.yml
index 119c2f5..12ecfaf 100644
--- a/tracker/presets/DR/snare-edm-3.yml
+++ b/tracker/presets/DR/snare-edm-3.yml
@@ -1,6 +1,6 @@
 name: snare-edm-3
 comment: 'Suggested range: E-4'
-numvoices: 2
+numvoices: 1
 units:
     - id: 341
       parameters: {}
diff --git a/tracker/presets/DR/tom-disco.yml b/tracker/presets/DR/tom-disco.yml
index d6b35b8..1350ac5 100644
--- a/tracker/presets/DR/tom-disco.yml
+++ b/tracker/presets/DR/tom-disco.yml
@@ -1,5 +1,5 @@
 name: tom-disco
-numvoices: 2
+numvoices: 1
 units:
     - type: envelope
       id: 1
diff --git a/tracker/presets/KEYS/clavi.yml b/tracker/presets/KEYS/clavi.yml
index ec94b92..834cfa6 100644
--- a/tracker/presets/KEYS/clavi.yml
+++ b/tracker/presets/KEYS/clavi.yml
@@ -1,5 +1,5 @@
 name: Clavi
-numvoices: 8
+numvoices: 1
 units:
     - type: envelope
       id: 1
diff --git a/tracker/presets/KEYS/lullaby.yml b/tracker/presets/KEYS/lullaby.yml
index ff8aaf5..8ed2a49 100644
--- a/tracker/presets/KEYS/lullaby.yml
+++ b/tracker/presets/KEYS/lullaby.yml
@@ -1,5 +1,5 @@
 name: lullaby
-numvoices: 4
+numvoices: 1
 units:
     - type: envelope
       id: 1
diff --git a/tracker/presets/KEYS/lullaby2.yml b/tracker/presets/KEYS/lullaby2.yml
index 87254c9..c7db1c8 100644
--- a/tracker/presets/KEYS/lullaby2.yml
+++ b/tracker/presets/KEYS/lullaby2.yml
@@ -1,5 +1,5 @@
-name: KEYS Lullaby2
-numvoices: 4
+name: lullaby2
+numvoices: 1
 units:
     - type: envelope
       id: 1
diff --git a/tracker/presets/KEYS/organ.yml b/tracker/presets/KEYS/organ.yml
index 69244b8..f08ceef 100644
--- a/tracker/presets/KEYS/organ.yml
+++ b/tracker/presets/KEYS/organ.yml
@@ -1,5 +1,5 @@
 name: organ
-numvoices: 4
+numvoices: 1
 units:
     - type: envelope
       id: 228
diff --git a/tracker/presets/KEYS/rhodes.yml b/tracker/presets/KEYS/rhodes.yml
index 3f0a114..a415df1 100644
--- a/tracker/presets/KEYS/rhodes.yml
+++ b/tracker/presets/KEYS/rhodes.yml
@@ -1,5 +1,5 @@
 name: rhodes
-numvoices: 8
+numvoices: 1
 units:
     - id: 183
       parameters: {}
diff --git a/tracker/presets/LEAD/happy-lead.yml b/tracker/presets/LEAD/happy-lead.yml
index 2e87d3d..d0ccba7 100644
--- a/tracker/presets/LEAD/happy-lead.yml
+++ b/tracker/presets/LEAD/happy-lead.yml
@@ -1,5 +1,5 @@
 name: happy-lead
-numvoices: 4
+numvoices: 1
 units:
     - id: 235
       parameters: {}
diff --git a/tracker/presets/LEAD/super-saw-2.yml b/tracker/presets/LEAD/super-saw-2.yml
index bac65cf..5d061bf 100644
--- a/tracker/presets/LEAD/super-saw-2.yml
+++ b/tracker/presets/LEAD/super-saw-2.yml
@@ -1,5 +1,5 @@
 name: super-saw-2
-numvoices: 4
+numvoices: 1
 units:
     - id: 233
       parameters: {}
diff --git a/tracker/presets/LEAD/super-saw-3.yml b/tracker/presets/LEAD/super-saw-3.yml
index 2a4ed24..bf4d188 100644
--- a/tracker/presets/LEAD/super-saw-3.yml
+++ b/tracker/presets/LEAD/super-saw-3.yml
@@ -1,6 +1,6 @@
 name: super-saw-3
 comment: Automate filter frequency for the classic trance sound
-numvoices: 4
+numvoices: 1
 units:
     - id: 231
       parameters: {}
diff --git a/tracker/presets/LEAD/super-saw.yml b/tracker/presets/LEAD/super-saw.yml
index 7cae343..9edd1ff 100644
--- a/tracker/presets/LEAD/super-saw.yml
+++ b/tracker/presets/LEAD/super-saw.yml
@@ -1,5 +1,5 @@
 name: super-saw
-numvoices: 4
+numvoices: 1
 units:
     - id: 231
       parameters: {}
diff --git a/tracker/presets/PL/Brass.yml b/tracker/presets/PL/Brass.yml
index 9c227d0..ab241e6 100644
--- a/tracker/presets/PL/Brass.yml
+++ b/tracker/presets/PL/Brass.yml
@@ -1,6 +1,6 @@
 name: brass
 comment: Brass sound use for short stabs at C1-C2 range
-numvoices: 4
+numvoices: 1
 units:
     - id: 225
       parameters: {}
diff --git a/tracker/presets/PL/Popper.yml b/tracker/presets/PL/Popper.yml
index 98e639f..fcacfb9 100644
--- a/tracker/presets/PL/Popper.yml
+++ b/tracker/presets/PL/Popper.yml
@@ -1,5 +1,5 @@
 name: popper
-numvoices: 3
+numvoices: 1
 units:
     - id: 197
       parameters: {}
diff --git a/tracker/presets/PL/brass2.yml b/tracker/presets/PL/brass2.yml
index 1eecbde..0d8d8a5 100644
--- a/tracker/presets/PL/brass2.yml
+++ b/tracker/presets/PL/brass2.yml
@@ -1,5 +1,5 @@
 name: brass2
-numvoices: 4
+numvoices: 1
 units:
     - id: 228
       parameters: {}
diff --git a/tracker/presets/PL/super-pluck.yml b/tracker/presets/PL/super-pluck.yml
index bd45aec..cef5e4d 100644
--- a/tracker/presets/PL/super-pluck.yml
+++ b/tracker/presets/PL/super-pluck.yml
@@ -1,5 +1,5 @@
 name: super-pluck
-numvoices: 4
+numvoices: 1
 units:
     - id: 34
       parameters: {}
diff --git a/tracker/presets/PL/trance bells b/tracker/presets/PL/trance-bells.yml
similarity index 85%
rename from tracker/presets/PL/trance bells
rename to tracker/presets/PL/trance-bells.yml
index df16f54..9597933 100644
--- a/tracker/presets/PL/trance bells	
+++ b/tracker/presets/PL/trance-bells.yml
@@ -1,9 +1,12 @@
-name: Happy lead
+name: trance-bells
 comment: |-
     Generic pluck generator
     Use oscillator type, color and shape to alter the sound properties
-numvoices: 4
+numvoices: 1
 units:
+    - id: 1007
+      parameters: {}
+      comment: Main envelopes
     - type: envelope
       id: 163
       parameters: {attack: 7, decay: 102, gain: 68, release: 78, stereo: 0, sustain: 47}
@@ -13,6 +16,9 @@ units:
     - type: mulp
       id: 216
       parameters: {stereo: 0}
+    - id: 1008
+      parameters: {}
+      comment: Main oscillators
     - type: oscillator
       id: 164
       parameters: {color: 91, detune: 52, gain: 128, lfo: 0, phase: 128, shape: 48, stereo: 0, transpose: 76, type: 0, unison: 3}
@@ -28,20 +34,30 @@ units:
     - type: oscillator
       id: 1002
       parameters: {color: 61, detune: 64, gain: 128, looplength: 821, loopstart: 2374, phase: 0, samplestart: 557335, shape: 58, stereo: 0, transpose: 55, type: 4, unison: 1}
-    - parameters: {}
-      disabled: true
     - type: addp
-      id: 1003
+      id: 1004
       parameters: {stereo: 0}
     - type: mulp
       id: 167
       parameters: {stereo: 0}
-    - type: filter
-      id: 217
-      parameters: {bandpass: 0, frequency: 23, highpass: 1, lowpass: 1, resonance: 128, stereo: 0}
+    - id: 1006
+      parameters: {}
+      comment: Modulated filters
+    - type: loadnote
+      id: 219
+      parameters: {stereo: 0}
+    - type: send
+      id: 220
+      parameters: {amount: 82, port: 0, sendpop: 1, stereo: 0, target: 218, voice: 0}
     - type: filter
       id: 218
       parameters: {bandpass: 0, frequency: 39, highpass: 1, lowpass: 0, resonance: 128, stereo: 0}
+    - type: filter
+      id: 217
+      parameters: {bandpass: 0, frequency: 23, highpass: 1, lowpass: 1, resonance: 128, stereo: 0}
+    - id: 1005
+      parameters: {}
+      comment: Delay & output
     - type: pan
       id: 168
       parameters: {panning: 61, stereo: 0}
@@ -52,9 +68,3 @@ units:
     - type: outaux
       id: 172
       parameters: {auxgain: 48, outgain: 24, stereo: 1}
-    - type: loadnote
-      id: 219
-      parameters: {stereo: 0}
-    - type: send
-      id: 220
-      parameters: {amount: 82, port: 0, sendpop: 1, stereo: 0, target: 218, unit: 0, voice: 0}
diff --git a/tracker/presets/ST/Pizzicato.yml b/tracker/presets/ST/Pizzicato.yml
index 5892dcd..465a6a3 100644
--- a/tracker/presets/ST/Pizzicato.yml
+++ b/tracker/presets/ST/Pizzicato.yml
@@ -1,5 +1,5 @@
 name: pizzicato
-numvoices: 4
+numvoices: 1
 units:
     - id: 223
       parameters: {}
diff --git a/tracker/presets/ST/Strings.yml b/tracker/presets/ST/Strings.yml
index 8219f30..52a2327 100644
--- a/tracker/presets/ST/Strings.yml
+++ b/tracker/presets/ST/Strings.yml
@@ -1,5 +1,5 @@
 name: strings
-numvoices: 3
+numvoices: 1
 units:
     - id: 224
       parameters: {}
diff --git a/tracker/presets/ST/pizzicato-octaves.yml b/tracker/presets/ST/pizzicato-octaves.yml
index f9f0794..b4a7521 100644
--- a/tracker/presets/ST/pizzicato-octaves.yml
+++ b/tracker/presets/ST/pizzicato-octaves.yml
@@ -1,5 +1,5 @@
 name: pizzicato-octaves
-numvoices: 4
+numvoices: 1
 units:
     - id: 226
       parameters: {}
diff --git a/tracker/presets/ST/string.yml b/tracker/presets/ST/string.yml
index 7e57872..8da09bb 100644
--- a/tracker/presets/ST/string.yml
+++ b/tracker/presets/ST/string.yml
@@ -1,5 +1,5 @@
 name: string
-numvoices: 3
+numvoices: 1
 units:
     - id: 66
       parameters: {}
diff --git a/tracker/presets/SY/Guitar.yml b/tracker/presets/SY/Guitar.yml
index 5fbea96..74517db 100644
--- a/tracker/presets/SY/Guitar.yml
+++ b/tracker/presets/SY/Guitar.yml
@@ -1,5 +1,5 @@
 name: guitar
-numvoices: 2
+numvoices: 1
 units:
     - id: 92
       parameters: {}
diff --git a/tracker/presets/SY/strangeland.yml b/tracker/presets/SY/strangeland.yml
index 7f012be..b5ed04f 100644
--- a/tracker/presets/SY/strangeland.yml
+++ b/tracker/presets/SY/strangeland.yml
@@ -1,5 +1,5 @@
 name: strangeland
-numvoices: 2
+numvoices: 1
 units:
     - id: 247
       parameters: {}