diff --git a/app-misc/spicetify-cli/Manifest b/app-misc/spicetify-cli/Manifest
index 2ab4af9..dba060c 100644
--- a/app-misc/spicetify-cli/Manifest
+++ b/app-misc/spicetify-cli/Manifest
@@ -1,2 +1,3 @@
 DIST spicetify-cli-2.38.4-deps.tar.xz 5215372 BLAKE2B 7a1ad9ad256ae31d2f6ae51a0bb01021ab8062769133d0fa1b25796a97925ec3a9ceb48c28490615a4456d346edb8133f255900ab7bc3216ce84135a6e01aef6 SHA512 ce4fa35ec07caccfc165a3f950fdcbf133c88329045d3363a3047aaa6fd2def8ae1960db425e3826000c11145148cdcd6443932d3812a18ff0f27d1e9c033ac6
 DIST spicetify-cli-2.38.4.tar.gz 2022350 BLAKE2B 336fe1e6cf7741bb4acc73b92c13f803c0fe9abfe2ef5eac8b6d23ffad4a8dc0f576363b2022b908abd115076a48581fd989e9ee720f9ed0862a6614d59c0de3 SHA512 381d975515fc4433cb036fbd4ca3670ae509da4670c6784dc1f4fbfcd27c9f4c2f8faf9fa700428688a68dc658916b32fc29859f3df85f2668d4f0f76f39a9f5
+DIST spicetify-themes.zip 101289537 BLAKE2B dfddbc466101ef4771656e0d372c0631b705edd729c6c0fafe8d71d83e26021c25e7bf1f4e91d3e96fba770c77a432c7ab7ef874ff294f60f6c7d2a8a836da1a SHA512 ffec185e48ea2140b5666ef6f791641a719c6c2c8facf11ae8fc1f08c0390501d780bbf683baea342c7cdc6863ab08980563c00353b8882cf48cec7ba99f9ea5
diff --git a/app-misc/spicetify-cli/files/spicetify b/app-misc/spicetify-cli/files/spicetify
deleted file mode 100644
index 0dc7ed4..0000000
--- a/app-misc/spicetify-cli/files/spicetify
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /opt/spicetify-cli/spicetify-cli "$@"
diff --git a/app-misc/spicetify-cli/spicetify-cli-2.38.4.ebuild b/app-misc/spicetify-cli/spicetify-cli-2.38.4.ebuild
index fb4ce29..4d08631 100644
--- a/app-misc/spicetify-cli/spicetify-cli-2.38.4.ebuild
+++ b/app-misc/spicetify-cli/spicetify-cli-2.38.4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# Based on https://data.gpo.zugaina.org/src_prepare-overlay/app-misc/spicetify-cli
 
 EAPI=8
 
@@ -53,15 +54,18 @@ HOMEPAGE="https://spicetify.app/"
 SRC_URI="
 	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
+	community-themes? ( https://github.com/spicetify/spicetify-themes/archive/refs/heads/master.zip -> spicetify-themes.zip )
 "
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="community-themes"
 
 # no tests
 RESTRICT="test"
+BDEPEND="community-themes? ( net-misc/wget )"
 
 INSTALLDIR="/opt/${PN}"
 
@@ -77,6 +81,12 @@ src_install() {
 	exec /opt/spicetify-cli/cli \$@
 	EOF
 	fperms +x "${INSTALLDIR}/cli"
+
+	if use community-themes; then
+		cd "${WORKDIR}/spicetify-themes-master"
+		insinto "${INSTALLDIR}/Themes"
+		doins -r Blossom BurntSienna Default Dreary Dribbblish Flow Matte Nightlight Onepunch SharkBlue Sleek StarryNight Turntable Ziro _Extra text manifest.json
+	fi
 }
 
 pkg_postinst() {