diff --git a/symlinks/config/aerc/aerc.conf b/symlinks/config/aerc/aerc.conf
index c12f8ac..c405851 100644
--- a/symlinks/config/aerc/aerc.conf
+++ b/symlinks/config/aerc/aerc.conf
@@ -18,12 +18,11 @@ pgp-provider=gpg
 unsafe-accounts-conf=false
 
 [ui]
-#
-# Describes the format for each row in a mailbox view. This field is compatible
-# with mutt's printf-like syntax.
-#
-# Default: %D %-17.17n %Z %s
-index-format=%-20.20D %-17.17n %Z %s
+index-columns=date<20,name<17,flags>4,subject<*
+column-date={{.DateAutoFormat .Date.Local}}
+column-name={{index (.From | names) 0}}
+column-flags={{.Flags | join ""}}
+column-subject={{.Subject}}
 
 #
 # See time.Time#Format at https://godoc.org/time#Time.Format
@@ -85,10 +84,8 @@ new-message-bell=false
 # Default: `
 pinned-tab-marker='`'
 
-# Describes the format string to use for the directory list
-#
-# Default: %n %>r
-dirlist-format=%n %>r
+dirlist-left={{.Folder}}
+dirlist-right={{if .Unread}}{{humanReadable .Unread}}/{{end}}{{if .Exists}}{{humanReadable .Exists}}{{end}}
 
 # Delay after which the messages are actually listed when entering a directory.
 # This avoids loading messages when skipping over folders and makes the UI more
@@ -156,10 +153,10 @@ styleset-name=default
 #threading-enabled=false
 
 [statusline]
-# Describes the format string for the statusline.
-#
-# Default: [%a] %S %>%T
-render-format=[%a] %S %>%T
+status-columns=left<*,center>=,right>*
+column-left=[{{.Account}}] {{.StatusInfo}}
+column-center={{.PendingKeys}}
+column-right={{.TrayInfo}}
 
 # Specifies the separator between grouped statusline elements.
 #
@@ -271,7 +268,7 @@ text/plain=sed 's/^>\+.*/\x1b[36m&\x1b[0m/'
 text/html=pandoc -f html -t plain
 image/*=catimg -w $(tput cols) -
 
-[triggers]
+[hooks]
 #
 # Triggers specify commands to execute when certain events occur.
 #
@@ -280,7 +277,8 @@ image/*=catimg -w $(tput cols) -
 
 #
 # Executed when a new email arrives in the selected folder
-new-email=exec notify-send "New email from %n" "%s"
+mail-received=notify-send "New email from %AERC_FROM_NAME" "$AERC_SUBJECT"
+aerc-startup=aerc :terminal khal interactive && aerc :next-tab
 
 [templates]
 # Templates are used to populate email bodies automatically.
diff --git a/symlinks/config/khal/config b/symlinks/config/khal/config
index 8fa0c14..868c70d 100644
--- a/symlinks/config/khal/config
+++ b/symlinks/config/khal/config
@@ -12,12 +12,13 @@ type = discover
 path = ~/.local/share/khal/calendars/contact_birthdays
 type = discover
 
+[[booked-appointments]]
+path = ~/.local/share/khal/calendars/booked-appointments
+type = discover
+
 [locale]
 timeformat = %H:%M
 dateformat = %Y-%m-%d
 longdateformat = %Y-%m-%d
 datetimeformat = %Y-%m-%d %H:%M
 longdatetimeformat = %Y-%m-%d %H:%M
-
-[default]
-default_calendar = personal
diff --git a/symlinks/config/mimeapps.list b/symlinks/config/mimeapps.list
index 999ac89..efaa729 100644
--- a/symlinks/config/mimeapps.list
+++ b/symlinks/config/mimeapps.list
@@ -9,6 +9,7 @@ text/markdown=nvim.desktop
 video/webm=org.videolan.VLC.desktop
 text/x-log=nvim.desktop
 text/plain=nvim.desktop
+x-scheme-handler/fleet=jetbrains-fleet.desktop
 
 [Added Associations]
 x-scheme-handler/sms=org.gnome.Shell.Extensions.GSConnect.desktop;