diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh
deleted file mode 100755
index ad6298d..0000000
--- a/stage4/04-enable-xcompmgr/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	raspi-config nonint do_xcompmgr 0
-EOF
diff --git a/stage4/04-pisdr-system/01-run.sh b/stage4/04-pisdr-system/01-run.sh
index 583d3e5..afa83f8 100755
--- a/stage4/04-pisdr-system/01-run.sh
+++ b/stage4/04-pisdr-system/01-run.sh
@@ -5,11 +5,11 @@ install -v -o 1000 -g 1000 -m 755 shortcut/sdrangel.desktop "${ROOTFS_DIR}/home/
 install -v -o 1000 -g 1000 -m 755 shortcut/gpredict.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/donald-giannatti-vla.jpg "${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/"
 
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/"
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/menus/"
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/"
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/LXDE-pi/"
 
-install -v -o 1000 -g 1000 -m 644 wallpaper/desktop-items-0.conf "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/LXDE-pi/"
\ No newline at end of file
+install -v -o 1000 -g 1000 -m 644 wallpaper/desktop-items-0.conf "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/LXDE-pi/"
diff --git a/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf b/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf
index 5c29f8f..3ecd629 100644
--- a/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf
+++ b/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf
@@ -1,4 +1,4 @@
 [*]
 wallpaper_mode=crop
 wallpaper_common=1
-wallpaper=/usr/share/rpd-wallpaper/donald-giannatti-vla.jpg
\ No newline at end of file
+wallpaper=/usr/share/rpd-wallpaper/kevin-quezada-lmt.jpg
diff --git a/stage4/04-pisdr-system/wallpaper/kevin-quezada-lmt.jpg b/stage4/04-pisdr-system/wallpaper/kevin-quezada-lmt.jpg
new file mode 100644
index 0000000..2563063
Binary files /dev/null and b/stage4/04-pisdr-system/wallpaper/kevin-quezada-lmt.jpg differ
diff --git a/stage4/05-pisdr-uhd/00-run.sh b/stage4/05-pisdr-uhd/00-run.sh
index 21f6e62..7526a13 100755
--- a/stage4/05-pisdr-uhd/00-run.sh
+++ b/stage4/05-pisdr-uhd/00-run.sh
@@ -11,14 +11,11 @@ fi
 cd uhd/host
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \
-      -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \
-      -DCMAKE_ASM_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15" \
-      -GNinja -DCMAKE_BUILD_TYPE=Release ../
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release ../
 ninja install
 cp /usr/local/lib/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/
 ldconfig
 uhd_images_downloader
 cd ..
 rm -fr build
