diff --git a/HOME/.local/share/applications/userapp-khalimport.desktop b/HOME/.local/share/applications/userapp-khalimport.desktop
index ce4ce1e..1512578 100644
--- a/HOME/.local/share/applications/userapp-khalimport.desktop
+++ b/HOME/.local/share/applications/userapp-khalimport.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Version=1.0
+Name=Khal Import
+Comment=Imports ICS files into Khal
 Type=Application
-Name=khalimport
-Exec=xterm -bg "#1E1E2e" -fg "#CDD6F4" -e "/usr/bin/khal import -a purelymail %s %f"
-Categories=Other;
-NoDisplay=true
-MimeType=text/calendar
 Terminal=false
+Exec=xdg-terminal-exec khal import %F
+MimeType=text/calendar;
+NoDisplay=true
diff --git a/aerc/aerc.conf b/aerc/aerc.conf
index ea97213..de2bd17 100644
--- a/aerc/aerc.conf
+++ b/aerc/aerc.conf
@@ -37,6 +37,7 @@ sort=unread
 [compose]
 address-book-cmd=khard email --parsable --remove-first-line %s
 header-layout=To|From,Cc|Bcc,Subject
+reply-to-self=false
 
 [multipart-converters]
 text/html=pandoc -f markdown -t html
@@ -71,4 +72,7 @@ audio/*=mpv --no-video
 text/*=vim
 
 [hooks]
+aerc-startup=aerc :terminal khal interactive \
+  && aerc :pin-tab \
+  && aerc :change-tab hjarl
 mail-received=notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] New mail from $AERC_FROM_NAME" "$AERC_SUBJECT"
diff --git a/aerc/binds.conf b/aerc/binds.conf
index f1169f4..7c1bf1d 100644
--- a/aerc/binds.conf
+++ b/aerc/binds.conf
@@ -1,5 +1,5 @@
-<C-o> = :next-tab<Enter>
-<C-i> = :prev-tab<Enter>
+<C-i> = :next-tab<Enter>
+<C-o> = :prev-tab<Enter>
 <C-t> = :term<Enter>
 ? = :help keys<Enter>
 \[t = :prev-tab<Enter>
@@ -25,6 +25,7 @@ c = :cf<space>
 C = :compose<Enter>
 D  = :delete-message<Enter>
 dd = :mv Trash<Enter>
+f = :forward<Enter>
 G = :select -1<Enter>
 gg = :select 0<Enter>
 gi = :cf INBOX<Enter>
@@ -39,10 +40,8 @@ m  = :move<space>
 n = :next-result<Enter>
 N = :prev-result<Enter>
 q = :quit<Enter>
-rq = :reply -aq<Enter>
-Rq = :reply -q<Enter>
-rr = :reply -a<Enter>
-Rr = :reply<Enter>
+r = :reply -aq<Enter>
+R = :reply -q<Enter>
 s = :split<Enter>
 S = :vsplit<Enter>
 T = :toggle-threads<Enter>
@@ -81,10 +80,8 @@ m  = :move<space>
 O  = :open<Enter>
 o  = :open<Enter>
 q  = :close<Enter>
-rq = :reply -aq<Enter>
-Rq = :reply -q<Enter>
-rr = :reply -a<Enter>
-Rr = :reply<Enter>
+r = :reply -aq<Enter>
+R = :reply -q<Enter>
 S  = :save<space>
 
 [view:folder=Trash]
@@ -109,9 +106,9 @@ $noinherit = true
 <A-p> = :switch-account -p<Enter>
 <backtab> = :prev-field<Enter>
 <C-n> = :next-field<Enter>
-<C-o> = :next-tab<Enter>
+<C-i> = :next-tab<Enter>
 <C-p> = :prev-field<Enter>
-<C-i> = :prev-tab<Enter>
+<C-o> = :prev-tab<Enter>
 <tab> = :next-field<Enter>
 
 [compose::editor]
@@ -119,16 +116,18 @@ $noinherit = true
 $noinherit = true
 $ex = <C-x>
 <C-n> = :next-field<Enter>
-<C-o> = :next-tab<Enter>
+<C-i> = :next-tab<Enter>
 <C-p> = :prev-field<Enter>
-<C-i> = :prev-tab<Enter>
+<C-o> = :prev-tab<Enter>
 
 [compose::review]
 y = :send<Enter> # Send
 n = :abort<Enter> # Abort (discard message, no confirmation)
 v = :preview<Enter> # Preview message
 p = :postpone<Enter> # Postpone
+H = :multipart text/html<Enter> # Add html from markdown
 q = :choose -o d discard abort -o p postpone postpone<Enter> # Abort or postpone
+Q = :abort<Enter> # Abort
 e = :edit<Enter> # Edit (body and headers)
 a = :attach<space> # Add attachment
 d = :detach<space> # Remove attachment
@@ -139,5 +138,5 @@ x = :encrypt<Enter> # Toggle encryption to all recipients
 $noinherit = true
 $ex = <C-x>
 
-<C-o> = :next-tab<Enter>
-<C-i> = :prev-tab<Enter>
+<C-i> = :next-tab<Enter>
+<C-o> = :prev-tab<Enter>
diff --git a/aerc/templates/forward_as_body b/aerc/templates/forward_as_body
new file mode 100644
index 0000000..e8d15dc
--- /dev/null
+++ b/aerc/templates/forward_as_body
@@ -0,0 +1,8 @@
+X-Mailer: aerc {{version}}
+
+Forwarded message from {{.OriginalFrom | names | join ", "}} on {{dateFormat .OriginalDate "Mon Jan 2, 2006 at 3:04 PM"}}:
+{{.OriginalText}}
+{{- with .Signature }}
+
+{{.}}
+{{- end }}
diff --git a/aerc/templates/new_message b/aerc/templates/new_message
new file mode 100644
index 0000000..8ff5f46
--- /dev/null
+++ b/aerc/templates/new_message
@@ -0,0 +1,5 @@
+X-Mailer: aerc {{version}}
+{{- with .Signature }}
+
+{{.}}
+{{- end -}}
diff --git a/aerc/templates/quoted_reply b/aerc/templates/quoted_reply
new file mode 100644
index 0000000..8564df3
--- /dev/null
+++ b/aerc/templates/quoted_reply
@@ -0,0 +1,23 @@
+X-Mailer: aerc {{version}}
+
+On {{dateFormat (.OriginalDate | toLocal) "Mon Jan 2, 2006 at 3:04 PM MST"}}, {{.OriginalFrom | names | join ", "}} wrote:
+
+{{ if or
+	(eq .OriginalMIMEType "text/html")
+	(contains (toLower .OriginalText) "<html")
+}}
+	{{- $text := exec `/usr/lib/aerc/filters/html` .OriginalText | replace `\r` `` -}}
+	{{- range split "\n" $text -}}
+		{{- if or
+			(eq (len .) 0)
+			(match `^\[.+\]\s*$` .)
+		}}{{continue}}{{end}}
+		{{- printf "%s\n" . | replace `^[\s]+` "" | quote}}
+	{{- end -}}
+{{- else }}
+	{{- trimSignature .OriginalText | quote -}}
+{{- end -}}
+{{- with .Signature }}
+
+{{.}}
+{{- end }}
diff --git a/vdirsyncer/config b/vdirsyncer/config
index aff8edc..c547829 100644
--- a/vdirsyncer/config
+++ b/vdirsyncer/config
@@ -34,8 +34,8 @@ fileext = ".ics"
 [storage google_calendar_remote]
 type = "google_calendar"
 token_file = "~/.config/vdirsyncer/google_calendar_token"
-client_id = "46299105873-2qbog08khdujcgvecbnjeql1r1rb0nir.apps.googleusercontent.com"
-client_secret = "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"
+client_id = "46299105873-hli2csm2rdgmtdnobmbsdcquajceli76.apps.googleusercontent.com"
+client_secret = "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"
 
 [pair google_contacts]
 a = "google_contacts_local"
@@ -52,8 +52,8 @@ fileext = ".vcf"
 [storage google_contacts_remote]
 type = "google_contacts"
 token_file = "~/.config/vdirsyncer/google_contacts_token"
-client_id = "46299105873-2qbog08khdujcgvecbnjeql1r1rb0nir.apps.googleusercontent.com"
-client_secret = "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"
+client_id = "46299105873-hli2csm2rdgmtdnobmbsdcquajceli76.apps.googleusercontent.com"
+client_secret = "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"
 
 [pair holidays]
 a = "holidays_local"