diff --git a/crystal/airootfs/etc/packages.x86_64 b/crystal/airootfs/etc/packages.x86_64
index a0ce5cf..5e97695 100644
--- a/crystal/airootfs/etc/packages.x86_64
+++ b/crystal/airootfs/etc/packages.x86_64
@@ -1,3 +1,6 @@
+# Arch packages
+base
+grub
 arch-install-scripts
 reflector
 pacman-contrib
@@ -29,19 +32,14 @@ mesa
 firefox
 
 # Things we're hosting
-arch-install-scripts
-base
-filesystem
 neofetch
-pfetch
-grub
 
 # Our in-house
-jade-gui
+crystal-core
+crystal-branding
 jade
+jade-gui
 onyx
-ame
-
 crystal-wallpapers
 
 # Text editors (issue #2)
diff --git a/crystal/bootstrap_packages.x86_64 b/crystal/bootstrap_packages.x86_64
index 41f749d..f42b408 100644
--- a/crystal/bootstrap_packages.x86_64
+++ b/crystal/bootstrap_packages.x86_64
@@ -1,4 +1,7 @@
 # Arch packages
+base
+lsb-release
+sudo
 cowsay
 curl
 openbsd-netcat
@@ -9,12 +12,11 @@ tree
 zsh
 
 # Things we're hosting
-base
-filesystem
-lsb-release
 neofetch
-pfetch
-sudo
+
+# Our packages
+crystal-core
+crystal-branding
 
 # Text editors
 micro
diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64
index 7136703..8adbf54 100644
--- a/crystal/packages.x86_64
+++ b/crystal/packages.x86_64
@@ -1,10 +1,13 @@
 # Arch packages
+base
+grub
+lsb-release
+sudo
 arch-install-scripts
 archlinux-keyring
 btrfs-progs
 cowsay
 curl
-curl
 dosfstools
 edk2-shell
 gtkmm3
@@ -49,17 +52,12 @@ pipewire
 pipewire-pulse
 
 # Things we're hosting
-base
-filesystem
-grub
-lsb-release
 neofetch
-sudo
 
 # Our packages
+crystal-core
+crystal-branding
 crystal-wallpapers
-crystal-mirrorlist
-crystal-keyring
 jade
 jade-gui