diff --git a/.gitmodules b/.gitmodules
index c6736bf..45988ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "i3/helpers/recently_used"]
 	path = i3/helpers/recently_used
 	url = https://github.com/xenomachina/recently_used
+[submodule "zsh/customizations/plugins/zlong_alert.zsh"]
+	path = zsh/customizations/plugins/zlong_alert
+	url = https://github.com/kevinywlui/zlong_alert.zsh.git
diff --git a/deps.sh b/deps.sh
index 10c4410..988ba50 100644
--- a/deps.sh
+++ b/deps.sh
@@ -9,7 +9,8 @@ DEPS=(
   neomutt # Command-line-based mail client
   nvim # Upgraded version of vim used for editing
   tmux # Terminal multiplexer, used for persistence of shell sessions
-  vdirsyncer # CalDAV and CardDAV syncer, used to mirror contacts and calendars to the local machine for Khal and Khard
+  todoman # Text based todo manager
+  vdirsyncer # CalDAV and CardDAV syncer, used to mirror contacts and calendars to the local machine for Khal and Khard/Todoman
   zsh # Alternative shell
 )
 
diff --git a/i3/config b/i3/config
index 9c611e5..c41c244 100644
--- a/i3/config
+++ b/i3/config
@@ -232,8 +232,10 @@ bindsym $mod+Control+1 workspace $ws1 ; exec exec firefox -P "Mari" --class "Fir
 
 # Place Spotify windows on workspace 2.
 for_window [class="^Spotify$"] move to workspace number $ws2
-for_window [class="^Sublime-music$"] move to workspace number $ws2
-bindsym $mod+Control+2 workspace $ws2 ; exec exec ~/.local/bin/sublime-music
+assign [class="^Sublime-music$"] workspace number $ws2
+assign [class="^Clementine$"] workspace number $ws2
+bindsym $mod+Control+2 workspace $ws2 ; exec exec clementine
+bindsym $mod+Control+Shift+2 workspace $ws2 ; exec exec spotify
 
 # Place Discord windows on workspace 3.
 assign [class="^discord$"] workspace number $ws3
diff --git a/khard/khard.conf b/khard/khard.conf
new file mode 100644
index 0000000..9267719
--- /dev/null
+++ b/khard/khard.conf
@@ -0,0 +1,47 @@
+[addressbooks]
+[[addressbook]]
+path = ~/.local/share/contacts/gubal/addressbook
+
+[general]
+debug = no
+default_action = list
+# These are either strings or comma seperated lists
+editor = nvim
+merge_editor = vimdiff
+
+[contact table]
+# display names by first or last name: first_name / last_name / formatted_name
+display = first_name
+# group by address book: yes / no
+group_by_addressbook = no
+# reverse table ordering: yes / no
+reverse = no
+# append nicknames to name column: yes / no
+show_nicknames = no
+# show uid table column: yes / no
+show_uids = yes
+# sort by first or last name: first_name / last_name / formatted_name
+sort = last_name
+# localize dates: yes / no
+localize_dates = yes
+# set a comma separated list of preferred phone number types in descending priority
+# or nothing for non-filtered alphabetical order
+preferred_phone_number_type = pref, cell, home
+# set a comma separated list of preferred email address types in descending priority
+# or nothing for non-filtered alphabetical order
+preferred_email_address_type = pref, work, home
+
+[vcard]
+# extend contacts with your own private objects
+# these objects are stored with a leading "X-" before the object name in the vcard files
+# every object label may only contain letters, digits and the - character
+# example:
+#   private_objects = Jabber, Skype, Twitter
+# default: ,  (the empty list)
+private_objects = Jabber, Skype, Twitter
+# preferred vcard version: 3.0 / 4.0
+preferred_version = 4.0
+# Look into source vcf files to speed up search queries: yes / no
+search_in_source_files = yes
+# skip unparsable vcard files: yes / no
+skip_unparsable = no
diff --git a/per-host/costadelsol/.config/khard b/per-host/costadelsol/.config/khard
new file mode 120000
index 0000000..60d0891
--- /dev/null
+++ b/per-host/costadelsol/.config/khard
@@ -0,0 +1 @@
+../../../khard
\ No newline at end of file
diff --git a/per-host/crystarium/.config/khard b/per-host/crystarium/.config/khard
new file mode 120000
index 0000000..60d0891
--- /dev/null
+++ b/per-host/crystarium/.config/khard
@@ -0,0 +1 @@
+../../../khard
\ No newline at end of file
diff --git a/per-host/goldsaucer/.config/khard b/per-host/goldsaucer/.config/khard
new file mode 120000
index 0000000..60d0891
--- /dev/null
+++ b/per-host/goldsaucer/.config/khard
@@ -0,0 +1 @@
+../../../khard
\ No newline at end of file
diff --git a/per-host/gubal/.config/khard b/per-host/gubal/.config/khard
new file mode 120000
index 0000000..60d0891
--- /dev/null
+++ b/per-host/gubal/.config/khard
@@ -0,0 +1 @@
+../../../khard
\ No newline at end of file
diff --git a/per-host/mordhona/.config/khard b/per-host/mordhona/.config/khard
new file mode 120000
index 0000000..60d0891
--- /dev/null
+++ b/per-host/mordhona/.config/khard
@@ -0,0 +1 @@
+../../../khard
\ No newline at end of file
diff --git a/per-host/template/.config/khard b/per-host/template/.config/khard
new file mode 120000
index 0000000..60d0891
--- /dev/null
+++ b/per-host/template/.config/khard
@@ -0,0 +1 @@
+../../../khard
\ No newline at end of file
diff --git a/st-0.8.4/config.h b/st-0.8.4/config.h
index a8ba28c..8f77564 100644
--- a/st-0.8.4/config.h
+++ b/st-0.8.4/config.h
@@ -6,7 +6,9 @@
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
 static char *fonts[] = {
-  "Ubuntu Mono:pixelsize=14:antialias=true:autohint=true"
+  "Liberation Mono:pixelsize=14:antialias=true:autohint=true",
+  "Ubuntu Mono:pixelsize=14:antialias=true:autohint=true",
+  "Symbola:pixelsize=14:antialias=true:autohint=true",
 };
 static int fonts_current = 0;
 
