diff --git a/app-backup/snapborg/snapborg-9999.ebuild b/app-backup/snapborg/snapborg-9999.ebuild
index 548c490..b2efcaa 100644
--- a/app-backup/snapborg/snapborg-9999.ebuild
+++ b/app-backup/snapborg/snapborg-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 git-r3
diff --git a/app-misc/spicetify-cli/Manifest b/app-misc/spicetify-cli/Manifest
index 5fbecbf..c49f504 100644
--- a/app-misc/spicetify-cli/Manifest
+++ b/app-misc/spicetify-cli/Manifest
@@ -1,2 +1,2 @@
-DIST spicetify-cli-2.36.11-deps.tar.xz 5223520 BLAKE2B baca6229ff613537375da05f7d7c25e6c44301f3e2dd7b30d31f11bc77d5c89c9f8b5e8be5201127ad5d8a2f3356b3e701b837b555dfbe52145cfeb4ef7ea0e3 SHA512 167cc92e9f6fe249ac025185e587fd75d0a61b670b65d5496b19a1cc9826c9509858e6b947d7b06d1ed016bc1121ba0b1680e4cc8e6472624dff92dc35891a99
-DIST spicetify-cli-2.36.11.tar.gz 2018637 BLAKE2B 0822e88c915f33bf3cdfb743ff133e3fff94c7ab4c5cbfe5033492601998ad5edf0940e2ec18005d1ca6140616ef40d33e50281ff00ca8499db14c059614ffe5 SHA512 88e8b07be6207a3d2781dbd1a29b504ab424356c22171de4617e4c1fcf1d19c7f68b17289f85f8342fec026d87d86009bb9e8ef2323db6617d89e64ba0058a0b
+DIST spicetify-cli-2.36.13-deps.tar.xz 5203916 BLAKE2B 6563c43cc708a6c7c037f49ea0fc6cf5ff51af3a6073e8ebbdcf91bce4ff6adf62e4b3eaf04122dfc48614ca65a3e3b60adb73a9388e59e7a601dfae8d040aa1 SHA512 658a8d1e127247a51cea1e9284c3d912c035528373cefa52a8369ddbb0de857178481e7aec84f611e40eb4f5b0a9d212bee19135b6855de010ac05b3f1630954
+DIST spicetify-cli-2.36.13.tar.gz 2020031 BLAKE2B 62b52ddab0e045906b55ec577f0d5d5c29211143c472f4fbe856d6036c41c6807d319a3788ee13c1c25251e853757a229e99a150eb1d01ddd1c7ff0e9e5ed12c SHA512 afac8ef74c40301053203cc3566a6528d034067375d87ccb7415bfaf4ab0b85aec62b4a0932be82aa89ddcc8762e4a72d2a39c0fe746034f06b716f045daea57
diff --git a/app-misc/spicetify-cli/spicetify-cli-2.36.11.ebuild b/app-misc/spicetify-cli/spicetify-cli-2.36.13.ebuild
similarity index 89%
rename from app-misc/spicetify-cli/spicetify-cli-2.36.11.ebuild
rename to app-misc/spicetify-cli/spicetify-cli-2.36.13.ebuild
index 3e0ed01..efca4c3 100644
--- a/app-misc/spicetify-cli/spicetify-cli-2.36.11.ebuild
+++ b/app-misc/spicetify-cli/spicetify-cli-2.36.13.ebuild
@@ -5,8 +5,10 @@ EAPI=8
 
 inherit go-module
 
+MY_PN="cli"
+
 WHITELIST_VERSIONS=(
-	"<> 1.2.8 1.2.37"
+	"<> 1.2.8 1.2.40"
 )
 
 whitelist_versions() {
@@ -49,9 +51,10 @@ whitelist_versions
 DESCRIPTION="Commandline tool to customize Spotify client."
 HOMEPAGE="https://spicetify.app/"
 SRC_URI="
-	https://github.com/spicetify/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spicetify/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://gitlab.com/api/v4/projects/37881342/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
 "
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
 SLOT="0"
@@ -68,9 +71,12 @@ src_compile() {
 
 src_install() {
 	insinto "${INSTALLDIR}"
-	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
-	dobin "${FILESDIR}/spicetify"
-	fperms +x "${INSTALLDIR}/spicetify-cli"
+	doins -r {CustomApps,Extensions,Themes,jsHelper,cli}
+	newbin - spicetify <<-EOF
+	#!/usr/bin/env sh
+	exec /opt/spicetify-cli/cli \$@
+	EOF
+	fperms +x "${INSTALLDIR}/cli"
 }
 
 pkg_postinst() {
diff --git a/dev-python/notify-send-py/notify-send-py-1.2.7.ebuild b/dev-python/notify-send-py/notify-send-py-1.2.7.ebuild
index d5593c4..4eec73c 100644
--- a/dev-python/notify-send-py/notify-send-py-1.2.7.ebuild
+++ b/dev-python/notify-send-py/notify-send-py-1.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit distutils-r1
 
 DESCRIPTION="Script and module for sending desktop notifications"
diff --git a/dev-python/zscroll/zscroll-2.0.1.ebuild b/dev-python/zscroll/zscroll-2.0.1.ebuild
index 6cbca86..625e24d 100644
--- a/dev-python/zscroll/zscroll-2.0.1.ebuild
+++ b/dev-python/zscroll/zscroll-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit distutils-r1
 distutils_enable_tests pytest
 
diff --git a/games-util/oversteer/oversteer-0.8.2.ebuild b/games-util/oversteer/oversteer-0.8.2.ebuild
index a8feef9..57ff3a2 100644
--- a/games-util/oversteer/oversteer-0.8.2.ebuild
+++ b/games-util/oversteer/oversteer-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 DESCRIPTION="Graphical application to configure Logitech Wheels"
 HOMEPAGE="https://github.com/berarma/oversteer"
diff --git a/net-p2p/syncthing-gtk/syncthing-gtk-0.9.4.5-r2.ebuild b/net-p2p/syncthing-gtk/syncthing-gtk-0.9.4.5-r2.ebuild
index 4684e98..379487d 100644
--- a/net-p2p/syncthing-gtk/syncthing-gtk-0.9.4.5-r2.ebuild
+++ b/net-p2p/syncthing-gtk/syncthing-gtk-0.9.4.5-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=true
-PYTHON_COMPAT=( python3_{8..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1 optfeature
 
diff --git a/sys-apps/system76-driver/system76-driver-9999.ebuild b/sys-apps/system76-driver/system76-driver-9999.ebuild
index b581607..bdda1ec 100644
--- a/sys-apps/system76-driver/system76-driver-9999.ebuild
+++ b/sys-apps/system76-driver/system76-driver-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 systemd virtualx git-r3