diff --git a/config-root.yaml b/config-root.yaml
index 450e4672..becfe0ad 100644
--- a/config-root.yaml
+++ b/config-root.yaml
@@ -1,3 +1,5 @@
+actions:
+  chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev
 config:
   backup: true
   banner: true
@@ -18,11 +20,10 @@ 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
@@ -65,6 +66,9 @@ 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
@@ -128,64 +132,58 @@ 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
-    - 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
+      - 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
     include:
-    - Locale
-    - Pacman
-    - Network
+      - Locale
+      - Pacman
   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
deleted file mode 100644
index d054f631..00000000
--- a/home/.config/neomutt/accounts/marko@korhonen.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
index f37ec331..00000000
--- a/home/.config/neomutt/neomuttrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 76dd80bb..e963c9aa 100644
--- a/home/.config/nvimpager/init.vim
+++ b/home/.config/nvimpager/init.vim
@@ -8,3 +8,4 @@ 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 5bc7c612..2736d7e0 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 d0ad336a..0e44439b 100644
--- a/home/.config/sway/conf.d/06-keybinds.conf
+++ b/home/.config/sway/conf.d/06-keybinds.conf
@@ -54,15 +54,11 @@ 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
-
-# manage clipboard
-bindsym $mod+c exec clipman pick -t wofi
+# password manager
+bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass
 
 # 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 f8d685a8..f6f9633e 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 --notify 1>> ~/.log/clipman 2>&1
-	wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"
+	wl-paste -t text --watch clipman store 1>> ~/.log/clipman 2>&1 &
 	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 92ec5d67..de6a082a 100644
--- a/root/etc/systemd/network/01-wired.network
+++ b/root/etc/systemd/network/01-wired.network
@@ -2,8 +2,7 @@
 Name=enp*
 
 [Network]
-DHCP=yes
+DHCP=ipv4
 
 [DHCP]
 RouteMetric=10
-UseDomains=true
diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network
index 8ae44320..29b43b08 100644
--- a/root/etc/systemd/network/02-usb0.network
+++ b/root/etc/systemd/network/02-usb0.network
@@ -2,8 +2,7 @@
 Name=usb0
 
 [Network]
-DHCP=yes
+DHCP=ipv4
 
 [DHCP]
 RouteMetric=10
-UseDomains=true
diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network
index 94b6271b..3c39f957 100644
--- a/root/etc/systemd/network/03-wireless.network
+++ b/root/etc/systemd/network/03-wireless.network
@@ -2,8 +2,7 @@
 Name=wlp*
 
 [Network]
-DHCP=yes
+DHCP=ipv4
 
 [DHCP]
 RouteMetric=20
-UseDomains=true
diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network
index 6252119e..16e7cfb2 100644
--- a/root/etc/systemd/network/04-wlan0.network
+++ b/root/etc/systemd/network/04-wlan0.network
@@ -2,8 +2,7 @@
 Name=wlan0
 
 [Network]
-DHCP=yes
+DHCP=ipv4
 
 [DHCP]
 RouteMetric=20
-UseDomains=true
diff --git a/root/etc/systemd/networkd.conf b/root/etc/systemd/networkd.conf
deleted file mode 100644
index 966d4b58..00000000
--- a/root/etc/systemd/networkd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Network]
-SpeedMeter=yes
-SpeedMeterIntervalSec=10sec
diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf
deleted file mode 100644
index ad4ea0b2..00000000
--- a/root/etc/systemd/resolved.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Resolve]
-LLMNR=no
diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf
new file mode 100644
index 00000000..e1aac332
--- /dev/null
+++ b/root/etc/systemd/timesyncd.conf
@@ -0,0 +1,3 @@
+[Time]
+NTP=0.arch.pool.ntp.org
+FallbackNTP=0.pfsense.pool.ntp.org