diff --git a/dot_irssi/private_config.tmpl b/dot_irssi/private_config.tmpl
index b927653..d9a95ab 100644
--- a/dot_irssi/private_config.tmpl
+++ b/dot_irssi/private_config.tmpl
@@ -7,6 +7,14 @@ servers = (
     tls_verify = "yes";
     autoconnect = "yes";
   },
+  {
+    address = "eu.tilde.chat";
+    chatnet = "tildeverse";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+    autoconnect = "yes";
+  },
   { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; }
 );
 
diff --git a/dot_ssh/config b/dot_ssh/config
index 2850528..1c0ad0d 100644
--- a/dot_ssh/config
+++ b/dot_ssh/config
@@ -7,6 +7,8 @@ ControlPath ~/.ssh/sockets/socket-%r@%h:%p
 VerifyHostKeyDNS yes
 AddKeysToAgent yes
 ForwardAgent no
+ForwardX11 no
+PKCS11Provider /usr/local/lib/pkcs11/opensc-pkcs11.so
 
 Host cshpc
 Hostname cshpc.rrze.uni-erlangen.de
@@ -14,77 +16,62 @@ User unrz254
 
 Host csnhr
 Hostname csnhr.nhr.fau.de
-ForwardAgent no
 User unrz254
 
 Host moodle
 Hostname moodle.nhr.fau.de
-ForwardAgent no
 User moodle
 
 Host moebiusband
 Hostname server.moebiusband.org
-ForwardAgent no
 User jan
 
 Host fritz
 HostName fritz
-ForwardAgent no
 User unrz254
 ProxyJump cshpc
 
 Host alex
 HostName alex
-ForwardAgent no
 User unrz254
 ProxyJump cshpc
 
 Host meggie
 HostName meggie
-ForwardAgent no
 User unrz254
 ProxyJump cshpc
 
 Host testfront
 HostName testfront
-ForwardAgent no
 User unrz254
 ProxyJump cshpc
 
 Host monitoring
 Hostname monitoring.nhr.fau.de
-ForwardAgent no
 User jan
 ProxyJump cshpc
 
 Host monitoring-test
 Hostname monitoring-test.nhr.fau.de
-ForwardAgent no
 User unrz254
 ProxyJump cshpc
 
 Host gondor
 Hostname 192.168.1.130
-ForwardAgent no
 
 Host rohan
 HostName rohan
-ForwardAgent no
 User jan
 ProxyJump cshpc
 
-ProxyJump cshpc
 Host gitolite
-Hostname moebiusband.org
-ForwardAgent no
+Hostname server.moebiusband.org
 User gitolite3
 
 Host github
 Hostname github.com
-ForwardAgent no
 User git
 
 Host rrze-git
 Hostname gitlab.rrze.uni-erlangen.de
-ForwardAgent no
 User git
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 1ecac10..a889bbe 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -19,8 +19,10 @@ alias ccd='chezmoi cd'
 alias cdi='chezmoi diff'
 alias cap='chezmoi apply'
 
+{{- if ne .chezmoi.os "openbsd" }}
 zstyle :omz:plugins:keychain agents ssh
 zstyle :omz:plugins:keychain identities {{ .sshkey }}
+{{- end }}
 source $ZSH/oh-my-zsh.sh
 
 export LC_ALL=en_US.UTF-8
diff --git a/dot_mbsyncrc b/private_dot_mbsyncrc.tmpl
similarity index 91%
rename from dot_mbsyncrc
rename to private_dot_mbsyncrc.tmpl
index 8a76ff9..47144e5 100644
--- a/dot_mbsyncrc
+++ b/private_dot_mbsyncrc.tmpl
@@ -5,7 +5,7 @@
 IMAPAccount moebius
 Host mail.moebiusband.org
 User jan
-PassCmd "keepassxc-cli show  /home/jan/doc/private/Passwords.kdbx server/moebiusband.org -a password"
+Pass  {{ (keepassxc "moebiusband.org").Password }}
 SSLType IMAPS
 SSLVersions TLSv1.2
 CertificateFile /etc/ssl/cert.pem