diff --git a/external/config/cli/bullseye/debootstrap/config_desktop/packages b/external/config/cli/bullseye/debootstrap/config_desktop/packages
index 4047267878ef..20dfb5861197 100644
--- a/external/config/cli/bullseye/debootstrap/config_desktop/packages
+++ b/external/config/cli/bullseye/debootstrap/config_desktop/packages
@@ -1 +1,3 @@
+dconf-cli
+libglib2.0-dev
 libgtk2.0-bin
diff --git a/external/config/cli/bullseye/debootstrap/packages b/external/config/cli/bullseye/debootstrap/packages
index b120db8b462f..fe32e6fcfa42 100644
--- a/external/config/cli/bullseye/debootstrap/packages
+++ b/external/config/cli/bullseye/debootstrap/packages
@@ -6,6 +6,7 @@ cpio
 crda
 cron
 dbus
+dbus-user-session
 dmsetup
 fdisk
 gnupg
diff --git a/external/config/cli/buster/debootstrap/config_desktop/packages b/external/config/cli/buster/debootstrap/config_desktop/packages
index 4047267878ef..20dfb5861197 100644
--- a/external/config/cli/buster/debootstrap/config_desktop/packages
+++ b/external/config/cli/buster/debootstrap/config_desktop/packages
@@ -1 +1,3 @@
+dconf-cli
+libglib2.0-dev
 libgtk2.0-bin
diff --git a/external/config/cli/buster/debootstrap/packages b/external/config/cli/buster/debootstrap/packages
index cda0f4eaf478..bf764c71ef52 100644
--- a/external/config/cli/buster/debootstrap/packages
+++ b/external/config/cli/buster/debootstrap/packages
@@ -5,6 +5,7 @@ console-setup
 cpio
 cron
 dbus
+dbus-user-session
 dmsetup
 fdisk
 gnupg
diff --git a/external/config/cli/buster/main/config_cli_standard/packages b/external/config/cli/buster/main/config_cli_standard/packages
index 70c48ef5e769..bcef71b87ebd 100644
--- a/external/config/cli/buster/main/config_cli_standard/packages
+++ b/external/config/cli/buster/main/config_cli_standard/packages
@@ -24,8 +24,8 @@ libwrap0-dev
 linux-base
 man-db
 networkd-dispatcher
-nfs-kernel-server
 nfs-common
+nfs-kernel-server
 python3-distutils
 python3-lib2to3
 rng-tools
diff --git a/external/config/cli/focal/debootstrap/components b/external/config/cli/focal/debootstrap/components
index 7df132ae4b15..0dcc42257c3a 100644
--- a/external/config/cli/focal/debootstrap/components
+++ b/external/config/cli/focal/debootstrap/components
@@ -1 +1 @@
-main universe
+main universe restricted
diff --git a/external/config/cli/focal/debootstrap/packages b/external/config/cli/focal/debootstrap/packages
index e102fe877de5..2c09babb6e94 100644
--- a/external/config/cli/focal/debootstrap/packages
+++ b/external/config/cli/focal/debootstrap/packages
@@ -6,6 +6,7 @@ cpio
 crda
 cron
 dbus
+dbus-user-session
 dmsetup
 fdisk
 gnupg
@@ -22,7 +23,6 @@ locales
 logrotate
 netbase
 netcat-openbsd
-rng-tools
 rsync
 rsyslog
 sudo
diff --git a/external/config/cli/jammy/debootstrap/components b/external/config/cli/jammy/debootstrap/components
index 7df132ae4b15..0dcc42257c3a 100755
--- a/external/config/cli/jammy/debootstrap/components
+++ b/external/config/cli/jammy/debootstrap/components
@@ -1 +1 @@
-main universe
+main universe restricted
diff --git a/external/config/cli/jammy/debootstrap/packages b/external/config/cli/jammy/debootstrap/packages
index e102fe877de5..2c09babb6e94 100755
--- a/external/config/cli/jammy/debootstrap/packages
+++ b/external/config/cli/jammy/debootstrap/packages
@@ -6,6 +6,7 @@ cpio
 crda
 cron
 dbus
+dbus-user-session
 dmsetup
 fdisk
 gnupg
