From 1a19b60e97679919ba37c2bca38b50cea9581f74 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Thu, 16 Jul 2009 17:16:21 -0700
Subject: [PATCH] TripleOscillator presets - fixed empty.wav

Translated userwave0="samples/empty.wav" to userwave0="" and such.
Additionally updated references - if they included "samples/" I
took that out since now they reference from samples already.
---
 TODO                                                | 1 +
 data/presets/TripleOscillator/AmazingBubbles.xpf    | 2 +-
 data/presets/TripleOscillator/AnalogTimes.xpf       | 2 +-
 data/presets/TripleOscillator/AnalogTimes2.xpf      | 2 +-
 data/presets/TripleOscillator/Analogous.xpf         | 2 +-
 data/presets/TripleOscillator/Arpeggio_1.xpf        | 2 +-
 data/presets/TripleOscillator/Arpeggio_2.xpf        | 2 +-
 data/presets/TripleOscillator/Bell.xpf              | 2 +-
 data/presets/TripleOscillator/Bell_2.xpf            | 2 +-
 data/presets/TripleOscillator/Distorted-FM-Bass.xpf | 2 +-
 data/presets/TripleOscillator/Dull-Bell-Arp.xpf     | 2 +-
 data/presets/TripleOscillator/E-Organ.xpf           | 2 +-
 data/presets/TripleOscillator/Fat-FMish-Bells.xpf   | 2 +-
 data/presets/TripleOscillator/Fat.xpf               | 2 +-
 data/presets/TripleOscillator/Freaky-Bass.xpf       | 2 +-
 data/presets/TripleOscillator/FutureBass.xpf        | 2 +-
 data/presets/TripleOscillator/Gong.xpf              | 2 +-
 data/presets/TripleOscillator/Harmonium.xpf         | 2 +-
 data/presets/TripleOscillator/Harp-of-a-Fairy.xpf   | 2 +-
 data/presets/TripleOscillator/Harpsichord.xpf       | 2 +-
 data/presets/TripleOscillator/Jupiter.xpf           | 2 +-
 data/presets/TripleOscillator/LFO-party.xpf         | 2 +-
 data/presets/TripleOscillator/LovelyDream.xpf       | 2 +-
 data/presets/TripleOscillator/MoogArpeggio.xpf      | 2 +-
 data/presets/TripleOscillator/Play-some-rock.xpf    | 2 +-
 data/presets/TripleOscillator/PluckArpeggio.xpf     | 2 +-
 data/presets/TripleOscillator/Plucked.xpf           | 2 +-
 data/presets/TripleOscillator/PowerStrings.xpf      | 2 +-
 data/presets/TripleOscillator/RaveBass.xpf          | 2 +-
 data/presets/TripleOscillator/ResonantPad.xpf       | 2 +-
 data/presets/TripleOscillator/RockOrgan.xpf         | 2 +-
 data/presets/TripleOscillator/Short1.xpf            | 2 +-
 data/presets/TripleOscillator/Short2.xpf            | 2 +-
 data/presets/TripleOscillator/Short3.xpf            | 2 +-
 data/presets/TripleOscillator/Short4.xpf            | 2 +-
 data/presets/TripleOscillator/SoftBass.xpf          | 2 +-
 data/presets/TripleOscillator/SoftStrings.xpf       | 2 +-
 data/presets/TripleOscillator/SpaceBass.xpf         | 2 +-
 data/presets/TripleOscillator/Square.xpf            | 2 +-
 data/presets/TripleOscillator/TB303-Arpeggio.xpf    | 2 +-
 data/presets/TripleOscillator/TB303.xpf             | 2 +-
 data/presets/TripleOscillator/TheMaster.xpf         | 2 +-
 data/presets/TripleOscillator/Whistle.xpf           | 2 +-
 data/presets/TripleOscillator/Xylophon.xpf          | 2 +-
 44 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/TODO b/TODO
index 4d42b3248..9afd9249a 100644
--- a/TODO
+++ b/TODO
@@ -57,6 +57,7 @@ Andrew Kelley's todo:
   before playing)
 * VST presets don't work. when you save a project, it doesn't even save
   what you did.
+* if you listen to LB302 presets and then listen to Organic presets, segfault
 
 
 - automation recording:
diff --git a/data/presets/TripleOscillator/AmazingBubbles.xpf b/data/presets/TripleOscillator/AmazingBubbles.xpf
index 3201f3d49..70365ac62 100644
--- a/data/presets/TripleOscillator/AmazingBubbles.xpf
+++ b/data/presets/TripleOscillator/AmazingBubbles.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="6" vol="100" name="Amazing Bubbles 2" basetone="11" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="5" coarse1="-12" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="200" vol1="200" finel0="0" vol2="200" finel1="0" finel2="0" modalgo1="2" stphdetun0="292" pan0="0" modalgo2="1" stphdetun1="56" pan1="0" stphdetun2="70" pan2="0" phoffset0="0" phoffset1="49" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="4" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="5" coarse1="-12" userwavefile2="" wavetype2="2" coarse2="0" vol0="200" vol1="200" finel0="0" vol2="200" finel1="0" finel2="0" modalgo1="2" stphdetun0="292" pan0="0" modalgo2="1" stphdetun1="56" pan1="0" stphdetun2="70" pan2="0" phoffset0="0" phoffset1="49" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="4" coarse0="-12" />
       <eldata fres="0.8" ftype="6" fcut="483" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.325" latt="0" sus="0" lspd="0.2475" att="0" pdel="0" lamt="0.18" dec="0.242" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/AnalogTimes.xpf b/data/presets/TripleOscillator/AnalogTimes.xpf
