diff --git a/config-root.toml b/config-root.toml
new file mode 100644
index 0000000..80f8ead
--- /dev/null
+++ b/config-root.toml
@@ -0,0 +1,209 @@
+[config]
+backup = true
+banner = true
+create = true
+dotpath = "root"
+ignoreempty = false
+keepdot = true
+link_dotfile_default = "nolink"
+link_on_import = "nolink"
+longkey = false
+showdiff = false
+workdir = "~/.config/sdotdrop"
+
+[dotfiles]
+
+[dotfiles."f_60-uinput-permissions.rules"]
+dst = "/etc/udev/rules.d/60-uinput-permissions.rules"
+src = "etc/udev/rules.d/60-uinput-permissions.rules"
+
+[dotfiles.d_bin]
+dst = "/usr/local/bin"
+src = "usr/local/bin"
+
+[dotfiles.d_network]
+src = "etc/systemd/network"
+dst = "/etc/systemd/network"
+
+[dotfiles."f_networkd.conf"]
+src = "etc/systemd/networkd.conf"
+dst = "/etc/systemd/networkd.conf"
+
+[dotfiles."f_99-sysctl.conf"]
+dst = "/etc/sysctl.d/99-sysctl.conf"
+src = "etc/sysctl.d/99-sysctl.conf"
+
+[dotfiles."f_adb.service"]
+dst = "/etc/systemd/system/adb.service"
+src = "etc/systemd/system/adb.service"
+
+[dotfiles."f_clamd.conf"]
+dst = "/etc/clamav/clamd.conf"
+src = "etc/clamav/clamd.conf"
+
+[dotfiles.f_cryptissue]
+dst = "/etc/cryptissue"
+src = "etc/cryptissue"
+
+[dotfiles."f_detected.sh"]
+dst = "/etc/clamav/detected.sh"
+src = "etc/clamav/detected.sh"
+
+[dotfiles."f_freetype2.sh"]
+dst = "/etc/profile.d/freetype2.sh"
+src = "etc/profile.d/freetype2.sh"
+
+[dotfiles."f_fonts.conf"]
+dst = "/etc/fonts/local.conf"
+src = "etc/fonts/local.conf"
+
+[dotfiles."f_locale.conf"]
+dst = "/etc/locale.conf"
+src = "etc/locale.conf"
+
+[dotfiles."f_locale.gen"]
+dst = "/etc/locale.gen"
+src = "etc/locale.gen"
+
+[dotfiles."f_logind.conf"]
+dst = "/etc/systemd/logind.conf"
+src = "etc/systemd/logind.conf"
+
+[dotfiles."f_bluetooth.conf"]
+dst = "/etc/bluetooth/main.conf"
+src = "etc/bluetooth/main.conf"
+
+[dotfiles."f_pacman.conf"]
+dst = "/etc/pacman.conf"
+src = "etc/pacman.conf"
+
+[dotfiles.f_pacman_zsh_hook]
+dst = "/etc/pacman.d/hooks/zsh.hook"
+src = "etc/pacman.d/hooks/zsh.hook"
+
+[dotfiles.f_sshd_config]
+dst = "/etc/ssh/sshd_config"
+src = "etc/ssh/sshd_config"
+
+[dotfiles."f_welcomemessage.conf"]
+dst = "/etc/welcomemessage.conf"
+src = "etc/welcomemessage.conf"
+
+[dotfiles."f_getty.conf"]
+src = "etc/systemd/system/getty@tty1.service.d/override.conf"
+dst = "/etc/systemd/system/getty@tty1.service.d/override.conf"
+
+[dotfiles."f_99-conbee-usb-serial.rules"]
+src = "etc/udev/rules.d/99-conbee-usb-serial.rules"
+dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules"
+
+[dotfiles."f_99-lowbat.rules"]
+src = "etc/udev/rules.d/99-lowbat.rules"
+dst = "/etc/udev/rules.d/99-lowbat.rules"
+
+[dotfiles."f_sleep.conf"]
+src = "etc/systemd/sleep.conf"
+dst = "/etc/systemd/sleep.conf"
+
+[dotfiles.f_fstab]
+src = "etc/fstab"
+dst = "/etc/fstab"
+
+[dotfiles.f_ignore]
+src = ".ignore"
+dst = "/.ignore"
+
+[dotfiles."f_mkinitcpio.conf"]
+src = "etc/mkinitcpio.conf"
+dst = "/etc/mkinitcpio.conf"
+
+[dotfiles."f_vconsole.conf"]
+src = "etc/vconsole.conf"
+dst = "/etc/vconsole.conf"
+
+[dotfiles."f_20-quiet-printk.conf"]
+src = "etc/sysctl.d/20-quiet-printk.conf"
+dst = "/etc/sysctl.d/20-quiet-printk.conf"
+
+[dotfiles."f_system.conf"]
+src = "etc/systemd/system.conf"
+dst = "/etc/systemd/system.conf"
+
+[dotfiles.f_cpupower]
+src = "etc/default/cpupower"
+dst = "/etc/default/cpupower"
+
+[dotfiles."f_pacserve.service.conf"]
+src = "etc/pacserve/pacserve.service.conf"
+dst = "/etc/pacserve/pacserve.service.conf"
+
+[dotfiles."d_mkinitcpio.d"]
+src = "etc/mkinitcpio.d"
+dst = "/etc/mkinitcpio.d"
+
+[dotfiles.f_cmdline]
+src = "etc/kernel/cmdline"
+dst = "/etc/kernel/cmdline"
+
+[dotfiles."f_loader.conf"]
+src = "boot/loader/loader.conf"
+dst = "/boot/loader/loader.conf"
+
+[dotfiles."f_timesyncd.conf"]
+src = "etc/systemd/timesyncd.conf"
+dst = "/etc/systemd/timesyncd.conf"
+
+[profiles]
+
+[profiles.Network]
+dotfiles = ["d_network", "f_networkd.conf"]
+
+[profiles.Locale]
+dotfiles = ["f_locale.conf", "f_locale.gen"]
+
+[profiles.Pacman]
+dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_pacserve.service.conf"]
+
+[profiles.Mirkwood]
+dotfiles = [
+  "f_getty.conf",
+  "f_cryptissue",
+  "f_welcomemessage.conf",
+  "d_bin",
+  "f_adb.service",
+  "f_bluetooth.conf",
+  "f_sshd_config",
+  "f_logind.conf",
+  "f_60-uinput-permissions.rules",
+  "f_freetype2.sh",
+  "f_fonts.conf",
+  "f_99-lowbat.rules",
+  "f_ignore",
+  "f_mkinitcpio.conf",
+  "f_vconsole.conf",
+  "f_20-quiet-printk.conf",
+  "f_system.conf",
+  "f_cpupower",
+  "d_mkinitcpio.d",
+  "f_cmdline",
+  "f_loader.conf",
+  "f_timesyncd.conf",
+]
+include = ["Locale", "Pacman", "Network"]
+
+[profiles.Moria]
+include = ["Locale", "Pacman", "Network"]
+dotfiles = ["f_sshd_config", "f_99-sysctl.conf", "f_cpupower"]
+
+[profiles.Gondor]
+include = ["Locale", "Pacman"]
+dotfiles = ["f_sshd_config"]
+
+[profiles.localhost]
+include = ["Locale"]
+
+[profiles.Edoras]
+include = ["Pacman"]
+
+[profiles.mko-laptop]
+dotfiles = ["f_cpupower"]
diff --git a/config-root.yaml b/config-root.yaml
deleted file mode 100644
index 0fe3267..0000000
--- a/config-root.yaml
+++ /dev/null
@@ -1,184 +0,0 @@
-config:
-  backup: true
-  banner: true
-  create: true
-  dotpath: root
-  ignoreempty: false
-  keepdot: true
-  link_dotfile_default: nolink
-  link_on_import: nolink
-  longkey: false
-  showdiff: false
-  workdir: ~/.config/sdotdrop
-dotfiles:
-  f_60-uinput-permissions.rules:
-    dst: /etc/udev/rules.d/60-uinput-permissions.rules
-    src: etc/udev/rules.d/60-uinput-permissions.rules
-  d_bin:
-    dst: /usr/local/bin
-    src: usr/local/bin
-  d_network:
-    src: etc/systemd/network
-    dst: /etc/systemd/network
-  f_networkd.conf:
-    src: etc/systemd/networkd.conf
-    dst: /etc/systemd/networkd.conf
-  f_99-sysctl.conf:
-    dst: /etc/sysctl.d/99-sysctl.conf
-    src: etc/sysctl.d/99-sysctl.conf
-  f_adb.service:
-    dst: /etc/systemd/system/adb.service
-    src: etc/systemd/system/adb.service
-  f_clamd.conf:
-    dst: /etc/clamav/clamd.conf
-    src: etc/clamav/clamd.conf
-  f_cryptissue:
-    dst: /etc/cryptissue
-    src: etc/cryptissue
-  f_detected.sh:
-    dst: /etc/clamav/detected.sh
-    src: etc/clamav/detected.sh
-  f_freetype2.sh:
-    dst: /etc/profile.d/freetype2.sh
-    src: etc/profile.d/freetype2.sh
-  f_fonts.conf:
-    dst: /etc/fonts/local.conf
-    src: etc/fonts/local.conf
-  f_locale.conf:
-    dst: /etc/locale.conf
-    src: etc/locale.conf
-  f_locale.gen:
-    dst: /etc/locale.gen
-    src: etc/locale.gen
-  f_logind.conf:
-    dst: /etc/systemd/logind.conf
-    src: etc/systemd/logind.conf
-  f_bluetooth.conf:
-    dst: /etc/bluetooth/main.conf
-    src: etc/bluetooth/main.conf
-  f_pacman.conf:
-    dst: /etc/pacman.conf
-    src: etc/pacman.conf
-  f_pacman_zsh_hook:
-    dst: /etc/pacman.d/hooks/zsh.hook
-    src: etc/pacman.d/hooks/zsh.hook
-  f_sshd_config:
-    dst: /etc/ssh/sshd_config
-    src: etc/ssh/sshd_config
-  f_welcomemessage.conf:
-    dst: /etc/welcomemessage.conf
-    src: etc/welcomemessage.conf
-  f_getty.conf:
-    src: etc/systemd/system/getty@tty1.service.d/override.conf
-    dst: /etc/systemd/system/getty@tty1.service.d/override.conf
-  f_99-conbee-usb-serial.rules:
-    src: etc/udev/rules.d/99-conbee-usb-serial.rules
-    dst: /etc/udev/rules.d/99-conbee-usb-serial.rules
-  f_99-lowbat.rules:
-    src: etc/udev/rules.d/99-lowbat.rules
-    dst: /etc/udev/rules.d/99-lowbat.rules
-  f_sleep.conf:
-    src: etc/systemd/sleep.conf
-    dst: /etc/systemd/sleep.conf
-  f_fstab:
-    src: etc/fstab
-    dst: /etc/fstab
-  f_ignore:
-    src: .ignore
-    dst: /.ignore
-  f_mkinitcpio.conf:
-    src: etc/mkinitcpio.conf
-    dst: /etc/mkinitcpio.conf
-  f_vconsole.conf:
-    src: etc/vconsole.conf
-    dst: /etc/vconsole.conf
-  f_20-quiet-printk.conf:
-    src: etc/sysctl.d/20-quiet-printk.conf
-    dst: /etc/sysctl.d/20-quiet-printk.conf
-  f_system.conf:
-    src: etc/systemd/system.conf
-    dst: /etc/systemd/system.conf
-  f_cpupower:
-    src: etc/default/cpupower
-    dst: /etc/default/cpupower
-  f_pacserve.service.conf:
-    src: etc/pacserve/pacserve.service.conf
-    dst: /etc/pacserve/pacserve.service.conf
-  d_mkinitcpio.d:
-    src: etc/mkinitcpio.d
-    dst: /etc/mkinitcpio.d
-  f_cmdline:
-    src: etc/kernel/cmdline
-    dst: /etc/kernel/cmdline
-  f_loader.conf:
-    src: boot/loader/loader.conf
-    dst: /boot/loader/loader.conf
-  f_timesyncd.conf:
-    src: etc/systemd/timesyncd.conf
-    dst: /etc/systemd/timesyncd.conf
-profiles:
-  Network:
-    dotfiles:
-    - d_network
-    - f_networkd.conf
-  Locale:
-    dotfiles:
-    - f_locale.conf
-    - f_locale.gen
-  Pacman:
-    dotfiles:
-    - f_pacman.conf
-    - f_pacman_zsh_hook
-    - f_pacserve.service.conf
-  Mirkwood:
-    dotfiles:
-    - f_getty.conf
-    - f_cryptissue
-    - f_welcomemessage.conf
-    - d_bin
-    - f_adb.service
-    - f_bluetooth.conf
-    - f_sshd_config
-    - f_logind.conf
-    - f_60-uinput-permissions.rules
-    - f_freetype2.sh
-    - f_fonts.conf
-    - f_99-lowbat.rules
-    - f_ignore
-    - f_mkinitcpio.conf
-    - f_vconsole.conf
-    - f_20-quiet-printk.conf
-    - f_system.conf
-    - f_cpupower
-    - d_mkinitcpio.d
-    - f_cmdline
-    - f_loader.conf
-    - f_timesyncd.conf
-    include:
-    - Locale
-    - Pacman
-    - Network
-  Moria:
-    include:
-    - Locale
-    - Pacman
-    - Network
-    dotfiles:
-    - f_sshd_config
-    - f_99-sysctl.conf
-    - f_cpupower
-  Gondor:
-    include:
-    - Locale
-    - Pacman
-    dotfiles:
-    - f_sshd_config
-  localhost:
-    include:
-    - Locale
-  Edoras:
-    include:
-    - Pacman
-  mko-laptop:
-    dotfiles:
-    - f_cpupower
diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000..9b22bcc
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,327 @@
+[actions]
+nvim-packer-sync = "nvim +PackerSync"
+
+[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]
+
+[dotfiles.d_systemd]
+dst = "~/.config/systemd/user"
+src = ".config/systemd/user"
+
+[dotfiles.d_mpv]
+dst = "~/.config/mpv"
+src = ".config/mpv"
+
+[dotfiles.d_neomutt]
+dst = "~/.config/neomutt"
+src = ".config/neomutt"
+
+[dotfiles.d_imapnotify]
+dst = "~/.config/imapnotify"
+src = ".config/imapnotify"
+
+[dotfiles.f_nvim_init]
+dst = "~/.config/nvim/init.lua"
+src = ".config/nvim/init.lua"
+
+[dotfiles.d_nvim_lua]
+actions = ["nvim-packer-sync"]
+dst = "~/.config/nvim/lua"
+src = ".config/nvim/lua"
+
+[dotfiles.d_nvim_ftplugin]
+dst = "~/.config/nvim/ftplugin"
+src = ".config/nvim/ftplugin"
+
+[dotfiles.d_sway]
+dst = "~/.config/sway"
+src = ".config/sway"
+
+[dotfiles.d_waybar]
+dst = "~/.config/waybar"
+src = ".config/waybar"
+
+[dotfiles.d_wofi]
+src = ".config/wofi"
+dst = "~/.config/wofi"
+
+[dotfiles."f_abcde.conf"]
+dst = "~/.abcde.conf"
+src = ".abcde.conf"
+
+[dotfiles.f_mbsyncrc]
+dst = "~/.mbsyncrc"
+src = ".mbsyncrc"
+
+[dotfiles."f_alacritty.yml"]
+dst = "~/.config/alacritty/alacritty.yml"
+src = ".config/alacritty/alacritty.yml"
+
+[dotfiles.f_authorized_keys]
+dst = "~/.ssh/authorized_keys"
+src = ".ssh/authorized_keys"
+
+[dotfiles.f_beets_config]
+dst = "~/.config/beets/config.yaml"
+src = ".config/beets/config.yaml"
+
+[dotfiles.f_beets_whitelist]
+dst = "~/.config/beets/whitelist"
+src = ".config/beets/whitelist"
+
+[dotfiles.f_bspwmrc]
+dst = "~/.config/bspwm/bspwmrc"
+src = ".config/bspwm/bspwmrc"
+
+[dotfiles.f_gitconfig]
+dst = "~/.gitconfig"
+src = ".gitconfig"
+
+[dotfiles.f_libra_config]
+dst = "~/.config/libra/config.toml"
+src = ".config/libra/config.toml"
+
+[dotfiles.f_mailcap]
+dst = "~/.mailcap"
+src = ".mailcap"
+
+[dotfiles."f_makepkg.conf"]
+dst = "~/.config/pacman/makepkg.conf"
+src = ".config/pacman/makepkg.conf"
+
+[dotfiles.f_mako_config]
+dst = "~/.config/mako/config"
+src = ".config/mako/config"
+
+[dotfiles."f_mimeo_associations.txt"]
+dst = "~/.config/mimeo/associations.txt"
+src = ".config/mimeo/associations.txt"
+
+[dotfiles."f_mpd.conf"]
+dst = "~/.config/mpd/mpd.conf"
+src = ".config/mpd/mpd.conf"
+
+[dotfiles."f_mpdris2.conf"]
+dst = "~/.config/mpDris2/mpDris2.conf"
+src = ".config/mpDris2/mpDris2.conf"
+
+[dotfiles."f_mpdscribble.conf"]
+dst = "~/.mpdscribble/mpdscribble.conf"
+src = ".mpdscribble/mpdscribble.conf"
+
+[dotfiles.f_ncmpcpp_bindings]
+dst = "~/.config/ncmpcpp/bindings"
+src = ".config/ncmpcpp/bindings"
+
+[dotfiles."f_ranger.conf"]
+dst = "~/.config/ranger/rc.conf"
+src = ".config/ranger/rc.conf"
+
+[dotfiles."f_ranger_commands.py"]
+dst = "~/.config/ranger/commands.py"
+src = ".config/ranger/commands.py"
+
+[dotfiles."f_redshift.conf"]
+dst = "~/.config/redshift/redshift.conf"
+src = ".config/redshift/redshift.conf"
+
+[dotfiles."f_rtv.cfg"]
+dst = "~/.config/rtv/rtv.cfg"
+src = ".config/rtv/rtv.cfg"
+
+[dotfiles."f_ssh.conf"]
+dst = "~/.ssh/config"
+src = ".ssh/config"
+
+[dotfiles."f_steam-native.desktop"]
+dst = "~/.local/share/applications/steam-native.desktop"
+src = ".local/share/applications/steam-native.desktop"
+
+[dotfiles."f_tdesktop_lang.strings"]
+dst = "~/.config/telegram-desktop/lang.strings"
+src = ".config/telegram-desktop/lang.strings"
+
+[dotfiles."f_tmux.conf"]
+dst = "~/.tmux.conf"
+src = ".tmux.conf"
+
+[dotfiles.f_youtube-dl_config]
+dst = "~/.config/youtube-dl/config"
+src = ".config/youtube-dl/config"
+
+[dotfiles.d_zathura]
+dst = "~/.config/zathura"
+src = ".config/zathura"
+
+[dotfiles.f_zprofile]
+dst = "~/.zprofile"
+src = ".zprofile"
+
+[dotfiles.f_zshrc]
+dst = "~/.zshrc"
+src = ".zshrc"
+
+[dotfiles.d_zsh]
+src = ".config/zsh"
+dst = "~/.config/zsh"
+
+[dotfiles."f_fonts.conf"]
+src = ".config/fontconfig/fonts.conf"
+dst = "~/.config/fontconfig/fonts.conf"
+
+[dotfiles.f_ripgrep_ignore]
+src = ".ignore"
+dst = "~/.ignore"
+
+[dotfiles."f_ncmpcpp.conf"]
+src = ".config/ncmpcpp/config"
+dst = "~/.config/ncmpcpp/config"
+
+[dotfiles.f_hushlogin]
+src = ".hushlogin"
+dst = "~/.hushlogin"
+
+[dotfiles."f_paru.conf"]
+src = ".config/paru/paru.conf"
+dst = "~/.config/paru/paru.conf"
+
+[dotfiles.f_msmtp_config]
+src = ".config/msmtp/config"
+dst = "~/.config/msmtp/config"
+
+[dotfiles."f_foot.ini"]
+src = ".config/foot/foot.ini"
+dst = "~/.config/foot/foot.ini"
+
+[dotfiles."f_gpg-agent.conf"]
+src = ".gnupg/gpg-agent.conf"
+dst = "~/.gnupg/gpg-agent.conf"
+chmod = "600"
+
+[dotfiles."f_gpg.conf"]
+src = ".gnupg/gpg.conf"
+dst = "~/.gnupg/gpg.conf"
+
+[dotfiles."f_gpg_scdaemon.conf"]
+src = ".gnupg/scdaemon.conf"
+dst = "~/.gnupg/scdaemon.conf"
+
+[dotfiles."f_electron-flags.conf"]
+src = ".config/electron-flags.conf"
+dst = "~/.config/electron-flags.conf"
+
+[dotfiles."f_electron12-flags.conf"]
+src = ".config/electron12-flags.conf"
+dst = "~/.config/electron12-flags.conf"
+
+[dotfiles.f_pam_environment]
+src = ".pam_environment"
+dst = "~/.pam_environment"
+
+[profiles]
+
+[profiles.base]
+dotfiles = ["d_systemd"]
+
+[profiles.terminal]
+dotfiles = [
+  "f_hushlogin",
+  "f_ripgrep_ignore",
+  "f_ranger_commands.py",
+  "f_rtv.cfg",
+  "f_mailcap",
+  "d_zsh",
+  "f_zshrc",
+  "f_tmux.conf",
+  "f_ranger.conf",
+  "f_ssh.conf",
+  "f_authorized_keys",
+  "f_nvim_init",
+  "d_nvim_lua",
+  "d_nvim_ftplugin",
+  "f_gitconfig",
+  "f_alacritty.yml",
+]
+
+[profiles.email]
+dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"]
+
+[profiles.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",
+]
+
+[profiles.sway]
+dotfiles = [
+  "d_sway",
+  "d_waybar",
+  "d_wofi",
+  "f_mako_config",
+  "f_redshift.conf",
+  "d_zathura",
+  "f_mimeo_associations.txt",
+  "f_tdesktop_lang.strings",
+  "f_fonts.conf",
+  "f_zprofile",
+  "f_electron-flags.conf",
+  "f_electron12-flags.conf",
+]
+
+[profiles.pacman]
+dotfiles = ["f_makepkg.conf", "f_paru.conf"]
+
+[profiles.gpg]
+dotfiles = [
+  "f_gpg-agent.conf",
+  "f_gpg.conf",
+  "f_gpg_scdaemon.conf",
+  "f_pam_environment",
+]
+
+[profiles.Mirkwood]
+include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"]
+dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"]
+
+[profiles.Moria]
+include = ["terminal", "pacman"]
+dotfiles = ["f_zprofile"]
+
+[profiles.Gondor]
+include = ["terminal", "pacman"]
+
+[profiles.mko-laptop]
+include = ["terminal", "media", "gpg"]
+
+[profiles.Edoras]
+include = ["terminal", "pacman"]
+
+[profiles.TakamakiPC]
+include = ["terminal", "pacman"]
+
+[profiles.localhost]
+include = ["terminal"]
+
+[profiles.ViiruJaTeippi]
+include = ["terminal"]
diff --git a/config.yaml b/config.yaml
deleted file mode 100644
index 0a074a1..0000000
--- a/config.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-  nvim-packer-sync: nvim +PackerSync
-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_imapnotify:
-    dst: ~/.config/imapnotify
-    src: .config/imapnotify
-  f_nvim_init:
-    dst: ~/.config/nvim/init.lua
-    src: .config/nvim/init.lua
-  d_nvim_lua:
-    actions:
-    - nvim-packer-sync
-    dst: ~/.config/nvim/lua
-    src: .config/nvim/lua
-  d_nvim_ftplugin:
-    dst: ~/.config/nvim/ftplugin
-    src: .config/nvim/ftplugin
-  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
-  d_zathura:
-    dst: ~/.config/zathura
-    src: .config/zathura
-  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_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
-  f_foot.ini:
-    src: .config/foot/foot.ini
-    dst: ~/.config/foot/foot.ini
-  f_gpg-agent.conf:
-    src: .gnupg/gpg-agent.conf
-    dst: ~/.gnupg/gpg-agent.conf
-    chmod: '600'
-  f_gpg.conf:
-    src: .gnupg/gpg.conf
-    dst: ~/.gnupg/gpg.conf
-  f_gpg_scdaemon.conf:
-    src: .gnupg/scdaemon.conf
-    dst: ~/.gnupg/scdaemon.conf
-  f_electron-flags.conf:
-    src: .config/electron-flags.conf
-    dst: ~/.config/electron-flags.conf
-  f_electron12-flags.conf:
-    src: .config/electron12-flags.conf
-    dst: ~/.config/electron12-flags.conf
-  f_pam_environment:
-    src: .pam_environment
-    dst: ~/.pam_environment
-profiles:
-  base:
-    dotfiles:
-    - d_systemd
-  terminal:
-    dotfiles:
-    - f_hushlogin
-    - f_ripgrep_ignore
-    - f_ranger_commands.py
-    - f_rtv.cfg
-    - f_mailcap
-    - d_zsh
-    - f_zshrc
-    - f_tmux.conf
-    - f_ranger.conf
-    - f_ssh.conf
-    - f_authorized_keys
-    - f_nvim_init
-    - d_nvim_lua
-    - d_nvim_ftplugin
-    - f_gitconfig
-    - f_alacritty.yml
-  email:
-    dotfiles:
-    - d_neomutt
-    - d_imapnotify
-    - 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
-    - d_zathura
-    - f_mimeo_associations.txt
-    - f_tdesktop_lang.strings
-    - f_fonts.conf
-    - f_zprofile
-    - f_electron-flags.conf
-    - f_electron12-flags.conf
-  pacman:
-    dotfiles:
-    - f_makepkg.conf
-    - f_paru.conf
-  gpg:
-    dotfiles:
-    - f_gpg-agent.conf
-    - f_gpg.conf
-    - f_gpg_scdaemon.conf
-    - f_pam_environment
-  Mirkwood:
-    include:
-    - base
-    - terminal
-    - email
-    - media
-    - sway
-    - pacman
-    - gpg
-    dotfiles:
-    - f_paru.conf
-    - f_gitconfig
-    - f_foot.ini
-  Moria:
-    include:
-    - terminal
-    - pacman
-    dotfiles:
-    - f_zprofile
-  Gondor:
-    include:
-    - terminal
-    - pacman
-  mko-laptop:
-    include:
-    - terminal
-    - media
-    - gpg
-  Edoras:
-    include:
-    - terminal
-    - pacman
-  TakamakiPC:
-    include:
-    - terminal
-    - pacman
-  localhost:
-    include:
-    - terminal
-  ViiruJaTeippi:
-    include:
-    - terminal
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index 055a91e..6f0f852 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -130,8 +130,8 @@ 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 $@ }
-sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ }
+dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config.toml $@ }
+sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ }
 compdef _dotdrop-completion.zsh sdotdrop
 alias dotgit='git -C $DOTREPO'
 dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD }