diff --git a/config/desktop.toml b/config/desktop.toml
index bbce92f..f8dd8e5 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -7,165 +7,38 @@ prompt = false
 
 # Package settings
 [packages]
-#acid = {}
 audiod = {}
-#autoconf = {}
-#automake = {}
-#bash = {}
-#binutils = {}
 ca-certificates = {}
-#cairo = {}
-#cairodemo = {}
-#cargo = {}
-#cleye = {}
-#cmatrix = {}
 contain = {}
 coreutils = {}
-#cpal = {}
-#curl = {}
 dash = {}
-#diffutils = {}
-#dosbox = {}
+diffutils = {}
 drivers = {}
-#drivers-041 = {}
-#duktape = {}
-#eduke32 = {}
-#exampled = {}
-#expat = {}
 extrautils = {}
-#fd = {}
-#ffmpeg = {}
 findutils = {}
-#freeciv = {}
-#freedoom = {}
-#freeglut = {}
-#freetype = {}
-#friar = {} # mio patch
-#game-2048 = {}
-#games = {}
-#gawk = {}
-#gcc = {}
 gdbserver = {}
-#gears = {}
-#generaluser-gs = {}
-#gettext = {}
-#gigalomania = {}
-#git = {}
-#glib = {}
-#glium = {}
-#glutin = {}
-#gnu-binutils = {}
-#gnu-grep = {}
-#gnu-make = {}
-#gstreamer = {}
-#harfbuzz = {}
-#hematite = {}
-#init = {}
+gnu-make = {}
 installer = {}
 ion = {}
 ipcd = {}
-#jansson = {}
-#keyboard-sfx = {}
-#lci = {}
-#libc-bench = {}
-#libffi = {}
-#libiconv = {}
-#libjpeg = {}
-#liborbital = {}
-#libpng = {}
-#libsodium = {}
-#llvm = {}
 logd = {}
-#lua = {}
-#mdp = {}
-#mesa = {}
-#mesa_glu = {}
-#miniserve = {}
-#nasm = {}
-#ncdu = {}
-#ncurses = {}
-#ncursesw = {}
 netdb = {}
 netstack = {}
 netsurf = {}
 netutils = {}
-#neverball = {}
-#newlib = {}
-#newlibtest = {}
-#nulld = {}
-#openjazz = {}
-#openssl = {}
-#openttd = {}
-#openttd-opengfx = {}
-#openttd-openmsx = {}
-#openttd-opensfx = {}
-#orbclient = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
-#osdemo = {}
-#pastel = {}
-#patch = {}
-#pciids = {}
-#pcre = {}
-#periodictable = {}
-#perl = {}
-#pixelcannon = {}
-#pixman = {}
 pkgutils = {}
-#powerline = {}
-#prboom = {}
 ptyd = {}
-#python = {}
-#qemu = {}
-#randd = {}
-#readline = {} # ncurses
 redoxfs = {}
-#redox-fatfs = {}
-#redox-ssh = {}
-#relibc = {}
-#relibc-tests = {}
-#ripgrep = {}
-#rodioplay = {}
-#rs-nes = {}
-#rust = {}
-#rust64 = {}
-#rust-cairo = {}
-#rust-cairo-demo = {}
-#rustual-boy = {}
-#schismtracker = {}
-#scummvm = {}
-#sdl = {}
-#sdl2 = {}
-#sdl2_gears = {}
-#sdl_gfx = {}
-#sdl_image = {}
-#sdl_mixer = {}
-#sdl_ttf = {}
-#sdl-player = {}
-#sed = {}
-#servo = {}
-#shellstorm = {}
+resist = {}
 smith = {}
-#sodium = {}
-#sopwith = {}
-#ssh = {}
 strace = {}
-#syobonaction = {}
-#terminfo = {}
-#termplay = {}
-#timidity = {}
-#ttf-hack = {}
 userutils = {}
 uutils = {}
-#vim = {}
-#vttest = {}
-#webrender = {}
-#winit = {}
-#xz = {}
-#zerod = {}
-#zlib = {}
+vim = {}
 
 # User settings
 [users.root]