index 48d257122..8b69794ba 100644
--- a/data/presets/TripleOscillator/AnalogTimes.xpf
+++ b/data/presets/TripleOscillator/AnalogTimes.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="100" name="Analog Times" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-14" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="50" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="13" finer2="-3" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-14" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="50" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="13" finer2="-3" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.01" ftype="6" fcut="1118" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.214" latt="0" sus="0" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.297" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/AnalogTimes2.xpf b/data/presets/TripleOscillator/AnalogTimes2.xpf
index 0be1051f9..e3adf0a92 100644
--- a/data/presets/TripleOscillator/AnalogTimes2.xpf
+++ b/data/presets/TripleOscillator/AnalogTimes2.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="AnalogTimes 2" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="13" coarse0="0" coarse1="0" coarse2="-12" finel0="0" finel1="0" modalgo1="2" modalgo2="3" finel2="-14" pan0="0" modalgo3="0" pan1="0" stphdetun0="247" pan2="0" stphdetun1="109" wavetype0="3" stphdetun2="50" wavetype1="2" wavetype2="0" vol0="49" vol1="54" phoffset0="0" phoffset1="271" vol2="14" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="13" coarse0="0" coarse1="0" coarse2="-12" finel0="0" finel1="0" modalgo1="2" modalgo2="3" finel2="-14" pan0="0" modalgo3="0" pan1="0" stphdetun0="247" pan2="0" stphdetun1="109" wavetype0="3" stphdetun2="50" wavetype1="2" wavetype2="0" vol0="49" vol1="54" phoffset0="0" phoffset1="271" vol2="14" />
       </instrument>
       <eldata fres="0.66" ftype="0" fcut="1" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.324" lamt="0" syncmode="0" latt="0" rel="0.473" sus="0.433" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/Analogous.xpf b/data/presets/TripleOscillator/Analogous.xpf
index 7091d8288..b166adb1a 100644
--- a/data/presets/TripleOscillator/Analogous.xpf
+++ b/data/presets/TripleOscillator/Analogous.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="82" name="Analogous" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="7" vol0="100" vol1="100" finel0="0" vol2="100" finel1="10" finel2="-2" modalgo1="2" stphdetun0="232" pan0="9" modalgo2="1" stphdetun1="95" pan1="-20" stphdetun2="109" pan2="10" phoffset0="74" phoffset1="280" phoffset2="82" finer0="0" finer1="16" finer2="-3" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="7" vol0="100" vol1="100" finel0="0" vol2="100" finel1="10" finel2="-2" modalgo1="2" stphdetun0="232" pan0="9" modalgo2="1" stphdetun1="95" pan1="-20" stphdetun2="109" pan2="10" phoffset0="74" phoffset1="280" phoffset2="82" finer0="0" finer1="16" finer2="-3" userwavefile0="" wavetype0="2" coarse0="-12" />
       <eldata fres="3" ftype="0" fcut="1205" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.375" latt="0" sus="0" lspd="0.1" att="0.043" pdel="0" lamt="0" dec="0.999" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Arpeggio_1.xpf b/data/presets/TripleOscillator/Arpeggio_1.xpf
index 51fc3e83d..9b6068172 100644
--- a/data/presets/TripleOscillator/Arpeggio_1.xpf
+++ b/data/presets/TripleOscillator/Arpeggio_1.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Arpeggio 1" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="57" vol="33" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="13" coarse0="0" coarse1="0" coarse2="-12" finel0="0" finel1="0" modalgo1="2" modalgo2="0" finel2="-14" pan0="0" modalgo3="0" pan1="0" stphdetun0="247" pan2="0" stphdetun1="109" wavetype0="3" stphdetun2="50" wavetype1="2" wavetype2="0" vol0="49" vol1="54" phoffset0="0" phoffset1="271" vol2="14" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="13" coarse0="0" coarse1="0" coarse2="-12" finel0="0" finel1="0" modalgo1="2" modalgo2="0" finel2="-14" pan0="0" modalgo3="0" pan1="0" stphdetun0="247" pan2="0" stphdetun1="109" wavetype0="3" stphdetun2="50" wavetype1="2" wavetype2="0" vol0="49" vol1="54" phoffset0="0" phoffset1="271" vol2="14" />
       </instrument>
       <eldata fres="0.66" ftype="0" fcut="1121" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.297" lamt="0" syncmode="0" latt="0" rel="0.234" sus="0" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/Arpeggio_2.xpf b/data/presets/TripleOscillator/Arpeggio_2.xpf
index 5e12cee81..c3679d1e8 100644
--- a/data/presets/TripleOscillator/Arpeggio_2.xpf
+++ b/data/presets/TripleOscillator/Arpeggio_2.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="33" name="Arpeggio 2" basetone="9" tab="2" >
-      <tripleoscillator userwavefile1="empty.wav" wavetype1="3" coarse1="0" userwavefile2="empty.wav" wavetype2="2" coarse2="12" vol0="100" vol1="100" finel0="-10" vol2="115" finel1="10" finel2="-2" modalgo1="2" stphdetun0="232" pan0="9" modalgo2="2" stphdetun1="110" pan1="-20" stphdetun2="109" pan2="10" phoffset0="87" phoffset1="280" phoffset2="82" finer0="13" finer1="16" finer2="4" userwavefile0="empty.wav" wavetype0="2" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="3" coarse1="0" userwavefile2="" wavetype2="2" coarse2="12" vol0="100" vol1="100" finel0="-10" vol2="115" finel1="10" finel2="-2" modalgo1="2" stphdetun0="232" pan0="9" modalgo2="2" stphdetun1="110" pan1="-20" stphdetun2="109" pan2="10" phoffset0="87" phoffset1="280" phoffset2="82" finer0="13" finer1="16" finer2="4" userwavefile0="" wavetype0="2" coarse0="-12" />
       <eldata fres="0.46" ftype="4" fcut="1250" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.167" latt="0" sus="0" lspd="0.1" att="0.048" pdel="0" lamt="0" dec="0.999" x100="0" lshp="0" hold="0" />
         <elcut lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.6094" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Bell.xpf b/data/presets/TripleOscillator/Bell.xpf
index 41e6a992b..b893f433a 100644
--- a/data/presets/TripleOscillator/Bell.xpf
+++ b/data/presets/TripleOscillator/Bell.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Bell" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="3" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="1" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="4" coarse1="12" userwavefile2="" wavetype2="3" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="1" coarse0="0" />
       <eldata fres="0.01" ftype="6" fcut="827" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.214" latt="0" sus="0.707" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.379" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Bell_2.xpf b/data/presets/TripleOscillator/Bell_2.xpf
index 300249f96..4a59c89aa 100644
--- a/data/presets/TripleOscillator/Bell_2.xpf
+++ b/data/presets/TripleOscillator/Bell_2.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Bell 2" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="3" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="86" pan1="0" stphdetun2="57" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="1" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="3" coarse1="12" userwavefile2="" wavetype2="4" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="86" pan1="0" stphdetun2="57" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="1" coarse0="0" />
       <eldata fres="0.01" ftype="6" fcut="827" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.214" latt="0" sus="0.707" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.379" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Distorted-FM-Bass.xpf b/data/presets/TripleOscillator/Distorted-FM-Bass.xpf
