diff --git a/config/i686/demo.toml b/config/i686/demo.toml
index a091a15..15049d8 100644
--- a/config/i686/demo.toml
+++ b/config/i686/demo.toml
@@ -22,47 +22,15 @@
 #                                                                            #
 ##############################################################################
 
-include = ["../net.toml"]
+include = ["../desktop.toml"]
 
 # General settings
 [general]
 # Filesystem size in MiB
 filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
 
 # Package settings
 [packages]
-audiod = {}
-bash = {}
-bootloader = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-installer = {}
-installer-gui = {}
-ion = {}
-netdb = {}
-netsurf = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-git = {}
-curl = {}
-vim = {}
-
 # Games
 dosbox = {}
 freedoom = {}
@@ -75,24 +43,6 @@ pixelcannon = {}
 # MIDI
 freepats = {}
 
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
 [[files]]
 path = "/home/user/Welcome.txt"
 data = """
diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml
index 1d2a4fe..da5a432 100644
--- a/config/x86_64/demo.toml
+++ b/config/x86_64/demo.toml
@@ -22,52 +22,25 @@
 #                                                                            #
 ##############################################################################
 
-include = ["../net.toml"]
+include = ["../desktop.toml"]
 
 # General settings
 [general]
 # Filesystem size in MiB
 filesystem_size = 1536
-# Do not prompt if settings are not defined
-prompt = false
 
 # Package settings
 [packages]
-audiod = {}
-bash = {}
-bootloader = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
+# GUI Apps
 cosmic-edit = {}
-cosmic-icons = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-installer = {}
-installer-gui = {}
-intel-one-mono = {}
-ion = {}
-netdb = {}
-netsurf = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-pop-icon-theme = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# Apps
 periodictable = {}
 
-# Shell Apps
+# GUI Data
+cosmic-icons = {}
+intel-one-mono = {}
+pop-icon-theme = {}
 
+# Shell Apps
 binutils = {}
 curl = {}
 git = {}
@@ -96,24 +69,6 @@ gears = {}
 # MIDI
 freepats = {}
 
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
 [[files]]
 path = "/home/user/Welcome.txt"
 data = """