diff --git a/config/jeremy.toml b/config/jeremy.toml
new file mode 100644
index 0000000..32a2acd
--- /dev/null
+++ b/config/jeremy.toml
@@ -0,0 +1,284 @@
+# This is Jeremy's configuration file
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+acid = {}
+atk = {}
+audiod = {}
+autoconf = {}
+automake = {}
+ca-certificates = {}
+cairo = {}
+cairodemo = {}
+cleye = {}
+cmatrix = {}
+contain = {}
+coreutils = {}
+cpal = {}
+curl = {}
+dash = {}
+diffutils = {}
+dosbox = {}
+drivers = {}
+eduke32 = {}
+expat = {}
+extrautils = {}
+ffmpeg = {}
+findutils = {}
+fontconfig = {}
+freedoom = {}
+freetype = {}
+fribidi = {}
+games = {}
+gcc = {}
+gdbserver = {}
+gears = {}
+generaluser-gs = {}
+gettext = {}
+gigalomania = {}
+git = {}
+glib = {}
+glium = {}
+glutin = {}
+gnu-binutils = {}
+gnu-grep = {}
+gnu-make = {}
+harfbuzz = {}
+installer = {}
+ion = {}
+ipcd = {}
+jansson = {}
+jeremy = {}
+keyboard-sfx = {}
+lci = {}
+libc-bench = {}
+libffi = {}
+libiconv = {}
+libjpeg = {}
+libogg = {}
+liborbital = {}
+libpng = {}
+libsodium = {}
+libvorbis = {}
+libxml2 = {}
+llvm = {}
+logd = {}
+mesa = {}
+mesa_glu = {}
+nasm = {}
+ncurses = {}
+netdb = {}
+netstack = {}
+netsurf = {}
+netutils = {}
+neverball = {}
+nghttp2 = {}
+openjazz = {}
+openssl = {}
+openttd = {}
+openttd-opengfx = {}
+openttd-openmsx = {}
+openttd-opensfx = {}
+orbclient = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+osdemo = {}
+pango = {}
+patch = {}
+pcre = {}
+periodictable = {}
+pixelcannon = {}
+pixman = {}
+pkg-config = {}
+pkgutils = {}
+prboom = {}
+ptyd = {}
+readline = {}
+redoxfs = {}
+resist = {}
+ripgrep = {}
+rodioplay = {}
+rs-nes = {}
+rust64 = {}
+rust-cairo = {}
+rust-cairo-demo = {}
+rustual-boy = {}
+schismtracker = {}
+scummvm = {}
+sdl = {}
+sdl2 = {}
+sdl2_gears = {}
+sdl2_image = {}
+sdl2_mixer = {}
+sdl2_ttf = {}
+sdl_gfx = {}
+sdl_image = {}
+sdl_mixer = {}
+sed = {}
+smith = {}
+sodium = {}
+sopwith = {}
+strace = {}
+syobonaction = {}
+terminfo = {}
+timidity = {}
+ttf-hack = {}
+userutils = {}
+uutils = {}
+vice = {}
+vim = {}
+vttest = {}
+vvvvvv = {}
+winit = {}
+xz = {}
+zlib = {}
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+ipcd
+logd
+ptyd
+pcid /etc/pcid.d/
+"""
+
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+[[files]]
+path = "/etc/init.d/20_orbital"
+data = """
+audiod
+orbital display:3/activate orblogin launcher
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty display:2
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
+[[files]]
+path = "/etc/net/mac"
+data = """
+54-52-00-ab-cd-ef
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"
+
+[[files]]
+path = "/etc/group"
+data = """
+root;0;root
+user;1000;user
+sudo;1;user
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+[[files]]
+path = "/usr/bin"
+data = "/bin"
+symlink = true
+
+[[files]]
+path = "/usr/games"
+data = "/games"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "/include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "/lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "/share"
+symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
+
+[[files]]
+path = "/dev/null"
+data = "null:"
+symlink = true
+
+[[files]]
+path = "/dev/random"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/urandom"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/zero"
+data = "zero:"
+symlink = true
diff --git a/config/server.toml b/config/server.toml
index 05b759d..bb1790d 100644
--- a/config/server.toml
+++ b/config/server.toml
@@ -7,158 +7,29 @@ prompt = false
 
 # Package settings
 [packages]
