diff --git a/data/presets/TripleOscillator/AnalogTimes2.cs.xml b/data/presets/TripleOscillator/AnalogTimes2.cs.xml
index 744848728..0be1051f9 100644
--- a/data/presets/TripleOscillator/AnalogTimes2.cs.xml
+++ b/data/presets/TripleOscillator/AnalogTimes2.cs.xml
@@ -1,30 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060323" type="instrumenttracksettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings>
-    <instrumenttrack width="250" x="12" y="227" surpos="134219776" fxch="0" height="436" baseoct="4" vol="100" name="AnalogTimes 2" basetone="9" tab="1" visible="1" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="-12" vol0="49" vol1="54" finel0="0" vol2="14" finel1="0" finel2="-14" modalgo1="2" stphdetun0="247" 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="3" coarse0="0" >
-        <journal entries="0" metadata="1" id="391701" curentry="0" />
-      </tripleoscillator>
-      <eldata fres="0.66" ftype="0" fcut="0" fwet="1" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.473" ctlenvamt="0" latt="0" sus="0.433" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.324" userwavefile="" x100="0" lshp="0" hold="0" >
-          <journal entries="0" metadata="1" id="579409" curentry="0" />
-        </elvol>
-        <elcut lfosyncmode="0" lpdel="0" amt="1" rel="0.43" ctlenvamt="0" latt="0" sus="0.64" lspd="0.767" att="0" pdel="0" lamt="0" dec="0.241" userwavefile="" x100="0" lshp="1" hold="0" >
-          <journal entries="0" metadata="1" id="907107" curentry="0" />
-        </elcut>
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.01" att="0" pdel="0" lamt="-0.01" dec="0.499" userwavefile="" x100="0" lshp="1" hold="0" >
-          <journal entries="0" metadata="1" id="403343" curentry="0" />
-        </elres>
-        <journal entries="0" metadata="1" id="518423" curentry="0" />
+  <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" />
+      </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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.241" lamt="0" syncmode="0" latt="0" rel="0.43" sus="0.64" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.767" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.499" lamt="-0.01" syncmode="0" latt="0" rel="0.1" sus="0.499" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.01" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords arpmode="0" chordrange="1" arprange="3" arpdisabled="1" chord="0" chorddisabled="0" arpgate="142" arp="0" arpsyncmode="0" arptime="102" arpdir="1" >
-        <journal entries="0" metadata="1" id="485335" curentry="0" />
-      </arpandchords>
-      <midi inputchannel="0" outputchannel="1" receive="1" send="0" inports="24:0 CS46XX:CS46XX" >
-        <journal entries="0" metadata="1" id="192691" curentry="0" />
-      </midi>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="102" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="142" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
     </instrumenttrack>
   </instrumenttracksettings>
