diff --git a/stage4/04-pisdr-system/01-run.sh b/stage4/04-pisdr-system/01-run.sh
index afa83f8..8c4a104 100755
--- a/stage4/04-pisdr-system/01-run.sh
+++ b/stage4/04-pisdr-system/01-run.sh
@@ -1,8 +1,12 @@
 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 -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/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/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/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/07-pisdr-sdrplay/00-run.sh b/stage4/07-pisdr-sdrplay/00-run.sh
index ed405dd..396ab57 100755
--- a/stage4/07-pisdr-sdrplay/00-run.sh
+++ b/stage4/07-pisdr-sdrplay/00-run.sh
@@ -8,6 +8,7 @@ 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
diff --git a/stage4/36-pisdr-xwxapt/00-run.sh b/stage4/36-pisdr-xwxapt/00-run.sh
index 9fd4f5f..d06871c 100755
--- a/stage4/36-pisdr-xwxapt/00-run.sh
+++ b/stage4/36-pisdr-xwxapt/00-run.sh
@@ -8,7 +8,7 @@ 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
diff --git a/stage4/42-pisdr-qtdab/00-run.sh b/stage4/42-pisdr-qtdab/00-run.sh
index b421bcb..4532774 100755
--- a/stage4/42-pisdr-qtdab/00-run.sh
+++ b/stage4/42-pisdr-qtdab/00-run.sh
@@ -1,5 +1,11 @@
 #!/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"