-#acid = {}
-#audiod = {}
-#autoconf = {}
-#automake = {}
-#bash = {}
-#binutils = {}
 ca-certificates = {}
-#cairo = {}
-#cairodemo = {}
-#cargo = {}
-#cleye = {}
-#cmatrix = {}
 contain = {}
 coreutils = {}
-#cpal = {}
-#curl = {}
 dash = {}
-#diffutils = {}
-#dosbox = {}
+diffutils = {}
 drivers = {}
-#drivers-041 = {}
-#duktape = {}
-#eduke32 = {}
-#exampled = {}
-#expat = {}
 extrautils = {}
-#fd = {}
-#ffmpeg = {}
 findutils = {}
-#freeciv = {}
-#freedoom = {}
-#freeglut = {}
-#freetype = {}
-#friar = {} # mio patch
-#game-2048 = {}
-#games = {}
-#gawk = {}
-#gcc = {}
-#gears = {}
-#generaluser-gs = {}
-#gettext = {}
-#gigalomania = {}
-#git = {}
-#glib = {}
-#glium = {}
-#glutin = {}
-#gnu-binutils = {}
-#gnu-grep = {}
-#gnu-make = {}
-#gstreamer = {}
-#harfbuzz = {}
-#hematite = {}
-#init = {}
+gnu-make = {}
 installer = {}
 ion = {}
 ipcd = {}
-#jansson = {}
-#keyboard-sfx = {}
-#lci = {}
-#libc-bench = {}
-#libffi = {}
-#libiconv = {}
-#libjpeg = {}
-#liborbital = {}
-#libpng = {}
-#libsodium = {}
-#llvm = {}
 logd = {}
-#lua = {}
-#mdp = {}
-#mesa = {}
-#mesa_glu = {}
-#miniserve = {}
-#nasm = {}
-#ncdu = {}
-#ncurses = {}
-#ncursesw = {}
 netdb = {}
 netstack = {}
-#netsurf = {}
 netutils = {}
-#newlib = {}
-#newlibtest = {}
-#nulld = {}
-#openjazz = {}
-#openssl = {}
-#openttd = {}
-#openttd-opengfx = {}
-#openttd-openmsx = {}
-#openttd-opensfx = {}
-#orbdata = {}
-#orbital = {}
-#orbterm = {}
-#orbutils = {}
-#osdemo = {}
-#pastel = {}
-#patch = {}
-#pciids = {}
-#pcre = {}
-#periodictable = {}
-#perl = {}
-#pixelcannon = {}
-#pixman = {}
 pkgutils = {}
-#powerline = {}
-#prboom = {}
 ptyd = {}
-#python = {}
-#qemu = {}
-#randd = {}
-#readline = {} # ncurses
 redoxfs = {}
-#redox-ssh = {}
-#relibc = {}
-#ripgrep = {}
-#rodioplay = {}
-#rs-nes = {}
-#rust = {}
-#rust64 = {}
-#rust-cairo = {}
-#rust-cairo-demo = {}
-#rustual-boy = {}
-#schismtracker = {}
-#scummvm = {}
-#sdl = {}
-#sdl2 = {}
-#sdl_gfx = {}
-#sdl_image = {}
-#sdl_mixer = {}
-#sdl_ttf = {}
-#sdl-player = {}
-#sed = {}
-#servo = {}
-#shellstorm = {}
+resist = {}
 smith = {}
-#sodium = {}
-#sopwith = {}
-#ssh = {}
-#syobonaction = {}
-#terminfo = {}
-#termplay = {}
-#timidity = {}
-#ttf-hack = {}
 userutils = {}
 uutils = {}
-#vim = {}
-#vttest = {}
-#webrender = {}
-#winit = {}
-#xz = {}
-#zerod = {}
-#zlib = {}
 
 # User settings
 [users.root]