diff --git a/stage4/04-pisdr-system/01-run.sh b/stage4/04-pisdr-system/01-run.sh
index afa83f8..828d1ed 100755
--- a/stage4/04-pisdr-system/01-run.sh
+++ b/stage4/04-pisdr-system/01-run.sh
@@ -1,8 +1,16 @@
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 install -v -o 1000 -g 1000 -m 755 shortcut/gnuradio.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 install -v -o 1000 -g 1000 -m 755 shortcut/gqrx.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
-install -v -o 1000 -g 1000 -m 755 shortcut/sdrangel.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 install -v -o 1000 -g 1000 -m 755 shortcut/gpredict.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/glrpt.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/osc.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/qtdab.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/sdrpp.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/wsjtx.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/inspectrum.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/limesuite.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/urh.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/quisk.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/usr/share/rpd-wallpaper/"
 install -v -o 1000 -g 1000 -m 755 wallpaper/kevin-quezada-lmt.jpg "${ROOTFS_DIR}/usr/share/rpd-wallpaper/"
diff --git a/stage4/04-pisdr-system/shortcut/glrpt.desktop b/stage4/04-pisdr-system/shortcut/glrpt.desktop
new file mode 100644
index 0000000..ce3d246
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/glrpt.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=GLRPT
+Comment=GLRPT
+Icon=/home/pi/PiSDR/Software/glrpt/share/launcher/glrpt.svg
+Exec=glrpt 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/inspectrum.desktop b/stage4/04-pisdr-system/shortcut/inspectrum.desktop
new file mode 100644
index 0000000..46348fd
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/inspectrum.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Inspectrum
+Comment=Inspectrum
+Icon=
+Exec=inspectrum 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/limesuite.desktop b/stage4/04-pisdr-system/shortcut/limesuite.desktop
new file mode 100644
index 0000000..434b430
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/limesuite.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=LimeSuite
+Comment=LimeSuite
+Icon=/home/pi/PiSDR/Radios/LimeSuite/Desktop/lime-suite-128.png
+Exec=LimeSuiteGUI 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/osc.desktop b/stage4/04-pisdr-system/shortcut/osc.desktop
new file mode 100644
index 0000000..8c6e099
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/osc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=IIO Oscilloscope
+Comment=IIO Oscilloscope
+Icon=/home/pi/PiSDR/Software/iio-oscilloscope/icons/osc.svg
+Exec=osc 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/qtdab.desktop b/stage4/04-pisdr-system/shortcut/qtdab.desktop
new file mode 100644
index 0000000..d7d4973
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/qtdab.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=QtDAB
+Comment=QtDAB
+Icon=/home/pi/PiSDR/Software/qt-dab/dab-maxi/qt-dab.png
+Exec=qt-dab-4.11 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/quisk.desktop b/stage4/04-pisdr-system/shortcut/quisk.desktop
new file mode 100644
index 0000000..0cd7348
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/quisk.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Quisk
+Comment=Quisk
+Icon=
+Exec=quisk 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/sdrangel.desktop b/stage4/04-pisdr-system/shortcut/sdrangel.desktop
deleted file mode 100644
index 2f76758..0000000
--- a/stage4/04-pisdr-system/shortcut/sdrangel.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=SDR Angel
-Comment=SDR Angel
-Icon=/home/pi/PiSDR/Software/sdrangel/cmake/cpack/sdrangel_icon.svg
-Exec=sdrangel 
-Type=Application
-Encoding=UTF-8
-Terminal=true
-Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/sdrpp.desktop b/stage4/04-pisdr-system/shortcut/sdrpp.desktop
new file mode 100644
index 0000000..5fb9a59
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/sdrpp.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SDR++
+Comment=SDR++
+Icon=/home/pi/PiSDR/Software/SDRPlusPlus/root/res/icons/sdrpp.png
+Exec=sdrpp 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/urh.desktop b/stage4/04-pisdr-system/shortcut/urh.desktop
new file mode 100644
index 0000000..1df7599
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/urh.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Universal Radio Hacker
+Comment=Universal Radio Hacker
+Icon=/home/pi/PiSDR/Software/urh/data/icons/appicon.svg
+Exec=urh 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/shortcut/wsjtx.desktop b/stage4/04-pisdr-system/shortcut/wsjtx.desktop
new file mode 100644
index 0000000..a527303
--- /dev/null
+++ b/stage4/04-pisdr-system/shortcut/wsjtx.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=WSJTX
+Comment=WSJTX
+Icon=
+Exec=wsjtx 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/stage4/04-pisdr-system/wallpaper/donald-giannatti-vla.jpg b/stage4/04-pisdr-system/wallpaper/donald-giannatti-vla.jpg
deleted file mode 100644
index 102fb59..0000000
Binary files a/stage4/04-pisdr-system/wallpaper/donald-giannatti-vla.jpg and /dev/null differ
diff --git a/stage4/07-pisdr-sdrplay/00-run.sh b/stage4/07-pisdr-sdrplay/00-run.sh
new file mode 100755
index 0000000..396ab57
--- /dev/null
+++ b/stage4/07-pisdr-sdrplay/00-run.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Radios"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
+
+if [ ! -d "sdrplay" ]; then
+    mkdir -p sdrplay
+fi
+
+cd sdrplay
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-ARM32-3.07.2.run
+chmod +x ./SDRplay_RSP_API-ARM32-3.07.2.run
+./SDRplay_RSP_API-ARM32-3.07.2.run --check
+./SDRplay_RSP_API-ARM32-3.07.2.run --noexec --target .
+sed -i 's/more sdrplay_license.txt//g' install_lib.sh
+sed -i 's/ARCH=\`uname -m\`/ARCH=armv7l/g' install_lib.sh
+printf "\ny\ny\ny\n" | ./install_lib.sh
+systemctl enable sdrplay
+ldconfig
+EOF
\ No newline at end of file
diff --git a/stage4/07-pisdr-sdrplay/01-run.sh b/stage4/07-pisdr-sdrplay/01-run.sh
new file mode 100755
index 0000000..90651f5
--- /dev/null
+++ b/stage4/07-pisdr-sdrplay/01-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
+
+if [ ! -d "SoapySDRPlay3" ]; then
+    git clone --depth 1 https://github.com/pothosware/SoapySDRPlay3.git
+fi
+
+cd SoapySDRPlay3
+mkdir -p build
+cd build
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/07-pisdr-limesdr/00-packages-nr b/stage4/09-pisdr-limesdr/00-packages-nr
similarity index 100%
rename from stage4/07-pisdr-limesdr/00-packages-nr
rename to stage4/09-pisdr-limesdr/00-packages-nr
diff --git a/stage4/07-pisdr-limesdr/00-run.sh b/stage4/09-pisdr-limesdr/00-run.sh
similarity index 100%
rename from stage4/07-pisdr-limesdr/00-run.sh
rename to stage4/09-pisdr-limesdr/00-run.sh
diff --git a/stage4/09-pisdr-rtlsdr/00-packages-nr b/stage4/11-pisdr-rtlsdr/00-packages-nr
similarity index 100%
rename from stage4/09-pisdr-rtlsdr/00-packages-nr
rename to stage4/11-pisdr-rtlsdr/00-packages-nr
diff --git a/stage4/09-pisdr-rtlsdr/00-run.sh b/stage4/11-pisdr-rtlsdr/00-run.sh
similarity index 100%
rename from stage4/09-pisdr-rtlsdr/00-run.sh
rename to stage4/11-pisdr-rtlsdr/00-run.sh
diff --git a/stage4/09-pisdr-rtlsdr/01-run.sh b/stage4/11-pisdr-rtlsdr/01-run.sh
similarity index 100%
rename from stage4/09-pisdr-rtlsdr/01-run.sh
rename to stage4/11-pisdr-rtlsdr/01-run.sh
diff --git a/stage4/11-pisdr-hackrf/00-packages b/stage4/12-pisdr-hackrf/00-packages
similarity index 100%
rename from stage4/11-pisdr-hackrf/00-packages
rename to stage4/12-pisdr-hackrf/00-packages
diff --git a/stage4/11-pisdr-hackrf/00-run.sh b/stage4/12-pisdr-hackrf/00-run.sh
similarity index 100%
rename from stage4/11-pisdr-hackrf/00-run.sh
rename to stage4/12-pisdr-hackrf/00-run.sh
diff --git a/stage4/11-pisdr-hackrf/01-run.sh b/stage4/12-pisdr-hackrf/01-run.sh
similarity index 100%
rename from stage4/11-pisdr-hackrf/01-run.sh
rename to stage4/12-pisdr-hackrf/01-run.sh
diff --git a/stage4/12-pisdr-gnuradio/00-packages-nr b/stage4/13-pisdr-gnuradio/00-packages-nr
similarity index 100%
rename from stage4/12-pisdr-gnuradio/00-packages-nr
rename to stage4/13-pisdr-gnuradio/00-packages-nr
diff --git a/stage4/12-pisdr-gnuradio/00-run.sh b/stage4/13-pisdr-gnuradio/00-run.sh
similarity index 100%
rename from stage4/12-pisdr-gnuradio/00-run.sh
rename to stage4/13-pisdr-gnuradio/00-run.sh
diff --git a/stage4/12-pisdr-gnuradio/01-run.sh b/stage4/13-pisdr-gnuradio/01-run.sh
similarity index 100%
rename from stage4/12-pisdr-gnuradio/01-run.sh
rename to stage4/13-pisdr-gnuradio/01-run.sh
diff --git a/stage4/13-pisdr-gnuradio-mod/01-run.sh b/stage4/14-pisdr-gnuradio-mod/01-run.sh
similarity index 74%
rename from stage4/13-pisdr-gnuradio-mod/01-run.sh
rename to stage4/14-pisdr-gnuradio-mod/01-run.sh
index db2e20d..0e4a775 100755
--- a/stage4/13-pisdr-gnuradio-mod/01-run.sh
+++ b/stage4/14-pisdr-gnuradio-mod/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Radios"
-cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
+mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gr-limesdr" ]; then
     git clone --single-branch --branch gr39 --depth 1 https://github.com/daniestevez/gr-limesdr.git