@@ -22,7 +23,6 @@ locales
 logrotate
 netbase
 netcat-openbsd
-rng-tools
 rsync
 rsyslog
 sudo
diff --git a/external/config/cli/sid b/external/config/cli/sid
deleted file mode 120000
index 766a99ab63dc..000000000000
--- a/external/config/cli/sid
+++ /dev/null
@@ -1 +0,0 @@
-buster
\ No newline at end of file
diff --git a/external/config/cli/sid/debootstrap/components b/external/config/cli/sid/debootstrap/components
new file mode 100644
index 000000000000..ba2906d0666c
--- /dev/null
+++ b/external/config/cli/sid/debootstrap/components
@@ -0,0 +1 @@
+main
diff --git a/external/config/cli/sid/debootstrap/config_desktop/packages b/external/config/cli/sid/debootstrap/config_desktop/packages
new file mode 100644
index 000000000000..20dfb5861197
--- /dev/null
+++ b/external/config/cli/sid/debootstrap/config_desktop/packages
@@ -0,0 +1,3 @@
+dconf-cli
+libglib2.0-dev
+libgtk2.0-bin
diff --git a/external/config/cli/sid/debootstrap/packages b/external/config/cli/sid/debootstrap/packages
new file mode 100644
index 000000000000..bf764c71ef52
--- /dev/null
+++ b/external/config/cli/sid/debootstrap/packages
@@ -0,0 +1,34 @@
+apt-utils
+bzip2
+ca-certificates
+console-setup
+cpio
+cron
+dbus
+dbus-user-session
+dmsetup
+fdisk
+gnupg
+haveged
+ifupdown
+init
+initramfs-tools
+iputils-ping
+isc-dhcp-client
+kmod
+less
+libpam-systemd
+linux-base
+locales
+logrotate
+netbase
+netcat-openbsd
+rsync
+rsyslog
+sudo
+systemd
+tzdata
+ucf
+udev
+whiptail
+wireless-regdb
diff --git a/external/config/cli/sid/main/config_cli_standard/packages b/external/config/cli/sid/main/config_cli_standard/packages
new file mode 100644
index 000000000000..bcef71b87ebd
--- /dev/null
+++ b/external/config/cli/sid/main/config_cli_standard/packages
@@ -0,0 +1,38 @@
+apt-file
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+command-not-found
+console-setup
+dkms
+expect
+fbset
+flex
+gnupg2
+hping3
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+man-db
+networkd-dispatcher
+nfs-common
+nfs-kernel-server
+python3-distutils
+python3-lib2to3
+rng-tools
+selinux-policy-default
+sudo
+unattended-upgrades
+unicode-data
+vnstat
+wireless-regdb
+wpasupplicant
diff --git a/external/config/cli/sid/main/config_cli_standard/packages.additional b/external/config/cli/sid/main/config_cli_standard/packages.additional
new file mode 100644
index 000000000000..a9cbde59edf3
--- /dev/null
+++ b/external/config/cli/sid/main/config_cli_standard/packages.additional
@@ -0,0 +1,38 @@
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+i2c-tools
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+nfs-common
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
diff --git a/external/config/cli/sid/main/config_desktop/packages b/external/config/cli/sid/main/config_desktop/packages
new file mode 100644
index 000000000000..3b19eeba79cd
--- /dev/null
+++ b/external/config/cli/sid/main/config_desktop/packages
@@ -0,0 +1,24 @@
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+console-setup
+expect
+fbset
+flex
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+sudo
+unattended-upgrades
+unicode-data
+wireless-regdb
+wpasupplicant
diff --git a/external/config/cli/sid/main/config_desktop/packages.additional b/external/config/cli/sid/main/config_desktop/packages.additional
new file mode 100644
index 000000000000..052d157ca7ca
--- /dev/null
+++ b/external/config/cli/sid/main/config_desktop/packages.additional
@@ -0,0 +1,36 @@
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
diff --git a/external/config/cli/sid/main/packages b/external/config/cli/sid/main/packages
new file mode 100644
index 000000000000..086157dafd9d
--- /dev/null
+++ b/external/config/cli/sid/main/packages
@@ -0,0 +1,21 @@
+bc
+chrony
+cpufrequtils
+debconf-utils
+device-tree-compiler
+dialog
+fake-hwclock
+figlet
+fping
+nala
+ncurses-term
+nocache
+openssh-server
+parted
+psmisc
+python3-apt
+smartmontools
+sysfsutils
+toilet
+u-boot-tools
+usbutils
diff --git a/external/config/cli/sid/main/packages.additional b/external/config/cli/sid/main/packages.additional
new file mode 100644
index 000000000000..74e4ea8c2e9b
--- /dev/null
+++ b/external/config/cli/sid/main/packages.additional
@@ -0,0 +1,19 @@
+cracklib-runtime
+curl
+htop
+i2c-tools
+iozone3
+jq
+libcrack2
+lsof
+mc
+mmc-utils
+nano
+netplan.io
+net-tools
+network-manager
+network-manager-openvpn
+resolvconf
+sysstat
+wget
+wireless-tools
diff --git a/external/config/cli/sid/main/sources/apt/nala.gpg b/external/config/cli/sid/main/sources/apt/nala.gpg
new file mode 100755
index 000000000000..79361eed92ad
Binary files /dev/null and b/external/config/cli/sid/main/sources/apt/nala.gpg differ
diff --git a/external/config/cli/sid/main/sources/apt/nala.source b/external/config/cli/sid/main/sources/apt/nala.source
new file mode 100755
index 000000000000..a87b69d8bc37
--- /dev/null
+++ b/external/config/cli/sid/main/sources/apt/nala.source
@@ -0,0 +1 @@
+deb [signed-by=/usr/share/keyrings/nala.gpg] http://deb.volian.org/volian/ scar main
diff --git a/external/config/desktop/bullseye/environments/gnome/config_base/packages b/external/config/desktop/bullseye/environments/gnome/config_base/packages
index a3e259c20b76..d798679f4e18 100644
--- a/external/config/desktop/bullseye/environments/gnome/config_base/packages
+++ b/external/config/desktop/bullseye/environments/gnome/config_base/packages
@@ -1,7 +1,9 @@
 anacron
 apt-config-auto-update