index 0ce86c465..a86f8620c 100644
--- a/data/presets/TripleOscillator/Distorted-FM-Bass.xpf
+++ b/data/presets/TripleOscillator/Distorted-FM-Bass.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Distorted FM-Bass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="1" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="4" coarse1="12" userwavefile2="" wavetype2="4" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="1" coarse0="0" />
       <eldata fres="0.01" ftype="6" fcut="827" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.347" latt="0" sus="0.707" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.379" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Dull-Bell-Arp.xpf b/data/presets/TripleOscillator/Dull-Bell-Arp.xpf
index 790484a85..f33011803 100644
--- a/data/presets/TripleOscillator/Dull-Bell-Arp.xpf
+++ b/data/presets/TripleOscillator/Dull-Bell-Arp.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="73" name="Dull Bell Arp" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="1" stphdetun0="0" pan0="0" modalgo2="1" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="146" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="1" stphdetun0="0" pan0="0" modalgo2="1" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="146" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="0" coarse0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.24" latt="0" sus="0.584" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.207" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/E-Organ.xpf b/data/presets/TripleOscillator/E-Organ.xpf
index f42320e3d..f79320bc0 100644
--- a/data/presets/TripleOscillator/E-Organ.xpf
+++ b/data/presets/TripleOscillator/E-Organ.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="E-Organ" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="62" vol="19" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="146" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="11" coarse0="-7" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="1" modalgo2="1" finel2="-18" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="125" wavetype0="0" stphdetun2="59" wavetype1="0" wavetype2="0" vol0="100" vol1="100" phoffset0="0" phoffset1="265" vol2="100" />
+        <tripleoscillator phoffset2="146" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="11" coarse0="-7" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="1" modalgo2="1" finel2="-18" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="125" wavetype0="0" stphdetun2="59" wavetype1="0" wavetype2="0" vol0="100" vol1="100" phoffset0="0" phoffset1="265" vol2="100" />
       </instrument>
       <eldata fres="0.5" ftype="0" fcut="14000" fwet="0" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.394" lamt="0" syncmode="0" latt="0" rel="0.215" sus="0" amt="1" x100="0" att="0.079" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/Fat-FMish-Bells.xpf b/data/presets/TripleOscillator/Fat-FMish-Bells.xpf
index 0c9b4b45a..818b9dc98 100644
--- a/data/presets/TripleOscillator/Fat-FMish-Bells.xpf
+++ b/data/presets/TripleOscillator/Fat-FMish-Bells.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="50" name="Fat FMish Bells" basetone="9" >
-      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="samples/shapes/smooth_inv_saw.ogg" wavetype2="2" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="127" finel1="-16" finel2="0" modalgo1="2" stphdetun0="121" pan0="0" modalgo2="0" stphdetun1="259" pan1="0" stphdetun2="92" pan2="0" phoffset0="0" phoffset1="266" phoffset2="80" finer0="0" finer1="13" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="shapes/smooth_inv_saw.ogg" wavetype2="2" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="127" finel1="-16" finel2="0" modalgo1="2" stphdetun0="121" pan0="0" modalgo2="0" stphdetun1="259" pan1="0" stphdetun2="92" pan2="0" phoffset0="0" phoffset1="266" phoffset2="80" finer0="0" finer1="13" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="1.26" ftype="7" fcut="1754" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.329" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.598" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Fat.xpf b/data/presets/TripleOscillator/Fat.xpf
index c15f67f53..b59b0aea1 100644
--- a/data/presets/TripleOscillator/Fat.xpf
+++ b/data/presets/TripleOscillator/Fat.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Fat" basetone="9" tab="0" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="49" vol1="56" finel0="0" vol2="100" finel1="0" finel2="-14" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="3" stphdetun1="109" pan1="0" stphdetun2="50" pan2="0" phoffset0="0" phoffset1="271" phoffset2="0" finer0="0" finer1="0" finer2="13" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="49" vol1="56" finel0="0" vol2="100" finel1="0" finel2="-14" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="3" stphdetun1="109" pan1="0" stphdetun2="50" pan2="0" phoffset0="0" phoffset1="271" phoffset2="0" finer0="0" finer1="0" finer2="13" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.88" ftype="6" fcut="686" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.199" ctlenvamt="0" latt="0" sus="0" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.297" x100="0" lshp="0" hold="0" />
         <elcut lpdel="0" amt="0.33" rel="0" ctlenvamt="0" latt="0" sus="0.999" lspd="0.767" att="0" pdel="0" lamt="0.47" dec="0.223" x100="0" lshp="1" hold="0" />
diff --git a/data/presets/TripleOscillator/Freaky-Bass.xpf b/data/presets/TripleOscillator/Freaky-Bass.xpf
index 9368fcad5..5a27ad8f0 100644
--- a/data/presets/TripleOscillator/Freaky-Bass.xpf
+++ b/data/presets/TripleOscillator/Freaky-Bass.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="100" name="Freaky Bass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-14" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="3" stphdetun1="50" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="13" finer2="-3" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-14" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="3" stphdetun1="50" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="13" finer2="-3" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.84" ftype="6" fcut="216" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.249" latt="0" sus="0" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.297" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/FutureBass.xpf b/data/presets/TripleOscillator/FutureBass.xpf
index 9c4b432fc..cc219445b 100644
--- a/data/presets/TripleOscillator/FutureBass.xpf
+++ b/data/presets/TripleOscillator/FutureBass.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" fxch="0" baseoct="7" vol="57" name="FutureBass" basetone="0" tab="1" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="5" coarse1="-12" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-12" finel2="-27" modalgo1="2" stphdetun0="71" pan0="0" modalgo2="2" stphdetun1="99" pan1="0" stphdetun2="151" pan2="0" phoffset0="0" phoffset1="260" phoffset2="44" finer0="0" finer1="15" finer2="16" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="5" coarse1="-12" userwavefile2="" wavetype2="4" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-12" finel2="-27" modalgo1="2" stphdetun0="71" pan0="0" modalgo2="2" stphdetun1="99" pan1="0" stphdetun2="151" pan2="0" phoffset0="0" phoffset1="260" phoffset2="44" finer0="0" finer1="15" finer2="16" userwavefile0="" wavetype0="0" coarse0="0" />
       <eldata fres="3" ftype="0" fcut="1032" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="0.48" rel="0.414" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.132" pdel="0" lamt="0" dec="0.261" x100="0" lshp="0" hold="0" />
         <elcut lfosyncmode="0" lpdel="0" amt="0" rel="0" ctlenvamt="0" latt="0" sus="0.998" lspd="1" att="0" pdel="0" lamt="0.66" dec="0.134" x100="1" lshp="2" hold="0" />
