diff --git a/shared/netinst/README.md b/shared/netinst/README.md
new file mode 100644
index 00000000..2c0abd8b
--- /dev/null
+++ b/shared/netinst/README.md
@@ -0,0 +1,3 @@
+### What is this yaml stuff?
+
+* *.yaml files will be used by the calamares netinstall module to load package groups
diff --git a/shared/netinst/hybrid-openrc.yaml b/shared/netinst/hybrid-openrc.yaml
new file mode 100644
index 00000000..ca635c02
--- /dev/null
+++ b/shared/netinst/hybrid-openrc.yaml
@@ -0,0 +1,49 @@
+- name: "base-devel"
+  description: "Development packages"
+  packages:
+        - autoconf
+        - automake
+        - binutils
+        - bison
+        - fakeroot
+        - file
+        - findutils
+        - flex
+        - gawk
+        - gcc
+        - gettext
+        - grep
+        - groff
+        - gzip
+        - libtool
+        - m4
+        - make
+        - patch
+        - pkg-config
+        - sed
+        - sudo
+        - texinfo
+        - util-linux
+        - which
+
+- name: "util"
+  description: "Utilities packages"
+  packages:
+        - yaourt
+
+- name: "multimedia"
+  description: "Multimedia packages"
+  packages:
+        - vlc
+
+- name: "steam"
+  description: "Steam packages"
+  packages:
+        - steam-manjaro
+
+- name: "java"
+  description: "Java packages"
+  packages:
+        - jre8-openjdk
+        - jre8-openjdk-headless
+        - icedtea-web
diff --git a/shared/netinst/hybrid-systemd-sonar.yaml b/shared/netinst/hybrid-systemd-sonar.yaml
new file mode 100644
index 00000000..8aeff84b
--- /dev/null
+++ b/shared/netinst/hybrid-systemd-sonar.yaml
@@ -0,0 +1,32 @@
+- name: "base-devel"
+  description: "Development packages"
+  packages:
+        - autoconf
+        - automake
+        - binutils
+        - bison
+        - fakeroot
+        - file
+        - findutils
+        - flex
+        - gawk
+        - gcc
+        - gettext
+        - grep
+        - groff
+        - gzip
+        - libtool
+        - m4
+        - make
+        - patch
+        - pkg-config
+        - sed
+        - sudo
+        - texinfo
+        - util-linux
+        - which
+
+- name "sonar-apps"
+  description: "Sonar linux applications"
+  packages:
+        - sonar-example-package
diff --git a/shared/netinst/hybrid-systemd.yaml b/shared/netinst/hybrid-systemd.yaml
new file mode 100644
index 00000000..ca635c02
--- /dev/null
+++ b/shared/netinst/hybrid-systemd.yaml
@@ -0,0 +1,49 @@
+- name: "base-devel"
+  description: "Development packages"
+  packages:
+        - autoconf
+        - automake
+        - binutils
+        - bison
+        - fakeroot
+        - file
+        - findutils
+        - flex
+        - gawk
+        - gcc
+        - gettext
+        - grep
+        - groff
+        - gzip
+        - libtool
+        - m4
+        - make
+        - patch
+        - pkg-config
+        - sed
+        - sudo
+        - texinfo
+        - util-linux
+        - which
+
+- name: "util"
+  description: "Utilities packages"
+  packages:
+        - yaourt
+
+- name: "multimedia"
+  description: "Multimedia packages"
+  packages:
+        - vlc
+
+- name: "steam"
+  description: "Steam packages"
+  packages:
+        - steam-manjaro
+
+- name: "java"
+  description: "Java packages"
+  packages:
+        - jre8-openjdk
+        - jre8-openjdk-headless
+        - icedtea-web
diff --git a/shared/netinst/netinstall-openrc.yaml b/shared/netinst/netinstall-openrc.yaml
new file mode 100644
index 00000000..da3fa86b
--- /dev/null
+++ b/shared/netinst/netinstall-openrc.yaml
@@ -0,0 +1,229 @@
+- name: "base"
+  description: "Command line interface"
+  hidden: true
+  selected: true
+  packages:
+       - bash
+       - bzip2
+       - coreutils
+       - cryptsetup-openrc
+       - device-mapper-openrc
+       - dhcpcd-openrc
+       - diffutils
+       - e2fsprogs
+       - file
+       - filesystem
+       - findutils
+       - gawk
+       - gcc-libs
+       - gettext
+       - glibc-openrc
+       - grep
+       - gzip
+       - inetutils-openrc
+       - iproute2
+       - iputils
+       - jfsutils
+       - less
+       - libeudev-systemd
+       - licenses
+       - logrotate
+       - lvm2-openrc
+       - man-db
+       - man-pages
+       - manjaro-system
+       - mdadm-openrc
+       - mhwd
+       - mhwd-db
+       - nano
+       - netifrc
+       - pacman
+       - pciutils
+       - pcmciautils
+       - perl
+       - procps-ng
+       - psmisc
+       - reiserfsprogs
+       - s-nail
+       - sed
+       - shadow
+       - sudo
+       - sysfsutils
+       - eudev-systemd
+       - tar
+       - texinfo
+       - udev-openrc
+       - usbutils
+       - util-linux
+       - vi
+       - which
+       - xfsprogs
+       - tcp_wrappers
+
+- name: "kernel"
+  description: "Kernel packages"
+  hidden: true
+  selected: true
+  packages:
+        - linux44
+
+- name: "boot"
+  description: "Bootloader packages"
+  hidden: true
+  selected: true
+  packages:
+        - grub
+        - os-prober
+        - memtest86+
+
+- name: "network"
+  description: "Network packages"
+  hidden: true
+  selected: true
+  packages:
+        - networkmanager-consolekit
+        - networkmanager-openrc
+        - avahi-openrc
+        - ntp-openrc
+        - rsync-openrc
+
+- name: "base-devel"
+  description: "Development packages"
+  hidden: false
+  selected: false
+  packages:
+        - autoconf
+        - automake
+        - binutils
+        - bison
+        - fakeroot
+        - file
+        - findutils
+        - flex
+        - gawk
+        - gcc
+        - gettext
+        - grep
+        - groff
+        - gzip
+        - libtool
+        - m4
+        - make
+        - patch
+        - pkg-config
+        - sed
+        - texinfo
+        - util-linux
+        - which
+
+- name: "plymouth"
+  description: "Plymouth"
+  hidden: false
+  selected: false
+  packages:
+        - plymouth-theme-manjaro-elegant
+
+- name: 'xfce4'
+  description: 'xfce4'
+  selected: false
+  hidden: false
+  packages:
+       - exo
+       - garcon
+       - gtk-xfce-engine
+       - thunar
+       - thunar-volman
+       - tumbler
+       - xfce4-appfinder
+       - xfce4-mixer
+       - xfce4-panel
+       - xfce4-power-manager
+       - xfce4-session
+       - xfce4-settings
+       - xfce4-terminal
+       - xfconf
+       - xfdesktop
+       - xfwm4
+       - xfwm4-themes
+       - displaymanager-openrc
+       - lightdm-gtk-greeter
+       - mousepad
+
+- name: 'plasma'
+  description: 'plasma'
+  selected: false
+  hidden: false
+  packages:
+       - bluedevil
+       - breeze
+       - breeze-gtk
+       - drkonqi
+       - kactivitymanagerd
+       - kde-cli-tools
+       - kde-gtk-config
+       - kdecoration
+       - kdeplasma-addons
+       - kgamma5
+       - khotkeys
+       - kinfocenter
+       - kmenuedit
+       - kscreen
+       - kscreenlocker
+       - ksshaskpass
+       - ksysguard
+       - kuiserver
+       - kwallet-pam
+       - kwayland-integration
+       - kwin
+       - kwrited
+       - libkscreen
+       - libksysguard
+       - milou
+       - oxygen
+       - plasma-desktop
+       - plasma-gpg-agent
+       - plasma-integration
+       - plasma-nm
+       - plasma-pa
+       - plasma-sdk
+       - plasma-ssh-agent
+       - plasma-workspace
+       - plasma-workspace-wallpapers
+       - polkit-kde-agent
+       - powerdevil
+       - sddm-kcm
+       - systemsettings
+       - user-manager
+       - displaymanager-openrc
+       - sddm-consolekit
+       - konsole
+       - dolphin
+       - kate
+       - ark
+       - khelpcenter
+
+- name: 'lxqt'
+  description: 'lxqt'
+  selected: false
+  hidden: false
+  packages:
+       - lximage-qt
+       - lxqt-about
+       - lxqt-common
+       - lxqt-config
+       - lxqt-globalkeys
+       - lxqt-notificationd
+       - lxqt-openssh-askpass
+       - lxqt-panel
+       - lxqt-policykit
+       - lxqt-powermanagement
+       - lxqt-qtplugin
+       - lxqt-runner
+       - lxqt-session
+       - lxqt-sudo
+       - openbox
+       - pcmanfm-qt
+       - displaymanager-openrc
+       - sddm-consolekit
+       - qterminal
+       - kwrite
diff --git a/shared/netinst/netinstall-systemd.yaml b/shared/netinst/netinstall-systemd.yaml
new file mode 100644
index 00000000..f26353ba
--- /dev/null
+++ b/shared/netinst/netinstall-systemd.yaml
@@ -0,0 +1,276 @@
+- name: "base"
+  description: "Command line interface"
+  hidden: true
+  selected: true
+  packages:
+       - bash
+       - bzip2
+       - coreutils
+       - cryptsetup
+       - device-mapper
+       - dhcpcd
+       - diffutils
+       - e2fsprogs
+       - file
+       - filesystem
+       - findutils
+       - gawk
+       - gcc-libs
+       - gettext
+       - glibc
+       - grep
+       - gzip
+       - inetutils
+       - iproute2
+       - iputils
+       - jfsutils
+       - less
+       - licenses
+       - logrotate
+       - lvm2
+       - man-db
+       - man-pages
+       - manjaro-system
+       - mdadm
+       - mhwd
+       - mhwd-db
+       - nano
+       - netctl
+       - pacman
+       - pciutils
+       - pcmciautils
+       - perl
+       - procps-ng
+       - psmisc
+       - reiserfsprogs
+       - s-nail
+       - sed
+       - shadow
+       - sudo
+       - sysfsutils
+       - systemd-sysvcompat
+       - tar
+       - texinfo
+       - usbutils
+       - util-linux
+       - vi
+       - which
+       - xfsprogs
+       - tcp_wrappers
+
+- name: "kernel"
+  description: "Kernel packages"
+  hidden: true
+  selected: true
+  packages:
+        - linux44
+        
+- name: "boot"
+  description: "Bootloader packages"
+  hidden: true
+  selected: true
+  packages:
+        - grub
+        - os-prober
+        - memtest86+
+
+- name: "network"
+  description: "Network packages"
+  hidden: true
+  selected: true
+  packages:
+        - networkmanager
+        - avahi
+        - ntp
+        - rsync
+       
+- name: "base-devel"
+  description: "Development packages"
+  hidden: false
+  selected: false
+  packages:
+        - autoconf
+        - automake
+        - binutils
+        - bison
+        - fakeroot
+        - file
+        - findutils
+        - flex
+        - gawk
+        - gcc
+        - gettext
+        - grep
+        - groff
+        - gzip
+        - libtool
+        - m4
+        - make
+        - patch
+        - pkg-config
+        - sed
+        - texinfo
+        - util-linux
+        - which
+
+- name: "plymouth"
+  description: "Plymouth"
+  hidden: false
+  selected: false
+  packages:
+        - plymouth-theme-manjaro-elegant
+
+- name: 'xfce4'
+  description: 'xfce4'
+  selected: false
+  hidden: false
+  packages:
+       - exo
+       - garcon
+       - gtk-xfce-engine
+       - thunar
+       - thunar-volman
+       - tumbler
+       - xfce4-appfinder
+       - xfce4-mixer
+       - xfce4-panel
+       - xfce4-power-manager
+       - xfce4-session
+       - xfce4-settings
+       - xfce4-terminal
+       - xfconf
+       - xfdesktop
+       - xfwm4
+       - xfwm4-themes
+       - lightdm-gtk-greeter
+       - mousepad
+
+- name: 'plasma'
+  description: 'plasma'
+  selected: false
+  hidden: false
+  packages:
+       - bluedevil
+       - breeze
+       - breeze-gtk
+       - drkonqi
+       - kactivitymanagerd
+       - kde-cli-tools
+       - kde-gtk-config
+       - kdecoration
+       - kdeplasma-addons
+       - kgamma5
+       - khotkeys
+       - kinfocenter
+       - kmenuedit
+       - kscreen
+       - kscreenlocker
+       - ksshaskpass
+       - ksysguard
+       - kuiserver
+       - kwallet-pam
+       - kwayland-integration
+       - kwin
+       - kwrited
+       - libkscreen
+       - libksysguard
+       - milou
+       - oxygen
+       - plasma-desktop
+       - plasma-gpg-agent
+       - plasma-integration
+       - plasma-nm
+       - plasma-pa
+       - plasma-sdk
+       - plasma-ssh-agent
+       - plasma-workspace
+       - plasma-workspace-wallpapers
+       - polkit-kde-agent
+       - powerdevil
+       - sddm-kcm
+       - systemsettings
+       - user-manager
+       - konsole
+       - dolphin
+       - kate
+       - ark
+       - khelpcenter
+
+- name: 'lxqt'
+  description: 'lxqt'
+  selected: false
+  hidden: false
+  packages:
+       - lximage-qt
+       - lxqt-about
+       - lxqt-common
+       - lxqt-config
+       - lxqt-globalkeys
+       - lxqt-notificationd
+       - lxqt-openssh-askpass
+       - lxqt-panel
+       - lxqt-policykit
+       - lxqt-powermanagement
+       - lxqt-qtplugin
+       - lxqt-runner
+       - lxqt-session
+       - lxqt-sudo
+       - openbox
+       - pcmanfm-qt
+       - sddm
+       - qterminal
+       - kwrite
+
+- name: 'gnome'
+  description: 'gnome'
+  selected: false
+  hidden: false
+  packages:
+       - adwaita-icon-theme
+       - baobab
+       - dconf-editor
+       - empathy
+       - eog
+       - epiphany
+       - evince
+       - gdm
+       - gnome-backgrounds
+       - gnome-calculator
+       - gnome-contacts
+       - gnome-control-center
+       - gnome-desktop
+       - gnome-dictionary
+       - gnome-disk-utility
+       - gnome-font-viewer
+       - gnome-keyring
+       - gnome-screenshot
+       - gnome-session
+       - gnome-settings-daemon
+       - gnome-shell
+       - gnome-shell-extensions
+       - gnome-system-log
+       - gnome-system-monitor
+       - gnome-terminal
+       - gnome-themes-standard
+       - gnome-user-docs
+       - gnome-user-share
+       - grilo-plugins
+       - gucharmap
+       - gvfs
+       - gvfs-afc
+       - gvfs-goa
+       - gvfs-google
+       - gvfs-gphoto2
+       - gvfs-mtp
+       - gvfs-nfs
+       - gvfs-smb
+       - mousetweaks
+       - mutter
+       - nautilus
+       - sushi
+       - totem
+       - tracker
+       - vino
+       - xdg-user-dirs-gtk
+       - yelp
+       - gedit