diff --git a/bspwm/.config/bspwm/wal.sh b/bspwm/.config/bspwm/wal.sh
new file mode 100755
index 00000000..7736218b
--- /dev/null
+++ b/bspwm/.config/bspwm/wal.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Source the colors from wal
+source ~/.cache/wal/colors.sh
+
+# Set the border colors
+bspc config normal_border_color   "$color8"
+bspc config active_border_color   "$color2"
+bspc config focused_border_color  "$color7"
+bspc config presel_feedback_color "$color7"
diff --git a/dunst/.config/dunst/wal.sh b/dunst/.config/dunst/wal.sh
new file mode 100755
index 00000000..249d3882
--- /dev/null
+++ b/dunst/.config/dunst/wal.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Symlink dunst config
+ln -sf ~/.cache/wal/dunstrc ~/.config/dunst/dunstrc
+
+# Restart dunst with the new color scheme
+pkill dunst
+dunst &
diff --git a/wal/.config/wal/done.sh b/wal/.config/wal/done.sh
index 20a9668d..40847e93 100755
--- a/wal/.config/wal/done.sh
+++ b/wal/.config/wal/done.sh
@@ -1,22 +1,9 @@
 #!/bin/sh
 
-# ===================
-# ====== bspwm ======
-# ===================
+if [ -e ~/.config/bspwm/wal.sh ]; then
+  ~/.config/bspwm/wal.sh
+fi
 
-# Source the colors from wal
-source "${HOME}/.cache/wal/colors.sh"
-
-# Set the border colors
-bspc config normal_border_color   "$color8"
-bspc config active_border_color   "$color2"
-bspc config focused_border_color  "$color7"
-bspc config presel_feedback_color "$color7"
-
-# Symlink dunst config
-mkdir -p  "${HOME}/.config/dunst"
-ln -sf    "${HOME}/.cache/wal/dunstrc"    "${HOME}/.config/dunst/dunstrc"
-
-# Restart dunst with the new color scheme
-pkill dunst
-dunst &
+if [ -e ~/.config/dunst/wal.sh ]; then
+  ~/.config/dunst/wal.sh
+fi