diff --git a/tracker/presets/BA/80s_bass_2.yml b/tracker/presets/BA/80s_bass_2.yml
new file mode 100644
index 0000000..ea9d327
--- /dev/null
+++ b/tracker/presets/BA/80s_bass_2.yml
@@ -0,0 +1,29 @@
+numvoices: 1
+units:
+    - type: oscillator
+      id: 3
+      parameters: {color: 91, detune: 68, gain: 64, lfo: 0, phase: 13, shape: 42, stereo: 1, transpose: 76, type: 1, unison: 1}
+    - type: oscillator
+      id: 4
+      parameters: {color: 126, detune: 53, gain: 64, lfo: 0, phase: 0, shape: 50, stereo: 1, transpose: 64, type: 1, unison: 2}
+    - type: addp
+      id: 1084
+      parameters: {stereo: 1}
+    - type: envelope
+      id: 1085
+      parameters: {attack: 30, decay: 81, gain: 128, release: 77, stereo: 1, sustain: 81}
+    - type: send
+      id: 1088
+      parameters: {amount: 108, port: 0, sendpop: 0, stereo: 1, target: 1087, voice: 0}
+    - type: mulp
+      id: 1086
+      parameters: {stereo: 1}
+    - type: filter
+      id: 1087
+      parameters: {bandpass: -1, frequency: 15, highpass: 0, lowpass: 1, resonance: 58, stereo: 1}
+    - type: pan
+      id: 284
+      parameters: {panning: 64, stereo: 1}
+    - type: outaux
+      id: 15
+      parameters: {auxgain: 0, outgain: 17, stereo: 1}
diff --git a/tracker/presets/BA/Bass organ.yml b/tracker/presets/BA/Bass organ.yml
new file mode 100644
index 0000000..85f3907
--- /dev/null
+++ b/tracker/presets/BA/Bass organ.yml	
@@ -0,0 +1,50 @@
+numvoices: 2
+units:
+    - id: 2064
+      parameters: {}
+      comment: Main oscillators & envelope
+    - type: envelope
+      id: 2065
+      parameters: {attack: 0, decay: 0, gain: 57, release: 71, stereo: 0, sustain: 101}
+    - type: oscillator
+      id: 2066
+      parameters: {color: 28, detune: 64, gain: 44, phase: 0, shape: 64, stereo: 0, transpose: 71, type: 2, unison: 1}
+    - type: oscillator
+      id: 2067
+      parameters: {color: 39, detune: 64, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 88, type: 2, unison: 0}
+    - type: addp
+      id: 2068
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1991
+      parameters: {color: 90, detune: 66, gain: 88, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 2, unison: 1}
+    - type: addp
+      id: 2069
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 2070
+      parameters: {stereo: 0}
+    - id: 2071
+      parameters: {}
+      comment: Effects
+    - type: envelope
+      id: 2072
+      parameters: {attack: 0, decay: 72, gain: 128, release: 81, stereo: 0, sustain: 0}
+    - type: send
+      id: 2073
+      parameters: {amount: 87, port: 0, sendpop: 1, stereo: 0, target: 2074, voice: 0}
+    - type: filter
+      id: 2074
+      parameters: {bandpass: 1, frequency: 38, highpass: 0, lowpass: 1, resonance: 122, stereo: 0}
+    - type: filter
+      id: 2076
+      parameters: {bandpass: -1, frequency: 11, highpass: -1, lowpass: 1, resonance: 98, stereo: 0}
+    - id: 2078
+      parameters: {}
+      comment: Effects & output
+    - type: pan
+      id: 2081
+      parameters: {panning: 64, stereo: 0}
+    - type: outaux
+      id: 2082
+      parameters: {auxgain: 4, outgain: 15, stereo: 1}
diff --git a/tracker/presets/BA/Bass.yml b/tracker/presets/BA/Bass.yml
index e3690bf..78140a6 100644
--- a/tracker/presets/BA/Bass.yml
+++ b/tracker/presets/BA/Bass.yml
@@ -1,26 +1,26 @@
-numvoices: 1
+numvoices: 2
 units:
     - id: 218
       parameters: {}
       comment: Modulations
     - type: oscillator
-      id: 5
-      parameters: {color: 128, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 90, stereo: 0, transpose: 32, type: 0}
+      id: 2106
+      parameters: {color: 127, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 64, stereo: 0, transpose: 40, type: 0}
     - type: send
-      id: 6
+      id: 2107
       parameters: {amount: 68, port: 1, sendpop: 0, target: 3}
     - type: send
       id: 38
-      parameters: {amount: 60, port: 1, sendpop: 1, target: 4}
+      parameters: {amount: 59, port: 1, sendpop: 1, target: 4}
     - id: 219
       parameters: {}
       comment: Main oscillators
     - type: oscillator
       id: 3
-      parameters: {color: 80, detune: 64, gain: 64, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 2}
+      parameters: {color: 80, detune: 64, gain: 92, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 2}
     - type: oscillator
       id: 4
-      parameters: {color: 96, detune: 72, gain: 64, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 1}
+      parameters: {color: 98, detune: 72, gain: 50, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1}
     - type: addp
       id: 40
       parameters: {stereo: 0}
@@ -28,32 +28,32 @@ units:
       parameters: {}
       comment: Main envelope
     - type: envelope
-      id: 1
+      id: 2108
       parameters: {attack: 32, decay: 64, gain: 95, release: 64, stereo: 0, sustain: 64}
     - type: send
-      id: 2
-      parameters: {amount: 120, port: 4, sendpop: 0, target: 1}
+      id: 2109
+      parameters: {amount: 120, port: 4, sendpop: 0, target: 2108}
     - type: mulp
-      id: 217
+      id: 2110
       parameters: {stereo: 0}
     - id: 221
       parameters: {}
       comment: Effects & output
     - type: filter
       id: 11
-      parameters: {bandpass: 0, frequency: 18, highpass: -1, lowpass: 1, resonance: 64, stereo: 0}
+      parameters: {bandpass: -1, frequency: 20, highpass: -1, lowpass: 1, resonance: 58, stereo: 0}
     - type: filter
