diff --git a/Makefile b/Makefile
index d3a624e..31dcebd 100644
--- a/Makefile
+++ b/Makefile
@@ -369,6 +369,7 @@ install:
 
 	# Install addtional stuff for Cadence
 	install -m 644 data/pulse2jack/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
+	install -m 644 data/70cadence-plugin-paths  $(X11_RC_DIR)
 	install -m 644 data/99cadence-session-start $(X11_RC_DIR)
 
 	# Install addtional stuff for Claudia
@@ -392,6 +393,7 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/carla-control \
 		$(DESTDIR)$(PREFIX)/bin/carla-standalone \
 		$(DESTDIR)$(PREFIX)/bin/caitlyn \
+		$(X11_RC_DIR)/70cadence-plugin-paths \
 		$(X11_RC_DIR)/99cadence-session-start
 #		$(DESTDIR)$(PREFIX)/bin/cadence-cpufreq
 
@@ -427,6 +429,7 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/carla.svg
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/carla-control.svg
+	rm -f $(X11_RC_DIR)/70cadence-plugin-paths
 	rm -f $(X11_RC_DIR)/99cadence-session-start
 	rm -rf $(DESTDIR)$(PREFIX)/lib/cadence/
 	rm -rf $(DESTDIR)$(PREFIX)/share/cadence/
diff --git a/data/70cadence-plugin-paths b/data/70cadence-plugin-paths
new file mode 100644
index 0000000..69af1af
--- /dev/null
+++ b/data/70cadence-plugin-paths
@@ -0,0 +1,20 @@
+# Cadence Session Startup
+# Part 1 - Export Plugins PATHs
+
+INSTALL_PREFIX="X-PREFIX-X"
+
+LADSPA_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printLADSPA_PATH`
+DSSI_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printDSSI_PATH`
+LV2_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printLV2_PATH`
+VST_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printVST_PATH`
+
+export LADSPA_PATH="$LADSPA_PATH_str"
+export DSSI_PATH="$DSSI_PATH_str"
+export LV2_PATH="$LV2_PATH_str"
+export VST_PATH="$VST_PATH_str"
+
+unset LADSPA_PATH_str
+unset DSSI_PATH_str
+unset LV2_PATH_str
+unset VST_PATH_str
+unset INSTALL_PREFIX
diff --git a/data/99cadence-session-start b/data/99cadence-session-start
index 600cc53..558d2fa 100644
--- a/data/99cadence-session-start
+++ b/data/99cadence-session-start
@@ -1,24 +1,9 @@
 # Cadence Session Startup
+# Part 2 - Start JACK (or not), according to user settings
 
 INSTALL_PREFIX="X-PREFIX-X"
 
-# Export Plugins PATHs
-LADSPA_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printLADSPA_PATH`
-DSSI_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printDSSI_PATH`
-LV2_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printLV2_PATH`
-VST_PATH_str=`$INSTALL_PREFIX/bin/cadence-session-start --printVST_PATH`
-
-export LADSPA_PATH="$LADSPA_PATH_str"
-export DSSI_PATH="$DSSI_PATH_str"
-export LV2_PATH="$LV2_PATH_str"
-export VST_PATH="$VST_PATH_str"
-
-# Start JACK (or not), according to user settings
 CADENCE_SESSION="$INSTALL_PREFIX/bin/cadence-session-start --system-start"
 exec $CADENCE_SESSION &
 
-unset LADSPA_PATH_str
-unset DSSI_PATH_str
-unset LV2_PATH_str
-unset VST_PATH_str
 unset INSTALL_PREFIX
diff --git a/doc/TODO b/doc/TODO
index 848c472..ed15cf0 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -10,7 +10,7 @@ GUI:
   - Check shortcut consistency
 
 All:
-  - Only use QSettings in function scope, not always opened (makes config invalid if a crash happens)
+  - Only use QSettings in function scope, not always opened (makes config still valid if a crash happens)
 
 -------------------
 - APPS -
@@ -18,7 +18,6 @@ All:
 Cadence:
  - add freq info to systray tooltip
  - add freq Hz change
- - set plugin path before DBus starts
  - add desktop decriptions
 
 Claudia:
@@ -26,8 +25,7 @@ Claudia:
  - rename canvas client should rename app name
 
 Claudia-Launcher:
- - Cleanup DB
- - Add vmpk-jack
+ - Finish plugins
  - Very small horizontal UI, need first fix
  - Auto-close option