diff --git a/data/presets/TripleOscillator/Gong.xpf b/data/presets/TripleOscillator/Gong.xpf
index df28ca6f0..1c82ae31d 100644
--- a/data/presets/TripleOscillator/Gong.xpf
+++ b/data/presets/TripleOscillator/Gong.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="132646936" muted="0" fxch="0" tbidx="0" baseoct="4" vol="100" name="Gong" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="12" vol0="100" vol1="68" finel0="0" vol2="81" finel1="-18" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="104" pan2="0" phoffset0="0" phoffset1="307" phoffset2="304" finer0="0" finer1="13" finer2="0" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="0" userwavefile2="" wavetype2="0" coarse2="12" vol0="100" vol1="68" finel0="0" vol2="81" finel1="-18" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="104" pan2="0" phoffset0="0" phoffset1="307" phoffset2="304" finer0="0" finer1="13" finer2="0" userwavefile0="" wavetype0="0" coarse0="0" />
       <eldata fres="3" ftype="0" fcut="16000" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.437" x100="0" lshp="0" hold="0.114" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Harmonium.xpf b/data/presets/TripleOscillator/Harmonium.xpf
index 8ef8ae155..cd7527b9e 100644
--- a/data/presets/TripleOscillator/Harmonium.xpf
+++ b/data/presets/TripleOscillator/Harmonium.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Harmonium" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="11" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="0" modalgo2="1" finel2="-24" pan0="0" modalgo3="0" pan1="-36" stphdetun0="195" pan2="27" stphdetun1="90" wavetype0="1" stphdetun2="306" wavetype1="1" wavetype2="0" vol0="35" vol1="51" phoffset0="260" phoffset1="89" vol2="32" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="11" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="0" modalgo2="1" finel2="-24" pan0="0" modalgo3="0" pan1="-36" stphdetun0="195" pan2="27" stphdetun1="90" wavetype0="1" stphdetun2="306" wavetype1="1" wavetype2="0" vol0="35" vol1="51" phoffset0="260" phoffset1="89" vol2="32" />
       </instrument>
       <eldata fres="0.5" ftype="0" fcut="14000" fwet="0" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.27" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.265" amt="1" x100="0" att="0.062" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/Harp-of-a-Fairy.xpf b/data/presets/TripleOscillator/Harp-of-a-Fairy.xpf
index a124ebc5f..4ebe1ca26 100644
--- a/data/presets/TripleOscillator/Harp-of-a-Fairy.xpf
+++ b/data/presets/TripleOscillator/Harp-of-a-Fairy.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Harp of a Fairy" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="1" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="12" vol0="35" vol1="35" finel0="0" vol2="35" finel1="0" finel2="0" modalgo1="2" stphdetun0="195" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="261" pan2="0" phoffset0="0" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="1" coarse1="0" userwavefile2="" wavetype2="0" coarse2="12" vol0="35" vol1="35" finel0="0" vol2="35" finel1="0" finel2="0" modalgo1="2" stphdetun0="195" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="261" pan2="0" phoffset0="0" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="0" coarse0="-12" />
       <eldata fres="2" ftype="1" fcut="1457" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.297" latt="0" sus="0.6" lspd="0.1" att="0.04" pdel="0" lamt="0" dec="0.15" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Harpsichord.xpf b/data/presets/TripleOscillator/Harpsichord.xpf
index 55bc14b77..b9aed0541 100644
--- a/data/presets/TripleOscillator/Harpsichord.xpf
+++ b/data/presets/TripleOscillator/Harpsichord.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="100" name="Harpsichord" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="-12" vol0="75" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="4" coarse1="12" userwavefile2="" wavetype2="4" coarse2="-12" vol0="75" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.5" ftype="0" fcut="9574" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.249" latt="0" sus="0.707" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.379" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Jupiter.xpf b/data/presets/TripleOscillator/Jupiter.xpf
index 360bbdc6e..e32d7e716 100644
--- a/data/presets/TripleOscillator/Jupiter.xpf
+++ b/data/presets/TripleOscillator/Jupiter.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Jupiter" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="20" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="80" userwavefile0="" finer0="0" userwavefile1="" finer1="13" userwavefile2="samples/shapes/smooth_inv_saw.ogg" finer2="0" coarse0="0" coarse1="0" coarse2="12" finel0="0" finel1="-16" modalgo1="2" modalgo2="0" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="121" pan2="0" stphdetun1="259" wavetype0="2" stphdetun2="92" wavetype1="2" wavetype2="3" vol0="100" vol1="100" phoffset0="0" phoffset1="266" vol2="63" />
+        <tripleoscillator phoffset2="80" userwavefile0="" finer0="0" userwavefile1="" finer1="13" userwavefile2="shapes/smooth_inv_saw.ogg" finer2="0" coarse0="0" coarse1="0" coarse2="12" finel0="0" finel1="-16" modalgo1="2" modalgo2="0" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="121" pan2="0" stphdetun1="259" wavetype0="2" stphdetun2="92" wavetype1="2" wavetype2="3" vol0="100" vol1="100" phoffset0="0" phoffset1="266" vol2="63" />
       </instrument>
       <eldata fres="1.26" ftype="7" fcut="1754" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.598" lamt="0" syncmode="0" latt="0" rel="0.329" sus="0" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/LFO-party.xpf b/data/presets/TripleOscillator/LFO-party.xpf
index a817cc85b..26525f2ce 100644
--- a/data/presets/TripleOscillator/LFO-party.xpf
+++ b/data/presets/TripleOscillator/LFO-party.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="LFO-party" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="89" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="10" userwavefile2="samples/empty.wav" finer2="0" coarse0="0" coarse1="12" coarse2="-12" finel0="0" finel1="-10" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="12" stphdetun0="0" pan2="-37" stphdetun1="0" wavetype0="2" stphdetun2="296" wavetype1="2" wavetype2="2" vol0="85" vol1="51" phoffset0="0" phoffset1="0" vol2="48" />
+        <tripleoscillator phoffset2="89" userwavefile0="" finer0="0" userwavefile1="" finer1="10" userwavefile2="" finer2="0" coarse0="0" coarse1="12" coarse2="-12" finel0="0" finel1="-10" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="12" stphdetun0="0" pan2="-37" stphdetun1="0" wavetype0="2" stphdetun2="296" wavetype1="2" wavetype2="2" vol0="85" vol1="51" phoffset0="0" phoffset1="0" vol2="48" />
       </instrument>
       <eldata fres="0.21" ftype="6" fcut="1834" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.444" lamt="-0.16" syncmode="0" latt="0" rel="0.242" sus="0.238" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.3624" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/LovelyDream.xpf b/data/presets/TripleOscillator/LovelyDream.xpf