-</multimediaproject>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/Bass.cs.xml b/data/presets/TripleOscillator/Bass.cs.xml
deleted file mode 100644
index 4f8a3af00..000000000
--- a/data/presets/TripleOscillator/Bass.cs.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060405" type="instrumenttracksettings" version="1.0" >
-  <head/>
-  <instrumenttracksettings>
-    <instrumenttrack width="250" x="0" y="256" surpos="134219776" fxch="0" height="436" baseoct="4" vol="60" name="bass" basetone="9" tab="0" visible="1" >
-      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="-24" userwavefile2="" wavetype2="2" coarse2="-12" vol0="60" vol1="33" finel0="0" vol2="68" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="1" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="0" coarse0="-24" >
-        <journal entries="0" metadata="1" id="745335" curentry="0" />
-      </tripleoscillator>
-      <eldata fres="0.01" ftype="3" fcut="320" fwet="0" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.238" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0" >
-          <journal entries="0" metadata="1" id="478852" curentry="0" />
-        </elvol>
-        <elcut lfosyncmode="2" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" >
-          <journal entries="0" metadata="1" id="740691" curentry="0" />
-        </elcut>
-        <elres lfosyncmode="6" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.01" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="3" hold="0.499" >
-          <journal entries="0" metadata="1" id="277655" curentry="0" />
-        </elres>
-        <journal entries="0" metadata="1" id="388879" curentry="0" />
-      </eldata>
-      <arpandchords arpmode="0" chordrange="1" arprange="1" arpdisabled="1" chord="0" chorddisabled="1" arpgate="100" arp="0" arpsyncmode="0" arptime="100" arpdir="1" >
-        <journal entries="0" metadata="1" id="604030" curentry="0" />
-      </arpandchords>
-      <midi defvelout="0" inputchannel="0" outputchannel="1" receive="0" send="0" defvelin="0" >
-        <journal entries="0" metadata="1" id="900862" curentry="0" />
-      </midi>
-    </instrumenttrack>
-  </instrumenttracksettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Beam.cs.xml b/data/presets/TripleOscillator/Beam.cs.xml
deleted file mode 100644
index 37be2abec..000000000
--- a/data/presets/TripleOscillator/Beam.cs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060222" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Beam" basetone="9" tab="2" >
-      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="33" vol1="33" finel0="0" vol2="33" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="0" coarse0="0" />
-      <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.1" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0" 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="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />
-      </eldata>
-      <arpandchords arpmode="0" chordrange="1" arprange="6" arpdisabled="0" chord="0" chorddisabled="1" arpgate="87" arp="67" arpsyncmode="0" arptime="100" arpdir="4" />
-      <midi inputchannel="0" outputchannel="1" receive="0" send="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/ChurchOrgan.cs.xml b/data/presets/TripleOscillator/ChurchOrgan.cs.xml
index e7a7cef7d..1c3c9ee3b 100644
--- a/data/presets/TripleOscillator/ChurchOrgan.cs.xml
+++ b/data/presets/TripleOscillator/ChurchOrgan.cs.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.0" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Church Organ" basetone="9" tab="1" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="5" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="22" finel2="-25" modalgo1="1" stphdetun0="66" pan0="0" modalgo2="0" 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="5" coarse0="0" />
-      <eldata fres="1" ftype="0" fcut="6028" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.095" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.019" pdel="0" lamt="0" dec="0.374" 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" />
-        <elres lpdel="0" amt="0" rel="0" 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" />
+  <instrumenttracksettings muted="0" type="0" name="Church Organ 2" >
+    <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="14" >
+      <instrument name="tripleoscillator" >
+        <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="0" pan2="0" stphdetun1="278" wavetype0="0" stphdetun2="274" wavetype1="0" wavetype2="0" vol0="100" vol1="100" phoffset0="0" phoffset1="70" vol2="100" />
+      </instrument>
+      <eldata fres="0.01" ftype="6" fcut="13120" fwet="1" >
+        <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0" lamt="0" syncmode="0" latt="0" rel="0.234" sus="0" amt="1" x100="0" att="0.078" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.499" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.499" amt="0" x100="0" att="0" lpdel="0" hold="0.499" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.499" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.499" amt="0" x100="0" att="0" lpdel="0" hold="0.499" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="4" arprange="1" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="4" chord-enabled="1" />
+      <arpeggiator arptime="164" arprange="1" arptime_denominator="1" syncmode="0" arpmode="1" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/ChurchOrgan_2.cs.xml b/data/presets/TripleOscillator/ChurchOrgan_2.cs.xml
deleted file mode 100644
index 800920eca..000000000
--- a/data/presets/TripleOscillator/ChurchOrgan_2.cs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060115" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="24" name="Church Organ 2" basetone="9" tab="1" >
-      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="119" pan1="0" stphdetun2="249" pan2="0" phoffset0="0" phoffset1="70" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="" wavetype0="0" coarse0="0" />
-      <eldata fres="0.01" ftype="6" fcut="13120" fwet="1" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.234" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.078" pdel="0" lamt="0" dec="0" 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="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />
-      </eldata>
-      <arpandchords arpmode="1" chordrange="4" arprange="1" arpdisabled="1" chord="0" chorddisabled="0" arpgate="100" arp="0" arpsyncmode="0" arptime="164" arpdir="1" />
-      <midi inputchannel="0" outputchannel="1" receive="1" send="0" inports="80:0 CS46XX:CS46XX" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Crystallo.cs.xml b/data/presets/TripleOscillator/Crystallo.cs.xml
deleted file mode 100644
index 50905d904..000000000
--- a/data/presets/TripleOscillator/Crystallo.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="60" name="Crystallo" basetone="9" >
-      <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="150" 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" />
-      <eldata fres="0.01" ftype="6" fcut="4907" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.396" latt="0" sus="0.381" lspd="0.0917" att="0.021" pdel="0" lamt="0" dec="0.191" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0.5" />
-        <elres lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Default.cs.xml b/data/presets/TripleOscillator/Default.cs.xml
deleted file mode 100644
index d01330b3a..000000000
--- a/data/presets/TripleOscillator/Default.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Default" 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="2" stphdetun0="0" pan0="0" modalgo2="2" 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="0" coarse0="0" />
-      <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
-        <elvol 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" />
-        <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" />
-        <elpitch 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" />
-        <elcut 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" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Detuned-Synced-FM-Bass.cs.xml b/data/presets/TripleOscillator/Detuned-Synced-FM-Bass.cs.xml
deleted file mode 100644
index 6702d041f..000000000
--- a/data/presets/TripleOscillator/Detuned-Synced-FM-Bass.cs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.1-cvs20051215" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="38" name="Detuned Synced FM Bass" basetone="9" tab="2" >
-      <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="0" 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" />
-      <eldata fres="0.88" ftype="6" fcut="686" fwet="0" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.18" ctlenvamt="0" latt="0" sus="0" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.296" x100="0" lshp="0" hold="0" />
-        <elcut lfosyncmode="0" lpdel="0" amt="0.33" rel="0" ctlenvamt="0" latt="0" sus="0.998" lspd="0.767" att="0" pdel="0" lamt="0.47" dec="0.223" x100="0" lshp="1" hold="0" />
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.01" att="0" pdel="0" lamt="-0.01" dec="0.499" x100="0" lshp="1" hold="0" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="2" arpdisabled="0" chord="0" chorddisabled="0" arpgate="150" arp="0" arpsyncmode="0" arptime="177" arpdir="1" />
-      <midi inputchannel="0" outputchannel="0" receive="0" send="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Distorted-FM-Bass_2.cs.xml b/data/presets/TripleOscillator/Distorted-FM-Bass_2.cs.xml
deleted file mode 100644
index 7f30ff457..000000000
--- a/data/presets/TripleOscillator/Distorted-FM-Bass_2.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="200" name="Distorted FM-Bass 2" 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" />
-      <eldata fres="0.01" ftype="6" fcut="827" 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.011" x100="0" lshp="0" hold="0.092" />
-        <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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.221" x100="0" lshp="0" hold="0" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="8" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/E-Organ.cs.xml b/data/presets/TripleOscillator/E-Organ.cs.xml
index 6d311b210..f42320e3d 100644
--- a/data/presets/TripleOscillator/E-Organ.cs.xml
+++ b/data/presets/TripleOscillator/E-Organ.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="33" name="E-Organ" basetone="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="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" />
-      <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
-        <elvol lpdel="0" amt="1" rel="0.215" latt="0" sus="0" lspd="0.1" att="0.079" 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" />
-        <elpitch 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" />
-        <elcut 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" />
-        <elres 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" />
+  <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" />
+      </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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="3" arprange="3" chord="0" arpgate="100" arp="8" arptime="150" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="3" chord-enabled="1" />
+      <arpeggiator arptime="150" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="8" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/E-Piano.cs.xml b/data/presets/TripleOscillator/E-Piano.cs.xml
deleted file mode 100644
index 427551587..000000000
--- a/data/presets/TripleOscillator/E-Piano.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="69" name="E-Piano" 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="0" finel2="1" modalgo1="2" stphdetun0="87" pan0="9" modalgo2="2" stphdetun1="203" pan1="-14" stphdetun2="255" pan2="0" phoffset0="0" phoffset1="152" phoffset2="26" finer0="0" finer1="0" finer2="1" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="12" />
-      <eldata fres="0.7" ftype="0" fcut="2286" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0" latt="0" sus="1" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.496" 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" />
-        <elpitch 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" />
-        <elcut 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" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" chord="0" arpgate="76" arp="8" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/EvilHardcore.cs.xml b/data/presets/TripleOscillator/EvilHardcore.cs.xml
deleted file mode 100644
index 34b87a5c8..000000000
--- a/data/presets/TripleOscillator/EvilHardcore.cs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.1-cvs20051208" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Evil Hardcore (play with C2-G3!)" basetone="9" tab="0" >
-      <tripleoscillator userwavefile1="" wavetype1="0" coarse1="-3" userwavefile2="" wavetype2="0" coarse2="0" vol0="100" vol1="12" finel0="0" vol2="100" finel1="-3" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="256" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="3" finer2="0" userwavefile0="" wavetype0="0" coarse0="0" />
-      <eldata fres="10" ftype="7" fcut="64" fwet="1" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.1" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.058" pdel="0" lamt="0" dec="0.235" x100="0" lshp="0" hold="0" />
-        <elcut lfosyncmode="6" lpdel="0" amt="0" rel="0" ctlenvamt="0" latt="0" sus="0.959" lspd="0.01" att="0" pdel="0" lamt="0.115" dec="0.123" x100="0" lshp="0" hold="0" />
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" x100="0" lshp="0" hold="0.499" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" arpdisabled="1" chord="0" chorddisabled="1" arpgate="100" arp="0" arpsyncmode="0" arptime="100" arpdir="1" />
-      <midi inputchannel="0" outputchannel="0" receive="0" send="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/FM-Wood-Arp.cs.xml b/data/presets/TripleOscillator/FM-Wood-Arp.cs.xml
deleted file mode 100644
index 780d00368..000000000
--- a/data/presets/TripleOscillator/FM-Wood-Arp.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="FM-Wood Arp" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="5" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="38" finel1="0" finel2="0" modalgo1="0" stphdetun0="253" pan0="0" modalgo2="0" stphdetun1="85" pan1="0" stphdetun2="115" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="4" coarse0="0" />
-      <eldata fres="0.85" ftype="0" fcut="0" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.098" latt="0" sus="0" lspd="0.01" att="0" pdel="0" lamt="0" dec="0" x100="0" lshp="0" hold="0.097" />
-        <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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0.545" rel="0" latt="0" sus="0.999" lspd="0.3411" att="0" pdel="0" lamt="0" dec="0.164" x100="0" lshp="1" hold="0" />
-        <elres lpdel="0" amt="0" rel="0.1" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.125" x100="0" lshp="0" hold="0" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="58" arp="3" arptime="100" arpdir="4" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Fear.cs.xml b/data/presets/TripleOscillator/Fear.cs.xml
deleted file mode 100644
index 109ffff8e..000000000
--- a/data/presets/TripleOscillator/Fear.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Fear" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="23" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="-14" vol0="100" vol1="76" finel0="0" vol2="100" finel1="0" finel2="6" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="93" pan1="0" stphdetun2="107" pan2="0" phoffset0="0" phoffset1="114" phoffset2="130" finer0="0" finer1="0" finer2="6" userwavefile0="samples/empty.wav" wavetype0="0" coarse0="0" />
-      <eldata fres="0.85" ftype="0" fcut="1143" fwet="0" >
-        <elvol lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="-0.305" dec="0.517" 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" />
-        <elpitch 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" />
-        <elcut 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" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="100" arp="3" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/HardClipping.cs.xml b/data/presets/TripleOscillator/HardClipping.cs.xml
deleted file mode 100644
index ee9d2c44c..000000000
--- a/data/presets/TripleOscillator/HardClipping.cs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimedia-project creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.3.0-rc2" type="instrumenttracksettings" version="1.0" >
- <head/>
- <instrumenttracksettings>
-  <instrumenttrack width="250" x="381" surpos-x="0" y="123" surpos-y="0" fxch="0" height="436" basenote="69" vol="86" name="Nostalgic feelings" tab="3" visible="1" >
-   <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="" wavetype2="0" coarse2="0" vol0="200" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="0" stphdetun0="0" pan0="0" modalgo2="2" 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="3.12" ftype="7" fcut="157" fwet="1" >
-    <elvol lspd_numerator="1" lpdel="0" amt="1" rel="0.295" ctlenvamt="0" latt="0" syncmode="0" sus="0" lspd_denominator="1" lspd="0.1" att="0.008" pdel="0" lamt="0" dec="0.281" userwavefile="" x100="0" lshp="0" hold="0" />
-    <elcut lspd_numerator="1" lpdel="0" amt="1" rel="0" ctlenvamt="1" latt="0" syncmode="0" sus="0.999" lspd_denominator="1" lspd="0.287" att="0" pdel="0" lamt="0.615" dec="0.324" userwavefile="" x100="0" lshp="0" hold="0" />
-    <elres lspd_numerator="1" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" syncmode="0" sus="0.5" lspd_denominator="1" lspd="0.0845" att="0" pdel="0" lamt="0" dec="0.5" userwavefile="" x100="0" lshp="0" hold="0.5" />
-   </eldata>
-   <arpandchords arpmode="0" chordrange="1" arp-enabled="0" arptime_numerator="1" arprange="1" chord-enabled="1" arptime_denominator="1" chord="0" syncmode="0" arpgate="100" arp="0" arptime="289" arpdir="0" />
-   <midi defvelout="0" inputchannel="0" outputchannel="1" receive="0" send="0" defvelin="0" />
-   <fx fxdisabled="0" >
-    <rack numofeffects="1" >
-     <effect key="AAAAAgAAAAIAAAADAAAAUgBDAEEAUABTADoAIABDAGwAaQBwACAALQAgAEgAYQByAGQAIABjAGwAaQBwAHAAZQByACwAIAA4AHgAIABvAHYAZQByAHMAYQBtAHAAbABlAGQAAAAEAAAAAgAAAAgAQwBsAGkAcAAAAA4AYwBhAHAAcwAuAHMAbzCB" autoquit="0" name="ladspaeffect" gate="0" wet="1" on="1" >
-      <ladspacontrols port11="1.08" port01="1.08" port01link="1" link="1" ports="2" />
-     </effect>
-    </rack>
-   </fx>
-  </instrumenttrack>
- </instrumenttracksettings>
-</multimedia-project>
diff --git a/data/presets/TripleOscillator/Harmonium.cs.xml b/data/presets/TripleOscillator/Harmonium.cs.xml
index af4322233..8ef8ae155 100644
--- a/data/presets/TripleOscillator/Harmonium.cs.xml
+++ b/data/presets/TripleOscillator/Harmonium.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="100" name="Harmonium" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="1" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="0" coarse2="0" vol0="35" vol1="51" finel0="0" vol2="32" finel1="0" finel2="-24" modalgo1="0" stphdetun0="195" pan0="0" modalgo2="1" stphdetun1="90" pan1="-36" stphdetun2="306" pan2="27" phoffset0="260" phoffset1="89" phoffset2="0" finer0="0" finer1="0" finer2="11" userwavefile0="samples/empty.wav" 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.265" 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" />
-        <elpitch 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" />
-        <elcut 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" />
-        <elres 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" />
+  <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" />
+      </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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="3" arprange="1" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="3" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/HorrorBass.cs.xml b/data/presets/TripleOscillator/HorrorBass.cs.xml
deleted file mode 100644
index b732b4322..000000000
--- a/data/presets/TripleOscillator/HorrorBass.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="100" name="HorrorBass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="3" coarse2="0" vol0="50" vol1="67" finel0="0" vol2="27" finel1="0" finel2="-17" modalgo1="0" stphdetun0="88" pan0="0" modalgo2="0" stphdetun1="209" pan1="0" stphdetun2="280" pan2="0" phoffset0="0" phoffset1="266" phoffset2="0" finer0="0" finer1="0" finer2="12" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
-      <eldata fres="1.99" ftype="0" fcut="0" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.187" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0" x100="0" lshp="0" hold="0.134" />
-        <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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0.66" rel="0" latt="0" sus="0.999" lspd="0.1" att="0.038" pdel="0" lamt="0" dec="0.185" x100="0" lshp="0" hold="0.068" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="8" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Jupiter.cs.xml b/data/presets/TripleOscillator/Jupiter.cs.xml
index 1b2b38fd3..360bbdc6e 100644
--- a/data/presets/TripleOscillator/Jupiter.cs.xml
+++ b/data/presets/TripleOscillator/Jupiter.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="5" vol="50" name="Jupiter" basetone="9" >
-      <tripleoscillator userwavefile1="" wavetype1="2" coarse1="0" userwavefile2="samples/shapes/smooth_inv_saw.ogg" wavetype2="3" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="63" 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" />
+  <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" />
+      </instrument>
       <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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0.82" rel="0.016" latt="0" sus="0.999" lspd="0.2918" att="0" pdel="0" lamt="0.63" dec="0.137" x100="0" lshp="1" hold="0" />
