diff --git a/config.yaml b/config.yaml
index a78fff99..8997dac9 100644
--- a/config.yaml
+++ b/config.yaml
@@ -155,13 +155,6 @@ dotfiles:
   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
 profiles:
   base:
     dotfiles:
@@ -232,8 +225,6 @@ profiles:
     - f_user-dirs.dirs
     - f_gitconfig
     - f_foot.ini
-    - f_gpg-agent.conf
-    - f_gpg.conf
   Moria:
     include:
     - terminal
@@ -246,7 +237,6 @@ profiles:
   mko-laptop:
     include:
     - terminal
-    - media
   Edoras:
     include:
     - terminal
diff --git a/dotdrop b/dotdrop
index 3f00e21e..5d4b12ea 160000
--- a/dotdrop
+++ b/dotdrop
@@ -1 +1 @@
-Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb
+Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6
diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml
index 8fa9eb14..5574fc86 100644
--- a/home/.config/alacritty/alacritty.yml
+++ b/home/.config/alacritty/alacritty.yml
@@ -73,6 +73,8 @@ mouse:
   double_click: { threshold: 300 }
   triple_click: { threshold: 300 }
   hide_when_typing: false
+  url:
+    modifiers: None
 
 selection:
   semantic_escape_chars: ',│`|:"'' ()[]{}<>'
diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf
index 26d19160..be2d89c7 100644
--- a/home/.config/mpv/mpv.conf
+++ b/home/.config/mpv/mpv.conf
@@ -9,10 +9,8 @@ hwdec-codecs=all
 
 {%@@ if profile == "Mirkwood" @@%}
 gpu-context=wayland
-{%@@ endif @@%}
-
-{%@@ if profile == "mko-laptop" @@%}
-script=~/bin/mpris.so
+{%@@ elif profile == "Rivendell" @@%}
+ao=alsa
 {%@@ endif @@%}
 
 #############
@@ -106,11 +104,8 @@ ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]"
 [best]
 ytdl-format="bestvideo+bestaudio"
 
-
-{%@@ if profile == "Mirkwood" @@%}
 # Vulkan hwdec profile
 [vulkan]
 gpu-api=vulkan
 gpu-context=waylandvk
 hwdec=vaapi-copy
-{%@@ endif @@%}
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index 7c6baad8..eed6bc92 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg }
 xgpgtar() { gpg -d $1 | tar x --zstd }
 
 # colorise output