index f17412a42..7f7a60089 100644
--- a/data/presets/TripleOscillator/LovelyDream.xpf
+++ b/data/presets/TripleOscillator/LovelyDream.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="2" baseoct="4" vol="100" name="Lovely Dream" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="0" vol0="75" vol1="75" finel0="0" vol2="75" finel1="0" finel2="-18" modalgo1="1" stphdetun0="0" pan0="0" modalgo2="1" stphdetun1="125" pan1="0" stphdetun2="59" pan2="0" phoffset0="0" phoffset1="265" phoffset2="146" finer0="0" finer1="0" finer2="11" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="-7" />
+      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="75" vol1="75" finel0="0" vol2="75" finel1="0" finel2="-18" modalgo1="1" stphdetun0="0" pan0="0" modalgo2="1" stphdetun1="125" pan1="0" stphdetun2="59" pan2="0" phoffset0="0" phoffset1="265" phoffset2="146" finer0="0" finer1="0" finer2="11" userwavefile0="" wavetype0="0" coarse0="-7" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.388" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.394" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/MoogArpeggio.xpf b/data/presets/TripleOscillator/MoogArpeggio.xpf
index c5a22326d..9e74480ba 100644
--- a/data/presets/TripleOscillator/MoogArpeggio.xpf
+++ b/data/presets/TripleOscillator/MoogArpeggio.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Moog Arpeggio" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="76" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="0" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="4" stphdetun2="275" wavetype1="4" wavetype2="1" vol0="150" vol1="150" phoffset0="0" phoffset1="184" vol2="150" />
+        <tripleoscillator phoffset2="76" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="0" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="4" stphdetun2="275" wavetype1="4" wavetype2="1" vol0="150" vol1="150" phoffset0="0" phoffset1="184" vol2="150" />
       </instrument>
       <eldata fres="0.14" ftype="6" fcut="2314" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.154" lamt="0" syncmode="0" latt="0" rel="0.187" sus="0.582" amt="1" x100="0" att="0.038" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/Play-some-rock.xpf b/data/presets/TripleOscillator/Play-some-rock.xpf
index 51f8ad2c6..a3469e25e 100644
--- a/data/presets/TripleOscillator/Play-some-rock.xpf
+++ b/data/presets/TripleOscillator/Play-some-rock.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="135792616" fxch="0" baseoct="4" vol="100" name="Play some rock" basetone="9" tab="3" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="5" coarse2="-12" vol0="100" vol1="54" finel0="0" vol2="26" finel1="0" finel2="-14" modalgo1="0" stphdetun0="247" pan0="0" modalgo2="0" stphdetun1="109" pan1="0" stphdetun2="334" pan2="0" phoffset0="0" phoffset1="271" phoffset2="82" finer0="0" finer1="0" finer2="13" userwavefile0="samples/empty.wav" wavetype0="3" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="4" coarse1="0" userwavefile2="" wavetype2="5" coarse2="-12" vol0="100" vol1="54" finel0="0" vol2="26" finel1="0" finel2="-14" modalgo1="0" stphdetun0="247" pan0="0" modalgo2="0" stphdetun1="109" pan1="0" stphdetun2="334" pan2="0" phoffset0="0" phoffset1="271" phoffset2="82" finer0="0" finer1="0" finer2="13" userwavefile0="" wavetype0="3" coarse0="0" />
       <eldata fres="0.33" ftype="0" fcut="0" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.277" ctlenvamt="0" latt="0" sus="0" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.296" userwavefile="" x100="0" lshp="0" hold="0" />
         <elcut lfosyncmode="0" lpdel="0" amt="1" rel="0.25" ctlenvamt="0" latt="0" sus="0.34" lspd="0.767" att="0" pdel="0" lamt="0" dec="0.665" userwavefile="" x100="0" lshp="1" hold="0" />
diff --git a/data/presets/TripleOscillator/PluckArpeggio.xpf b/data/presets/TripleOscillator/PluckArpeggio.xpf
index 146b592ae..5781d6acf 100644
--- a/data/presets/TripleOscillator/PluckArpeggio.xpf
+++ b/data/presets/TripleOscillator/PluckArpeggio.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Pluck Arpeggio" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="36" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="0" coarse0="12" coarse1="0" coarse2="12" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="271" pan2="0" stphdetun1="299" wavetype0="5" stphdetun2="234" wavetype1="4" wavetype2="5" vol0="80" vol1="90" phoffset0="0" phoffset1="108" vol2="100" />
+        <tripleoscillator phoffset2="36" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="0" coarse0="12" coarse1="0" coarse2="12" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="271" pan2="0" stphdetun1="299" wavetype0="5" stphdetun2="234" wavetype1="4" wavetype2="5" vol0="80" vol1="90" phoffset0="0" phoffset1="108" vol2="100" />
       </instrument>
       <eldata fres="0.95" ftype="1" fcut="1181" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.191" lamt="0" syncmode="0" latt="0" rel="0.177" sus="0.394" amt="1" x100="0" att="0.021" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/Plucked.xpf b/data/presets/TripleOscillator/Plucked.xpf
index 506fac3be..8f30397f4 100644
--- a/data/presets/TripleOscillator/Plucked.xpf
+++ b/data/presets/TripleOscillator/Plucked.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" fxch="0" baseoct="3" vol="100" name="Plucked" basetone="9" tab="3" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="5" coarse2="12" vol0="80" vol1="90" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="271" pan0="0" modalgo2="2" stphdetun1="299" pan1="0" stphdetun2="234" pan2="0" phoffset0="0" phoffset1="108" phoffset2="36" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="5" coarse0="12" />
+      <tripleoscillator userwavefile1="" wavetype1="4" coarse1="0" userwavefile2="" wavetype2="5" coarse2="12" vol0="80" vol1="90" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="271" pan0="0" modalgo2="2" stphdetun1="299" pan1="0" stphdetun2="234" pan2="0" phoffset0="0" phoffset1="108" phoffset2="36" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="5" coarse0="12" />
       <eldata fres="0.01" ftype="6" fcut="4859" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.324" ctlenvamt="0" latt="0" sus="0.998" lspd="0.0917" att="0.02" pdel="0" lamt="0" dec="0.324" userwavefile="" x100="0" lshp="0" hold="0" />
         <elcut lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="1" att="0.499" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="1" hold="0.499" />