-        <elres 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" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.137" lamt="0.63" syncmode="0" latt="0" rel="0.016" sus="0.999" amt="0.82" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.2918" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="158" arpdir="2" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="158" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="1" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/LFO-party.cs.xml b/data/presets/TripleOscillator/LFO-party.cs.xml
index b9b6c4a64..a817cc85b 100644
--- a/data/presets/TripleOscillator/LFO-party.cs.xml
+++ b/data/presets/TripleOscillator/LFO-party.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="LFO-party" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="-12" vol0="85" vol1="51" finel0="0" vol2="48" finel1="-10" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="12" stphdetun2="296" pan2="-37" phoffset0="0" phoffset1="0" phoffset2="89" finer0="0" finer1="10" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+  <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" />
+      </instrument>
       <eldata fres="0.21" ftype="6" fcut="1834" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.242" latt="0" sus="0.238" lspd="0.3624" att="0" pdel="0" lamt="-0.16" dec="0.444" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.6011" att="0" pdel="0" lamt="0.64" dec="0.999" x100="0" lshp="1" hold="0" />
-        <elres lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.4752" att="0" pdel="0" lamt="0.395" dec="0.5" x100="0" lshp="1" hold="0" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.999" lamt="0.64" syncmode="0" latt="0" rel="0" sus="0.999" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.6011" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0.395" syncmode="0" latt="0" rel="0" sus="0.999" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.4752" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="8" arptime="100" arpdir="4" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="1" arp="8" arptime_numerator="1" arpdir="2" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/Moog.cs.xml b/data/presets/TripleOscillator/Moog.cs.xml
deleted file mode 100644
index 358c3ff10..000000000
--- a/data/presets/TripleOscillator/Moog.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="20" name="Moog" 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" />
-      <eldata fres="2" ftype="0" fcut="143" 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.136" x100="0" lshp="0" hold="0.239" />
-        <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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0.79" rel="0" latt="0" sus="0.999" lspd="0.767" att="0" pdel="0" lamt="0" dec="0.223" x100="0" lshp="1" hold="0" />
-        <elres lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="-0.00599995" dec="0.5" x100="0" lshp="1" hold="0" />
-      </eldata>
-      <arpandchords chordrange="2" arprange="2" chord="0" arpgate="142" arp="0" arptime="179" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/MoogArpeggio.cs.xml b/data/presets/TripleOscillator/MoogArpeggio.cs.xml
index f8d270768..c5a22326d 100644
--- a/data/presets/TripleOscillator/MoogArpeggio.cs.xml
+++ b/data/presets/TripleOscillator/MoogArpeggio.cs.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.0" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Moog Arpeggio" basetone="9" tab="0" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="4" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="1" coarse2="0" vol0="150" vol1="150" finel0="0" vol2="150" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="275" pan2="0" phoffset0="0" phoffset1="184" phoffset2="76" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="4" coarse0="0" />
+  <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" />
+      </instrument>
       <eldata fres="0.14" ftype="6" fcut="2314" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.187" ctlenvamt="0" latt="0" sus="0.582" lspd="0.0917" att="0.038" pdel="0" lamt="0" dec="0.154" x100="0" lshp="0" hold="0" />
-        <elcut lpdel="0" amt="0" rel="0" ctlenvamt="0" latt="0" sus="0.5" lspd="0.6339" att="0.5" pdel="0" lamt="1" dec="0.5" x100="0" lshp="1" hold="0.5" />
-        <elres lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="-0.00599995" dec="0.5" x100="0" lshp="1" hold="0" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="1" syncmode="0" latt="0" rel="0" sus="0.5" amt="0" x100="0" att="0.5" lpdel="0" hold="0.5" lshp="1" lspd="0.6339" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="-0.005" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.01" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="100" arpdir="3" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="1" arp="0" arptime_numerator="1" arpdir="1" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/MyComputer.cs.xml b/data/presets/TripleOscillator/MyComputer.cs.xml
deleted file mode 100644
index 7a7f7d530..000000000
--- a/data/presets/TripleOscillator/MyComputer.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="56" name="My Computer" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="0" 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="241" pan2="0" phoffset0="0" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="3" coarse0="0" />
-      <eldata fres="3" ftype="0" fcut="218" fwet="0" >
-        <elvol lpdel="0" amt="1" rel="0.172" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.5" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0.179" latt="0" sus="0.434" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.525" x100="0" lshp="0" hold="0" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="75" arp="8" arptime="120" arpdir="4" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Nice.cs.xml b/data/presets/TripleOscillator/Nice.cs.xml
deleted file mode 100644
index 52de529a0..000000000
--- a/data/presets/TripleOscillator/Nice.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="2" baseoct="4" vol="52" name="Nice" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="3" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-12" finel2="0" modalgo1="2" stphdetun0="71" pan0="0" modalgo2="0" stphdetun1="99" pan1="0" stphdetun2="206" pan2="0" phoffset0="0" phoffset1="260" phoffset2="0" finer0="0" finer1="15" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
-      <eldata fres="0.01" ftype="6" fcut="1598" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.139" latt="0" sus="0" lspd="0.1" att="0.068" pdel="0" lamt="0" dec="0.276" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.9615" att="0" pdel="0" lamt="0" dec="0.134" x100="0" lshp="1" hold="0" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="2" arprange="2" chord="0" arpgate="81" arp="0" arptime="210" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/NostalgicFeelings.cs.xml b/data/presets/TripleOscillator/NostalgicFeelings.cs.xml
deleted file mode 100644
index 41450245e..000000000
--- a/data/presets/TripleOscillator/NostalgicFeelings.cs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.1" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="75" name="Nostalgic feelings" basetone="9" tab="1" >
-      <tripleoscillator userwavefile1="" wavetype1="3" coarse1="-12" userwavefile2="" wavetype2="4" coarse2="0" vol0="124" vol1="114" finel0="-7" 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="0" phoffset2="261" finer0="9" finer1="0" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
-      <eldata fres="3.35" ftype="7" fcut="240" fwet="1" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.377" ctlenvamt="0" latt="0" sus="0.546" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.384" x100="0" lshp="0" hold="0.202" />
-        <elcut lfosyncmode="0" lpdel="0" amt="0.795" rel="0" ctlenvamt="1" latt="0" sus="0.998" lspd="0.2431" att="0" pdel="0" lamt="0.595" dec="0.365" x100="0" lshp="0" hold="0.033" />
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" x100="0" lshp="0" hold="0.499" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" arpdisabled="1" chord="0" chorddisabled="1" arpgate="100" arp="0" arpsyncmode="0" arptime="100" arpdir="1" />
-      <midi inputchannel="0" outputchannel="0" route="0" receive="1" send="1" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/OldComputerGames.cs.xml b/data/presets/TripleOscillator/OldComputerGames.cs.xml
new file mode 100644
index 000000000..18a21d4a4
--- /dev/null
+++ b/data/presets/TripleOscillator/OldComputerGames.cs.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Old Computer Games" >
+    <instrumenttrack pan="-7" fxch="0" pitch="0" basenote="57" vol="86" >
+      <instrument name="tripleoscillator" >
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="-4" userwavefile1="" finer1="2" userwavefile2="" finer2="-2" coarse0="0" coarse1="0" coarse2="0" finel0="4" finel1="-2" modalgo1="2" modalgo2="0" finel2="2" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="3" stphdetun2="0" wavetype1="3" wavetype2="2" vol0="33" vol1="30" phoffset0="0" phoffset1="0" vol2="33" />
+      </instrument>
+      <eldata fres="1.01" ftype="0" fcut="5320" fwet="1" >
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.4" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.48" lamt="0" syncmode="0" latt="0" rel="0" sus="1" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />
+      </eldata>
+      <chordcreator chord="0" chordrange="2" chord-enabled="1" />
+      <arpeggiator arptime="105" arprange="1" arptime_denominator="4" syncmode="0" arpmode="2" arp-enabled="1" arp="3" arptime_numerator="4" arpdir="0" arpgate="34" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="4" enabled="1" >
+        <effect key="AAAACQAAAAACAAAACgAAAABGAEMAKgAgAFQAbwBuAGUAUwB0AGEAYwBrACAALQAgAFQAbwBuAGUAIABzAHQAYQBjAGsAIABlAG0AdQBsAGEAdABpAG8AbgAAAAsAAAAAAgAAABIAVABvAG4AZQBTAHQAYQBjAGsAAAAOAGMAYQBwAHMALgBzAG8=" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port11="0" port01="0" port12="0.14" port02="0.14" port13="0.5" port03="0.5" port14="0.5" port04="0.5" port04link="1" port02link="1" port03link="1" link="1" ports="8" port01link="1" />
+        </effect>
+        <effect key="AAAACQAAAAACAAAACgAAAAAeAFQAQQBQACAAUwB0AGUAcgBlAG8AIABFAGMAaABvAAAACwAAAAACAAAAHgB0AGEAcABfAHMAdABlAHIAZQBvAF8AZQBjAGgAbwAAABYAdABhAHAAXwBlAGMAaABvAC4AcwBv" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port00="640" port01="18" port02="640" port03="21" port04="-11.6" port05="-11.6" port06="2.4" port07="1" port08="0" port09="1" ports="10" />
+        </effect>
+        <effect key="AAAACQAAAAACAAAACgAAAAAcAFQAQQBQACAAQQB1AHQAbwBQAGEAbgBuAGUAcgAAAAsAAAAAAgAAABYAdABhAHAAXwBhAHUAdABvAHAAYQBuAAAAHAB0AGEAcABfAGEAdQB0AG8AcABhAG4ALgBzAG8=" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port00="0.2" port01="27" port02="10.125" ports="3" />
+        </effect>
+        <effect key="AAAACQAAAAACAAAACgAAAABmAEMAKgAgAFAAbABhAHQAZQAyAHgAMgAgAC0AIABWAGUAcgBzAGEAdABpAGwAZQAgAHAAbABhAHQAZQAgAHIAZQB2AGUAcgBiACwAIABzAHQAZQByAGUAbwAgAGkAbgBwAHUAdABzAAAACwAAAAACAAAAEABQAGwAYQB0AGUAMgB4ADIAAAAOAGMAYQBwAHMALgBzAG8=" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port02="0.27335" port03="0.749" port04="0" port05="0.4" ports="4" />
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/PluckArpeggio.cs.xml b/data/presets/TripleOscillator/PluckArpeggio.cs.xml
index b453aab6c..146b592ae 100644
--- a/data/presets/TripleOscillator/PluckArpeggio.cs.xml
+++ b/data/presets/TripleOscillator/PluckArpeggio.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Pluck Arpeggio" basetone="9" >
-      <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" />
+  <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" />
+      </instrument>
       <eldata fres="0.95" ftype="1" fcut="1181" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.177" latt="0" sus="0.394" lspd="0.0917" att="0.021" pdel="0" lamt="0" dec="0.191" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="1" att="0.5" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0.5" />
