diff --git a/docker-compose.yml b/docker-compose.yml
index 506f64d36..b7e375e51 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,102 +1,100 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
 # Copyright (C) 2015, 2016 CERN.
 #
 # Invenio is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public License as
 # published by the Free Software Foundation; either version 2 of the
 # License, or (at your option) any later version.
 #
 # Invenio is distributed in the hope that it will be
 # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Invenio; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307, USA.
 #
 # In applying this license, CERN does not
 # waive the privileges and immunities granted to it by virtue of its status
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
 web:
   restart: "always"
   build: .
   command: /bin/bash -c "invenio3 run -h 0.0.0.0"
   environment:
     - PATH=/home/invenio/.virtualenvs/invenio3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     - VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python
     - INVENIO_WEB_HOST=127.0.0.1
     - INVENIO_WEB_INSTANCE=invenio3
     - INVENIO_WEB_VENV=invenio3
     - INVENIO_USER_EMAIL=info@inveniosoftware.org
     - INVENIO_USER_PASS=uspass123
     - INVENIO_POSTGRESQL_HOST=postgresql
     - INVENIO_POSTGRESQL_DBNAME=invenio3
     - INVENIO_POSTGRESQL_DBUSER=invenio3
     - INVENIO_POSTGRESQL_DBPASS=dbpass123
     - INVENIO_REDIS_HOST=redis
     - INVENIO_ELASTICSEARCH_HOST=elasticsearch
     - INVENIO_RABBITMQ_HOST=rabbitmq
     - INVENIO_WORKER_HOST=127.0.0.1
   volumes_from:
     - static
   links:
     - postgresql
     - redis
     - elasticsearch
     - rabbitmq
   ports:
     - "5000:5000"
 
 postgresql:
   restart: "always"
   image: postgres
   environment:
     - POSTGRES_USER=invenio3
     - POSTGRES_DB=invenio3
     - POSTGRES_PASSWORD=dbpass123
   ports:
     - "25432:5432"
 
 redis:
   restart: "always"
   image: redis
   ports:
     - "26379:6379"
 
 elasticsearch:
   restart: "always"
   image: elasticsearch
   ports:
     - "29200:9200"
     - "29300:9300"
 
 rabbitmq:
   restart: "always"
   image: rabbitmq
   ports:
     - "24369:4369"
     - "45672:25672"
 
 nginx:
   restart: "always"
   build: ./nginx
   ports:
     - "80:80"
   volumes_from:
     - static
   links:
     - web
 
 static:
   restart: "no"
   build: .
   volumes:
     - /home/invenio/.virtualenvs/invenio3/var/invenio3-instance/static
-    - /home/invenio/.virtualenvs/invenio3/src/invenio-theme/invenio_theme/static
-    - /home/invenio/.virtualenvs/invenio3/src/invenio-search-ui/invenio_search_ui/static
   user: invenio
