merged with trunk

6 files changed, 1973 insertions, 43 deletions

diff --git a/muse2/share/templates/MusE.cfg b/muse2/share/templates/MusE.cfg
index 3c13b834..875a29a5 100644
--- a/muse2/share/templates/MusE.cfg
+++ b/muse2/share/templates/MusE.cfg
@@ -54,6 +54,7 @@
     <inputTracksVisible>0</inputTracksVisible>
     <outputTracksVisible>0</outputTracksVisible>
     <synthTracksVisible>0</synthTracksVisible>
+    <smartFocus>1</smartFocus>
     <font0>arial,10,-1,5,50,0,0,0,0,0</font0>
     <font1>arial,7,-1,5,50,0,0,0,0,0</font1>
     <font2>arial,10,-1,5,50,0,0,0,0,0</font2>
diff --git a/muse2/share/templates/audio.med b/muse2/share/templates/audio.med
index 0e0abd55..8fc7d9b5 100644
--- a/muse2/share/templates/audio.med
+++ b/muse2/share/templates/audio.med
@@ -17,8 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
-    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
+    <geometryMain x="0" y="0" w="1024" h="695"></geometryMain>
+    <geometryTransport x="0" y="0" w="0" h="0"></geometryTransport>
+    <arrangerVisible>1</arrangerVisible>
+    <markerVisible>0</markerVisible>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
     <sequencer>
@@ -53,10 +55,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -67,10 +93,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -81,10 +131,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -95,10 +169,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -109,10 +207,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -123,10 +245,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -137,10 +283,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -151,10 +321,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -165,10 +359,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -179,10 +397,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -193,10 +435,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -207,10 +473,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -221,10 +511,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -235,10 +549,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -249,10 +587,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -263,10 +625,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -289,7 +675,7 @@
         <range>1</range>
         <strength>90</strength>
         <threshold>0</threshold>
-        <raster>3</raster>
+        <raster>2</raster>
         <swing>0</swing>
         <quant_len>1</quant_len>
         </quantize>
@@ -329,7 +715,7 @@
       <pastedialog>
         <insert_method>0</insert_method>
         <number>1</number>
-        <raster>384</raster>
+        <raster>1536</raster>
         <clone>0</clone>
         <all_in_one_track>0</all_in_one_track>
         </pastedialog>
@@ -575,14 +961,14 @@
       </Route>
     <Route channel="1">
       <source name="Out 1"/>
-      <dest type="1" name="system:playback_2"/>
+      <dest type="1" name="system:playback_1"/>
       </Route>
     <Route channel="0">
       <source type="1" name="system:capture_1"/>
       <dest name="Input 1"/>
       </Route>
     <Route channel="1">
-      <source type="1" name="system:capture_2"/>
+      <source type="1" name="system:capture_1"/>
       <dest name="Input 1"/>
       </Route>
     <Route>
@@ -647,4 +1033,6 @@
     <drummap>
       </drummap>
     </song>
+  <no_toplevels>
+  </no_toplevels>
   </muse>
diff --git a/muse2/share/templates/default.med b/muse2/share/templates/default.med
index a33ffc3d..f9518959 100644
--- a/muse2/share/templates/default.med
+++ b/muse2/share/templates/default.med
@@ -17,6 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
+    <geometryMain x="0" y="0" w="1024" h="695"></geometryMain>
+    <geometryTransport x="0" y="0" w="0" h="0"></geometryTransport>
+    <arrangerVisible>1</arrangerVisible>
+    <markerVisible>0</markerVisible>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
     <sequencer>
@@ -51,10 +55,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -65,10 +93,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -79,10 +131,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -93,10 +169,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -107,10 +207,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -121,10 +245,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -135,10 +283,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -149,10 +321,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -163,10 +359,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -177,10 +397,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -191,10 +435,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -205,10 +473,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -219,10 +511,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -233,10 +549,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -247,10 +587,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -261,10 +625,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -287,7 +675,7 @@
         <range>1</range>
         <strength>90</strength>
         <threshold>0</threshold>
-        <raster>3</raster>
+        <raster>2</raster>
         <swing>0</swing>
         <quant_len>1</quant_len>
         </quantize>
@@ -327,7 +715,7 @@
       <pastedialog>
         <insert_method>0</insert_method>
         <number>1</number>
-        <raster>384</raster>
+        <raster>1536</raster>
         <clone>0</clone>
         <all_in_one_track>0</all_in_one_track>
         </pastedialog>
@@ -382,11 +770,11 @@
       <controller id="2" cur="0" color="#ff0000" visible="0">
         </controller>
       </AudioOutput>