-        <elres lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0.5" lpdel="0" hold="0.5" lshp="1" lspd="1" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.01" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="100" arpdir="3" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="1" arp="0" arptime_numerator="1" arpdir="1" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/RaveBass.cs.xml b/data/presets/TripleOscillator/RaveBass.cs.xml
index 680c4f82f..219e728a1 100644
--- a/data/presets/TripleOscillator/RaveBass.cs.xml
+++ b/data/presets/TripleOscillator/RaveBass.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="3" vol="50" name="RaveBass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="100" finel1="10" finel2="-2" modalgo1="2" stphdetun0="232" pan0="9" modalgo2="2" 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" />
+  <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" />
+      </instrument>
       <eldata fres="0.9" ftype="0" fcut="1143" fwet="0" >
-        <elvol lpdel="0" amt="1" rel="0.242" latt="0" sus="0" lspd="0.2607" att="0.048" pdel="0" lamt="0.06" 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" />
-        <elpitch 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" />
-        <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" />
-        <elres lpdel="0" amt="0" rel="0" 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" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0.5" lpdel="0" hold="0.5" lshp="1" lspd="0.6094" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0" sus="0.5" amt="0" x100="0" att="0.5" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="76" arp="12" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="2" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="12" arptime_numerator="1" arpdir="0" arpgate="76" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/RaveBass_2.cs.xml b/data/presets/TripleOscillator/RaveBass_2.cs.xml
deleted file mode 100644
index 55a6f4866..000000000
--- a/data/presets/TripleOscillator/RaveBass_2.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="3" vol="50" name="RaveBass 2" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="3" coarse1="0" userwavefile2="samples/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="samples/empty.wav" wavetype0="2" coarse0="-12" />
-      <eldata fres="0.32" ftype="4" fcut="1324" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.242" latt="0" sus="0" lspd="0.1" att="0.048" 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" />
-        <elpitch 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" />
-        <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" />
-        <elres lpdel="0" amt="0" rel="0" 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="76" arp="12" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/SawLead.cs.xml b/data/presets/TripleOscillator/SawLead.cs.xml
index 86283ebdb..b4750526c 100644
--- a/data/presets/TripleOscillator/SawLead.cs.xml
+++ b/data/presets/TripleOscillator/SawLead.cs.xml
@@ -1,336 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.2.1-svn20061204" type="instrumenttracksettings" version="1.0" >
- <head/>
- <instrumenttracksettings>
-  <instrumenttrack width="250" x="0" y="0" height="436" name="Default" tab="0" visible="1" >
-   <automation-pattern>
-    <vol>
-     <time value="100" pos="0" />
-    </vol>
-    <surpos-x>
-     <time value="0" pos="0" />
-    </surpos-x>
-    <surpos-y>
-     <time value="0" pos="0" />
-    </surpos-y>
-    <fxch>
-     <time value="0" pos="0" />
-    </fxch>
-    <basenote>
-     <time value="57" pos="0" />
-    </basenote>
-   </automation-pattern>
-   <tripleoscillator userwavefile1="" userwavefile2="" userwavefile0="" >
-    <automation-pattern>
-     <modalgo1>
-      <time value="2" pos="0" />
-     </modalgo1>
-     <modalgo2>
-      <time value="2" pos="0" />
-     </modalgo2>
-     <vol0>
-      <time value="33" pos="0" />
-     </vol0>
-     <pan0>
-      <time value="0" pos="0" />
-     </pan0>
-     <coarse0>
-      <time value="0" pos="0" />
-     </coarse0>
-     <finel0>
-      <time value="6" pos="0" />
-     </finel0>
-     <finer0>
-      <time value="-12" pos="0" />
-     </finer0>
-     <phoffset0>
-      <time value="0" pos="0" />
-     </phoffset0>
-     <stphdetun0>
-      <time value="0" pos="0" />
-     </stphdetun0>
-     <wavetype0>
-      <time value="2" pos="0" />
-     </wavetype0>
-     <vol1>
-      <time value="33" pos="0" />
-     </vol1>
-     <pan1>
-      <time value="0" pos="0" />
-     </pan1>
-     <coarse1>
-      <time value="0" pos="0" />
-     </coarse1>
-     <finel1>
-      <time value="8" pos="0" />
-     </finel1>
-     <finer1>
-      <time value="-18" pos="0" />
-     </finer1>
-     <phoffset1>
-      <time value="0" pos="0" />
-     </phoffset1>
-     <stphdetun1>
-      <time value="0" pos="0" />
-     </stphdetun1>
-     <wavetype1>
-      <time value="0" pos="0" />
-     </wavetype1>
-     <vol2>
-      <time value="33" pos="0" />
-     </vol2>
-     <pan2>
-      <time value="0" pos="0" />
-     </pan2>
-     <coarse2>
-      <time value="0" pos="0" />
-     </coarse2>
-     <finel2>
-      <time value="8" pos="0" />
-     </finel2>
-     <finer2>
-      <time value="22" pos="0" />
-     </finer2>
-     <phoffset2>
-      <time value="0" pos="0" />
-     </phoffset2>
-     <stphdetun2>
-      <time value="0" pos="0" />
-     </stphdetun2>
-     <wavetype2>
-      <time value="1" pos="0" />
-     </wavetype2>
-    </automation-pattern>
-   </tripleoscillator>
-   <eldata fwet="0" >
-    <automation-pattern>
-     <ftype>
-      <time value="0" pos="0" />
-     </ftype>
-     <fcut>
-      <time value="14000" pos="0" />
-     </fcut>
-     <fres>
-      <time value="0.5" pos="0" />
-     </fres>
-    </automation-pattern>
-    <elvol syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elvol>
-    <elcut syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elcut>
-    <elres syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elres>
-   </eldata>
-   <arpandchords arpdisabled="1" syncmode="0" chorddisabled="1" >
-    <automation-pattern>
-     <chord>
-      <time value="0" pos="0" />
-     </chord>
-     <chordrange>
-      <time value="1" pos="0" />
-     </chordrange>
-     <arp>
-      <time value="0" pos="0" />
-     </arp>
-     <arprange>
-      <time value="1" pos="0" />
-     </arprange>
-     <arptime>
-      <time value="100" pos="0" />
-     </arptime>
-     <arptime_numerator>
-      <time value="1" pos="0" />
-     </arptime_numerator>
-     <arptime_denominator>
-      <time value="1" pos="0" />
-     </arptime_denominator>
-     <arpgate>
-      <time value="100" pos="0" />
-     </arpgate>
-     <arpdir>
-      <time value="0" pos="0" />
-     </arpdir>
-     <arpmode>
-      <time value="0" pos="0" />
-     </arpmode>
-    </automation-pattern>
-   </arpandchords>
-   <midi>
-    <automation-pattern>
-     <inputchannel>
-      <time value="0" pos="0" />
-     </inputchannel>
-     <outputchannel>
-      <time value="1" pos="0" />
-     </outputchannel>
-     <receive>
-      <time value="0" pos="0" />
-     </receive>
-     <send>
-      <time value="0" pos="0" />
-     </send>
-     <defvelin>
-      <time value="0" pos="0" />
-     </defvelin>
-     <defvelout>
-      <time value="0" pos="0" />
-     </defvelout>
-    </automation-pattern>
-   </midi>
-   <fx fxdisabled="1" >
-    <rack numofeffects="0" />
-   </fx>
-  </instrumenttrack>
- </instrumenttracksettings>
-</multimediaproject>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Default" >
+    <instrumenttrack pan="0" fxch="0" pitch="0" basenote="57" vol="68" >
+      <instrument name="tripleoscillator" >
+        <tripleoscillator phoffset2="39" userwavefile0="" finer0="2" userwavefile1="" finer1="-2" userwavefile2="" finer2="2" coarse0="0" coarse1="0" coarse2="0" finel0="6" finel1="-2" modalgo1="2" modalgo2="2" finel2="2" pan0="0" modalgo3="0" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="196" wavetype1="2" wavetype2="2" vol0="33" vol1="33" phoffset0="0" phoffset1="47" vol2="33" />
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0" >
+        <elvol lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0" />
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/SawLead2.cs.xml b/data/presets/TripleOscillator/SawLead2.cs.xml
deleted file mode 100644
index 10c8bb39c..000000000
--- a/data/presets/TripleOscillator/SawLead2.cs.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.2.1-svn20061204" type="instrumenttracksettings" version="1.0" >
- <head/>
- <instrumenttracksettings>
-  <instrumenttrack width="250" x="183" y="27" height="436" name="Default" tab="0" visible="1" >
-   <automation-pattern>
-    <vol>
-     <time value="100" pos="0" />
-    </vol>
-    <surpos-x>
-     <time value="0" pos="0" />
-    </surpos-x>
-    <surpos-y>
-     <time value="0" pos="0" />
-    </surpos-y>
-    <fxch>
-     <time value="0" pos="0" />
-    </fxch>
-    <basenote>
-     <time value="57" pos="0" />
-    </basenote>
-   </automation-pattern>
-   <tripleoscillator userwavefile1="" userwavefile2="" userwavefile0="" >
-    <automation-pattern>
-     <modalgo1>
-      <time value="2" pos="0" />
-     </modalgo1>
-     <modalgo2>
-      <time value="2" pos="0" />
-     </modalgo2>
-     <vol0>
-      <time value="33" pos="0" />
-     </vol0>
-     <pan0>
-      <time value="0" pos="0" />
-     </pan0>
-     <coarse0>
-      <time value="0" pos="0" />
-     </coarse0>
-     <finel0>
-      <time value="6" pos="0" />
-     </finel0>
-     <finer0>
-      <time value="2" pos="0" />
-     </finer0>
-     <phoffset0>
-      <time value="0" pos="0" />
-     </phoffset0>
-     <stphdetun0>
-      <time value="0" pos="0" />
-     </stphdetun0>
-     <wavetype0>
-      <time value="2" pos="0" />
-     </wavetype0>
-     <vol1>
-      <time value="33" pos="0" />
-     </vol1>
-     <pan1>
-      <time value="0" pos="0" />
-     </pan1>
-     <coarse1>
-      <time value="0" pos="0" />
-     </coarse1>
-     <finel1>
-      <time value="-2" pos="0" />
-     </finel1>
-     <finer1>
-      <time value="-2" pos="0" />
-     </finer1>
-     <phoffset1>
-      <time value="47" pos="0" />
-     </phoffset1>
-     <stphdetun1>
-      <time value="0" pos="0" />
-     </stphdetun1>
-     <wavetype1>
-      <time value="2" pos="0" />
-     </wavetype1>
-     <vol2>
-      <time value="33" pos="0" />
-     </vol2>
-     <pan2>
-      <time value="0" pos="0" />
-     </pan2>
-     <coarse2>
-      <time value="0" pos="0" />
-     </coarse2>
-     <finel2>
-      <time value="2" pos="0" />
-     </finel2>
-     <finer2>
-      <time value="2" pos="0" />
-     </finer2>
-     <phoffset2>
-      <time value="39" pos="0" />
-     </phoffset2>
-     <stphdetun2>
-      <time value="196" pos="0" />
-     </stphdetun2>
-     <wavetype2>
-      <time value="2" pos="0" />
-     </wavetype2>
-    </automation-pattern>
-   </tripleoscillator>
-   <eldata fwet="0" >
-    <automation-pattern>
-     <ftype>
-      <time value="0" pos="0" />
-     </ftype>
-     <fcut>
-      <time value="14000" pos="0" />
-     </fcut>
-     <fres>
-      <time value="0.5" pos="0" />
-     </fres>
-    </automation-pattern>
-    <elvol syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elvol>
-    <elcut syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elcut>
-    <elres syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elres>
-   </eldata>
-   <arpandchords arpdisabled="1" syncmode="0" chorddisabled="1" >
-    <automation-pattern>
-     <chord>
-      <time value="0" pos="0" />
-     </chord>
-     <chordrange>
-      <time value="1" pos="0" />
-     </chordrange>
-     <arp>
-      <time value="0" pos="0" />
-     </arp>
-     <arprange>
-      <time value="1" pos="0" />
-     </arprange>
-     <arptime>
-      <time value="100" pos="0" />
-     </arptime>
-     <arptime_numerator>
-      <time value="1" pos="0" />
-     </arptime_numerator>
-     <arptime_denominator>
-      <time value="1" pos="0" />
-     </arptime_denominator>
-     <arpgate>
-      <time value="100" pos="0" />
-     </arpgate>
-     <arpdir>
-      <time value="0" pos="0" />
-     </arpdir>
-     <arpmode>
-      <time value="0" pos="0" />
-     </arpmode>
-    </automation-pattern>
-   </arpandchords>
-   <midi>
-    <automation-pattern>
-     <inputchannel>
-      <time value="0" pos="0" />
-     </inputchannel>
-     <outputchannel>
-      <time value="1" pos="0" />
-     </outputchannel>
-     <receive>
-      <time value="0" pos="0" />
-     </receive>
-     <send>
-      <time value="0" pos="0" />
-     </send>
-     <defvelin>
-      <time value="0" pos="0" />
-     </defvelin>
-     <defvelout>
-      <time value="0" pos="0" />
-     </defvelout>
-    </automation-pattern>
-   </midi>
-   <fx fxdisabled="1" >
-    <rack numofeffects="0" />
-   </fx>
-  </instrumenttrack>
- </instrumenttracksettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/ShortBass.cs.xml b/data/presets/TripleOscillator/ShortBass.cs.xml
deleted file mode 100644
index dc0309edd..000000000
--- a/data/presets/TripleOscillator/ShortBass.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="2" baseoct="4" vol="100" name="Short Bass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="50" vol1="50" finel0="0" vol2="50" finel1="0" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="120" pan2="0" phoffset0="101" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="1" coarse0="0" />
-      <eldata fres="0.14" ftype="0" fcut="2496" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.6673" att="0.5" pdel="0" lamt="0.94" dec="0.5" x100="0" lshp="1" hold="0.5" />
-        <elres lpdel="0" amt="0" rel="0" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Simple-Acid-Bass.cs.xml b/data/presets/TripleOscillator/Simple-Acid-Bass.cs.xml
deleted file mode 100644
index f59d62bfb..000000000
--- a/data/presets/TripleOscillator/Simple-Acid-Bass.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Simple Acid Bass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="5" coarse1="-12" userwavefile2="samples/empty.wav" wavetype2="5" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-12" finel2="0" modalgo1="2" stphdetun0="71" pan0="0" modalgo2="3" stphdetun1="99" pan1="0" stphdetun2="206" pan2="0" phoffset0="0" phoffset1="260" phoffset2="0" finer0="0" finer1="15" finer2="0" userwavefile0="samples/empty.wav" wavetype0="5" coarse0="0" />
-      <eldata fres="0.81" ftype="6" fcut="1691" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.022" latt="0" sus="0" lspd="0.1" att="0.068" pdel="0" lamt="0" dec="0.267" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.9365" att="0" pdel="0" lamt="0.575" dec="0.134" x100="0" lshp="1" hold="0" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="81" arp="0" arptime="100" arpdir="3" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/SoftBass.cs.xml b/data/presets/TripleOscillator/SoftBass.cs.xml
index 1fcd221e0..544aab578 100644
--- a/data/presets/TripleOscillator/SoftBass.cs.xml
+++ b/data/presets/TripleOscillator/SoftBass.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="75" name="Soft Bass" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="4" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="0" finel2="0" modalgo1="2" stphdetun0="247" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="120" pan2="0" phoffset0="101" phoffset1="0" phoffset2="0" finer0="0" finer1="0" finer2="0" userwavefile0="samples/empty.wav" wavetype0="5" coarse0="-12" />
+  <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" />
+      </instrument>
       <eldata fres="0.5" ftype="0" fcut="2839" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.151" latt="0" sus="0.704" lspd="0.0917" att="0" pdel="0" lamt="0" dec="0.281" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.7263" att="0.5" pdel="0" lamt="0.83" dec="0.5" x100="0" lshp="0" hold="0.5" />