diff --git a/st-0.8.4/st b/st-0.8.4/st
index 6911ad9..be549eb 100755
Binary files a/st-0.8.4/st and b/st-0.8.4/st differ
diff --git a/st-0.8.4/x.o b/st-0.8.4/x.o
index bb028ef..8c3d30c 100644
Binary files a/st-0.8.4/x.o and b/st-0.8.4/x.o differ
diff --git a/vdirsyncer/config b/vdirsyncer/config
index 99faa92..54ed630 100644
--- a/vdirsyncer/config
+++ b/vdirsyncer/config
@@ -1,11 +1,6 @@
 [general]
 status_path = "~/.local/share/vdirsyncer/status/"
 
-[pair gubal_contacts_local_to_radicale]
-a = "gubal_contacts_local"
-b = "gubal_contacts_radicale"
-collections = ["from a", "from b"]
-
 [pair gubal_contacts_local_to_xandikos]
 a = "gubal_contacts_local"
 b = "gubal_contacts_xandikos"
@@ -13,26 +8,15 @@ collections = ["from a", "from b"]
 
 [storage gubal_contacts_local]
 type = "filesystem"
-path = "~/.local/share/vdirsyncer/gubal_contacts/"
+path = "~/.local/share/contacts/gubal"
 fileext = ".vcf"
 
-[storage gubal_contacts_radicale]
-type = "carddav"
-url = "https://calendar.reya.zone/radicale/reya/"
-username = "reya"
-password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/radicale/reya", "protocol", "WebDAV"]
-
 [storage gubal_contacts_xandikos]
 type = "carddav"
 url = "https://calendar.reya.zone/xandikos/reya/"
 username = "reya"
 password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/xandikos/reya", "protocol", "WebDAV"]
 
-[pair gubal_calendars_local_to_radicale]
-a = "gubal_calendars_local"
-b = "gubal_calendars_radicale"
-collections = ["from a", "from b"]
-
 [pair gubal_calendars_local_to_xandikos]
 a = "gubal_calendars_local"
 b = "gubal_calendars_xandikos"
@@ -40,15 +24,9 @@ collections = ["from a", "from b"]
 
 [storage gubal_calendars_local]
 type = "filesystem"
-path = "~/.local/share/vdirsyncer/gubal_calendars/"
+path = "~/.local/share/calendars/gubal"
 fileext = ".ics"
 
-[storage gubal_calendars_radicale]
-type = "caldav"
-url = "https://calendar.reya.zone/radicale/reya/"
-username = "reya"
-password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/radicale/reya", "protocol", "WebDAV"]
-
 [storage gubal_calendars_xandikos]
 type = "caldav"
 url = "https://calendar.reya.zone/xandikos/reya/"
diff --git a/zsh/customizations/plugins/zlong_alert b/zsh/customizations/plugins/zlong_alert
new file mode 160000
index 0000000..e5a7896
--- /dev/null
+++ b/zsh/customizations/plugins/zlong_alert
@@ -0,0 +1 @@
+Subproject commit e5a789635fd074c39c3faad7959644f690b6ae88
diff --git a/zsh/customizations/zsh_aliases.zsh b/zsh/customizations/zsh_aliases.zsh
index 8842ebe..4efe7dc 100644
--- a/zsh/customizations/zsh_aliases.zsh
+++ b/zsh/customizations/zsh_aliases.zsh
@@ -36,6 +36,16 @@ function reload_zsh()
   source "$HOME"/.zshrc
 }
 
+function dock()
+{
+  xrandr --output DP-1 --auto --left-of eDP-1
+}
+
+function dock_off()
+{
+  xrandr --output DP-1 --off
+}
+
 # Check if the git repository is fully synced.
 # Pass --force-fetch to force the fetch to happen, even if one happened recently.
 function __common_configs_in_sync() {
diff --git a/zsh/ohmyzsh b/zsh/ohmyzsh
index 3f0672f..93ad3a8 160000
--- a/zsh/ohmyzsh
+++ b/zsh/ohmyzsh
@@ -1 +1 @@
-Subproject commit 3f0672ff946a508329e382261e6eb8f837106e38
+Subproject commit 93ad3a88214b95f571e03c21f7d9bd76f9110938
diff --git a/zsh/zshrc.zsh b/zsh/zshrc.zsh
index a4739d3..ce2b605 100644
--- a/zsh/zshrc.zsh
+++ b/zsh/zshrc.zsh
@@ -72,7 +72,7 @@ ZSH_CUSTOM=${__COMMON_CONFIGS}/zsh/customizations
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
+plugins=(git zlong_alert)
 
 source $ZSH/oh-my-zsh.sh
 # User configuration