-EOF
\ No newline at end of file
+EOF
diff --git a/stage4/07-pisdr-soapysdr/00-packages-nr b/stage4/06-pisdr-soapysdr/00-packages-nr
similarity index 100%
rename from stage4/07-pisdr-soapysdr/00-packages-nr
rename to stage4/06-pisdr-soapysdr/00-packages-nr
diff --git a/stage4/07-pisdr-soapysdr/01-run.sh b/stage4/06-pisdr-soapysdr/01-run.sh
similarity index 100%
rename from stage4/07-pisdr-soapysdr/01-run.sh
rename to stage4/06-pisdr-soapysdr/01-run.sh
diff --git a/stage4/07-pisdr-soapysdr/02-run.sh b/stage4/06-pisdr-soapysdr/02-run.sh
similarity index 100%
rename from stage4/07-pisdr-soapysdr/02-run.sh
rename to stage4/06-pisdr-soapysdr/02-run.sh
diff --git a/stage4/08-pisdr-limesdr/00-packages-nr b/stage4/07-pisdr-limesdr/00-packages-nr
similarity index 100%
rename from stage4/08-pisdr-limesdr/00-packages-nr
rename to stage4/07-pisdr-limesdr/00-packages-nr
diff --git a/stage4/08-pisdr-limesdr/00-run.sh b/stage4/07-pisdr-limesdr/00-run.sh
similarity index 100%
rename from stage4/08-pisdr-limesdr/00-run.sh
rename to stage4/07-pisdr-limesdr/00-run.sh
diff --git a/stage4/07-pisdr-soapysdr/03-run.sh b/stage4/07-pisdr-soapysdr/03-run.sh
deleted file mode 100755
index cabe0f3..0000000
--- a/stage4/07-pisdr-soapysdr/03-run.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-on_chroot << EOF
-mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
-cd 	    	"/home/${FIRST_USER_NAME}/PiSDR/Software"
-
-if [ ! -d "gr-soapy" ]; then
-    git clone --depth 1 https://gitlab.com/librespacefoundation/gr-soapy.git
-fi
-
-cd gr-soapy
-mkdir -p build
-cd build
-cmake -GNinja ..
-ninja install
-ldconfig
-cd ..
-rm -fr build
-EOF
diff --git a/stage4/09-pisdr-airspy/00-run.sh b/stage4/08-pisdr-airspy/00-run.sh
similarity index 100%
rename from stage4/09-pisdr-airspy/00-run.sh
rename to stage4/08-pisdr-airspy/00-run.sh
diff --git a/stage4/09-pisdr-airspy/01-run.sh b/stage4/08-pisdr-airspy/01-run.sh
similarity index 100%
rename from stage4/09-pisdr-airspy/01-run.sh
rename to stage4/08-pisdr-airspy/01-run.sh
diff --git a/stage4/09-pisdr-airspy/02-run.sh b/stage4/08-pisdr-airspy/02-run.sh
similarity index 100%
rename from stage4/09-pisdr-airspy/02-run.sh
rename to stage4/08-pisdr-airspy/02-run.sh
diff --git a/stage4/09-pisdr-airspy/03-run.sh b/stage4/08-pisdr-airspy/03-run.sh
similarity index 100%
rename from stage4/09-pisdr-airspy/03-run.sh
rename to stage4/08-pisdr-airspy/03-run.sh
diff --git a/stage4/10-pisdr-rtlsdr/00-run.sh b/stage4/09-pisdr-rtlsdr/00-run.sh
similarity index 100%
rename from stage4/10-pisdr-rtlsdr/00-run.sh
rename to stage4/09-pisdr-rtlsdr/00-run.sh
diff --git a/stage4/10-pisdr-rtlsdr/01-run.sh b/stage4/09-pisdr-rtlsdr/01-run.sh
similarity index 100%
rename from stage4/10-pisdr-rtlsdr/01-run.sh
rename to stage4/09-pisdr-rtlsdr/01-run.sh
diff --git a/stage4/11-pisdr-plutosdr/00-packages-nr b/stage4/10-pisdr-plutosdr/00-packages-nr
similarity index 100%
rename from stage4/11-pisdr-plutosdr/00-packages-nr
rename to stage4/10-pisdr-plutosdr/00-packages-nr
diff --git a/stage4/11-pisdr-plutosdr/00-run.sh b/stage4/10-pisdr-plutosdr/00-run.sh
similarity index 100%
rename from stage4/11-pisdr-plutosdr/00-run.sh
rename to stage4/10-pisdr-plutosdr/00-run.sh
diff --git a/stage4/11-pisdr-plutosdr/01-run.sh b/stage4/10-pisdr-plutosdr/01-run.sh
similarity index 100%
rename from stage4/11-pisdr-plutosdr/01-run.sh
rename to stage4/10-pisdr-plutosdr/01-run.sh
diff --git a/stage4/11-pisdr-plutosdr/03-run.sh b/stage4/10-pisdr-plutosdr/03-run.sh
similarity index 100%
rename from stage4/11-pisdr-plutosdr/03-run.sh
rename to stage4/10-pisdr-plutosdr/03-run.sh
diff --git a/stage4/12-pisdr-hackrf/00-run.sh b/stage4/11-pisdr-hackrf/00-run.sh
similarity index 100%
rename from stage4/12-pisdr-hackrf/00-run.sh
rename to stage4/11-pisdr-hackrf/00-run.sh
diff --git a/stage4/12-pisdr-hackrf/01-run.sh b/stage4/11-pisdr-hackrf/01-run.sh
similarity index 100%
rename from stage4/12-pisdr-hackrf/01-run.sh
rename to stage4/11-pisdr-hackrf/01-run.sh
diff --git a/stage4/11-pisdr-plutosdr/02-run.sh b/stage4/11-pisdr-plutosdr/02-run.sh
deleted file mode 100755
index 5507565..0000000
--- a/stage4/11-pisdr-plutosdr/02-run.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
-cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
-
-if [ ! -d "gr-iio" ]; then
-    git clone --single-branch --branch upgrade-3.8 --depth 1 https://github.com/analogdevicesinc/gr-iio
-fi
-
-cd gr-iio
-mkdir -p build
-cd build
-cmake -GNinja -DINSTALL_UDEV_RULE=ON ..
-ninja install
-ldconfig
-cd ..
-rm -fr build
-EOF
\ No newline at end of file
diff --git a/stage4/06-pisdr-gnuradio/00-packages-nr b/stage4/12-pisdr-gnuradio/00-packages-nr
similarity index 96%
rename from stage4/06-pisdr-gnuradio/00-packages-nr
rename to stage4/12-pisdr-gnuradio/00-packages-nr
index b854773..cef510c 100644
--- a/stage4/06-pisdr-gnuradio/00-packages-nr
+++ b/stage4/12-pisdr-gnuradio/00-packages-nr
@@ -15,10 +15,10 @@ libportaudio2
 pulseaudio
 libjack-dev
 libgmp-dev