-        <elres lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="1" att="0" pdel="0" lamt="0" dec="0.5" x100="0" lshp="1" hold="0" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0.83" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0.5" lpdel="0" hold="0.5" lshp="0" lspd="0.7263" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/SoftStrings.cs.xml b/data/presets/TripleOscillator/SoftStrings.cs.xml
index fa6fa5991..b27f67324 100644
--- a/data/presets/TripleOscillator/SoftStrings.cs.xml
+++ b/data/presets/TripleOscillator/SoftStrings.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="3" vol="50" name="Soft Strings" basetone="9" >
-      <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" />
+  <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" />
+      </instrument>
       <eldata fres="1.04" ftype="7" fcut="2524" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="1" rel="0.016" latt="0" sus="0.999" lspd="0.6268" att="0" pdel="0" lamt="0.63" dec="0.137" x100="0" lshp="1" hold="0" />
-        <elres lpdel="0" amt="0" rel="0.1" latt="0" sus="0.5" lspd="0.6717" att="0" pdel="0" lamt="0.43" dec="0.5" x100="0" lshp="0" hold="0.5" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.137" lamt="0.63" syncmode="0" latt="0" rel="0.016" sus="0.999" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.6268" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0.43" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.6717" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="100" arp="0" arptime="158" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="158" arprange="2" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/Square.cs.xml b/data/presets/TripleOscillator/Square.cs.xml
index a7f729867..e1ee82776 100644
--- a/data/presets/TripleOscillator/Square.cs.xml
+++ b/data/presets/TripleOscillator/Square.cs.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.0" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="39" name="Square" basetone="9" tab="1" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="3" coarse1="12" userwavefile2="samples/empty.wav" wavetype2="6" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="1" finel1="-8" finel2="0" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="54" phoffset2="0" finer0="0" finer1="8" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
+  <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" />
+      </instrument>
       <eldata fres="0.87" ftype="6" fcut="92" fwet="0" >
