diff --git a/README.md b/README.md
index c700419..74c81ea 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.09.23:** - Add support for custom themes.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
diff --git a/readme-vars.yml b/readme-vars.yml
index a3d07ab..80ee096 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -46,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "06.09.23:", desc: "Add support for custom themes." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
   - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run
index 0ec0b82..6340a4f 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run
@@ -20,6 +20,18 @@ if [ ! -f /config/phpmyadmin/config.inc.php ]; then
     cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php
 fi
 
+# Set up themes
+if [[ -d "/config/themes" && ! -L "/app/www/public/themes" ]]; then
+    cp -R /app/www/public/themes/* /config/themes
+    rm -rf "/app/www/public/themes"
+fi
+if [[ ! -d "/config/themes" && ! -L "/app/www/public/themes" ]]; then
+    mv "/app/www/public/themes" /config/themes
+fi
+if [[ -d "/config/themes" && ! -L "/app/www/public/themes" ]]; then
+    ln -s "/config/themes" "/app/www/public/themes"
+fi
+
 # permissions
 lsiown -R abc:abc \
     /config \