-    <Route channel="1">
+    <Route channel="0">
       <source name="Out 1"/>
-      <dest type="1" name="system:playback_2"/>
+      <dest type="1" name="system:playback_1"/>
       </Route>
-    <Route channel="0">
+    <Route channel="1">
       <source name="Out 1"/>
       <dest type="1" name="system:playback_1"/>
       </Route>
@@ -412,5 +800,6 @@
     <drummap>
       </drummap>
     </song>
+  <no_toplevels>
+  </no_toplevels>
   </muse>
-  
diff --git a/muse2/share/templates/midiGM.med b/muse2/share/templates/midiGM.med
index 19b74dff..c21f6d0f 100644
--- a/muse2/share/templates/midiGM.med
+++ b/muse2/share/templates/midiGM.med
@@ -17,8 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
-    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
+    <geometryMain x="0" y="0" w="1024" h="695"></geometryMain>
+    <geometryTransport x="0" y="0" w="0" h="0"></geometryTransport>
+    <arrangerVisible>1</arrangerVisible>
+    <markerVisible>0</markerVisible>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
     <sequencer>
@@ -55,10 +57,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -72,10 +98,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -89,10 +139,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -106,10 +180,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -123,10 +221,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -140,10 +262,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -157,10 +303,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -174,10 +344,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -191,10 +385,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -208,10 +426,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -225,10 +467,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -242,10 +508,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -259,10 +549,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -276,10 +590,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -293,10 +631,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -310,10 +672,34 @@
           <controller id="10">
             <val>0</val>
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -337,7 +723,7 @@
         <range>1</range>
         <strength>90</strength>
         <threshold>0</threshold>
-        <raster>3</raster>
+        <raster>2</raster>
         <swing>0</swing>
         <quant_len>1</quant_len>
         </quantize>
@@ -377,7 +763,7 @@
       <pastedialog>
         <insert_method>0</insert_method>
         <number>1</number>
-        <raster>384</raster>
+        <raster>1536</raster>
         <clone>0</clone>
         <all_in_one_track>0</all_in_one_track>
         </pastedialog>
@@ -560,4 +946,6 @@
     <drummap>
       </drummap>
     </song>
+  <no_toplevels>
+  </no_toplevels>
   </muse>
diff --git a/muse2/share/templates/monorecord.med b/muse2/share/templates/monorecord.med
index 738cab17..77207417 100644
--- a/muse2/share/templates/monorecord.med
+++ b/muse2/share/templates/monorecord.med
@@ -17,8 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
-    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
+    <geometryMain x="0" y="0" w="1024" h="695"></geometryMain>
+    <geometryTransport x="0" y="0" w="0" h="0"></geometryTransport>
+    <arrangerVisible>1</arrangerVisible>
+    <markerVisible>0</markerVisible>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
     <sequencer>
@@ -53,10 +55,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -67,10 +93,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -81,10 +131,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -95,10 +169,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -109,10 +207,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -123,10 +245,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -137,10 +283,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -151,10 +321,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -165,10 +359,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -179,10 +397,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -193,10 +435,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -207,10 +473,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -221,10 +511,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -235,10 +549,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -249,10 +587,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -263,10 +625,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -274,7 +660,7 @@
           </channel>
         </midiport>
       <midiport idx="1">
-        <instrument>generic midi</instrument>
+        <instrument>General Midi</instrument>
         <channel idx="0">
           <controller id="7">
             </controller>
@@ -405,7 +791,7 @@
           </channel>
         </midiport>
       <midiport idx="2">
-        <instrument>generic midi</instrument>
+        <instrument>General Midi</instrument>
         <channel idx="0">
           <controller id="7">
             </controller>
@@ -536,7 +922,7 @@
           </channel>
         </midiport>
       <midiport idx="3">
-        <instrument>generic midi</instrument>
+        <instrument>General Midi</instrument>
         <channel idx="0">
           <controller id="7">
             </controller>
@@ -682,7 +1068,7 @@
         <range>1</range>
         <strength>90</strength>
         <threshold>0</threshold>
-        <raster>3</raster>
+        <raster>2</raster>
         <swing>0</swing>
         <quant_len>1</quant_len>
         </quantize>
@@ -722,7 +1108,7 @@
       <pastedialog>
         <insert_method>0</insert_method>
         <number>1</number>
-        <raster>384</raster>
+        <raster>1536</raster>
         <clone>0</clone>
         <all_in_one_track>0</all_in_one_track>
         </pastedialog>
@@ -853,4 +1239,6 @@
     <drummap>
       </drummap>
     </song>