-libsdl1.2-dev
 liblog4cpp5-dev
 libqwt-qt5-dev
 libqt5opengl5-dev
+libcodec2-dev
 
 python3-numpy
 python3-mako
diff --git a/stage4/12-pisdr-gnuradio/00-run.sh b/stage4/12-pisdr-gnuradio/00-run.sh
new file mode 100644
index 0000000..b54a0ff
--- /dev/null
+++ b/stage4/12-pisdr-gnuradio/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 "volk" ]; then
+	git clone --single-branch --branch v2.5.0 --depth 1 --recurse-submodules --shallow-submodules https://github.com/gnuradio/volk.git
+fi
+
+cd volk
+mkdir -p build
+cd build
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
diff --git a/stage4/06-pisdr-gnuradio/00-run.sh b/stage4/12-pisdr-gnuradio/01-run.sh
similarity index 85%
rename from stage4/06-pisdr-gnuradio/00-run.sh
rename to stage4/12-pisdr-gnuradio/01-run.sh
index c615d12..7396b8f 100755
--- a/stage4/06-pisdr-gnuradio/00-run.sh
+++ b/stage4/12-pisdr-gnuradio/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gnuradio" ]; then
-    git clone --single-branch --branch maint-3.8 --depth 1 --recurse-submodules --shallow-submodules https://github.com/gnuradio/gnuradio.git
+    git clone --single-branch --branch maint-3.9 --depth 1 --recurse-submodules --shallow-submodules https://github.com/gnuradio/gnuradio.git
 fi
 
 cd gnuradio
@@ -17,4 +17,4 @@ ninja install
 ldconfig
 cd ..
 rm -fr build
-EOF
\ No newline at end of file
+EOF
diff --git a/stage4/08-pisdr-limesdr/01-run.sh b/stage4/13-pisdr-gnuradio-mod/01-run.sh
similarity index 74%
rename from stage4/08-pisdr-limesdr/01-run.sh
rename to stage4/13-pisdr-gnuradio-mod/01-run.sh
index 70c3645..db2e20d 100755
--- a/stage4/08-pisdr-limesdr/01-run.sh
+++ b/stage4/13-pisdr-gnuradio-mod/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "gr-limesdr" ]; then
-    git clone --single-branch --branch gr-3.8 --depth 1 https://github.com/myriadrf/gr-limesdr.git
+    git clone --single-branch --branch gr39 --depth 1 https://github.com/daniestevez/gr-limesdr.git
 fi
 
 cd gr-limesdr
diff --git a/stage4/13-pisdr-osmocom/00-run.sh b/stage4/13-pisdr-gnuradio-mod/02-run.sh
similarity index 75%
rename from stage4/13-pisdr-osmocom/00-run.sh
rename to stage4/13-pisdr-gnuradio-mod/02-run.sh
index 9f505b9..1fff15f 100755
--- a/stage4/13-pisdr-osmocom/00-run.sh
+++ b/stage4/13-pisdr-gnuradio-mod/02-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gr-osmosdr" ]; then
-    git clone --single-branch --branch gr3.8 --depth 1 git://git.osmocom.org/gr-osmosdr
+    git clone --single-branch --branch master --depth 1 git://git.osmocom.org/gr-osmosdr
 fi
 
 cd gr-osmosdr