diff --git a/data/presets/TripleOscillator/PowerStrings.xpf b/data/presets/TripleOscillator/PowerStrings.xpf
index c74354933..eca5512a9 100644
--- a/data/presets/TripleOscillator/PowerStrings.xpf
+++ b/data/presets/TripleOscillator/PowerStrings.xpf
@@ -4,7 +4,7 @@
  <head/>
  <instrumenttracksettings>
   <instrumenttrack width="250" x="301" surpos-x="0" y="24" surpos-y="0" fxch="0" height="436" basenote="66" vol="11" name="PowerStrings" tab="3" visible="1" >
-   <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="samples/shapes/smooth_inv_saw.ogg" wavetype2="3" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="42" finel1="-16" finel2="0" modalgo1="2" stphdetun0="121" pan0="0" modalgo2="0" stphdetun1="259" pan1="0" stphdetun2="92" pan2="0" phoffset0="0" phoffset1="266" phoffset2="80" finer0="0" finer1="13" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
+   <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="shapes/smooth_inv_saw.ogg" wavetype2="3" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="42" finel1="-16" finel2="0" modalgo1="2" stphdetun0="121" pan0="0" modalgo2="0" stphdetun1="259" pan1="0" stphdetun2="92" pan2="0" phoffset0="0" phoffset1="266" phoffset2="80" finer0="0" finer1="13" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
    <eldata fres="1.04" ftype="7" fcut="3224" fwet="1" >
     <elvol lspd_numerator="1" lpdel="0" amt="1" rel="0.219" ctlenvamt="0" latt="0" syncmode="0" sus="0" lspd_denominator="1" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.797" userwavefile="" x100="0" lshp="0" hold="0" />
     <elcut lspd_numerator="1" lpdel="0" amt="1" rel="0.016" ctlenvamt="0" latt="0" syncmode="0" sus="0.998" lspd_denominator="1" lspd="0.6268" att="0" pdel="0" lamt="0" dec="0.336" userwavefile="" x100="0" lshp="1" hold="0" />
diff --git a/data/presets/TripleOscillator/RaveBass.xpf b/data/presets/TripleOscillator/RaveBass.xpf
index 219e728a1..4f9347a37 100644
--- a/data/presets/TripleOscillator/RaveBass.xpf
+++ b/data/presets/TripleOscillator/RaveBass.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="RaveBass" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="57" vol="29" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="82" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="16" userwavefile2="samples/empty.wav" finer2="-3" coarse0="-12" coarse1="0" coarse2="12" finel0="0" finel1="10" modalgo1="2" modalgo2="2" finel2="-2" pan0="9" modalgo3="0" pan1="-20" stphdetun0="232" pan2="10" stphdetun1="95" wavetype0="2" stphdetun2="109" wavetype1="2" wavetype2="2" vol0="100" vol1="100" phoffset0="74" phoffset1="280" vol2="100" />
+        <tripleoscillator phoffset2="82" userwavefile0="" finer0="0" userwavefile1="" finer1="16" userwavefile2="" finer2="-3" coarse0="-12" coarse1="0" coarse2="12" finel0="0" finel1="10" modalgo1="2" modalgo2="2" finel2="-2" pan0="9" modalgo3="0" pan1="-20" stphdetun0="232" pan2="10" stphdetun1="95" wavetype0="2" stphdetun2="109" wavetype1="2" wavetype2="2" vol0="100" vol1="100" phoffset0="74" phoffset1="280" vol2="100" />
       </instrument>
       <eldata fres="0.9" ftype="0" fcut="1143" fwet="0" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.999" lamt="0.06" syncmode="0" latt="0" rel="0.242" sus="0" amt="1" x100="0" att="0.048" lpdel="0" hold="0" lshp="0" lspd="0.2607" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/ResonantPad.xpf b/data/presets/TripleOscillator/ResonantPad.xpf
index 2cfa8ce6c..6855bf39c 100644
--- a/data/presets/TripleOscillator/ResonantPad.xpf
+++ b/data/presets/TripleOscillator/ResonantPad.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="100" name="Resonant Pad" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-14" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="50" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="13" finer2="-3" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-14" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="50" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="13" finer2="-3" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.84" ftype="6" fcut="622" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0.242" latt="0" sus="0" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.297" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/RockOrgan.xpf b/data/presets/TripleOscillator/RockOrgan.xpf
index 14a2afd46..c9a85f64b 100644
--- a/data/presets/TripleOscillator/RockOrgan.xpf
+++ b/data/presets/TripleOscillator/RockOrgan.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="25" name="Rock Organ" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="1" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="124" phoffset2="120" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="1" coarse1="12" userwavefile2="" wavetype2="0" coarse2="-12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="124" phoffset2="120" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="0" coarse0="0" />
       <eldata fres="0.7" ftype="6" fcut="836" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.242" latt="0" sus="0" lspd="0.1" att="0.056" pdel="0" lamt="0" dec="0.589" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Short1.xpf b/data/presets/TripleOscillator/Short1.xpf
index c5ba117a7..07665e6f8 100644
--- a/data/presets/TripleOscillator/Short1.xpf
+++ b/data/presets/TripleOscillator/Short1.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Short1" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="-11" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="252" pan0="0" modalgo2="1" stphdetun1="122" pan1="0" stphdetun2="120" pan2="0" phoffset0="101" phoffset1="0" phoffset2="0" finer0="8" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="-11" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="252" pan0="0" modalgo2="1" stphdetun1="122" pan1="0" stphdetun2="120" pan2="0" phoffset0="101" phoffset1="0" phoffset2="0" finer0="8" finer1="0" finer2="0" userwavefile0="" wavetype0="2" coarse0="-12" />
       <eldata fres="0.32" ftype="0" fcut="3100" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.204" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Short2.xpf b/data/presets/TripleOscillator/Short2.xpf
