diff --git a/config-root.yaml b/config-root.yaml
index becfe0ad..450e4672 100644
--- a/config-root.yaml
+++ b/config-root.yaml
@@ -1,5 +1,3 @@
-actions:
-  chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev
 config:
   backup: true
   banner: true
@@ -20,10 +18,11 @@ dotfiles:
     dst: /usr/local/bin
     src: usr/local/bin
   d_networkd:
-    actions:
-      - chmod-wireguard
     src: etc/systemd/network
     dst: /etc/systemd/network
+  f_networkd:
+    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
@@ -66,9 +65,6 @@ dotfiles:
   f_sshd_config:
     dst: /etc/ssh/sshd_config
     src: etc/ssh/sshd_config
-  f_timesyncd.conf:
-    dst: /etc/systemd/timesyncd.conf
-    src: etc/systemd/timesyncd.conf
   f_welcomemessage.conf:
     dst: /etc/welcomemessage.conf
     src: etc/welcomemessage.conf
@@ -132,58 +128,64 @@ dotfiles:
   f_pacserve.service.conf:
     src: etc/pacserve/pacserve.service.conf
     dst: /etc/pacserve/pacserve.service.conf
+  f_resolved.conf:
+    src: etc/systemd/resolved.conf
+    dst: /etc/systemd/resolved.conf
 profiles:
+  Network:
+    dotfiles:
+    - d_networkd
+    - f_resolved.conf
   Locale:
     dotfiles:
-      - f_locale.conf
-      - f_locale.gen
+    - f_locale.conf
+    - f_locale.gen
   Pacman:
     dotfiles:
-      - f_pacman.conf
-      - f_pacserve.service.conf
+    - f_pacman.conf
+    - f_pacserve.service.conf
   Mirkwood:
     dotfiles:
-      - f_getty.conf
-      - f_cryptissue
-      - f_welcomemessage.conf
-      - d_bin
-      - d_networkd
-      - f_adb.service
-      - f_bluetooth.conf
-      - f_iwd@.service
-      - f_sshd_config
-      - f_logind.conf
-      - f_60-uinput-permissions.rules
-      - f_freetype2.sh
-      - f_fonts.conf
-      - f_timesyncd.conf
-      - f_99-sysctl.conf
-      - f_99-lowbat.rules
-      - f_ignore
-      - f_mkinitcpio.conf
-      - f_vconsole.conf
-      - f_20-quiet-printk.conf
-      - f_system.conf
-      - f_cpupower
-      - f_arch.conf
-      - f_arch-lts.conf
-      - f_kodi.conf
-      - f_pacserve.service.conf
+    - f_getty.conf
+    - f_cryptissue
+    - f_welcomemessage.conf
+    - d_bin
+    - f_adb.service
+    - f_bluetooth.conf
+    - f_iwd@.service
+    - f_sshd_config
+    - f_logind.conf
+    - f_60-uinput-permissions.rules
+    - f_freetype2.sh
+    - f_fonts.conf
+    - f_99-sysctl.conf
+    - f_99-lowbat.rules
+    - f_ignore
+    - f_mkinitcpio.conf
+    - f_vconsole.conf
+    - f_20-quiet-printk.conf
+    - f_system.conf
+    - f_cpupower
+    - f_arch.conf
+    - f_arch-lts.conf
+    - f_kodi.conf
+    - f_pacserve.service.conf
     include:
-      - Locale
-      - Pacman
+    - Locale
+    - Pacman
+    - Network
   Moria:
     include:
-      - Locale
-      - Pacman
+    - Locale
+    - Pacman
     dotfiles:
-      - f_sshd_config
-      - f_99-sysctl.conf
+    - f_sshd_config
+    - f_99-sysctl.conf
   Gondor:
     include:
-      - Locale
+    - Locale
     dotfiles:
-      - f_sshd_config
+    - f_sshd_config
   localhost:
     include:
