diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
index 7975324b0..a47783811 100644
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
@@ -5,15 +5,15 @@ efiBootLoader: "grub"
 
 # systemd-boot configuration files settings, set kernel and initramfs file names
 # and amount of time before default selection boots
-kernel: "/vmlinuz-linux"
-img: "/initramfs-linux.img"
-fallback: "/initramfs-linux-fallback.img"
+kernel: "_ALL_kver_"
+img: "_default_image_"
+fallback: "_fallback_image_"
 timeout: "10"
 # Optionally set the menu entry name and kernel name to use in systemd-boot.
 # If not specified here, these settings will be taken from branding.desc.
-# bootloaderEntryName: "Generic GNU/Linux"
-# kernelLine: ", with Stable-Kernel"
-# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
+# bootloaderEntryName: "Manjaro"
+kernelLine: ", with _manjaro_kernel_"
+fallbackKernelLine: ", with _manjaro_kernel_ (fallback initramfs)"
 
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index c8c3dec46..e2bfe2d2f 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -32,6 +32,8 @@ DesktopEnvironment = collections.namedtuple('DesktopEnvironment', ['executable',
 desktop_environments = [
     DesktopEnvironment('/usr/bin/startkde', 'plasma'),  # KDE Plasma 5
     DesktopEnvironment('/usr/bin/startkde', 'kde-plasma'),  # KDE Plasma 4
+    DesktopEnvironment('/usr/bin/budgie-desktop', 'budgie-desktop'), # Budgie v10.x
+    DesktopEnvironment('/usr/bin/budgie-session', 'budgie-desktop'), # Budgie v8.x
     DesktopEnvironment('/usr/bin/gnome-session', 'gnome'),
     DesktopEnvironment('/usr/bin/startxfce4', 'xfce'),
     DesktopEnvironment('/usr/bin/cinnamon-session-cinnamon', 'cinnamon'),
@@ -42,8 +44,6 @@ desktop_environments = [
     DesktopEnvironment('/usr/bin/lxqt-session', 'lxqt'),
     DesktopEnvironment('/usr/bin/pekwm', 'pekwm'),
     DesktopEnvironment('/usr/bin/pantheon-session', 'pantheon'),
-    DesktopEnvironment('/usr/bin/budgie-session', 'budgie-session'),
-    DesktopEnvironment('/usr/bin/budgie-desktop', 'budgie-desktop'),
     DesktopEnvironment('/usr/bin/i3', 'i3'),
     DesktopEnvironment('/usr/bin/startdde', 'deepin'),
     DesktopEnvironment('/usr/bin/openbox-session', 'openbox')
diff --git a/src/modules/locale/locale.conf b/src/modules/locale/locale.conf
index 824c8abeb..381707de7 100644
--- a/src/modules/locale/locale.conf
+++ b/src/modules/locale/locale.conf
@@ -1,7 +1,5 @@
 ---
-region:                     "America"
-zone:                       "New_York"
-
-# GeoIP settings. Leave commented out to disable GeoIP.
-#localeGenPath:             "/etc/locale.gen"
-#geoipUrl:                  "freegeoip.net"
+region:        "America"
+zone:          "New_York"
+localeGenPath: "/etc/locale.gen"
+geoipUrl:      "freegeoip.net"
diff --git a/src/modules/netinstall/netinstall.yaml b/src/modules/netinstall/netinstall.yaml
index 8e9037f4d..e37188312 100644
--- a/src/modules/netinstall/netinstall.yaml
+++ b/src/modules/netinstall/netinstall.yaml
@@ -2,7 +2,6 @@
   description: "Default group"
   hidden: true
   selected: true
-  critical: false
   packages:
     - base
     - chakra-live-skel
@@ -166,7 +165,6 @@
     - kapudan
 - name: "Wireless"
   description: "Tools for wireless connections"
-  critical: false
   packages:
     - crda
     - ndiswrapper
@@ -200,4 +198,49 @@
     - kdegraphics-svgpart
     - kdegraphics-thumbnailers
     - imagemagick
+- name: "Burning"
+  description: "Set of packages for disc burning"
+  packages:
+    - dvd+rw-tools
+    - vcdimager
+    - transcode
+    - emovix
+    - k3b
+    - libdvdcss
+- name: "Printing"
+  description: "Print much?"
+  packages:
+    - cups
+    - gutenprint
+    - cups-pdf
+    - kdeadmin-print-manager
+    - hplip
+    - epsoneplijs
+    - epson-inkjet-printer-escpr
+    - python2-gobject2
+    - samba
+- name: "Multimedia"
+  description: "Music and video players"
+  packages:
+    - kdemultimedia-dragonplayer
+    - kdenlive
+    - amarok
+- name: "Miscellaneous"
+  description: "Useful tools and apps"
+  packages:
+    - imagewriter
+    - tomoyo-tools
+    - python2-gobject  ## needed for systemd-analyze
+    - clamav
+    - kdenetwork-kget  ## maybe move to a network group?
+    - kdeplasma-addons-applets-lancelot
+    - kdeplasma-applets-homerun
+    - kdeplasma-applets-appmenu-qml
+    - kdeplasma-addons-runners-characters
+    - kdeplasma-addons-runners-converter
+    - kdeplasma-addons-runners-datetime
+    - kdeplasma-addons-runners-dictionary ##4.10 option
+    - kdeplasma-addons-runners-spellchecker
+    - appmenu-qt  ## needed for menubar options in 4.10
+    - kscreen
 
diff --git a/src/modules/services/services.conf b/src/modules/services/services.conf
index d9c8895ea..ebc8f9bd9 100644
--- a/src/modules/services/services.conf
+++ b/src/modules/services/services.conf
@@ -5,7 +5,7 @@ services:
   - name: "NetworkManager"  #name of the service file
     mandatory: false        #true=> if enabling fails the installer errors out and quits
                             #false=>if enabling fails print warning to console and continue
-  - name: "cups"
+  - name: "org.cups.cupsd"
     mandatory: false
 
 targets:
diff --git a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf
index 68de113b5..755fc77c5 100644
--- a/src/modules/unpackfs/unpackfs.conf
+++ b/src/modules/unpackfs/unpackfs.conf
@@ -1,8 +1,8 @@
 ---
 unpack:
-    -   source: "/path/to/filesystem.img"
-        sourcefs: "ext4"
-        destination: ""
-    -   source: "/path/to/another/filesystem.sqfs"
+    -   source: "_root-image_"
+        sourcefs: "squashfs"
+        destination: ""
+    -   source: "_desktop-image_"
         sourcefs: "squashfs"
         destination: ""