index 66c42eb53..1f63be14e 100644
--- a/data/presets/TripleOscillator/Short2.xpf
+++ b/data/presets/TripleOscillator/Short2.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Short2" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="-14" vol2="100" finel1="0" finel2="0" modalgo1="1" stphdetun0="91" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="120" pan2="0" phoffset0="91" phoffset1="0" phoffset2="0" finer0="12" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="-14" vol2="100" finel1="0" finel2="0" modalgo1="1" stphdetun0="91" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="120" pan2="0" phoffset0="91" phoffset1="0" phoffset2="0" finer0="12" finer1="0" finer2="0" userwavefile0="" wavetype0="2" coarse0="-12" />
       <eldata fres="0.51" ftype="0" fcut="3100" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.204" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Short3.xpf b/data/presets/TripleOscillator/Short3.xpf
index 74dc078fa..4a2c46b26 100644
--- a/data/presets/TripleOscillator/Short3.xpf
+++ b/data/presets/TripleOscillator/Short3.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="100" name="Short3" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="0" vol0="50" vol1="50" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="162" pan0="0" modalgo2="3" stphdetun1="70" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="4" coarse1="0" userwavefile2="" wavetype2="4" coarse2="0" vol0="50" vol1="50" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="162" pan0="0" modalgo2="3" stphdetun1="70" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.5" ftype="0" fcut="33" fwet="1" >
         <elvol lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.144" x100="0" lshp="0" hold="0.216" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Short4.xpf b/data/presets/TripleOscillator/Short4.xpf
index 4a6a98f4b..1632f2eb8 100644
--- a/data/presets/TripleOscillator/Short4.xpf
+++ b/data/presets/TripleOscillator/Short4.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Short4" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="3" coarse2="12" vol0="100" vol1="72" finel0="0" vol2="35" finel1="0" finel2="0" modalgo1="0" stphdetun0="195" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="261" pan2="0" phoffset0="0" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="-12" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="3" coarse2="12" vol0="100" vol1="72" finel0="0" vol2="35" finel1="0" finel2="0" modalgo1="0" stphdetun0="195" pan0="0" modalgo2="0" stphdetun1="0" pan1="0" stphdetun2="261" pan2="0" phoffset0="0" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="2" coarse0="-12" />
       <eldata fres="3" ftype="1" fcut="588" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.193" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/SoftBass.xpf b/data/presets/TripleOscillator/SoftBass.xpf
index 544aab578..95a836bbe 100644
--- a/data/presets/TripleOscillator/SoftBass.xpf
+++ b/data/presets/TripleOscillator/SoftBass.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Soft Bass" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="44" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="0" coarse0="-12" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="247" pan2="0" stphdetun1="0" wavetype0="5" stphdetun2="120" wavetype1="2" wavetype2="4" vol0="100" vol1="100" phoffset0="101" phoffset1="0" vol2="100" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="0" coarse0="-12" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="247" pan2="0" stphdetun1="0" wavetype0="5" stphdetun2="120" wavetype1="2" wavetype2="4" vol0="100" vol1="100" phoffset0="101" phoffset1="0" vol2="100" />
       </instrument>
       <eldata fres="0.5" ftype="0" fcut="2839" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.281" lamt="0" syncmode="0" latt="0" rel="0.151" sus="0.704" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/SoftStrings.xpf b/data/presets/TripleOscillator/SoftStrings.xpf
index b27f67324..29ac963d8 100644
--- a/data/presets/TripleOscillator/SoftStrings.xpf
+++ b/data/presets/TripleOscillator/SoftStrings.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="SoftStrings" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="57" vol="29" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="80" userwavefile0="" finer0="0" userwavefile1="" finer1="13" userwavefile2="samples/shapes/smooth_inv_saw.ogg" finer2="0" coarse0="0" coarse1="0" coarse2="12" finel0="0" finel1="-16" modalgo1="2" modalgo2="0" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="121" pan2="0" stphdetun1="259" wavetype0="2" stphdetun2="92" wavetype1="2" wavetype2="3" vol0="100" vol1="100" phoffset0="0" phoffset1="266" vol2="42" />
+        <tripleoscillator phoffset2="80" userwavefile0="" finer0="0" userwavefile1="" finer1="13" userwavefile2="shapes/smooth_inv_saw.ogg" finer2="0" coarse0="0" coarse1="0" coarse2="12" finel0="0" finel1="-16" modalgo1="2" modalgo2="0" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="121" pan2="0" stphdetun1="259" wavetype0="2" stphdetun2="92" wavetype1="2" wavetype2="3" vol0="100" vol1="100" phoffset0="0" phoffset1="266" vol2="42" />
       </instrument>
       <eldata fres="1.04" ftype="7" fcut="2524" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.598" lamt="0" syncmode="0" latt="0" rel="0.329" sus="0" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/SpaceBass.xpf b/data/presets/TripleOscillator/SpaceBass.xpf
index 4298b320a..afd8774f2 100644
--- a/data/presets/TripleOscillator/SpaceBass.xpf
+++ b/data/presets/TripleOscillator/SpaceBass.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="2" baseoct="5" vol="100" name="Space Bass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-23" finel2="0" modalgo1="0" stphdetun0="250" pan0="0" modalgo2="1" stphdetun1="50" pan1="0" stphdetun2="161" pan2="0" phoffset0="0" phoffset1="62" phoffset2="264" finer0="0" finer1="13" finer2="-3" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-23" finel2="0" modalgo1="0" stphdetun0="250" pan0="0" modalgo2="1" stphdetun1="50" pan1="0" stphdetun2="161" pan2="0" phoffset0="0" phoffset1="62" phoffset2="264" finer0="0" finer1="13" finer2="-3" userwavefile0="" wavetype0="2" coarse0="0" />
       <eldata fres="0.88" ftype="6" fcut="686" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.346" latt="0" sus="0.738" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.297" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Square.xpf b/data/presets/TripleOscillator/Square.xpf
index e1ee82776..8ba456516 100644
--- a/data/presets/TripleOscillator/Square.xpf
+++ b/data/presets/TripleOscillator/Square.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="Square" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="23" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="8" userwavefile2="samples/empty.wav" finer2="0" coarse0="0" coarse1="12" coarse2="0" finel0="0" finel1="-8" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="0" wavetype1="3" wavetype2="6" vol0="100" vol1="100" phoffset0="0" phoffset1="54" vol2="1" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="8" userwavefile2="" finer2="0" coarse0="0" coarse1="12" coarse2="0" finel0="0" finel1="-8" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="0" wavetype1="3" wavetype2="6" vol0="100" vol1="100" phoffset0="0" phoffset1="54" vol2="1" />
       </instrument>
       <eldata fres="0.87" ftype="6" fcut="92" fwet="0" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0" lamt="0" syncmode="0" latt="0" rel="0.332" sus="0" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/TB303-Arpeggio.xpf b/data/presets/TripleOscillator/TB303-Arpeggio.xpf