diff --git a/stage4/13-pisdr-gnuradio-mod/02-run.sh b/stage4/14-pisdr-gnuradio-mod/02-run.sh
similarity index 100%
rename from stage4/13-pisdr-gnuradio-mod/02-run.sh
rename to stage4/14-pisdr-gnuradio-mod/02-run.sh
diff --git a/stage4/14-pisdr-gnuradio-mod/03-run.sh b/stage4/14-pisdr-gnuradio-mod/03-run.sh
new file mode 100755
index 0000000..73401a1
--- /dev/null
+++ b/stage4/14-pisdr-gnuradio-mod/03-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "gr-sdrplay3" ]; then
+    git clone --single-branch --branch master --depth 1 https://github.com/fventuri/gr-sdrplay3.git
+fi
+
+cd gr-sdrplay3
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
diff --git a/stage4/14-pisdr-gqrx/00-packages-nr b/stage4/15-pisdr-gqrx/00-packages-nr
similarity index 100%
rename from stage4/14-pisdr-gqrx/00-packages-nr
rename to stage4/15-pisdr-gqrx/00-packages-nr
diff --git a/stage4/14-pisdr-gqrx/00-run.sh b/stage4/15-pisdr-gqrx/00-run.sh
similarity index 100%
rename from stage4/14-pisdr-gqrx/00-run.sh
rename to stage4/15-pisdr-gqrx/00-run.sh
diff --git a/stage4/15-pisdr-cygnusrf/00-run.sh b/stage4/16-pisdr-cygnusrf/00-run.sh
similarity index 100%
rename from stage4/15-pisdr-cygnusrf/00-run.sh
rename to stage4/16-pisdr-cygnusrf/00-run.sh
diff --git a/stage4/16-pisdr-rtl443/00-run.sh b/stage4/17-pisdr-rtl443/00-run.sh
similarity index 100%
rename from stage4/16-pisdr-rtl443/00-run.sh
rename to stage4/17-pisdr-rtl443/00-run.sh
diff --git a/stage4/17-pisdr-sdrangel/00-packages-nr b/stage4/18-pisdr-sdrangel/00-packages-nr
similarity index 100%
rename from stage4/17-pisdr-sdrangel/00-packages-nr
rename to stage4/18-pisdr-sdrangel/00-packages-nr
diff --git a/stage4/17-pisdr-sdrangel/00-run.sh b/stage4/18-pisdr-sdrangel/00-run.sh
similarity index 100%
rename from stage4/17-pisdr-sdrangel/00-run.sh
rename to stage4/18-pisdr-sdrangel/00-run.sh
diff --git a/stage4/17-pisdr-sdrangel/01-run.sh b/stage4/18-pisdr-sdrangel/01-run.sh
similarity index 100%
rename from stage4/17-pisdr-sdrangel/01-run.sh
rename to stage4/18-pisdr-sdrangel/01-run.sh
diff --git a/stage4/17-pisdr-sdrangel/02-run.sh b/stage4/18-pisdr-sdrangel/02-run.sh
similarity index 100%
rename from stage4/17-pisdr-sdrangel/02-run.sh
rename to stage4/18-pisdr-sdrangel/02-run.sh
diff --git a/stage4/17-pisdr-sdrangel/03-run.sh b/stage4/18-pisdr-sdrangel/03-run.sh
similarity index 100%
rename from stage4/17-pisdr-sdrangel/03-run.sh
rename to stage4/18-pisdr-sdrangel/03-run.sh
diff --git a/stage4/17-pisdr-sdrangel/04-run.sh b/stage4/18-pisdr-sdrangel/04-run.sh
similarity index 100%
rename from stage4/17-pisdr-sdrangel/04-run.sh
rename to stage4/18-pisdr-sdrangel/04-run.sh
diff --git a/stage4/17-pisdr-sdrangel/05-run.sh b/stage4/18-pisdr-sdrangel/05-run.sh
similarity index 100%
rename from stage4/17-pisdr-sdrangel/05-run.sh
rename to stage4/18-pisdr-sdrangel/05-run.sh
diff --git a/stage4/18-pisdr-libacars/00-packages-nr b/stage4/19-pisdr-libacars/00-packages-nr
similarity index 100%
rename from stage4/18-pisdr-libacars/00-packages-nr
rename to stage4/19-pisdr-libacars/00-packages-nr
diff --git a/stage4/18-pisdr-libacars/00-run.sh b/stage4/19-pisdr-libacars/00-run.sh
similarity index 100%
rename from stage4/18-pisdr-libacars/00-run.sh
rename to stage4/19-pisdr-libacars/00-run.sh
diff --git a/stage4/19-pisdr-acarsdec/00-run.sh b/stage4/20-pisdr-acarsdec/00-run.sh
similarity index 100%
rename from stage4/19-pisdr-acarsdec/00-run.sh
rename to stage4/20-pisdr-acarsdec/00-run.sh
diff --git a/stage4/20-pisdr-multimonng/00-run.sh b/stage4/21-pisdr-multimonng/00-run.sh
similarity index 100%
rename from stage4/20-pisdr-multimonng/00-run.sh
rename to stage4/21-pisdr-multimonng/00-run.sh
diff --git a/stage4/21-pisdr-hamlib/00-packages-nr b/stage4/22-pisdr-hamlib/00-packages-nr
similarity index 100%
rename from stage4/21-pisdr-hamlib/00-packages-nr
rename to stage4/22-pisdr-hamlib/00-packages-nr
diff --git a/stage4/21-pisdr-hamlib/00-run.sh b/stage4/22-pisdr-hamlib/00-run.sh
similarity index 94%
rename from stage4/21-pisdr-hamlib/00-run.sh
rename to stage4/22-pisdr-hamlib/00-run.sh
index 37f2164..475bb04 100755
--- a/stage4/21-pisdr-hamlib/00-run.sh
+++ b/stage4/22-pisdr-hamlib/00-run.sh
@@ -12,5 +12,6 @@ cd Hamlib
 ./bootstrap
 ./configure --with-python-binding
 make -j$(nproc)
