diff --git a/config/aarch64/acid.toml b/config/aarch64/acid.toml
index 5a51fa2..5f83a00 100644
--- a/config/aarch64/acid.toml
+++ b/config/aarch64/acid.toml
@@ -12,15 +12,12 @@ prompt = false
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 acid = {}
 coreutils = {}
 # TODO: Does this need escalated?
 escalated = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 
 # User settings
diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml
index e820cca..874e13a 100644
--- a/config/aarch64/demo.toml
+++ b/config/aarch64/demo.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,11 +22,9 @@ diffutils = {}
 #escalated = {} # porting
 extrautils = {}
 findutils = {}
-initfs = {}
 #installer = {} # failure to build ring
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 #netsurf = {} # lots of porting issues
 orbdata = {}
diff --git a/config/aarch64/desktop-minimal.toml b/config/aarch64/desktop-minimal.toml
index 9128eed..4aaad1f 100644
--- a/config/aarch64/desktop-minimal.toml
+++ b/config/aarch64/desktop-minimal.toml
@@ -11,15 +11,12 @@ prompt = false
 
 # Package settings
 [packages]
-bootstrap = {}
 coreutils = {}
 drivers = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml
index c446bee..287a95b 100644
--- a/config/aarch64/desktop.toml
+++ b/config/aarch64/desktop.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,11 +22,9 @@ diffutils = {}
 #escalated = {} # porting
 extrautils = {}
 findutils = {}
-initfs = {}
 #installer = {} # failure to build ring
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 #netsurf = {} # lots of porting issues
 orbdata = {}
diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml
index f2c96c1..d0355de 100644
--- a/config/aarch64/dev.toml
+++ b/config/aarch64/dev.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/aarch64/jeremy.toml b/config/aarch64/jeremy.toml
index e595d45..2323013 100644
--- a/config/aarch64/jeremy.toml
+++ b/config/aarch64/jeremy.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,11 +22,9 @@ diffutils = {}
 #escalated = {} # porting
 extrautils = {}
 findutils = {}
-initfs = {}
 #installer = {} # failure to build ring
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 #netsurf = {} # lots of porting issues
 orbdata = {}
diff --git a/config/aarch64/raspi3bp/server-minimal.toml b/config/aarch64/raspi3bp/server-minimal.toml
index 5e88699..e67b491 100644
--- a/config/aarch64/raspi3bp/server-minimal.toml
+++ b/config/aarch64/raspi3bp/server-minimal.toml
@@ -13,14 +13,11 @@ efi_partition_size = 128
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 smith = {}
 userutils = {}
diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml
index 42e3b72..fa54e55 100644
--- a/config/aarch64/resist.toml
+++ b/config/aarch64/resist.toml
@@ -13,7 +13,6 @@ prompt = false
 [packages]
 bash = {}
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 diffutils = {}
 drivers = {}
@@ -23,9 +22,7 @@ findutils = {}
 gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
-initfs = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 ptyd = {}
 resist = {}
diff --git a/config/aarch64/server-minimal.toml b/config/aarch64/server-minimal.toml
index 0a91f02..2ed56fc 100644
--- a/config/aarch64/server-minimal.toml
+++ b/config/aarch64/server-minimal.toml
@@ -12,14 +12,11 @@ prompt = false
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 smith = {}
 userutils = {}
diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml
index 6011d2a..0306e65 100644
--- a/config/aarch64/server.toml
+++ b/config/aarch64/server.toml
@@ -13,7 +13,6 @@ prompt = false
 [packages]
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -24,12 +23,10 @@ diffutils = {}
 # escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 # FIXME: failed to build
 # installer = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 # FIXME: failed to build
 # pkgutils = {}
diff --git a/config/base.toml b/config/base.toml
index fe5ff5f..896b7b7 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -8,6 +8,11 @@
 # Do not prompt if settings are not defined
 prompt = false
 
+[packages]
+bootstrap = {}
+initfs = {}
+kernel = {}
+
 ## Configuration files
 [[files]]
 path = "/etc/hostname"
diff --git a/config/i686/acid.toml b/config/i686/acid.toml
index 5a51fa2..5f83a00 100644
--- a/config/i686/acid.toml
+++ b/config/i686/acid.toml
@@ -12,15 +12,12 @@ prompt = false
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 acid = {}
 coreutils = {}
 # TODO: Does this need escalated?
 escalated = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 
 # User settings
diff --git a/config/i686/demo.toml b/config/i686/demo.toml
index e5a5452..1d24599 100644
--- a/config/i686/demo.toml
+++ b/config/i686/demo.toml
@@ -36,7 +36,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -45,12 +44,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml
index 9128eed..4aaad1f 100644
--- a/config/i686/desktop-minimal.toml
+++ b/config/i686/desktop-minimal.toml
@@ -11,15 +11,12 @@ prompt = false
 
 # Package settings
 [packages]