diff --git a/scripts/create-instance.sh b/scripts/create-instance.sh
index 883ed7c4d..658657d24 100755
--- a/scripts/create-instance.sh
+++ b/scripts/create-instance.sh
@@ -1,208 +1,211 @@
 #!/usr/bin/env bash
 #
 # This file is part of Invenio.
 # Copyright (C) 2015, 2016 CERN.
 #
 # Invenio is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public License as
 # published by the Free Software Foundation; either version 2 of the
 # License, or (at your option) any later version.
 #
 # Invenio is distributed in the hope that it will be
 # useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Invenio; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307, USA.
 #
 # In applying this license, CERN does not
 # waive the privileges and immunities granted to it by virtue of its status
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
 # check environment variables:
 if [ -v ${INVENIO_WEB_HOST} ]; then
     echo "[ERROR] Please set environment variable INVENIO_WEB_HOST before runnning this script."
     echo "[ERROR] Example: export INVENIO_WEB_HOST=192.168.50.10"
     exit 1
 fi
 if [ -v ${INVENIO_WEB_INSTANCE} ]; then
     echo "[ERROR] Please set environment variable INVENIO_WEB_INSTANCE before runnning this script."
     echo "[ERROR] Example: export INVENIO_WEB_INSTANCE=invenio3"
     exit 1
 fi
 if [ -v ${INVENIO_WEB_VENV} ]; then
     echo "[ERROR] Please set environment variable INVENIO_WEB_VENV before runnning this script."
     echo "[ERROR] Example: export INVENIO_WEB_VENV=invenio3"
     exit 1
 fi
 if [ -v ${INVENIO_USER_EMAIL} ]; then
     echo "[ERROR] Please set environment variable INVENIO_USER_EMAIL before runnning this script."
     echo "[ERROR] Example: export INVENIO_USER_EMAIL=info@inveniosoftware.org"
     exit 1
 fi
 if [ -v ${INVENIO_USER_PASS} ]; then
     echo "[ERROR] Please set environment variable INVENIO_USER_PASS before runnning this script."
     echo "[ERROR] Example: export INVENIO_USER_PASS=uspass123"
     exit 1
 fi
 if [ -v ${INVENIO_POSTGRESQL_HOST} ]; then
     echo "[ERROR] Please set environment variable INVENIO_POSTGRESQL_HOST before runnning this script."
     echo "[ERROR] Example: export INVENIO_POSTGRESQL_HOST=192.168.50.11"
     exit 1
 fi
 if [ -v ${INVENIO_POSTGRESQL_DBNAME} ]; then
     echo "[ERROR] Please set environment variable INVENIO_POSTGRESQL_DBNAME before runnning this script."
     echo "[ERROR] Example: INVENIO_POSTGRESQL_DBNAME=invenio3"
     exit 1
 fi
 if [ -v ${INVENIO_POSTGRESQL_DBUSER} ]; then
     echo "[ERROR] Please set environment variable INVENIO_POSTGRESQL_DBUSER before runnning this script."
     echo "[ERROR] Example: INVENIO_POSTGRESQL_DBUSER=invenio3"
     exit 1
 fi
 if [ -v ${INVENIO_POSTGRESQL_DBPASS} ]; then
     echo "[ERROR] Please set environment variable INVENIO_POSTGRESQL_DBPASS before runnning this script."
     echo "[ERROR] Example: INVENIO_POSTGRESQL_DBPASS=dbpass123"
     exit 1
 fi
 if [ -v ${INVENIO_REDIS_HOST} ]; then
     echo "[ERROR] Please set environment variable INVENIO_REDIS_HOST before runnning this script."
     echo "[ERROR] Example: export INVENIO_REDIS_HOST=192.168.50.12"
     exit 1
 fi
 if [ -v ${INVENIO_ELASTICSEARCH_HOST} ]; then
     echo "[ERROR] Please set environment variable INVENIO_ELASTICSEARCH_HOST before runnning this script."
     echo "[ERROR] Example: export INVENIO_ELASTICSEARCH_HOST=192.168.50.13"
     exit 1
 fi
 if [ -v ${INVENIO_RABBITMQ_HOST} ]; then
     echo "[ERROR] Please set environment variable INVENIO_RABBITMQ_HOST before runnning this script."
     echo "[ERROR] Example: export INVENIO_RABBITMQ_HOST=192.168.50.14"
     exit 1
 fi
 if [ -v ${INVENIO_WORKER_HOST} ]; then
     echo "[ERROR] Please set environment variable INVENIO_WORKER_HOST before runnning this script."
     echo "[ERROR] Example: export INVENIO_WORKER_HOST=192.168.50.15"
     exit 1
 fi
 
 # load virtualenvrapper:
 source $(which virtualenvwrapper.sh)
 
 # detect pathname of this script:
 scriptpathname=$(cd "$(dirname $0)" && pwd)
 
 # sphinxdoc-create-virtual-environment-begin
 mkvirtualenv ${INVENIO_WEB_VENV}
 cdvirtualenv
 mkdir -p src
 cd src
 # sphinxdoc-create-virtual-environment-end
 
 # quit on errors and unbound symbols:
 set -o errexit
 set -o nounset
 
 if [[ "$@" != *"--devel"* ]]; then
 # sphinxdoc-install-invenio-full-begin
 # FIXME the next pip commands are needed only for invenio<3.0.0a3
 pip install invenio-db[postgresql] --pre
 pip install invenio-access[postgresql] --pre
 pip install invenio-search --pre
 pip install dojson --pre
 # now we can install full Invenio:
 pip install invenio[full] --pre
 # sphinxdoc-install-invenio-full-end
 else
     pip install -r $scriptpathname/../requirements-devel.txt
 fi
 
 # sphinxdoc-create-instance-begin
 inveniomanage instance create ${INVENIO_WEB_INSTANCE}
 # sphinxdoc-create-instance-end
 
 # sphinxdoc-install-instance-begin
 cd ${INVENIO_WEB_INSTANCE}
 pip install -e .
 pip install -r requirements-devel.txt
 # sphinxdoc-install-instance-end
 
 # sphinxdoc-customise-instance-begin
 mkdir -p ../../var/${INVENIO_WEB_INSTANCE}-instance/
 echo "# Database" > ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://${INVENIO_POSTGRESQL_DBUSER}:${INVENIO_POSTGRESQL_DBPASS}@${INVENIO_POSTGRESQL_HOST}:5432/${INVENIO_POSTGRESQL_DBNAME}'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
