diff --git a/portage/package.env b/portage/package.env
index 5f7c2ed..1374ae6 100644
--- a/portage/package.env
+++ b/portage/package.env
@@ -43,7 +43,6 @@ app-misc/jq				nopie.conf
 app-misc/mc				nopie.conf
 app-misc/tmux				nopie.conf
 app-portage/eix				nopie.conf
-app-portage/eix				nopie.conf
 app-portage/gemato			nopie.conf
 app-portage/portage-utils		nopie.conf
 app-shells/bash				nopie.conf
@@ -128,7 +127,12 @@ dev-libs/spdlog				nopie.conf
 dev-libs/tree-sitter			nopie.conf
 dev-libs/unibilium			nopie.conf
 dev-libs/wayland			nopie.conf
+dev-perl/HTML-Parser			nopie.conf
 dev-perl/Locale-gettext			nopie.conf
+dev-perl/Net-SSLeay			nopie.conf
+dev-perl/Socket6			nopie.conf
+dev-perl/TermReadKey			nopie.conf
+dev-perl/XML-Parser			nopie.conf
 dev-python/PySocks			nopie.conf
 dev-python/charset_normalizer		nopie.conf
 dev-python/cython			nopie.conf
@@ -205,6 +209,7 @@ media-libs/tiff				nopie.conf
 media-libs/webrtc-audio-processing	nopie.conf
 media-plugins/alsa-plugins		nopie.conf
 media-plugins/frei0r-plugins		nopie.conf
+media-sound/alsa-utils			nopie.conf
 media-sound/cmus			nopie.conf
 media-sound/lame			nopie.conf
 media-sound/mpg123			nopie.conf
@@ -230,6 +235,7 @@ net-libs/libsignal-protocol-c		nopie.conf
 net-libs/libsoup			nopie.conf
 net-libs/nghttp2			nopie.conf
 net-misc/curl				nopie.conf
+perl-core/Compress-Raw-Zlib		nopie.conf
 sci-libs/fftw				nopie.conf
 sys-apps/acl				nopie.conf
 sys-apps/file				nopie.conf
@@ -261,7 +267,6 @@ sys-fs/cryptmount			nopie.conf
 sys-fs/cryptsetup			nopie.conf
 sys-fs/e2fsprogs			nopie.conf
 sys-fs/fuse				nopie.conf
-#sys-fs/jmtpfs				nopie.conf
 sys-fs/udev				nopie.conf
 sys-fs/udisks				nopie.conf
 sys-libs/argp-standalone		nopie.conf
@@ -295,24 +300,28 @@ www-client/w3m				nopie.conf
 x11-base/xcb-proto			nopie.conf
 x11-libs/*				nopie.conf
 x11-libs/xtrans				nopie.conf
-media-sound/alsa-utils			nopie.conf
-dev-perl/Socket6			nopie.conf
-dev-perl/TermReadKey			nopie.conf
-dev-perl/Net-SSLeay			nopie.conf
-perl-core/Compress-Raw-Zlib		nopie.conf
-dev-perl/HTML-Parser			nopie.conf
-dev-perl/XML-Parser			nopie.conf
 
 # No LTO, no PIE
 
 # Basic
+app-admin/setools			basic.conf
 dev-lang/perl				basic.conf
+dev-lang/python				basic.conf
 dev-libs/appstream-glib                 basic.conf
 dev-libs/gobject-introspection          basic.conf
+dev-libs/libevent			basic.conf
 dev-libs/libxml2			basic.conf
 dev-libs/libxslt                        basic.conf
+dev-lua/lpeg				basic.conf
+dev-lua/luv				basic.conf
+dev-lua/mpack				basic.conf
+dev-python/cffi				basic.conf
+dev-python/cython			basic.conf
+dev-python/pycryptodome			basic.conf
+dev-util/pkgconf			basic.conf
 gui-apps/waybar                         basic.conf
 media-libs/libcanberra                  basic.conf
+media-libs/mlt				basic.conf
 media-libs/opencv                       basic.conf
 media-sound/mumble                      basic.conf
 net-analyzer/openbsd-netcat		basic.conf
@@ -326,26 +335,15 @@ sys-apps/shadow				basic.conf
 sys-block/parted                        basic.conf
 sys-boot/grub				basic.conf
 sys-devel/gettext			basic.conf
+sys-fs/cryptmount			basic.conf
 sys-fs/lvm2				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
 sys-process/audit                       basic.conf
 sys-process/procps			basic.conf
-dev-libs/libevent			basic.conf
-dev-util/pkgconf			basic.conf
-sys-fs/cryptmount			basic.conf
-dev-lang/python				basic.conf
-dev-lua/lpeg				basic.conf
-dev-lua/luv				basic.conf
-dev-lua/mpack				basic.conf
-dev-python/cffi				basic.conf
-media-libs/mlt				basic.conf
-dev-python/cython			basic.conf
-dev-python/pycryptodome			basic.conf
-sys-libs/libselinux			basic.conf
-sys-libs/libsemanage			basic.conf
-app-admin/setools			basic.conf
 
 # Chromium
 www-client/chromium			chromium.conf