diff --git a/data/templates/Qsampler.lscp b/data/templates/Qsampler.lscp
new file mode 100644
index 0000000..55ae8a2
--- /dev/null
+++ b/data/templates/Qsampler.lscp
@@ -0,0 +1,4 @@
+# Qsampler - A LinuxSampler Qt GUI Interface
+#
+
+RESET
diff --git a/src/claudia_database.py b/src/claudia_database.py
index 998bd83..4aca334 100644
--- a/src/claudia_database.py
+++ b/src/claudia_database.py
@@ -20,7 +20,7 @@ TEMPLATE_NO  = "No"
 
 # (L, D, L, V, VST-Mode, T, M, MIDI-Mode) -> ( LADSPA, DSSI, LV2, VST, VST-Mode, Transport, MIDI, MIDI-Mode)
 
-# TODO - on kxstudio, set ardour2 and jacker to LEVEL_1
+# TODO - on kxstudio, set ardour2, jacker and qsampler to LEVEL_1
 
 list_DAW = [
   # Package          AppName            Type              Binary             Icon              Template?     Level      Rel.-Model    (L, D, L, V, VST-Mode,  T, M, MIDI-Mode)      (doc-file,                                                         website)
@@ -119,7 +119,7 @@ list_Instrument = [
   ( "pianoteq",             "Pianoteq",          "Synth",            "Pianoteq",               "pianoteq",         TEMPLATE_NO,  LEVEL_0, "Demo",       (1, 0, "ALSA + JACK"), ("file:///usr/local/bin/Documentation/pianoteq-english.pdf",   "http://www.pianoteq.com/pianoteq3_standard") ),
   ( "pianoteq-play",        "Pianoteq Play",     "Synth",            "Pianoteq-PLAY",          "pianoteq",         TEMPLATE_NO,  LEVEL_0, "Demo",       (1, 0, "ALSA + JACK"), ("file:///usr/local/bin/Documentation/pianoteq-english.pdf",   "http://www.pianoteq.com/pianoteq3_play") ),
 
-  ( "qsampler",             "Qsampler",          "Sampler",          "qsampler",               "qsampler",         TEMPLATE_NO,  LEVEL_1, "OpenSource", (0, 0, "ALSA + JACK"), ("",                                                           "http://qsampler.sourceforge.net/") ),
+  ( "qsampler",             "Qsampler",          "Sampler",          "qsampler",               "qsampler",         TEMPLATE_NO,  LEVEL_0, "OpenSource", (0, 0, "ALSA + JACK"), ("",                                                           "http://qsampler.sourceforge.net/") ),
 
   ( "qsynth",               "Qsynth",            "SoundFont Player", "qsynth -a jack -m jack", "qsynth",           TEMPLATE_NO,  LEVEL_0, "OpenSource", (1, 0, "ALSA | JACK"), ("",                                                           "http://qsynth.sourceforge.net/") ),
 
diff --git a/src/claudia_launcher.py b/src/claudia_launcher.py
index 6289132..fece18a 100755
--- a/src/claudia_launcher.py
+++ b/src/claudia_launcher.py
@@ -254,6 +254,12 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
         elif app == "Jack Rack":
             self.createAppTemplate("jack-rack", app, binary)
 
+        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)
 
@@ -263,12 +269,6 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
         #elif (app == "Non-Mixer"):
             #self.createAppTemplate("non-mixer", app, binary)
 
-        #elif (app == "Qsampler"):
-            #self.createAppTemplate("qsampler", app, binary)
-
-        #elif (app == "Yoshimi"):
-            #self.createAppTemplate("yoshimi", app, binary)
-
         else:
             appBus = self.callback_getAppBus()
             appBus.RunCustom2(False, binary, app, "0")
@@ -514,6 +514,27 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
             tmplte_cmd  = binary
             tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r)
 
+        elif app == "qsampler":
+            tmplte_file = os.path.join(proj_folder, "Qsampler_%i.lscp" % rand_check)
+
+            # Create template
+            os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Qsampler.lscp"), tmplte_file))
+
+            tmplte_cmd  = binary
+            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 == "jack-mixer"):
             #tmplte_file_r = os.path.join(proj_folder, "Jack-Mixer_%i.xml" % (rand_check))
 
@@ -543,28 +564,6 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
             #tmplte_cmd = binary
             #tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder)
 
-            #elif (app == "qsampler"):
-            #tmplte_file_r = os.path.join(proj_folder, "Qsampler_%i.lscp" % (rand_check))
-
-            ## Create template
-            #os.system("cp '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "Qsampler.lscp"), tmplte_file_r))
-
-            #tmplte_cmd = binary
-            #tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r)
-
-            #tmplte_lvl = "1" if (app_name == "Qsampler (SVN)") else "0"
-
-            #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"
-
             #else:
             #print("ERROR: Failed to parse app name")
             #return