+apt-xapian-index
 at-spi2-core
 bubblewrap
+colord
 cups
 dbus-x11
 dictionaries-common
@@ -40,6 +42,7 @@ gir1.2-rsvg-2.0
 gir1.2-snapd-1
 gir1.2-soup-2.4
 gir1.2-upowerglib-1.0
+gist
 gjs
 gnome-control-center
 gnome-desktop3-data
@@ -60,6 +63,7 @@ gvfs-backends
 gvfs-bin
 hunspell-en-us
 inputattach
+inxi
 libaccountsservice0
 libasound2
 libasound2-plugins
@@ -141,6 +145,7 @@ libunwind8
 libupower-glib3
 libusbmuxd6
 libwebkit2gtk-4.0-37
+libxapp1
 libxaw7
 libxfont2
 libxkbfile1
@@ -179,12 +184,14 @@ terminator
 tracker
 tracker-extract
 tracker-miner-fs
+tree
 upower
 x11-apps
 x11-session-utils
 x11-utils
 x11-xkb-utils
 x11-xserver-utils
+xapps-common
 xarchiver
 xdg-dbus-proxy
 xdg-desktop-portal
diff --git a/external/config/desktop/bullseye/environments/mate/config_base/packages b/external/config/desktop/bullseye/environments/mate/config_base/packages
index 9b674a8f45b9..6bb68e15b9b4 100644
--- a/external/config/desktop/bullseye/environments/mate/config_base/packages
+++ b/external/config/desktop/bullseye/environments/mate/config_base/packages
@@ -4,11 +4,13 @@ blueman
 bluez
 bluez-tools
 cifs-utils
+colord
 dbus-x11
 debian-mate-default-settings
 dictionaries-common
 gcr
 gdebi
+gist
 gnome-keyring
 gnome-orca
 gnome-packagekit
@@ -22,6 +24,7 @@ libgck-1-0
 libgl1-mesa-dri
 libgtk2.0-bin
 libpam-gnome-keyring
+libxapp1
 lightdm
 lightdm-gtk-greeter-settings
 mate-applet-appmenu