-      - Locale
+    - Locale
diff --git a/home/.config/neomutt/accounts/marko@korhonen.cc b/home/.config/neomutt/accounts/marko@korhonen.cc
new file mode 100644
index 00000000..d054f631
--- /dev/null
+++ b/home/.config/neomutt/accounts/marko@korhonen.cc
@@ -0,0 +1,9 @@
+# vim: filetype=neomuttrc
+
+set folder = ~/.mail/marko@korhonen.cc
+set spoolfile = +INBOX
+set postponed = +Drafts
+set record = +Sent
+
+set realname='Marko Korhonen'
+set from=marko@korhonen.cc
diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc
new file mode 100644
index 00000000..f37ec331
--- /dev/null
+++ b/home/.config/neomutt/neomuttrc
@@ -0,0 +1,9 @@
+# vim: filetype=neomuttrc
+
+## General options
+set header_cache = "~/.cache/neomutt"
+set mbox_type=Maildir
+
+# Accounts
+source "~/.config/neomutt/accounts/marko@korhonen.cc"
+folder-hook $folder 'source ~/.config/neomutt/accounts/marko@korhonen.cc'
diff --git a/home/.config/nvimpager/init.vim b/home/.config/nvimpager/init.vim
index e963c9aa..76dd80bb 100644
--- a/home/.config/nvimpager/init.vim
+++ b/home/.config/nvimpager/init.vim
@@ -8,4 +8,3 @@ set runtimepath+=~/.config/nvim/plugged/vim-polyglot
 source ~/.config/nvim/conf.d/02-appearance.vim
 source ~/.config/nvim/conf.d/03-keybinds.vim
 source ~/.config/nvim/conf.d/06-misc.vim
-source ~/.config/nvim/conf.d/07-clipboardfix.vim
diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf
index 2736d7e0..5bc7c612 100644
--- a/home/.config/sway/conf.d/01-vars.conf
+++ b/home/.config/sway/conf.d/01-vars.conf
@@ -3,5 +3,5 @@
 set $mod Mod4
 set $term alacritty
 set $gnome-schema org.gnome.desktop.interface
-set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1)
+set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1)
 set $scripts ~/.config/sway/scripts
diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf
index 0e44439b..d0ad336a 100644
--- a/home/.config/sway/conf.d/06-keybinds.conf
+++ b/home/.config/sway/conf.d/06-keybinds.conf
@@ -54,11 +54,15 @@ bindsym --locked XF86Search output eDP-1 toggle
 # FZF
 # exit menu
 bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh
+# password manager
+bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass
+
 # launch a program
 bindsym $mod+d exec wofi
 bindsym $mod+Shift+d exec wofi --show run
-# password manager
-bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass
+
+# manage clipboard
+bindsym $mod+c exec clipman pick -t wofi
 
 # manage notifications
 bindsym $mod+Backspace exec makoctl invoke
diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf
index f6f9633e..f8d685a8 100644
--- a/home/.config/sway/conf.d/08-exec.conf
+++ b/home/.config/sway/conf.d/08-exec.conf
@@ -7,9 +7,9 @@ exec {
 	telegram-desktop
 	/usr/lib/kdeconnectd
 	kdeconnect-indicator 
-	thunderbird
 	mako
-	wl-paste -t text --watch clipman store 1>> ~/.log/clipman 2>&1 &
+	wl-paste -t text --watch clipman store --notify 1>> ~/.log/clipman 2>&1
+	wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"
 	mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob
 	/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 	gnome-keyring-daemon --start --components=secrets
diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network
index de6a082a..92ec5d67 100644
--- a/root/etc/systemd/network/01-wired.network
+++ b/root/etc/systemd/network/01-wired.network
@@ -2,7 +2,8 @@
 Name=enp*
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=10
+UseDomains=true
diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network
index 29b43b08..8ae44320 100644
--- a/root/etc/systemd/network/02-usb0.network
+++ b/root/etc/systemd/network/02-usb0.network
@@ -2,7 +2,8 @@
 Name=usb0
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=10
+UseDomains=true
diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network
index 3c39f957..94b6271b 100644
--- a/root/etc/systemd/network/03-wireless.network
+++ b/root/etc/systemd/network/03-wireless.network
@@ -2,7 +2,8 @@
 Name=wlp*
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=20
+UseDomains=true
diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network
index 16e7cfb2..6252119e 100644
--- a/root/etc/systemd/network/04-wlan0.network
+++ b/root/etc/systemd/network/04-wlan0.network
@@ -2,7 +2,8 @@
 Name=wlan0
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=20
+UseDomains=true
diff --git a/root/etc/systemd/networkd.conf b/root/etc/systemd/networkd.conf
new file mode 100644
index 00000000..966d4b58
--- /dev/null
+++ b/root/etc/systemd/networkd.conf
@@ -0,0 +1,3 @@
+[Network]
+SpeedMeter=yes
+SpeedMeterIntervalSec=10sec
diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf
new file mode 100644
index 00000000..ad4ea0b2
--- /dev/null
+++ b/root/etc/systemd/resolved.conf
@@ -0,0 +1,2 @@
+[Resolve]
+LLMNR=no
diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf
deleted file mode 100644
index e1aac332..00000000
--- a/root/etc/systemd/timesyncd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Time]
-NTP=0.arch.pool.ntp.org
-FallbackNTP=0.pfsense.pool.ntp.org