--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 # Created by houston4444
 #
 PREFIX ?= /usr/local
-DESTDIR =
-DEST_RAY := $(DESTDIR)$(PREFIX)/share/raysession
+DESTDIR ?=
+DEST_RAY := $(PREFIX)/share/raysession
 
 LINK = ln -s -f
 LRELEASE ?= lrelease
@@ -138,18 +138,18 @@
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/raysession.svg
 	rm -rf $(DESTDIR)/etc/xdg/raysession/client_templates/40_ray_nsm
 	rm -rf $(DESTDIR)/etc/xdg/raysession/client_templates/60_ray_lash
-	rm -rf $(DEST_RAY)
+	rm -rf $(DESTDIR)$(DEST_RAY)
 
 pure_install:
 	# Create directories
-	install -d $(DESTDIR)$(PREFIX)/bin/
-	install -d $(DESTDIR)$(PREFIX)/share/applications/
-	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
-	install -d $(DEST_RAY)/
-	install -d $(DEST_RAY)/locale/
-	install -d $(DEST_RAY)/$(_DIR)/
-	install -d $(DEST_RAY)/$(PATCHBAY_DIR)/locale/
-	install -d $(DESTDIR)/etc/xdg/raysession/client_templates/
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install -d $(DESTDIR)$(PREFIX)/share/applications
+	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+	install -d $(DESTDIR)$(DEST_RAY)
+	install -d $(DESTDIR)$(DEST_RAY)/locale
+	install -d $(DESTDIR)$(DEST_RAY)/$(_DIR)
+	install -d $(DESTDIR)$(DEST_RAY)/$(PATCHBAY_DIR)/locale
+	install -d $(DESTDIR)/etc/xdg/raysession/client_templates
 	install -d $(DESTDIR)/etc/bash_completion.d
 	
 	# Install icons
@@ -162,10 +162,10 @@
 	# Copy Templates Factory
 	cp -r client_templates/40_ray_nsm  $(DESTDIR)/etc/xdg/raysession/client_templates/
 	cp -r client_templates/60_ray_lash $(DESTDIR)/etc/xdg/raysession/client_templates/
-	cp -r client_templates  $(DEST_RAY)/
-	cp -r session_templates $(DEST_RAY)/
-	cp -r session_scripts   $(DEST_RAY)/
-	cp -r data              $(DEST_RAY)/
+	cp -r client_templates  $(DESTDIR)$(DEST_RAY)/
+	cp -r session_templates $(DESTDIR)$(DEST_RAY)/
+	cp -r session_scripts   $(DESTDIR)$(DEST_RAY)/
+	cp -r data              $(DESTDIR)$(DEST_RAY)/
 
 	# Copy completion script
 	cp -r src/completion/ray_completion.sh $(DESTDIR)/etc/bash_completion.d/
@@ -173,9 +173,9 @@
 		$(DESTDIR)/etc/bash_completion.d/ray_completion.sh
 
 	# Copy patchbay themes, manual and lib
-	cp -r HoustonPatchbay/themes $(DEST_RAY)/$(PATCHBAY_DIR)/
-	cp -r HoustonPatchbay/manual $(DEST_RAY)/$(PATCHBAY_DIR)/
-	cp -r HoustonPatchbay/source $(DEST_RAY)/$(PATCHBAY_DIR)/
+	cp -r HoustonPatchbay/themes $(DESTDIR)$(DEST_RAY)/$(PATCHBAY_DIR)/
+	cp -r HoustonPatchbay/manual $(DESTDIR)$(DEST_RAY)/$(PATCHBAY_DIR)/
+	cp -r HoustonPatchbay/source $(DESTDIR)$(DEST_RAY)/$(PATCHBAY_DIR)/
 
 	# Copy Desktop Files
 	install -m 644 data/share/applications/*.desktop \
@@ -186,22 +186,22 @@
 		$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
 
 	# Install main code
-	cp -r src $(DEST_RAY)/
-
-	$(LINK) $(DEST_RAY)/src/bin/ray-jack_checker_daemon $(DESTDIR)$(PREFIX)/bin/
-	$(LINK) $(DEST_RAY)/src/bin/ray-jack_config_script  $(DESTDIR)$(PREFIX)/bin/
-	$(LINK) $(DEST_RAY)/src/bin/ray-pulse2jack          $(DESTDIR)$(PREFIX)/bin/
-	$(LINK) $(DEST_RAY)/src/bin/ray_git                 $(DESTDIR)$(PREFIX)/bin/
+	cp -r src $(DESTDIR)$(DEST_RAY)/
+
+	$(LINK) $(DESTDIR)$(DEST_RAY)/src/bin/ray-jack_checker_daemon $(DESTDIR)$(PREFIX)/bin/
+	$(LINK) $(DESTDIR)$(DEST_RAY)/src/bin/ray-jack_config_script  $(DESTDIR)$(PREFIX)/bin/
+	$(LINK) $(DESTDIR)$(DEST_RAY)/src/bin/ray-pulse2jack          $(DESTDIR)$(PREFIX)/bin/
+	$(LINK) $(DESTDIR)$(DEST_RAY)/src/bin/ray_git                 $(DESTDIR)$(PREFIX)/bin/
 	
 	# compile python files
-	$(PYTHON) -m compileall $(DEST_RAY)/HoustonPatchbay/source/
-	$(PYTHON) -m compileall $(DEST_RAY)/src/
+	$(PYTHON) -m compileall $(DESTDIR)$(DEST_RAY)/HoustonPatchbay/source/
+	$(PYTHON) -m compileall $(DESTDIR)$(DEST_RAY)/src/
 	
 	# install local manual
-	cp -r manual $(DEST_RAY)/
+	cp -r manual $(DESTDIR)$(DEST_RAY)/
 	
 	# install utility-scripts
-	cp -r utility-scripts $(DEST_RAY)/
+	cp -r utility-scripts $(DESTDIR)$(DEST_RAY)/
 	
 	# install main bash scripts to bin
 	install -m 755 data/bin/raysession  $(DESTDIR)$(PREFIX)/bin/
@@ -209,6 +209,6 @@
 	install -m 755 data/bin/ray_control $(DESTDIR)$(PREFIX)/bin/
 	
 	# Install Translations
-	install -m 644 locale/*.qm $(DEST_RAY)/locale/
-	install -m 644 $(PATCHBAY_DIR)/locale/*.qm $(DEST_RAY)/$(PATCHBAY_DIR)/locale
-
+	install -m 644 locale/*.qm $(DESTDIR)$(DEST_RAY)/locale/
+	install -m 644 $(PATCHBAY_DIR)/locale/*.qm $(DESTDIR)$(DEST_RAY)/$(PATCHBAY_DIR)/locale/
+