diff --git a/etc/portage/env/rust-makeopts.conf b/etc/portage/env/rust-makeopts.conf
index 39256d5..db2d5ff 100644
--- a/etc/portage/env/rust-makeopts.conf
+++ b/etc/portage/env/rust-makeopts.conf
@@ -1 +1 @@
-MAKEOPTS="-j10"
+MAKEOPTS="-j8"
diff --git a/etc/portage/make.conf b/etc/portage/make.conf
index 31fad15..e748e33 100644
--- a/etc/portage/make.conf
+++ b/etc/portage/make.conf
@@ -5,22 +5,33 @@ CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
 FFLAGS="${COMMON_FLAGS}"
 RUSTFLAGS="${RUSTFLAGS} -C target-cpu=native"
+
+# Compile options
+MAKEOPTS="-j10 -l12"
+
+# WARNING: Changing your CHOST is not something that should be done lightly.
+# Please consult https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable before changing.
 CHOST="x86_64-pc-linux-musl"
+
+# NOTE: This stage was built with the bindist USE flag enabled
+
+# This sets the language of build output to English.
+# Please keep this setting intact when reporting bugs.
 LC_MESSAGES=en_US.utf8
 
-# Compiler options
-MAKEOPTS="-j12 -l14"
-
-# Portage logging
+# Logging
 PORTAGE_ELOG_CLASSES="log warn error"
 PORTAGE_LOGDIR="/var/log/portage"
 PORTAGE_LOGDIR_CLEAN="find \"\${PORTAGE_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
 
-# Licensing
+# Only accept free licenses
 ACCEPT_LICENSE="-* @FREE"
 
+# USE flags
+USE="${USE} -debug -telemetry -modemmanager -ext* -ppp -systemd -elogind -X -kde -gnome -gtk-doc -webengine hardened dist-kernel udev initramfs hostonly secureboot modules-sign apparmor acpi networkmanager dbus hwaccel bash-completion man pam pipewire pulseaudio vulkan wayland jpeg png svg eme-free"
+
 # Emerge flags
-EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build y --ask y"
+EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --with-bdeps y --quiet-build y"
 
 # Secureboot settings
 SECUREBOOT_SIGN_KEY="/var/lib/sbctl/keys/db/db.key"
