diff --git a/portage/package.env b/portage/package.env
index af3e71b..47e7947 100644
--- a/portage/package.env
+++ b/portage/package.env
@@ -3,35 +3,23 @@
 # Copyright 2022-2023 Inference
 # SPDX-License-Identifier: BSD-3-Clause-Clear
 
-# Version: 2.3.0.35
+# Version: 3.0.0.36
 
 
-# Malloc, No LTO
-app-crypt/efitools						malloc-nolto.conf
-app-shells/zsh							malloc-nolto.conf
-
 # No LTO
+app-crypt/efitools						nolto.conf
+app-shells/zsh							nolto.conf
 dev-lang/rust							nolto.conf notmpfs.conf
 dev-util/cbindgen						nolto.conf
 sys-libs/libcap							nolto.conf
 sys-process/bottom						nolto.conf
 x11-terms/alacritty						nolto.conf
 
-# Malloc, No PIE
-app-admin/doas							malloc-nopie.conf
-app-admin/keepassxc						malloc-nopie.conf
-app-misc/mc								malloc-nopie.conf
-app-shells/bash							malloc-nopie.conf
-media-gfx/chafa							malloc-nopie.conf
-media-gfx/gimp							malloc-nopie.conf
-media-gfx/graphicsmagick				malloc-nopie.conf
-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/doas							nopie.conf
+app-admin/keepassxc						nopie.conf
 app-admin/perl-cleaner					nopie.conf
 app-admin/setools						nopie.conf
 app-admin/sysklogd						nopie.conf
@@ -60,9 +48,11 @@ app-eselect/eselect-vi					nopie.conf
 app-i18n/uchardet						nopie.conf
 app-misc/ca-certificates				nopie.conf
 app-misc/jq								nopie.conf
+app-misc/mc								nopie.conf
 app-misc/tmux							nopie.conf
 app-portage/eix							nopie.conf
 app-portage/gemato						nopie.conf
+app-shells/bash							nopie.conf
 app-text/asciidoc						nopie.conf
 app-text/enchant						nopie.conf
 app-text/hunspell						nopie.conf
@@ -158,8 +148,12 @@ gnome-base/gsettings-desktop-schemas	nopie.conf
 gnome-base/librsvg						nopie.conf
 gui-libs/wlroots						nopie.conf
 media-fonts/font-util					nopie.conf
+media-gfx/chafa							nopie.conf
 media-gfx/exiv2							nopie.conf
+media-gfx/gimp							nopie.conf
+media-gfx/graphicsmagick				nopie.conf
 media-gfx/graphite2						nopie.conf
+media-gfx/imagemagick					nopie.conf
 media-gfx/mypaint-brushes				nopie.conf
 media-gfx/qrencode						nopie.conf
 media-libs/alsa-lib						nopie.conf
@@ -304,31 +298,13 @@ www-client/w3m							nopie.conf
 x11-base/xcb-proto						nopie.conf
 x11-libs/*								nopie.conf
 
-# Malloc, Basic
-app-admin/setools						malloc-basic.conf
-app-text/tree							malloc-basic.conf
-gui-apps/waybar							malloc-basic.conf
-media-sound/cmus						malloc-basic.conf
-net-analyzer/openbsd-netcat				malloc-basic.conf
-net-voip/mumble							malloc-basic.conf
-sys-apps/attr							malloc-basic.conf
-sys-apps/dbus							malloc-basic.conf
-sys-apps/iproute2						malloc-basic.conf
-sys-apps/shadow							malloc-basic.conf
-sys-block/parted						malloc-basic.conf
-sys-boot/grub							malloc-basic.conf
-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-process/audit						malloc-basic.conf
-sys-process/procps						malloc-basic.conf
-
-# No LTO, no PIE
+# No LTO, No PIE
 gnome-base/librsvg						nolto-nopie.conf
 
 # Basic
+app-admin/setools						basic.conf
 app-portage/portage-utils				basic.conf
+app-text/tree							basic.conf
 dev-lang/perl							basic.conf
 dev-lang/python							basic.conf
 dev-libs/appstream-glib					basic.conf
@@ -341,15 +317,31 @@ dev-lua/mpack							basic.conf
 dev-perl/*								basic.conf
 dev-python/*							basic.conf
 dev-util/pkgconf						basic.conf
+gui-apps/waybar							basic.conf
+media-sound/cmus						basic.conf
+net-analyzer/openbsd-netcat				basic.conf
 net-libs/nodejs							basic.conf
+net-voip/mumble							basic.conf
 perl-core/*								basic.conf
+sys-apps/attr							basic.conf
+sys-apps/dbus							basic.conf
+sys-apps/iproute2						basic.conf
 sys-apps/portage						basic.conf
+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/fuse								basic.conf
+sys-fs/lvm2								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
+sys-process/audit						basic.conf
+sys-process/procps						basic.conf
 
 # Chromium
 www-client/traveller					chromium.conf notmpfs.conf