diff --git a/bin/cherokee-server b/bin/cherokee-server
index 20a55e8..02e8966 100755
--- a/bin/cherokee-server
+++ b/bin/cherokee-server
@@ -16,6 +16,7 @@ fi
 [ -d "/config/cherokee" ] && cp -Rf "/config/cherokee/." "/etc/cherokee/" || cp -Rf "/usr/local/share/template-files/config/defaults/cherokee/" "/etc/cherokee/"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ -d "/data/htdocs" ] || mkdir -p "/data/htdocs"
+[ -d "/config/cherokee/themes" ] && cp -Rf "/config/cherokee/themes/." "/usr/local/share/cherokee/share/cherokee/themes/"
 if [ -z "$(ls -A /data/htdocs/www/* 2>/dev/null||echo '')" ]; then
   mkdir -p "/data/htdocs" "/data/htdocs/cgi-bin"
   cp -Rf "/usr/local/share/template-files/data/." "/data/"
diff --git a/config/cherokee/cherokee.conf b/config/cherokee/cherokee.conf
index 6b0c430..c89ce96 100644
--- a/config/cherokee/cherokee.conf
+++ b/config/cherokee/cherokee.conf
@@ -27,7 +27,7 @@ vserver!1!rule!5!handler = server_info
 vserver!1!rule!5!handler!type = just_about
 vserver!1!rule!5!match = directory
 vserver!1!rule!5!match!directory = /about
-vserver!1!rule!4!document_root = /usr/local/share/cherokee/lib/cgi-bin
+vserver!1!rule!4!document_root = /data/htdocs/cgi-bin
 vserver!1!rule!4!handler = cgi
 vserver!1!rule!4!match = directory
 vserver!1!rule!4!match!directory = /cgi-bin
@@ -297,4 +297,4 @@ mime!video/x-ms-wvx!extensions = wvx
 mime!video/x-msvideo!extensions = avi
 mime!video/x-sgi-movie!extensions = movie
 mime!x-conference/x-cooltalk!extensions = ice
-mime!x-world/x-vrml!extensions = vrm,vrml,wrl
\ No newline at end of file
+mime!x-world/x-vrml!extensions = vrm,vrml,wrl