diff --git a/portage/package.accept_keywords b/portage/package.accept_keywords
index 24040b3..2928563 100644
--- a/portage/package.accept_keywords
+++ b/portage/package.accept_keywords
@@ -29,6 +29,6 @@ sys-libs/libexecinfo			~amd64
 sys-libs/libomp				~amd64
 sys-libs/libucontext			~amd64
 sys-libs/musl-legacy-compat		~amd64
+virtual/rust				~amd64
 www-client/chromium			~amd64
 www-client/firefox			~amd64
-virtual/rust				~amd64
diff --git a/portage/package.env b/portage/package.env
index 30a944e..9895b81 100644
--- a/portage/package.env
+++ b/portage/package.env
@@ -127,10 +127,11 @@ dev-libs/unibilium			nopie.conf
 dev-libs/wayland			nopie.conf
 dev-lua/lpeg				nopie.conf
 dev-lua/mpack				nopie.conf
-dev-python/dbus-python			nopie.conf
+dev-perl/Locale-gettext			nopie.conf
 dev-python/PySocks			nopie.conf
 dev-python/charset_normalizer		nopie.conf
 dev-python/cython			nopie.conf
+dev-python/dbus-python			nopie.conf
 dev-python/idna				nopie.conf
 dev-python/markupsafe			nopie.conf
 dev-python/pygments			nopie.conf
@@ -183,9 +184,6 @@ media-libs/libogg			nopie.conf
 media-libs/libpng			nopie.conf
 media-libs/libsamplerate		nopie.conf
 media-libs/libsdl2			nopie.conf
-media-libs/sdl2-gfx			nopie.conf
-media-libs/sdl2-mixer			nopie.conf
-media-libs/sdl2-ttf			nopie.conf
 media-libs/libsndfile			nopie.conf
 media-libs/libvorbis			nopie.conf
 media-libs/libvpx			nopie.conf
@@ -194,7 +192,10 @@ media-libs/mesa				nopie.conf
 media-libs/openh264			nopie.conf
 media-libs/openjpeg			nopie.conf
 media-libs/opus				nopie.conf
+media-libs/sdl2-gfx			nopie.conf
 media-libs/sdl2-image			nopie.conf
+media-libs/sdl2-mixer			nopie.conf
+media-libs/sdl2-ttf			nopie.conf
 media-libs/speex			nopie.conf
 media-libs/speexdsp			nopie.conf
 media-libs/tiff				nopie.conf
@@ -292,7 +293,6 @@ www-client/w3m				nopie.conf
 x11-base/xcb-proto			nopie.conf
 x11-libs/*				nopie.conf
 x11-libs/xtrans				nopie.conf
-dev-perl/Locale-gettext			nopie.conf
 
 # No LTO, no PIE
 
@@ -330,17 +330,17 @@ sys-devel/gcc				gcc-nopie.conf
 
 # GCC - Basic
 dev-lang/python				gcc-basic.conf
+dev-lua/*				gcc-basic.conf
 dev-perl/*				gcc-basic.conf
 dev-python/*				gcc-basic.conf
 media-libs/mlt                          gcc-basic.conf
 net-libs/nodejs				gcc-basic.conf
+perl-core/*				gcc-basic.conf
 sys-apps/dbus                           gcc-basic.conf
 sys-apps/shadow                         gcc-basic.conf
 sys-auth/elogind                        gcc-basic.conf
+sys-boot/grub				gcc-basic.conf
+sys-fs/cryptmount			gcc-basic.conf
 sys-libs/libcap                         gcc-basic.conf
 sys-libs/libselinux			gcc-basic.conf
 sys-process/procps                      gcc-basic.conf
-perl-core/*				gcc-basic.conf
-dev-lua/*				gcc-basic.conf
-sys-boot/grub				gcc-basic.conf
-sys-fs/cryptmount			gcc-basic.conf
diff --git a/portage/package.use b/portage/package.use
index 4f53f6d..4861226 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -8,13 +8,14 @@ app-crypt/gcr					gtk
 app-text/poppler				cairo
 app-text/xmlto					text
 dev-cpp/gtkmm					X
+dev-lang/rust					-verify-sig
 dev-libs/libedit				static-libs
 dev-libs/libpcre				-readline
 dev-libs/libpcre2				-readline
 dev-qt/qtcore					icu
-dev-qt/qtgui					eglfs jpeg
-dev-qt/qtgui					egl
 dev-qt/qtgui					X
+dev-qt/qtgui					egl
+dev-qt/qtgui					eglfs jpeg
 gui-apps/grim					jpeg
 gui-apps/waybar					mpd network -popups -sndio -tray
 gui-libs/wlroots				X
@@ -30,17 +31,20 @@ media-libs/imlib2				X
 media-libs/libepoxy				X
 media-libs/libglvnd				X
 media-libs/libpng				apng
+media-libs/libpulse				X
 media-libs/libraw				jpeg
 media-libs/libsdl2				gles2 opengl X
-media-libs/libsndfile				minimal
 media-libs/libsndfile				-minimal
+media-libs/libsndfile				minimal
 media-libs/libvpx				postproc
 media-libs/mesa					X
 media-libs/mlt					qt5 ffmpeg frei0r xml sdl
 media-libs/opencv				contrib contribdnn
+media-libs/sdl2-image				gif jpeg png tiff webp
 media-plugins/alsa-plugins			pulseaudio
 media-video/ffmpeg				X sdl
 media-video/mpv					cli -xv
+net-dns/dnsmasq					ipv6
 net-dns/dnsmasq					script
 net-im/profanity				gpg omemo otr
 net-libs/nodejs					-lto
@@ -50,6 +54,7 @@ sys-devel/clang					default-compiler-rt default-lld default-libcxx
 sys-devel/clang-runtime				libcxx
 sys-fs/cryptsetup				argon2 nls openssl udev reencrypt
 sys-kernel/gentoo-sources			symlink
+sys-kernel/linux-firmware			savedconfig
 sys-libs/libcxx					static-libs
 sys-libs/libcxxabi				static-libs
 sys-libs/llvm-libunwind				static-libs
@@ -63,8 +68,3 @@ x11-libs/gtk+					X
 x11-libs/libdrm					video_cards_radeon
 x11-libs/libxkbcommon				X
 x11-libs/pango					X
-sys-kernel/linux-firmware			savedconfig
-net-dns/dnsmasq					ipv6
-media-libs/sdl2-image				gif jpeg png tiff webp
-dev-lang/rust					-verify-sig
-media-libs/libpulse				X