+make install
 ldconfig
-EOF
\ No newline at end of file
+EOF
diff --git a/stage4/22-pisdr-gpredict/00-packages-nr b/stage4/23-pisdr-gpredict/00-packages-nr
similarity index 100%
rename from stage4/22-pisdr-gpredict/00-packages-nr
rename to stage4/23-pisdr-gpredict/00-packages-nr
diff --git a/stage4/22-pisdr-gpredict/00-run.sh b/stage4/23-pisdr-gpredict/00-run.sh
similarity index 89%
rename from stage4/22-pisdr-gpredict/00-run.sh
rename to stage4/23-pisdr-gpredict/00-run.sh
index 805f6a0..4feb5d2 100755
--- a/stage4/22-pisdr-gpredict/00-run.sh
+++ b/stage4/23-pisdr-gpredict/00-run.sh
@@ -10,6 +10,7 @@ fi
 
 cd gpredict
 bash autogen.sh
-make -j$(nproc) install
+make -j$(nproc)
+make install
 ldconfig
-EOF
\ No newline at end of file
+EOF
diff --git a/stage4/23-pisdr-rpitx/00-packages-nr b/stage4/24-pisdr-rpitx/00-packages-nr
similarity index 100%
rename from stage4/23-pisdr-rpitx/00-packages-nr
rename to stage4/24-pisdr-rpitx/00-packages-nr
diff --git a/stage4/23-pisdr-rpitx/00-run.sh b/stage4/24-pisdr-rpitx/00-run.sh
similarity index 100%
rename from stage4/23-pisdr-rpitx/00-run.sh
rename to stage4/24-pisdr-rpitx/00-run.sh
diff --git a/stage4/24-pisdr-virgo/00-run.sh b/stage4/25-pisdr-virgo/00-run.sh
similarity index 100%
rename from stage4/24-pisdr-virgo/00-run.sh
rename to stage4/25-pisdr-virgo/00-run.sh
diff --git a/stage4/25-pisdr-quisk/00-packages-nr b/stage4/26-pisdr-quisk/00-packages-nr
similarity index 100%
rename from stage4/25-pisdr-quisk/00-packages-nr
rename to stage4/26-pisdr-quisk/00-packages-nr
diff --git a/stage4/25-pisdr-quisk/00-run.sh b/stage4/26-pisdr-quisk/00-run.sh
similarity index 100%
rename from stage4/25-pisdr-quisk/00-run.sh
rename to stage4/26-pisdr-quisk/00-run.sh
diff --git a/stage4/26-pisdr-limesdr-toolbox/00-run.sh b/stage4/27-pisdr-limesdr-toolbox/00-run.sh
similarity index 100%
rename from stage4/26-pisdr-limesdr-toolbox/00-run.sh
rename to stage4/27-pisdr-limesdr-toolbox/00-run.sh
diff --git a/stage4/27-pisdr-airband/00-packages-nr b/stage4/28-pisdr-airband/00-packages-nr
similarity index 100%
rename from stage4/27-pisdr-airband/00-packages-nr
rename to stage4/28-pisdr-airband/00-packages-nr
diff --git a/stage4/27-pisdr-airband/00-run.sh b/stage4/28-pisdr-airband/00-run.sh
similarity index 100%
rename from stage4/27-pisdr-airband/00-run.sh
rename to stage4/28-pisdr-airband/00-run.sh
diff --git a/stage4/28-pisdr-osmo-fl2k/00-packages-nr b/stage4/29-pisdr-osmo-fl2k/00-packages-nr
similarity index 100%
rename from stage4/28-pisdr-osmo-fl2k/00-packages-nr
rename to stage4/29-pisdr-osmo-fl2k/00-packages-nr
diff --git a/stage4/28-pisdr-osmo-fl2k/00-run.sh b/stage4/29-pisdr-osmo-fl2k/00-run.sh
similarity index 100%
rename from stage4/28-pisdr-osmo-fl2k/00-run.sh
rename to stage4/29-pisdr-osmo-fl2k/00-run.sh
diff --git a/stage4/29-pisdr-leandvb/00-run.sh b/stage4/30-pisdr-leandvb/00-run.sh
similarity index 100%
rename from stage4/29-pisdr-leandvb/00-run.sh
rename to stage4/30-pisdr-leandvb/00-run.sh
diff --git a/stage4/30-pisdr-vaportrail/00-run.sh b/stage4/31-pisdr-vaportrail/00-run.sh
similarity index 100%
rename from stage4/30-pisdr-vaportrail/00-run.sh
rename to stage4/31-pisdr-vaportrail/00-run.sh
diff --git a/stage4/32-pisdr-foxtelem/00-run.sh b/stage4/32-pisdr-foxtelem/00-run.sh
index f8f005a..d6d090b 100755
--- a/stage4/32-pisdr-foxtelem/00-run.sh
+++ b/stage4/32-pisdr-foxtelem/00-run.sh
@@ -8,5 +8,6 @@ if [ ! -d "FoxTelem" ]; then
     wget http://amsat.us/FoxTelem/linux/FoxTelem_1.11g2_linux.tar.gz
     tar -xvzf FoxTelem_1.11g2_linux.tar.gz
     mv FoxTelem_1.11g2_linux FoxTelem