diff --git a/etc/portage/package.accept_keywords/05boot b/etc/portage/package.accept_keywords/05boot
deleted file mode 100644
index aeab99f..0000000
--- a/etc/portage/package.accept_keywords/05boot
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/portage/package.accept_keywords/05boot
-# Keywords for boot system
-
-# zlevis
-dev-libs/jose ~amd64
diff --git a/etc/portage/package.accept_keywords/15video b/etc/portage/package.accept_keywords/15video
deleted file mode 100644
index ee8abd3..0000000
--- a/etc/portage/package.accept_keywords/15video
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/portage/package.accept_keywords/15video
-# Keywords for video packages
-
-# river
-gui-wm/river ~amd64
-dev-lang/zig ~amd64
-
-# kanshi
-gui-apps/kanshi ~amd64
-dev-libs/libscfg ~amd64
-
-# wlsunset
-gui-apps/wlsunset ~amd64
-
-# waylock
-gui-apps/waylock ~amd64
-
-# fuzzel
-gui-apps/fuzzel ~amd64
diff --git a/etc/portage/package.accept_keywords/99inv b/etc/portage/package.accept_keywords/99inv
deleted file mode 100644
index bf5beca..0000000
--- a/etc/portage/package.accept_keywords/99inv
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/portage/package.accept_keywords/99inv
-# Individual keywords
-
-# gimp
-media-gfx/gimp ~amd64
-media-libs/babl ~amd64
-media-libs/gegl ~amd64
diff --git a/etc/portage/package.env/firefox b/etc/portage/package.env/firefox
deleted file mode 100644
index e67bb4c..0000000
--- a/etc/portage/package.env/firefox
+++ /dev/null
@@ -1 +0,0 @@
-www-client/firefox rust-makeopts.conf
diff --git a/etc/portage/package.env/gentoo-kernel b/etc/portage/package.env/gentoo-kernel
deleted file mode 100644
index 7a79e3a..0000000
--- a/etc/portage/package.env/gentoo-kernel
+++ /dev/null
@@ -1 +0,0 @@
-sys-kernel/gentoo-kernel enable-ccache.conf
diff --git a/etc/portage/package.env/rust b/etc/portage/package.env/rust
deleted file mode 100644
index f3c66cc..0000000
--- a/etc/portage/package.env/rust
+++ /dev/null
@@ -1 +0,0 @@
-dev-lang/rust rust-makeopts.conf
diff --git a/etc/portage/package.license/kernel b/etc/portage/package.license/kernel
deleted file mode 100644
index b481ef9..0000000
--- a/etc/portage/package.license/kernel
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/portage/package.license/kernel
-# Accept firmware licenses
-
-sys-kernel/linux-firmware linux-fw-redistributable @BINARY-REDISTRIBUTABLE
diff --git a/etc/portage/package.mask/river b/etc/portage/package.mask/river
deleted file mode 100644
index 6e28449..0000000
--- a/etc/portage/package.mask/river
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/portage/package.mask/river
-# Mask river 0.4 to remain in river classic
-
->=gui-wm/river-0.4
diff --git a/etc/portage/package.mask/rust-bin b/etc/portage/package.mask/rust-bin
deleted file mode 100644
index 7781b9c..0000000
--- a/etc/portage/package.mask/rust-bin
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/portage/package.mask/rust-bin
-# Mask rust-bin because it does not work on musl
-
-dev-lang/rust-bin*
diff --git a/etc/portage/package.use/00glo b/etc/portage/package.use/00glo
deleted file mode 100644
index 9a88673..0000000
--- a/etc/portage/package.use/00glo
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/portage/package.use/00glo
-# Global USE flags
-
-# System requirements
-*/* hardened dist-kernel initramfs hostonly secureboot modules-sign udev acpi apparmor
-
-# User requirements
-*/* networkmanager dbus hwaccel bash-completion man pam pipewire system-pipewire vulkan wayland eme-free jpeg png svg
-
-# Remove bloat
-*/* -debug -telemetry -modemmanager -ext* -ppp -systemd -elogind -X -kde -gnome -gtk-doc -webengine
diff --git a/etc/portage/package.use/01cpu b/etc/portage/package.use/01cpu
deleted file mode 100644
index c2170fd..0000000
--- a/etc/portage/package.use/01cpu
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/portage/package.use/01cpu
-# System specific cpu flags
-*/* cpu_flags_x86: aes avx avx2 bmi1 bmi2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3
diff --git a/etc/portage/package.use/05boot b/etc/portage/package.use/05boot
deleted file mode 100644
index 635ee51..0000000
--- a/etc/portage/package.use/05boot
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/portage/package.use/05boot
-# USE flags for boot system
-
-# installkernel
-sys-kernel/installkernel dracut ukify uki
-sys-apps/systemd-utils kernel-install boot ukify
-
-# zlevis
-app-crypt/zlevis dracut
diff --git a/etc/portage/package.use/10base b/etc/portage/package.use/10base
deleted file mode 100644
index 4aeb865..0000000
--- a/etc/portage/package.use/10base
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/portage/package.use/10base
-# USE flags for base packages
-
-# doas
-app-admin/doas persist
-
-# networkmanager
-net-misc/networkmanager -wext
-
-# htop
-sys-process/htop lm-sensors
-
-# cups
-net-print/cups pdf
-app-text/ghostscript-gpl cups
-net-print/libcupsfilters pdf
diff --git a/etc/portage/package.use/15video b/etc/portage/package.use/15video
deleted file mode 100644
index ae6e6bc..0000000
--- a/etc/portage/package.use/15video
+++ /dev/null
@@ -1,33 +0,0 @@
-# /etc/portage/package.use/15video
-# USE flags for video packages
-
-# seatd
-sys-auth/seatd server -builtin
-
-# videocards
-*/* VIDEO_CARDS: -* amdgpu radeonsi
-
-# pipewire
-media-video/pipewire sound-server loudness echo-cancel bluetooth
-media-sound/pulseaudio -daemon
-
-# mpv
-media-video/mpv -pulseaudio
-
-# xwayland
-gui-libs/wlroots X
-gui-wm/river X
-x11-libs/libxkbcommon X
-media-libs/libepoxy X
-media-libs/libglvnd X
-media-libs/mesa X
-
-# libdrm
-x11-libs/libdrm x11-libs/libdrm video_cards_radeon
-
-# xdg-utils
-app-text/xmlto text
-
-# swaybg
-gui-apps/swaybg gdk-pixbuf
-
diff --git a/etc/portage/package.use/99inv b/etc/portage/package.use/99inv
deleted file mode 100644
index 6af9260..0000000
--- a/etc/portage/package.use/99inv
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/portage/package.use/99inv
-# USE flags for individual packages
-
-# python
-*/* PYTHON_TARGETS: -* python3_13
-*/* PYTHON_SINGLE_TARGET: -* python3_13
-
-# gimp
-app-text/poppler cairo
-media-libs/babl introspection lcms
-media-libs/gegl cairo introspection lcms
-
-# firefox
-www-client/firefox pulseaudio
-media-libs/libvpx postproc
-
-# thunderbird
-media-libs/freetype harfbuzz
-
-# distrobox
-net-firewall/iptables nftables
-
-# texlive
-app-text/texlive extra science
-media-libs/harfbuzz icu
diff --git a/etc/portage/repos.conf/eselect-repo.conf b/etc/portage/repos.conf/eselect-repo.conf
deleted file mode 100644
index d2f11a5..0000000
--- a/etc/portage/repos.conf/eselect-repo.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# created by eselect-repo
-
-[gentoo]
-location = /var/db/repos/gentoo
-sync-type = git
-sync-uri = https://github.com/gentoo-mirror/gentoo.git
-
-[guru]
-location = /var/db/repos/guru
-sync-type = git
-sync-uri = https://github.com/gentoo-mirror/guru.git
-
-[portage-ample]
-location = /var/db/repos/portage-ample
-sync-type = git
-sync-uri = https://git.ampel.dev/ampel/portage-ample
-
-[local]
-location = /var/db/repos/local
diff --git a/etc/portage/sets/base b/etc/portage/sets/base
deleted file mode 100644
index 303ab2b..0000000
--- a/etc/portage/sets/base
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/portage/sets/base
-# Set containing system base packages
-
-# services
-sys-block/zram-init
-net-misc/networkmanager
-net-wireless/bluez
-net-vpn/tailscale
-net-print/cups-meta
-
-# apparmor
-sys-apps/apparmor
-sys-apps/apparmor-utils
-sec-policy/apparmor-profiles
-
-# tools/shell
-app-admin/doas
-app-admin/eselect
-app-eselect/eselect-repository
-app-portage/cpuid2cpuflags
-app-portage/gentoolkit
-dev-util/ccache
-app-editors/neovim
-sys-process/htop
diff --git a/etc/portage/sets/inv b/etc/portage/sets/inv
deleted file mode 100644
index ea35f21..0000000
--- a/etc/portage/sets/inv
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/portage/sets/inv
-# Set containing individual packages
-
-www-client/firefox:esr
-mail-client/thunderbird:0/esr
-media-gfx/gimp
-net-fs/cifs-utils
-app-containers/distrobox
-app-text/texlive
diff --git a/etc/portage/sets/sys b/etc/portage/sets/sys
deleted file mode 100644
index ce6e8f2..0000000
--- a/etc/portage/sets/sys
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/portage/sets/sys
-# Set containing necessary system packages
-
-# kernel
-sys-kernel/linux-firmware
-sys-kernel/gentoo-kernel
-sys-fs/zfs
-sys-fs/zfs-kmod
-sys-power/acpid
-
-# boot
-app-crypt/sbsigntools
-app-crypt/sbctl
-app-crypt/tpm2-tools
-app-crypt/zlevis
-app-crypt/jitterentropy
-sys-apps/systemd-utils
-
-# musl
-sys-libs/timezone-data
-sys-libs/error-standalone
diff --git a/etc/portage/sets/video b/etc/portage/sets/video
deleted file mode 100644
index 578ffe8..0000000
--- a/etc/portage/sets/video
+++ /dev/null
@@ -1,28 +0,0 @@
-# /etc/portage/sets/video
-# Set containing video packages
-
-# user-services
-sys-auth/turnstile
-
-# window-management
-gui-wm/river
-
-# interface
-media-video/pipewire
-media-video/wireplumber
-
-# utilities
-gui-apps/foot
-gui-apps/fuzzel
-gui-apps/kanshi
-gui-apps/wlsunset
-gui-apps/grim
-gui-apps/slurp
-gui-apps/wl-clipboard
-gui-apps/swaybg
-gui-apps/waylock
-gui-apps/mako
-x11-libs/libnotify
-x11-misc/xdg-user-dirs
-gui-libs/xdg-desktop-portal-wlr
-media-video/mpv