-alias cvs='grc cvs'
-alias df='grc df'
-alias digg='grc digg'
-alias gcc='grc gcc'
-alias g++='grc g++'
-alias ifconfig='grc ifconfig'
-alias make='grc make'
-alias mount='grc mount'
-alias mtr='grc mtr'
-alias netstat='grc mount'
-alias ping='grc ping'
-alias ps='grc ps'
-alias tail='grc tail'
-alias traceroute='grc traceroute'
-alias wdiff='grc wdiff'
-alias blkid='grc blkid'
-alias du='grc du'
-alias dnf='grc dnf'
-alias docker='grc docker'
-alias docker-machine='grc docker-machine'
-alias env='grc env'
-alias id='grc id'
-alias ip='grc ip'
-alias iostat='grc iostat'
-alias last='grc last'
-alias lsattr='grc lsattr'
-alias lsblk='grc lsblk'
-alias lspci='grc lspci'
-alias lsmod='grc lsmod'
-alias lsof='grc lsof'
-alias getfacl='grc getfacl'
-alias getsebool='grc getsebool'
-alias ulimit='grc ulimit'
-alias uptime='grc uptime'
-alias nmap='grc nmap'
-alias fdisk='grc fdisk'
-alias findmnt='grc findmnt'
-alias free='grc free'
-alias semanage='grc semanage'
-alias sar='grc sar'
-alias ss='grc ss'
-alias sysctl='grc sysctl'
-alias systemctl='grc systemctl'
-alias stat='grc stat'
-alias showmount='grc showmount'
-alias tune2fs='grc tune2fs'
-alias tcpdum='grc tcpdum'
+cvs() { grc cvs $@ }
+df() { grc df $@ }
+digg() { grc digg $@ }
+gcc() { grc gcc $@ }
+g++() { grc g++ $@ }
+ifconfig() { grc ifconfig $@ }
+make() { grc make $@ }
+mount() { grc mount $@ }
+mtr() { grc mtr $@ }
+netstat() { grc mount $@ }
+ping() { grc ping $@ }
+ps() { grc ps $@ }
+tail() { grc tail $@ }
+traceroute() { grc traceroute $@ }
+wdiff() { grc wdiff $@ }
+blkid() { grc blkid $@ }
+du() { grc du $@ }
+dnf() { grc dnf $@ }
+docker() { grc docker $@ }
+docker-machine() { grc docker-machine $@ }
+env() { grc env $@ }
+id() { grc id $@ }
+ip() { grc ip $@ }
+iostat() { grc iostat $@ }
+last() { grc last $@ }
+lsattr() { grc lsattr $@ }
+lsblk() { grc lsblk $@ }
+lspci() { grc lspci $@ }
+lsmod() { grc lsmod $@ }
+lsof() { grc lsof $@ }
+getfacl() { grc getfacl $@ }
+getsebool() { grc getsebool $@ }
+ulimit() { grc ulimit $@ }
+uptime() { grc uptime $@ }
+nmap() { grc nmap $@ }
+fdisk() { grc fdisk $@ }
+findmnt() { grc findmnt $@ }
+free() { grc free $@ }
+semanage() { grc semanage $@ }
+sar() { grc sar $@ }
+ss() { grc ss $@ }
+sysctl() { grc sysctl $@ }
+systemctl() { grc systemctl $@ }
+stat() { grc stat $@ }
+showmount() { grc showmount $@ }
+tune2fs() { grc tune2fs $@ }
+tcpdum() { grc tcpdum $@ }
 
 btw, () {
 	echo "                 I use"
diff --git a/home/.gitconfig b/home/.gitconfig
index 16d6ce2d..9734926e 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -1,9 +1,5 @@
 [user]
-	{%@@ if profile == "mko-laptop" @@%}
-	email = marko.korhonen@rossum.fi
-	{%@@ else @@%}
 	email = marko@korhonen.cc
-	{%@@ endif @@%}
 	name = Marko Korhonen
 	signingkey = C514037F1EFF4FA6
 
@@ -32,4 +28,4 @@
 	cmd = nvim -d -c 'set nomodifiable'
 
 [pull]
-	rebase = merges
+	rebase = false
diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf
deleted file mode 100644
index a2009825..00000000
--- a/home/.gnupg/gpg-agent.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-enable-ssh-support
-pinentry-program /usr/bin/pinentry-gnome3
-default-cache-ttl 60
-max-cache-ttl 120
-extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
diff --git a/home/.gnupg/gpg.conf b/home/.gnupg/gpg.conf
index 0a9596e7..50a0191b 100644
--- a/home/.gnupg/gpg.conf
+++ b/home/.gnupg/gpg.conf
@@ -1,2 +1,17 @@
-use-agent
-keyserver hkps://keys.openpgp.org
+# File re-created by pEp
+# See backup in '/home/reekymarko/.gnupg/gpg.conf.1.pep.bkp'
+
+# File re-created by pEp
+# See backup in '/home/reekymarko/.gnupg/gpg.conf.0.pep.bkp'
+
+# GnuPG config file created by KGpg
+
+default-key  A90767494C36DEC2EBBCFB8E83850D9D26A2216C
+keyserver hkp://keys.gnupg.net
+cert-digest-algo SHA256
+no-emit-version 
+no-comments 
+personal-cipher-preferences AES AES256 AES192 CAST5
+personal-digest-preferences SHA256 SHA512 SHA384 SHA224
+ignore-time-conflict 
+allow-freeform-uid 
diff --git a/home/.ssh/config b/home/.ssh/config
index 637e7359..b39bd8de 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -1,5 +1,3 @@
-Include ~/.ssh/rossum_hosts
-
 host gitea
 	HostName korhonen.cc
 	user git
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 97733f89..01d8a2a7 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -2,7 +2,7 @@
 ILoveCandy
 Color
 CheckSpace
-ParallelDownloads = 5
+TotalDownload
 HoldPkg = pacman glibc
 SigLevel = Required DatabaseOptional
 Architecture = auto