-bootstrap = {}
 coreutils = {}
 drivers = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml
index 24fc97c..aed5b2e 100644
--- a/config/i686/desktop.toml
+++ b/config/i686/desktop.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/i686/dev.toml b/config/i686/dev.toml
index f2c96c1..d0355de 100644
--- a/config/i686/dev.toml
+++ b/config/i686/dev.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml
index 3c352da..cd573b0 100644
--- a/config/i686/jeremy.toml
+++ b/config/i686/jeremy.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/i686/resist.toml b/config/i686/resist.toml
index 42e3b72..fa54e55 100644
--- a/config/i686/resist.toml
+++ b/config/i686/resist.toml
@@ -13,7 +13,6 @@ prompt = false
 [packages]
 bash = {}
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 diffutils = {}
 drivers = {}
@@ -23,9 +22,7 @@ findutils = {}
 gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
-initfs = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 ptyd = {}
 resist = {}
diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml
index 0a91f02..2ed56fc 100644
--- a/config/i686/server-minimal.toml
+++ b/config/i686/server-minimal.toml
@@ -12,14 +12,11 @@ prompt = false
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 smith = {}
 userutils = {}
diff --git a/config/i686/server.toml b/config/i686/server.toml
index bd152a3..071f81e 100644
--- a/config/i686/server.toml
+++ b/config/i686/server.toml
@@ -13,7 +13,6 @@ prompt = false
 [packages]
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -22,11 +21,9 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 pkgutils = {}
 ptyd = {}
diff --git a/config/x86_64/acid.toml b/config/x86_64/acid.toml
index 5a51fa2..5f83a00 100644
--- a/config/x86_64/acid.toml
+++ b/config/x86_64/acid.toml
@@ -12,15 +12,12 @@ prompt = false
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 acid = {}
 coreutils = {}
 # TODO: Does this need escalated?
 escalated = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 
 # User settings
diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml
index ac55ac8..31a96b7 100644
--- a/config/x86_64/demo.toml
+++ b/config/x86_64/demo.toml
@@ -36,7 +36,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -47,13 +46,11 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 intel-one-mono = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml
index 115cfa0..277ba8a 100644
--- a/config/x86_64/desktop-contain.toml
+++ b/config/x86_64/desktop-contain.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/x86_64/desktop-minimal.toml b/config/x86_64/desktop-minimal.toml
index 9128eed..4aaad1f 100644
--- a/config/x86_64/desktop-minimal.toml
+++ b/config/x86_64/desktop-minimal.toml
@@ -11,15 +11,12 @@ prompt = false
 
 # Package settings
 [packages]
-bootstrap = {}
 coreutils = {}
 drivers = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml
index 24fc97c..aed5b2e 100644
--- a/config/x86_64/desktop.toml
+++ b/config/x86_64/desktop.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml
index f2c96c1..d0355de 100644
--- a/config/x86_64/dev.toml
+++ b/config/x86_64/dev.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml
index ed157f1..5a82647 100644
--- a/config/x86_64/jeremy.toml
+++ b/config/x86_64/jeremy.toml
@@ -14,7 +14,6 @@ prompt = false
 audiod = {}
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -23,12 +22,10 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 installer-gui = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 netsurf = {}
 orbdata = {}
diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml
index 42e3b72..fa54e55 100644
--- a/config/x86_64/resist.toml
+++ b/config/x86_64/resist.toml
@@ -13,7 +13,6 @@ prompt = false
 [packages]
 bash = {}
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 diffutils = {}
 drivers = {}
@@ -23,9 +22,7 @@ findutils = {}
 gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
-initfs = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 ptyd = {}
 resist = {}
diff --git a/config/x86_64/server-minimal.toml b/config/x86_64/server-minimal.toml
index 0a91f02..2ed56fc 100644
--- a/config/x86_64/server-minimal.toml
+++ b/config/x86_64/server-minimal.toml
@@ -12,14 +12,11 @@ prompt = false
 # Package settings
 [packages]
 bootloader = {}
-bootstrap = {}
 coreutils = {}
 escalated = {}
 extrautils = {}
-initfs = {}
 ion = {}
 ipcd = {}
-kernel = {}
 ptyd = {}
 smith = {}
 userutils = {}
diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml
index bd152a3..071f81e 100644
--- a/config/x86_64/server.toml
+++ b/config/x86_64/server.toml
@@ -13,7 +13,6 @@ prompt = false
 [packages]
 bash = {}
 bootloader = {}
-bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
@@ -22,11 +21,9 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-initfs = {}
 installer = {}
 ion = {}
 ipcd = {}
-kernel = {}
 netdb = {}
 pkgutils = {}
 ptyd = {}