+echo "# Static file" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
+echo "COLLECT_STORAGE='flask_collect.storage.file'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
+echo "" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "# Redis" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "CACHE_TYPE='redis'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "CACHE_REDIS_HOST='${INVENIO_REDIS_HOST}'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "CACHE_REDIS_URL='redis://${INVENIO_REDIS_HOST}:6379/0'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "ACCOUNTS_SESSION_REDIS_URL='redis://${INVENIO_REDIS_HOST}:6379/1'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "# Celery" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "BROKER_URL='amqp://guest:guest@${INVENIO_RABBITMQ_HOST}:5672//'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "CELERY_RESULT_BACKEND='redis://${INVENIO_REDIS_HOST}:6379/2'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "CELERY_ACCEPT_CONTENT=['json', 'msgpack', 'yaml']" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "# Elasticsearch" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "SEARCH_ELASTIC_HOSTS='${INVENIO_ELASTICSEARCH_HOST}'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 RECORDS_REST_CONF=`cat <<EOF
 RECORDS_REST_ENDPOINTS = dict(
     recid=dict(
         pid_type='recid',
         pid_minter='recid',
         pid_fetcher='recid',
         search_index='marc21',
         search_type=None,
         record_serializers={
         'application/json': ('invenio_records_rest.serializers'
                              ':json_v1_response'),
         },
         search_serializers={
         'application/json': ('invenio_records_rest.serializers'
                              ':json_v1_search'),
         },
         list_route='/records/',
         item_route='/records/<pid_value>',
         default_media_type='application/json',
         max_result_window=10000,
     ),
 )
 EOF
 `
 echo "${RECORDS_REST_CONF}" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 RECORDS_UI_CONF=`cat <<EOF
 RECORDS_UI_ENDPOINTS = dict(
     recid=dict(
       pid_type='recid',
       route='/records/<pid_value>',
       template='invenio_marc21/detail.html',
     ),
 )
 EOF
 `
 echo "${RECORDS_UI_CONF}" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 JSONSCHEMAS_CONF=`cat <<EOF
 JSONSCHEMAS_ENDPOINT='/schema'
 JSONSCHEMAS_HOST='http://${INVENIO_WEB_HOST}:5000'
 EOF
 `
 echo "${JSONSCHEMAS_CONF}" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "OAISERVER_RECORD_INDEX='marc21'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 echo "OAISERVER_ID_PREFIX='oai:${INVENIO_WEB_INSTANCE}:recid/'" >> ../../var/${INVENIO_WEB_INSTANCE}-instance/${INVENIO_WEB_INSTANCE}.cfg
 # sphinxdoc-customise-instance-end
 
 # sphinxdoc-run-npm-begin
 cd ${INVENIO_WEB_INSTANCE}
 ${INVENIO_WEB_INSTANCE} npm
 cdvirtualenv var/${INVENIO_WEB_INSTANCE}-instance/static
 CI=true npm install
 cd -
 # sphinxdoc-run-npm-end
 
 # sphinxdoc-collect-and-build-assets-begin
 ${INVENIO_WEB_INSTANCE} collect -v
 ${INVENIO_WEB_INSTANCE} assets build
 # sphinxdoc-collect-and-build-assets-end