-        <elvol lpdel="0" amt="1" rel="0.332" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0" x100="0" lshp="0" hold="0" />
-        <elcut lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.1178" att="0.101" pdel="0" lamt="0" dec="0.174" x100="0" lshp="1" hold="0" />
-        <elres 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" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.174" lamt="0" syncmode="0" latt="0" rel="0" sus="0.999" amt="0" x100="0" att="0.101" lpdel="0" hold="0" lshp="1" lspd="0.1178" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="1" chord="0" arpgate="72" arp="0" arptime="165" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="165" arprange="1" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="72" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/SquareArp.cs.xml b/data/presets/TripleOscillator/SquareArp.cs.xml
deleted file mode 100644
index 98414f2c7..000000000
--- a/data/presets/TripleOscillator/SquareArp.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="0" baseoct="4" vol="100" name="Square Arp" basetone="9" >
-      <tripleoscillator userwavefile1="" wavetype1="3" coarse1="-12" userwavefile2="" wavetype2="2" coarse2="0" vol0="100" vol1="69" finel0="-9" vol2="0" finel1="0" finel2="-16" modalgo1="2" stphdetun0="172" pan0="0" modalgo2="2" stphdetun1="0" pan1="0" stphdetun2="259" pan2="0" phoffset0="109" phoffset1="0" phoffset2="128" finer0="6" finer1="0" finer2="10" userwavefile0="" wavetype0="3" coarse0="0" />
-      <eldata fres="0.32" ftype="0" fcut="495" fwet="0" >
-        <elvol lpdel="0" amt="1" rel="0.216" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" 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" />
-        <elpitch 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" />
-        <elcut 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" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="100" arpdir="1" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/SquareLead.cs.xml b/data/presets/TripleOscillator/SquareLead.cs.xml
deleted file mode 100644
index 4bee4ce1c..000000000
--- a/data/presets/TripleOscillator/SquareLead.cs.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.2.1-svn20061204" type="instrumenttracksettings" version="1.0" >
- <head/>
- <instrumenttracksettings>
-  <instrumenttrack width="250" x="290" y="54" height="436" name="Default" tab="0" visible="1" >
-   <automation-pattern>
-    <vol>
-     <time value="100" pos="0" />
-    </vol>
-    <surpos-x>
-     <time value="0" pos="0" />
-    </surpos-x>
-    <surpos-y>
-     <time value="0" pos="0" />
-    </surpos-y>
-    <fxch>
-     <time value="0" pos="0" />
-    </fxch>
-    <basenote>
-     <time value="57" pos="0" />
-    </basenote>
-   </automation-pattern>
-   <tripleoscillator userwavefile1="" userwavefile2="" userwavefile0="" >
-    <automation-pattern>
-     <modalgo1>
-      <time value="2" pos="0" />
-     </modalgo1>
-     <modalgo2>
-      <time value="2" pos="0" />
-     </modalgo2>
-     <vol0>
-      <time value="33" pos="0" />
-     </vol0>
-     <pan0>
-      <time value="0" pos="0" />
-     </pan0>
-     <coarse0>
-      <time value="0" pos="0" />
-     </coarse0>
-     <finel0>
-      <time value="-10" pos="0" />
-     </finel0>
-     <finer0>
-      <time value="12" pos="0" />
-     </finer0>
-     <phoffset0>
-      <time value="0" pos="0" />
-     </phoffset0>
-     <stphdetun0>
-      <time value="0" pos="0" />
-     </stphdetun0>
-     <wavetype0>
-      <time value="3" pos="0" />
-     </wavetype0>
-     <vol1>
-      <time value="33" pos="0" />
-     </vol1>
-     <pan1>
-      <time value="0" pos="0" />
-     </pan1>
-     <coarse1>
-      <time value="0" pos="0" />
-     </coarse1>
-     <finel1>
-      <time value="-16" pos="0" />
-     </finel1>
-     <finer1>
-      <time value="-16" pos="0" />
-     </finer1>
-     <phoffset1>
-      <time value="0" pos="0" />
-     </phoffset1>
-     <stphdetun1>
-      <time value="0" pos="0" />
-     </stphdetun1>
-     <wavetype1>
-      <time value="4" pos="0" />
-     </wavetype1>
-     <vol2>
-      <time value="33" pos="0" />
-     </vol2>
-     <pan2>
-      <time value="0" pos="0" />
-     </pan2>
-     <coarse2>
-      <time value="0" pos="0" />
-     </coarse2>
-     <finel2>
-      <time value="4" pos="0" />
-     </finel2>
-     <finer2>
-      <time value="8" pos="0" />
-     </finer2>
-     <phoffset2>
-      <time value="0" pos="0" />
-     </phoffset2>
-     <stphdetun2>
-      <time value="0" pos="0" />
-     </stphdetun2>
-     <wavetype2>
-      <time value="3" pos="0" />
-     </wavetype2>
-    </automation-pattern>
-   </tripleoscillator>
-   <eldata fwet="0" >
-    <automation-pattern>
-     <ftype>
-      <time value="0" pos="0" />
-     </ftype>
-     <fcut>
-      <time value="14000" pos="0" />
-     </fcut>
-     <fres>
-      <time value="0.5" pos="0" />
-     </fres>
-    </automation-pattern>
-    <elvol syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elvol>
-    <elcut syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elcut>
-    <elres syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elres>
-   </eldata>
-   <arpandchords arpdisabled="1" syncmode="0" chorddisabled="1" >
-    <automation-pattern>
-     <chord>
-      <time value="0" pos="0" />
-     </chord>
-     <chordrange>
-      <time value="1" pos="0" />
-     </chordrange>
-     <arp>
-      <time value="0" pos="0" />
-     </arp>
-     <arprange>
-      <time value="1" pos="0" />
-     </arprange>
-     <arptime>
-      <time value="100" pos="0" />
-     </arptime>
-     <arptime_numerator>
-      <time value="1" pos="0" />
-     </arptime_numerator>
-     <arptime_denominator>
-      <time value="1" pos="0" />
-     </arptime_denominator>
-     <arpgate>
-      <time value="100" pos="0" />
-     </arpgate>
-     <arpdir>
-      <time value="0" pos="0" />
-     </arpdir>
-     <arpmode>
-      <time value="0" pos="0" />
-     </arpmode>
-    </automation-pattern>
-   </arpandchords>
-   <midi>
-    <automation-pattern>
-     <inputchannel>
-      <time value="0" pos="0" />
-     </inputchannel>
-     <outputchannel>
-      <time value="1" pos="0" />
-     </outputchannel>
-     <receive>
-      <time value="0" pos="0" />
-     </receive>
-     <send>
-      <time value="0" pos="0" />
-     </send>
-     <defvelin>
-      <time value="0" pos="0" />
-     </defvelin>
-     <defvelout>
-      <time value="0" pos="0" />
-     </defvelout>
-    </automation-pattern>
-   </midi>
-   <fx fxdisabled="1" >
-    <rack numofeffects="0" />
-   </fx>
-  </instrumenttrack>
- </instrumenttracksettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/SquareLead2.cs.xml b/data/presets/TripleOscillator/SquareLead2.cs.xml
deleted file mode 100644
index cccc3ad06..000000000
--- a/data/presets/TripleOscillator/SquareLead2.cs.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.2.1-svn20061204" type="instrumenttracksettings" version="1.0" >
- <head/>
- <instrumenttracksettings>
-  <instrumenttrack width="250" x="514" y="123" height="436" name="Default" tab="0" visible="1" >
-   <automation-pattern>
-    <vol>
-     <time value="100" pos="0" />
-    </vol>
-    <surpos-x>
-     <time value="0" pos="0" />
-    </surpos-x>
-    <surpos-y>
-     <time value="0" pos="0" />
-    </surpos-y>
-    <fxch>
-     <time value="0" pos="0" />
-    </fxch>
-    <basenote>
-     <time value="57" pos="0" />
-    </basenote>
-   </automation-pattern>
-   <tripleoscillator userwavefile1="" userwavefile2="" userwavefile0="" >
-    <automation-pattern>
-     <modalgo1>
-      <time value="2" pos="0" />
-     </modalgo1>
-     <modalgo2>
-      <time value="2" pos="0" />
-     </modalgo2>
-     <vol0>
-      <time value="33" pos="0" />
-     </vol0>
-     <pan0>
-      <time value="0" pos="0" />
-     </pan0>
-     <coarse0>
-      <time value="0" pos="0" />
-     </coarse0>
-     <finel0>
-      <time value="-10" pos="0" />
-     </finel0>
-     <finer0>
-      <time value="2" pos="0" />
-     </finer0>
-     <phoffset0>
-      <time value="0" pos="0" />
-     </phoffset0>
-     <stphdetun0>
-      <time value="0" pos="0" />
-     </stphdetun0>
-     <wavetype0>
-      <time value="3" pos="0" />
-     </wavetype0>
-     <vol1>
-      <time value="33" pos="0" />
-     </vol1>
-     <pan1>
-      <time value="0" pos="0" />
-     </pan1>
-     <coarse1>
-      <time value="0" pos="0" />
-     </coarse1>
-     <finel1>
-      <time value="4" pos="0" />
-     </finel1>
-     <finer1>
-      <time value="18" pos="0" />
-     </finer1>
-     <phoffset1>
-      <time value="0" pos="0" />
-     </phoffset1>
-     <stphdetun1>
-      <time value="0" pos="0" />
-     </stphdetun1>
-     <wavetype1>
-      <time value="2" pos="0" />
-     </wavetype1>
-     <vol2>
-      <time value="29" pos="0" />
-     </vol2>
-     <pan2>
-      <time value="0" pos="0" />
-     </pan2>
-     <coarse2>
-      <time value="0" pos="0" />
-     </coarse2>
-     <finel2>
-      <time value="-2" pos="0" />
-     </finel2>
-     <finer2>
-      <time value="-16" pos="0" />
-     </finer2>
-     <phoffset2>
-      <time value="45" pos="0" />
-     </phoffset2>
-     <stphdetun2>
-      <time value="252" pos="0" />
-     </stphdetun2>
-     <wavetype2>
-      <time value="3" pos="0" />
-     </wavetype2>
-    </automation-pattern>
-   </tripleoscillator>
-   <eldata fwet="0" >
-    <automation-pattern>
-     <ftype>
-      <time value="0" pos="0" />
-     </ftype>
-     <fcut>
-      <time value="14000" pos="0" />
-     </fcut>
-     <fres>
-      <time value="0.5" pos="0" />
-     </fres>
-    </automation-pattern>
-    <elvol syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elvol>
-    <elcut syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elcut>
-    <elres syncmode="0" userwavefile="" >
-     <automation-pattern>
-      <pdel>
-       <time value="0" pos="0" />
-      </pdel>
-      <att>
-       <time value="0" pos="0" />
-      </att>
-      <hold>
-       <time value="0.5" pos="0" />
-      </hold>
-      <dec>
-       <time value="0.5" pos="0" />
-      </dec>
-      <sus>
-       <time value="0.5" pos="0" />
-      </sus>
-      <rel>
-       <time value="0.1" pos="0" />
-      </rel>
-      <amt>
-       <time value="0" pos="0" />
-      </amt>
-      <lshp>
-       <time value="0" pos="0" />
-      </lshp>
-      <lpdel>
-       <time value="0" pos="0" />
-      </lpdel>
-      <latt>
-       <time value="0" pos="0" />
-      </latt>
-      <lspd>
-       <time value="0.1" pos="0" />
-      </lspd>
-      <lspd_numerator>
-       <time value="1" pos="0" />
-      </lspd_numerator>
-      <lspd_denominator>
-       <time value="1" pos="0" />
-      </lspd_denominator>
-      <lamt>
-       <time value="0" pos="0" />
-      </lamt>
-      <x100>
-       <time value="0" pos="0" />
-      </x100>
-      <ctlenvamt>
-       <time value="0" pos="0" />
-      </ctlenvamt>
-     </automation-pattern>
-    </elres>
-   </eldata>
-   <arpandchords arpdisabled="1" syncmode="0" chorddisabled="1" >
-    <automation-pattern>
-     <chord>
-      <time value="0" pos="0" />
-     </chord>
-     <chordrange>
-      <time value="1" pos="0" />
-     </chordrange>
-     <arp>
-      <time value="0" pos="0" />
-     </arp>
-     <arprange>
-      <time value="1" pos="0" />
-     </arprange>
-     <arptime>
-      <time value="100" pos="0" />
-     </arptime>
-     <arptime_numerator>
-      <time value="1" pos="0" />
-     </arptime_numerator>
-     <arptime_denominator>
-      <time value="1" pos="0" />
-     </arptime_denominator>
-     <arpgate>
-      <time value="100" pos="0" />
-     </arpgate>
-     <arpdir>
-      <time value="0" pos="0" />
-     </arpdir>
-     <arpmode>
-      <time value="0" pos="0" />
-     </arpmode>
-    </automation-pattern>
-   </arpandchords>
-   <midi>
-    <automation-pattern>
-     <inputchannel>
-      <time value="0" pos="0" />
-     </inputchannel>
-     <outputchannel>
-      <time value="1" pos="0" />
-     </outputchannel>
-     <receive>
-      <time value="0" pos="0" />
-     </receive>
-     <send>
-      <time value="0" pos="0" />
-     </send>
-     <defvelin>
-      <time value="0" pos="0" />
-     </defvelin>
-     <defvelout>
-      <time value="0" pos="0" />
-     </defvelout>
-    </automation-pattern>
-   </midi>
-   <fx fxdisabled="1" >
-    <rack numofeffects="0" />
-   </fx>
-  </instrumenttrack>
- </instrumenttracksettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Steel.cs.xml b/data/presets/TripleOscillator/Steel.cs.xml
deleted file mode 100644
index 3f041c276..000000000
--- a/data/presets/TripleOscillator/Steel.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="Steel Room" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="5" coarse2="12" vol0="100" vol1="100" finel0="0" vol2="166" finel1="-6" finel2="-13" modalgo1="2" stphdetun0="0" pan0="0" modalgo2="0" stphdetun1="65" pan1="0" stphdetun2="0" pan2="0" phoffset0="0" phoffset1="0" phoffset2="59" finer0="0" finer1="9" finer2="12" userwavefile0="samples/empty.wav" wavetype0="3" coarse0="0" />
-      <eldata fres="3" ftype="0" fcut="25" fwet="1" >
-        <elvol lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.32" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.1" att="0.179" pdel="0" lamt="0" dec="0.271" x100="0" lshp="0" hold="0.166" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Stranger.cs.xml b/data/presets/TripleOscillator/Stranger.cs.xml
deleted file mode 100644
index 6978bdd36..000000000
--- a/data/presets/TripleOscillator/Stranger.cs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="52" name="Stranger" basetone="10" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="3" coarse1="-12" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="100" finel0="0" vol2="100" finel1="-12" finel2="0" modalgo1="2" stphdetun0="71" pan0="0" modalgo2="0" stphdetun1="99" pan1="0" stphdetun2="206" pan2="0" phoffset0="0" phoffset1="260" phoffset2="0" finer0="0" finer1="15" finer2="0" userwavefile0="samples/empty.wav" wavetype0="2" coarse0="0" />
-      <eldata fres="0.81" ftype="6" fcut="1598" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.139" latt="0" sus="0" lspd="0.1" att="0.068" pdel="0" lamt="0" dec="0.276" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0" rel="0" latt="0" sus="0.999" lspd="0.9615" att="0" pdel="0" lamt="0.575" dec="0.134" x100="0" lshp="1" hold="0" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="81" arp="0" arptime="210" arpdir="3" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/TB303-Arpeggio.cs.xml b/data/presets/TripleOscillator/TB303-Arpeggio.cs.xml
index 62b04aa07..69fa74cbd 100644
--- a/data/presets/TripleOscillator/TB303-Arpeggio.cs.xml
+++ b/data/presets/TripleOscillator/TB303-Arpeggio.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="5" vol="100" name="TB303 Arpeggio" 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="3" stphdetun0="0" pan0="0" modalgo2="0" 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" />
+  <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" />
+      </instrument>
       <eldata fres="0.88" ftype="6" fcut="968" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.022" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="0.565" rel="0" latt="0" sus="0.999" lspd="0.3808" att="0" pdel="0" lamt="0.47" dec="0.223" x100="0" lshp="1" hold="0" />
