diff --git a/tracker/presets/BA/Deep_bass_2.yml b/tracker/presets/BA/Deep_bass_2.yml
index b1c4eeb..3cab45a 100644
--- a/tracker/presets/BA/Deep_bass_2.yml
+++ b/tracker/presets/BA/Deep_bass_2.yml
@@ -1,37 +1,39 @@
+name: Deep bass 2
+numvoices: 1
 units:
     - type: oscillator
-      id: 1983
+      id: 1923
       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}
+      id: 1924
+      parameters: {color: 112, detune: 54, gain: 64, lfo: 0, phase: 32, shape: 29, stereo: 1, transpose: 64, type: 1, unison: 3}
     - type: distort
-      id: 1708
+      id: 1925
       parameters: {drive: 104, stereo: 1}
     - type: addp
-      id: 1985
+      id: 1926
       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}
+      id: 1927
+      parameters: {color: 51, detune: 72, gain: 95, phase: 64, shape: 48, stereo: 1, transpose: 52, type: 0, unison: 3}
     - type: distort
-      id: 1709
+      id: 1928
       parameters: {drive: 122, stereo: 1}
     - type: addp
-      id: 1701
+      id: 1929
       parameters: {stereo: 1}
     - type: envelope
-      id: 1986
-      parameters: {attack: 24, decay: 24, gain: 93, release: 56, stereo: 1, sustain: 128}
+      id: 1930
+      parameters: {attack: 39, decay: 64, gain: 93, release: 64, stereo: 1, sustain: 128}
     - type: mulp
-      id: 1987
+      id: 1931
       parameters: {stereo: 1}
     - type: pan
-      id: 1988
+      id: 1932
       parameters: {panning: 64, stereo: 1}
     - type: filter
-      id: 1707
+      id: 1933
       parameters: {bandpass: 0, frequency: 12, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
     - type: outaux
-      id: 1989
-      parameters: {auxgain: 0, outgain: 15, stereo: 1}
+      id: 1934
+      parameters: {auxgain: 0, outgain: 21, stereo: 1}
diff --git a/tracker/presets/BA/Fatbeat_bass.yml b/tracker/presets/BA/Fatbeat_bass.yml
index 0b8ca2d..9df453c 100644
--- a/tracker/presets/BA/Fatbeat_bass.yml
+++ b/tracker/presets/BA/Fatbeat_bass.yml
@@ -1,10 +1,23 @@
+name: Fatbeat bass
+numvoices: 4
 units:
+    - id: 1807
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 1808
+      parameters: {attack: 47, decay: 64, gain: 74, release: 64, stereo: 0, sustain: 52}
+    - type: send
+      id: 1811
+      parameters: {amount: 106, port: 3, sendpop: 1, target: 1814}
+    - id: 1823
+      parameters: {}
     - type: envelope
       id: 1821
-      parameters: {attack: 71, decay: 0, gain: 64, release: 85, stereo: 0, sustain: 128}
+      parameters: {attack: 78, decay: 0, gain: 128, release: 64, stereo: 0, sustain: 128}
     - type: send
       id: 1810
-      parameters: {amount: 0, port: 0, sendpop: 1, stereo: 0, target: 1852, voice: 0}
+      parameters: {amount: 2, port: 0, sendpop: 1, stereo: 0, target: 1852, voice: 0}
     - id: 1812
       parameters: {}
       comment: Main body
@@ -12,19 +25,22 @@ units:
       parameters: {}
     - type: envelope
       id: 1813
-      parameters: {attack: 23, decay: 0, gain: 127, release: 73, stereo: 0, sustain: 128}
+      parameters: {attack: 30, decay: 71, gain: 127, release: 60, stereo: 0, sustain: 95}
     - 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}
+      parameters: {color: 128, detune: 50, gain: 64, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 88, 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}
+      parameters: {color: 55, detune: 80, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 76, 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}
+      parameters: {color: 64, detune: 54, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 2, unison: 2}
+    - type: dbgain
+      id: 1830
+      parameters: {decibels: 78, stereo: 0}
     - type: addp
       id: 1819
       parameters: {stereo: 0}
@@ -33,7 +49,7 @@ units:
       parameters: {stereo: 0}
     - type: filter
       id: 1852
