diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
deleted file mode 100644
index ec18e2c1c..000000000
--- a/app-admin/testdisk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testdisk-7.1_pre20180922.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
deleted file mode 100644
index 09fdc98fa..000000000
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=6837474129968d7de13d91e5454bd824c9136e73
-inherit autotools flag-o-matic gnome2-utils
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-COMMON_DEPEND="
-	static? (
-		sys-apps/util-linux[static-libs]
-		sys-fs/e2fsprogs[static-libs]
-		sys-libs/ncurses:0[static-libs]
-		jpeg? ( virtual/jpeg:0[static-libs] )
-		ntfs? ( sys-fs/ntfs3g:=[static-libs] )
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-		zlib? ( sys-libs/zlib[static-libs] )
-		!arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
-	)
-	!static? (
-		sys-apps/util-linux
-		sys-fs/e2fsprogs
-		sys-libs/ncurses:0=
-		jpeg? ( virtual/jpeg:0 )
-		ntfs? ( sys-fs/ntfs3g )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-		zlib? ( sys-libs/zlib )
-		!arm? ( ewf? ( app-forensics/libewf:= ) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="!static? ( ${COMMON_DEPEND} )"
-
-DOCS=( )
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sudo
-		--without-ntfs
-		$(use_with ewf)
-		$(use_with jpeg)
-		$(use_with ntfs ntfs3g)
-		$(use_enable qt5 qt)
-		$(use_with reiserfs)
-		$(use_with zlib)
-	)
-
-	# this static method is the same used by upstream for their 'static' make
-	# target, but better, as it doesn't break.
-	use static && append-ldflags -static
-
-	econf "${myeconfargs[@]}"
-
-	# perform safety checks for NTFS, REISERFS and JPEG
-	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-		die "Failed to find either NTFS or NTFS-3G library."
-	fi
-	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-		die "Failed to find reiserfs library."
-	fi
-	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-		die "Failed to find jpeg library."
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/profiles/default/package.keywords/default b/profiles/default/package.keywords/default
index d10240b09..d1f86f635 100644
--- a/profiles/default/package.keywords/default
+++ b/profiles/default/package.keywords/default
@@ -68,7 +68,8 @@ dev-util/pycharm-professional amd64
 ~media-gfx/viewnior-1.7 amd64
 ~media-libs/avidemux-core-2.7.6 amd64
 ~media-libs/avidemux-plugins-2.7.6 amd64
-~media-libs/dav1d-0.8.0 amd64
+~media-libs/dav1d-0.8.1 amd64
+~media-libs/libgphoto2-2.5.26 amd64
 ~media-libs/libopenshot-0.2.5 amd64
 ~media-libs/libopenshot-audio-0.2.0 amd64
 ~media-libs/opencolorio-1.1.1 amd64
@@ -147,10 +148,10 @@ sys-apps/inxi amd64
 ~sys-fs/xfsprogs-5.10.0 amd64
 ~sys-fs/zfs-2.0.1 amd64
 ~sys-fs/zfs-kmod-2.0.1 amd64
-~sys-kernel/linux-headers-5.4 amd64
+~sys-kernel/linux-headers-5.10 amd64
 ~sys-power/cpupower-5.4 amd64
 ~sys-process/atop-2.5.0 amd64
-~sys-process/htop-3.0.2 amd64
+~sys-process/htop-3.0.4 amd64
 ~sys-process/nmon-16m amd64
 ~www-apps/gitea-1.13.0 amd64
 ~www-client/falkon-3.1.0 amd64
@@ -186,4 +187,3 @@ www-plugins/chrome-binary-plugins:stable amd64
 =x11-wm/awesome-4.3-r2 amd64
 ~x11-wm/jwm-2.3.7 amd64
 ~x11-wm/openbox-3.6.1 amd64
-~xfce-extra/xfce4-statusnotifier-plugin-0.2.2 amd64
diff --git a/profiles/default/package.keywords/depends b/profiles/default/package.keywords/depends
index 6f431d8bd..5458fa658 100644
--- a/profiles/default/package.keywords/depends
+++ b/profiles/default/package.keywords/depends
@@ -756,4 +756,3 @@ net-vpn/wireguard-tools amd64
 ~x11-wm/windowmaker-0.95.8 amd64
 ~x11-wm/wmfs-20180520 amd64
 ~x11-wm/wmii-3.9.2 amd64
-~xfce-extra/xfce4-alsa-plugin-0.3.0 amd64
diff --git a/profiles/default/package.keywords/xfce b/profiles/default/package.keywords/xfce
index eb23bd2ab..51a8e08e8 100644
--- a/profiles/default/package.keywords/xfce
+++ b/profiles/default/package.keywords/xfce
@@ -1,8 +1,10 @@
 ~dev-python/thunarx-python-0.5.1 amd64
+~x11-terms/xfce4-terminal-0.8.10 amd64
 ~xfce-base/garcon-0.8.0 amd64
 ~xfce-extra/thunar-archive-plugin-0.4.0 amd64
 ~xfce-extra/thunar-media-tags-plugin-0.3.0 amd64
 ~xfce-extra/thunar-vcs-plugin-0.2.0 amd64
+~xfce-extra/xfce4-alsa-plugin-0.3.0 amd64
 ~xfce-extra/xfce4-calculator-plugin-0.7.1 amd64
 ~xfce-extra/xfce4-cpugraph-plugin-1.2.0 amd64
 ~xfce-extra/xfce4-datetime-plugin-0.8.1 amd64
@@ -15,6 +17,7 @@
 ~xfce-extra/xfce4-screenshooter-1.9.8 amd64
 ~xfce-extra/xfce4-sensors-plugin-1.3.95 amd64
 ~xfce-extra/xfce4-smartbookmark-plugin-0.5.2 amd64
+~xfce-extra/xfce4-statusnotifier-plugin-0.2.2 amd64
 ~xfce-extra/xfce4-taskmanager-1.4.0 amd64
 ~xfce-extra/xfce4-xkb-plugin-0.8.2 amd64