index 69fa74cbd..1bee743b0 100644
--- a/data/presets/TripleOscillator/TB303-Arpeggio.xpf
+++ b/data/presets/TripleOscillator/TB303-Arpeggio.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="TB303 Arpeggio" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="13" userwavefile2="samples/empty.wav" finer2="-3" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="-14" modalgo1="3" modalgo2="0" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="50" wavetype0="2" stphdetun2="0" wavetype1="2" wavetype2="2" vol0="100" vol1="100" phoffset0="0" phoffset1="0" vol2="100" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="13" userwavefile2="" finer2="-3" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="-14" modalgo1="3" modalgo2="0" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="50" wavetype0="2" stphdetun2="0" wavetype1="2" wavetype2="2" vol0="100" vol1="100" phoffset0="0" phoffset1="0" vol2="100" />
       </instrument>
       <eldata fres="0.88" ftype="6" fcut="968" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.297" lamt="0" syncmode="0" latt="0" rel="0.022" sus="0" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/TB303.xpf b/data/presets/TripleOscillator/TB303.xpf
index 023754598..d8ee12141 100644
--- a/data/presets/TripleOscillator/TB303.xpf
+++ b/data/presets/TripleOscillator/TB303.xpf
@@ -5,7 +5,7 @@
   <instrumenttracksettings muted="0" type="0" name="TB303" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="59" >
       <instrument name="tripleoscillator" >
-        <tripleoscillator phoffset2="0" userwavefile0="samples/empty.wav" finer0="0" userwavefile1="samples/empty.wav" finer1="0" userwavefile2="samples/empty.wav" finer2="0" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="173" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="0" wavetype1="2" wavetype2="2" vol0="100" vol1="0" phoffset0="0" phoffset1="0" vol2="0" />
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="0" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="173" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="0" wavetype1="2" wavetype2="2" vol0="100" vol1="0" phoffset0="0" phoffset1="0" vol2="0" />
       </instrument>
       <eldata fres="0.76" ftype="6" fcut="1" fwet="1" >
         <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.279" lamt="0" syncmode="0" latt="0" rel="0.112" sus="0" amt="1" x100="0" att="0.038" lpdel="0" hold="0" lshp="0" lspd="0.0917" ctlenvamt="0" lspd_numerator="1" />
diff --git a/data/presets/TripleOscillator/TheMaster.xpf b/data/presets/TripleOscillator/TheMaster.xpf
index f51d88848..ed2e33b4d 100644
--- a/data/presets/TripleOscillator/TheMaster.xpf
+++ b/data/presets/TripleOscillator/TheMaster.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="48" name="The Master" basetone="9" tab="1" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="0" vol0="160" vol1="132" finel0="-12" vol2="68" finel1="0" finel2="0" modalgo1="0" stphdetun0="235" pan0="0" modalgo2="1" stphdetun1="185" pan1="0" stphdetun2="209" pan2="0" phoffset0="98" phoffset1="58" phoffset2="235" finer0="12" finer1="0" finer2="0" userwavefile0="shapes/micro.wav" wavetype0="7" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="160" vol1="132" finel0="-12" vol2="68" finel1="0" finel2="0" modalgo1="0" stphdetun0="235" pan0="0" modalgo2="1" stphdetun1="185" pan1="0" stphdetun2="209" pan2="0" phoffset0="98" phoffset1="58" phoffset2="235" finer0="12" finer1="0" finer2="0" userwavefile0="shapes/micro.wav" wavetype0="7" coarse0="0" />
       <eldata fres="1.35" ftype="0" fcut="3200" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.384" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.039" pdel="0" lamt="0" dec="0" x100="0" lshp="0" hold="0" />
         <elcut lfosyncmode="0" lpdel="0.019" amt="1" rel="0" ctlenvamt="0" latt="0" sus="0.999" lspd="0.2384" att="0.037" pdel="0" lamt="0.345" dec="0.221" x100="0" lshp="0" hold="0" />
diff --git a/data/presets/TripleOscillator/Whistle.xpf b/data/presets/TripleOscillator/Whistle.xpf
index 2faefc562..12bd2a038 100644
--- a/data/presets/TripleOscillator/Whistle.xpf
+++ b/data/presets/TripleOscillator/Whistle.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Whistle" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="1" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="1" coarse2="0" vol0="35" vol1="35" finel0="0" vol2="32" finel1="0" finel2="-24" modalgo1="2" stphdetun0="195" pan0="0" modalgo2="2" stphdetun1="90" pan1="-36" stphdetun2="0" pan2="27" phoffset0="260" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="11" userwavefile0="samples/empty.wav" wavetype0="1" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="1" coarse1="0" userwavefile2="" wavetype2="1" coarse2="0" vol0="35" vol1="35" finel0="0" vol2="32" finel1="0" finel2="-24" modalgo1="2" stphdetun0="195" pan0="0" modalgo2="2" stphdetun1="90" pan1="-36" stphdetun2="0" pan2="27" phoffset0="260" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="11" userwavefile0="" wavetype0="1" coarse0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.1" latt="0" sus="0.234" lspd="0.1" att="0.062" pdel="0" lamt="0" dec="0.27" x100="0" lshp="0" hold="0" />
         <elpan lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />
diff --git a/data/presets/TripleOscillator/Xylophon.xpf b/data/presets/TripleOscillator/Xylophon.xpf
index ca5503cf3..c2c6eb9ca 100644
--- a/data/presets/TripleOscillator/Xylophon.xpf
+++ b/data/presets/TripleOscillator/Xylophon.xpf
@@ -4,7 +4,7 @@
   <head/>
   <channelsettings>
     <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Xylophon" basetone="9" tab="2" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="22" finel2="-25" modalgo1="1" stphdetun0="66" pan0="0" modalgo2="1" stphdetun1="275" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="12" finer2="-13" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="0" />
+      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="22" finel2="-25" modalgo1="1" stphdetun0="66" pan0="0" modalgo2="1" stphdetun1="275" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="12" finer2="-13" userwavefile0="" wavetype0="0" coarse0="0" />
       <eldata fres="0.5" ftype="1" fcut="820" fwet="0" >
         <elvol lpdel="0" amt="1" rel="0.38" ctlenvamt="0" latt="0" sus="0.999" lspd="0.01" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0" />
         <elcut lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.5" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="0" hold="0.5" />