diff --git a/.gitmodules b/.gitmodules
index 1cb3070..c4d281f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "pkg/riseup-vpn"]
 	path = pkg/riseup-vpn
 	url = https://aur.archlinux.org/riseup-vpn.git
+[submodule "pkg/nordic-kde-git"]
+	path = pkg/nordic-kde-git
+	url = https://aur.archlinux.org/nordic-kde-git.git
+[submodule "pkg/qt-installer-framework"]
+	path = pkg/qt-installer-framework
+	url = https://aur.archlinux.org/qt-installer-framework.git
+[submodule "pkg/xournalpp-git"]
+	path = pkg/xournalpp-git
+	url = https://aur.archlinux.org/xournalpp-git.git
diff --git a/README.md b/README.md
index 34779df..7947b55 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,11 @@
 There are several AUR packages added as submodules inside [pkg](pkg):
 
 ```shell
-git submodule add "https://aur.archlinux.org/riseup-vpn.git" pkg/riseup-vpn
+AUR=(xournalpp-git qt-installer-framework riseup-vpn nordic-kde-git)
+
+for pkg in "${AUR[@]}"; do
+  git submodule add "https://aur.archlinux.org/${pkg}.git" pkg/"${pkg}"
+done
 ```
 
 To update all submodules, run
diff --git a/build-pkg/build-all-without-docker.sh b/build-pkg/build-all-without-docker.sh
index d291af1..8857cc4 100755
--- a/build-pkg/build-all-without-docker.sh
+++ b/build-pkg/build-all-without-docker.sh
@@ -82,9 +82,13 @@ function main() {
     done
   else
     # Stage1
-    build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda || return $?
+    build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda \
+      xournalpp-git qt-installer-framework nordic-kde-git \
+      || return $?
     # Stage2
-    build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh || return $?
+    build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh \
+      riseup-vpn \
+      || return $?
     # Stage3
     build-and-push de-p1st-base || return $?
     # Stage4
diff --git a/build-pkg/build-all.sh b/build-pkg/build-all.sh
index ee89939..6137c3c 100755
--- a/build-pkg/build-all.sh
+++ b/build-pkg/build-all.sh
@@ -59,9 +59,13 @@ function main() {
   fi
 
   # Stage1
-  build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda || return $?
+  build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda \
+    xournalpp-git qt-installer-framework nordic-kde-git \
+    || return $?
   # Stage2
-  build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh || return $?
+  build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh \
+    riseup-vpn \
+    || return $?
   # Stage3
   build-and-push de-p1st-base || return $?
   # Stage4
diff --git a/pkg/de-p1st-sddm-theme-nordic/PKGBUILD b/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
index bea7ba5..2805715 100644
--- a/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
+++ b/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
@@ -12,7 +12,6 @@ license=('MIT')
 depends=('sddm' 'sddm-nordic-theme-git')
 # Without plasma-framework the following error occurs:
 # Main.qml:28:1: module "org.kde.plasma.extras" is not installed
-# TODO: is this reported upstream (on AUR?)
 depends+=('plasma-framework')
 depends+=('holo' 'git' 'base')
 depends+=('de-p1st-wallpaper')
diff --git a/pkg/nordic-kde-git b/pkg/nordic-kde-git
new file mode 160000
index 0000000..dab91fe
--- /dev/null
+++ b/pkg/nordic-kde-git
@@ -0,0 +1 @@
+Subproject commit dab91fe8c3cca06c128b8bec51ba499b46e40d9c
diff --git a/pkg/qt-installer-framework b/pkg/qt-installer-framework
new file mode 160000
index 0000000..2dbc32d
--- /dev/null
+++ b/pkg/qt-installer-framework
@@ -0,0 +1 @@
+Subproject commit 2dbc32d4b4bd1c88ce83b4cf783628f5373c8a3c
diff --git a/pkg/xournalpp-git b/pkg/xournalpp-git
new file mode 160000
index 0000000..862ea08
--- /dev/null
+++ b/pkg/xournalpp-git
@@ -0,0 +1 @@
+Subproject commit 862ea08ac50c7ae6cb0eccb796af0bb9075238b0