-      id: 12
-      parameters: {bandpass: 0, frequency: 32, highpass: 0, lowpass: 1, resonance: 48, stereo: 0}
+      id: 2111
+      parameters: {bandpass: -1, frequency: 16, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: distort
-      id: 13
+      id: 2112
       parameters: {drive: 86, stereo: 0}
     - type: pan
       id: 15
       parameters: {panning: 64, stereo: 0}
     - type: delay
       id: 16
-      parameters: {damp: 102, dry: 56, feedback: 63, notetracking: 2, pregain: 43, stereo: 1}
+      parameters: {damp: 102, dry: 88, feedback: 63, notetracking: 2, pregain: 51, stereo: 1}
       varargs: [24, 48]
     - type: outaux
       id: 20
diff --git a/tracker/presets/BA/Deep_bass_2.yml b/tracker/presets/BA/Deep_bass_2.yml
new file mode 100644
index 0000000..e7f89a6
--- /dev/null
+++ b/tracker/presets/BA/Deep_bass_2.yml
@@ -0,0 +1,38 @@
+numvoices: 1
+units:
+    - type: oscillator
+      id: 1983
+      parameters: {color: 122, detune: 77, gain: 53, lfo: 0, phase: 0, shape: 111, stereo: 1, transpose: 64, type: 1, unison: 3}
+    - type: oscillator
+      id: 1984
+      parameters: {color: 112, detune: 54, gain: 70, lfo: 0, phase: 32, shape: 29, stereo: 1, transpose: 64, type: 1, unison: 3}
+    - type: distort
+      id: 1708
+      parameters: {drive: 104, stereo: 1}
+    - type: addp
+      id: 1985
+      parameters: {stereo: 1}
+    - type: oscillator
+      id: 1700
+      parameters: {color: 51, detune: 72, gain: 128, phase: 64, shape: 48, stereo: 1, transpose: 52, type: 0, unison: 3}
+    - type: distort
+      id: 1709
+      parameters: {drive: 122, stereo: 1}
+    - type: addp
+      id: 1701
+      parameters: {stereo: 1}
+    - type: envelope
+      id: 1986
+      parameters: {attack: 24, decay: 24, gain: 93, release: 56, stereo: 1, sustain: 128}
+    - type: mulp
+      id: 1987
+      parameters: {stereo: 1}
+    - type: pan
+      id: 1988
+      parameters: {panning: 64, stereo: 1}
+    - type: filter
+      id: 1707
+      parameters: {bandpass: 0, frequency: 12, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+    - type: outaux
+      id: 1989
+      parameters: {auxgain: 0, outgain: 15, stereo: 1}
diff --git a/tracker/presets/BA/Deep_bass_3.yml b/tracker/presets/BA/Deep_bass_3.yml
new file mode 100644
index 0000000..b23b9bd
--- /dev/null
+++ b/tracker/presets/BA/Deep_bass_3.yml
@@ -0,0 +1,29 @@
+numvoices: 2
+units:
+    - type: envelope
+      id: 1974
+      parameters: {attack: 21, decay: 64, gain: 92, release: 64, stereo: 0, sustain: 83}
+    - type: push
+      id: 161
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1975
+      parameters: {color: 64, detune: 68, gain: 128, lfo: 0, phase: 15, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
+    - type: addp
+      id: 1976
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1977
+      parameters: {color: 113, detune: 64, gain: 128, lfo: 0, phase: 0, shape: 102, stereo: 0, transpose: 64, type: 1, unison: 0}
+    - type: addp
+      id: 165
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 1978
+      parameters: {stereo: 0}
+    - type: pan
+      id: 1979
+      parameters: {panning: 64, stereo: 0}
+    - type: outaux
+      id: 1980
+      parameters: {auxgain: 0, outgain: 38, stereo: 1}
diff --git a/tracker/presets/BA/Fatbeat_bass.yml b/tracker/presets/BA/Fatbeat_bass.yml
new file mode 100644
index 0000000..f45eb99
--- /dev/null
+++ b/tracker/presets/BA/Fatbeat_bass.yml
@@ -0,0 +1,51 @@
+numvoices: 2
+units:
+    - type: envelope
+      id: 1821
+      parameters: {attack: 71, decay: 0, gain: 64, release: 85, stereo: 0, sustain: 128}
+    - type: send
+      id: 1810
+      parameters: {amount: 0, port: 0, sendpop: 1, stereo: 0, target: 1852, voice: 0}
+    - id: 1812
+      parameters: {}
+      comment: Main body
+    - id: 1822
+      parameters: {}
+    - type: envelope
+      id: 1813
+      parameters: {attack: 23, decay: 0, gain: 127, release: 73, stereo: 0, sustain: 128}
+    - type: oscillator
+      id: 1849
+      parameters: {color: 128, detune: 50, gain: 64, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 2}
+    - type: oscillator
+      id: 1814
+      parameters: {color: 8, detune: 80, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 2}
+    - type: addp
+      id: 1850
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1818
+      parameters: {color: 64, detune: 56, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 52, type: 2, unison: 2}
+    - type: addp
+      id: 1819
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 1851
+      parameters: {stereo: 0}
+    - type: filter
+      id: 1852
+      parameters: {bandpass: 0, frequency: 88, highpass: 0, lowpass: 1, resonance: 104, stereo: 0}
+    - type: pan
+      id: 1816
+      parameters: {panning: 64, stereo: 0}
+    - id: 1853
+      parameters: {}
+    - type: compressor
+      id: 1854
+      parameters: {attack: 48, invgain: 64, ratio: 90, release: 69, stereo: 1, threshold: 36}
+    - type: mulp
+      id: 1855
+      parameters: {stereo: 1}
+    - type: outaux
+      id: 1817
+      parameters: {auxgain: 0, outgain: 18, stereo: 1}
diff --git a/tracker/presets/BA/House_bass_organ.yml b/tracker/presets/BA/House_bass_organ.yml
index 2e3aeae..bc32966 100644
--- a/tracker/presets/BA/House_bass_organ.yml
+++ b/tracker/presets/BA/House_bass_organ.yml
@@ -1,4 +1,4 @@
-numvoices: 1
+numvoices: 2
 units:
     - id: 235
       parameters: {}
@@ -7,20 +7,20 @@ units:
       id: 236
       parameters: {attack: 11, decay: 70, gain: 37, release: 64, stereo: 0, sustain: 64}
     - type: send
-      id: 1700
+      id: 2133
       parameters: {amount: 93, port: 4, sendpop: 0, stereo: 0, target: 236, voice: 0}
     - type: oscillator
       id: 237
-      parameters: {color: 100, detune: 64, gain: 100, phase: 64, shape: 64, stereo: 0, transpose: 40, type: 0, unison: 2}
+      parameters: {color: 100, detune: 64, gain: 100, phase: 64, shape: 64, stereo: 0, transpose: 52, type: 0, unison: 2}
     - type: oscillator
       id: 238
-      parameters: {color: 64, detune: 64, gain: 90, phase: 0, shape: 64, stereo: 0, transpose: 71, type: 2, unison: 0}
+      parameters: {color: 64, detune: 64, gain: 90, phase: 0, shape: 64, stereo: 0, transpose: 83, type: 2, unison: 0}
     - type: addp
       id: 239
       parameters: {stereo: 0}
     - type: oscillator
-      id: 1701
-      parameters: {color: 76, detune: 64, gain: 80, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 2, unison: 0}
+      id: 2134
+      parameters: {color: 76, detune: 64, gain: 80, phase: 32, shape: 64, stereo: 0, transpose: 76, type: 2, unison: 0}
     - type: addp
       id: 1702
       parameters: {stereo: 0}
diff --git a/tracker/presets/BA/Picked_bass.yml b/tracker/presets/BA/Picked_bass.yml
index 1563ad5..c06c240 100644
--- a/tracker/presets/BA/Picked_bass.yml
+++ b/tracker/presets/BA/Picked_bass.yml
@@ -1,26 +1,26 @@
-numvoices: 1
+numvoices: 2
 units:
     - type: envelope
-      id: 1209
+      id: 2277
       parameters: {attack: 40, decay: 0, gain: 128, release: 72, stereo: 0, sustain: 88}
     - type: oscillator
-      id: 1210
+      id: 2278
       parameters: {color: 64, detune: 64, gain: 128, looplength: 534, loopstart: 6302, phase: 0, samplestart: 923813, shape: 64, stereo: 0, transpose: 84, type: 4, unison: 0}
     - type: mulp
-      id: 1211
+      id: 2279
       parameters: {stereo: 0}
     - type: filter
-      id: 1698
-      parameters: {bandpass: 0, frequency: 50, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+      id: 2280
+      parameters: {bandpass: 0, frequency: 107, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: hold
-      id: 1699
-      parameters: {holdfreq: 64, stereo: 0}
+      id: 2281
+      parameters: {holdfreq: 80, stereo: 0}
     - type: filter
-      id: 1700
-      parameters: {bandpass: 0, frequency: 11, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
+      id: 2166
+      parameters: {bandpass: -1, frequency: 12, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
     - type: pan
-      id: 1213
+      id: 2282
       parameters: {panning: 64, stereo: 0}
     - type: outaux
-      id: 1214
-      parameters: {auxgain: 20, outgain: 40, stereo: 1}
+      id: 2283
+      parameters: {auxgain: 12, outgain: 29, stereo: 1}
diff --git a/tracker/presets/BA/Punch_bass.yml b/tracker/presets/BA/Punch_bass.yml
index 39b14f3..109dcf1 100644
--- a/tracker/presets/BA/Punch_bass.yml
+++ b/tracker/presets/BA/Punch_bass.yml
@@ -1,4 +1,4 @@
-numvoices: 1
+numvoices: 2
 units:
     - id: 216
       parameters: {}
@@ -10,34 +10,34 @@ units:
       id: 4
       parameters: {color: 0, detune: 64, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 0}
     - type: addp
-      id: 5
+      id: 2315
       parameters: {stereo: 0}
-    - id: 217
+    - id: 2316
       parameters: {}
       comment: Main envelope
     - type: envelope
-      id: 1
-      parameters: {attack: 0, decay: 71, gain: 46, release: 75, stereo: 0, sustain: 64}
+      id: 2317
+      parameters: {attack: 0, decay: 82, gain: 46, release: 75, stereo: 0, sustain: 64}
     - type: send
-      id: 2
-      parameters: {amount: 113, port: 4, sendpop: 0, target: 1}
+      id: 2318
+      parameters: {amount: 113, port: 4, sendpop: 0, target: 2317}
     - type: mulp
-      id: 12
+      id: 2319
       parameters: {stereo: 0}
-    - id: 218
+    - id: 2320
       parameters: {}
       comment: Effects & output
     - type: envelope
-      id: 6
+      id: 2321
       parameters: {attack: 6, decay: 70, gain: 128, release: 64, stereo: 0, sustain: 0}
     - type: send
       id: 214
-      parameters: {amount: 75, port: 0, sendpop: 0, target: 10}
+      parameters: {amount: 75, port: 0, sendpop: 0, target: 2323}
     - type: send
-      id: 215
+      id: 2322
       parameters: {amount: 75, port: 0, sendpop: 1, target: 11}
     - type: filter
-      id: 10
+      id: 2323
       parameters: {bandpass: -1, frequency: 24, highpass: 0, lowpass: 1, resonance: 75, stereo: 0}
     - type: filter
       id: 11
diff --git a/tracker/presets/BA/Slap_bass.yml b/tracker/presets/BA/Slap_bass.yml
index a9603cf..6eea79d 100644
--- a/tracker/presets/BA/Slap_bass.yml
+++ b/tracker/presets/BA/Slap_bass.yml
@@ -1,4 +1,4 @@
-numvoices: 1
+numvoices: 2
 units:
     - id: 1241
       parameters: {}
@@ -17,10 +17,10 @@ units:
       comment: Main oscillators
     - type: oscillator
       id: 1246
-      parameters: {color: 83, detune: 64, gain: 64, lfo: 0, phase: 64, shape: 84, stereo: 0, transpose: 64, type: 0, unison: 1}
+      parameters: {color: 64, detune: 64, gain: 64, lfo: 0, phase: 64, shape: 84, stereo: 0, transpose: 64, type: 0, unison: 1}
     - type: oscillator
       id: 1247
-      parameters: {color: 100, detune: 64, gain: 64, lfo: 0, phase: 0, shape: 26, stereo: 0, transpose: 64, type: 1, unison: 2}
+      parameters: {color: 104, detune: 64, gain: 74, lfo: 0, phase: 0, shape: 17, stereo: 0, transpose: 64, type: 1, unison: 2}
     - type: addp
       id: 1248
       parameters: {stereo: 0}
@@ -50,13 +50,13 @@ units:
       parameters: {bandpass: 0, frequency: 29, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: filter
       id: 1257
-      parameters: {bandpass: 1, frequency: 57, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+      parameters: {bandpass: -1, frequency: 64, highpass: 1, lowpass: 1, resonance: 128, stereo: 0}
     - type: hold
       id: 1698
-      parameters: {holdfreq: 64, stereo: 0}
+      parameters: {holdfreq: 66, stereo: 0}
     - type: pan
       id: 1258
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 1259
-      parameters: {auxgain: 7, outgain: 44, stereo: 1}
+      parameters: {auxgain: 7, outgain: 64, stereo: 1}
diff --git a/tracker/presets/BA/Trance_bass_2.yml b/tracker/presets/BA/Trance_bass_2.yml
new file mode 100644
index 0000000..da6a135
--- /dev/null
+++ b/tracker/presets/BA/Trance_bass_2.yml
@@ -0,0 +1,39 @@
+numvoices: 2
+units:
+    - id: 1351
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 173
+      parameters: {attack: 69, decay: 0, gain: 64, release: 81, stereo: 0, sustain: 128}
+    - id: 2040
+      parameters: {}
+    - type: send
+      id: 175
+      parameters: {amount: 46, port: 3, sendpop: 1, target: 179}
+    - id: 1350
+      parameters: {}
+      comment: Main body
+    - type: oscillator
+      id: 177
+      parameters: {color: 96, detune: 59, gain: 64, lfo: 0, phase: 0, shape: 47, stereo: 0, transpose: 76, type: 0, unison: 0}
+    - type: oscillator
+      id: 179
+      parameters: {color: 128, detune: 77, gain: 74, lfo: 0, phase: 64, shape: 111, stereo: 0, transpose: 64, type: 1, unison: 3}
+    - type: addp
+      id: 178
+      parameters: {stereo: 0}
+    - type: envelope
+      id: 176
+      parameters: {attack: 0, decay: 0, gain: 92, release: 70, stereo: 0, sustain: 89}
+    - type: mulp
+      id: 185
+      parameters: {stereo: 0}
+    - type: pan
+      id: 183
+      parameters: {panning: 64, stereo: 0}
+    - id: 1344
+      parameters: {}
+    - type: outaux
+      id: 184
+      parameters: {auxgain: 1, outgain: 24, stereo: 1}
diff --git a/tracker/presets/BA/Trance_bass_3.yml b/tracker/presets/BA/Trance_bass_3.yml
new file mode 100644
index 0000000..c124559
--- /dev/null
+++ b/tracker/presets/BA/Trance_bass_3.yml
@@ -0,0 +1,43 @@
+numvoices: 2
+units:
+    - id: 2041
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 2042
+      parameters: {attack: 0, decay: 77, gain: 128, release: 83, stereo: 0, sustain: 81}
+    - type: send
+      id: 174
+      parameters: {amount: 80, port: 0, sendpop: 0, target: 181}
+    - type: send
+      id: 2043
+      parameters: {amount: 110, port: 3, sendpop: 1, target: 2047}
+    - id: 2044
+      parameters: {}
+      comment: Main body
+    - type: envelope
+      id: 2045
+      parameters: {attack: 0, decay: 0, gain: 64, release: 52, stereo: 0, sustain: 128}
+    - type: oscillator
+      id: 2046
+      parameters: {color: 81, detune: 68, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
+    - type: oscillator
+      id: 2047
+      parameters: {color: 40, detune: 63, gain: 93, lfo: 0, phase: 64, shape: 97, stereo: 0, transpose: 64, type: 1, unison: 1}
+    - type: addp
+      id: 2048
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 2049
+      parameters: {stereo: 0}
+    - type: filter
+      id: 181
+      parameters: {bandpass: -1, frequency: 36, highpass: 0, lowpass: 1, resonance: 79, stereo: 0}
+    - type: pan
+      id: 2050
+      parameters: {panning: 64, stereo: 0}
+    - id: 2051
+      parameters: {}
+    - type: outaux
+      id: 2052
+      parameters: {auxgain: 7, outgain: 46, stereo: 1}
diff --git a/tracker/presets/BL/Kalimba.yml b/tracker/presets/BL/Kalimba.yml
index 937c6c7..fe6f9f4 100644
--- a/tracker/presets/BL/Kalimba.yml
+++ b/tracker/presets/BL/Kalimba.yml
@@ -1,11 +1,11 @@
-numvoices: 1
+numvoices: 2
 units:
     - type: envelope
       id: 1209
-      parameters: {attack: 0, decay: 65, gain: 64, release: 64, stereo: 0, sustain: 0}
+      parameters: {attack: 0, decay: 65, gain: 128, release: 64, stereo: 0, sustain: 0}
     - type: oscillator
       id: 1210
-      parameters: {color: 64, detune: 54, gain: 64, looplength: 48, loopstart: 1446, phase: 0, samplestart: 743044, shape: 64, stereo: 0, transpose: 66, type: 4, unison: 2}
+      parameters: {color: 64, detune: 66, gain: 96, looplength: 48, loopstart: 1446, phase: 0, samplestart: 743044, shape: 64, stereo: 0, transpose: 66, type: 4, unison: 0}
     - type: mulp
       id: 1211
       parameters: {stereo: 0}
@@ -14,4 +14,4 @@ units:
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 1214
-      parameters: {auxgain: 21, outgain: 64, stereo: 1}
+      parameters: {auxgain: 17, outgain: 64, stereo: 1}
diff --git a/tracker/presets/BL/Marimba.yml b/tracker/presets/BL/Marimba.yml
index f229093..d661a0d 100644
--- a/tracker/presets/BL/Marimba.yml
+++ b/tracker/presets/BL/Marimba.yml
@@ -1,17 +1,14 @@
-numvoices: 1
+numvoices: 2
 units:
     - type: envelope
       id: 1241
-      parameters: {attack: 22, decay: 73, gain: 96, release: 81, stereo: 0, sustain: 64}
+      parameters: {attack: 0, decay: 90, gain: 64, release: 83, stereo: 0, sustain: 0}
     - type: oscillator
       id: 1242
-      parameters: {color: 64, detune: 58, gain: 92, looplength: 74, loopstart: 1528, phase: 0, samplestart: 802728, shape: 64, stereo: 0, transpose: 62, type: 4, unison: 0}
+      parameters: {color: 64, detune: 64, gain: 64, looplength: 594, loopstart: 1317, phase: 0, samplestart: 800733, shape: 64, stereo: 0, transpose: 70, type: 4, unison: 2}
     - type: filter
       id: 1714
-      parameters: {bandpass: 0, frequency: 64, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
-    - type: hold
-      id: 1713
-      parameters: {holdfreq: 64, stereo: 0}
+      parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: mulp
       id: 1243
       parameters: {stereo: 0}
@@ -20,4 +17,4 @@ units:
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 1245
-      parameters: {auxgain: 14, outgain: 64, stereo: 1}
+      parameters: {auxgain: 19, outgain: 35, stereo: 1}
diff --git a/tracker/presets/BL/Trance_bells_2.yml b/tracker/presets/BL/Trance_bells_2.yml
new file mode 100644
index 0000000..2bbd36c
--- /dev/null
+++ b/tracker/presets/BL/Trance_bells_2.yml
@@ -0,0 +1,51 @@
+comment: |-
+    Generic pluck generator
+    Use oscillator type, color and shape to alter the sound properties
+numvoices: 2
+units:
+    - id: 1007
+      parameters: {}
+      comment: Main envelopes
+    - type: envelope
+      id: 1793
+      parameters: {attack: 22, decay: 84, gain: 66, release: 84, stereo: 1, sustain: 64}
+    - id: 1008
+      parameters: {}
+      comment: Main oscillators
+    - type: oscillator
+      id: 1974
+      parameters: {color: 64, detune: 61, gain: 54, lfo: 0, phase: 0, shape: 104, stereo: 1, transpose: 76, type: 1, unison: 1}
+    - type: add
+      id: 214
+      parameters: {stereo: 1}
+    - type: oscillator
+      id: 1975
+      parameters: {color: 98, detune: 73, gain: 64, lfo: 0, phase: 64, shape: 64, stereo: 1, transpose: 76, type: 1, unison: 3}
+    - type: addp
+      id: 1976
+      parameters: {stereo: 1}
+    - type: oscillator
+      id: 2033
+      parameters: {color: 108, detune: 56, gain: 52, lfo: 0, phase: 85, shape: 31, stereo: 1, transpose: 64, type: 1, unison: 3}
+    - type: addp
+      id: 2034
+      parameters: {stereo: 1}
+    - type: mulp
+      id: 1798
+      parameters: {stereo: 1}
+    - id: 1006
+      parameters: {}
+      comment: Modulated filters
+    - type: filter
+      id: 2046
+      parameters: {bandpass: 0, frequency: 121, highpass: -1, lowpass: 1, resonance: 84, stereo: 1}
+    - id: 2047
+      parameters: {}
+      comment: Delay & output
+    - type: delay
+      id: 1801
+      parameters: {damp: 0, dry: 72, feedback: 57, notetracking: 2, pregain: 63, stereo: 1}
+      varargs: [36, 74]
+    - type: outaux
+      id: 1802
+      parameters: {auxgain: 12, outgain: 26, stereo: 1}
diff --git a/tracker/presets/BL/Trance_bells_3.yml b/tracker/presets/BL/Trance_bells_3.yml
new file mode 100644
index 0000000..d19e254
--- /dev/null
+++ b/tracker/presets/BL/Trance_bells_3.yml
@@ -0,0 +1,66 @@
+comment: |-
+    Generic pluck generator
+    Use oscillator type, color and shape to alter the sound properties
+numvoices: 2
+units:
+    - id: 1713
+      parameters: {}
+      comment: Main envelopes
+    - type: envelope
+      id: 163
+      parameters: {attack: 0, decay: 85, gain: 50, release: 84, stereo: 0, sustain: 32}
+    - id: 2347
+      parameters: {}
+      comment: Main oscillators
+    - type: oscillator
+      id: 164
+      parameters: {color: 125, detune: 70, gain: 64, lfo: 0, phase: 0, shape: 25, stereo: 0, transpose: 76, type: 1, unison: 2}
+    - type: add
+      id: 1715
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 165
+      parameters: {color: 102, detune: 70, gain: 128, lfo: 0, phase: 0, shape: 34, stereo: 0, transpose: 64, type: 1, unison: 2}
+    - type: addp
+      id: 166
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1002
+      parameters: {color: 128, detune: 64, gain: 128, looplength: 821, loopstart: 2374, phase: 0, samplestart: 557335, shape: 64, stereo: 0, transpose: 76, type: 0, unison: 0}
+    - type: addp
+      id: 1004
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 167
+      parameters: {stereo: 0}
+    - id: 1716
+      parameters: {}
+      comment: Modulated filters
+    - type: loadnote
+      id: 219
+      parameters: {stereo: 0}
+    - type: loadval
+      id: 2349
+      parameters: {stereo: 0, value: 98}
+    - type: addp
+      id: 2348
+      parameters: {stereo: 0}
+    - type: send
+      id: 220
+      parameters: {amount: 105, port: 0, sendpop: 1, stereo: 0, target: 218, voice: 0}
+    - type: filter
+      id: 218
+      parameters: {bandpass: 0, frequency: 47, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+    - id: 1005
+      parameters: {}
+      comment: Delay & output
+    - type: pan
+      id: 168
+      parameters: {panning: 64, stereo: 0}
+    - type: delay
+      id: 169
+      parameters: {damp: 36, dry: 63, feedback: 76, notetracking: 0, pregain: 52, stereo: 1}
+      varargs: [12550, 24402, 21265, 32419]
+    - type: outaux
+      id: 172
+      parameters: {auxgain: 17, outgain: 35, stereo: 1}
diff --git a/tracker/presets/DR/DR_kickedm.yml b/tracker/presets/DR/DR_kickedm.yml
new file mode 100644
index 0000000..07c0a5a
--- /dev/null
+++ b/tracker/presets/DR/DR_kickedm.yml
@@ -0,0 +1,77 @@
+name: DR kick-edm
+comment: A#2
+numvoices: 2
+units:
+    - id: 128
+      parameters: {}
+      comment: Pitch drop
+    - type: envelope
+      id: 1282
+      parameters: {attack: 72, decay: 85, gain: 128, release: 0, stereo: 0, sustain: 0}
+    - type: envelope
+      id: 120
+      parameters: {attack: 50, decay: 80, gain: 64, release: 0, stereo: 0, sustain: 0}
+    - type: mulp
+      id: 121
+      parameters: {stereo: 0}
+    - type: send
+      id: 1283
+      parameters: {amount: 0, port: 0, sendpop: 1, target: 1285}
+    - id: 129
+      parameters: {}
+      comment: Body & tail
+    - type: envelope
+      id: 1284
+      parameters: {attack: 53, decay: 68, gain: 98, release: 0, stereo: 0, sustain: 0}
+    - type: send
+      id: 1348
+      parameters: {amount: 26, port: 0, sendpop: 0, stereo: 0, target: 184, voice: 0}
+    - type: oscillator
+      id: 1285
+      parameters: {color: 128, detune: 64, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 80, type: 0, unison: 3}
+    - type: mulp
+      id: 126
+      parameters: {stereo: 0}
+    - id: 130
+      parameters: {}
+      comment: Tick
+    - type: envelope
+      id: 1286
+      parameters: {attack: 0, decay: 46, gain: 128, release: 0, stereo: 0, sustain: 0}
+    - type: noise
+      id: 111
+      parameters: {gain: 128, shape: 64, stereo: 0}
+    - type: filter
+      id: 112
+      parameters: {bandpass: 1, frequency: 91, highpass: 0, lowpass: 0, resonance: 128, stereo: 0}
+    - type: filter
+      id: 1287
+      parameters: {bandpass: 1, frequency: 83, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+    - type: mulp
+      id: 1288
+      parameters: {stereo: 0}
+    - type: addp
+      id: 1289
+      parameters: {stereo: 0}
+    - id: 131
+      parameters: {}
+      comment: Filters
+    - type: filter
+      id: 1290
+      parameters: {bandpass: 1, frequency: 86, highpass: -1, lowpass: 1, resonance: 63, stereo: 0}
+    - type: filter
+      id: 1293
+      parameters: {bandpass: 1, frequency: 15, highpass: -1, lowpass: 1, resonance: 84, stereo: 0}
+    - id: 132
+      parameters: {}
+      comment: Output
+    - type: pan
+      id: 1294
+      parameters: {panning: 64, stereo: 0}
+    - type: outaux
+      id: 1295
+      parameters: {auxgain: 4, outgain: 98, stereo: 1}
+    - id: 1443
+      parameters: {}
+    - id: 1346
+      parameters: {}
diff --git a/tracker/presets/DR/DR_kickedm2.yml b/tracker/presets/DR/DR_kickedm2.yml
new file mode 100644
index 0000000..1fa41db
--- /dev/null
+++ b/tracker/presets/DR/DR_kickedm2.yml
@@ -0,0 +1,81 @@
+name: DR kickedm2
+comment: A#2
+numvoices: 2
+units:
+    - id: 1660
+      parameters: {}
+      comment: Pitch drop
+    - type: envelope
+      id: 1661
+      parameters: {attack: 64, decay: 0, gain: 128, release: 0, stereo: 0, sustain: 128}
+    - type: send
+      id: 1664
+      parameters: {amount: 52, port: 0, sendpop: 1, target: 1667}
+    - id: 1665
+      parameters: {}
+      comment: Body & tail
+    - type: envelope
+      id: 1666
+      parameters: {attack: 0, decay: 73, gain: 100, release: 0, stereo: 0, sustain: 0}
+    - type: oscillator
+      id: 1667
+      parameters: {color: 128, detune: 64, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 83, type: 0, unison: 3}
+    - type: mulp
+      id: 1668
+      parameters: {stereo: 0}
+    - id: 1669
+      parameters: {}
+      comment: Tick
+    - type: envelope
+      id: 1670
+      parameters: {attack: 0, decay: 64, gain: 128, release: 0, stereo: 0, sustain: 0}
+    - type: oscillator
+      id: 1831
+      parameters: {color: 64, detune: 64, gain: 128, looplength: 1, loopstart: 640, phase: 0, samplestart: 649771, shape: 64, stereo: 0, transpose: 76, type: 4, unison: 0}
+    - type: filter
+      id: 1672
+      parameters: {bandpass: 1, frequency: 99, highpass: -1, lowpass: 0, resonance: 128, stereo: 0}
+    - type: dbgain
+      id: 1832
+      parameters: {decibels: 81, stereo: 0}
+    - type: mulp
+      id: 1674
+      parameters: {stereo: 0}
+    - type: addp
+      id: 1675
+      parameters: {stereo: 0}
+    - id: 1676
+      parameters: {}
+      comment: Filters
+    - type: hold
+      id: 1792
+      parameters: {holdfreq: 72, stereo: 0}
+    - type: filter
+      id: 1771
+      parameters: {bandpass: 1, frequency: 115, highpass: 0, lowpass: 1, resonance: 87, stereo: 0}
+    - type: filter
+      id: 1677
+      parameters: {bandpass: 1, frequency: 9, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
+    - id: 1679
+      parameters: {}
+      comment: Output
+    - type: pan
+      id: 1680
+      parameters: {panning: 64, stereo: 0}
+    - type: outaux
+      id: 1681
+      parameters: {auxgain: 1, outgain: 128, stereo: 1}
+    - id: 1773
+      parameters: {}
+      comment: SideChains
+    - type: envelope
+      id: 1769
+      parameters: {attack: 57, decay: 75, gain: 128, release: 0, stereo: 0, sustain: 0}
+    - type: send
+      id: 1727
+      parameters: {amount: 21, port: 0, sendpop: 0, stereo: 0, target: 1726, voice: 0}
+    - type: send
+      id: 1728
+      parameters: {amount: 20, port: 0, sendpop: 1, stereo: 0, target: 1713, voice: 0}
+    - id: 1682
+      parameters: {}
diff --git a/tracker/presets/GTR/Guitar_Wall.yml b/tracker/presets/GTR/Guitar_Wall.yml
new file mode 100644
index 0000000..7014105
--- /dev/null
+++ b/tracker/presets/GTR/Guitar_Wall.yml
@@ -0,0 +1,59 @@
+numvoices: 1
+units:
+    - type: envelope
+      id: 1974
+      parameters: {attack: 0, decay: 64, gain: 64, release: 0, stereo: 0, sustain: 0}
+    - type: oscillator
+      id: 1975
+      parameters: {color: 75, detune: 58, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 1}
+    - type: mulp
+      id: 1976
+      parameters: {stereo: 0}
+    - type: delay
+      id: 1977
+      parameters: {damp: 0, dry: 0, feedback: 127, notetracking: 1, pregain: 82, stereo: 0}
+      varargs: [10839, 5397, 10787]
+    - type: filter
+      id: 1978
+      parameters: {bandpass: 1, frequency: 37, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+    - type: compressor
+      id: 1979
+      parameters: {attack: 26, invgain: 18, ratio: 88, release: 70, stereo: 0, threshold: 39}
+    - type: mulp
+      id: 1980
+      parameters: {stereo: 0}
+    - type: envelope
+      id: 1981
+      parameters: {attack: 0, decay: 81, gain: 110, release: 66, stereo: 0, sustain: 88}
+    - type: mulp
+      id: 1982
+      parameters: {stereo: 0}
+    - type: distort
+      id: 1983
+      parameters: {drive: 87, stereo: 0}
+    - id: 1984
+      parameters: {}
+      comment: Output
+    - type: send
+      id: 1985
+      parameters: {amount: 108, port: 0, sendpop: 0, stereo: 0, target: 1986, voice: 0}
+    - type: pan
+      id: 1986
+      parameters: {panning: 64, stereo: 0}
+    - type: distort
+      id: 1987
+      parameters: {drive: 100, stereo: 1}
+    - type: belleq
+      id: 1988
+      parameters: {bandwidth: 60, frequency: 34, gain: 57, stereo: 1}
+    - type: outaux
+      id: 1989
+      parameters: {auxgain: 5, outgain: 17, stereo: 1}
+    - id: 1990
+      parameters: {}
+    - type: noise
+      id: 1991
+      parameters: {gain: 64, shape: 64, stereo: 0}
+    - type: send
+      id: 1992
+      parameters: {amount: 89, port: 6, sendpop: 1, stereo: 0, target: 1975, voice: 0}
diff --git a/tracker/presets/GTR/Guitar_Wall_PalmMuted.yml b/tracker/presets/GTR/Guitar_Wall_PalmMuted.yml
new file mode 100644
index 0000000..e3109d3
--- /dev/null
+++ b/tracker/presets/GTR/Guitar_Wall_PalmMuted.yml
@@ -0,0 +1,71 @@
+numvoices: 1
+units:
+    - type: envelope
+      id: 1993
+      parameters: {attack: 0, decay: 62, gain: 80, release: 0, stereo: 0, sustain: 0}
+    - type: send
+      id: 1994
+      parameters: {amount: 82, port: 2, sendpop: 0, stereo: 0, target: 1999, voice: 0}
+    - type: send
+      id: 1995
+      parameters: {amount: 100, port: 0, sendpop: 0, stereo: 0, target: 2000, voice: 0}
+    - type: oscillator
+      id: 1996
+      parameters: {color: 64, detune: 64, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 66, type: 0, unison: 1}
+    - type: mulp
+      id: 1997
+      parameters: {stereo: 0}
+    - type: delay
+      id: 1998
+      parameters: {damp: 17, dry: 0, feedback: 125, notetracking: 1, pregain: 63, stereo: 0}
+      varargs: [10847, 5382, 10787]
+    - type: belleq
+      id: 1999
+      parameters: {bandwidth: 39, frequency: 34, gain: 32, stereo: 0}
+    - type: filter
+      id: 2000
+      parameters: {bandpass: 0, frequency: 37, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+    - type: compressor
+      id: 2001
+      parameters: {attack: 22, invgain: 16, ratio: 64, release: 44, stereo: 0, threshold: 64}
+    - type: mulp
+      id: 2002
+      parameters: {stereo: 0}
+    - type: distort
+      id: 2003
+      parameters: {drive: 109, stereo: 0}
+    - type: belleq
+      id: 2004
+      parameters: {bandwidth: 71, frequency: 77, gain: 79, stereo: 0}
+    - type: envelope
+      id: 2005
+      parameters: {attack: 0, decay: 70, gain: 77, release: 66, stereo: 0, sustain: 64}
+    - type: mulp
+      id: 2006
+      parameters: {stereo: 0}
+    - type: distort
+      id: 2007
+      parameters: {drive: 108, stereo: 0}
+    - type: send
+      id: 2008
+      parameters: {amount: 118, port: 0, sendpop: 0, stereo: 0, target: 2010, voice: 0}
+    - id: 2009
+      parameters: {}
+      comment: Output
+    - type: pan
+      id: 2010
+      parameters: {panning: 64, stereo: 0}
+    - type: belleq
+      id: 2011
+      parameters: {bandwidth: 54, frequency: 101, gain: 56, stereo: 1}
+    - type: outaux
+      id: 2012
+      parameters: {auxgain: 5, outgain: 22, stereo: 1}
+    - id: 2013
+      parameters: {}
+    - type: noise
+      id: 2014
+      parameters: {gain: 64, shape: 64, stereo: 0}
+    - type: send
+      id: 2015
+      parameters: {amount: 77, port: 6, sendpop: 1, stereo: 0, target: 1996, voice: 0}
diff --git a/tracker/presets/GTR/Muted_guitar.yml b/tracker/presets/GTR/Muted_guitar.yml
index 3e02e01..18c5313 100644
--- a/tracker/presets/GTR/Muted_guitar.yml
+++ b/tracker/presets/GTR/Muted_guitar.yml
@@ -2,10 +2,10 @@ numvoices: 1
 units:
     - type: envelope
       id: 1215
-      parameters: {attack: 0, decay: 72, gain: 96, release: 64, stereo: 0, sustain: 0}
+      parameters: {attack: 0, decay: 72, gain: 103, release: 64, stereo: 0, sustain: 0}
     - type: oscillator
       id: 1216
-      parameters: {color: 64, detune: 64, gain: 96, looplength: 225, loopstart: 1184, phase: 0, samplestart: 804812, shape: 64, stereo: 0, transpose: 81, type: 4, unison: 0}
+      parameters: {color: 64, detune: 64, gain: 100, looplength: 225, loopstart: 1184, phase: 0, samplestart: 804812, shape: 64, stereo: 0, transpose: 81, type: 4, unison: 0}
     - type: mulp
       id: 1217
       parameters: {stereo: 0}
@@ -14,4 +14,4 @@ units:
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 1219
-      parameters: {auxgain: 9, outgain: 57, stereo: 1}
+      parameters: {auxgain: 7, outgain: 96, stereo: 1}
diff --git a/tracker/presets/GTR/Nylon_guitar_2.yml b/tracker/presets/GTR/Nylon_guitar_2.yml
index 663305e..f8115b7 100644
--- a/tracker/presets/GTR/Nylon_guitar_2.yml
+++ b/tracker/presets/GTR/Nylon_guitar_2.yml
@@ -2,7 +2,7 @@ numvoices: 1
 units:
     - type: envelope
       id: 1215
-      parameters: {attack: 0, decay: 84, gain: 74, release: 87, stereo: 0, sustain: 0}
+      parameters: {attack: 0, decay: 88, gain: 86, release: 72, stereo: 0, sustain: 18}
     - type: oscillator
       id: 1216
       parameters: {color: 64, detune: 64, gain: 80, looplength: 520, loopstart: 2820, phase: 0, samplestart: 832934, shape: 64, stereo: 0, transpose: 54, type: 4, unison: 0}
@@ -11,7 +11,7 @@ units:
       parameters: {stereo: 0}
     - type: filter
       id: 1742
-      parameters: {bandpass: 0, frequency: 72, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+      parameters: {bandpass: 0, frequency: 76, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: hold
       id: 1741
       parameters: {holdfreq: 64, stereo: 0}
@@ -20,4 +20,4 @@ units:
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 1219
-      parameters: {auxgain: 13, outgain: 54, stereo: 1}
+      parameters: {auxgain: 12, outgain: 57, stereo: 1}
diff --git a/tracker/presets/LEAD/Bell_lead_4.yml b/tracker/presets/LEAD/Bell_lead_4.yml
new file mode 100644
index 0000000..e8c3602
--- /dev/null
+++ b/tracker/presets/LEAD/Bell_lead_4.yml
@@ -0,0 +1,46 @@
+name: Bell lead 4
+numvoices: 1
+units:
+    - id: 1250
+      parameters: {}
+      comment: Main oscillators
+    - type: oscillator
+      id: 1268
+      parameters: {color: 70, detune: 68, gain: 26, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 76, type: 2, unison: 3}
+    - type: oscillator
+      id: 1251
+      parameters: {color: 72, detune: 61, gain: 74, looplength: 1645, loopstart: 3820, phase: 0, samplestart: 551786, shape: 103, stereo: 0, transpose: 71, type: 4, unison: 1}
+    - type: addp
+      id: 1269
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1254
+      parameters: {color: 64, detune: 64, gain: 128, looplength: 21, loopstart: 3175, phase: 0, samplestart: 216843, shape: 90, stereo: 0, transpose: 52, type: 4, unison: 0}
+    - type: dbgain
+      id: 1256
+      parameters: {decibels: 75, stereo: 0}
+    - type: addp
+      id: 1255
+      parameters: {stereo: 0}
+    - id: 1252
+      parameters: {}
+      comment: Main envelope
+    - type: envelope
+      id: 1270
+      parameters: {attack: 0, decay: 75, gain: 64, release: 80, stereo: 0, sustain: 64}
+    - type: mulp
+      id: 1271
+      parameters: {stereo: 0}
+    - id: 1003
+      parameters: {}
+      comment: Delay & output
+    - type: pan
+      id: 1272
+      parameters: {panning: 56, stereo: 0}
+    - type: delay
+      id: 1273
+      parameters: {damp: 56, dry: 74, feedback: 95, notetracking: 0, pregain: 64, stereo: 1}
+      varargs: [12550, 24402, 21265, 32419]
+    - type: outaux
+      id: 1253
+      parameters: {auxgain: 25, outgain: 29, stereo: 1}
diff --git a/tracker/presets/PAD/Warm_Sawpad.yml b/tracker/presets/PAD/Warm_Sawpad.yml
new file mode 100644
index 0000000..c3f0738
--- /dev/null
+++ b/tracker/presets/PAD/Warm_Sawpad.yml
@@ -0,0 +1,40 @@
+name: Warm Sawpad
+numvoices: 6
+units:
+    - id: 1753
+      parameters: {}
+      comment: Main oscillators
+    - type: oscillator
+      id: 1754
+      parameters: {color: 128, detune: 55, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 3}
+    - type: envelope
+      id: 1755
+      parameters: {attack: 79, decay: 0, gain: 128, release: 80, stereo: 1, sustain: 128}
+    - type: mulp
+      id: 1756
+      parameters: {stereo: 1}
+    - id: 1757
+      parameters: {}
+      comment: Effects & output
+    - type: filter
+      id: 1758
+      parameters: {bandpass: 0, frequency: 42, highpass: 1, lowpass: 1, resonance: 128, stereo: 1}
+    - type: filter
+      id: 1759
+      parameters: {bandpass: 0, frequency: 45, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+    - type: filter
+      id: 1760
+      parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, resonance: 39, stereo: 1}
+    - type: pan
+      id: 1761
+      parameters: {panning: 64, stereo: 1}
+    - type: delay
+      id: 1762
+      parameters: {damp: 120, dry: 128, feedback: 81, notetracking: 0, pregain: 73, stereo: 1}
+      varargs: [12550, 24402, 21265, 32419]
+    - type: outaux
+      id: 1763
+      parameters: {auxgain: 35, outgain: 60, stereo: 1}
+    - id: 1764
+      parameters: {}
+      comment: Filter modulation
diff --git a/tracker/presets/ST/Strings.yml b/tracker/presets/ST/Strings.yml
index 23ca9e4..ecc191f 100644
--- a/tracker/presets/ST/Strings.yml
+++ b/tracker/presets/ST/Strings.yml
@@ -1,29 +1,30 @@
-numvoices: 1
+name: Strings
+numvoices: 8
 units:
     - id: 224
       parameters: {}
       comment: Modulations
     - type: oscillator
       id: 29
-      parameters: {color: 128, detune: 64, gain: 82, lfo: 1, phase: 0, shape: 35, stereo: 0, transpose: 82, type: 0}
+      parameters: {color: 128, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 41, stereo: 0, transpose: 82, type: 0}
     - type: send
       id: 44
-      parameters: {amount: 74, port: 1, sendpop: 0, stereo: 0, target: 24, voice: 0}
+      parameters: {amount: 73, port: 1, sendpop: 0, stereo: 0, target: 24, voice: 0}
     - type: send
-      id: 1241
-      parameters: {amount: 48, port: 1, sendpop: 1, stereo: 0, target: 37, voice: 0}
+      id: 1615
+      parameters: {amount: 50, port: 1, sendpop: 1, stereo: 0, target: 37, voice: 0}
     - id: 225
       parameters: {}
       comment: Left
     - type: envelope
       id: 33
-      parameters: {attack: 57, decay: 93, gain: 64, release: 71, stereo: 0, sustain: 64}
+      parameters: {attack: 64, decay: 94, gain: 45, release: 80, stereo: 0, sustain: 128}
     - type: oscillator
       id: 24
-      parameters: {color: 69, detune: 64, gain: 64, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 67, type: 4, unison: 1}
+      parameters: {color: 64, detune: 64, gain: 64, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 67, type: 4, unison: 3}
     - type: oscillator
       id: 1242
-      parameters: {color: 69, detune: 64, gain: 64, looplength: 11272, loopstart: 147, phase: 0, samplestart: 1458843, shape: 64, stereo: 0, transpose: 65, type: 4, unison: 0}
+      parameters: {color: 64, detune: 71, gain: 113, looplength: 9710, loopstart: 251, phase: 0, samplestart: 1448797, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 0}
     - type: addp
       id: 20
       parameters: {stereo: 0}
@@ -35,13 +36,13 @@ units:
       comment: Right
     - type: envelope
       id: 46
-      parameters: {attack: 57, decay: 93, gain: 64, release: 71, stereo: 0, sustain: 64}
+      parameters: {attack: 69, decay: 94, gain: 53, release: 80, stereo: 0, sustain: 128}
     - type: oscillator
       id: 37
-      parameters: {color: 64, detune: 64, gain: 64, looplength: 9710, loopstart: 251, phase: 0, samplestart: 1448797, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 1}
+      parameters: {color: 64, detune: 73, gain: 128, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 67, type: 4, unison: 2}
     - type: oscillator
       id: 38
-      parameters: {color: 128, detune: 58, gain: 58, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 80, stereo: 0, transpose: 67, type: 4, unison: 0}
+      parameters: {color: 64, detune: 65, gain: 109, looplength: 9710, loopstart: 251, phase: 0, samplestart: 1448797, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 0}
     - type: addp
       id: 39
       parameters: {stereo: 0}
@@ -52,8 +53,8 @@ units:
       parameters: {}
       comment: Effects & output
     - type: filter
-      id: 45
-      parameters: {bandpass: 1, frequency: 100, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+      id: 1690
+      parameters: {bandpass: -1, frequency: 128, highpass: 1, lowpass: 1, resonance: 74, stereo: 1}
     - type: outaux
       id: 23
-      parameters: {auxgain: 15, outgain: 19, stereo: 1}
+      parameters: {auxgain: 40, outgain: 80, stereo: 1}
diff --git a/tracker/presets/UTIL/UTIL_globalmastering.yml b/tracker/presets/UTIL/UTIL_globalmastering.yml
new file mode 100644
index 0000000..fcd8314
--- /dev/null
+++ b/tracker/presets/UTIL/UTIL_globalmastering.yml
@@ -0,0 +1,43 @@
+name: UTIL global-mastering
+numvoices: 1
+units:
+    - id: 1173
+      parameters: {}
+      comment: Aux1 reverb
+    - type: in
+      id: 1157
+      parameters: {channel: 2, stereo: 1}
+    - type: delay
+      id: 1158
+      parameters: {damp: 64, dry: 0, feedback: 121, notetracking: 0, pregain: 70, stereo: 1}
+      varargs: [1116, 1188, 1276, 1356, 1422, 1492, 1556, 1618, 1140, 1212, 1300, 1380, 1446, 1516, 1580, 1642]
+    - type: out
+      id: 1169
+      parameters: {gain: 90, stereo: 1}
+    - id: 1174
+      parameters: {}
+      comment: Mastering
+    - type: in
+      id: 1170
+      parameters: {channel: 0, stereo: 1}
+    - type: gain
+      id: 1697
+      parameters: {gain: 21, stereo: 1}
+    - type: filter
+      id: 1171
+      parameters: {bandpass: -1, frequency: 100, highpass: -1, lowpass: 1, resonance: 128, stereo: 1}
+      comment: Limit highs
+    - type: filter
+      id: 1166
+      parameters: {bandpass: -1, frequency: 12, highpass: -1, lowpass: 1, resonance: 96, stereo: 1}
+      comment: Low cut
+    - type: compressor
+      id: 1694
+      parameters: {attack: 45, invgain: 89, ratio: 110, release: 45, stereo: 1, threshold: 85}
+    - type: mulp
+      id: 1695
+      parameters: {stereo: 1}
+    - type: out
+      id: 1172
+      parameters: {gain: 64, stereo: 1}
+      comment: Master gain