+    rm FoxTelem_1.11g2_linux.tar.gz
 fi
 EOF
diff --git a/stage4/33-pisdr-sdrplusplus/00-packages-nr b/stage4/33-pisdr-sdrplusplus/00-packages-nr
new file mode 100644
index 0000000..56991f4
--- /dev/null
+++ b/stage4/33-pisdr-sdrplusplus/00-packages-nr
@@ -0,0 +1,4 @@
+libfftw3-dev
+libglfw3-dev
+libglew-dev
+librtaudio-dev
\ No newline at end of file
diff --git a/stage4/33-pisdr-sdrplusplus/00-run.sh b/stage4/33-pisdr-sdrplusplus/00-run.sh
new file mode 100755
index 0000000..6394fe5
--- /dev/null
+++ b/stage4/33-pisdr-sdrplusplus/00-run.sh
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "SDRPlusPlus" ]; then
+    git clone --single-branch --branch 1.0.4 --depth 1 https://github.com/AlexandreRouma/SDRPlusPlus.git
+fi
+
+cd SDRPlusPlus
+bash ./create_root.sh
+mkdir -p build
+cd build
+cmake -DOPT_BUILD_AIRSPY_SOURCE=ON \
+      -DOPT_BUILD_AIRSPYHF_SOURCE=ON \
+      -DOPT_BUILD_FILE_SOURCE=ON \
+      -DOPT_BUILD_HACKRF_SOURCE=ON \
+      -DOPT_BUILD_LIMESDR_SOURCE=ON \
+      -DOPT_BUILD_RTL_SDR_SOURCE=ON \
+      -DOPT_BUILD_RTL_TCP_SOURCE=ON \
+      -DOPT_BUILD_SDRPLAY_SOURCE=ON \
+      -DOPT_BUILD_SOAPY_SOURCE=ON \
+      -DOPT_BUILD_SPYSERVER_SOURCE=ON \
+      -DOPT_BUILD_PLUTOSDR_SOURCE=ON \
+      -DOPT_BUILD_AUDIO_SINK=ON \
+      -DOPT_BUILD_NETWORK_SINK=ON \
+      -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON \
+      -DOPT_BUILD_M17_DECODER=ON \
+      -DOPT_BUILD_METEOR_DEMODULATOR=ON \
+      -DOPT_BUILD_RADIO=ON \
+      -DOPT_BUILD_DISCORD_PRESENCE=ON \
+      -DOPT_BUILD_FREQUENCY_MANAGER=ON \
+      -DOPT_BUILD_RECORDER=ON \
+      -DOPT_BUILD_RIGCTL_SERVER=ON \
+      -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/34-pisdr-glrpt/00-packages-nr b/stage4/34-pisdr-glrpt/00-packages-nr
new file mode 100644
index 0000000..ba026bb
--- /dev/null
+++ b/stage4/34-pisdr-glrpt/00-packages-nr
@@ -0,0 +1 @@
+libturbojpeg0-dev
\ No newline at end of file
diff --git a/stage4/34-pisdr-glrpt/00-run.sh b/stage4/34-pisdr-glrpt/00-run.sh
new file mode 100755
index 0000000..94353c9
--- /dev/null
+++ b/stage4/34-pisdr-glrpt/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "glrpt" ]; then
+    git clone --depth 1 https://github.com/dvdesolve/glrpt.git
+fi
+
+cd glrpt
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/31-pisdr-urh/00-run.sh b/stage4/35-pisdr-urh/00-run.sh
similarity index 100%
rename from stage4/31-pisdr-urh/00-run.sh
rename to stage4/35-pisdr-urh/00-run.sh
diff --git a/stage4/36-pisdr-xwxapt/00-run.sh b/stage4/36-pisdr-xwxapt/00-run.sh
new file mode 100755
index 0000000..d06871c
--- /dev/null
+++ b/stage4/36-pisdr-xwxapt/00-run.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "xwxapt" ]; then
+    mkdir -p xwxapt
+fi
+
+cd xwxapt
+wget http://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-3.4.3.tar.bz2
+tar jxvf xwxapt-3.4.3.tar.bz2
+cd xwxapt-3.4.3
+./autogen.sh
+./configure
+make -j$(nproc)
+make install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/stage4/37-pisdr-nrsc5/00-packages-nr b/stage4/37-pisdr-nrsc5/00-packages-nr
new file mode 100644
index 0000000..572f460
--- /dev/null
+++ b/stage4/37-pisdr-nrsc5/00-packages-nr
@@ -0,0 +1,5 @@
+autoconf
+libtool
+libao-dev
+libfftw3-dev
+libfaad-dev
\ No newline at end of file
diff --git a/stage4/37-pisdr-nrsc5/00-run.sh b/stage4/37-pisdr-nrsc5/00-run.sh
new file mode 100755
index 0000000..192004f
--- /dev/null
+++ b/stage4/37-pisdr-nrsc5/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "nrsc5" ]; then
+    git clone --depth 1 https://github.com/theori-io/nrsc5.git
+fi
+
+cd nrsc5
+mkdir -p build
+cd build
+cmake -DUSE_NEON=ON -DUSE_FAAD2=OFF -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/38-pisdr-wsjtx/00-packages-nr b/stage4/38-pisdr-wsjtx/00-packages-nr
new file mode 100644
index 0000000..c4a5429
--- /dev/null
+++ b/stage4/38-pisdr-wsjtx/00-packages-nr
@@ -0,0 +1 @@
+wsjtx
\ No newline at end of file
diff --git a/stage4/39-pisdr-inspectrum/00-packages-nr b/stage4/39-pisdr-inspectrum/00-packages-nr
new file mode 100644
index 0000000..8594f21
--- /dev/null
+++ b/stage4/39-pisdr-inspectrum/00-packages-nr
@@ -0,0 +1 @@
+libliquid-dev
\ No newline at end of file
diff --git a/stage4/39-pisdr-inspectrum/00-run.sh b/stage4/39-pisdr-inspectrum/00-run.sh
new file mode 100755
index 0000000..c75b015
--- /dev/null
+++ b/stage4/39-pisdr-inspectrum/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "inspectrum" ]; then
+    git clone --depth 1 https://github.com/miek/inspectrum.git
+fi
+
+cd inspectrum
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/40-pisdr-rtlais/00-run.sh b/stage4/40-pisdr-rtlais/00-run.sh
new file mode 100755
index 0000000..fb44773
--- /dev/null
+++ b/stage4/40-pisdr-rtlais/00-run.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "rtl-ais" ]; then
+    git clone --depth 1 https://github.com/dgiardini/rtl-ais.git
+fi
+
+cd rtl-ais
+make -j$(nproc)
+make install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/stage4/41-pisdr-iiooscilloscope/00-packages-nr b/stage4/41-pisdr-iiooscilloscope/00-packages-nr
new file mode 100644
index 0000000..c45143d
--- /dev/null
+++ b/stage4/41-pisdr-iiooscilloscope/00-packages-nr
@@ -0,0 +1,16 @@
+libglib2.0-dev
+libgtk2.0-dev
+libgtkdatabox-dev
+libmatio-dev
+libfftw3-dev
+libxml2
+libxml2-dev
+bison
+flex
+libavahi-common-dev
+libavahi-client-dev
+libcurl4-openssl-dev
+libjansson-dev
+cmake
+libaio-dev
+libserialport-dev
\ No newline at end of file
diff --git a/stage4/41-pisdr-iiooscilloscope/00-run.sh b/stage4/41-pisdr-iiooscilloscope/00-run.sh
new file mode 100755
index 0000000..5067473
--- /dev/null
+++ b/stage4/41-pisdr-iiooscilloscope/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "iio-oscilloscope" ]; then
+    git clone --depth 1 https://github.com/analogdevicesinc/iio-oscilloscope.git
+fi
+
+cd iio-oscilloscope
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/42-pisdr-qtdab/00-packages-nr b/stage4/42-pisdr-qtdab/00-packages-nr
new file mode 100644
index 0000000..04e85e5
--- /dev/null
+++ b/stage4/42-pisdr-qtdab/00-packages-nr
@@ -0,0 +1,11 @@
+libsndfile1-dev
+libfftw3-dev
+portaudio19-dev
+libusb-1.0-0-dev
+mesa-common-dev
+libgl1-mesa-dev
+libqt5opengl5-dev
+libsamplerate0-dev
+libqwt-qt5-dev
+qtbase5-dev
+libfaad-dev
\ No newline at end of file
diff --git a/stage4/42-pisdr-qtdab/00-run.sh b/stage4/42-pisdr-qtdab/00-run.sh
new file mode 100755
index 0000000..4532774
--- /dev/null
+++ b/stage4/42-pisdr-qtdab/00-run.sh
@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+
+
+# Dont forget to update the desktop shortcut.
+
+
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "qt-dab" ]; then
+    git clone --single-branch --branch qt-dab-4.11 --depth 1 https://github.com/JvanKatwijk/qt-dab.git
+fi
+
+cd qt-dab/dab-maxi
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/35-pisdr-cleanup/00-run.sh b/stage4/43-pisdr-cleanup/00-run.sh
similarity index 100%
rename from stage4/35-pisdr-cleanup/00-run.sh
rename to stage4/43-pisdr-cleanup/00-run.sh
diff --git a/stage4/35-pisdr-cleanup/01-run.sh b/stage4/43-pisdr-cleanup/01-run.sh
similarity index 88%
rename from stage4/35-pisdr-cleanup/01-run.sh
rename to stage4/43-pisdr-cleanup/01-run.sh
index ec6fc03..4cd430d 100755
--- a/stage4/35-pisdr-cleanup/01-run.sh
+++ b/stage4/43-pisdr-cleanup/01-run.sh
@@ -8,6 +8,7 @@ chown pi:pi /lib/udev/rules.d/90-libiio.rules
 chown pi:pi /etc/udev/rules.d/53-hackrf.rules
 chown pi:pi /etc/udev/rules.d/uhd-usrp.rules
 chown pi:pi /etc/udev/rules.d/64-limesuite.rules
+chown pi:pi /etc/udev/rules.d/66-mirics.rules
 udevadm control --reload-rules
 udevadm trigger
-EOF
\ No newline at end of file
+EOF