-        <elres lpdel="0" amt="0" rel="0" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="-0.00599995" dec="0.5" x100="0" lshp="1" hold="0" />
+        <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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.223" lamt="0.47" syncmode="0" latt="0" rel="0" sus="0.999" amt="0.565" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.3808" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="-0.005" syncmode="0" latt="0" rel="0" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.01" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="2" chord="0" arpgate="142" arp="0" arptime="179" arpdir="1" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="179" arprange="2" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="1" arp="0" arptime_numerator="1" arpdir="0" arpgate="142" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/TB303.cs.xml b/data/presets/TripleOscillator/TB303.cs.xml
index cd9905901..023754598 100644
--- a/data/presets/TripleOscillator/TB303.cs.xml
+++ b/data/presets/TripleOscillator/TB303.cs.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.0.9" type="channelsettings" version="1.0" >
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
   <head/>
-  <channelsettings>
-    <channeltrack surpos="134219776" muted="0" fxch="0" tbidx="1" baseoct="4" vol="100" name="TB303" basetone="9" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="2" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="0" vol0="100" vol1="0" finel0="0" vol2="0" finel1="0" finel2="0" modalgo1="2" stphdetun0="173" pan0="0" modalgo2="2" 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" />
-      <eldata fres="0.76" ftype="6" fcut="0" fwet="1" >
-        <elvol lpdel="0" amt="1" rel="0.112" latt="0" sus="0" lspd="0.0917" att="0.038" pdel="0" lamt="0" dec="0.279" 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" />
-        <elpitch 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" />
-        <elcut lpdel="0" amt="1" rel="0" latt="0" sus="0.999" lspd="0.0658" att="0.062" pdel="0" lamt="0" dec="0.426" x100="0" lshp="0" hold="0" />
-        <elres lpdel="0" amt="0" rel="0" latt="0" sus="0.5" lspd="0.01" att="0" pdel="0" lamt="-0.00599995" dec="0.5" x100="0" lshp="1" hold="0" />
+  <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" />
+      </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" />
+        <elcut lspd_denominator="1" pdel="0" userwavefile="" dec="0.426" lamt="0" syncmode="0" latt="0" rel="0" sus="0.999" amt="1" x100="0" att="0.062" lpdel="0" hold="0" lshp="0" lspd="0.0658" ctlenvamt="0" lspd_numerator="1" />
+        <elres lspd_denominator="1" pdel="0" userwavefile="" dec="0.5" lamt="-0.005" syncmode="0" latt="0" rel="0" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0" lshp="1" lspd="0.01" ctlenvamt="0" lspd_numerator="1" />
       </eldata>
