diff --git a/.config/dtfscripts/services/common.bash b/.config/dtfscripts/common_service.sh
similarity index 100%
rename from .config/dtfscripts/services/common.bash
rename to .config/dtfscripts/common_service.sh
diff --git a/.config/dtfscripts/services/compton.dtf b/.config/dtfscripts/services/compton.dtf
index c9104da3..8c1c3232 100755
--- a/.config/dtfscripts/services/compton.dtf
+++ b/.config/dtfscripts/services/compton.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Compton"
 service_process="compton"
 
diff --git a/.config/dtfscripts/services/conky.dtf b/.config/dtfscripts/services/conky.dtf
index f4af4cb9..d23cc558 100755
--- a/.config/dtfscripts/services/conky.dtf
+++ b/.config/dtfscripts/services/conky.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Conky"
 service_process="conky"
 
diff --git a/.config/dtfscripts/services/dropbox.dtf b/.config/dtfscripts/services/dropbox.dtf
index ce1a8b80..587f0a75 100755
--- a/.config/dtfscripts/services/dropbox.dtf
+++ b/.config/dtfscripts/services/dropbox.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Dropbox"
 service_process="dropbox"
 service_kill_on_reload="false"
diff --git a/.config/dtfscripts/services/dunst.dtf b/.config/dtfscripts/services/dunst.dtf
index 4a9dd9f0..f02be0ac 100755
--- a/.config/dtfscripts/services/dunst.dtf
+++ b/.config/dtfscripts/services/dunst.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Dunst"
 service_process="dunst"
 
diff --git a/.config/dtfscripts/services/kill_krunner.dtf b/.config/dtfscripts/services/kill_krunner.dtf
index 30ab4e36..4aa77466 100755
--- a/.config/dtfscripts/services/kill_krunner.dtf
+++ b/.config/dtfscripts/services/kill_krunner.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Krunner"
 service_process="krunner"
 
diff --git a/.config/dtfscripts/services/plasmashell.dtf b/.config/dtfscripts/services/plasmashell.dtf
index 7a98e8ed..d3f703f0 100755
--- a/.config/dtfscripts/services/plasmashell.dtf
+++ b/.config/dtfscripts/services/plasmashell.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Plasma"
 service_process="plasmashell"
 
diff --git a/.config/dtfscripts/services/polybar.dtf b/.config/dtfscripts/services/polybar.dtf
index 5e8f55d3..a3686954 100755
--- a/.config/dtfscripts/services/polybar.dtf
+++ b/.config/dtfscripts/services/polybar.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Polybar"
 service_process="polybar"
 
diff --git a/.config/dtfscripts/services/redshift.dtf b/.config/dtfscripts/services/redshift.dtf
index 63899c45..018e7d89 100755
--- a/.config/dtfscripts/services/redshift.dtf
+++ b/.config/dtfscripts/services/redshift.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Redshift"
 service_process="redshift"
 service_kill_on_reload="false"
diff --git a/.config/dtfscripts/services/sxhkd.dtf b/.config/dtfscripts/services/sxhkd.dtf
index 0fc486db..39b81472 100755
--- a/.config/dtfscripts/services/sxhkd.dtf
+++ b/.config/dtfscripts/services/sxhkd.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="sxhkd"
 service_process="sxhkd"
 
diff --git a/.config/dtfscripts/services/syncthing.dtf b/.config/dtfscripts/services/syncthing.dtf
index 59914f34..da6902a4 100755
--- a/.config/dtfscripts/services/syncthing.dtf
+++ b/.config/dtfscripts/services/syncthing.dtf
@@ -6,7 +6,6 @@
 # Distributed under terms of the MIT license.
 #
 
-source $DTF_SERVICES_DIR/common.bash
 service_name="Syncthing"
 service_process="syncthing"
 service_kill_on_reload="false"
diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index a525528e..d009ec6f 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -62,10 +62,11 @@ if [[ "$XDG_RUNTIME_DIR" == "" ]]; then
 fi
 
 ## Set some more variables
-export DTF_SERVICES_DIR="$XDG_CONFIG_HOME/dtfscripts/services"
+export DTF_CONFIG_HOME="$XDG_CONFIG_HOME/dtfscripts"
+export DTF_SERVICES_DIR="$DTF_CONFIG_HOME/services"
 
 ## Load device-specific scripts
-if [[ -x "$XDG_CONFIG_HOME/dtfscripts/devices/$(hostname).rc" ]]; then
+if [[ -x "$DTF_CONFIG_HOME/devices/$(hostname).rc" ]]; then
 	dtf_log "Sourcing devices/$(hostname).rc"
 	source $HOME/.config/dtfscripts/devices/$(hostname).rc
 fi
@@ -94,7 +95,8 @@ for service in $DTF_SERVICES; do
 		dtf_log "Service is unexecutable: $service"
 		exit 1
 	fi
-	source $service_full
+	source "$DTF_CONFIG_HOME/common_service.sh"
+	source "$service_full"
 	if isup && [[ "$service_kill_on_reload" == "true" ]] ; then
 		stop
 	fi