-      parameters: {bandpass: 0, frequency: 88, highpass: 0, lowpass: 1, resonance: 104, stereo: 0}
+      parameters: {bandpass: 0, frequency: 0, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: pan
       id: 1816
       parameters: {panning: 64, stereo: 0}
@@ -41,10 +57,10 @@ units:
       parameters: {}
     - type: compressor
       id: 1854
-      parameters: {attack: 48, invgain: 64, ratio: 90, release: 69, stereo: 1, threshold: 36}
+      parameters: {attack: 29, invgain: 71, ratio: 81, release: 60, stereo: 1, threshold: 77}
     - type: mulp
       id: 1855
       parameters: {stereo: 1}
     - type: outaux
       id: 1817
-      parameters: {auxgain: 0, outgain: 18, stereo: 1}
+      parameters: {auxgain: 0, outgain: 36, stereo: 1}
diff --git a/tracker/presets/BA/Fatbeat_bass_2.yml b/tracker/presets/BA/Fatbeat_bass_2.yml
new file mode 100644
index 0000000..9df453c
--- /dev/null
+++ b/tracker/presets/BA/Fatbeat_bass_2.yml
@@ -0,0 +1,66 @@
+name: Fatbeat bass
+numvoices: 4
+units:
+    - id: 1807
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 1808
+      parameters: {attack: 47, decay: 64, gain: 74, release: 64, stereo: 0, sustain: 52}
+    - type: send
+      id: 1811
+      parameters: {amount: 106, port: 3, sendpop: 1, target: 1814}
+    - id: 1823
+      parameters: {}
+    - type: envelope
+      id: 1821
+      parameters: {attack: 78, decay: 0, gain: 128, release: 64, stereo: 0, sustain: 128}
+    - type: send
+      id: 1810
+      parameters: {amount: 2, 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: 30, decay: 71, gain: 127, release: 60, stereo: 0, sustain: 95}
+    - type: oscillator
+      id: 1849
+      parameters: {color: 128, detune: 50, gain: 64, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 88, type: 1, unison: 2}
+    - type: oscillator
+      id: 1814
+      parameters: {color: 55, detune: 80, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 2}
+    - type: addp
+      id: 1850
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 1818
+      parameters: {color: 64, detune: 54, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 2, unison: 2}
+    - type: dbgain
+      id: 1830
+      parameters: {decibels: 78, stereo: 0}
+    - type: addp
+      id: 1819
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 1851
+      parameters: {stereo: 0}
+    - type: filter
+      id: 1852
+      parameters: {bandpass: 0, frequency: 0, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+    - type: pan
+      id: 1816
+      parameters: {panning: 64, stereo: 0}
+    - id: 1853
+      parameters: {}
+    - type: compressor
+      id: 1854
+      parameters: {attack: 29, invgain: 71, ratio: 81, release: 60, stereo: 1, threshold: 77}
+    - type: mulp
+      id: 1855
+      parameters: {stereo: 1}
+    - type: outaux
+      id: 1817
+      parameters: {auxgain: 0, outgain: 36, stereo: 1}
diff --git a/tracker/presets/BA/Reese_bass.yml b/tracker/presets/BA/Reese_bass.yml
new file mode 100644
index 0000000..b8f4367
--- /dev/null
+++ b/tracker/presets/BA/Reese_bass.yml
@@ -0,0 +1,42 @@
+name: Reese bass
+numvoices: 1
+units:
+    - type: oscillator
+      id: 1756
+      parameters: {color: 122, detune: 77, gain: 60, lfo: 0, phase: 0, shape: 113, stereo: 1, transpose: 64, type: 1, unison: 3}
+    - type: send
+      id: 1724
+      parameters: {amount: 93, port: 0, sendpop: 0, stereo: 0, target: 1763, voice: 0}
+    - type: oscillator
+      id: 1757
+      parameters: {color: 112, detune: 54, gain: 64, lfo: 0, phase: 32, shape: 29, stereo: 1, transpose: 64, type: 1, unison: 3}
+    - type: distort
+      id: 1758
+      parameters: {drive: 96, stereo: 1}
+    - type: addp
+      id: 1759
+      parameters: {stereo: 1}
+    - type: oscillator
+      id: 1722
+      parameters: {color: 103, detune: 72, gain: 64, phase: 0, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 3}
+    - type: distort
+      id: 1760
+      parameters: {drive: 126, stereo: 1}
+    - type: addp
+      id: 1723
+      parameters: {stereo: 1}
+    - type: envelope
+      id: 1761
+      parameters: {attack: 35, decay: 0, gain: 93, release: 68, stereo: 1, sustain: 128}
+    - type: mulp
+      id: 1762
+      parameters: {stereo: 1}
+    - type: pan
+      id: 1763
+      parameters: {panning: 64, stereo: 1}
+    - type: filter
+      id: 1764
+      parameters: {bandpass: 1, frequency: 10, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+    - type: outaux
+      id: 1765
+      parameters: {auxgain: 0, outgain: 13, stereo: 1}
diff --git a/tracker/presets/BA/Trance_bass.yml b/tracker/presets/BA/Trance_bass.yml
index c6ee8ef..ab6a9b1 100644
--- a/tracker/presets/BA/Trance_bass.yml
+++ b/tracker/presets/BA/Trance_bass.yml
@@ -1,51 +1,69 @@
+name: Trance bass
+numvoices: 2
 units:
-    - id: 1351
+    - id: 1807
       parameters: {}
       comment: Modulations
     - type: envelope
-      id: 173
-      parameters: {attack: 0, decay: 70, gain: 128, release: 53, stereo: 0, sustain: 64}
+      id: 1808
+      parameters: {attack: 30, decay: 100, gain: 128, release: 0, stereo: 0, sustain: 64}
     - type: send
-      id: 174
-      parameters: {amount: 81, port: 0, sendpop: 0, target: 181}
+      id: 1811
+      parameters: {amount: 101, port: 3, sendpop: 1, target: 1814}
+    - id: 1823
+      parameters: {}
+    - type: envelope
+      id: 1821
+      parameters: {attack: 0, decay: 76, gain: 128, release: 25, stereo: 0, sustain: 0}
     - type: send
-      id: 175
-      parameters: {amount: 103, port: 3, sendpop: 1, target: 179}
-    - id: 1350
+      id: 1810
+      parameters: {amount: 107, port: 0, sendpop: 1, stereo: 0, target: 23, voice: 0}
+    - id: 1812
       parameters: {}
       comment: Main body
+    - id: 1822
+      parameters: {}
     - type: envelope
-      id: 176
-      parameters: {attack: 0, decay: 0, gain: 64, release: 45, stereo: 0, sustain: 64}
+      id: 1813
+      parameters: {attack: 30, decay: 71, gain: 127, release: 60, stereo: 0, sustain: 95}
     - type: oscillator
       id: 177
-      parameters: {color: 100, detune: 69, gain: 64, lfo: 0, phase: 0, shape: 75, stereo: 0, transpose: 64, type: 0, unison: 1}
+      parameters: {color: 128, detune: 50, gain: 64, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 88, type: 1, unison: 2}
     - type: oscillator
-      id: 179
-      parameters: {color: 65, detune: 54, gain: 64, lfo: 0, phase: 64, shape: 79, stereo: 0, transpose: 76, type: 1, unison: 1}
+      id: 1814
+      parameters: {color: 55, detune: 80, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 2}
     - type: addp
       id: 178
       parameters: {stereo: 0}
+    - type: oscillator
+      id: 1818
+      parameters: {color: 32, detune: 54, gain: 128, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 1}
+    - type: dbgain
+      id: 1830
+      parameters: {decibels: 79, stereo: 0}
+    - type: addp
+      id: 1819
+      parameters: {stereo: 0}
     - type: mulp
       id: 185
       parameters: {stereo: 0}
     - type: filter
-      id: 181
-      parameters: {bandpass: 0, frequency: 47, highpass: 0, lowpass: 1, resonance: 95, stereo: 0}
+      id: 1815
+      parameters: {bandpass: 0, frequency: 53, highpass: 1, lowpass: 1, resonance: 64, stereo: 0}
     - type: filter
-      id: 1698
-      parameters: {bandpass: -1, frequency: 11, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
+      id: 182
+      parameters: {bandpass: 1, frequency: 68, highpass: 1, lowpass: 1, resonance: 96, stereo: 0}
     - type: pan
-      id: 183
+      id: 1816
       parameters: {panning: 64, stereo: 0}
     - id: 1344
       parameters: {}
     - type: compressor
       id: 186
-      parameters: {attack: 45, invgain: 64, ratio: 93, release: 50, stereo: 1, threshold: 64}
+      parameters: {attack: 51, invgain: 64, ratio: 117, release: 48, stereo: 1, threshold: 64}
     - type: mulp
       id: 187
       parameters: {stereo: 1}
     - type: outaux
-      id: 184
-      parameters: {auxgain: 6, outgain: 36, stereo: 1}
+      id: 1817
+      parameters: {auxgain: 0, outgain: 128, stereo: 1}
diff --git a/tracker/presets/BA/Trance_bass_4.yml b/tracker/presets/BA/Trance_bass_4.yml
new file mode 100644
index 0000000..a149508
--- /dev/null
+++ b/tracker/presets/BA/Trance_bass_4.yml
@@ -0,0 +1,67 @@
+name: Trance bass 4
+numvoices: 5
+units:
+    - id: 1351
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 173
+      parameters: {attack: 0, decay: 76, gain: 128, release: 86, stereo: 0, sustain: 64}
+    - type: send
+      id: 2114
+      parameters: {amount: 100, port: 0, sendpop: 0, target: 2116}
+    - type: send
+      id: 175
+      parameters: {amount: 100, port: 3, sendpop: 1, target: 179, voice: 0}
+    - id: 1350
+      parameters: {}
+      comment: Main body
+    - type: envelope
+      id: 176
+      parameters: {attack: 0, decay: 77, gain: 76, release: 54, stereo: 0, sustain: 64}
+    - type: oscillator
+      id: 177
+      parameters: {color: 128, detune: 65, gain: 87, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
+    - type: distort
+      id: 1698
+      parameters: {drive: 118}
+    - type: filter
+      id: 1708
+      parameters: {bandpass: 1, frequency: 69, highpass: 0, lowpass: 1, resonance: 128}
+    - type: oscillator
+      id: 179
+      parameters: {color: 57, detune: 64, gain: 74, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 0}
+    - type: distort
+      id: 2115
+      parameters: {drive: 80}
+    - type: addp
+      id: 178
+      parameters: {stereo: 0}
+    - type: mulp
+      id: 185
+      parameters: {stereo: 0}
+    - type: filter
+      id: 2116
+      parameters: {bandpass: 1, frequency: 0, highpass: 0, lowpass: 1, resonance: 87, stereo: 0}
+    - id: 1344
+      parameters: {}
+    - type: pan
+      id: 183
+      parameters: {panning: 62, stereo: 0}
+    - type: outaux
+      id: 184
+      parameters: {auxgain: 0, outgain: 41, stereo: 1}
+    - id: 1702
+      parameters: {}
+    - type: noise
+      id: 1703
+      parameters: {gain: 40, shape: 47}
+    - type: send
+      id: 2117
+      parameters: {amount: 62, port: 2, sendpop: 0, target: 177}
+    - type: hold
+      id: 2118
+      parameters: {holdfreq: 0}
+    - type: send
+      id: 2119
+      parameters: {amount: 26, port: 2, sendpop: 1, target: 179}
diff --git a/tracker/presets/BA/Trance_bass_5.yml b/tracker/presets/BA/Trance_bass_5.yml
new file mode 100644
index 0000000..9eae3cd
--- /dev/null
+++ b/tracker/presets/BA/Trance_bass_5.yml
@@ -0,0 +1,69 @@
+name: Trance bass 5
+numvoices: 5
+units:
+    - id: 2092
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 2093
+      parameters: {attack: 0, decay: 78, gain: 128, release: 86, stereo: 0, sustain: 64}
+    - type: send
+      id: 174
+      parameters: {amount: 104, port: 0, sendpop: 0, target: 181}
+    - type: send
+      id: 2094
+      parameters: {amount: 100, port: 3, sendpop: 1, target: 2105, voice: 0}
+    - type: noise
+      id: 2095
+      parameters: {gain: 64, shape: 39}
+    - type: send
+      id: 2096
+      parameters: {amount: 62, port: 2, sendpop: 0, target: 2100}
+    - type: hold
+      id: 2097
+      parameters: {holdfreq: 0}
+    - type: send
+      id: 2098
+      parameters: {amount: 26, port: 2, sendpop: 1, target: 2105}
+    - id: 2099
+      parameters: {}
+      comment: Main body
+    - type: oscillator
+      id: 2100
+      parameters: {color: 128, detune: 64, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
+    - type: distort
+      id: 2101
+      parameters: {drive: 120}
+    - type: filter
+      id: 2102
+      parameters: {bandpass: 1, frequency: 80, highpass: 0, lowpass: 1, resonance: 96}
+    - type: push
+      id: 2103
+      parameters: {}
+    - id: 2104
+      parameters: {}
+    - type: oscillator
+      id: 2105
+      parameters: {color: 64, detune: 63, gain: 71, lfo: 0, phase: 64, shape: 64, stereo: 1, transpose: 76, type: 1, unison: 1}
+    - type: distort
+      id: 2106
+      parameters: {drive: 70, stereo: 1}
+    - type: addp
+      id: 2107
+      parameters: {stereo: 1}
+    - type: filter
+      id: 181
+      parameters: {bandpass: 0, frequency: 0, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+    - type: envelope
+      id: 2108
+      parameters: {attack: 0, decay: 75, gain: 48, release: 72, stereo: 1, sustain: 64}
+    - type: mulp
+      id: 2109
+      parameters: {stereo: 1}
+    - id: 2110
+      parameters: {}
+    - type: outaux
+      id: 2112
+      parameters: {auxgain: 0, outgain: 67, stereo: 1}
+    - id: 2113
+      parameters: {}
diff --git a/tracker/presets/BA/Trance_bass_6.yml b/tracker/presets/BA/Trance_bass_6.yml
new file mode 100644
index 0000000..8c37610
--- /dev/null
+++ b/tracker/presets/BA/Trance_bass_6.yml
@@ -0,0 +1,83 @@
+name: Trance bass 6
+numvoices: 5
+units:
+    - id: 2055
+      parameters: {}
+      comment: Modulations
+    - type: envelope
+      id: 2090
+      parameters: {attack: 70, decay: 0, gain: 128, release: 77, sustain: 128}
+    - type: send
+      id: 2091
+      parameters: {amount: 0, port: 0, sendpop: 1, target: 2087}
+    - type: envelope
+      id: 2056
+      parameters: {attack: 0, decay: 78, gain: 128, release: 64, stereo: 0, sustain: 64}
+    - type: send
+      id: 2057
+      parameters: {amount: 104, port: 0, sendpop: 0, target: 2080}
+    - type: send
+      id: 2058
+      parameters: {amount: 100, port: 3, sendpop: 1, target: 2077, voice: 0}
+    - type: noise
+      id: 2059
+      parameters: {gain: 64, shape: 39}
+    - type: send
+      id: 2060
+      parameters: {amount: 62, port: 2, sendpop: 0, target: 2064}
+    - type: hold
+      id: 2061
+      parameters: {holdfreq: 0}
+    - type: send
+      id: 2062
+      parameters: {amount: 26, port: 2, sendpop: 1, target: 2077}
+    - id: 2063
+      parameters: {}
+      comment: Main body
+    - type: oscillator
+      id: 2064
+      parameters: {color: 128, detune: 64, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
+    - type: distort
+      id: 2065
+      parameters: {drive: 119}
+    - type: filter
+      id: 2066
+      parameters: {bandpass: -1, frequency: 84, highpass: 1, lowpass: 1, resonance: 78}
+    - type: push
+      id: 2076
+      parameters: {}
+    - id: 2075
+      parameters: {}
+    - type: oscillator
+      id: 2077
+      parameters: {color: 64, detune: 63, gain: 71, lfo: 0, phase: 64, shape: 64, stereo: 1, transpose: 76, type: 1, unison: 1}
+    - type: distort
+      id: 2078
+      parameters: {drive: 70, stereo: 1}
+    - type: addp
+      id: 2079
+      parameters: {stereo: 1}
+    - type: filter
+      id: 2080
+      parameters: {bandpass: 0, frequency: 0, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+    - type: envelope
+      id: 2081
+      parameters: {attack: 20, decay: 78, gain: 48, release: 56, stereo: 1, sustain: 53}
+    - type: mulp
+      id: 2074
+      parameters: {stereo: 1}
+    - id: 2082
+      parameters: {}
+    - type: push
+      id: 2086
+      parameters: {stereo: 1}
+    - type: outaux
+      id: 2067
+      parameters: {auxgain: 0, outgain: 64, stereo: 1}
+    - id: 2088
+      parameters: {}
+    - type: outaux
+      id: 2087
+      parameters: {auxgain: 0, outgain: 0, stereo: 1}
+    - id: 2089
+      parameters: {}
diff --git a/tracker/presets/LEAD/Bell_lead_4.yml b/tracker/presets/BL/Bell_lead_4.yml
similarity index 100%
rename from tracker/presets/LEAD/Bell_lead_4.yml
rename to tracker/presets/BL/Bell_lead_4.yml
diff --git a/tracker/presets/BL/Trance_bells_2.yml b/tracker/presets/BL/Trance_bells_2.yml
index b35cdb3..a63d24c 100644
--- a/tracker/presets/BL/Trance_bells_2.yml
+++ b/tracker/presets/BL/Trance_bells_2.yml
@@ -1,34 +1,27 @@
-comment: |-
-    Generic pluck generator
-    Use oscillator type, color and shape to alter the sound properties
+name: Trance bells 2
+numvoices: 3
 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}
+      id: 2053
+      parameters: {color: 64, detune: 61, gain: 30, lfo: 0, phase: 0, shape: 104, stereo: 1, transpose: 64, type: 1, unison: 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}
+      id: 1794
+      parameters: {color: 86, detune: 73, gain: 32, lfo: 0, phase: 64, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 3}
     - type: addp
-      id: 1976
+      id: 1795
       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}
+      parameters: {color: 108, detune: 56, gain: 32, lfo: 0, phase: 85, shape: 31, stereo: 1, transpose: 76, type: 1, unison: 3}
     - type: addp
       id: 2034
       parameters: {stereo: 1}
+    - type: envelope
+      id: 1793
+      parameters: {attack: 22, decay: 84, gain: 66, release: 84, stereo: 1, sustain: 64}
     - type: mulp
       id: 1798
       parameters: {stereo: 1}
@@ -37,14 +30,17 @@ units:
       comment: Modulated filters
     - type: filter
       id: 2046
-      parameters: {bandpass: 0, frequency: 121, highpass: -1, lowpass: 1, resonance: 84, stereo: 1}
-    - id: 2047
+      parameters: {bandpass: 0, frequency: 96, highpass: -1, lowpass: 1, resonance: 128, stereo: 1}
+    - id: 1799
       parameters: {}
       comment: Delay & output
+    - type: pan
+      id: 2054
+      parameters: {panning: 64, stereo: 1}
     - type: delay
       id: 1801
-      parameters: {damp: 0, dry: 72, feedback: 57, notetracking: 2, pregain: 63, stereo: 1}
+      parameters: {damp: 0, dry: 75, feedback: 84, notetracking: 2, pregain: 63, stereo: 1}
       varargs: [36, 74]
     - type: outaux
       id: 1802
-      parameters: {auxgain: 12, outgain: 26, stereo: 1}
+      parameters: {auxgain: 16, outgain: 64, stereo: 1}
diff --git a/tracker/presets/CHIP/Chip_bass_stereo.yml b/tracker/presets/CHIP/Chip_bass_stereo.yml
new file mode 100644
index 0000000..a7a6fa2
--- /dev/null
+++ b/tracker/presets/CHIP/Chip_bass_stereo.yml
@@ -0,0 +1,30 @@
+name: Chip bass stereo
+numvoices: 5
+units:
+    - type: oscillator
+      id: 1709
+      parameters: {color: 64, detune: 69, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 1}
+    - type: envelope
+      id: 1708
+      parameters: {attack: 20, decay: 73, gain: 64, release: 67, stereo: 1, sustain: 64}
+    - type: mulp
+      id: 1713
+      parameters: {stereo: 1}
+    - type: distort
+      id: 1710
+      parameters: {drive: 106, stereo: 1}
+    - type: hold
+      id: 1711
+      parameters: {holdfreq: 35, stereo: 1}
+    - type: distort
+      id: 1712
+      parameters: {drive: 110, stereo: 1}
+    - type: send
+      id: 1714
+      parameters: {amount: 18, port: 0, sendpop: 0, stereo: 1, target: 1715}
+    - type: pan
+      id: 1715
+      parameters: {panning: 64, stereo: 1}
+    - type: outaux
+      id: 1716
+      parameters: {auxgain: 0, outgain: 42, stereo: 1}
diff --git a/tracker/presets/DR/DR_kickedm2.yml b/tracker/presets/DR/DR_kickedm2.yml
index ce3fdb9..83c881d 100644
--- a/tracker/presets/DR/DR_kickedm2.yml
+++ b/tracker/presets/DR/DR_kickedm2.yml
@@ -1,23 +1,25 @@
+name: DR kickedm2
 comment: A#2
+numvoices: 1
 units:
-    - id: 1660
+    - id: 1833
       parameters: {}
-      comment: Pitch drop
+      comment: 'Suggested range: A-1 --> C-2'
     - type: envelope
       id: 1661
-      parameters: {attack: 64, decay: 0, gain: 128, release: 0, stereo: 0, sustain: 128}
+      parameters: {attack: 66, decay: 0, gain: 128, release: 64, stereo: 0, sustain: 128}
     - type: send
       id: 1664
-      parameters: {amount: 52, port: 0, sendpop: 1, target: 1667}
+      parameters: {amount: 53, 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}
+      parameters: {color: 117, detune: 75, gain: 128, lfo: 0, phase: 32, shape: 70, stereo: 0, transpose: 82, type: 0, unison: 2}
+    - type: envelope
+      id: 1666
+      parameters: {attack: 0, decay: 73, gain: 64, release: 0, stereo: 0, sustain: 0}
     - type: mulp
       id: 1668
       parameters: {stereo: 0}
@@ -26,34 +28,25 @@ units:
       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}
+      parameters: {attack: 5, decay: 26, gain: 128, release: 0, stereo: 0, sustain: 0}
     - type: filter
       id: 1672
-      parameters: {bandpass: 1, frequency: 99, highpass: -1, lowpass: 0, resonance: 128, stereo: 0}
+      parameters: {bandpass: -1, frequency: 114, highpass: 0, lowpass: 0, resonance: 80, stereo: 0}
     - type: dbgain
       id: 1832
-      parameters: {decibels: 81, stereo: 0}
-    - type: mulp
-      id: 1674
-      parameters: {stereo: 0}
+      parameters: {decibels: 85, 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}
+      parameters: {bandpass: 0, frequency: 85, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
     - type: filter
       id: 1677
-      parameters: {bandpass: 1, frequency: 9, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
+      parameters: {bandpass: 1, frequency: 12, highpass: 1, lowpass: 0, resonance: 57, stereo: 0}
     - id: 1679
       parameters: {}
       comment: Output
@@ -62,4 +55,6 @@ units:
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 1681
-      parameters: {auxgain: 1, outgain: 128, stereo: 1}
+      parameters: {auxgain: 3, outgain: 24, stereo: 1}
+    - id: 1682
+      parameters: {}
diff --git a/tracker/presets/KEYS/Pop_piano.yml b/tracker/presets/KEYS/Pop_piano.yml
index 0d2a655..ac8fa2e 100644
--- a/tracker/presets/KEYS/Pop_piano.yml
+++ b/tracker/presets/KEYS/Pop_piano.yml
@@ -1,22 +1,21 @@
+name: Pop piano
+numvoices: 4
 units:
     - type: envelope
-      id: 1241
-      parameters: {attack: 0, decay: 79, gain: 96, release: 71, stereo: 1, sustain: 33}
+      id: 1836
+      parameters: {attack: 15, decay: 79, gain: 96, release: 72, stereo: 1, sustain: 30}
     - type: oscillator
-      id: 1242
-      parameters: {color: 64, detune: 63, gain: 96, looplength: 1487, loopstart: 8309, phase: 0, samplestart: 972709, shape: 64, stereo: 1, transpose: 68, type: 4, unison: 0}
+      id: 1837
+      parameters: {color: 64, detune: 63, gain: 96, looplength: 1487, loopstart: 8309, phase: 64, samplestart: 972709, shape: 64, stereo: 1, transpose: 68, type: 4, unison: 1}
     - type: mulp
-      id: 1243
+      id: 1838
       parameters: {stereo: 1}
     - type: filter
-      id: 1741
-      parameters: {bandpass: 0, frequency: 93, highpass: 0, lowpass: 1, resonance: 113, stereo: 1}
-    - type: hold
-      id: 1742
-      parameters: {holdfreq: 91, stereo: 1}
+      id: 1839
+      parameters: {bandpass: 0, frequency: 112, highpass: 0, lowpass: 1, resonance: 103, stereo: 1}
     - type: pan
-      id: 1244
+      id: 1840
       parameters: {panning: 64, stereo: 1}
     - type: outaux
-      id: 1245
-      parameters: {auxgain: 19, outgain: 64, stereo: 1}
+      id: 1841
+      parameters: {auxgain: 25, outgain: 42, stereo: 1}
diff --git a/tracker/presets/KEYS/Pop_piano_2.yml b/tracker/presets/KEYS/Pop_piano_2.yml
index c45776b..2cc9268 100644
--- a/tracker/presets/KEYS/Pop_piano_2.yml
+++ b/tracker/presets/KEYS/Pop_piano_2.yml
@@ -1,37 +1,42 @@
+name: Pop piano 2
+numvoices: 4
 units:
     - id: 1187
       parameters: {}
       comment: Oscillators
     - type: oscillator
-      id: 2
-      parameters: {color: 64, detune: 64, gain: 96, looplength: 1854, loopstart: 9313, phase: 0, samplestart: 961458, shape: 64, stereo: 0, transpose: 76, type: 4, unison: 0}
+      id: 1396
+      parameters: {color: 64, detune: 64, gain: 64, looplength: 1339, loopstart: 9176, phase: 32, samplestart: 982589, shape: 64, stereo: 0, transpose: 60, type: 4, unison: 1}
     - type: oscillator
       id: 1241
-      parameters: {color: 64, detune: 67, gain: 96, looplength: 1487, loopstart: 8309, phase: 0, samplestart: 972709, shape: 64, stereo: 0, transpose: 68, type: 4}
+      parameters: {color: 64, detune: 64, gain: 128, looplength: 1487, loopstart: 8309, phase: 0, samplestart: 972709, shape: 64, stereo: 0, transpose: 68, type: 4, unison: 0}
     - type: addp
-      id: 1185
+      id: 1818
       parameters: {stereo: 0}
     - id: 1188
       parameters: {}
       comment: Envelope
     - type: envelope
       id: 1
-      parameters: {attack: 0, decay: 80, gain: 64, release: 34, stereo: 0, sustain: 36}
+      parameters: {attack: 11, decay: 82, gain: 64, release: 69, stereo: 0, sustain: 20}
     - type: mulp
-      id: 1186
+      id: 1819
       parameters: {stereo: 0}
     - id: 1189
       parameters: {}
       comment: Pan & output
     - type: filter
-      id: 1741
-      parameters: {bandpass: 0, frequency: 76, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
-    - type: hold
-      id: 1742
-      parameters: {holdfreq: 91, stereo: 0}
+      id: 1805
+      parameters: {bandpass: 0, frequency: 94, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
+    - type: compressor
+      id: 1397
+      parameters: {attack: 43, invgain: 70, ratio: 72, release: 74, stereo: 0, threshold: 30}
+    - type: mulp
+      id: 1398
+      parameters: {stereo: 0}
     - type: pan
       id: 5
       parameters: {panning: 64, stereo: 0}
     - type: outaux
       id: 6
-      parameters: {auxgain: 19, outgain: 64, stereo: 1}
+      parameters: {auxgain: 0, outgain: 29, stereo: 1}
diff --git a/tracker/presets/KEYS/Pop_piano_st.yml b/tracker/presets/KEYS/Pop_piano_st.yml
new file mode 100644
index 0000000..6cd0526
--- /dev/null
+++ b/tracker/presets/KEYS/Pop_piano_st.yml
@@ -0,0 +1,42 @@
+name: Pop piano st
+numvoices: 4
+units:
+    - id: 1820
+      parameters: {}
+      comment: Oscillators
+    - type: oscillator
+      id: 1821
+      parameters: {color: 64, detune: 66, gain: 64, looplength: 1339, loopstart: 9176, phase: 75, samplestart: 982589, shape: 50, stereo: 1, transpose: 60, type: 4, unison: 2}
+    - type: oscillator
+      id: 1822
+      parameters: {color: 64, detune: 64, gain: 64, looplength: 1487, loopstart: 8309, phase: 0, samplestart: 972709, shape: 64, stereo: 1, transpose: 68, type: 4, unison: 1}
+    - type: addp
+      id: 1812
+      parameters: {stereo: 1}
+    - id: 1823
+      parameters: {}
+      comment: Envelope
+    - type: envelope
+      id: 1824
+      parameters: {attack: 12, decay: 80, gain: 64, release: 74, stereo: 1, sustain: 0}
+    - type: mulp
+      id: 1813
+      parameters: {stereo: 1}
+    - id: 1825
+      parameters: {}
+      comment: Pan & output
+    - type: filter
+      id: 1826
+      parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, resonance: 99, stereo: 1}
+    - type: compressor
+      id: 1827
+      parameters: {attack: 41, invgain: 33, ratio: 64, release: 78, stereo: 1, threshold: 37}
+    - type: mulp
+      id: 1828
+      parameters: {stereo: 1}
+    - type: pan
+      id: 1829
+      parameters: {panning: 64, stereo: 1}
+    - type: outaux
+      id: 1830
+      parameters: {auxgain: 4, outgain: 17, stereo: 1}
diff --git a/tracker/presets/LEAD/Happy_lead_2.yml b/tracker/presets/LEAD/Happy_lead_2.yml
new file mode 100644
index 0000000..0c45f5a
--- /dev/null
+++ b/tracker/presets/LEAD/Happy_lead_2.yml
@@ -0,0 +1,46 @@
+name: Happy lead
+numvoices: 5
+units:
+    - id: 1784
+      parameters: {}
+      comment: Main oscillators
+    - type: oscillator
+      id: 164
+      parameters: {color: 78, detune: 56, gain: 80, lfo: 0, phase: 0, shape: 36, stereo: 1, transpose: 76, type: 1, unison: 2}
+    - type: oscillator
+      id: 165
+      parameters: {color: 80, detune: 56, gain: 76, lfo: 0, phase: 64, shape: 24, stereo: 1, transpose: 88, type: 1, unison: 3}
+    - type: addp
+      id: 166
+      parameters: {stereo: 1}
+    - id: 1785
+      parameters: {}
+      comment: Main envelopes
+    - type: envelope
+      id: 163
+      parameters: {attack: 26, decay: 64, gain: 128, release: 65, stereo: 1, sustain: 128}
+    - type: mulp
+      id: 167
+      parameters: {stereo: 1}
+    - id: 234
+      parameters: {}
+      comment: Filters
+    - type: filter
+      id: 230
+      parameters: {bandpass: 1, frequency: 32, highpass: -1, lowpass: 0, resonance: 128, stereo: 1}
+    - type: filter
+      id: 217
+      parameters: {bandpass: -1, frequency: 128, highpass: -1, lowpass: 1, resonance: 128, stereo: 1}
+    - id: 1789
+      parameters: {}
+      comment: Delay & output
+    - type: pan
+      id: 168
+      parameters: {panning: 64, stereo: 1}
+    - type: delay
+      id: 169
+      parameters: {damp: 33, dry: 128, feedback: 78, notetracking: 0, pregain: 43, stereo: 1}
+      varargs: [12550, 24402, 21265, 32419]
+    - type: outaux
+      id: 172
+      parameters: {auxgain: 0, outgain: 23, stereo: 1}
diff --git a/tracker/presets/LEAD/Supersaw.yml b/tracker/presets/LEAD/Supersaw.yml
new file mode 100644
index 0000000..cea4d0a
--- /dev/null
+++ b/tracker/presets/LEAD/Supersaw.yml
@@ -0,0 +1,70 @@
+name: Supersaw
+comment: Automate filter frequency for the classic trance sound
+numvoices: 5
+units:
+    - id: 2198
+      parameters: {}
+      comment: Right
+    - type: oscillator
+      id: 2199
+      parameters: {color: 128, detune: 30, gain: 64, phase: 43, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+    - type: oscillator
+      id: 2200
+      parameters: {color: 128, detune: 90, gain: 64, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 3}
+    - type: addp
+      id: 2218
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 2217
+      parameters: {color: 128, detune: 50, gain: 64, lfo: 0, phase: 22, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+    - type: addp
+      id: 2201
+      parameters: {stereo: 0}
+    - type: envelope
+      id: 2202
+      parameters: {attack: 30, decay: 0, gain: 64, release: 64, stereo: 0, sustain: 85}
+    - type: mulp
+      id: 2203
+      parameters: {stereo: 0}
+    - id: 2204
+      parameters: {}
+      comment: Left
+    - type: oscillator
+      id: 2205
+      parameters: {color: 128, detune: 90, gain: 64, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+    - type: oscillator
+      id: 2206
+      parameters: {color: 128, detune: 35, gain: 64, lfo: 0, phase: 16, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 3}
+    - type: addp
+      id: 2207
+      parameters: {stereo: 0}
+    - type: oscillator
+      id: 2219
+      parameters: {color: 128, detune: 25, gain: 79, phase: 98, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+    - type: addp
+      id: 2220
+      parameters: {stereo: 0}
+    - type: envelope
+      id: 2208
+      parameters: {attack: 30, decay: 0, gain: 64, release: 64, stereo: 0, sustain: 85}
+    - type: mulp
+      id: 2209
+      parameters: {stereo: 0}
+    - id: 2210
+      parameters: {}
+      comment: Effects
+    - type: belleq
+      id: 2211
+      parameters: {bandwidth: 90, frequency: 81, gain: 70, stereo: 0}
+    - type: xch
+      id: 2212
+      parameters: {}
+    - type: belleq
+      id: 2213
+      parameters: {bandwidth: 92, frequency: 72, gain: 69}
+    - id: 2214
+      parameters: {}
+      comment: Output
+    - type: outaux
+      id: 2216
+      parameters: {auxgain: 0, outgain: 21, stereo: 1}
diff --git a/tracker/presets/PL/Punchy_2.yml b/tracker/presets/PL/Punchy_2.yml
new file mode 100644
index 0000000..787d03c
--- /dev/null
+++ b/tracker/presets/PL/Punchy_2.yml
@@ -0,0 +1,64 @@
+name: Punchy2
+numvoices: 5
+units:
+    - id: 197
+      parameters: {}
+      comment: Modulations
+    - type: oscillator
+      id: 1854
+      parameters: {color: 128, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 0}
+    - type: send
+      id: 12
+      parameters: {amount: 71, port: 1, sendpop: 1, target: 1857}
+    - type: envelope
+      id: 1855
+      parameters: {attack: 0, decay: 68, gain: 128, release: 73, stereo: 0, sustain: 14}
+    - type: send
+      id: 1698
+      parameters: {amount: 84, port: 0, sendpop: 0, target: 1861}
+    - type: send
+      id: 4
+      parameters: {amount: 109, port: 0, sendpop: 1, target: 20}
+    - id: 195
+      parameters: {}
+      comment: Main oscillators
+    - type: oscillator
+      id: 1857
+      parameters: {color: 128, detune: 70, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 1}
+    - type: oscillator
+      id: 1858
+      parameters: {color: 90, detune: 73, gain: 31, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 76, type: 2, unison: 3}
+    - type: addp
+      id: 1860
+      parameters: {stereo: 0}
+    - id: 196
+      parameters: {}
+      comment: Filters
+    - type: filter
+      id: 1861
+      parameters: {bandpass: 0, frequency: 66, highpass: -1, lowpass: 1, resonance: 83, stereo: 0}
+    - type: filter
+      id: 20
+      parameters: {bandpass: -1, frequency: 40, highpass: 0, lowpass: 1, resonance: 128, stereo: 0}
+    - id: 193
+      parameters: {}
+      comment: Main envelope
+    - type: envelope
+      id: 1862
+      parameters: {attack: 25, decay: 64, gain: 128, release: 71, stereo: 0, sustain: 128}
+    - type: mulp
+      id: 1863
+      parameters: {stereo: 0}
+    - id: 194
+      parameters: {}
+      comment: Effects & output
+    - type: pan
+      id: 23
+      parameters: {panning: 64, stereo: 0}
+    - type: delay
+      id: 1864
+      parameters: {damp: 78, dry: 128, feedback: 45, notetracking: 2, pregain: 81, stereo: 1}
+      varargs: [36, 32]
+    - type: outaux
+      id: 25
+      parameters: {auxgain: 13, outgain: 19, stereo: 1}
diff --git a/tracker/presets/UTIL/Global_mastering.yml b/tracker/presets/UTIL/Global_mastering.yml
index 6bf00cb..98c4a53 100644
--- a/tracker/presets/UTIL/Global_mastering.yml
+++ b/tracker/presets/UTIL/Global_mastering.yml
@@ -1,38 +1,27 @@
+name: Global mastering
+numvoices: 1
 units:
-    - id: 1173
+    - id: 1184
       parameters: {}
-      comment: Aux1 reverb
-    - type: in
-      id: 1157
-      parameters: {channel: 2, stereo: 1}
-    - type: delay
-      id: 1158
-      parameters: {damp: 28, dry: 0, feedback: 122, notetracking: 0, pregain: 40, 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: 128, stereo: 1}
-    - id: 1174
-      parameters: {}
-      comment: Mastering
+      comment: Global mastering - set this preset as last intrument, load reverbs before this
     - type: in
       id: 1170
       parameters: {channel: 0, stereo: 1}
     - type: filter
       id: 1171
-      parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+      parameters: {bandpass: -1, frequency: 128, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
       comment: Limit highs
     - type: filter
       id: 1166
-      parameters: {bandpass: 0, frequency: 8, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+      parameters: {bandpass: 1, frequency: 10, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
       comment: Low cut
     - type: compressor
       id: 1167
-      parameters: {attack: 0, invgain: 90, ratio: 128, release: 42, stereo: 1, threshold: 90}
+      parameters: {attack: 42, invgain: 89, ratio: 92, release: 42, stereo: 1, threshold: 83}
     - type: mulp
       id: 1168
       parameters: {stereo: 1}
     - type: out
       id: 1172
-      parameters: {gain: 128, stereo: 1}
+      parameters: {gain: 116, stereo: 1}
       comment: Master gain
diff --git a/tracker/presets/UTIL/Reverb_Church.yml b/tracker/presets/UTIL/Reverb_Church.yml
new file mode 100644
index 0000000..3713aa0
--- /dev/null
+++ b/tracker/presets/UTIL/Reverb_Church.yml
@@ -0,0 +1,35 @@
+name: Reverb Church
+numvoices: 1
+units:
+    - id: 1191
+      parameters: {}
+      comment: Church Reverb - Load this before Global mastering
+    - type: in
+      id: 1192
+      parameters: {channel: 2, stereo: 1}
+      comment: If you need second reverb set channel to 4 and use aux opcode to send
+    - type: filter
+      id: 1699
+      parameters: {bandpass: 0, frequency: 75, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+      comment: Filter hights - church doesn't reflect very bright sounds, adjust to fit your style
+    - type: filter
+      id: 1700
+      parameters: {bandpass: 0, frequency: 19, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+      comment: Filter bass - to clean up some low frequences
+    - id: 1703
+      parameters: {}
+      comment: First reflections, adjust feedback to alter the first reflections length
+    - type: delay
+      id: 1698
+      parameters: {damp: 22, dry: 0, feedback: 105, notetracking: 0, pregain: 62, stereo: 1}
+      varargs: [1777, 2129, 2467, 2819, 3217, 3571, 3929, 4297, 1783, 2131, 2473, 2833, 3221, 3581, 3931, 4327]
+    - id: 1704
+      parameters: {}
+      comment: Longer reverb tail from the church.. alter pregain and feedback to sculpt the reverb
+    - type: delay
+      id: 1701
+      parameters: {damp: 28, dry: 128, feedback: 110, notetracking: 0, pregain: 75, stereo: 1}
+      varargs: [4703, 5087, 5483, 5857, 6269, 6673, 7039, 7499, 4721, 5099, 5501, 5861, 6271, 6679, 7043, 7507]
+    - type: out
+      id: 1702
+      parameters: {gain: 128, stereo: 1}
diff --git a/tracker/presets/UTIL/Reverb_Hall.yml b/tracker/presets/UTIL/Reverb_Hall.yml
new file mode 100644
index 0000000..a39c205
--- /dev/null
+++ b/tracker/presets/UTIL/Reverb_Hall.yml
@@ -0,0 +1,32 @@
+name: Reverb Hall
+numvoices: 1
+units:
+    - id: 1723
+      parameters: {}
+      comment: Hall reverb - Load this before Global mastering
+    - type: in
+      id: 1724
+      parameters: {channel: 2, stereo: 1}
+      comment: Set channel to 4 if you need second reverb, use aux opcode to send
+    - type: filter
+      id: 1736
+      parameters: {bandpass: 1, frequency: 97, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+      comment: Filter highs - adjust to increase brightness
+    - type: filter
+      id: 1735
+      parameters: {bandpass: 0, frequency: 26, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+      comment: Filter lows - to clean up muddy bass freqs
+    - id: 1738
+      parameters: {}
+      comment: Try different feedback and damp values to sculpt the reverb length and tone
+    - type: delay
+      id: 1725
+      parameters: {damp: 21, dry: 0, feedback: 119, notetracking: 0, pregain: 64, stereo: 1}
+      varargs: [601, 751, 911, 1069, 1229, 1381, 1543, 1709, 1871, 2027, 2179, 2339, 2477, 2621, 2777, 2927, 613, 761, 919, 1087, 1237, 1399, 1553, 1721, 1877, 2039, 2161, 2341, 2467, 2633, 2791, 2939]
+    - type: belleq
+      id: 1737
+      parameters: {bandwidth: 54, frequency: 36, gain: 55, stereo: 1}
+      comment: Cleanup mids (adjust or remove if you don't need)
+    - type: out
+      id: 1726
+      parameters: {gain: 128, stereo: 1}
diff --git a/tracker/presets/UTIL/Reverb_Plate.yml b/tracker/presets/UTIL/Reverb_Plate.yml
new file mode 100644
index 0000000..cbb6722
--- /dev/null
+++ b/tracker/presets/UTIL/Reverb_Plate.yml
@@ -0,0 +1,24 @@
+name: Reverb Plate
+numvoices: 1
+units:
+    - id: 1173
+      parameters: {}
+      comment: Plate Reverb - Load this before Global mastering preset
+    - type: in
+      id: 1157
+      parameters: {channel: 2, stereo: 1}
+      comment: If you need secondary reverb, set channel to 4 and use aux opcode to send
+    - type: filter
+      id: 1703
+      parameters: {bandpass: 0, frequency: 27, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+      comment: Filter bass around 200hz, plate doesn't have usually low bass
+    - id: 1704
+      parameters: {}
+      comment: Feedback controls the plate reverb length, damp should be kept quite low values, plates sound metallic by their nature
+    - type: delay
+      id: 1158
+      parameters: {damp: 23, dry: 0, feedback: 120, notetracking: 0, pregain: 64, stereo: 1}
+      varargs: [223, 307, 397, 487, 593, 677, 787, 883, 997, 1093, 1213, 1303, 1439, 1543, 1627, 1753, 233, 317, 419, 503, 607, 701, 811, 911, 1019, 1109, 1229, 1321, 1453, 1559, 1663, 1783]
+    - type: out
+      id: 1169
+      parameters: {gain: 128, stereo: 1}
diff --git a/tracker/presets/UTIL/Reverb_Room.yml b/tracker/presets/UTIL/Reverb_Room.yml
new file mode 100644
index 0000000..189d8df
--- /dev/null
+++ b/tracker/presets/UTIL/Reverb_Room.yml
@@ -0,0 +1,20 @@
+name: Reverb Room
+numvoices: 1
+units:
+    - id: 1699
+      parameters: {}
+      comment: Room reverb - load this before Global mastering
+    - type: in
+      id: 1700
+      parameters: {channel: 2, stereo: 1}
+      comment: Set channel 4 if you need secondary reverb. Use opcode "aux" to send
+    - id: 1703
+      parameters: {}
+      comment: Room reverbs are short by nature, so keep feedback less than ~80. Use damp to alter room brightness.
+    - type: delay
+      id: 1701
+      parameters: {damp: 59, dry: 0, feedback: 51, notetracking: 0, pregain: 64, stereo: 1}
+      varargs: [1116, 1188, 1276, 1356, 1422, 1492, 1556, 1618, 1140, 1212, 1300, 1380, 1446, 1516, 1580, 1642]
+    - type: out
+      id: 1702
+      parameters: {gain: 128, stereo: 1}
diff --git a/tracker/presets/UTIL/Reverb_Studio.yml b/tracker/presets/UTIL/Reverb_Studio.yml
new file mode 100644
index 0000000..95dac99
--- /dev/null
+++ b/tracker/presets/UTIL/Reverb_Studio.yml
@@ -0,0 +1,20 @@
+name: Reverb Studio
+numvoices: 1
+units:
+    - id: 1173
+      parameters: {}
+      comment: 'Studio Reverb - Load this before Global mastering '
+    - type: in
+      id: 1157
+      parameters: {channel: 2, stereo: 1}
+      comment: if you need secondary reverb set channel to 4. use opcode "aux" to send here.
+    - id: 1185
+      parameters: {}
+      comment: Use feedback and damp values to sculpt the room size and brightness.
+    - type: delay
+      id: 1158
+      parameters: {damp: 30, dry: 0, feedback: 90, notetracking: 0, pregain: 64, stereo: 1}
+      varargs: [443, 523, 613, 691, 787, 877, 971, 1051, 1151, 1237, 1321, 1447, 1531, 1613, 1721, 1823, 457, 547, 619, 709, 809, 883, 983, 1063, 1163, 1259, 1361, 1453, 1549, 1621, 1733, 1847]
+    - type: out
+      id: 1169
+      parameters: {gain: 128, stereo: 1}
diff --git a/tracker/presets/UTIL/UTIL_globalmastering.yml b/tracker/presets/UTIL/UTIL_globalmastering.yml
deleted file mode 100644
index f6222b3..0000000
--- a/tracker/presets/UTIL/UTIL_globalmastering.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-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