diff --git a/root/srv/setup-ttrss.sh b/root/srv/setup-ttrss.sh
index 6582607..8d95059 100755
--- a/root/srv/setup-ttrss.sh
+++ b/root/srv/setup-ttrss.sh
@@ -51,6 +51,12 @@ setup_ttrss()
     	TTRSS_PATH=/var/www/ttrss
     fi
 
+    TTRSS_PATH_THEMES=${TTRSS_PATH}/themes.local
+    mkdir -p ${TTRSS_PATH_THEMES}
+
+    TTRSS_PATH_PLUGINS=${TTRSS_PATH}/plugins.local
+    mkdir -p ${TTRSS_PATH_PLUGINS}
+
     if [ ! -d ${TTRSS_PATH} ]; then
         mkdir -p ${TTRSS_PATH}
         if [ -n "$TTRSS_GIT_TAG" ]; then
@@ -63,10 +69,10 @@ setup_ttrss()
             echo "Setup: Setting up Tiny Tiny RSS (latest revision) ..."
             git clone --depth=1 ${TTRSS_REPO_URL} ${TTRSS_PATH}
         fi
-        git clone --depth=1 https://github.com/sepich/tt-rss-mobilize.git ${TTRSS_PATH}/plugins/mobilize
-        git clone --depth=1 https://github.com/m42e/ttrss_plugin-feediron.git ${TTRSS_PATH}/plugins/feediron
-        git clone --depth=1 https://github.com/levito/tt-rss-feedly-theme.git ${TTRSS_PATH}/themes/levito-feedly-git
-        git clone --depth=1 https://github.com/Gravemind/tt-rss-feedlish-theme.git ${TTRSS_PATH}/themes/gravemind-feedly-git
+        git clone --depth=1 https://github.com/sepich/tt-rss-mobilize.git ${TTRSS_PATH_PLUGINS}/mobilize
+        git clone --depth=1 https://github.com/m42e/ttrss_plugin-feediron.git ${TTRSS_PATH_PLUGINS}/feediron
+        git clone --depth=1 https://github.com/levito/tt-rss-feedly-theme.git ${TTRSS_PATH_THEMES}/levito-feedly-git
+        git clone --depth=1 https://github.com/Gravemind/tt-rss-feedlish-theme.git ${TTRSS_PATH_THEMES}/gravemind-feedly-git
     fi
 
     # Add initial config.
diff --git a/root/srv/update-ttrss.sh b/root/srv/update-ttrss.sh
index 4c581a0..c13a3b9 100755
--- a/root/srv/update-ttrss.sh
+++ b/root/srv/update-ttrss.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 TTRSS_PATH=/var/www/ttrss
+TTRSS_PATH_THEMES=${TTRSS_PATH}/themes.local
+TTRSS_PATH_PLUGINS=${TTRSS_PATH}/plugins.local
 
 update_ttrss()
 {
@@ -16,25 +18,22 @@ update_ttrss()
 update_plugin_mobilize()
 {
     echo "Updating: Mobilize plugin"
-    ( cd ${TTRSS_PATH}/plugins/mobilize && git pull origin HEAD )
+    ( cd ${TTRSS_PATH_PLUGINS}/mobilize && git pull origin HEAD )
 
     # Patch ttrss-mobilize plugin for getting it to work.
-    sed -i -e "s/<?$/<?php/g" ${TTRSS_PATH}/plugins/mobilize/m.php
+    sed -i -e "s/<?$/<?php/g" ${TTRSS_PATH_PLUGINS}/mobilize/m.php
 }
 
 update_plugin_feediron()
 {
     echo "Updating: FeedIron"
-    ( cd ${TTRSS_PATH}/plugins/feediron && git pull origin HEAD )
+    ( cd ${TTRSS_PATH_PLUGINS}/feediron && git pull origin HEAD )
 }
 
 update_themes()
 {
     echo "Updating: Themes"
 
-    TTRSS_PATH_THEMES=${TTRSS_PATH}/themes.local
-    mkdir -p ${TTRSS_PATH_THEMES}
-
     ( cd ${TTRSS_PATH_THEMES}/levito-feedly-git && git pull origin HEAD )
     ( cd ${TTRSS_PATH_THEMES}/gravemind-feedly-git && git pull origin HEAD )