diff --git a/debian/calamares-settings.install b/debian/calamares-settings.install
index d55f350..179cfec 100644
--- a/debian/calamares-settings.install
+++ b/debian/calamares-settings.install
@@ -1,3 +1,3 @@
 #lib/*
-#usr/*
 etc/*
+usr/*
diff --git a/etc/calamares/modules/netinstall.conf b/etc/calamares/modules/netinstall.conf
new file mode 100644
index 0000000..3264295
--- /dev/null
+++ b/etc/calamares/modules/netinstall.conf
@@ -0,0 +1,2 @@
+---
+groupsUrl: file:///usr/share/calamares/netinstall.php
diff --git a/usr/share/calamares/netinstall.php b/usr/share/calamares/netinstall.php
new file mode 100644
index 0000000..d955dcc
--- /dev/null
+++ b/usr/share/calamares/netinstall.php
@@ -0,0 +1,14 @@
+- name: "Restricted Media Formats"
+  description: "Media tools with restricted uses"
+  packages:
+    - flashplugin-installer
+    - gstreamer1.0-plugins-ugly
+    - gstreamer1.0-plugins-bad
+    - gstreamer1.0-libav
+    - libk3b6-extracodecs
+    - libdvdread4
+    - chromium-codecs-ffmpeg-extra
+    - oxideqt-codecs-extra
+    - unrar
+    - lame
+    - libavcodec-extra
diff --git a/usr/share/calamares/netinstall.php~ b/usr/share/calamares/netinstall.php~
new file mode 100644
index 0000000..e371883
--- /dev/null
+++ b/usr/share/calamares/netinstall.php~
@@ -0,0 +1,246 @@
+- name: "Default"
+  description: "Default group"
+  hidden: true
+  selected: true
+  packages:
+    - base
+    - chakra-live-skel
+    - cdemu-client
+    - lsb-release
+    - avahi
+    - grub
+    # disk utils
+    - dosfstools
+    - e2fsprogs
+    - fuse
+    - gptfdisk
+    - jfsutils
+    - ntfs-3g
+    - reiserfsprogs
+    - xfsprogs
+    # power
+    - acpi_call
+    - pmtools
+    # network
+    - dnsutils
+    - iputils
+    - netcfg
+    - xinetd
+    # firmwares
+    - alsa-firmware
+    - linux-firmware
+    # sound
+    - alsa-lib
+    - alsa-utils
+    - gstreamer
+    - gst-plugins-good
+    - gst-plugins-bad
+    - libao
+    - libcanberra-gstreamer
+    - libcanberra-pulse
+    - pulseaudio
+    - pulseaudio-alsa
+    # tools
+    - bash-completion
+    - hwinfo
+    - lsof
+    - man-db
+    - mlocate
+    - nano
+    - openssh
+    - sudo
+    - vim
+    - zsh # :D
+    # archivers
+    - p7zip
+    - unarj
+    - unrar
+    - unzip
+    - zip
+    # xorg base
+    - xorg
+    - xorg-apps
+    - xorg-fonts-alias
+    - xorg-fonts-encodings
+    - xorg-fonts-misc
+    - xorg-res-utils
+    - xorg-server
+    - xorg-server-utils
+    - xorg-xauth
+    - xorg-xinit
+    - xorg-xkb-utils
+    # xorg video drivers
+    - xf86-video-apm
+    - xf86-video-ark
+    - xf86-video-ati
+    - xf86-video-chips
+    - xf86-video-cirrus
+    - xf86-video-glint
+    - xf86-video-i128
+    - xf86-video-i740
+    - xf86-video-intel
+    - xf86-video-mach64
+    - xf86-video-mga
+    - xf86-video-neomagic
+    - xf86-video-nouveau
+    - xf86-video-nv
+    - xf86-video-openchrome
+    - xf86-video-r128
+    - xf86-video-rendition
+    - xf86-video-s3
+    - xf86-video-s3virge
+    - xf86-video-savage
+    - xf86-video-siliconmotion
+    - xf86-video-sisusb
+    - xf86-video-tdfx
+    - xf86-video-trident
+    - xf86-video-tseng
+    - xf86-video-v4l
+    - xf86-video-vesa
+    - xf86-video-voodoo
+    - mesa-libgl
+    # xorg input drivers
+    - xf86-input-synaptics
+    - xf86-input-wacom
+    - xf86-input-evdev
+    - xf86-input-keyboard
+    - xf86-input-mouse
+    # fonts
+    - terminus-font
+    - ttf-dejavu
+    - ttf-liberation
+    - wqy-microhei
+    - xorg-fonts-100dpi
+    - xorg-fonts-75dpi
+    - xorg-fonts-cyrillic
+    # additional stuff that needs xorg
+    - hicolor-icon-theme
+    # kde
+    - chakra-common
+    - qt
+    - kde-baseapps
+    - kde-baseapps-dolphin
+    - kde-baseapps-konsole
+    - kde-runtime
+    - kde-workspace
+    - kdelibs
+    - kdepimlibs
+    - kdemultimedia-kmix
+    - oxygen-icons
+    - phonon-backend-gstreamer
+    # chakra theme (including kapudan options)
+    - chakra-wallpapers-dharma
+    - chakra-wallpapers-curie
+    - chakra-wallpapers-descartes
+    - grub2-themes-sirius
+    - kapudan-kde-themes-caledonia
+    - kde-kdm-themes-sirius
+    - kde-ksplash-themes-sirius
+    - kde-plasma-themes-caledonia
+    - python2-imaging
+    - python2-v4l2capture
+    - python2-xlib
+    - caledonia-colors
+    - yakuake-themes-ronak
+    # kde (everything else)
+    - kdeadmin-kcron
+    - kdeadmin-kuser
+    - kdeplasma-addons-applets-icontasks
+    - kdesdk-kate
+    - kdeutils-ark
+    - kdeutils-kgpg
+    - kdeutils-sweeper
+    # kde network
+    - kdeplasma-applets-plasma-nm
+    - networkmanager-dispatcher-ntpd
+    - kcm-ufw
+    # applications
+    - rekonq
+    - yakuake
+    # enable systemd-units
+    - chakra-init-live
+    # overlay pkgs
+    - partitionmanager
+    - octopi-notifier
+    - kapudan
+- name: "Wireless"
+  description: "Tools for wireless connections"
+  packages:
+    - crda
+    - ndiswrapper
+    - usb-modeswitch
+    - wireless-regdb
+    - wireless_tools
+    - wpa_supplicant
+- name: "CCR"
+  description: "Tools for the Chakra Community Repository"
+  packages:
+    - ccr
+    - base-devel
+- name: "Graphics"
+  description: "Applications to work with graphics"
+  packages:
+    - kdegraphics-gwenview
+    - kdegraphics-kamera
+    - kdegraphics-kcolorchooser
+    - kdegraphics-kgamma
+    - kdegraphics-kolourpaint
+    - kdegraphics-kruler
+    - kdegraphics-ksaneplugin
+    - kdegraphics-ksnapshot
+    - kdegraphics-libkdcraw
+    - kdegraphics-libkexiv2
+    - kdegraphics-libkipi
+    - kdegraphics-libksane
+    - kdegraphics-mobipocket
+    - kdegraphics-okular
+    - kdegraphics-strigi-analyzer
+    - 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
+