diff --git a/data/templates/Jack-Mixer.xml b/data/templates/Jack-Mixer.xml
new file mode 100644
index 0000000..03d490e
--- /dev/null
+++ b/data/templates/Jack-Mixer.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<jack_mixer geometry="122x300">
+	<main_mix_channel balance="0.000000" balance_midi_cc="8" volume="0.000000" volume_midi_cc="7"/>
+</jack_mixer>
diff --git a/src/claudia_launcher.py b/src/claudia_launcher.py
index cc4006a..d7bd545 100755
--- a/src/claudia_launcher.py
+++ b/src/claudia_launcher.py
@@ -257,17 +257,8 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
         elif app == "Qsampler":
             self.createAppTemplate("qsampler", app, binary)
 
-        #elif app == "Yoshimi":
-            #self.createAppTemplate("yoshimi", app, binary)
-
-        #elif (app == "Jack Mixer"):
-            #self.createAppTemplate("jack-mixer", app, binary)
-
-        #elif (app == "Jamin"):
-            #self.createAppTemplate("jamin", app, binary)
-
-        #elif (app == "Non-Mixer"):
-            #self.createAppTemplate("non-mixer", app, binary)
+        elif (app == "Jack Mixer"):
+            self.createAppTemplate("jack-mixer", app, binary)
 
         else:
             appBus = self.callback_getAppBus()
@@ -524,49 +515,20 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
             tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file)
             #tmplte_lvl  = "1" # TODO - broken??
 
-            #elif (app == "yoshimi"):
-            #tmplte_file = os.path.join(proj_folder, "Yoshimi_%i.state" % (rand_check))
-
-            ## Create template
-            #os.system("cp '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "Yoshimi.state"), tmplte_file))
-
-            #tmplte_cmd = binary
-            #tmplte_cmd += " --state='%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file)
-
-            #tmplte_lvl = "1"
-
-            #elif (app == "jamin"):
-            #tmplte_file_r = os.path.join(proj_folder, "Jamin_%i.jam" % (rand_check))
-
-            ## Create template
-            #os.system("cp '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "Jamin.jam"), tmplte_file_r))
-
-            #tmplte_cmd = binary
-            #tmplte_cmd += " -f '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r)
+        elif app == "jack-mixer":
+            tmplte_file = os.path.join(proj_folder, "Jack-Mixer_%i.xml" % rand_check)
 
-            #elif (app == "jack-mixer"):
-            #tmplte_file_r = os.path.join(proj_folder, "Jack-Mixer_%i.xml" % (rand_check))
-
-            ## Create template
-            #os.system("cp '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "Jack-Mixer.xml"), tmplte_file_r))
-
-            #tmplte_cmd = binary
-            #tmplte_cmd += " -c '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r)
-
-            #tmplte_lvl = "1"
-
-            #elif (app == "non-mixer"):
-            #tmplte_folder = os.path.join(proj_folder, "Non-Mixer_%i" % (rand_check))
+            # Create template
+            os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Jack-Mixer.xml"), tmplte_file))
 
-            ## Create template
-            #os.system("cp -r '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "Non-Mixer"), tmplte_folder))
+            tmplte_cmd  = binary
+            tmplte_cmd += " -c '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file)
 
-            #tmplte_cmd = binary
-            #tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder)
+            if self.callback_isLadishRoom():
+                tmplte_lvl = "lash"
 
-            #else:
-            #print("ERROR: Failed to parse app name")
-            #return
+        else:
+            print("ClaudiaLauncher::createAppTemplate(%s) - Failed to parse app name" % app)
 
         if tmplte_file != None:
             os.system('sed -i "s/X_SR_X-CLAUDIA-X_SR_X/%s/" "%s"' % (proj_srate, tmplte_file))