diff --git a/portage/package.env b/portage/package.env
index 6532984..9b87591 100644
--- a/portage/package.env
+++ b/portage/package.env
@@ -3,21 +3,19 @@
 # Copyright 2022 Inference
 # License: BSD 3-Clause Clear
 
-# 0.2.0.2
+# 0.4.0.4
 
 
 # Malloc, No LTO
 app-crypt/efitools						malloc-nolto.conf
 app-shells/zsh							malloc-nolto.conf
-sys-libs/libcap							malloc-nolto.conf
 
 # No LTO
+sys-libs/libcap							nolto.conf
 sys-process/bottom						nolto.conf
 x11-terms/alacritty						nolto.conf
 
 # Malloc, No PIE
-app-accessibility/at-spi2-atk			malloc-nopie.conf
-app-accessibility/at-spi2-core			malloc-nopie.conf
 app-admin/doas							malloc-nopie.conf
 app-admin/keepassxc						malloc-nopie.conf
 app-misc/mc								malloc-nopie.conf
@@ -30,6 +28,8 @@ media-gfx/imagemagick					malloc-nopie.conf
 # Malloc, No LTO, No PIE
 
 # No PIE
+app-accessibility/at-spi2-atk			nopie.conf
+app-accessibility/at-spi2-core			nopie.conf
 app-admin/perl-cleaner					nopie.conf
 app-admin/setools						nopie.conf
 app-admin/sysklogd						nopie.conf
@@ -139,9 +139,6 @@ dev-libs/openssl						nopie.conf
 dev-libs/popt							nopie.conf
 dev-libs/protobuf						nopie.conf
 dev-libs/re2							nopie.conf
-dev-libs/serd							nopie.conf
-dev-libs/snowball-stemmer				nopie.conf
-dev-libs/sord							nopie.conf
 dev-libs/spdlog							nopie.conf
 dev-libs/tree-sitter					nopie.conf
 dev-libs/unibilium						nopie.conf
@@ -240,7 +237,6 @@ net-misc/curl							nopie.conf
 sci-libs/fftw							nopie.conf
 sys-apps/acl							nopie.conf
 sys-apps/file							nopie.conf
-sys-apps/flatpak						nopie.conf
 sys-apps/gawk							nopie.conf
 sys-apps/help2man						nopie.conf
 sys-apps/kmod							nopie.conf
@@ -304,15 +300,9 @@ x11-libs/*								nopie.conf
 # Malloc, Basic
 app-admin/setools						malloc-basic.conf
 app-text/tree							malloc-basic.conf
-dev-libs/appstream-glib					malloc-basic.conf
-dev-libs/gobject-introspection			malloc-basic.conf
-dev-libs/libevent						malloc-basic.conf
-dev-libs/libxml2						malloc-basic.conf
-dev-libs/libxslt						malloc-basic.conf
 gui-apps/waybar							malloc-basic.conf
 media-sound/cmus						malloc-basic.conf
 net-analyzer/openbsd-netcat				malloc-basic.conf
-net-libs/nodejs							malloc-basic.conf
 sys-apps/attr							malloc-basic.conf
 sys-apps/dbus							malloc-basic.conf
 sys-apps/iproute2						malloc-basic.conf
@@ -323,17 +313,19 @@ sys-devel/gettext						malloc-basic.conf
 sys-fs/cryptmount						malloc-basic.conf
 sys-fs/fuse								malloc-basic.conf
 sys-fs/lvm2								malloc-basic.conf
-sys-libs/libcap							malloc-basic.conf
-sys-libs/libselinux						malloc-basic.conf
-sys-libs/libsemanage					malloc-basic.conf
-sys-libs/slang							malloc-basic.conf
 sys-process/audit						malloc-basic.conf
 sys-process/procps						malloc-basic.conf
 
 # No LTO, no PIE
+gnome-base/librsvg						nolto-nopie.conf
 
 # Basic
 app-portage/portage-utils				basic.conf
+dev-libs/appstream-glib					basic.conf
+dev-libs/gobject-introsepction			basic.conf
+dev-libs/libevent						basic.conf
+dev-libs/libxml2						basic.conf
+dev-libs/libxslt						basic.conf
 dev-lang/perl							basic.conf
 dev-lang/python							basic.conf
 dev-lua/lpeg							basic.conf
@@ -342,21 +334,26 @@ dev-lua/mpack							basic.conf
 dev-perl/*								basic.conf
 dev-python/*							basic.conf
 dev-util/pkgconf						basic.conf
+net-libs/nodejs							basic.conf
 net-voip/mumble							basic.conf
 perl-core/*								basic.conf
 sys-apps/portage						basic.conf
 sys-libs/compiler-rt					basic.conf
+sys-libs/libcap							basic.conf
+sys-libs/libselinux						basic.conf
+sys-libs/libsemanage					basic.conf
 sys-libs/musl							basic.conf
+sys-libs/slang							basic.conf
 
 # Chromium
 www-client/traveller					chromium.conf
 
 # GCC - No PIE
 dev-libs/libedit						gcc-nopie.conf
-dev-libs/poco							gcc-nopie.conf
-media-libs/libsoundtouch				gcc-nopie.conf
-media-sound/audacity					gcc-nopie.conf
 sys-auth/elogind						gcc-nopie.conf
 sys-block/thin-provisioning-tools		gcc-nopie.conf
 sys-devel/gcc							gcc-nopie.conf
 sys-fs/jmtpfs							gcc-nopie.conf
+media-libs/libva nopie.conf
+gnome-base/gsettings-desktop-schemas nopie.conf
+media-libs/libsdl2 nopie.conf