diff --git a/nextcloud/11.0/Dockerfile b/nextcloud/11.0/Dockerfile
index d44c1b1..f5b9331 100644
--- a/nextcloud/11.0/Dockerfile
+++ b/nextcloud/11.0/Dockerfile
@@ -110,7 +110,7 @@ COPY s6.d /etc/s6.d
 
 RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
 
-VOLUME /data /config /apps2
+VOLUME /data /config /apps2 /nextcloud/themes
 
 EXPOSE 8888
 
diff --git a/nextcloud/11.0/run.sh b/nextcloud/11.0/run.sh
index ac968ab..95679b4 100644
--- a/nextcloud/11.0/run.sh
+++ b/nextcloud/11.0/run.sh
@@ -10,8 +10,6 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null
 
-mv nextcloud fix && mv fix nextcloud # fix strange bug
-
 # Create folder for php sessions if not exists
 if [ ! -d /data/session ]; then
   mkdir -p /data/session;
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 6b2a476..7a87c85 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -20,7 +20,7 @@
 - OPCache (opcocde), APCu (local) installed and configured.
 - system cron task running.
 - MySQL, PostgreSQL (server not built-in) and sqlite3 support.
-- Redis, FTP, SMB, LDAP support.
+- Redis, FTP, SMB, LDAP, IMAP support.
 - GNU Libiconv for php iconv extension (avoiding errors with some apps).
 - No root processes. Never.
 - Environment variables provided (see below).
@@ -66,6 +66,7 @@ Don't forget to use a **strong password** for the admin account!
 - **/data** : Nextcloud data.
 - **/config** : config.php location.
 - **/apps2** : Nextcloud downloaded apps.
+- **/nextcloud/themes** : Nextcloud themes location.
 
 ### Database
 Basically, you can use a database instance running on the host or any other machine. An easier solution is to use an external database container. I suggest you to use MariaDB, which is a reliable database server. You can use the official `mariadb` image available on Docker Hub to create a database container, which must be linked to the Nextcloud container. PostgreSQL can also be used as well.
@@ -88,6 +89,7 @@ docker run -d --name nextcloud \
        -v /mnt/nextcloud/data:/data \
        -v /mnt/nextcloud/config:/config \
        -v /mnt/nextcloud/apps:/apps2 \
+       -v /mnt/nextcloud/themes:/nextcloud/themes \
        -e UID=1000 -e GID=1000 \
        -e UPLOAD_MAX_SIZE=10G \
        -e APC_SHM_SIZE=128M \
@@ -153,6 +155,7 @@ nextcloud:
     - /mnt/nextcloud/data:/data
     - /mnt/nextcloud/config:/config
     - /mnt/nextcloud/apps:/apps2
+    - /mnt/nextcloud/themes:/nextcloud/themes
 
 # If using MySQL
 nextcloud-db:
diff --git a/nextcloud/daily/Dockerfile b/nextcloud/daily/Dockerfile
index 6ee0dd9..f8468ca 100644
--- a/nextcloud/daily/Dockerfile
+++ b/nextcloud/daily/Dockerfile
@@ -100,7 +100,7 @@ COPY s6.d /etc/s6.d
 
 RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
 
-VOLUME /data /config /apps2
+VOLUME /data /config /apps2 /nextcloud/themes
 
 EXPOSE 8888
 
diff --git a/nextcloud/daily/run.sh b/nextcloud/daily/run.sh
index ac968ab..95679b4 100644
--- a/nextcloud/daily/run.sh
+++ b/nextcloud/daily/run.sh
@@ -10,8 +10,6 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null
 
-mv nextcloud fix && mv fix nextcloud # fix strange bug
-
 # Create folder for php sessions if not exists
 if [ ! -d /data/session ]; then
   mkdir -p /data/session;