diff --git a/generate.py b/generate.py
index 9029c37..7aa3179 100644
--- a/generate.py
+++ b/generate.py
@@ -192,7 +192,7 @@ LOOP_INSTRUMENTS = {
     # Mellotron (tape playback, sustained)
     "mellotron", "mellotron_strings", "mellotron_flute", "mellotron_choir",
     # Sustained synths
-    "synth_pad", "synth_lead", "synth_bass", "acid_bass", "808_bass",
+    "synth_pad", "acid_bass", "808_bass",
     "choir", "vocal", "granular_pad", "granular_texture",
     "analog_pad", "drift_saw", "drift_square", "wavefold_warm",
     # Continuous
diff --git a/op1-samples/pytheory/synth_bass.wav b/op1-samples/pytheory/synth_bass.wav
index d936d8d..1de6b98 100644
Binary files a/op1-samples/pytheory/synth_bass.wav and b/op1-samples/pytheory/synth_bass.wav differ
diff --git a/op1-samples/pytheory/synth_lead.wav b/op1-samples/pytheory/synth_lead.wav
index 208b83e..b9547ee 100644
Binary files a/op1-samples/pytheory/synth_lead.wav and b/op1-samples/pytheory/synth_lead.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/a4.wav b/opxy-samples/pytheory/synth_bass.preset/a4.wav
index 1e583ef..08f5081 100644
Binary files a/opxy-samples/pytheory/synth_bass.preset/a4.wav and b/opxy-samples/pytheory/synth_bass.preset/a4.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/c2.wav b/opxy-samples/pytheory/synth_bass.preset/c2.wav
index 3de7503..f7a1532 100644
Binary files a/opxy-samples/pytheory/synth_bass.preset/c2.wav and b/opxy-samples/pytheory/synth_bass.preset/c2.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/c3.wav b/opxy-samples/pytheory/synth_bass.preset/c3.wav
index e6f942e..b9fa20e 100644
Binary files a/opxy-samples/pytheory/synth_bass.preset/c3.wav and b/opxy-samples/pytheory/synth_bass.preset/c3.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/c4.wav b/opxy-samples/pytheory/synth_bass.preset/c4.wav
index 6664f3a..2e5fe28 100644
Binary files a/opxy-samples/pytheory/synth_bass.preset/c4.wav and b/opxy-samples/pytheory/synth_bass.preset/c4.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/c5.wav b/opxy-samples/pytheory/synth_bass.preset/c5.wav
index 4719ed1..7c762d1 100644
Binary files a/opxy-samples/pytheory/synth_bass.preset/c5.wav and b/opxy-samples/pytheory/synth_bass.preset/c5.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/c6.wav b/opxy-samples/pytheory/synth_bass.preset/c6.wav
index 7f51560..2588739 100644
Binary files a/opxy-samples/pytheory/synth_bass.preset/c6.wav and b/opxy-samples/pytheory/synth_bass.preset/c6.wav differ
diff --git a/opxy-samples/pytheory/synth_bass.preset/patch.json b/opxy-samples/pytheory/synth_bass.preset/patch.json
index 26281ff..c0edee1 100644
--- a/opxy-samples/pytheory/synth_bass.preset/patch.json
+++ b/opxy-samples/pytheory/synth_bass.preset/patch.json
@@ -43,9 +43,9 @@
   "envelope": {
     "amp": {
       "attack": 0,
-      "decay": 2457,
-      "release": 14395,
-      "sustain": 32767
+      "decay": 20295,
+      "release": 16383,
+      "sustain": 14989
     },
     "filter": {
       "attack": 0,
@@ -90,8 +90,9 @@
       "hikey": 42,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 11189,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 36,
       "reverse": false,
@@ -104,8 +105,9 @@
       "hikey": 54,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 11189,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 48,
       "reverse": false,
@@ -118,8 +120,9 @@
       "hikey": 64,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 11187,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 60,
       "reverse": false,
@@ -132,8 +135,9 @@
       "hikey": 70,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 11179,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 69,
       "reverse": false,
@@ -146,8 +150,9 @@
       "hikey": 78,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 11224,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 72,
       "reverse": false,
@@ -160,8 +165,9 @@
       "hikey": 127,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 11207,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 84,
       "reverse": false,
diff --git a/opxy-samples/pytheory/synth_lead.preset/a4.wav b/opxy-samples/pytheory/synth_lead.preset/a4.wav
index 5969599..fd3aff3 100644
Binary files a/opxy-samples/pytheory/synth_lead.preset/a4.wav and b/opxy-samples/pytheory/synth_lead.preset/a4.wav differ
diff --git a/opxy-samples/pytheory/synth_lead.preset/c2.wav b/opxy-samples/pytheory/synth_lead.preset/c2.wav
index 684624d..fc51a88 100644
Binary files a/opxy-samples/pytheory/synth_lead.preset/c2.wav and b/opxy-samples/pytheory/synth_lead.preset/c2.wav differ
diff --git a/opxy-samples/pytheory/synth_lead.preset/c3.wav b/opxy-samples/pytheory/synth_lead.preset/c3.wav
index 31bfdfd..f2b9ea3 100644
Binary files a/opxy-samples/pytheory/synth_lead.preset/c3.wav and b/opxy-samples/pytheory/synth_lead.preset/c3.wav differ
diff --git a/opxy-samples/pytheory/synth_lead.preset/c4.wav b/opxy-samples/pytheory/synth_lead.preset/c4.wav
index ef10043..e27fb13 100644
Binary files a/opxy-samples/pytheory/synth_lead.preset/c4.wav and b/opxy-samples/pytheory/synth_lead.preset/c4.wav differ
diff --git a/opxy-samples/pytheory/synth_lead.preset/c5.wav b/opxy-samples/pytheory/synth_lead.preset/c5.wav
index 0d00ab4..3f94fbb 100644
Binary files a/opxy-samples/pytheory/synth_lead.preset/c5.wav and b/opxy-samples/pytheory/synth_lead.preset/c5.wav differ
diff --git a/opxy-samples/pytheory/synth_lead.preset/c6.wav b/opxy-samples/pytheory/synth_lead.preset/c6.wav
index d202da7..59e024c 100644
Binary files a/opxy-samples/pytheory/synth_lead.preset/c6.wav and b/opxy-samples/pytheory/synth_lead.preset/c6.wav differ
diff --git a/opxy-samples/pytheory/synth_lead.preset/patch.json b/opxy-samples/pytheory/synth_lead.preset/patch.json
index 7c960b2..187469f 100644
--- a/opxy-samples/pytheory/synth_lead.preset/patch.json
+++ b/opxy-samples/pytheory/synth_lead.preset/patch.json
@@ -43,9 +43,9 @@
   "envelope": {
     "amp": {
       "attack": 0,
-      "decay": 2457,
-      "release": 14395,
-      "sustain": 32767
+      "decay": 20295,
+      "release": 16383,
+      "sustain": 14989
     },
     "filter": {
       "attack": 0,
@@ -86,31 +86,33 @@
   "platform": "OP-XY",
   "regions": [
     {
-      "framecount": 43777,
+      "framecount": 43767,
       "hikey": 42,
       "lokey": 0,
       "loop.crossfade": 0,
-      "loop.end": 43777,
-      "loop.onrelease": true,
+      "loop.enabled": false,
+      "loop.end": 43767,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 36,
       "reverse": false,
       "sample": "c2.wav",
-      "sample.end": 43777,
+      "sample.end": 43767,
       "tune": 0
     },
     {
-      "framecount": 43955,
+      "framecount": 43959,
       "hikey": 54,
       "lokey": 0,
       "loop.crossfade": 0,
-      "loop.end": 43955,
-      "loop.onrelease": true,
+      "loop.enabled": false,
+      "loop.end": 43959,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 48,
       "reverse": false,
       "sample": "c3.wav",
-      "sample.end": 43955,
+      "sample.end": 43959,
       "tune": 0
     },
     {
@@ -118,8 +120,9 @@
       "hikey": 64,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 43835,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 60,
       "reverse": false,
@@ -132,8 +135,9 @@
       "hikey": 70,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 43889,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 69,
       "reverse": false,
@@ -142,17 +146,18 @@
       "tune": 0
     },
     {
-      "framecount": 43978,
+      "framecount": 43976,
       "hikey": 78,
       "lokey": 0,
       "loop.crossfade": 0,
-      "loop.end": 43978,
-      "loop.onrelease": true,
+      "loop.enabled": false,
+      "loop.end": 43976,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 72,
       "reverse": false,
       "sample": "c5.wav",
-      "sample.end": 43978,
+      "sample.end": 43976,
       "tune": 0
     },
     {
@@ -160,8 +165,9 @@
       "hikey": 127,
       "lokey": 0,
       "loop.crossfade": 0,
+      "loop.enabled": false,
       "loop.end": 43873,
-      "loop.onrelease": true,
+      "loop.onrelease": false,
       "loop.start": 0,
       "pitch.keycenter": 84,
       "reverse": false,