diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index d9123d6..5e51428 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -7295,9 +7295,6 @@ package.use : sys-block/mbuffer:0 -debug ssl
 [sys-block/nbd:0]
 package.use : sys-block/nbd:0 -debug zlib
 
-[sys-block/thin-provisioning-tools:0]
-package.use : sys-block/thin-provisioning-tools:0 -test
-
 [sys-boot/lilo:0]
 package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
@@ -7392,7 +7389,7 @@ package.use : sys-fs/ext4magic:0 -debug -expert-mode -file-attr
 package.use : sys-fs/fuse:0 -examples static-libs
 
 [sys-fs/lvm2:0]
-package.use : sys-fs/lvm2:0 -clvm -cman -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd readline static-libs thin udev
+package.use : sys-fs/lvm2:0 -clvm -cman -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd -thin readline static-libs udev
 
 [sys-fs/mhddfs:0]
 package.use : sys-fs/mhddfs:0 suid
diff --git a/core/var/lib/portage/world.CYCLE.1 b/core/var/lib/portage/world.CYCLE.1
index 241aef3..f388d48 100644
--- a/core/var/lib/portage/world.CYCLE.1
+++ b/core/var/lib/portage/world.CYCLE.1
@@ -16,7 +16,7 @@ dev-util/strace
 dev-vcs/git
 gnome-extra/gnome-system-monitor
 mail-client/claws-mail
-mail-client/mailx
+mail-client/nail
 mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp
diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index bee17b5..99a66a4 100644
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@@ -17,7 +17,7 @@ dev-util/strace
 dev-vcs/git
 gnome-extra/gnome-system-monitor
 mail-client/claws-mail
-mail-client/mailx
+mail-client/nail
 mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp
diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index e0e5f46..50fb095 100644
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
@@ -1925,8 +1925,8 @@ mail-client/clawsker
 mail-client/cone
 mail-client/geary
 mail-client/mail-notification
-mail-client/mailx
 mail-client/mutt
+mail-client/nail
 mail-client/trojita
 mail-filter/anomy-sanitizer
 mail-filter/bmf