diff --git a/config/desktop/_all_distributions/environments/_all_environments/debian/postinst b/config/desktop/_all_distributions/environments/_all_environments/debian/postinst
index 7f54a61470..5c5755647f 100755
--- a/config/desktop/_all_distributions/environments/_all_environments/debian/postinst
+++ b/config/desktop/_all_distributions/environments/_all_environments/debian/postinst
@@ -24,3 +24,10 @@ done < /etc/passwd
 
 systemctl --user enable psd.service || true >/dev/null 2>&1
 systemctl --user start psd.service || true >/dev/null 2>&1
+
+#
+# gnome logo hack
+#
+
+cp /usr/share/pixmaps/armbian/armbian.png /usr/share/pixmaps/ubuntu-logo-icon.png
+cp /usr/share/pixmaps/armbian/armbian.png /usr/share/pixmaps/ubuntu-logo-dark.png
diff --git a/config/desktop/focal/appgroups/multimedia/packages b/config/desktop/focal/appgroups/multimedia/packages
index 7be8ad70a9..f3a08a0942 100644
--- a/config/desktop/focal/appgroups/multimedia/packages
+++ b/config/desktop/focal/appgroups/multimedia/packages
@@ -1,3 +1,4 @@
 celluloid
+eog
 gimp
 mpv
diff --git a/config/desktop/focal/environments/gnome/debian/postinst b/config/desktop/focal/environments/gnome/debian/postinst
index 3f0f46a320..29f8aa64b9 100644
--- a/config/desktop/focal/environments/gnome/debian/postinst
+++ b/config/desktop/focal/environments/gnome/debian/postinst
@@ -15,7 +15,7 @@ install -Dv /dev/null $profile
 # set default shortcuts
 echo "
 [org/gnome/shell]
-favorite-apps = ['terminator.desktop']
+favorite-apps = ['terminator.desktop', 'org.gnome.Nautilus.desktop', 'google-chrome.desktop', 'thunderbird.desktop', 'code.desktop', 'Zoom.desktop']
 
 [org/gnome/desktop/background]
 picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
diff --git a/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/browsers/debian/postinst b/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/browsers/debian/postinst
deleted file mode 100644
index ba30af432f..0000000000
--- a/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/browsers/debian/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# install Gnome X64 specific
-
-echo "
-[org/gnome/shell]
-favorite-apps = [$(dconf read /org/gnome/shell/favorite-apps | sed 's/[][]//g') , 'google-chrome.desktop']
-" >> $keys
-
-# update
-dconf update
-
diff --git a/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/email/debian/postinst b/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/email/debian/postinst
deleted file mode 100644
index 8c6e1a9a7e..0000000000
--- a/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/email/debian/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# install Gnome X64 specific favorites
-
-echo "
-[org/gnome/shell]
-favorite-apps = [$(dconf read /org/gnome/shell/favorite-apps | sed 's/[][]//g') , 'thunderbird.desktop']
-" >> $keys
-
-# Update
-dconf update
-
diff --git a/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/programming/debian/postinst b/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/programming/debian/postinst
deleted file mode 100644
index a0bed4de4d..0000000000
--- a/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/gnome/appgroups/programming/debian/postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# install Gnome x64 specific favorites
-
-echo "
-[org/gnome/shell]
-favorite-apps = [$(dconf read /org/gnome/shell/favorite-apps | sed 's/[][]//g') , 'code.desktop']
-" >> $keys
-
-# Update
-dconf update
diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
index ea976f3f3f..32f3e88c7a 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
@@ -114,6 +114,9 @@ case "$1" in
 			ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
 			systemctl restart systemd-networkd
 			;;
+		x86|arm64)
+			[[ -n "$(dmesg | grep "No NVIDIA GPU found")" ]] && sudo apt-get -y -qq purge nvidia-dkms-510 nvidia-driver-510 nvidia-settings nvidia-common >> /dev/null
+		;;
 		*)
 
 	esac