@@ -104,7 +107,10 @@ system-config-printer-common
 tracker
 tracker-extract
 tracker-miner-fs
+tree
+x11-utils
 x11-xserver-utils
+xapps-common
 xarchiver
 xfonts-base
 xinit
diff --git a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg
new file mode 100755
index 000000000000..b5a8ebbf68ce
Binary files /dev/null and b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg differ
diff --git a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
index 2e6ad7c7036f..71c9724b2c3c 100644
--- a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
+++ b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
@@ -1 +1 @@
-ppa:oibaf/graphics-drivers
\ No newline at end of file
+deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main
diff --git a/external/config/desktop/focal/appgroups/emulators/only_for b/external/config/desktop/focal/appgroups/emulators/only_for
deleted file mode 100755
index d400067581e0..000000000000
--- a/external/config/desktop/focal/appgroups/emulators/only_for
+++ /dev/null
@@ -1 +0,0 @@
-arm64
diff --git a/external/config/desktop/focal/appgroups/emulators/packages b/external/config/desktop/focal/appgroups/emulators/packages
deleted file mode 100755
index d248784d6886..000000000000
--- a/external/config/desktop/focal/appgroups/emulators/packages
+++ /dev/null
@@ -1 +0,0 @@
-box64
diff --git a/external/config/desktop/focal/appgroups/emulators/sources/apt/box64.source b/external/config/desktop/focal/appgroups/emulators/sources/apt/box64.source
deleted file mode 100755
index 20af820d043f..000000000000
--- a/external/config/desktop/focal/appgroups/emulators/sources/apt/box64.source
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ryanfortner.github.io/box64-debs/debian ./
diff --git a/external/config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg b/external/config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg
deleted file mode 100755
index 56b6eb1bca2a..000000000000
--- a/external/config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=yWSi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.gpg b/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.gpg
new file mode 100755
index 000000000000..97a235ec8ba8
Binary files /dev/null and b/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.gpg differ
diff --git a/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source b/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source
index 0eb625d27d2b..8203377c0d36 100755
--- a/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source
+++ b/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source
@@ -1 +1 @@
-deb http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main
+deb [signed-by=/usr/share/keyrings/vscodium.gpg] http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main
diff --git a/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg b/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg
deleted file mode 100755
index d4fb5f708a58..000000000000
--- a/external/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=LCWI
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/external/packages/bsp/common/etc/default/orangepi-ramlog.dpkg-dist b/external/packages/bsp/common/etc/default/orangepi-ramlog.dpkg-dist
index f6fd22896a56..b286d0d93518 100644
--- a/external/packages/bsp/common/etc/default/orangepi-ramlog.dpkg-dist
+++ b/external/packages/bsp/common/etc/default/orangepi-ramlog.dpkg-dist
@@ -15,10 +15,11 @@ USE_RSYNC=true
 # commands used to synchronize logs to disk from RAM (XTRA_RSYNC_TO) or from
 # disk to RAM (XTRA_RSYNC_FROM).  These are bash arrays to make specifying
 # multiple arguments easy even in the presence of whitespace.
-XTRA_RSYNC_TO=(
-  ## If you use log rotation programs that datestamp their logs (e.g., runit's
-  ## svlogd or daemontools' multilog), deleting log files while synchronizing is
-  ## likely a good idea.
-  # --delete
-)
+
+
+# If you use log rotation programs that datestamp their logs (e.g., runit's
+# svlogd or daemontools' multilog), deleting log files while synchronizing is
+# likely a good idea.
+#XTRA_RSYNC_TO=(--delete)
+XTRA_RSYNC_FROM=()
 XTRA_RSYNC_FROM=()
diff --git a/external/packages/bsp/common/usr/lib/nand-sata-install/exclude.txt b/external/packages/bsp/common/usr/lib/nand-sata-install/exclude.txt
index 95b3f17ceb34..61457f55bbd1 100644
--- a/external/packages/bsp/common/usr/lib/nand-sata-install/exclude.txt
+++ b/external/packages/bsp/common/usr/lib/nand-sata-install/exclude.txt
@@ -6,3 +6,4 @@
 /mnt/*
 /run/*
 /tmp/*
+/ddbr/*