diff --git a/config-home.yaml b/config-home.yaml
deleted file mode 100644
index e34b03a..0000000
--- a/config-home.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-actions:
-  vim-plug: nvim +PlugInstall +qall
-config:
-  backup: true
-  banner: true
-  create: true
-  dotpath: home
-  ignoreempty: false
-  keepdot: true
-  link_dotfile_default: nolink
-  link_on_import: nolink
-  longkey: false
-  showdiff: false
-  workdir: ~/.config/dotdrop
-dotfiles:
-  d_systemd:
-    dst: ~/.config/systemd/user
-    src: .config/systemd/user
-  d_mpv:
-    dst: ~/.config/mpv
-    src: .config/mpv
-  d_neomutt:
-    dst: ~/.config/neomutt
-    src: .config/neomutt
-  d_goimapnotify:
-    dst: ~/.config/imapnotify
-    src: .config/imapnotify
-  f_init.vim:
-    dst: ~/.config/nvim/init.vim
-    src: .config/nvim/init.vim
-  d_nvim_config:
-    actions:
-    - vim-plug
-    dst: ~/.config/nvim/conf.d
-    src: .config/nvim/conf.d
-  f_coc-settings.json:
-    dst: ~/.config/nvim/coc-settings.json
-    src: .config/nvim/coc-settings.json
-  d_scripts:
-    dst: ~/.scripts
-    src: .scripts
-  d_sway:
-    dst: ~/.config/sway
-    src: .config/sway
-  d_waybar:
-    dst: ~/.config/waybar
-    src: .config/waybar
-  d_wofi:
-    src: .config/wofi
-    dst: ~/.config/wofi
-  f_abcde.conf:
-    dst: ~/.abcde.conf
-    src: .abcde.conf
-  f_mbsyncrc:
-    dst: ~/.mbsyncrc
-    src: .mbsyncrc
-  f_alacritty.yml:
-    dst: ~/.config/alacritty/alacritty.yml
-    src: .config/alacritty/alacritty.yml
-  f_authorized_keys:
-    dst: ~/.ssh/authorized_keys
-    src: .ssh/authorized_keys
-  f_beets_config:
-    dst: ~/.config/beets/config.yaml
-    src: .config/beets/config.yaml
-  f_beets_whitelist:
-    dst: ~/.config/beets/whitelist
-    src: .config/beets/whitelist
-  f_bspwmrc:
-    dst: ~/.config/bspwm/bspwmrc
-    src: .config/bspwm/bspwmrc
-  f_gitconfig:
-    dst: ~/.gitconfig
-    src: .gitconfig
-  f_libra_config:
-    dst: ~/.config/libra/config.toml
-    src: .config/libra/config.toml
-  f_mailcap:
-    dst: ~/.mailcap
-    src: .mailcap
-  f_makepkg.conf:
-    dst: ~/.config/pacman/makepkg.conf
-    src: .config/pacman/makepkg.conf
-  f_mako_config:
-    dst: ~/.config/mako/config
-    src: .config/mako/config
-  f_mimeo_associations.txt:
-    dst: ~/.config/mimeo/associations.txt
-    src: .config/mimeo/associations.txt
-  f_mpd.conf:
-    dst: ~/.config/mpd/mpd.conf
-    src: .config/mpd/mpd.conf
-  f_mpdris2.conf:
-    dst: ~/.config/mpDris2/mpDris2.conf
-    src: .config/mpDris2/mpDris2.conf
-  f_mpdscribble.conf:
-    dst: ~/.mpdscribble/mpdscribble.conf
-    src: .mpdscribble/mpdscribble.conf
-  f_ncmpcpp_bindings:
-    dst: ~/.config/ncmpcpp/bindings
-    src: .config/ncmpcpp/bindings
-  f_ranger.conf:
-    dst: ~/.config/ranger/rc.conf
-    src: .config/ranger/rc.conf
-  f_ranger_commands.py:
-    dst: ~/.config/ranger/commands.py
-    src: .config/ranger/commands.py
-  f_redshift.conf:
-    dst: ~/.config/redshift/redshift.conf
-    src: .config/redshift/redshift.conf
-  f_rtv.cfg:
-    dst: ~/.config/rtv/rtv.cfg
-    src: .config/rtv/rtv.cfg
-  f_ssh.conf:
-    dst: ~/.ssh/config
-    src: .ssh/config
-  f_steam-native.desktop:
-    dst: ~/.local/share/applications/steam-native.desktop
-    src: .local/share/applications/steam-native.desktop
-  f_tdesktop_lang.strings:
-    dst: ~/.config/telegram-desktop/lang.strings
-    src: .config/telegram-desktop/lang.strings
-  f_tmux.conf:
-    dst: ~/.tmux.conf
-    src: .tmux.conf
-  f_youtube-dl_config:
-    dst: ~/.config/youtube-dl/config
-    src: .config/youtube-dl/config
-  f_zathurarc:
-    dst: ~/.config/zathura/zathurarc
-    src: .config/zathura/zathurarc
-  f_zprofile:
-    dst: ~/.zprofile
-    src: .zprofile
-  f_zshrc:
-    dst: ~/.zshrc
-    src: .zshrc
-  d_zsh:
-    src: .config/zsh
-    dst: ~/.config/zsh
-  f_fonts.conf:
-    src: .config/fontconfig/fonts.conf
-    dst: ~/.config/fontconfig/fonts.conf
-  f_ripgrep_ignore:
-    src: .ignore
-    dst: ~/.ignore
-  f_nvimpager:
-    src: .config/nvimpager/init.vim
-    dst: ~/.config/nvimpager/init.vim
-  f_ncmpcpp.conf:
-    src: .config/ncmpcpp/config
-    dst: ~/.config/ncmpcpp/config
-  f_hushlogin:
-    src: .hushlogin
-    dst: ~/.hushlogin
-  f_paru.conf:
-    src: .config/paru/paru.conf
-    dst: ~/.config/paru/paru.conf
-profiles:
-  base:
-    dotfiles:
-    - d_systemd
-  terminal:
-    dotfiles:
-    - f_nvimpager
-    - f_hushlogin
-    - f_ripgrep_ignore
-    - f_ranger_commands.py
-    - f_rtv.cfg
-    - f_mailcap
-    - d_zsh
-    - f_zshrc
-    - f_tmux.conf
-    - f_gitconfig
-    - f_ranger.conf
-    - f_ssh.conf
-    - f_authorized_keys
-    - d_scripts
-    - d_nvim_config
-    - f_init.vim
-    - f_coc-settings.json
-    - f_gitconfig
-    - f_alacritty.yml
-  email:
-    dotfiles:
-    - d_neomutt
-    - d_goimapnotify
-    - f_mbsyncrc
-  media:
-    dotfiles:
-    - f_beets_config
-    - f_beets_whitelist
-    - f_abcde.conf
-    - d_mpv
-    - f_youtube-dl_config
-    - f_mpd.conf
-    - f_ncmpcpp_bindings
-    - f_ncmpcpp.conf
-    - f_libra_config
-    - f_mpdscribble.conf
-    - f_mpdris2.conf
-  sway:
-    dotfiles:
-    - d_sway
-    - d_waybar
-    - d_wofi
-    - f_mako_config
-    - f_redshift.conf
-    - f_zathurarc
-    - f_mimeo_associations.txt
-    - f_tdesktop_lang.strings
-    - f_fonts.conf
-    - f_zprofile
-  Pacman:
-    dotfiles:
-    - f_makepkg.conf
-    - f_paru.conf
-  Mirkwood:
-    include:
-    - base
-    - terminal
-    - email
-    - media
-    - sway
-    - Pacman
-    dotfiles:
-    - f_paru.conf
-  Moria:
-    include:
-    - terminal
-    - media
-    - Pacman
-  Gondor:
-    include:
-    - terminal
-    - Pacman
-  mko-laptop:
-    include:
-    - terminal
-  AnittaPC:
-    include:
-    - terminal
-    - Pacman
-  TakamakiPC:
-    include:
-    - terminal
-    - Pacman
-  localhost:
-    include:
-    - terminal
diff --git a/config.yaml b/config.yaml
deleted file mode 120000
index 6524534..0000000
--- a/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-config-home.yaml
\ No newline at end of file
diff --git a/config.yaml b/config.yaml
new file mode 100644
index 0000000..6215cdb
--- /dev/null
+++ b/config.yaml
@@ -0,0 +1,254 @@
+actions:
+  vim-plug: nvim +PlugInstall +qall
+config:
+  backup: true
+  banner: true
+  create: true
+  dotpath: home
+  ignoreempty: false
+  keepdot: true
+  link_dotfile_default: nolink
+  link_on_import: nolink
+  longkey: false
+  showdiff: false
+  workdir: ~/.config/dotdrop
+dotfiles:
+  d_systemd:
+    dst: ~/.config/systemd/user
+    src: .config/systemd/user
+  d_mpv:
+    dst: ~/.config/mpv
+    src: .config/mpv
+  d_neomutt:
+    dst: ~/.config/neomutt
+    src: .config/neomutt
+  d_goimapnotify:
+    dst: ~/.config/imapnotify
+    src: .config/imapnotify
+  f_init.vim:
+    dst: ~/.config/nvim/init.vim
+    src: .config/nvim/init.vim
+  d_nvim_config:
+    actions:
+    - vim-plug
+    dst: ~/.config/nvim/conf.d
+    src: .config/nvim/conf.d
+  f_coc-settings.json:
+    dst: ~/.config/nvim/coc-settings.json
+    src: .config/nvim/coc-settings.json
+  d_scripts:
+    dst: ~/.scripts
+    src: .scripts
+  d_sway:
+    dst: ~/.config/sway
+    src: .config/sway
+  d_waybar:
+    dst: ~/.config/waybar
+    src: .config/waybar
+  d_wofi:
+    src: .config/wofi
+    dst: ~/.config/wofi
+  f_abcde.conf:
+    dst: ~/.abcde.conf
+    src: .abcde.conf
+  f_mbsyncrc:
+    dst: ~/.mbsyncrc
+    src: .mbsyncrc
+  f_alacritty.yml:
+    dst: ~/.config/alacritty/alacritty.yml
+    src: .config/alacritty/alacritty.yml
+  f_authorized_keys:
+    dst: ~/.ssh/authorized_keys
+    src: .ssh/authorized_keys
+  f_beets_config:
+    dst: ~/.config/beets/config.yaml
+    src: .config/beets/config.yaml
+  f_beets_whitelist:
+    dst: ~/.config/beets/whitelist
+    src: .config/beets/whitelist
+  f_bspwmrc:
+    dst: ~/.config/bspwm/bspwmrc
+    src: .config/bspwm/bspwmrc
+  f_gitconfig:
+    dst: ~/.gitconfig
+    src: .gitconfig
+  f_libra_config:
+    dst: ~/.config/libra/config.toml
+    src: .config/libra/config.toml
+  f_mailcap:
+    dst: ~/.mailcap
+    src: .mailcap
+  f_makepkg.conf:
+    dst: ~/.config/pacman/makepkg.conf
+    src: .config/pacman/makepkg.conf
+  f_mako_config:
+    dst: ~/.config/mako/config
+    src: .config/mako/config
+  f_mimeo_associations.txt:
+    dst: ~/.config/mimeo/associations.txt
+    src: .config/mimeo/associations.txt
+  f_mpd.conf:
+    dst: ~/.config/mpd/mpd.conf
+    src: .config/mpd/mpd.conf
+  f_mpdris2.conf:
+    dst: ~/.config/mpDris2/mpDris2.conf
+    src: .config/mpDris2/mpDris2.conf
+  f_mpdscribble.conf:
+    dst: ~/.mpdscribble/mpdscribble.conf
+    src: .mpdscribble/mpdscribble.conf
+  f_ncmpcpp_bindings:
+    dst: ~/.config/ncmpcpp/bindings
+    src: .config/ncmpcpp/bindings
+  f_ranger.conf:
+    dst: ~/.config/ranger/rc.conf
+    src: .config/ranger/rc.conf
+  f_ranger_commands.py:
+    dst: ~/.config/ranger/commands.py
+    src: .config/ranger/commands.py
+  f_redshift.conf:
+    dst: ~/.config/redshift/redshift.conf
+    src: .config/redshift/redshift.conf
+  f_rtv.cfg:
+    dst: ~/.config/rtv/rtv.cfg
+    src: .config/rtv/rtv.cfg
+  f_ssh.conf:
+    dst: ~/.ssh/config
+    src: .ssh/config
+  f_steam-native.desktop:
+    dst: ~/.local/share/applications/steam-native.desktop
+    src: .local/share/applications/steam-native.desktop
+  f_tdesktop_lang.strings:
+    dst: ~/.config/telegram-desktop/lang.strings
+    src: .config/telegram-desktop/lang.strings
+  f_tmux.conf:
+    dst: ~/.tmux.conf
+    src: .tmux.conf
+  f_youtube-dl_config:
+    dst: ~/.config/youtube-dl/config
+    src: .config/youtube-dl/config
+  f_zathurarc:
+    dst: ~/.config/zathura/zathurarc
+    src: .config/zathura/zathurarc
+  f_zprofile:
+    dst: ~/.zprofile
+    src: .zprofile
+  f_zshrc:
+    dst: ~/.zshrc
+    src: .zshrc
+  d_zsh:
+    src: .config/zsh
+    dst: ~/.config/zsh
+  f_fonts.conf:
+    src: .config/fontconfig/fonts.conf
+    dst: ~/.config/fontconfig/fonts.conf
+  f_ripgrep_ignore:
+    src: .ignore
+    dst: ~/.ignore
+  f_nvimpager:
+    src: .config/nvimpager/init.vim
+    dst: ~/.config/nvimpager/init.vim
+  f_ncmpcpp.conf:
+    src: .config/ncmpcpp/config
+    dst: ~/.config/ncmpcpp/config
+  f_hushlogin:
+    src: .hushlogin
+    dst: ~/.hushlogin
+  f_paru.conf:
+    src: .config/paru/paru.conf
+    dst: ~/.config/paru/paru.conf
+  f_msmtp_config:
+    src: .config/msmtp/config
+    dst: ~/.config/msmtp/config
+profiles:
+  base:
+    dotfiles:
+    - d_systemd
+  terminal:
+    dotfiles:
+    - f_nvimpager
+    - f_hushlogin
+    - f_ripgrep_ignore
+    - f_ranger_commands.py
+    - f_rtv.cfg
+    - f_mailcap
+    - d_zsh
+    - f_zshrc
+    - f_tmux.conf
+    - f_gitconfig
+    - f_ranger.conf
+    - f_ssh.conf
+    - f_authorized_keys
+    - d_scripts
+    - d_nvim_config
+    - f_init.vim
+    - f_coc-settings.json
+    - f_gitconfig
+    - f_alacritty.yml
+  email:
+    dotfiles:
+    - d_neomutt
+    - d_goimapnotify
+    - f_mbsyncrc
+    - f_msmtp_config
+  media:
+    dotfiles:
+    - f_beets_config
+    - f_beets_whitelist
+    - f_abcde.conf
+    - d_mpv
+    - f_youtube-dl_config
+    - f_mpd.conf
+    - f_ncmpcpp_bindings
+    - f_ncmpcpp.conf
+    - f_libra_config
+    - f_mpdscribble.conf
+    - f_mpdris2.conf
+  sway:
+    dotfiles:
+    - d_sway
+    - d_waybar
+    - d_wofi
+    - f_mako_config
+    - f_redshift.conf
+    - f_zathurarc
+    - f_mimeo_associations.txt
+    - f_tdesktop_lang.strings
+    - f_fonts.conf
+    - f_zprofile
+  Pacman:
+    dotfiles:
+    - f_makepkg.conf
+    - f_paru.conf
+  Mirkwood:
+    include:
+    - base
+    - terminal
+    - email
+    - media
+    - sway
+    - Pacman
+    dotfiles:
+    - f_paru.conf
+  Moria:
+    include:
+    - terminal
+    - media
+    - Pacman
+  Gondor:
+    include:
+    - terminal
+    - Pacman
+  mko-laptop:
+    include:
+    - terminal
+  AnittaPC:
+    include:
+    - terminal
+    - Pacman
+  TakamakiPC:
+    include:
+    - terminal
+    - Pacman
+  localhost:
+    include:
+    - terminal
diff --git a/dotdrop b/dotdrop
index 581c82d..d42d810 160000
--- a/dotdrop
+++ b/dotdrop
@@ -1 +1 @@
-Subproject commit 581c82da3817b1e2284ba86e9ed4445a95a3882f
+Subproject commit d42d810ab1842c9568f655127491eeedf1d376fc
diff --git a/home/.config/msmtp/config b/home/.config/msmtp/config
new file mode 100644
index 0000000..81ca24c
--- /dev/null
+++ b/home/.config/msmtp/config
@@ -0,0 +1,25 @@
+# marko@korhonen.cc
+account        	marko@korhonen.cc
+from           	marko@korhonen.cc
+user           	marko@korhonen.cc
+password 		"{{@@ env['PASS_EMAIL_MARKO'] @@}}"
+auth 			on
+tls            	on
+tls_starttls   	off
+tls_trust_file 	/etc/ssl/certs/ca-certificates.crt
+logfile        	~/.log/msmtp/marko@korhonen.cc.log
+host           	smtp.migadu.com
+port           	465
+
+# admin@korhonen.cc
+account        	admin@korhonen.cc
+from           	admin@korhonen.cc
+user           	admin@korhonen.cc
+password 		"{{@@ env['PASS_EMAIL_ADMIN'] @@}}"
+auth 			on
+tls            	on
+tls_starttls   	off
+tls_trust_file 	/etc/ssl/certs/ca-certificates.crt
+logfile        	~/.log/msmtp/admin@korhonen.cc.log
+host           	smtp.migadu.com
+port           	465
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index 6fa5d6b..85a9456 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -117,7 +117,7 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" }
 
 # dotdrop
 updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets }
-dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ }
+dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh $@ }
 sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ }
 compdef _dotdrop-completion.zsh sdotdrop
 alias dotgit='git -C $DOTREPO'