-      <arpandchords chordrange="1" arprange="3" chord="0" arpgate="100" arp="0" arptime="100" arpdir="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
+      <chordcreator chord="0" chordrange="1" chord-enabled="1" />
+      <arpeggiator arptime="100" arprange="3" arptime_denominator="1" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="1" arpdir="0" arpgate="100" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="0" enabled="0" />
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/WarmStack.cs.xml b/data/presets/TripleOscillator/WarmStack.cs.xml
new file mode 100644
index 000000000..7dc3a2785
--- /dev/null
+++ b/data/presets/TripleOscillator/WarmStack.cs.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-beta" type="instrumenttracksettings" >
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Warm Stack" >
+    <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="100" >
+      <instrument name="tripleoscillator" >
+        <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="20" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="0" pan1="0" stphdetun0="4" pan2="0" stphdetun1="0" wavetype0="1" stphdetun2="0" wavetype1="0" wavetype2="2" vol0="33" vol1="33" phoffset0="40" phoffset1="0" vol2="41" />
+      </instrument>
+      <eldata fres="2.71" ftype="0" fcut="2520" fwet="1" >
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.26" lamt="0" syncmode="0" latt="0" rel="0.17" sus="0.87" amt="1" x100="0" att="0" lpdel="0" hold="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="1" syncmode="1" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1667" ctlenvamt="0" lspd_numerator="4" />
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="2" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />
+      </eldata>
+      <chordcreator chord="0" chordrange="2" chord-enabled="1" />
+      <arpeggiator arptime="108" arprange="2" arptime_denominator="4" syncmode="0" arpmode="1" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="1" />
+      <midiport inputcontroller="0" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" defvelout="0" readable="0" defvelin="0" />
+      <fxchain numofeffects="3" enabled="1" >
+        <effect key="AAAACQAAAAACAAAACgAAAAAoAEYAcgBlAGUAdgBlAHIAYgAgACgAVgBlAHIAcwBpAG8AbgAgADMAKQAAAAsAAAAAAgAAABIAZgByAGUAZQB2AGUAcgBiADMAAAAMAGMAbQB0AC4AcwBv" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port04="0" port05="0.8" port06="0" port07="0.4" port08="1" port09="0.5" ports="6" />
+        </effect>
+        <effect key="AAAACQAAAAACAAAACgAAAABMAEYAZQBlAGQAYgBhAGMAawAgAEQAZQBsAGEAeQAgAEwAaQBuAGUAIAAoAE0AYQB4AGkAbQB1AG0AIABEAGUAbABhAHkAIAA1AHMAKQAAAAsAAAAAAgAAABQAZgBiAGQAZQBsAGEAeQBfADUAcwAAAAwAYwBtAHQALgBzAG8=" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port10="412.5" port00_denominator="4" port00="412.5" port10_numerator="4" port11="0.31" port01="0.31" port10_denominator="4" port14="0.34" syncmode="4" port04="0.34" port04link="1" link="1" port00link="1" ports="6" port00_numerator="4" port01link="1" />
+        </effect>
+        <effect key="AAAACQAAAAACAAAACgAAAAAsAEYAYQBzAHQAIABMAG8AbwBrAGEAaABlAGEAZAAgAGwAaQBtAGkAdABlAHIAAAALAAAAAAIAAAAoAGYAYQBzAHQATABvAG8AawBhAGgAZQBhAGQATABpAG0AaQB0AGUAcgAAADwAZgBhAHMAdABfAGwAbwBvAGsAYQBoAGUAYQBkAF8AbABpAG0AaQB0AGUAcgBfADEAOQAxADMALgBzAG8=" autoquit="0" gate="0" name="ladspaeffect" wet="1" on="1" >
+          <ladspacontrols port00="0" port01="0" port02="507.45" syncmode="0" port02_numerator="4" ports="3" port02_denominator="4" />
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>
diff --git a/data/presets/TripleOscillator/Warmth.cs.xml b/data/presets/TripleOscillator/Warmth.cs.xml
deleted file mode 100644
index ca69d5fed..000000000
--- a/data/presets/TripleOscillator/Warmth.cs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.1-cvs20051108" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="132646936" fxch="0" baseoct="4" vol="34" name="Warmth" basetone="9" tab="0" >
-      <tripleoscillator userwavefile1="" wavetype1="5" coarse1="0" userwavefile2="" wavetype2="6" coarse2="0" vol0="88" vol1="92" finel0="-8" vol2="3" finel1="-8" finel2="0" modalgo1="2" stphdetun0="191" pan0="0" modalgo2="0" stphdetun1="260" pan1="0" stphdetun2="0" pan2="0" phoffset0="182" phoffset1="49" phoffset2="0" finer0="10" finer1="12" finer2="0" userwavefile0="" wavetype0="2" coarse0="0" />
-      <eldata fres="1.51" ftype="0" fcut="1920" fwet="1" >
-        <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.369" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.216" x100="0" lshp="0" hold="0" />
-        <elcut lfosyncmode="0" lpdel="0" amt="0.85" rel="0" ctlenvamt="0" latt="0" sus="0.999" lspd="0.01" att="0" pdel="0" lamt="0.335" dec="0.333" x100="0" lshp="0" hold="0" />
-        <elres lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" x100="0" lshp="0" hold="0.499" />
-      </eldata>
-      <arpandchords chordrange="2" arprange="1" arpdisabled="1" chord="0" chorddisabled="0" arpgate="100" arp="0" arpsyncmode="0" arptime="100" arpdir="1" />
-      <midi inputchannel="0" outputchannel="0" route="0" receive="1" send="0" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>
diff --git a/data/presets/TripleOscillator/Weird.cs.xml b/data/presets/TripleOscillator/Weird.cs.xml
deleted file mode 100644
index 728a0ff5c..000000000
--- a/data/presets/TripleOscillator/Weird.cs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE multimedia-project>
-<multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.0" type="channelsettings" version="1.0" >
-  <head/>
-  <channelsettings>
-    <channeltrack surpos="132646936" fxch="0" baseoct="4" vol="100" name="Weird" basetone="9" tab="0" >
-      <tripleoscillator userwavefile1="samples/empty.wav" wavetype1="0" coarse1="0" userwavefile2="samples/empty.wav" wavetype2="2" coarse2="12" vol0="100" vol1="61" finel0="0" vol2="81" finel1="-18" finel2="0" modalgo1="3" 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" />
-      <eldata fres="3" ftype="0" fcut="16000" fwet="0" >
-        <elvol lpdel="0" amt="1" rel="0.301" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.123" pdel="0" lamt="0" dec="0.437" 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" />
-        <elres 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" />
-      </eldata>
-      <arpandchords chordrange="1" arprange="1" arpdisabled="1" chord="0" chorddisabled="0" arpgate="100" arp="0" arptime="100" arpdir="1" />
-    </channeltrack>
-  </channelsettings>
-</multimediaproject>