diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.19.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.19.ebuild
deleted file mode 100644
index c08ddfd..0000000
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.19.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="21"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/sifive/meta-sifive"
-IUSE="experimental"
-EXTRAVERSION="-${PN}"
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and surface patches"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0001-surface3-oemb.patch -> ${KV_FULL}-0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0002-mwifiex.patch -> ${KV_FULL}-0002-mwifiex.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0003-ath10k.patch -> ${KV_FULL}-0003-ath10k.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0004-ipts.patch -> ${KV_FULL}-0004-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0005-surface-sam-over-hid.patch -> ${KV_FULL}-0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0006-surface-sam.patch -> ${KV_FULL}-0006-surface-sam.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0007-surface-hotplug.patch -> ${KV_FULL}-0007-surface-hotplug.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0008-surface-typecover.patch -> ${KV_FULL}-0008-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0009-cameras.patch -> ${KV_FULL}-0009-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0010-amd-gpio.patch -> ${KV_FULL}-0010-amd-gpio.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0011-amd-s0ix.patch -> ${KV_FULL}-0011-amd-s0ix.patch
-"
-
-src_unpack() {
-	kernel-2_src_unpack
-	unpack_set_extraversion
-}
-
-src_prepare() {
-	local SURFACE_PATCH
-	local SURFACE_PATCHES="
-	${KV_FULL}-0001-surface3-oemb.patch
-	${KV_FULL}-0002-mwifiex.patch
-	${KV_FULL}-0003-ath10k.patch
-	${KV_FULL}-0004-ipts.patch
-	${KV_FULL}-0005-surface-sam-over-hid.patch
-	${KV_FULL}-0006-surface-sam.patch
-	${KV_FULL}-0007-surface-hotplug.patch
-	${KV_FULL}-0008-surface-typecover.patch
-	${KV_FULL}-0009-cameras.patch
-	${KV_FULL}-0010-amd-gpio.patch
-	${KV_FULL}-0011-amd-s0ix.patch"
-
-
-	local SURFACE_PATH="${DISTDIR}"
-	for SURFACE_PATCH in $SURFACE_PATCHES
-	do
-		eapply "${SURFACE_PATH}/${SURFACE_PATCH}"
-	done
-	eapply_user
-
-	cp "${FILESDIR}/config-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}/EXAMPLE.config"
-
-	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
-	S="${WORKDIR}/linux-${KV_FULL}-surface"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.7.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.7.ebuild
deleted file mode 100644
index 8093fc4..0000000
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="8"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/sifive/meta-sifive"
-IUSE="experimental"
-EXTRAVERSION="-${PN}"
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and surface patches"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0001-surface3-oemb.patch -> ${KV_FULL}-0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0002-mwifiex.patch -> ${KV_FULL}-0002-mwifiex.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0003-ath10k.patch -> ${KV_FULL}-0003-ath10k.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0004-ipts.patch -> ${KV_FULL}-0004-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0005-surface-sam-over-hid.patch -> ${KV_FULL}-0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0006-surface-typecover.patch -> ${KV_FULL}-0006-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0007-cameras.patch -> ${KV_FULL}-0007-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0008-amd-gpio.patch -> ${KV_FULL}-0008-amd-gpio.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0009-amd-s0ix.patch -> ${KV_FULL}-0009-amd-s0ix.patch
-"
-
-src_unpack() {
-	kernel-2_src_unpack
-	unpack_set_extraversion
-}
-
-src_prepare() {
-	local SURFACE_PATCH
-	local SURFACE_PATCHES="
-	${KV_FULL}-0001-surface3-oemb.patch
-	${KV_FULL}-0002-mwifiex.patch
-	${KV_FULL}-0003-ath10k.patch
-	${KV_FULL}-0004-ipts.patch
-	${KV_FULL}-0005-surface-sam-over-hid.patch
-	${KV_FULL}-0006-surface-typecover.patch
-	${KV_FULL}-0007-cameras.patch
-	${KV_FULL}-0008-amd-gpio.patch
-	${KV_FULL}-0009-amd-s0ix.patch"
-
-
-	local SURFACE_PATH="${DISTDIR}"
-	for SURFACE_PATCH in $SURFACE_PATCHES
-	do
-		eapply "${SURFACE_PATH}/${SURFACE_PATCH}"
-	done
-	eapply_user
-
-	cp "${FILESDIR}/config-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}/EXAMPLE.config"
-
-	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
-	S="${WORKDIR}/linux-${KV_FULL}-surface"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.8.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.8.ebuild
deleted file mode 100644
index c5ec00b..0000000
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/sifive/meta-sifive"
-IUSE="experimental"
-EXTRAVERSION="-${PN}"
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and surface patches"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0001-surface3-oemb.patch -> ${KV_FULL}-0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0002-mwifiex.patch -> ${KV_FULL}-0002-mwifiex.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0003-ath10k.patch -> ${KV_FULL}-0003-ath10k.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0004-ipts.patch -> ${KV_FULL}-0004-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0005-surface-sam-over-hid.patch -> ${KV_FULL}-0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0006-surface-typecover.patch -> ${KV_FULL}-0006-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0007-cameras.patch -> ${KV_FULL}-0007-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0008-amd-gpio.patch -> ${KV_FULL}-0008-amd-gpio.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0009-amd-s0ix.patch -> ${KV_FULL}-0009-amd-s0ix.patch
-"
-
-src_unpack() {
-	kernel-2_src_unpack
-	unpack_set_extraversion
-}
-
-src_prepare() {
-	local SURFACE_PATCH
-	local SURFACE_PATCHES="
-	${KV_FULL}-0001-surface3-oemb.patch
-	${KV_FULL}-0002-mwifiex.patch
-	${KV_FULL}-0003-ath10k.patch
-	${KV_FULL}-0004-ipts.patch
-	${KV_FULL}-0005-surface-sam-over-hid.patch
-	${KV_FULL}-0006-surface-typecover.patch
-	${KV_FULL}-0007-cameras.patch
-	${KV_FULL}-0008-amd-gpio.patch
-	${KV_FULL}-0009-amd-s0ix.patch"
-
-
-	local SURFACE_PATH="${DISTDIR}"
-	for SURFACE_PATCH in $SURFACE_PATCHES
-	do
-		eapply "${SURFACE_PATH}/${SURFACE_PATCH}"
-	done
-	eapply_user
-
-	cp "${FILESDIR}/config-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}/EXAMPLE.config"
-
-	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
-	S="${WORKDIR}/linux-${KV_FULL}-surface"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.9.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.15.23.ebuild
similarity index 79%
rename from sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.9.ebuild
rename to sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.15.23.ebuild
index e5ddffb..e5a9db6 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.14.9.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.15.23.ebuild
@@ -16,15 +16,15 @@ IUSE="experimental"
 EXTRAVERSION="-${PN}"
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and surface patches"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0001-surface3-oemb.patch -> ${KV_FULL}-0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0002-mwifiex.patch -> ${KV_FULL}-0002-mwifiex.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0003-ath10k.patch -> ${KV_FULL}-0003-ath10k.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0004-ipts.patch -> ${KV_FULL}-0004-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0005-surface-sam-over-hid.patch -> ${KV_FULL}-0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0006-surface-typecover.patch -> ${KV_FULL}-0006-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0007-cameras.patch -> ${KV_FULL}-0007-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0008-amd-gpio.patch -> ${KV_FULL}-0008-amd-gpio.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.14/0009-amd-s0ix.patch -> ${KV_FULL}-0009-amd-s0ix.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0001-surface3-oemb.patch -> ${KV_FULL}-0001-surface3-oemb.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0002-mwifiex.patch -> ${KV_FULL}-0002-mwifiex.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0003-ath10k.patch -> ${KV_FULL}-0003-ath10k.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0004-ipts.patch -> ${KV_FULL}-0004-ipts.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0005-surface-sam-over-hid.patch -> ${KV_FULL}-0005-surface-sam-over-hid.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0006-surface-typecover.patch -> ${KV_FULL}-0006-surface-typecover.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0007-cameras.patch -> ${KV_FULL}-0007-cameras.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0008-amd-gpio.patch -> ${KV_FULL}-0008-amd-gpio.patch
+		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.15/0009-amd-s0ix.patch -> ${KV_FULL}-0009-amd-s0ix.patch
 "
 
 src_unpack() {