diff --git a/.XCompose b/.XCompose
index 29655f2..7dd779b 100644
Binary files a/.XCompose and b/.XCompose differ
diff --git a/.xinitrc b/.xinitrc
index 6df4db0..743e231 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -27,10 +27,10 @@ export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK
 (
 	xautolock \
 		-noclose \
-		-locker '~/bin/screensaver start' \
-		-notify 5 -notifier '~/bin/screensaver notify 5' \
+		-locker slock \
+		-notify 5 -notifier 'notify-send Screensaver Activating...' \
 		-corners 0+-0 -cornerdelay 1 -cornerredelay 900000 &
-	dunst &
+	twmnd &
 	gtk-redshift &
 	skype &
 	psi-plus &
@@ -38,6 +38,7 @@ export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK
 	pa-applet &
 	clipit &
 	clementine &
+	linconnect-server &
 )
 
 i3status=~/.config/i3status/config
diff --git a/bin/screensaver b/bin/screensaver
deleted file mode 100755
index 5a20cdc..0000000
--- a/bin/screensaver
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$1" = "notify" ]; then
-	# notify-send help says timeout is in milliseconds
-	# but it appears that it is really in seconds (is it a dunst bug?)
-	[ $2 -gt 1 ] && notify-send -t $[$2-1] "Activating screensaver in $2 seconds..."
-else
-	killall -USR1 dunst
-	slock &
-	slock_pid=$!
-	# for xautolock -unlocknow
-	trap "killall -USR2 dunst; kill $slock_pid" EXIT
-	wait $slock_pid
-fi