+  <no_toplevels>
+  </no_toplevels>
   </muse>
diff --git a/muse2/share/templates/synti.med b/muse2/share/templates/synti.med
index 461e315a..86e01660 100644
--- a/muse2/share/templates/synti.med
+++ b/muse2/share/templates/synti.med
@@ -17,8 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
-    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
+    <geometryMain x="0" y="0" w="1024" h="695"></geometryMain>
+    <geometryTransport x="0" y="0" w="0" h="0"></geometryTransport>
+    <arrangerVisible>1</arrangerVisible>
+    <markerVisible>0</markerVisible>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
     <sequencer>
@@ -57,10 +59,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -71,10 +97,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -85,10 +135,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -99,10 +173,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -113,10 +211,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -127,10 +249,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -141,10 +287,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -155,10 +325,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -169,10 +363,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -183,10 +401,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -197,10 +439,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -211,10 +477,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -225,10 +515,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -239,10 +553,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -253,10 +591,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -267,10 +629,34 @@
             </controller>
           <controller id="10">
             </controller>
+          <controller id="11">
+            </controller>
+          <controller id="71">
+            </controller>
+          <controller id="72">
+            </controller>
+          <controller id="73">
+            </controller>
+          <controller id="74">
+            </controller>
+          <controller id="75">
+            </controller>
+          <controller id="76">
+            </controller>
+          <controller id="77">
+            </controller>
+          <controller id="78">
+            </controller>
           <controller id="91">
             </controller>
           <controller id="93">
             </controller>
+          <controller id="94">
+            </controller>
+          <controller id="131072">
+            </controller>
+          <controller id="131073">
+            </controller>
           <controller id="262144">
             </controller>
           <controller id="262145">
@@ -412,7 +798,7 @@
           </channel>
         </midiport>
       <midiport idx="2">
-        <instrument>generic midi</instrument>
+        <instrument>General Midi</instrument>
         <channel idx="0">
           <controller id="7">
             </controller>
@@ -692,7 +1078,7 @@
         <range>1</range>
         <strength>90</strength>
         <threshold>0</threshold>
-        <raster>3</raster>
+        <raster>2</raster>
         <swing>0</swing>
         <quant_len>1</quant_len>
         </quantize>
@@ -732,7 +1118,7 @@
       <pastedialog>
         <insert_method>0</insert_method>
         <number>1</number>
-        <raster>384</raster>
+        <raster>1536</raster>
         <clone>0</clone>
         <all_in_one_track>0</all_in_one_track>
         </pastedialog>
@@ -862,7 +1248,7 @@
       <label>Organ</label>
       <port>0</port>
       <nativeGuiVisible>0</nativeGuiVisible>
-      <nativeGeometry x="3" y="23" w="460" h="364"></nativeGeometry>
+      <nativeGeometry x="478" y="27" w="460" h="364"></nativeGeometry>
       <curProgram bankH="0" bankL="0" prog="0"/>
       <midistate version="2">
         <event type="2" datalen="75">
@@ -897,7 +1283,7 @@
       <label>vam</label>
       <port>3</port>
       <nativeGuiVisible>0</nativeGuiVisible>
-      <nativeGeometry x="0" y="0" w="696" h="533"></nativeGeometry>
+      <nativeGeometry x="270" y="27" w="726" h="533"></nativeGeometry>
       <curProgram bankH="0" bankL="0" prog="0"/>
       <midistate version="2">
         <event type="2" datalen="131">
@@ -919,7 +1305,7 @@
       </Route>
     <Route channel="1">
       <source name="Out 1"/>
-      <dest type="1" name="system:playback_2"/>
+      <dest type="1" name="system:playback_1"/>
       </Route>
     <Route channel="0" channels="2">
       <source name="fluid-1"/>
@@ -934,21 +1320,9 @@
       <dest name="Out 1"/>
       </Route>
     <Route channelMask="65535">
-      <source mport="0"/>
-      <dest name="Track 1"/>
-      </Route>
-    <Route channelMask="65535">
-      <source mport="1"/>
-      <dest name="Track 1"/>
-      </Route>
-    <Route channelMask="65535">
       <source mport="2"/>
       <dest name="Track 1"/>
       </Route>
-    <Route channelMask="65535">
-      <source mport="3"/>
-      <dest name="Track 1"/>
-      </Route>
     <tempolist fix="500000">
       <tempo at="21474837">
         <tick>0</tick>
@@ -971,4 +1345,6 @@
     <drummap>
       </drummap>
     </song>
+  <no_toplevels>
+  </no_toplevels>
   </muse>