diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
index 940fe28..7604569
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,285 @@
-# generic
-.DS_Store
-.vagrant
-*.pyc
+# Created by https://www.toptal.com/developers/gitignore/api/python,visualstudiocode,pycharm+iml
+# Edit at https://www.toptal.com/developers/gitignore?templates=python,visualstudiocode,pycharm+iml
 
-# code & config
-_service-provider/*
-_solr/schema.xml
-_src/*
-local/*
-.vscode/settings.json
+### PyCharm+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+### Python Patch ###
+# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
+poetry.toml
+
+# ruff
+.ruff_cache/
+
+# LSP config files
+pyrightconfig.json
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+# End of https://www.toptal.com/developers/gitignore/api/python,visualstudiocode,pycharm+iml
+
+.git-old/*
+.github
\ No newline at end of file
diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..502b578
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,3 @@
+ignored:
+  - DL3018
+  - DL3008
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..40d17f8
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+    "files.associations": {
+        "*html": "jinja-html"
+    },
+    "emmet.includeLanguages": {
+        "jinja-html": "*html"
+    }
+}
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..04b029f
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at info@keitaro.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..7edd28e
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,27 @@
+## How to contribute to Dockerized CKAN
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/keitaroinc/docker-ckan/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/keitaroinc/docker-ckan/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, we include an issue template to help out in filling-in the issue.
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* [Create a new feature issue](https://github.com/keitaroinc/docker-ckan/issues/new) using the Feature Request template and describe your proposed changes
+
+* Submit a pull request referring to the relevant feature issue/s
+
+#### **Do you have questions about the source code?**
+
+* Ask any question about how to use Dockerized CKAN in our [gitter chat](https://gitter.im/keitaroinc/docker-ckan).
+
+Thanks!
+
+Keitaro Team
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..725a7a7
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,190 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2020 Keitaro AB
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..903797e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,9 @@
+VERSION := $(shell git describe --tags --exact-match 2>/dev/null || echo latest)
+DOCKERHUB_NAMESPACE ?= keitaro
+IMAGE := ${DOCKERHUB_NAMESPACE}/ckan:${VERSION}
+
+build:
+	docker build -t ${IMAGE} rootfs
+
+push: build
+	docker push ${IMAGE}
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..2ee6539
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,2 @@
+docker-ckan
+Copyright (c) 2016 Keitaro AB
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 0000000..d50994f
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,6 @@
+# Roadmap
+
+- [ ] Fix Filters in search pages
+- [ ] fix tags page(home sees tags, but "all tags" does not)
+- [ ] check if all requested plugins are working
+- [ ] 
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 0000000..511c630
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,115 @@
+# Dockerized CKAN 
+
+[![build-status](https://github.com/keitaroinc/docker-ckan/workflows/Docker%20Image%20Build/badge.svg?branch=master)](https://github.com/keitaroinc/docker-ckan/actions) [![License][]][1] [![Docker Pulls][]][2] [![Chat on Gitter][]][3]
+    
+This repository contains base docker images, examples and docker-compose used to build and run CKAN. 
+
+We build and publish docker images built using this repository to Dockerhub:
+- [CKAN docker images](https://hub.docker.com/r/keitaro/ckan). 
+- [Datapusher docker images](https://hub.docker.com/r/keitaro/ckan-datapusher)
+
+and Github Container Registry:
+- [CKAN docker images on GHCR](https://github.com/orgs/keitaroinc/packages/container/package/ckan)
+- [Datapusher docker images on GHCR](https://github.com/orgs/keitaroinc/packages/container/package/datapusher)
+
+Looking to run CKAN on Kubernetes? Check out our [CKAN Helm Chart](https://github.com/keitaroinc/ckan-helm)!
+
+## Overview
+Images are provided in two flavors:
+- [Alpine Linux](https://alpinelinux.org/) based images
+- [Ubuntu Focal](https://ubuntu.com/) based images are the ones ending with `-focal` in the tag name
+
+The Docker containers include only the required extensions to start a CKAN instance. The docker images are built using a multi-stage docker approach in order to produce slim production grade docker images with the right libraries and configuration. This multi-stage approach allows us to build python binary wheels in the build stages that later on we install in the main stage.
+
+Directory layout:
+- [compose](./compose) - contains a docker-compose setup allowing users to spin up a CKAN setup easily using [docker-compose](https://docs.docker.com/compose/)
+- [images](./images) - includes docker contexts for building all supported CKAN versions and datapusher
+- [examples](./examples) - includes examples on how to extend the CKAN docker images and how to run them
+
+## Running CKAN using docker-compose
+To start CKAN using docker-compose, simply change into the *compose* directory and run
+```sh
+cd compose/2.9
+docker-compose build
+docker-compose up
+```
+Check if CKAN was succesfuly started on http://localhost:5000. 
+
+### Configuration
+In order to configure CKAN within docker-compose we use both build/up time variables loaded via the [.env](./compose/2.9/.env) file, and runtime variables loaded via the [.ckan-env](./compose/2.9/.ckan-env) file. 
+
+Variables in the [.env](./compose/2.9/.env) file are loaded when running `docker-compose build` and `docker-compose up`, while variables in [.ckan-env](./compose/2.9/.ckan-env) file are used withing the CKAN container at runtime to configure CKAN and CKAN extensions using [ckanext-envvars](https://github.com/okfn/ckanext-envvars).
+
+## Extending CKAN docker images
+Check some examples of extending CKAN docker images in the [examples](./examples) directory.
+
+We recommend to use a multi-stage approach to extend the docker images that we provide here. To extend the images the following Dockerfile structure is recommended:
+```docker
+###################
+### Extensions ####
+###################
+FROM ghcr.io/keitaroinc/ckan:2.9.9 as extbuild
+
+# Switch to the root user
+USER root
+
+# Install any system packages necessary to build extensions
+# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
+RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
+        python3-dev=3.8.10-r0 
+
+# Fetch and build the custom CKAN extensions
+RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0.0.1#egg=ckanext-acme
+
+############
+### MAIN ###
+############
+FROM ghcr.io/keitaroinc/ckan:2.9.9
+
+# Add the custom extensions to the plugins list
+ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme
+
+# Switch to the root user
+USER root
+
+COPY --from=extbuild /wheels /srv/app/ext_wheels
+
+# Install and enable the custom extensions
+RUN pip install --no-index --find-links=/srv/app/ext_wheels ckanext-acme && \
+    ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \
+    chown -R ckan:ckan /srv/app
+
+# Remove wheels
+RUN rm -rf /srv/app/ext_wheels
+
+# Switch to the ckan user
+USER ckan
+```
+
+### Adding init and afterinit scripts
+You can add scripts to CKAN custom images and copy them to the *docker-entrypoint.d* directory. Any *.sh or *.py file in that directory will be executed before the main initialization script (prerun.py) is executed.
+
+You can add scripts to CKAN custom images and copy them to the *docker-afterinit.d* directory. Any *.sh or *.py file in that directory will be executed after the main initialization script (prerun.py) is executed.
+
+## Build
+To build a CKAN image run:
+```sh 
+docker build --tag ghcr.io/keitaroinc/ckan:2.9.9 images/ckan/2.9
+``` 
+The –-tag ghcr.io/keitaroinc/ckan:2.9.9 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.9 and 'images/ckan/2.9'  at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
+
+## Upload to DockerHub
+>*It's recommended to upload built images to DockerHub* 
+
+To upload the image to DockerHub run:
+
+```sh 
+docker push [options] <docker-hub-namespace>/ckan:<image-tag> 
+```
+
+  [License]: https://img.shields.io/badge/license-Apache--2.0-blue.svg?style=flat
+  [1]: https://opensource.org/licenses/Apache-2.0
+  [Docker Pulls]: https://img.shields.io/docker/pulls/keitaro/ckan.svg?style=flat
+  [2]: https://hub.docker.com/r/keitaro/ckan
+  [Chat on Gitter]: https://badges.gitter.im/gitterHQ/gitter.svg
+  [3]: https://gitter.im/keitaroinc/docker-ckan
diff --git a/compose/2.10/.ckan.env b/compose/2.10/.ckan.env
new file mode 100644
index 0000000..ca6058a
--- /dev/null
+++ b/compose/2.10/.ckan.env
@@ -0,0 +1,44 @@
+# Runtime configuration of CKAN enabled through ckanext-envvars
+# Information about how it works: https://github.com/okfn/ckanext-envvars
+# Note that variables here take presedence over build/up time variables in .env
+
+DEVELOPMENT=true
+
+# Set to true to disable CKAN from starting and serve a maintenance page
+MAINTENANCE_MODE=false
+
+# General Settings
+CKAN_SITE_ID=default
+CKAN_SITE_URL=http://localhost:5000
+CKAN_PORT=5000
+CKAN_MAX_UPLOAD_SIZE_MB=200
+CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
+# See https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-settings
+CKAN___API_TOKEN__JWT__ENCODE__SECRET=string:CHANGE_ME
+CKAN___API_TOKEN__JWT__DECODE__SECRET=string:CHANGE_ME
+# CKAN Plugins
+CKAN__PLUGINS="envvars image_view text_view recline_view datastore datapusher spatial_metadata spatial_query d4science d4science_theme"
+# CKAN requires storage path to be set in order for filestore to be enabled
+CKAN__STORAGE_PATH=/srv/app/data
+CKAN__WEBASSETS__PATH=/srv/app/data/webassets
+# SYSADMIN settings, a sysadmin user is created automatically with the below credentials
+CKAN_SYSADMIN_NAME=sysadmin
+CKAN_SYSADMIN_PASSWORD=password
+CKAN_SYSADMIN_EMAIL=sysadmin@ckantest.com
+
+# Email settings
+CKAN_SMTP_SERVER=smtp.corporateict.domain:25
+CKAN_SMTP_STARTTLS=True
+CKAN_SMTP_USER=user
+CKAN_SMTP_PASSWORD=pass
+CKAN_SMTP_MAIL_FROM=ckan@localhost
+
+# Datapusher configuration
+CKAN__DATAPUSHER__URL=http://datapusher:8000
+CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000/
+CKAN__DATAPUSHER__API_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJ6M0lGRGw4SVdFR3lVRzFYRHJ0cm56WmNmcDlzbmFuUHlUMjdqLXRVSW9nIiwiaWF0IjoxNjc3MDYwNjQ1fQ.ECCa0wU-FOOGpdE9_TTVj__2J9SfANRBD6gRClBvPk0
+# CKAN__DATAPUSHER__API_TOKEN=replace_this_with_api_token_once_ckan_starts
+
+# Solr configuration
+CKAN_VERSION=2.10
+CKAN_CORE_NAME=ckan
diff --git a/compose/2.10/Dockerfile b/compose/2.10/Dockerfile
new file mode 100644
index 0000000..e5411d9
--- /dev/null
+++ b/compose/2.10/Dockerfile
@@ -0,0 +1,39 @@
+###################
+### Extensions
+###################
+FROM registry.trust-itservices.com/d4science/ckan-docker/ckan:2.10.4-focal as extbuild
+
+# Switch to the root user
+USER root
+
+#install pip
+RUN apt-get update
+RUN apt-get install python3-dev python3-pip libxml2-dev libxslt1-dev libgeos-c1v5 -y
+
+############
+### MAIN
+############
+FROM registry.trust-itservices.com/d4science/ckan-docker/ckan:2.10.4-focal
+
+# Add the custom extensions to the plugins list
+ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher spatial_metadata spatial_query d4science d4science_theme
+
+# Switch to the root user
+USER root
+
+#COPY --from=extbuild /wheels /srv/app/ext_wheels
+
+# Add requirements.txt to the image
+COPY requirements.txt /srv/app/requirements.txt
+
+# Install and enable the custom extensions
+RUN pip install -r /srv/app/requirements.txt
+
+RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \
+    chown -R ckan:ckan /srv/app
+
+# Remove wheels
+RUN rm -rf /srv/app/ext_wheels
+
+# Switch to the ckan user
+# USER ckan
diff --git a/compose/2.10/ckan-docker.code-workspace b/compose/2.10/ckan-docker.code-workspace
new file mode 100644
index 0000000..407c760
--- /dev/null
+++ b/compose/2.10/ckan-docker.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "../.."
+		}
+	],
+	"settings": {}
+}
\ No newline at end of file
diff --git a/compose/2.10/docker-compose.yml b/compose/2.10/docker-compose.yml
new file mode 100644
index 0000000..8288623
--- /dev/null
+++ b/compose/2.10/docker-compose.yml
@@ -0,0 +1,99 @@
+# docker-compose build && docker-compose up -d
+version: "3.8"
+
+volumes:
+  ckan_data:
+  pg_data:
+  solr_data:
+
+services:
+  ckan:
+    container_name: ckan
+    build:
+      context: .
+    networks:
+      - frontend
+      - backend
+    depends_on:
+      - db
+      - solr
+    ports:
+      - "0.0.0.0:${CKAN_PORT}:5000"
+    env_file:
+      - ./.ckan.env
+    environment:
+      - CKAN_SQLALCHEMY_URL=postgresql://ckan:${POSTGRES_PASSWORD}@db/ckan
+      - CKAN_DATASTORE_WRITE_URL=postgresql://ckan:${POSTGRES_PASSWORD}@db/datastore
+      - CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:${DATASTORE_READONLY_PASSWORD}@db/datastore
+      - CKAN_SOLR_URL=http://solr:8983/solr/ckan
+      - CKAN_REDIS_URL=redis://redis:6379/1
+      - CKAN_SITE_URL=${CKAN_SITE_URL}
+      - CKAN_MAX_UPLOAD_SIZE_MB=${CKAN_MAX_UPLOAD_SIZE_MB}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
+      
+    volumes:
+      - ckan_data:/srv/app/data
+      - ./src:/srv/app/src_extensions
+      - ./docker-entrypoint.d:/srv/app/docker-entrypoint.d
+
+  datapusher:
+    container_name: datapusher
+    image: ghcr.io/keitaroinc/datapusher:${DATAPUSHER_VERSION}
+    networks:
+      - frontend
+      - backend
+    ports:
+      - "8000:8000"
+    environment:
+      - DATAPUSHER_MAX_CONTENT_LENGTH=${DATAPUSHER_MAX_CONTENT_LENGTH}
+      - DATAPUSHER_CHUNK_SIZE=${DATAPUSHER_CHUNK_SIZE}
+      - DATAPUSHER_CHUNK_INSERT_ROWS=${DATAPUSHER_CHUNK_INSERT_ROWS}
+      - DATAPUSHER_DOWNLOAD_TIMEOUT=${DATAPUSHER_DOWNLOAD_TIMEOUT}
+      - DATAPUSHER_SSL_VERIFY=${DATA_PUSHER_SSL_VERIFY}
+      - DATAPUSHER_REWRITE_RESOURCES=${DATAPUSHER_REWRITE_RESOURCES}
+      - DATAPUSHER_REWRITE_URL=${DATAPUSHER_REWRITE_URL}
+
+
+  db:
+    container_name: db
+    build:
+      context: .
+      dockerfile: postgresql/Dockerfile
+      args:
+        - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
+        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    networks:
+      - backend
+    environment:
+      - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - PGDATA=/var/lib/postgresql/data/db
+    volumes:
+      - pg_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "ckan"]
+
+  solr:
+    container_name: solr
+    image: ckan/ckan-solr:2.10-solr9-spatial
+    networks:
+      - backend
+    env_file:
+      - ./.ckan.env
+    environment:
+      - CKAN_CORE_NAME=${CKAN_CORE_NAME}
+      - CKAN_VERSION=${CKAN_VERSION}
+    volumes:
+      - solr_data:/var/solr
+      - ${PWD}/solr8/ckan_init_solr.sh:/docker-entrypoint-initdb.d/ckan_init_solr.sh
+
+  redis:
+    container_name: redis
+    image: redis:${REDIS_VERSION}
+    networks:
+      - backend
+
+networks:
+  frontend:
+  backend:
diff --git a/compose/2.10/docker-entrypoint.d/00_set_ckan_devserver.sh b/compose/2.10/docker-entrypoint.d/00_set_ckan_devserver.sh
new file mode 100644
index 0000000..6b0c2f3
--- /dev/null
+++ b/compose/2.10/docker-entrypoint.d/00_set_ckan_devserver.sh
@@ -0,0 +1 @@
+ckan config-tool ${APP_DIR}/production.ini "ckan.devserver.watch_patterns = **/*.py **/*.html"
\ No newline at end of file
diff --git a/compose/2.10/docker-entrypoint.d/01_setup_spatial.sh b/compose/2.10/docker-entrypoint.d/01_setup_spatial.sh
new file mode 100644
index 0000000..8d387a3
--- /dev/null
+++ b/compose/2.10/docker-entrypoint.d/01_setup_spatial.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [[ $CKAN__PLUGINS == *"spatial_metadata"* ]]; then
+   echo "Configuring CKAN spatial ..."
+
+   ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.common_map.type=Stadia.StamenTerrain"
+   ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.common_map.max_zoom=18"
+   # ckan config-tool $CKAN_INI "ckanext.spatial.search_backend = solr-spatial-field"
+   ckan config-tool ${APP_DIR}/production.ini "ckan.search.solr_allowed_query_parsers = frange"
+   # forse è da aggiungere un qualche tipo di key per production
+
+else
+   echo "Not configuring spatial, plugin not enabled."
+fi
diff --git a/compose/2.10/docker-entrypoint.d/02_setup_extensions.sh b/compose/2.10/docker-entrypoint.d/02_setup_extensions.sh
new file mode 100644
index 0000000..7f6f9c8
--- /dev/null
+++ b/compose/2.10/docker-entrypoint.d/02_setup_extensions.sh
@@ -0,0 +1,42 @@
+SRC_EXTENSIONS_DIR=/srv/app/src_extensions
+
+# Install any local extensions in the src_extensions volume
+echo "Looking for local extensions to install..."
+echo "Extension dir ($SRC_EXTENSIONS_DIR) contents:"
+ls -la $SRC_EXTENSIONS_DIR
+for i in $SRC_EXTENSIONS_DIR/*
+do
+    if [ -d $i ];
+    then
+
+        if [ -f $i/pip-requirements.txt ];
+        then
+            pip install -r $i/pip-requirements.txt
+            echo "Found requirements file in $i"
+        fi
+        if [ -f $i/requirements.txt ];
+        then
+            pip install -r $i/requirements.txt
+            echo "Found requirements file in $i"
+        fi
+        if [ -f $i/dev-requirements.txt ];
+        then
+            pip install -r $i/dev-requirements.txt
+            echo "Found dev-requirements file in $i"
+        fi
+        if [ -f $i/setup.py ];
+        then
+            cd $i
+            python3 $i/setup.py develop
+            echo "Found setup.py file in $i"
+            cd $APP_DIR
+        fi
+
+        # Point `use` in test.ini to location of `test-core.ini`
+        if [ -f $i/test.ini ];
+        then
+            echo "Updating \`test.ini\` reference to \`test-core.ini\` for plugin $i"
+            ckan config-tool $i/test.ini "use = config:../../src/ckan/test-core.ini"
+        fi
+    fi
+done
diff --git a/compose/2.10/postgresql/Dockerfile b/compose/2.10/postgresql/Dockerfile
new file mode 100644
index 0000000..e5fcbb7
--- /dev/null
+++ b/compose/2.10/postgresql/Dockerfile
@@ -0,0 +1,13 @@
+FROM postgis/postgis:14-3.2-alpine
+
+# Allow connections; we don't map out any ports so only linked docker containers can connect
+RUN echo "host all  all    0.0.0.0/0  md5" >> /var/lib/postgresql/data/pg_hba.conf
+
+# Customize default user/pass/db
+ENV POSTGRES_DB ckan
+ENV POSTGRES_USER ckan
+ARG POSTGRES_PASSWORD
+ARG DS_RO_PASS
+
+# Include datastore setup scripts
+COPY ./postgresql/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
diff --git a/compose/2.10/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh b/compose/2.10/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh
new file mode 100644
index 0000000..ec1b3c3
--- /dev/null
+++ b/compose/2.10/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+    CREATE ROLE datastore_ro NOSUPERUSER NOCREATEDB NOCREATEROLE LOGIN PASSWORD '$DS_RO_PASS';
+    CREATE DATABASE datastore OWNER ckan ENCODING 'utf-8';
+    GRANT ALL PRIVILEGES ON DATABASE datastore TO ckan;
+EOSQL
\ No newline at end of file
diff --git a/compose/2.10/postgresql/docker-entrypoint-initdb.d/20_postgis_permissions.sql b/compose/2.10/postgresql/docker-entrypoint-initdb.d/20_postgis_permissions.sql
new file mode 100644
index 0000000..8b5348e
--- /dev/null
+++ b/compose/2.10/postgresql/docker-entrypoint-initdb.d/20_postgis_permissions.sql
@@ -0,0 +1,2 @@
+ALTER VIEW geometry_columns OWNER TO ckan;
+ALTER TABLE spatial_ref_sys OWNER TO ckan;
diff --git a/compose/2.10/requirements.txt b/compose/2.10/requirements.txt
new file mode 100644
index 0000000..9db4c49
--- /dev/null
+++ b/compose/2.10/requirements.txt
@@ -0,0 +1,3 @@
+# Spatial
+-e git+https://github.com/ckan/ckanext-spatial.git@v2.1.1#egg=ckanext-spatial
+-r https://raw.githubusercontent.com/ckan/ckanext-spatial/v2.1.1/requirements.txt
diff --git a/compose/2.10/solr8/ckan_init_solr.sh b/compose/2.10/solr8/ckan_init_solr.sh
new file mode 100755
index 0000000..091450f
--- /dev/null
+++ b/compose/2.10/solr8/ckan_init_solr.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Initialize SOLR for CKAN by creating a ckan core
+# Arguments are supplied via environment variables: CKAN_CORE_NAME CKAN_VERSION
+# Example:
+#   CKAN_CORE_NAME=ckan
+#   CKAN_VERSION=2.9.7
+
+set -e
+
+MAJOR_VERSION=`echo $CKAN_VERSION | cut -d "." -f 1`
+MINOR_VERSION=`echo $CKAN_VERSION | cut -d "." -f 2`
+
+CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/`echo $MAJOR_VERSION.$MINOR_VERSION`/ckan/config/solr/schema.xml
+
+echo "Check whether managed schema exists for CKAN $CKAN_VERSION"
+if ! curl --output /dev/null --silent --head --fail "$CKAN_SOLR_SCHEMA_URL"; then
+  echo "Can't find CKAN SOLR schema at URL: $CKAN_SOLR_SCHEMA_URL. Exiting..."
+  exit 1
+fi
+
+echo "Check whether SOLR is initialized for CKAN"
+CORESDIR=/var/solr/data
+
+COREDIR="$CORESDIR/$CKAN_CORE_NAME"
+if [ -d "$COREDIR" ]; then
+    echo "SOLR already initialized, skipping initialization"
+else
+    echo "Initializing SOLR core $CKAN_CORE_NAME for CKAN $CKAN_VERSION"
+    # init script for handling an empty /var/solr
+    /opt/docker-solr/scripts/init-var-solr
+    
+    # Precreate CKAN core
+    /opt/docker-solr/scripts/precreate-core $CKAN_CORE_NAME
+    
+    # Replace the managed schema with CKANs schema
+    echo "Adding CKAN managed schema"
+    curl $CKAN_SOLR_SCHEMA_URL -o /var/solr/data/$CKAN_CORE_NAME/conf/managed-schema -s
+    
+    echo "SOLR initialized"
+fi
diff --git a/compose/2.10/src/ckanext-d4science/.coveragerc b/compose/2.10/src/ckanext-d4science/.coveragerc
new file mode 100644
index 0000000..895e291
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/.coveragerc
@@ -0,0 +1,5 @@
+[report]
+omit =
+    */site-packages/*
+    */python?.?/*
+    ckan/*
diff --git a/compose/2.10/src/ckanext-d4science/.gitignore b/compose/2.10/src/ckanext-d4science/.gitignore
new file mode 100644
index 0000000..8570dc5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/.gitignore
@@ -0,0 +1,42 @@
+.ropeproject
+node_modules
+bower_components
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+sdist/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Sphinx documentation
+docs/_build/
diff --git a/compose/2.10/src/ckanext-d4science/LICENSE b/compose/2.10/src/ckanext-d4science/LICENSE
new file mode 100644
index 0000000..58777e3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/LICENSE
@@ -0,0 +1,661 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/compose/2.10/src/ckanext-d4science/MANIFEST.in b/compose/2.10/src/ckanext-d4science/MANIFEST.in
new file mode 100644
index 0000000..3d68def
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/MANIFEST.in
@@ -0,0 +1,5 @@
+include README.rst
+include LICENSE
+include requirements.txt
+recursive-include ckanext/d4science *.html *.json *.js *.less *.css *.mo *.yml
+recursive-include ckanext/d4science/migration *.ini *.py *.mako
diff --git a/compose/2.10/src/ckanext-d4science/README.md b/compose/2.10/src/ckanext-d4science/README.md
new file mode 100644
index 0000000..17f8649
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/README.md
@@ -0,0 +1,123 @@
+[![Tests](https://github.com/d4science/ckanext-d4science/workflows/Tests/badge.svg?branch=main)](https://github.com/d4science/ckanext-d4science/actions)
+
+# ckanext-d4science
+
+**TODO:** Put a description of your extension here:  What does it do? What features does it have? Consider including some screenshots or embedding a video!
+
+
+## Requirements
+
+**TODO:** For example, you might want to mention here which versions of CKAN this
+extension works with.
+
+If your extension works across different versions you can add the following table:
+
+Compatibility with core CKAN versions:
+
+| CKAN version    | Compatible?   |
+| --------------- | ------------- |
+| 2.6 and earlier | not tested    |
+| 2.7             | not tested    |
+| 2.8             | not tested    |
+| 2.9             | not tested    |
+
+Suggested values:
+
+* "yes"
+* "not tested" - I can't think of a reason why it wouldn't work
+* "not yet" - there is an intention to get it working
+* "no"
+
+
+## Installation
+
+**TODO:** Add any additional install steps to the list below.
+   For example installing any non-Python dependencies or adding any required
+   config settings.
+
+To install ckanext-d4science:
+
+1. Activate your CKAN virtual environment, for example:
+
+     . /usr/lib/ckan/default/bin/activate
+
+2. Clone the source and install it on the virtualenv
+
+    git clone https://github.com/d4science/ckanext-d4science.git
+    cd ckanext-d4science
+    pip install -e .
+	pip install -r requirements.txt
+
+3. Add `d4science` to the `ckan.plugins` setting in your CKAN
+   config file (by default the config file is located at
+   `/etc/ckan/default/ckan.ini`).
+
+4. Restart CKAN. For example if you've deployed CKAN with Apache on Ubuntu:
+
+     sudo service apache2 reload
+
+
+## Config settings
+
+None at present
+
+**TODO:** Document any optional config settings here. For example:
+
+	# The minimum number of hours to wait before re-checking a resource
+	# (optional, default: 24).
+	ckanext.d4science.some_setting = some_default_value
+
+
+## Developer installation
+
+To install ckanext-d4science for development, activate your CKAN virtualenv and
+do:
+
+    git clone https://github.com/d4science/ckanext-d4science.git
+    cd ckanext-d4science
+    python setup.py develop
+    pip install -r dev-requirements.txt
+
+
+## Tests
+
+To run the tests, do:
+
+    pytest --ckan-ini=test.ini
+
+
+## Releasing a new version of ckanext-d4science
+
+If ckanext-d4science should be available on PyPI you can follow these steps to publish a new version:
+
+1. Update the version number in the `setup.py` file. See [PEP 440](http://legacy.python.org/dev/peps/pep-0440/#public-version-identifiers) for how to choose version numbers.
+
+2. Make sure you have the latest version of necessary packages:
+
+    pip install --upgrade setuptools wheel twine
+
+3. Create a source and binary distributions of the new version:
+
+       python setup.py sdist bdist_wheel && twine check dist/*
+
+   Fix any errors you get.
+
+4. Upload the source distribution to PyPI:
+
+       twine upload dist/*
+
+5. Commit any outstanding changes:
+
+       git commit -a
+       git push
+
+6. Tag the new release of the project on GitHub with the version number from
+   the `setup.py` file. For example if the version number in `setup.py` is
+   0.0.1 then do:
+
+       git tag 0.0.1
+       git push --tags
+
+## License
+
+[AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/__init__.py b/compose/2.10/src/ckanext-d4science/ckanext/__init__.py
new file mode 100644
index 0000000..ed48ed0
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/__init__.py
@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+# this is a namespace package
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/__init__.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/.gitignore b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/script.js b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/script.js
new file mode 100644
index 0000000..19cbb55
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/script.js
@@ -0,0 +1,10 @@
+ckan.module("d4science-module", function ($, _) {
+  "use strict";
+  return {
+    options: {
+      debug: false,
+    },
+
+    initialize: function () {},
+  };
+});
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/style.css b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/style.css
new file mode 100644
index 0000000..9631595
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/style.css
@@ -0,0 +1,5 @@
+/*
+body {
+  border-radius: 0;
+}
+*/
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/webassets.yml b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/webassets.yml
new file mode 100644
index 0000000..6efc58d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/assets/webassets.yml
@@ -0,0 +1,14 @@
+# d4science-js:
+#   filter: rjsmin
+#   output: ckanext-d4science/%(version)s-d4science.js
+#   contents:
+#     - js/d4science.js
+#   extra:
+#     preload:
+#       - base/main
+
+# d4science-css:
+#   filter: cssrewrite
+#   output: ckanext-d4science/%(version)s-d4science.css
+#   contents:
+#     - css/d4science.css
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/cli.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/cli.py
new file mode 100644
index 0000000..060483e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/cli.py
@@ -0,0 +1,20 @@
+import click
+
+
+@click.group(short_help="d4science CLI.")
+def d4science():
+    """d4science CLI.
+    """
+    pass
+
+
+@d4science.command()
+@click.argument("name", default="d4science")
+def command(name):
+    """Docs.
+    """
+    click.echo("Hello, {name}!".format(name=name))
+
+
+def get_commands():
+    return [d4science]
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/helpers.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/helpers.py
new file mode 100644
index 0000000..98b7f2d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/helpers.py
@@ -0,0 +1,9 @@
+
+def d4science_hello():
+    return "Hello, d4science!"
+
+
+def get_helpers():
+    return {
+        "d4science_hello": d4science_hello,
+    }
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/i18n/.gitignore b/compose/2.10/src/ckanext-d4science/ckanext/d4science/i18n/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/action.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/action.py
new file mode 100644
index 0000000..abd4970
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/action.py
@@ -0,0 +1,25 @@
+import ckan.plugins.toolkit as tk
+import ckanext.d4science.logic.schema as schema
+
+
+@tk.side_effect_free
+def d4science_get_sum(context, data_dict):
+    tk.check_access(
+        "d4science_get_sum", context, data_dict)
+    data, errors = tk.navl_validate(
+        data_dict, schema.d4science_get_sum(), context)
+
+    if errors:
+        raise tk.ValidationError(errors)
+
+    return {
+        "left": data["left"],
+        "right": data["right"],
+        "sum": data["left"] + data["right"]
+    }
+
+
+def get_actions():
+    return {
+        'd4science_get_sum': d4science_get_sum,
+    }
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/auth.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/auth.py
new file mode 100644
index 0000000..346bef3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/auth.py
@@ -0,0 +1,12 @@
+import ckan.plugins.toolkit as tk
+
+
+@tk.auth_allow_anonymous_access
+def d4science_get_sum(context, data_dict):
+    return {"success": True}
+
+
+def get_auth_functions():
+    return {
+        "d4science_get_sum": d4science_get_sum,
+    }
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/schema.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/schema.py
new file mode 100644
index 0000000..f5c4191
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/schema.py
@@ -0,0 +1,11 @@
+import ckan.plugins.toolkit as tk
+
+
+def d4science_get_sum():
+    not_empty = tk.get_validator("not_empty")
+    convert_int = tk.get_validator("convert_int")
+
+    return {
+        "left": [not_empty, convert_int],
+        "right": [not_empty, convert_int]
+    }
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/validators.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/validators.py
new file mode 100644
index 0000000..8a7e597
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/logic/validators.py
@@ -0,0 +1,13 @@
+import ckan.plugins.toolkit as tk
+
+
+def d4science_required(value):
+    if not value or value is tk.missing:
+        raise tk.Invalid(tk._("Required"))
+    return value
+
+
+def get_validators():
+    return {
+        "d4science_required": d4science_required,
+    }
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/plugin.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/plugin.py
new file mode 100644
index 0000000..06eb5a5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/plugin.py
@@ -0,0 +1,77 @@
+import ckan.plugins as plugins
+import ckan.plugins.toolkit as toolkit
+from ckan.views.resource import Blueprint
+from ckanext.d4science import helpers
+from ckanext.d4science.logic import action, auth
+from ckanext.d4science.logic import validators
+
+
+# import ckanext.d4science.cli as cli
+# import ckanext.d4science.helpers as helpers
+# import ckanext.d4science.views as views
+# from ckanext.d4science.logic import (
+#     action, auth, validators
+# )
+
+
+class D4SciencePlugin(plugins.SingletonPlugin):
+    plugins.implements(plugins.IConfigurer)
+    
+    plugins.implements(plugins.IAuthFunctions)
+    plugins.implements(plugins.IActions)
+    # plugins.implements(plugins.IClick)
+    plugins.implements(plugins.ITemplateHelpers)
+    plugins.implements(plugins.IValidators)
+
+    #ckan 2.10
+    plugins.implements(plugins.IBlueprint)
+    
+
+    # IConfigurer
+
+    def update_config(self, config_):
+        toolkit.add_template_directory(config_, "templates")
+        toolkit.add_public_directory(config_, "public")
+        toolkit.add_resource("assets", "d4science")
+
+    
+    # IAuthFunctions
+
+    def get_auth_functions(self):
+        return auth.get_auth_functions()
+
+    # IActions
+
+    def get_actions(self):
+        return action.get_actions()
+
+    # IBlueprint
+
+    # def get_blueprint(self):
+    #     return views.get_blueprints()
+    
+    def get_blueprint(self):
+        blueprint = Blueprint('foo', self.__module__)
+        # rules = [
+        #     ('/group', 'group_index', custom_group_index),
+        # ]
+        # for rule in rules:
+        #     blueprint.add_url_rule(*rule)
+
+        return blueprint
+
+    # IClick
+
+    # def get_commands(self):
+    #     return cli.get_commands()
+
+    # ITemplateHelpers
+
+    def get_helpers(self):
+        return helpers.get_helpers()
+
+    # IValidators
+
+    def get_validators(self):
+        return validators.get_validators()
+    
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/public/.gitignore b/compose/2.10/src/ckanext-d4science/ckanext/d4science/public/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/templates/.gitignore b/compose/2.10/src/ckanext-d4science/ckanext/d4science/templates/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/__init__.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_action.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_action.py
new file mode 100644
index 0000000..4983727
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_action.py
@@ -0,0 +1,13 @@
+"""Tests for action.py."""
+
+import pytest
+
+import ckan.tests.helpers as test_helpers
+
+
+@pytest.mark.ckan_config("ckan.plugins", "d4science")
+@pytest.mark.usefixtures("with_plugins")
+def test_d4science_get_sum():
+    result = test_helpers.call_action(
+        "d4science_get_sum", left=10, right=30)
+    assert result["sum"] == 40
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_auth.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_auth.py
new file mode 100644
index 0000000..183d32b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_auth.py
@@ -0,0 +1,19 @@
+"""Tests for auth.py."""
+
+import pytest
+
+import ckan.tests.factories as factories
+import ckan.tests.helpers as test_helpers
+import ckan.model as model
+
+
+@pytest.mark.ckan_config("ckan.plugins", "d4science")
+@pytest.mark.usefixtures("with_request_context", "with_plugins", "clean_db")
+def test_d4science_get_sum():
+    user = factories.User()
+    context = {
+        "user": user["name"],
+        "model": model
+    }
+    assert test_helpers.call_auth(
+        "d4science_get_sum", context=context)
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_validators.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_validators.py
new file mode 100644
index 0000000..6c7f28e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/logic/test_validators.py
@@ -0,0 +1,16 @@
+"""Tests for validators.py."""
+
+import pytest
+
+import ckan.plugins.toolkit as tk
+
+from ckanext.d4science.logic import validators
+
+
+def test_d4science_reauired_with_valid_value():
+    assert validators.d4science_required("value") == "value"
+
+
+def test_d4science_reauired_with_invalid_value():
+    with pytest.raises(tk.Invalid):
+        validators.d4science_required(None)
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_helpers.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_helpers.py
new file mode 100644
index 0000000..f90d94b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_helpers.py
@@ -0,0 +1,7 @@
+"""Tests for helpers.py."""
+
+import ckanext.d4science.helpers as helpers
+
+
+def test_d4science_hello():
+    assert helpers.d4science_hello() == "Hello, d4science!"
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_plugin.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_plugin.py
new file mode 100644
index 0000000..ee3f39f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_plugin.py
@@ -0,0 +1,56 @@
+"""
+Tests for plugin.py.
+
+Tests are written using the pytest library (https://docs.pytest.org), and you
+should read the testing guidelines in the CKAN docs:
+https://docs.ckan.org/en/2.9/contributing/testing.html
+
+To write tests for your extension you should install the pytest-ckan package:
+
+    pip install pytest-ckan
+
+This will allow you to use CKAN specific fixtures on your tests.
+
+For instance, if your test involves database access you can use `clean_db` to
+reset the database:
+
+    import pytest
+
+    from ckan.tests import factories
+
+    @pytest.mark.usefixtures("clean_db")
+    def test_some_action():
+
+        dataset = factories.Dataset()
+
+        # ...
+
+For functional tests that involve requests to the application, you can use the
+`app` fixture:
+
+    from ckan.plugins import toolkit
+
+    def test_some_endpoint(app):
+
+        url = toolkit.url_for('myblueprint.some_endpoint')
+
+        response = app.get(url)
+
+        assert response.status_code == 200
+
+
+To temporary patch the CKAN configuration for the duration of a test you can use:
+
+    import pytest
+
+    @pytest.mark.ckan_config("ckanext.myext.some_key", "some_value")
+    def test_some_action():
+        pass
+"""
+import ckanext.d4science.plugin as plugin
+
+
+@pytest.mark.ckan_config("ckan.plugins", "d4science")
+@pytest.mark.usefixtures("with_plugins")
+def test_plugin():
+    assert plugin_loaded("d4science")
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_views.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_views.py
new file mode 100644
index 0000000..9f12530
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/tests/test_views.py
@@ -0,0 +1,16 @@
+"""Tests for views.py."""
+
+import pytest
+
+import ckanext.d4science.validators as validators
+
+
+import ckan.plugins.toolkit as tk
+
+
+@pytest.mark.ckan_config("ckan.plugins", "d4science")
+@pytest.mark.usefixtures("with_plugins")
+def test_d4science_blueprint(app, reset_db):
+    resp = app.get(tk.h.url_for("d4science.page"))
+    assert resp.status_code == 200
+    assert resp.body == "Hello, d4science!"
diff --git a/compose/2.10/src/ckanext-d4science/ckanext/d4science/views.py b/compose/2.10/src/ckanext-d4science/ckanext/d4science/views.py
new file mode 100644
index 0000000..7192356
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/ckanext/d4science/views.py
@@ -0,0 +1,17 @@
+from flask import Blueprint
+
+
+d4science = Blueprint(
+    "d4science", __name__)
+
+
+def page():
+    return "Hello, d4science!"
+
+
+d4science.add_url_rule(
+    "/d4science/page", view_func=page)
+
+
+def get_blueprints():
+    return [d4science]
diff --git a/compose/2.10/src/ckanext-d4science/dev-requirements.txt b/compose/2.10/src/ckanext-d4science/dev-requirements.txt
new file mode 100644
index 0000000..eac82b4
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/dev-requirements.txt
@@ -0,0 +1 @@
+pytest-ckan
diff --git a/compose/2.10/src/ckanext-d4science/requirements.txt b/compose/2.10/src/ckanext-d4science/requirements.txt
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science/setup.cfg b/compose/2.10/src/ckanext-d4science/setup.cfg
new file mode 100644
index 0000000..94cc26d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/setup.cfg
@@ -0,0 +1,62 @@
+[metadata]
+name = ckanext-d4science
+version = 0.0.1
+description = d4science custom extensions
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/d4science/ckanext-d4science
+author = d4science
+author_email = info@d4science.org
+license = AGPL
+classifiers =
+            Development Status :: 4 - Beta
+            License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+            Programming Language :: Python :: 3.7
+            Programming Language :: Python :: 3.8
+            Programming Language :: Python :: 3.9
+            Programming Language :: Python :: 3.10
+keywords = CKAN
+
+[options]
+packages = find:
+namespace_packages = ckanext
+install_requires =
+include_package_data = True
+
+[options.entry_points]
+ckan.plugins =
+             d4science = ckanext.d4science.plugin:D4SciencePlugin
+
+babel.extractors =
+                 ckan = ckan.lib.extract:extract_ckan
+
+[options.extras_require]
+
+[extract_messages]
+keywords = translate isPlural
+add_comments = TRANSLATORS:
+output_file = ckanext/d4science/i18n/ckanext-d4science.pot
+width = 80
+
+[init_catalog]
+domain = ckanext-d4science
+input_file = ckanext/d4science/i18n/ckanext-d4science.pot
+output_dir = ckanext/d4science/i18n
+
+[update_catalog]
+domain = ckanext-d4science
+input_file = ckanext/d4science/i18n/ckanext-d4science.pot
+output_dir = ckanext/d4science/i18n
+previous = true
+
+[compile_catalog]
+domain = ckanext-d4science
+directory = ckanext/d4science/i18n
+statistics = true
+
+[tool:pytest]
+filterwarnings =
+        ignore::sqlalchemy.exc.SADeprecationWarning
+        ignore::sqlalchemy.exc.SAWarning
+        ignore::DeprecationWarning
+addopts = --ckan-ini test.ini
diff --git a/compose/2.10/src/ckanext-d4science/setup.py b/compose/2.10/src/ckanext-d4science/setup.py
new file mode 100644
index 0000000..4d26df7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/setup.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+from setuptools import setup
+
+setup(
+    # If you are changing from the default layout of your extension, you may
+    # have to change the message extractors, you can read more about babel
+    # message extraction at
+    # http://babel.pocoo.org/docs/messages/#extraction-method-mapping-and-configuration
+    message_extractors={
+        'ckanext': [
+            ('**.py', 'python', None),
+            ('**.js', 'javascript', None),
+            ('**/templates/**.html', 'ckan', None),
+        ],
+    }
+)
diff --git a/compose/2.10/src/ckanext-d4science/test.ini b/compose/2.10/src/ckanext-d4science/test.ini
new file mode 100644
index 0000000..67f9d4b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science/test.ini
@@ -0,0 +1,45 @@
+[DEFAULT]
+debug = false
+smtp_server = localhost
+error_email_from = ckan@localhost
+
+[app:main]
+use = config:../../src/ckan/test-core.ini
+
+# Insert any custom config settings to be used when running your extension's
+# tests here. These will override the one defined in CKAN core's test-core.ini
+ckan.plugins = d4science
+
+
+# Logging configuration
+[loggers]
+keys = root, ckan, sqlalchemy
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_ckan]
+qualname = ckan
+handlers =
+level = INFO
+
+[logger_sqlalchemy]
+handlers =
+qualname = sqlalchemy.engine
+level = WARN
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
diff --git a/compose/2.10/src/ckanext-d4science_theme/.project b/compose/2.10/src/ckanext-d4science_theme/.project
new file mode 100644
index 0000000..2c4c958
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ckanext-d4science_theme</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/compose/2.10/src/ckanext-d4science_theme/.settings/org.eclipse.core.resources.prefs b/compose/2.10/src/ckanext-d4science_theme/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..77f221a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/setup.py=utf-8
diff --git a/compose/2.10/src/ckanext-d4science_theme/LICENSE b/compose/2.10/src/ckanext-d4science_theme/LICENSE
new file mode 100644
index 0000000..3ffc567
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/LICENSE
@@ -0,0 +1,661 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/MANIFEST.in b/compose/2.10/src/ckanext-d4science_theme/MANIFEST.in
new file mode 100644
index 0000000..06e4a8a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/MANIFEST.in
@@ -0,0 +1,2 @@
+include README.rst
+recursive-include ckanext/d4science_theme *.html *.json *.js *.less *.css
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/README.rst b/compose/2.10/src/ckanext-d4science_theme/README.rst
new file mode 100644
index 0000000..ebc903a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/README.rst
@@ -0,0 +1,129 @@
+
+============
+ckanext-d4science_theme
+============
+
+The CKAN extension that implements the D4Science theme template used by D4Science Catalogues
+
+
+------------
+Requirements
+------------
+
+None
+
+------------
+Installation
+------------
+
+To install ckanext-d4science_theme:
+
+1. Activate your CKAN virtual environment, for example::
+
+     . /usr/lib/ckan/default/bin/activate
+
+2. Install the ckanext-d4science_theme Python package into your virtual environment::
+
+     pip install ckanext-d4science_theme
+
+3. Add ``d4science_theme`` to the ``ckan.plugins`` setting in your CKAN
+   config file (by default the config file is located at
+   ``/etc/ckan/default/production.ini``).
+
+4. Restart CKAN. For example if you've deployed CKAN with Apache on Ubuntu::
+
+     sudo service apache2 reload
+
+
+---------------
+Config Settings
+---------------
+
+Document any optional config settings here. For example::
+
+    # The minimum number of hours to wait before re-checking a resource
+    # (optional, default: 24).
+    ckanext.d4science_theme.some_setting = some_default_value
+
+
+------------------------
+Development Installation
+------------------------
+
+To install ckanext-d4science_theme for development, activate your CKAN virtualenv and
+do::
+
+    git clone https://code-repo.d4science.org/CKAN-Extensions/ckanext-d4science_theme.git
+    cd ckanext-d4science_theme
+    python setup.py develop
+    pip install -r dev-requirements.txt
+
+
+-----------------
+Running the Tests
+-----------------
+
+To run the tests, do::
+
+    nosetests --nologcapture --with-pylons=test.ini
+
+To run the tests and produce a coverage report, first make sure you have
+coverage installed in your virtualenv (``pip install coverage``) then run::
+
+    nosetests --nologcapture --with-pylons=test.ini --with-coverage --cover-package=ckanext.d4science_theme --cover-inclusive --cover-erase --cover-tests
+
+
+---------------------------------
+Registering ckanext-d4science_theme on PyPI
+---------------------------------
+
+ckanext-d4science_theme should be availabe on PyPI as
+https://pypi.python.org/pypi/ckanext-d4science_theme. If that link doesn't work, then
+you can register the project on PyPI for the first time by following these
+steps:
+
+1. Create a source distribution of the project::
+
+     python setup.py sdist
+
+2. Register the project::
+
+     python setup.py register
+
+3. Upload the source distribution to PyPI::
+
+     python setup.py sdist upload
+
+4. Tag the first release of the project on GitHub with the version number from
+   the ``setup.py`` file. For example if the version number in ``setup.py`` is
+   0.0.1 then do::
+
+       git tag 0.0.1
+       git push --tags
+
+
+----------------------------------------
+Releasing a New Version of ckanext-d4science_theme
+----------------------------------------
+
+ckanext-d4science_theme is availabe on PyPI as https://pypi.python.org/pypi/ckanext-d4science_theme.
+To publish a new version to PyPI follow these steps:
+
+1. Update the version number in the ``setup.py`` file.
+   See `PEP 440 <http://legacy.python.org/dev/peps/pep-0440/#public-version-identifiers>`_
+   for how to choose version numbers.
+
+2. Create a source distribution of the new version::
+
+     python setup.py sdist
+
+3. Upload the source distribution to PyPI::
+
+     python setup.py sdist upload
+
+4. Tag the new release of the project on GitHub with the version number from
+   the ``setup.py`` file. For example if the version number in ``setup.py`` is
+   0.0.2 then do::
+
+       git tag 0.0.2
+       git push --tags
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/__init__.py
new file mode 100644
index 0000000..2e2033b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/__init__.py
@@ -0,0 +1,7 @@
+# this is a namespace package
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/__init__.py
new file mode 100644
index 0000000..6cca9de
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/__init__.py
@@ -0,0 +1,19 @@
+# from flask import Flask, g
+# from ckan.lib.app_globals import app_globals
+# import ckan.plugins.toolkit as toolkit
+
+# app = Flask("d4Science")
+
+# def base_context():
+#     return {
+#         'helpers': toolkit.h,
+#     }
+
+# @app.context_processor
+# def inject_base_context():
+#     return base_context()
+
+# # Aggiungi main_css al contesto globale di Flask
+# # @app.before_request
+# # def before_request():
+# #     g.main_css = app_globals.main_css
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/css/d4science_theme.css b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/css/d4science_theme.css
new file mode 100644
index 0000000..9e416b1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/css/d4science_theme.css
@@ -0,0 +1,844 @@
+/* =====================================================
+   The "account masthead" bar across the top of the site
+   ===================================================== */
+
+.account-masthead {
+    background-color: #ccc;
+}
+/* The "bubble" containing the number of new notifications. */
+.account-masthead .account .notifications a span {
+  background-color: #9fa0a2;
+}
+/* The text and icons in the user account info. */
+.account-masthead .account ul li a {
+  color: rgba(255, 255, 255, 0.6);
+}
+/* The user account info text and icons, when the user's pointer is hovering
+   over them. */
+.account-masthead .account ul li a:hover {
+  color: rgba(255, 255, 255, 0.7);
+/*  background-color: black;*/
+}
+
+
+/* ========================================================================
+   The main masthead bar that contains the site logo, nav links, and search
+   ======================================================================== */
+
+.masthead {
+  background: #eee url("/bg-noise.png") repeat scroll 0 0;
+  border-top: 1px solid #555;
+  padding-top: 5px;
+  padding-bottom: 15px !important;
+  border-bottom: 1px solid #999;
+/*  background-image: url("/bg-pattern.min.svg") !important; */
+}
+
+.masthead .navigation .nav-pills li a{
+	color: #187794;
+}
+
+a.logo > img{
+	margin-bottom: 5px;
+}
+
+/* The "navigation pills" in the masthead (the links to Datasets,
+   Organizations, etc) when the user's pointer hovers over them. */
+.masthead .navigation .nav-pills li a:hover {
+/*  background-color: rgb(48, 48, 48);*/
+  color: white;
+}
+/* The "active" navigation pill (for example, when you're on the /dataset page
+   the "Datasets" link is active). */
+.masthead .navigation .nav-pills li.active a {
+  background-color: #d2d2d5;
+}
+/* The "box shadow" effect that appears around the search box when it
+   has the keyboard cursor's focus. */
+.masthead input[type="text"]:focus {
+ -webkit-box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+  box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+}
+
+
+/* ===========================================
+   The content in the middle of the front page
+   =========================================== */
+
+/* Remove the "box shadow" effect around various boxes on the page. */
+.box {
+  box-shadow: none;
+}
+.hero {
+	background: #FEFEFE repeat scroll 0 0 !important;
+}
+/* Remove the borders around the "Welcome to CKAN" and "Search Your Data"
+   boxes. */
+.hero .box {
+  /*border: none;*/
+  margin-top: 10px !important;
+}
+/* Change the colors of the "Search Your Data" box. */
+.homepage .module-search .module-content {
+  color: rgb(68, 68, 68);
+  background-color: white;
+}
+/* Change the background color of the "Popular Tags" box. */
+.homepage .module-search .tags {
+  background-color: #fcfcfc;
+}
+
+.homepage-title{
+	font-size: 20px;
+	font-weight: bold;
+	color: #202020;
+	margin-bottom: 20px;
+}
+
+/* Change the background color of the "Popular Tags" box. */
+.homepage .module-search h3{
+  color: #444;
+}
+
+/* Remove some padding. This makes the bottom edges of the "Welcome to CKAN"
+   and "Search Your Data" boxes line up. */
+.module-content:last-child {
+  /*padding-bottom: 0px;*/
+}
+.homepage .module-search {
+  padding: 0px;
+}
+/* Add a border line between the top and bottom halves of the front page. */
+.homepage [role="main"] {
+  border-bottom: 1px solid #bbb;
+  padding: 10px 0;
+}
+
+.homepage .stats ul li a b{
+	font-size: 30px !important;
+}
+
+[role="main"], .main {
+/*    background: #f5f6fa url("/bg-pattern.min.svg") repeat; scroll 0 0;*/
+    /*background: #fafafa url("/bg-pattern.svg") repeat; scroll 0 0;*/
+    background: #fdfdfd none repeat scroll 0 0;
+    min-height: 0px !important;
+}
+
+.media-item-homepage {
+	 background-color: white;
+    border-radius: 3px;
+    float: left;
+    margin: 15px 0 0 15px;
+    overflow: hidden;
+    padding-left: 10px;
+    padding-right: 10px;
+    position: relative;
+    text-align: center;
+    width: 150px;
+}
+
+.media-heading-homepage {
+    font-size: 16px;
+    hyphens: auto;
+    line-height: 1.3;
+    margin: 5px 0;
+}
+
+.media-grid-homepage {
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+/*    background: #fbfbfb url("../../../base/images/bg.png") repeat scroll 0 0;
+    border-color: #dddddd;
+    border-image: none;
+    border-style: solid;
+    border-width: 1px 0;*/
+    list-style: outside none none;
+    margin: 0 -10px;
+    padding-bottom: 15px;
+}
+.media-grid-homepage::before, .media-grid::after {
+    content: "";
+    display: table;
+    line-height: 0;
+}
+.media-grid-homepage::after {
+    clear: both;
+}
+
+.background-circle{
+    padding: 10px 10px;
+    display: inline-block !important;
+    -webkit-border-radius: 90px;
+    -moz-border-radius: 90px;
+    border-radius: 90px;
+    background-color: #4679b2;
+    text-decoration: none !important;
+}
+
+.color-white{
+	color: white !important;
+}
+
+.badge-circle {
+	border-radius: 50% 50% 50% 50% !important;
+	height: 60px;
+   text-align: center;
+   vertical-align: middle;
+   width: 65px;
+   background-color: #4679b2;
+   display: inline-block !important;
+   padding-top: 5px;
+   text-decoration: none !important;
+}
+
+/* ====================================
+   The footer at the bottom of the site
+   ==================================== */
+
+.site-footer, body {
+  background-color: #bbb;
+  font-family: "Lato","Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 16px;
+}
+/* The text in the footer. */
+.site-footer,
+.site-footer label,
+.site-footer small {
+  color: rgba(255, 255, 255, 0.6);
+}
+/* The link texts in the footer. */
+.site-footer a {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.site-footer-internal{
+    min-height: 10px;
+    padding: 2px 0;
+    font-size: 12px;
+}
+
+.site-footer-internal {
+  /*background-color: rgba(255, 255, 255, 0.6);*/
+  text-align: center;
+  /*display: inline-block;*/
+}
+
+.site-footer-internal,
+.site-footer-internal label,
+.site-footer-internal small {
+
+}
+
+.site-footer-internal a {
+  display: inline-block;
+}
+
+.d4s-hide-text {
+    background-color: transparent;
+    border: 0 none;
+    color: transparent;
+    font: 0px/0 a;
+    text-shadow: none;
+}
+
+.d4science-footer-logo {
+    background: url("/gCube_70.png") no-repeat scroll left top rgba(0, 0, 0, 0);
+    height: 32px;
+    margin-top: 2px;
+    text-indent: -900em;
+    width: 75px;
+}
+
+.d4s-ckan-footer-logo {
+    background: rgba(0, 0, 0, 0) url("/ckan-logo-footer.png") no-repeat scroll left top;
+    height: 21px;
+    margin-top: 2px;
+    text-indent: -900em;
+    width: 69px;
+}
+
+.site-footer-d4science {
+	font-size: 14px;
+	color: #f5f5f5;
+	text-align: center;
+	height: 25px;
+	padding-top: 5px;
+	background-color: #7F7F7F;
+}
+
+.site-footer-d4science a {
+  font-weight: bold;
+  text-decoration: none;
+  color: white;
+}
+
+
+/* ====================================
+   Base elements of the site
+   ==================================== */
+
+div .principaltitle {
+	color: inherit;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 1.2;
+	margin: 15px 0;
+	text-rendering: optimizelegibility;
+	word-break: break-all;
+	padding-bottom: 10px;
+	padding-top: 5px;
+	border-bottom: 1px solid #eee;
+}
+
+div .notes {
+	color: #444444;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-size: 14px;
+	line-height: 1.3;
+	text-align: justify;
+	word-break: break-all;
+}
+
+div .infotitle {
+	font-size: 15px;
+	hyphens: auto;
+	line-height: 1.3;
+	word-break: break-all;
+	font-weight: bold;
+}
+
+.toolbar .breadcrumb{
+	font-size: 16px !important;
+}
+
+.box{
+	border: 0px !important;
+}
+
+div .sectiontitle{
+	color: #9F9F9F;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-size: 17px;
+	font-weight: bold;
+	margin: 20px 0;
+	margin-top: 20px;
+	margin-bottom: 10px;
+	text-rendering: optimizelegibility;
+}
+
+section .well {
+	background-color: #fdfdfd !important;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+	box-shadow: none !important;
+	margin-bottom: 20px;
+	min-height: 20px;
+   
+}
+
+.page-heading {
+    font-size: 18px;
+    line-height: 1.2;
+    margin-top: 20px;
+    margin-bottom: 0px;
+}
+
+#dataset-resources .resource-list{
+	background-color: #fdfdfd !important;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+   box-shadow: none !important;
+   margin: -1px 0 !important;
+}
+
+.wrapper{
+	border: 1px solid #d0d0d0;
+	box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.05);
+	border-radius: 3px
+}
+
+.home-popular{
+	padding-top: 25px;
+}
+
+.logo-homepage{
+	max-height: 60px;
+}
+
+.statistics-show{
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	color: #444444;
+	text-decoration: none;
+}
+
+.d4s-center-cropped{
+    text-align: center;
+    background-color: #eee;
+    border: 1px solid #ddd;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+
+.tag-list {
+    font-size: 14px;
+}
+
+
+/* ====================================
+   Acquired Dataset
+   ==================================== */
+.label-acquired {
+    background-color: #55a1ce;
+}
+
+.label-owner {
+    background-color: #e0051e;
+}
+
+.divider {
+    margin-left:10px;
+    height:auto;
+    display:inline-block;
+}
+
+/* ====================================
+   List Dataset
+   ==================================== */
+   
+/*LEFT
+.show_meatadatatype {
+  color: white;
+  display: inline-block; // Inline elements with width and height. TL;DR they make the icon buttons stack from left-to-right instead of top-to-bottom 
+  position: relative; // All 'absolute'ly positioned elements are relative to this one 
+  margin-bottom: 20px;
+  margin-left: 25px;
+}
+*/
+
+/*RIGHT*/
+.show_meatadatatype {
+    color: white;
+    display: inline-block;
+    float: right;
+    margin-right: 2px;
+    margin-top: -20px;
+    position: relative;
+}
+
+
+
+/* LEFT
+ * Position the badge within the relatively positioned button
+.button__badge {
+  background-color: #fa3e3e;
+  border-radius: 2px;
+  color: white;
+ 
+  padding: 1px 6px;
+  font-size: 10px;
+
+  position: absolute; 
+  top: 0;
+  right: 0;
+}*/
+
+
+
+/* RIGTH */
+.button__badge {
+  color: #808080;
+  padding: 0px 2px;
+  font-size: 10px;
+  top: 0;
+  right: 0;
+  font-family: sans-serif, times, georgia;
+}
+
+/* ====================================
+   Modal Popup
+   ==================================== */
+
+/* Popup container - can be anything you want */
+/* The Modal (background) */
+.d4s_modal {
+    display: none; /* Hidden by default */
+    position: fixed; /* Stay in place */
+    z-index: 10001; /* Sit on top (NB. At 1000 there is the zoom in/out of the Map Widget)*/
+    /*padding-top: 100px;*/ /* Location of the box */
+    left: 0;
+    top: 0;
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    overflow: auto; /* Enable scroll if needed */
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+}
+
+/* Modal Content */
+.d4s_modal-content {
+    background-color: #fefefe;
+    /*margin: auto;*/
+    padding: 20px;
+    border: 1px solid #888;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	 border-radius: 5px;
+	 position: absolute;
+    left: 50%;
+    margin-left: -225px;
+    width: 450px;
+}
+
+/* The Close Button */
+.d4s_close {
+    color: #aaaaaa;
+    float: right;
+    font-size: 28px;
+    font-weight: bold;
+    padding-left: 20px;
+}
+
+.d4s_close:hover,
+.d4s_close:focus {
+    color: #000;
+    text-decoration: none;
+    cursor: pointer;
+}
+
+.d4s_div_clickable{
+	cursor: pointer;
+}
+
+/*====================================
+D4S POPUP
+======================================*/
+
+/* Popup container - can be anything you want */
+.popupD4SNoArrow {
+    position: relative;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+/* The actual popup */
+.popupD4SNoArrow .popuptext {
+    visibility: hidden;
+    width: 300px;
+    background-color: #555;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px;
+    position: absolute;
+    z-index: 1;
+    bottom: 125%;
+    left: 50%;
+    margin-left: -150px;
+}
+
+/* Toggle this class - hide and show the popup */
+.popupD4SNoArrow .show {
+    visibility: visible;
+    -webkit-animation: fadeIn 1s;
+    animation: fadeIn 1s;
+}
+
+
+/* Popup container - can be anything you want */
+.popupD4S {
+    position: relative;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+/* The actual popup */
+.popupD4S .popuptext {
+    visibility: hidden;
+    width: 300px;
+    background-color: #555;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px;
+    position: absolute;
+    z-index: 1;
+    bottom: 125%;
+    left: 50%;
+    margin-left: -150px;
+}
+
+/* Popup arrow */
+.popupD4S .popuptext::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 50%;
+    margin-left: -5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: #555 transparent transparent transparent;
+}
+
+/* Toggle this class - hide and show the popup */
+.popupD4S .show {
+    visibility: visible;
+    -webkit-animation: fadeIn 1s;
+    animation: fadeIn 1s;
+}
+
+/* Add animation (fade in the popup) */
+@-webkit-keyframes fadeIn {
+    from {opacity: 0;} 
+    to {opacity: 1;}
+}
+
+@keyframes fadeIn {
+    from {opacity: 0;}
+    to {opacity:1 ;}
+}
+
+/*====================================
+D4S PACKAGE
+======================================*/
+
+.graphic-preview-style {
+	text-align: center;
+	border-top: 1px dotted #DDD;
+	padding-top: 10px;
+	padding-bottom: 0px;
+	margin-top: 15px;
+}
+
+.graphic-preview-style a{
+	font-size: 13px;
+}
+
+.graphic-preview-style img{
+	max-width: 100% !important;
+	height: auto;
+	
+}
+
+.graphic-preview-style #graphic-title{
+	font-size: 13px;
+	
+}
+
+.nav-item{
+	word-wrap:break-word;
+ }
+
+/*====================================
+RESOURCE_LIST RESOURCE_ITEM INTO PACKAGE
+======================================*/
+
+.required-access {
+	font-style: italic;
+	font-weight: bold;
+	padding: 5px;
+}
+
+/*====================================
+LINK TO RESOURCES FROM PACKAGE LIST
+======================================*/
+
+.dataset-resources li a {
+    background-color: #187794;
+}
+
+.label[data-format="csw"], .label[data-format*="csw"] {
+    background-color: #e6b800;
+}
+
+/*====================================
+CSS APPLIED TO Similar GRSF Records
+======================================*/
+
+.my-grsf-table{
+	word-break: break-all;
+}
+
+.my-grsf-table tr td{
+	width: inherit;
+}
+
+.my-grsf-table tr td:first-child{
+	width: 82px !important;
+}
+
+/*====================================
+CSS APPLIED in base.html
+======================================*/
+
+#ckan-page-loading {
+	display: none;
+	position: fixed;
+   top: 50%;
+   left: 50%;
+   margin-top: -130px;
+   margin-left: -130px;
+   width: 260px;
+   height: 260px;
+   z-index: 100000;
+   background-image: url("/pageloading.gif");
+   background-repeat: no-repeat;
+   background-position: center;
+}
+
+/*====================================
+CSS APPLIED in search_for_location.html
+======================================*/
+
+div#search-for-location {
+	
+}
+
+div#search-for-location #dataset-map {
+	position: relative !important;
+	top: +0px !important;
+}
+
+div#search-for-location #dataset-map-container {
+	height: 300px;
+}
+
+
+div#search-for-location .module-heading {
+	display: none;
+}
+
+div#search-for-extent{
+	padding-top: 10px;
+}
+
+/*====================================
+CSS APPLIED in additional_info.html
+======================================*/
+.qr-code-table {
+	width: 100%;
+}
+
+.qr-code-table td {
+	width: 85%;
+	border: 1px solid #e3e3e3;
+}
+
+.qr-code-table td:first-child {
+	padding-left: 10px;
+	border-right-style: none;
+
+}
+
+.qr-code-table td:last-child {
+	width: 105px;
+	text-align: center;
+	border-left-style: none;
+
+}
+
+/* MAX-WITH APPIED TO QR_CODE */
+.qr-code-table img {
+  max-width: 100px;
+  height: auto;
+}
+
+
+/*====================================
+CSS APPLIED FROM JSON TO HTML TABLE
+======================================*/
+
+.json-to-html-table-column{
+	word-break: break-all;
+}
+
+.json-to-html-table-column tr td{
+	width: inherit;
+}
+
+.json-to-html-table-column tr td:first-child{
+	font-weight: bold;
+	color: #5a5a5a;
+}
+
+/*====================================
+CSS APPLIED into custom_form_fields
+======================================*/
+.disabled-div{
+    pointer-events: none;
+    opacity: 0.5;
+}
+
+.disabled-div input[type="text"]{
+	background: #f1f1f1;
+}
+
+/*====================================
+CSS APPLIED into extra_table.html
+======================================*/
+
+.read-more-state {
+	display: none;
+}
+
+.read-more-target {
+	opacity: 0;
+	max-height: 0;
+	font-size: 0;
+	transition: .25s ease;
+}
+
+.read-more-state:checked ~ .read-more-wrap .read-more-target {
+	opacity: 1;
+	font-size: inherit;
+	max-height: 999em;
+  content: "";
+}
+
+.read-more-state ~ .read-more-trigger:before {
+	content: 'Show more';
+}
+
+.read-more-state:checked ~ .read-more-trigger:before {
+	content: 'Show less';
+}
+
+.read-more-state:checked ~ .read-more-wrap::after {
+    content: "";
+}
+
+.read-more-trigger {
+	cursor: pointer;
+	display: inline-block;
+	padding: 0 .5em;
+	color: #187794;
+	font-size: .9em;
+	line-height: 2;
+	border: 1px solid #ddd;
+	border-radius: .25em;
+	font-weight: normal;
+}
+
+.read-more-trigger::after {
+	content: "";
+}
+
+.read-more-wrap {
+  margin-bottom: 2px;
+}
+
+.read-more-wrap::after{
+  content: " ...";
+  
+}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/js/d4science_scripts.js b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/js/d4science_scripts.js
new file mode 100644
index 0000000..36b79e3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/js/d4science_scripts.js
@@ -0,0 +1,305 @@
+/* =====================================================
+JavaScript used by CKAN plugin: 'd4science_theme' 
+Created by Francesco Mangiacrapa ISTI-CNR Pisa, Italy
+===================================================== */
+
+
+//old script starts
+CKAN_D4S_Breadcrumb_Manager = {
+	
+	breadcrumbShow : function (show) {
+	
+		var breadcrumb = document.getElementById('ckan-breadcrumb');
+		console.log('breadcrumb is '+breadcrumb)
+		if(breadcrumb){
+			if(show){
+				breadcrumb.style.display = 'block';
+				this.organizationTreeShow(true);
+			} else{ 
+				breadcrumb.style.display = 'none';
+				this.organizationTreeShow(false);
+			}
+		}
+		
+		//var elements = document.getElementsByTagName('a');
+		//for(var i = 0, len = elements.length; i < len; i++) {
+		//	elements[i].onclick = function () {
+		//  	//alert("You clicked an external link to: " + this.href);
+		//  	//window.parent.add_hide_breadcrumb_to_dom(false);
+	//   	this.add_hide_breadcrumb_to_dom(false);
+	// }
+		//}
+	},
+	
+	organizationTreeShow : function (show) {
+		var trees = document.getElementsByClassName("hierarchy-tree-top");
+		
+		if (trees){
+			for (i = 0; i < trees.length; i++) { 
+				if(show){
+					trees[i].style.display = 'block';
+				} else{ 
+					trees[i].style.display = 'none';
+				}
+			}
+		}
+	},
+
+	checkBreadcrumbShow : function () {
+		
+		var showBdc = this.getSessionStorageItem("showbreadcrumb")
+		//console.log("showBdc is: "+showBdc)
+		if(showBdc != undefined && showBdc=="false"){
+			console.log("Show breadcrumb false");
+			this.breadcrumbShow(false);
+		}else{
+			console.log("Show breadcrumb true");
+			this.breadcrumbShow(true);
+		}
+	},
+
+
+	setSessionStorageItem : function (item_key, item_value) {
+	
+		// Check browser support
+		if (typeof(Storage) !== "undefined") {
+			// Store
+			sessionStorage.setItem(item_key, item_value);
+			return true;
+		} else {
+			console.log("Sorry, your browser does not support Web Storage...");
+			return false;
+		}
+	},
+
+
+	getSessionStorageItem : function (item_key) {
+	
+		// Check browser support
+		if (typeof(Storage) !== "undefined") {
+			// Store
+			return sessionStorage.getItem(item_key);
+		} else {
+			console.log("Sorry, your browser does not support Web Storage...");
+			return undefined;
+	}
+	}
+
+}
+
+
+CKAN_D4S_Functions_Util = {
+	
+	getPosition : function(canvas, event){
+	var x = new Number();
+	var y = new Number();
+	try {
+	if (event.clientX != undefined && event.clientY != undefined)
+	{
+
+		x = event.clientX;
+		y = event.clientY;
+	}
+	else // Firefox method to get the position
+	{
+		x = event.clientX + document.body.scrollLeft +
+			document.documentElement.scrollLeft;
+		y = event.clientY + document.body.scrollTop +
+			document.documentElement.scrollTop;
+	}
+	x -= canvas.offsetLeft;
+	y -= canvas.offsetTop;
+	}catch (err) {
+		//silent error
+	}
+	return '{"posX": "'+x+'", "posY": "'+y+'"}';
+	},
+	
+	// When the user clicks on div, open the popup
+	showPopupD4S : function(event, my_div, my_popup_left_position) {
+		var popup = document.getElementById(my_div);
+		var clickPosition = this.getPosition(my_div, event)
+		var myPosition = JSON.parse(clickPosition);
+		this.closePopups(my_div);
+		// When the user clicks anywhere outside of the modal, close it
+		/*window.onclick = function(event) {
+		if (event.target != popup) {
+			popup.style.display = "none";
+		}
+		}*/
+		popup.classList.toggle("show");
+	
+		if(my_popup_left_position){
+			popup.style.left = my_popup_left_position;
+		}
+		else if (myPosition.posX){
+			popup.style.left = myPosition.posX + "px";
+		}
+	},
+	
+	closePopups : function ($target) {
+		var popups = document.getElementsByClassName('popuptext');
+		for (i = 0; i < popups.length; i++) {
+		if (popups[i].getAttribute('id') != $target) {
+				popups[i].classList.remove('show');
+		}	
+		}
+	},
+	
+	checkURL : function (url) {
+		//console.log('checking url: '+url)
+		var regex = new RegExp('^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/|www\.|ftp:\/\/)+[^ "]+$');
+		if (regex.test(url)) {
+			return true;
+	}
+	return false;
+	}
+
+}
+
+CKAN_D4S_HTMLMessage_Util = {
+	
+postHeightToPortlet : function (selectedProduct, product) {
+		var h = document.body.scrollHeight + "px";
+		var p = "";
+		var msg = "";
+		//WORK AROUND IF TWO MESSAGES ARE SENT FROM A PAGE OF A PRODUCT
+		//THE MESSAGE WITH 'NULL' PRODUCT IS SKIPPED
+		//console.log("window.location.pathname? "+window.location.pathname);
+		var pathArray = window.location.pathname.split('/');
+		var productContext = "dataset";
+		if(pathArray.length>1){
+			//console.log("pathArray is: "+pathArray);     	
+			var secondLevelLocation = pathArray[1]; //it is the second level location
+			//console.log("secondLevelLocation is: "+secondLevelLocation);
+			//console.log("h is: "+h);     	
+			if(secondLevelLocation == productContext){ //is it product context?
+				if(product !== 'undefined' && product !== null){
+					p = product;
+					//console.log("product selected is: "+p);
+				}else{
+					//console.log("product is null or undefined, passing only height");
+					msg = "{\"height\": \""+h+"\"}"; 	
+					//window.postMessage(msg,'*');
+					this.postMessageToParentWindow(msg);
+					return;
+				}
+			}
+		}
+		
+		//msg = "{'height': '"+h+"', 'product': '"+p+"'}";
+		msg = "{\"height\": \""+h+"\", \"product\": \""+p+"\"}"; 	
+		//window.postMessage(msg,'*');
+		//console.log("posting message in the window: "+msg);
+		this.postMessageToParentWindow(msg);
+	},
+	
+	postMessageToParentWindow : function (msg) {
+		//window.postMessage(msg,'*');
+		//console.log("posting message in the window: "+msg);
+		if(window.parent!=null){
+			console.log("posting message in the parent window: "+msg);
+			window.parent.postMessage(msg,'*');
+		}
+		return;
+	}
+
+}
+
+CKAN_D4S_JSON_Util = {
+
+
+//ADDED by Francesco Mangiacrapa
+appendHTMLToElement : function(containerID, elementHTML){
+
+	var divContainer = document.getElementById(containerID);
+	divContainer.innerHTML = "";
+	divContainer.appendChild(elementHTML);
+},
+
+//ADDED by Francesco Mangiacrapa
+jsonToHTML : function(containerID, cssClassToTable) {
+
+	try
+	{
+	var jsonTxt = document.getElementById(containerID).innerHTML;
+	var jsonObj = JSON.parse(jsonTxt);
+	//console.log(jsonObj.length)
+
+	if(jsonObj.length==undefined)
+		jsonObj = [jsonObj]
+		//console.log(jsonObj.length)
+
+	// EXTRACT VALUE FOR HTML HEADER.
+	var col = [];
+	for (var i = 0; i < jsonObj.length; i++) {
+		for (var key in jsonObj[i]) {
+		//console.log('key json' +key)
+		if (col.indexOf(key) === -1) {
+			col.push(key);
+		}
+		}
+	}
+
+	// CREATE DYNAMIC TABLE.
+	var table = document.createElement("table");
+	var addDefaultCss = "json-to-html-table-column";
+	if(cssClassToTable){
+		addDefaultCss = cssClassToTable;
+	}
+	try{
+			table.classList.add(addDefaultCss);
+	}catch(e){
+			console.log('invalid css add', e);
+	}
+
+	// ADD JSON DATA TO THE TABLE AS ROWS.
+	for (var i = 0; i < col.length; i++) {
+
+		tr = table.insertRow(-1);
+		var firstCell = tr.insertCell(-1);
+		//firstCell.style.cssText="font-weight: bold; text-align: center; vertical-align: middle;";
+		firstCell.innerHTML = col[i];
+		for (var j = 0; j < jsonObj.length; j++) {
+			var tabCell = tr.insertCell(-1);
+			var theValue = jsonObj[j][col[i]];
+			/*  console.log(theValue + ' is url? '+isUrl);*/
+			if(CKAN_D4S_Functions_Util.checkURL(theValue)){
+				theValue = '<a target="_blank" href='+theValue+'>'+theValue+'</a>';
+			}
+			
+			tabCell.innerHTML = theValue;
+		}
+	}
+
+	// FINALLY ADD THE NEWLY CREATED TABLE WITH JSON DATA TO A CONTAINER.
+	this.appendHTMLToElement(containerID, table);
+
+	}
+	catch(e){
+	console.log('invalid json', e);
+	}
+}
+}
+
+
+//Task #8032
+window.addEventListener("message",
+function (e) {
+
+		var curr_loc = window.location.toString()
+		var orgin = e.origin.toString()
+		if(curr_loc.startsWith(orgin)){
+			//alert("ignoring message from myself");
+		return; 
+		}
+		//console.log("origin: "+e.data)
+		if(e.data == null)
+			return;
+			
+		var pMess = JSON.parse(e.data)
+		//console.log(pMess.explore_vres_landing_page)
+		window.linktogateway = pMess.explore_vres_landing_page;
+},false);
+//old script ends
+			
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/webassets.yml b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/webassets.yml
new file mode 100644
index 0000000..5b697a1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/assets/webassets.yml
@@ -0,0 +1,15 @@
+d4science-js:
+  filter: rjsmin
+  output: ckanext-d4science_theme/ckanext/d4science_theme/assets/js/d4science_scripts.js
+  contents:
+    - js/d4science_scripts.js
+  extra:
+    preload:
+      - base/main
+
+d4science-css:
+  filter: cssrewrite
+  output: ckanext-d4science_theme/ckanext/d4science_theme/assets/css/d4science_theme.css
+  contents:
+    - css/d4science_theme.css
+  
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/__init__.py
new file mode 100644
index 0000000..68f2e01
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/__init__.py
@@ -0,0 +1,4 @@
+#The __init__.py files are required to make Python 
+#treat the directories as containing packages; this is done to prevent directories with a common name, such as string, from unintentionally hiding valid modules that occur later on the module search path. 
+#See: https://docs.python.org/3/tutorial/modules.html#packages
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/home.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/home.py
new file mode 100644
index 0000000..c5746d5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/home.py
@@ -0,0 +1,83 @@
+import logging
+# from ckan.controllers.home import HomeController
+import ckan.plugins as p
+from ckan.common import  _, g, c
+from collections import OrderedDict
+
+import ckan.lib.search as search
+import ckan.model as model
+import ckan.logic as logic
+import ckan.lib.maintain as maintain
+import ckan.lib.base as base
+import ckan.lib.helpers as h
+
+from flask import render_template
+
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it 
+# ISTI-CNR Pisa (ITALY)
+
+class d4SHomeController():
+    
+    #Overriding controllers.HomeController.index method
+    def index(self):
+        try:
+            # package search
+            context = {'model': model, 'session': model.Session,'user': c.user, 'auth_user_obj': c.userobj}
+            
+            facets = OrderedDict()
+            
+            default_facet_titles = {
+                'organization': _('Organizations'),
+                'groups': _('Groups'),
+                'types':_('Types'),
+                'tags': _('Tags'),
+                'res_format': _('Formats'),
+                'license_id': _('Licenses'),
+                }
+            
+            for facet in g.facets:
+                if facet in default_facet_titles:
+                    facets[facet] = default_facet_titles[facet]
+                else:
+                    facets[facet] = facet
+            
+            # Facet titles
+            for plugin in p.PluginImplementations(p.IFacets):
+                facets = plugin.dataset_facets(facets, 'dataset')
+            
+            c.facet_titles = facets
+            
+            data_dict = {
+                'q': '*:*',
+                'facet.field': list(facets.keys()),
+                'rows': 4,
+                'start': 0,
+                'sort': 'views_recent desc',
+                'fq': 'capacity:"public"'
+            }
+            query = logic.get_action('package_search')(context, data_dict)
+            c.search_facets = query['search_facets']
+            c.package_count = query['count']
+            c.datasets = query['results']
+            
+            #print "c.search_facets: "
+            #print " ".join(c.search_facets)
+            
+        except search.SearchError:
+            c.package_count = 0
+        
+        if c.userobj and not c.userobj.email:
+            url = h.url_for(controller='user', action='edit')
+            msg = _('Please <a href="%s">update your profile</a>'
+            ' and add your email address. ') % url + \
+            _('%s uses your email address'
+            ' if you need to reset your password.') \
+            % g.site_title
+            h.flash_notice(msg, allow_html=True)
+        
+        #return base.render('home/index.html', cache_force=True)
+        #ckan 2.10 :
+        return render_template('home/index.html')
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/organization.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/organization.py
new file mode 100644
index 0000000..90b85cc
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/organization.py
@@ -0,0 +1,134 @@
+# encoding: utf-8
+
+import re
+
+#import ckan.controllers.group as group
+import ckan.plugins as plugins
+import logging
+import datetime
+from urllib.parse import urlencode
+
+import ckan.plugins.toolkit as toolkit
+import ckan.lib.base as base
+import ckan.lib.helpers as h
+import ckan.lib.maintain as maintain
+import ckan.lib.navl.dictization_functions as dict_fns
+import ckan.logic as logic
+import ckan.lib.search as search
+import ckan.model as model
+import ckan.authz as authz
+import ckan.lib.plugins
+import ckan.plugins as plugins
+from ckan.common import c, request, _
+
+
+'''
+Created by Francesco Mangiacrapa, see: #8964
+'''
+class OrganizationVREController(plugins.toolkit.DefaultOrganizationForm): #changed for 2.10 : GroupController -> defaultOrganizationForm
+    ''' The organization controller is for Organizations, which are implemented
+    as Groups with is_organization=True and group_type='organization'. It works
+    the same as the group controller apart from:
+    * templates and logic action/auth functions are sometimes customized
+      (switched using _replace_group_org)
+    * 'bulk_process' action only works for organizations
+
+    Nearly all the code for both is in the GroupController (for historical
+    reasons).
+    '''
+
+    group_types = ['organization']
+
+    def _guess_group_type(self, expecting_name=False):
+        return 'organization'
+
+    def _replace_group_org(self, string):
+        ''' substitute organization for group if this is an org'''
+        return re.sub('^group', 'organization', string)
+
+    def _update_facet_titles(self, facets, group_type):
+        for plugin in plugins.PluginImplementations(plugins.IFacets):
+            facets = plugin.organization_facets(
+                facets, group_type, None)
+    
+    def index(self):
+        group_type = self._guess_group_type()
+
+        page = h.get_page_number(request.args) or 1
+        items_per_page = 21
+
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user, 'for_view': True,
+                   'with_private': False}
+
+        q = c.q = request.args.get('q', '')
+        sort_by = c.sort_by_selected = request.args.get('sort')
+        try:
+            logic.check_access('site_read', context)
+            logic.check_access('group_list', context)
+        except ckan.plugins.toolkit.NotAuthorized:
+            abort(403, _('Not authorized to see this page'))
+
+        # pass user info to context as needed to view private datasets of
+        # orgs correctly
+        if c.userobj:
+            context['user_id'] = c.userobj.id
+            context['user_is_admin'] = c.userobj.sysadmin
+
+        data_dict_global_results = {
+            'all_fields': False,
+            'q': q,
+            'sort': sort_by,
+            'type': group_type or 'group',
+        }
+        global_results = toolkit.get_action('group_list')(context,
+                                                    data_dict_global_results)
+
+        data_dict_page_results = {
+            'all_fields': True,
+            'q': q,
+            'sort': sort_by,
+            'type': group_type or 'group',
+            'limit': items_per_page,
+            'offset': items_per_page * (page - 1),
+        }
+        page_results = toolkit.get_action('group_list')(context,
+                                                  data_dict_page_results)
+
+        c.page = h.Page(
+            collection=global_results,
+            page=page,
+            url=h.pager_url,
+            items_per_page=items_per_page,
+        )
+
+        c.page.items = page_results
+        return base.render('organization_vre/index.html',
+                      extra_vars={'group_type': group_type})
+                      
+
+    def read(self, id, limit=20):
+        group_type = self._ensure_controller_matches_group_type(
+            id.split('@')[0])
+
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user,
+                   'schema': self._db_to_form_schema(group_type=group_type),
+                   'for_view': True}
+        data_dict = {'id': id, 'type': group_type}
+
+        # unicode format (decoded from utf8)
+        c.q = request.args.get('q', '')
+
+        try:
+            # Do not query for the group datasets when dictizing, as they will
+            # be ignored and get requested on the controller anyway
+            data_dict['include_datasets'] = False
+            c.group_dict = toolkit.get_action('group_show')(context, data_dict)
+            c.group = context['group']
+        except (NotFound, NotAuthorized, ckan.logic.NotFound):
+            abort(404, _('Group not found'))
+
+        self._read(id, limit, group_type)
+        return base.render('organization_vre/read.html',
+                      extra_vars={'group_type': group_type})
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/systemtype.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/systemtype.py
new file mode 100644
index 0000000..8d94e5b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/controllers/systemtype.py
@@ -0,0 +1,96 @@
+import logging
+import ckan.plugins as p
+from ckan.common import  _, g, c
+import ckan.lib.search as search
+import ckan.model as model
+import ckan.logic as logic
+import ckan.lib.maintain as maintain
+import ckan.lib.base as base
+import ckan.lib.helpers as h
+
+from urllib.parse import urlencode
+
+
+import ckan.lib.base as base
+import ckan.lib.helpers as h
+import ckan.lib.maintain as maintain
+import ckan.lib.navl.dictization_functions as dict_fns
+import ckan.logic as logic
+import ckan.lib.search as search
+import ckan.model as model
+import ckan.authz as authz
+import ckan.lib.plugins
+import ckan.plugins as plugins
+from ckan.common import c, g, request, _
+
+from collections import OrderedDict
+from flask import render_template
+
+
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it 
+# ISTI-CNR Pisa (ITALY)
+
+class d4STypeController():
+    
+    #Overriding controllers.HomeController.index method
+    def index(self):
+        try:
+            # package search
+            context = {'model': model, 'session': model.Session,'user': c.user, 'auth_user_obj': c.userobj}
+            
+            facets = OrderedDict()
+            
+            default_facet_titles = {
+                'organization': _('Organizations'),
+                'groups': _('Groups'),
+                'types':_('Types'),
+                'tags': _('Tags'),
+                'res_format': _('Formats'),
+                'license_id': _('Licenses'),
+                }
+            
+            for facet in g.facets:
+                if facet in default_facet_titles:
+                    facets[facet] = default_facet_titles[facet]
+                else:
+                    facets[facet] = facet
+            
+            # Facet titles
+            for plugin in p.PluginImplementations(p.IFacets):
+                facets = plugin.dataset_facets(facets, 'dataset')
+            
+            c.facet_titles = facets
+            
+            data_dict = {
+                'q': '*:*',
+                'facet.field': list(facets.keys()),
+                'rows': 4,
+                'start': 0,
+                'sort': 'views_recent desc',
+                'fq': 'capacity:"public"'
+            }
+            query = logic.get_action('package_search')(context, data_dict)
+            c.search_facets = query['search_facets']
+            c.package_count = query['count']
+            c.datasets = query['results']
+            
+            #print "c.search_facets: "
+            #print " ".join(c.search_facets)
+            
+        except search.SearchError:
+            c.package_count = 0
+        
+        if c.userobj and not c.userobj.email:
+            url = h.url_for(controller='user', action='edit')
+            msg = _('Please <a href="%s">update your profile</a>'
+            ' and add your email address. ') % url + \
+            _('%s uses your email address'
+            ' if you need to reset your password.') \
+            % g.site_title
+            h.flash_notice(msg, allow_html=True)
+        
+        # return base.render('type/index.html', cache_force=True)
+        return render_template('type/index.html')
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_cache_controller.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_cache_controller.py
new file mode 100644
index 0000000..0462d7d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_cache_controller.py
@@ -0,0 +1,106 @@
+import datetime
+import logging
+import os
+import tempfile
+import csv
+
+from .icproxycontroller import NAMESPACE_ID_LABEL
+
+log = logging.getLogger(__name__)
+
+CATALINA_HOME = 'CATALINA_HOME'
+temp_dir = None
+namespaces_dir = None
+NAMESPACES_DIR_NAME = "namespaces_for_catalogue"
+NAMESPACES_CACHE_FILENAME = "Namespaces_Catalogue_Categories.csv"
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+
+# D4S_Cache_Controller
+class D4S_Cache_Controller():
+    namespaces_cache_path = None
+    __scheduler = None
+
+    def __init__(self):
+        """ Virtually private constructor. """
+        log.debug("__init__ D4S_Cache_Controller")
+        self._check_cache()
+
+    def _check_cache(self):
+
+        if self.namespaces_cache_path is None:
+            self.init_temp_dir()
+            self.namespaces_cache_path = os.path.join(namespaces_dir, NAMESPACES_CACHE_FILENAME)
+            log.info("The namespaces cache is located at: %s" % self.namespaces_cache_path)
+
+        if not os.path.exists(self.namespaces_cache_path):
+            log.info("File does not exists creating it")
+            try:
+                with open(self.namespaces_cache_path, mode='w') as namespaces_file:
+                    csv.writer(namespaces_file, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL)
+                    log.info("Cache created at %s" % self.namespaces_cache_path)
+            except Exception as e:
+                print(e)
+
+    ''' Write the list of dictionary with namespaces'''
+    def write_namespaces(self, namespace_list_of_dict):
+        # Insert Data
+        with open(self.namespaces_cache_path, 'w') as namespaces_file:
+            writer = csv.writer(namespaces_file, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL)
+            writer.writerow([NAMESPACE_ID_LABEL, 'name', 'title', 'description'])
+            for namespace_dict in namespace_list_of_dict:
+                #print("namespace %s" % namespace_dict)
+                writer.writerow([namespace_dict[NAMESPACE_ID_LABEL], namespace_dict['name'], namespace_dict['title'], namespace_dict['description']])
+
+        log.info("Inserted %d namespaces in the Cache" % len(namespace_list_of_dict))
+
+    '''Returns the list of dictionary with namespaces'''
+    def read_namespaces(self):
+        # Read Data
+        namespace_list_of_dict = []
+        try:
+            with open(self.namespaces_cache_path, 'r') as namespaces_file:
+                reader = csv.DictReader(namespaces_file)
+                for row in reader:
+                    #print("read namespace %s" % row)
+                    namespace_list_of_dict.append(dict(row))
+
+            log.debug("from Cache returning namespace_list_of_dict %s: " % namespace_list_of_dict)
+            log.info("from Cache read namespace_list_of_dict with %d item/s " % len(namespace_list_of_dict))
+            return namespace_list_of_dict
+        except Exception as e:
+            print(e)
+
+        log.info("no namespace in the Cache returning empty list of dict")
+        return namespace_list_of_dict
+
+    @property
+    def get_namespaces_cache_path(self):
+        return self.namespaces_cache_path
+
+    @classmethod
+    def init_temp_dir(cls):
+        global temp_dir
+        global NAMESPACES_DIR_NAME
+        global namespaces_dir
+        try:
+            temp_dir = str(os.environ[CATALINA_HOME])
+            temp_dir = os.path.join(temp_dir, "temp")
+        except KeyError as error:
+            log.error("No environment variable for: %s" % CATALINA_HOME)
+
+        if temp_dir is None:
+            temp_dir = tempfile.gettempdir()  # using system tmp dir
+
+        log.debug("Temp dir is: %s" % temp_dir)
+
+        namespaces_dir = os.path.join(temp_dir, NAMESPACES_DIR_NAME)
+
+        if not os.path.exists(namespaces_dir):
+            os.makedirs(namespaces_dir)
+
+
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_extras.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_extras.py
new file mode 100644
index 0000000..8a62764
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_extras.py
@@ -0,0 +1,30 @@
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+import logging
+log = logging.getLogger(__name__)
+
+class D4S_Extras():
+
+    def __init__(self, category_dict={}, extras=[]):
+        self._category = category_dict
+        self._extras = extras
+
+    def append_extra(self, k, v):
+        #print ("self._extras: %s" %self._extras)
+        if k is not None:
+            self._extras.append({k:v})
+
+    @property
+    def category(self):
+        return self._category
+
+    @property
+    def extras(self):
+        return self._extras
+
+    def __repr__(self):
+        return 'category: %s'%self._category+' ' \
+                'extras: %s'%self._extras
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces.py
new file mode 100644
index 0000000..54f1e90
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces.py
@@ -0,0 +1,39 @@
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+#OrderedDict([(u'@id', u'extra_information'), (u'name', u'Extra Information'), (u'title', u'Extras'), (u'description', u'This section is about Extra(s)')]), u'contact': OrderedDict([(u'@id', u'contact'), (u'name', u'Contact'), (u'title', u'Contact Title'), (u'description', u'This section is about Contact(s)')]), u'developer_information': OrderedDict([(u'@id', u'developer_information'), (u'name', u'Developer'), (u'title', u'Developer Information'), (u'description', u'This section is about Developer(s)')])}
+
+import logging
+log = logging.getLogger(__name__)
+
+class D4S_Namespaces():
+
+    def __init__(self, id=None, name=None, title=None, description=None):
+        self._id = id
+        self._name = name
+        self._title = title
+        self._description = description
+
+    @property
+    def id(self):
+        return self._id
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def title(self):
+        return self._title
+
+
+    @property
+    def description(self):
+        return self._description
+
+    def __repr__(self):
+        return '{id: %s'%self.id+', ' \
+                'name: %s'%self.name+ ', ' \
+                'title: %s'%self.title+ ', ' \
+                'description: %s'%self.description+ '}'
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces_controller.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces_controller.py
new file mode 100644
index 0000000..afb88df
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces_controller.py
@@ -0,0 +1,130 @@
+import logging
+import time
+
+from .d4s_cache_controller import D4S_Cache_Controller
+from .icproxycontroller import D4S_IS_DiscoveryCatalogueNamespaces
+from threading import Event, Thread
+
+CATEGORY = 'category'
+NOCATEOGORY = 'nocategory'
+
+log = logging.getLogger(__name__)
+
+cancel_future_calls = None
+
+# Refreshing time for namespaces cache in secs.
+NAMESPACES_CACHE_REFRESHING_TIME = 60 * 60
+
+
+# Funtion to call repeatedly another function
+def call_repeatedly(interval, func, *args):
+    log.info("call_repeatedly called on func '{}' with interval {} sec".format(func.__name__, interval))
+    stopped = Event()
+
+    def loop():
+        while not stopped.wait(interval):  # the first call is in `interval` secs
+            func(*args)
+
+    th = Thread(name='daemon_caching_namespaces', target=loop)
+    th.setDaemon(True)
+    th.start()
+    return stopped.set
+
+
+def reload_namespaces_from_IS(urlICProxy, resourceID, gcubeToken):
+    log.info("_reload_namespaces_from_IS called")
+    try:
+        discovery_ctg_namespaces = D4S_IS_DiscoveryCatalogueNamespaces(urlICProxy, resourceID, gcubeToken)
+        namespaces_list_of_dict = discovery_ctg_namespaces.getNamespacesDictFromResource()
+
+        if namespaces_list_of_dict is not None and len(namespaces_list_of_dict) > 0:
+            log.debug("namespaces read from IS are: %s" % namespaces_list_of_dict)
+            D4S_Cache_Controller().write_namespaces(namespaces_list_of_dict)
+        else:
+            log.info("namespaces list read from IS is empty. Skipping caching update")
+
+    except Exception as e:
+        print("Error occurred on reading namespaces from IS and refilling the cache!")
+        print(e)
+
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+
+# D4S_IS_DiscoveryCatalogueNamespacesController is used to discovery namespaces for Catalogue Categories (implemented as a Singleton)
+# @param: urlICProxy is the URI of IC proxy rest-full service provided by IS
+# @param: resourceID is the resource ID of the Generic Resource: "Namespaces Catalogue Categories"
+# @param: gcubeToken the gcube token used to contact the IC proxy
+class D4S_Namespaces_Controller():
+    __instance = None
+
+    @staticmethod
+    def getInstance():
+        """ Static access method. """
+        if D4S_Namespaces_Controller.__instance is None:
+            D4S_Namespaces_Controller()
+
+        return D4S_Namespaces_Controller.__instance
+
+    def __init__(self):
+        """ Virtually private constructor. """
+        log.debug("__init__ D4S_Namespaces_Controller")
+
+        if D4S_Namespaces_Controller.__instance is not None:
+            raise Exception("This class is a singleton!")
+        else:
+            D4S_Namespaces_Controller.__instance = self
+
+        self._d4s_cache_controller = D4S_Cache_Controller()
+        self._urlICProxy = None
+        self._resourceID = None
+        self._gcubeToken = None
+
+    def load_namespaces(self, urlICProxy, resourceID, gcubeToken):
+        log.debug("readNamespaces called")
+        self._urlICProxy = urlICProxy
+        self._resourceID = resourceID
+        self._gcubeToken = gcubeToken
+        return self._check_namespaces()
+
+    def _read_namespaces(self):
+        return self._d4s_cache_controller.read_namespaces()
+
+    def _check_namespaces(self):
+        log.debug("_check_namespaces called")
+
+        if self._d4s_cache_controller is None:
+            self._d4s_cache_controller = D4S_Cache_Controller()
+
+        namespace_list = self._read_namespaces()
+
+        # when the Cache is empty
+        if namespace_list is None or not namespace_list:
+            # reading namespaces from IS and filling the DB
+            log.info("The Cache is empty. Reading the namespace from IS and filling the Cache")
+            reload_namespaces_from_IS(self._urlICProxy, self._resourceID, self._gcubeToken)
+            # reloading the namespaces from the cache
+            namespace_list = self._read_namespaces()
+
+        # starting Thread daemon for refreshing the namespaces Cache
+        global cancel_future_calls
+        if cancel_future_calls is None:
+            cancel_future_calls = call_repeatedly(NAMESPACES_CACHE_REFRESHING_TIME, reload_namespaces_from_IS,
+                                                  self._urlICProxy,
+                                                  self._resourceID,
+                                                  self._gcubeToken)
+
+        return namespace_list
+
+    def get_dict_ctg_namespaces(self):
+        log.debug("get_dict_ctg_namespaces called")
+        namespace_list_of_dict = self._check_namespaces()
+        return self.convert_namespaces_to_d4s_namespacedict(namespace_list_of_dict)
+
+    # Private method
+    @staticmethod
+    def convert_namespaces_to_d4s_namespacedict(namespace_list_of_dict):
+        log.debug("convert_namespaces_to_d4s_namespacedict called on %s" % namespace_list_of_dict)
+        return D4S_IS_DiscoveryCatalogueNamespaces.to_namespaces_dict_index_for_id(namespace_list_of_dict)
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces_extras_util.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces_extras_util.py
new file mode 100644
index 0000000..edb0bbf
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/d4s_namespaces_extras_util.py
@@ -0,0 +1,89 @@
+import logging
+import collections
+from .d4s_extras import D4S_Extras
+
+CATEGORY = 'category'
+NOCATEOGORY = 'nocategory'
+
+log = logging.getLogger(__name__)
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+
+# D4S_Namespaces_Extra_Util is used to get the extra fields indexed for D4Science namespaces 
+# @param: namespace_dict is the namespace dict of D4Science namespaces (defined in the Generic Resource: "Namespaces Catalogue Categories")
+# @param: extras is the dictionary of extra fields for a certain item
+class D4S_Namespaces_Extra_Util():
+    
+    def get_extras_indexed_for_namespaces(self, namespace_dict, extras):
+        extras_for_categories = collections.OrderedDict()
+
+        # ADDING ALL EXTRAS WITH NAMESPACE
+        for namespaceid in list(namespace_dict.keys()):
+            dict_extras = None
+            nms = namespaceid + ":"
+            #has_namespace_ref = None
+            for key, value in extras:
+                k = key
+                v = value
+                # print "key: " + k
+                # print "value: " + v
+                if k.startswith(nms):
+
+                    if namespaceid not in extras_for_categories:
+                        extras_for_categories[namespaceid] = collections.OrderedDict()
+
+                    dict_extras = extras_for_categories[namespaceid]
+                    log.debug("dict_extras %s "%dict_extras)
+
+                    if (dict_extras is None) or (not dict_extras):
+                        dict_extras = D4S_Extras(namespace_dict.get(namespaceid), [])
+                        log.debug("dict_extras after init %s " % dict_extras)
+
+                    #print ("dict_extras after init %s " % dict_extras)
+                    log.debug("replacing namespace into key %s " % k +" with empty string")
+                    nms = namespaceid + ":"
+                    k = k.replace(nms, "")
+                    dict_extras.append_extra(k, v)
+                    extras_for_categories[namespaceid] = dict_extras
+                    log.debug("adding d4s_extra: %s " % dict_extras+ " - to namespace id: %s" %namespaceid)
+                    #has_namespace_ref = True
+                    #break
+
+        #ADDING ALL EXTRAS WITHOUT NAMESPACE
+        for key, value in extras:
+            k = key
+            v = value
+
+            has_namespace_ref = None
+            for namespaceid in list(namespace_dict.keys()):
+                nms = namespaceid + ":"
+                #IF KEY NOT STARTING WITH NAMESPACE
+                if k.startswith(nms):
+                    has_namespace_ref = True
+                    log.debug("key: %s " % k + " - have namespace: %s" % nms)
+                    break
+
+            if has_namespace_ref is None:
+                log.debug("key: %s " % k + " - have not namespace")
+                if NOCATEOGORY not in extras_for_categories:
+                    extras_for_categories[NOCATEOGORY] = collections.OrderedDict()
+
+                dict_extras_no_cat = extras_for_categories[NOCATEOGORY]
+                #print ("dict_extras_no_cat %s " % dict_extras_no_cat)
+
+                if (dict_extras_no_cat is None) or (not dict_extras_no_cat):
+                    dict_extras_no_cat = D4S_Extras(NOCATEOGORY, [])
+
+                #print ("adding key: %s "%k+" - value: %s"%v)
+                log.debug("NOCATEOGORY adding key: %s " % k + " - value: %s" % v)
+
+                dict_extras_no_cat.append_extra(k, v)
+                log.debug("dict_extras_no_cat %s " % dict_extras_no_cat)
+                extras_for_categories[NOCATEOGORY] = dict_extras_no_cat
+                log.debug("extras_for_categories NOCATEOGORY %s " % extras_for_categories)
+
+        return extras_for_categories
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/icproxycontroller.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/icproxycontroller.py
new file mode 100644
index 0000000..f1c03ce
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/d4sdiscovery/icproxycontroller.py
@@ -0,0 +1,110 @@
+import logging
+import urllib.request, urllib.error, urllib.parse
+from lxml import etree
+
+import xmltodict
+import collections
+
+from .d4s_namespaces import D4S_Namespaces
+
+XPATH_NAMESPACES = "/Resource/Profile/Body/namespaces"
+gcubeTokenParam = "gcube-token"
+NAMESPACE_ID_LABEL = '@id'
+
+log = logging.getLogger(__name__)
+
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+def getResponseBody(uri):
+    req = urllib.request.Request(uri)
+    try:
+        resp = urllib.request.urlopen(req, timeout=20)
+    except urllib.error.HTTPError as e:
+        log.error("Error on contacting URI: %s" % uri)
+        log.error("HTTPError: %d" % e.code)
+        return None
+    except urllib.error.URLError as e:
+        # Not an HTTP-specific error (e.g. connection refused)
+        log.error("URLError - Input URI: %s " % uri + " is not valid!!")
+        return None
+    else:
+        # 200
+        body = resp.read()
+        return body
+
+
+# D4S_IS_DiscoveryCatalogueNamespaces is used to discovery namespaces for Catalogue Categories.
+# @param: urlICProxy is the URI of IC proxy rest-full service provided by IS
+# @param: resourceID is the resource ID of the Generic Resource: "Namespaces Catalogue Categories"
+# @param: gcubeToken the gcube token used to contact the IC proxy
+class D4S_IS_DiscoveryCatalogueNamespaces():
+
+    def __init__(self, urlICProxy, resourceID, gcubeToken):
+        self.urlICProxy = urlICProxy
+        self.resourceID = resourceID
+        self.gcubeToken = gcubeToken
+
+    def getNamespacesDictFromResource(self):
+
+        doc = {}
+        namespace_list = []
+
+        try:
+            # print("proxy: "+self.urlICProxy)
+            # print("resourceID: " + self.resourceID)
+            # print("gcubeTokenParam: " + gcubeTokenParam)
+            # print("gcubeToken: " + self.gcubeToken)
+
+            uri = self.urlICProxy + "/" + self.resourceID + "?" + gcubeTokenParam + "=" + self.gcubeToken
+            log.info("Contacting URL: %s" % uri)
+            theResource = getResponseBody(uri)
+            log.debug("Resource returned %s " % theResource)
+            theResourceXML = etree.XML(theResource)
+            theNamespaces = theResourceXML.xpath(XPATH_NAMESPACES)
+            log.debug("The body %s" % etree.tostring(theNamespaces[0]))
+
+            if theNamespaces is not None and theNamespaces[0] is not None:
+                bodyToString = etree.tostring(theNamespaces[0])
+                doc = xmltodict.parse(bodyToString)
+            else:
+                log.warn("No Namespace for Catalogue Categories found, returning None")
+        except Exception as inst:
+            log.error("Error on getting catalogue namespaces: " + str(inst))
+            log.info("Returning empty list of namespaces")
+            return namespace_list
+
+        log.debug("IS namespaces resource to dict is: %s" % doc)
+
+
+        if ('namespaces' in doc):
+            # log.debug('Namespaces obj %s:' % doc['namespaces'])
+            namespaces = doc['namespaces']
+            if doc is not None and 'namespace' in namespaces:
+                namespace_list = namespaces['namespace']
+
+        log.info("Loaded %d namespaces from IS resource" % len(namespace_list))
+        return namespace_list
+
+    @staticmethod
+    def to_namespaces_dict_index_for_id(namespace_list):
+        namespace_dict = collections.OrderedDict()
+        log.debug("namespaces to dict: %s" % namespace_list)
+        try:
+            if namespace_list is not None and len(namespace_list) > 0:
+                for namespace in namespace_list:
+                    try:
+                        if NAMESPACE_ID_LABEL in namespace:
+                            namespace_dict[namespace[NAMESPACE_ID_LABEL]] = D4S_Namespaces(
+                                namespace[NAMESPACE_ID_LABEL],
+                                namespace['name'],
+                                namespace['title'],
+                                namespace['description'])
+                    except Exception as inst:
+                        log.error("Error on converting catalogue namespaces: " + str(inst))
+        except Exception as inst:
+            log.error("Error on checking namespace_list: " + str(inst))
+        # print "namespace_dict to Nam: %s"%namespace_dict
+        return namespace_dict
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/.gitignore b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/d4science_scripts.js b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/d4science_scripts.js
new file mode 100644
index 0000000..642cdc5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/d4science_scripts.js
@@ -0,0 +1,303 @@
+/* =====================================================
+   JavaScript used by CKAN plugin: 'd4science_theme' 
+   Created by Francesco Mangiacrapa ISTI-CNR Pisa, Italy
+   ===================================================== */
+   
+   
+CKAN_D4S_Breadcrumb_Manager = {
+	
+	breadcrumbShow : function (show) {
+	
+		var breadcrumb = document.getElementById('ckan-breadcrumb');
+		console.log('breadcrumb is '+breadcrumb)
+		if(breadcrumb){
+			if(show){
+				breadcrumb.style.display = 'block';
+				this.organizationTreeShow(true);
+			} else{ 
+				breadcrumb.style.display = 'none';
+				this.organizationTreeShow(false);
+			}
+		}
+		
+		//var elements = document.getElementsByTagName('a');
+		//for(var i = 0, len = elements.length; i < len; i++) {
+		//	elements[i].onclick = function () {
+	    //  	//alert("You clicked an external link to: " + this.href);
+	    //  	//window.parent.add_hide_breadcrumb_to_dom(false);
+	   //   	this.add_hide_breadcrumb_to_dom(false);
+	   // }
+		//}
+	},
+	
+	organizationTreeShow : function (show) {
+		var trees = document.getElementsByClassName("hierarchy-tree-top");
+		
+		if (trees){
+			for (i = 0; i < trees.length; i++) { 
+				if(show){
+					trees[i].style.display = 'block';
+				} else{ 
+					trees[i].style.display = 'none';
+				}
+    		}
+		}
+	},
+
+	checkBreadcrumbShow : function () {
+		
+		var showBdc = this.getSessionStorageItem("showbreadcrumb")
+		//console.log("showBdc is: "+showBdc)
+		if(showBdc != undefined && showBdc=="false"){
+			console.log("Show breadcrumb false");
+			this.breadcrumbShow(false);
+		}else{
+			console.log("Show breadcrumb true");
+			this.breadcrumbShow(true);
+		}
+	},
+
+
+	setSessionStorageItem : function (item_key, item_value) {
+	
+		// Check browser support
+		if (typeof(Storage) !== "undefined") {
+	    	// Store
+	    	sessionStorage.setItem(item_key, item_value);
+	    	return true;
+		} else {
+	    	console.log("Sorry, your browser does not support Web Storage...");
+	    	return false;
+	    }
+	},
+
+
+	getSessionStorageItem : function (item_key) {
+	
+		// Check browser support
+		if (typeof(Storage) !== "undefined") {
+	    	// Store
+	    	return sessionStorage.getItem(item_key);
+		} else {
+	    	console.log("Sorry, your browser does not support Web Storage...");
+	    	return undefined;
+	   }
+	}
+
+}
+
+
+CKAN_D4S_Functions_Util = {
+	
+	getPosition : function(canvas, event){
+	  var x = new Number();
+	  var y = new Number();
+	  try {
+	  if (event.clientX != undefined && event.clientY != undefined)
+	  {
+
+		 x = event.clientX;
+		 y = event.clientY;
+	  }
+	  else // Firefox method to get the position
+	  {
+		 x = event.clientX + document.body.scrollLeft +
+		     document.documentElement.scrollLeft;
+		 y = event.clientY + document.body.scrollTop +
+		     document.documentElement.scrollTop;
+	  }
+	  x -= canvas.offsetLeft;
+	  y -= canvas.offsetTop;
+	  }catch (err) {
+	  	//silent error
+	  }
+	  return '{"posX": "'+x+'", "posY": "'+y+'"}';
+	},
+	
+	// When the user clicks on div, open the popup
+	showPopupD4S : function(event, my_div, my_popup_left_position) {
+		var popup = document.getElementById(my_div);
+		var clickPosition = this.getPosition(my_div, event)
+		var myPosition = JSON.parse(clickPosition);
+		this.closePopups(my_div);
+		// When the user clicks anywhere outside of the modal, close it
+		/*window.onclick = function(event) {
+	    if (event.target != popup) {
+	        popup.style.display = "none";
+	    }
+		}*/
+		popup.classList.toggle("show");
+	
+		if(my_popup_left_position){
+			popup.style.left = my_popup_left_position;
+		}
+		else if (myPosition.posX){
+			popup.style.left = myPosition.posX + "px";
+		}
+	},
+	
+	closePopups : function ($target) {
+		var popups = document.getElementsByClassName('popuptext');
+    	for (i = 0; i < popups.length; i++) {
+      	if (popups[i].getAttribute('id') != $target) {
+        		popups[i].classList.remove('show');
+       	}	
+    	}
+	},
+	
+	checkURL : function (url) {
+		//console.log('checking url: '+url)
+		var regex = new RegExp('^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/|www\.|ftp:\/\/)+[^ "]+$');
+		if (regex.test(url)) {
+			return true;
+	   }
+	   return false;
+	}
+
+}
+
+CKAN_D4S_HTMLMessage_Util = {
+	
+   postHeightToPortlet : function (selectedProduct, product) {
+	 	var h = document.body.scrollHeight + "px";
+	 	var p = "";
+	 	var msg = "";
+	 	//WORK AROUND IF TWO MESSAGES ARE SENT FROM A PAGE OF A PRODUCT
+	 	//THE MESSAGE WITH 'NULL' PRODUCT IS SKIPPED
+	 	//console.log("window.location.pathname? "+window.location.pathname);
+	 	var pathArray = window.location.pathname.split('/');
+	 	var productContext = "dataset";
+	 	if(pathArray.length>1){
+	 		//console.log("pathArray is: "+pathArray);     	
+	 		var secondLevelLocation = pathArray[1]; //it is the second level location
+	 		//console.log("secondLevelLocation is: "+secondLevelLocation);
+	 		//console.log("h is: "+h);     	
+	 		if(secondLevelLocation == productContext){ //is it product context?
+	 			if(product !== 'undefined' && product !== null){
+	 				p = product;
+	 				//console.log("product selected is: "+p);
+	 			}else{
+	 				//console.log("product is null or undefined, passing only height");
+	 				msg = "{\"height\": \""+h+"\"}"; 	
+	 				//window.postMessage(msg,'*');
+	 				this.postMessageToParentWindow(msg);
+	 				return;
+	 			}
+	 		}
+	 	}
+	 	
+	 	//msg = "{'height': '"+h+"', 'product': '"+p+"'}";
+	 	msg = "{\"height\": \""+h+"\", \"product\": \""+p+"\"}"; 	
+	 	//window.postMessage(msg,'*');
+	 	//console.log("posting message in the window: "+msg);
+	 	this.postMessageToParentWindow(msg);
+ 	},
+ 	
+ 	postMessageToParentWindow : function (msg) {
+ 		//window.postMessage(msg,'*');
+ 		//console.log("posting message in the window: "+msg);
+ 		if(window.parent!=null){
+ 			console.log("posting message in the parent window: "+msg);
+ 			window.parent.postMessage(msg,'*');
+	 	}
+	 	return;
+	 }
+
+}
+
+CKAN_D4S_JSON_Util = {
+
+
+  //ADDED by Francesco Mangiacrapa
+  appendHTMLToElement : function(containerID, elementHTML){
+
+     var divContainer = document.getElementById(containerID);
+     divContainer.innerHTML = "";
+     divContainer.appendChild(elementHTML);
+  },
+
+ //ADDED by Francesco Mangiacrapa
+ jsonToHTML : function(containerID, cssClassToTable) {
+
+    try
+    {
+       var jsonTxt = document.getElementById(containerID).innerHTML;
+       var jsonObj = JSON.parse(jsonTxt);
+       //console.log(jsonObj.length)
+
+       if(jsonObj.length==undefined)
+        jsonObj = [jsonObj]
+        //console.log(jsonObj.length)
+
+      // EXTRACT VALUE FOR HTML HEADER.
+       var col = [];
+       for (var i = 0; i < jsonObj.length; i++) {
+        for (var key in jsonObj[i]) {
+          //console.log('key json' +key)
+          if (col.indexOf(key) === -1) {
+            col.push(key);
+          }
+        }
+       }
+
+       // CREATE DYNAMIC TABLE.
+       var table = document.createElement("table");
+       var addDefaultCss = "json-to-html-table-column";
+       if(cssClassToTable){
+       	addDefaultCss = cssClassToTable;
+       }
+       try{
+    	    table.classList.add(addDefaultCss);
+       }catch(e){
+    		  console.log('invalid css add', e);
+       }
+
+       // ADD JSON DATA TO THE TABLE AS ROWS.
+       for (var i = 0; i < col.length; i++) {
+
+          tr = table.insertRow(-1);
+          var firstCell = tr.insertCell(-1);
+          //firstCell.style.cssText="font-weight: bold; text-align: center; vertical-align: middle;";
+          firstCell.innerHTML = col[i];
+          for (var j = 0; j < jsonObj.length; j++) {
+            var tabCell = tr.insertCell(-1);
+            var theValue = jsonObj[j][col[i]];
+            /*  console.log(theValue + ' is url? '+isUrl);*/
+            if(CKAN_D4S_Functions_Util.checkURL(theValue)){
+            	theValue = '<a target="_blank" href='+theValue+'>'+theValue+'</a>';
+            }
+            
+            tabCell.innerHTML = theValue;
+           }
+       }
+
+       // FINALLY ADD THE NEWLY CREATED TABLE WITH JSON DATA TO A CONTAINER.
+       this.appendHTMLToElement(containerID, table);
+
+    }
+    catch(e){
+       console.log('invalid json', e);
+    }
+  }
+}
+
+
+//Task #8032
+window.addEventListener("message",
+ function (e) {
+ 
+ 		 var curr_loc = window.location.toString()
+ 		 var orgin = e.origin.toString()
+ 		 if(curr_loc.startsWith(orgin)){
+ 		  	//alert("ignoring message from myself");
+      	return; 
+ 		 }
+ 		 //console.log("origin: "+e.data)
+ 		 if(e.data == null)
+ 		 	return;
+ 		 	
+ 		 var pMess = JSON.parse(e.data)
+ 		 //console.log(pMess.explore_vres_landing_page)
+ 		 window.linktogateway = pMess.explore_vres_landing_page;
+ },false);
+ 
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/d4science_theme.css b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/d4science_theme.css
new file mode 100644
index 0000000..9e416b1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/fanstatic/d4science_theme.css
@@ -0,0 +1,844 @@
+/* =====================================================
+   The "account masthead" bar across the top of the site
+   ===================================================== */
+
+.account-masthead {
+    background-color: #ccc;
+}
+/* The "bubble" containing the number of new notifications. */
+.account-masthead .account .notifications a span {
+  background-color: #9fa0a2;
+}
+/* The text and icons in the user account info. */
+.account-masthead .account ul li a {
+  color: rgba(255, 255, 255, 0.6);
+}
+/* The user account info text and icons, when the user's pointer is hovering
+   over them. */
+.account-masthead .account ul li a:hover {
+  color: rgba(255, 255, 255, 0.7);
+/*  background-color: black;*/
+}
+
+
+/* ========================================================================
+   The main masthead bar that contains the site logo, nav links, and search
+   ======================================================================== */
+
+.masthead {
+  background: #eee url("/bg-noise.png") repeat scroll 0 0;
+  border-top: 1px solid #555;
+  padding-top: 5px;
+  padding-bottom: 15px !important;
+  border-bottom: 1px solid #999;
+/*  background-image: url("/bg-pattern.min.svg") !important; */
+}
+
+.masthead .navigation .nav-pills li a{
+	color: #187794;
+}
+
+a.logo > img{
+	margin-bottom: 5px;
+}
+
+/* The "navigation pills" in the masthead (the links to Datasets,
+   Organizations, etc) when the user's pointer hovers over them. */
+.masthead .navigation .nav-pills li a:hover {
+/*  background-color: rgb(48, 48, 48);*/
+  color: white;
+}
+/* The "active" navigation pill (for example, when you're on the /dataset page
+   the "Datasets" link is active). */
+.masthead .navigation .nav-pills li.active a {
+  background-color: #d2d2d5;
+}
+/* The "box shadow" effect that appears around the search box when it
+   has the keyboard cursor's focus. */
+.masthead input[type="text"]:focus {
+ -webkit-box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+  box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+}
+
+
+/* ===========================================
+   The content in the middle of the front page
+   =========================================== */
+
+/* Remove the "box shadow" effect around various boxes on the page. */
+.box {
+  box-shadow: none;
+}
+.hero {
+	background: #FEFEFE repeat scroll 0 0 !important;
+}
+/* Remove the borders around the "Welcome to CKAN" and "Search Your Data"
+   boxes. */
+.hero .box {
+  /*border: none;*/
+  margin-top: 10px !important;
+}
+/* Change the colors of the "Search Your Data" box. */
+.homepage .module-search .module-content {
+  color: rgb(68, 68, 68);
+  background-color: white;
+}
+/* Change the background color of the "Popular Tags" box. */
+.homepage .module-search .tags {
+  background-color: #fcfcfc;
+}
+
+.homepage-title{
+	font-size: 20px;
+	font-weight: bold;
+	color: #202020;
+	margin-bottom: 20px;
+}
+
+/* Change the background color of the "Popular Tags" box. */
+.homepage .module-search h3{
+  color: #444;
+}
+
+/* Remove some padding. This makes the bottom edges of the "Welcome to CKAN"
+   and "Search Your Data" boxes line up. */
+.module-content:last-child {
+  /*padding-bottom: 0px;*/
+}
+.homepage .module-search {
+  padding: 0px;
+}
+/* Add a border line between the top and bottom halves of the front page. */
+.homepage [role="main"] {
+  border-bottom: 1px solid #bbb;
+  padding: 10px 0;
+}
+
+.homepage .stats ul li a b{
+	font-size: 30px !important;
+}
+
+[role="main"], .main {
+/*    background: #f5f6fa url("/bg-pattern.min.svg") repeat; scroll 0 0;*/
+    /*background: #fafafa url("/bg-pattern.svg") repeat; scroll 0 0;*/
+    background: #fdfdfd none repeat scroll 0 0;
+    min-height: 0px !important;
+}
+
+.media-item-homepage {
+	 background-color: white;
+    border-radius: 3px;
+    float: left;
+    margin: 15px 0 0 15px;
+    overflow: hidden;
+    padding-left: 10px;
+    padding-right: 10px;
+    position: relative;
+    text-align: center;
+    width: 150px;
+}
+
+.media-heading-homepage {
+    font-size: 16px;
+    hyphens: auto;
+    line-height: 1.3;
+    margin: 5px 0;
+}
+
+.media-grid-homepage {
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+/*    background: #fbfbfb url("../../../base/images/bg.png") repeat scroll 0 0;
+    border-color: #dddddd;
+    border-image: none;
+    border-style: solid;
+    border-width: 1px 0;*/
+    list-style: outside none none;
+    margin: 0 -10px;
+    padding-bottom: 15px;
+}
+.media-grid-homepage::before, .media-grid::after {
+    content: "";
+    display: table;
+    line-height: 0;
+}
+.media-grid-homepage::after {
+    clear: both;
+}
+
+.background-circle{
+    padding: 10px 10px;
+    display: inline-block !important;
+    -webkit-border-radius: 90px;
+    -moz-border-radius: 90px;
+    border-radius: 90px;
+    background-color: #4679b2;
+    text-decoration: none !important;
+}
+
+.color-white{
+	color: white !important;
+}
+
+.badge-circle {
+	border-radius: 50% 50% 50% 50% !important;
+	height: 60px;
+   text-align: center;
+   vertical-align: middle;
+   width: 65px;
+   background-color: #4679b2;
+   display: inline-block !important;
+   padding-top: 5px;
+   text-decoration: none !important;
+}
+
+/* ====================================
+   The footer at the bottom of the site
+   ==================================== */
+
+.site-footer, body {
+  background-color: #bbb;
+  font-family: "Lato","Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 16px;
+}
+/* The text in the footer. */
+.site-footer,
+.site-footer label,
+.site-footer small {
+  color: rgba(255, 255, 255, 0.6);
+}
+/* The link texts in the footer. */
+.site-footer a {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.site-footer-internal{
+    min-height: 10px;
+    padding: 2px 0;
+    font-size: 12px;
+}
+
+.site-footer-internal {
+  /*background-color: rgba(255, 255, 255, 0.6);*/
+  text-align: center;
+  /*display: inline-block;*/
+}
+
+.site-footer-internal,
+.site-footer-internal label,
+.site-footer-internal small {
+
+}
+
+.site-footer-internal a {
+  display: inline-block;
+}
+
+.d4s-hide-text {
+    background-color: transparent;
+    border: 0 none;
+    color: transparent;
+    font: 0px/0 a;
+    text-shadow: none;
+}
+
+.d4science-footer-logo {
+    background: url("/gCube_70.png") no-repeat scroll left top rgba(0, 0, 0, 0);
+    height: 32px;
+    margin-top: 2px;
+    text-indent: -900em;
+    width: 75px;
+}
+
+.d4s-ckan-footer-logo {
+    background: rgba(0, 0, 0, 0) url("/ckan-logo-footer.png") no-repeat scroll left top;
+    height: 21px;
+    margin-top: 2px;
+    text-indent: -900em;
+    width: 69px;
+}
+
+.site-footer-d4science {
+	font-size: 14px;
+	color: #f5f5f5;
+	text-align: center;
+	height: 25px;
+	padding-top: 5px;
+	background-color: #7F7F7F;
+}
+
+.site-footer-d4science a {
+  font-weight: bold;
+  text-decoration: none;
+  color: white;
+}
+
+
+/* ====================================
+   Base elements of the site
+   ==================================== */
+
+div .principaltitle {
+	color: inherit;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 1.2;
+	margin: 15px 0;
+	text-rendering: optimizelegibility;
+	word-break: break-all;
+	padding-bottom: 10px;
+	padding-top: 5px;
+	border-bottom: 1px solid #eee;
+}
+
+div .notes {
+	color: #444444;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-size: 14px;
+	line-height: 1.3;
+	text-align: justify;
+	word-break: break-all;
+}
+
+div .infotitle {
+	font-size: 15px;
+	hyphens: auto;
+	line-height: 1.3;
+	word-break: break-all;
+	font-weight: bold;
+}
+
+.toolbar .breadcrumb{
+	font-size: 16px !important;
+}
+
+.box{
+	border: 0px !important;
+}
+
+div .sectiontitle{
+	color: #9F9F9F;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-size: 17px;
+	font-weight: bold;
+	margin: 20px 0;
+	margin-top: 20px;
+	margin-bottom: 10px;
+	text-rendering: optimizelegibility;
+}
+
+section .well {
+	background-color: #fdfdfd !important;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+	box-shadow: none !important;
+	margin-bottom: 20px;
+	min-height: 20px;
+   
+}
+
+.page-heading {
+    font-size: 18px;
+    line-height: 1.2;
+    margin-top: 20px;
+    margin-bottom: 0px;
+}
+
+#dataset-resources .resource-list{
+	background-color: #fdfdfd !important;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+   box-shadow: none !important;
+   margin: -1px 0 !important;
+}
+
+.wrapper{
+	border: 1px solid #d0d0d0;
+	box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.05);
+	border-radius: 3px
+}
+
+.home-popular{
+	padding-top: 25px;
+}
+
+.logo-homepage{
+	max-height: 60px;
+}
+
+.statistics-show{
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	color: #444444;
+	text-decoration: none;
+}
+
+.d4s-center-cropped{
+    text-align: center;
+    background-color: #eee;
+    border: 1px solid #ddd;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+
+.tag-list {
+    font-size: 14px;
+}
+
+
+/* ====================================
+   Acquired Dataset
+   ==================================== */
+.label-acquired {
+    background-color: #55a1ce;
+}
+
+.label-owner {
+    background-color: #e0051e;
+}
+
+.divider {
+    margin-left:10px;
+    height:auto;
+    display:inline-block;
+}
+
+/* ====================================
+   List Dataset
+   ==================================== */
+   
+/*LEFT
+.show_meatadatatype {
+  color: white;
+  display: inline-block; // Inline elements with width and height. TL;DR they make the icon buttons stack from left-to-right instead of top-to-bottom 
+  position: relative; // All 'absolute'ly positioned elements are relative to this one 
+  margin-bottom: 20px;
+  margin-left: 25px;
+}
+*/
+
+/*RIGHT*/
+.show_meatadatatype {
+    color: white;
+    display: inline-block;
+    float: right;
+    margin-right: 2px;
+    margin-top: -20px;
+    position: relative;
+}
+
+
+
+/* LEFT
+ * Position the badge within the relatively positioned button
+.button__badge {
+  background-color: #fa3e3e;
+  border-radius: 2px;
+  color: white;
+ 
+  padding: 1px 6px;
+  font-size: 10px;
+
+  position: absolute; 
+  top: 0;
+  right: 0;
+}*/
+
+
+
+/* RIGTH */
+.button__badge {
+  color: #808080;
+  padding: 0px 2px;
+  font-size: 10px;
+  top: 0;
+  right: 0;
+  font-family: sans-serif, times, georgia;
+}
+
+/* ====================================
+   Modal Popup
+   ==================================== */
+
+/* Popup container - can be anything you want */
+/* The Modal (background) */
+.d4s_modal {
+    display: none; /* Hidden by default */
+    position: fixed; /* Stay in place */
+    z-index: 10001; /* Sit on top (NB. At 1000 there is the zoom in/out of the Map Widget)*/
+    /*padding-top: 100px;*/ /* Location of the box */
+    left: 0;
+    top: 0;
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    overflow: auto; /* Enable scroll if needed */
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+}
+
+/* Modal Content */
+.d4s_modal-content {
+    background-color: #fefefe;
+    /*margin: auto;*/
+    padding: 20px;
+    border: 1px solid #888;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	 border-radius: 5px;
+	 position: absolute;
+    left: 50%;
+    margin-left: -225px;
+    width: 450px;
+}
+
+/* The Close Button */
+.d4s_close {
+    color: #aaaaaa;
+    float: right;
+    font-size: 28px;
+    font-weight: bold;
+    padding-left: 20px;
+}
+
+.d4s_close:hover,
+.d4s_close:focus {
+    color: #000;
+    text-decoration: none;
+    cursor: pointer;
+}
+
+.d4s_div_clickable{
+	cursor: pointer;
+}
+
+/*====================================
+D4S POPUP
+======================================*/
+
+/* Popup container - can be anything you want */
+.popupD4SNoArrow {
+    position: relative;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+/* The actual popup */
+.popupD4SNoArrow .popuptext {
+    visibility: hidden;
+    width: 300px;
+    background-color: #555;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px;
+    position: absolute;
+    z-index: 1;
+    bottom: 125%;
+    left: 50%;
+    margin-left: -150px;
+}
+
+/* Toggle this class - hide and show the popup */
+.popupD4SNoArrow .show {
+    visibility: visible;
+    -webkit-animation: fadeIn 1s;
+    animation: fadeIn 1s;
+}
+
+
+/* Popup container - can be anything you want */
+.popupD4S {
+    position: relative;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+/* The actual popup */
+.popupD4S .popuptext {
+    visibility: hidden;
+    width: 300px;
+    background-color: #555;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px;
+    position: absolute;
+    z-index: 1;
+    bottom: 125%;
+    left: 50%;
+    margin-left: -150px;
+}
+
+/* Popup arrow */
+.popupD4S .popuptext::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 50%;
+    margin-left: -5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: #555 transparent transparent transparent;
+}
+
+/* Toggle this class - hide and show the popup */
+.popupD4S .show {
+    visibility: visible;
+    -webkit-animation: fadeIn 1s;
+    animation: fadeIn 1s;
+}
+
+/* Add animation (fade in the popup) */
+@-webkit-keyframes fadeIn {
+    from {opacity: 0;} 
+    to {opacity: 1;}
+}
+
+@keyframes fadeIn {
+    from {opacity: 0;}
+    to {opacity:1 ;}
+}
+
+/*====================================
+D4S PACKAGE
+======================================*/
+
+.graphic-preview-style {
+	text-align: center;
+	border-top: 1px dotted #DDD;
+	padding-top: 10px;
+	padding-bottom: 0px;
+	margin-top: 15px;
+}
+
+.graphic-preview-style a{
+	font-size: 13px;
+}
+
+.graphic-preview-style img{
+	max-width: 100% !important;
+	height: auto;
+	
+}
+
+.graphic-preview-style #graphic-title{
+	font-size: 13px;
+	
+}
+
+.nav-item{
+	word-wrap:break-word;
+ }
+
+/*====================================
+RESOURCE_LIST RESOURCE_ITEM INTO PACKAGE
+======================================*/
+
+.required-access {
+	font-style: italic;
+	font-weight: bold;
+	padding: 5px;
+}
+
+/*====================================
+LINK TO RESOURCES FROM PACKAGE LIST
+======================================*/
+
+.dataset-resources li a {
+    background-color: #187794;
+}
+
+.label[data-format="csw"], .label[data-format*="csw"] {
+    background-color: #e6b800;
+}
+
+/*====================================
+CSS APPLIED TO Similar GRSF Records
+======================================*/
+
+.my-grsf-table{
+	word-break: break-all;
+}
+
+.my-grsf-table tr td{
+	width: inherit;
+}
+
+.my-grsf-table tr td:first-child{
+	width: 82px !important;
+}
+
+/*====================================
+CSS APPLIED in base.html
+======================================*/
+
+#ckan-page-loading {
+	display: none;
+	position: fixed;
+   top: 50%;
+   left: 50%;
+   margin-top: -130px;
+   margin-left: -130px;
+   width: 260px;
+   height: 260px;
+   z-index: 100000;
+   background-image: url("/pageloading.gif");
+   background-repeat: no-repeat;
+   background-position: center;
+}
+
+/*====================================
+CSS APPLIED in search_for_location.html
+======================================*/
+
+div#search-for-location {
+	
+}
+
+div#search-for-location #dataset-map {
+	position: relative !important;
+	top: +0px !important;
+}
+
+div#search-for-location #dataset-map-container {
+	height: 300px;
+}
+
+
+div#search-for-location .module-heading {
+	display: none;
+}
+
+div#search-for-extent{
+	padding-top: 10px;
+}
+
+/*====================================
+CSS APPLIED in additional_info.html
+======================================*/
+.qr-code-table {
+	width: 100%;
+}
+
+.qr-code-table td {
+	width: 85%;
+	border: 1px solid #e3e3e3;
+}
+
+.qr-code-table td:first-child {
+	padding-left: 10px;
+	border-right-style: none;
+
+}
+
+.qr-code-table td:last-child {
+	width: 105px;
+	text-align: center;
+	border-left-style: none;
+
+}
+
+/* MAX-WITH APPIED TO QR_CODE */
+.qr-code-table img {
+  max-width: 100px;
+  height: auto;
+}
+
+
+/*====================================
+CSS APPLIED FROM JSON TO HTML TABLE
+======================================*/
+
+.json-to-html-table-column{
+	word-break: break-all;
+}
+
+.json-to-html-table-column tr td{
+	width: inherit;
+}
+
+.json-to-html-table-column tr td:first-child{
+	font-weight: bold;
+	color: #5a5a5a;
+}
+
+/*====================================
+CSS APPLIED into custom_form_fields
+======================================*/
+.disabled-div{
+    pointer-events: none;
+    opacity: 0.5;
+}
+
+.disabled-div input[type="text"]{
+	background: #f1f1f1;
+}
+
+/*====================================
+CSS APPLIED into extra_table.html
+======================================*/
+
+.read-more-state {
+	display: none;
+}
+
+.read-more-target {
+	opacity: 0;
+	max-height: 0;
+	font-size: 0;
+	transition: .25s ease;
+}
+
+.read-more-state:checked ~ .read-more-wrap .read-more-target {
+	opacity: 1;
+	font-size: inherit;
+	max-height: 999em;
+  content: "";
+}
+
+.read-more-state ~ .read-more-trigger:before {
+	content: 'Show more';
+}
+
+.read-more-state:checked ~ .read-more-trigger:before {
+	content: 'Show less';
+}
+
+.read-more-state:checked ~ .read-more-wrap::after {
+    content: "";
+}
+
+.read-more-trigger {
+	cursor: pointer;
+	display: inline-block;
+	padding: 0 .5em;
+	color: #187794;
+	font-size: .9em;
+	line-height: 2;
+	border: 1px solid #ddd;
+	border-radius: .25em;
+	font-weight: normal;
+}
+
+.read-more-trigger::after {
+	content: "";
+}
+
+.read-more-wrap {
+  margin-bottom: 2px;
+}
+
+.read-more-wrap::after{
+  content: " ...";
+  
+}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/helpers.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/helpers.py
new file mode 100644
index 0000000..28b22df
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/helpers.py
@@ -0,0 +1,723 @@
+from multiprocessing import context
+import ckan.authz as authz
+import ckan.model as model
+from webhelpers2.html import literal
+from webhelpers2.text import truncate
+import ckan.lib.helpers as h
+import ckan.logic as logic
+from ckan.common import config
+from ckanext.d4science_theme.d4sdiscovery.d4s_namespaces_controller import D4S_Namespaces_Controller
+from ckanext.d4science_theme.d4sdiscovery.d4s_namespaces_extras_util import D4S_Namespaces_Extra_Util
+from ckanext.d4science_theme.qrcodelink.generate_qrcode import D4S_QrCode
+import urllib.request, urllib.error, urllib.parse
+
+from ckan.common import (
+    _, g, c, request, session
+)
+
+import random
+from operator import itemgetter
+from logging import getLogger
+import base64
+import sys, os, re
+import configparser
+import collections
+import ckan.plugins.toolkit as tk
+import ckan.logic as logic
+
+
+log = getLogger(__name__)
+
+systemtype_field = 'systemtypefield'
+systemtype_field_default_value = 'system:type'
+ic_proxy_url_field = 'ic_proxy_url'
+ic_proxy_url_field_default_value = "https://registry.d4science.org/icproxy/gcube/service"
+application_token_field = 'application_token'
+namespaces_generic_resource_id_default_value = "23d827cd-ba8e-4d8c-9ab4-6303bdb7d1db"
+namespaces_gr_id_fieldname = "namespaces_generic_resource_id"
+namespaceseparator_field = 'namespace_separator'
+namespaceseparator_field_default_value = ':'
+systemtype_rgb_colors = ['#c0392b ', '#585858', '#04407C', '#9b59b6', '#2ecc71', '#16a085', '#7f8c8d ', '#2ecc71',
+                         '#FA8072', '#00FFFF', '#C76611', '#f39c12', '#800000']
+systemtype_field_colors = 'systemtype_field_colors'
+
+systemtype_cms_fields_placeholders = {'prefix': 'system:cm_', 'item_status': 'system:cm_item_status'}
+
+NOCATEOGORY = 'nocategory'
+TRANSLATE_OF_ = 'translate_of_'
+
+ctg_namespace_ctrl = None
+
+# def get_tag_list()
+#     return logic.get_action('tag_list')
+
+# ADDED BY FRANCESCO.MANGIACRAPA, related to Task #5196
+def get_user_role_for_group_or_org(group_id, user_name):
+    ''' Returns the user's role for the group. (Ignores privileges that cascade
+    in a group hierarchy.)'''
+    return authz.users_role_for_group_or_org(group_id, user_name)
+
+
+# ADDED BY FRANCESCO.MANGIACRAPA, related to breadcrumb for Group
+def get_parents_for_group(group_name_or_id):
+    ''' Returns the user's role for the group. (Ignores privileges that cascade
+    in a group hierarchy.)'''
+    group = model.Group.get(group_name_or_id)
+    if group:
+        return model.Group.get_parent_group_hierarchy(group)
+    else:
+        return None
+
+
+# ADDED BY FRANCESCO.MANGIACRAPA
+def get_header_param(parameter_name, default=None):
+    ''' This function allows templates to access header string parameters
+    from the request. '''
+    return request.headers.get(parameter_name, default)
+
+
+# ADDED BY FRANCESCO.MANGIACRAPA
+def get_request_param(parameter_name, default=None):
+    ''' This function allows templates to access query string parameters
+    from the request. '''
+    return request.args.get(parameter_name, default)
+
+
+# ADDED BY FRANCESCO.MANGIACRAPA
+def get_cookie_value(cookie_name, default=None):
+    ''' This function allows templates to access cookie by cookie_name parameter
+    from the request. '''
+
+    value = request.cookies.get(cookie_name)
+
+    if value is None:
+        print(('cookie: ' + cookie_name + ', has value None'))
+    else:
+        print(('cookie: ' + cookie_name + ', has value ' + value))
+
+    return value
+
+
+# Updated BY FRANCESCO.MANGIACRAPA, added allow_html
+def markdown_extract_html(text, extract_length=190, allow_html=False):
+    ''' Returns the plain text representation of markdown encoded text.  That
+    is the texted without any html tags.  If extract_length is 0 then it
+    will not be truncated.'''
+    if not text:
+        return ''
+    if allow_html:
+        plain = h.markdown(text.strip())
+    else:
+        plain = h.RE_MD_HTML_TAGS.sub('', h.markdown(text))
+
+    if not extract_length or len(plain) < extract_length:
+        return literal(plain)
+    return literal(str(truncate(plain, length=extract_length, indicator='...', whole_word=True)))
+
+
+def get_systemtype_field_dict_from_session():
+    '''Return the value of 'ckan.d4science_theme.metadatatypefield'
+    read from production.ini'''
+
+    systemtype_fieldname = session.get(systemtype_field)
+
+    if systemtype_fieldname is None:
+        log.info(systemtype_field + " not found in session, loading from config")
+    else:
+        log.debug(systemtype_field + " found in session having value: %s" % systemtype_fieldname)
+        return systemtype_fieldname
+
+    systemtype_fieldname = config.get('ckan.d4science_theme.' + systemtype_field)
+
+    if systemtype_fieldname is None:
+        log.info(
+            systemtype_field + " field does not exist in production.ini, returning default value %s" % systemtype_field_default_value)
+        systemtype_fieldname = systemtype_field_default_value
+
+    separator = get_namespace_separator_from_session()
+    log.debug("Replacing %s" % separator + " with empty string for key %s" % systemtype_field)
+    systemtype_fieldname_name = systemtype_fieldname.replace(separator, "")
+    purgedfieldname = purge_namespace_to_fieldname(systemtype_fieldname)
+    log.debug("Setting %s" % systemtype_fieldname + " in session for key %s" % systemtype_field)
+    session[systemtype_field] = {'id': systemtype_fieldname, 'name': systemtype_fieldname_name,
+                                 'title': purgedfieldname}
+    session.save()
+    return session[systemtype_field]
+
+
+def get_d4s_namespace_controller():
+    '''Instance the D4S_Namespaces_Controller and check that the namespaces are not empty reading it from IS and/or using a Caching system.
+    The ic-proxy-url is built by reading the configurations from production.ini'''
+
+    d4s_extras_controller = D4S_Namespaces_Controller.getInstance()
+    global ctg_namespace_ctrl
+
+    if ctg_namespace_ctrl is not None:
+        log.info("ctg_namespace_ctrl with configurations is NOT None")
+        the_namespaces = d4s_extras_controller.load_namespaces(ctg_namespace_ctrl['ic_proxy_url'],
+                                                               ctg_namespace_ctrl['resource_id'],
+                                                               ctg_namespace_ctrl['application_token'])
+        log.debug("the_namespaces are %s" % the_namespaces)
+
+        if the_namespaces is None or len(the_namespaces) == 0:
+            log.info("D4S_Namespaces_Controller obj with none or empty namespaces, going to read them")
+        else:
+            log.info("d4s_namespaces_controller found and the namespaces property is not empty: %s" % d4s_extras_controller)
+            return d4s_extras_controller
+    else:
+        log.info("ctg_namespace_ctrl with configurations is None, instancing it")
+
+    ic_proxy_url_value = config.get('ckan.d4science_theme.' + ic_proxy_url_field)
+
+    if ic_proxy_url_value is None:
+        log.info(
+            "ckan.d4science_theme." + ic_proxy_url_field + " field does not exist in production.ini, returning default value %s" % ic_proxy_url_field_default_value)
+        ic_proxy_url_value = ic_proxy_url_field_default_value
+
+    application_token_fieldname = config.get('ckan.d4science_theme.' + application_token_field)
+
+    if application_token_fieldname is None:
+        log.error("ckan.d4science_theme." + application_token_field + " field does not exist in production.ini!!!")
+        application_token_fieldname = None
+
+    namespaces_gr_id_fieldname_value = config.get('ckan.d4science_theme.' + namespaces_gr_id_fieldname)
+
+    if namespaces_gr_id_fieldname_value is None:
+        log.error("ckan.d4science_theme." + application_token_field + " field does not exist in production.ini!!!")
+        namespaces_gr_id_fieldname_value = namespaces_generic_resource_id_default_value
+
+    # filling the ctg_namespace_ctrl with IS configurations to perform the query for loading the namespaces from IS
+    ctg_namespace_ctrl = {'ic_proxy_url': ic_proxy_url_value,
+                          'application_token': application_token_fieldname,
+                          'resource_id': namespaces_gr_id_fieldname_value}
+
+    d4s_extras_controller.load_namespaces(ctg_namespace_ctrl['ic_proxy_url'], ctg_namespace_ctrl['resource_id'],
+                                          ctg_namespace_ctrl['application_token'])
+
+    return d4s_extras_controller
+
+
+def get_extras_indexed_for_namespaces(extras):
+    namespace_dict = get_namespaces_dict()
+    # log.info("my_namespace_dict %s" % namespace_dict)
+    my_extra = get_extras(extras)
+    # log.info("my_extra is %s" % my_extra)
+    # d4s_extras_controller = D4S_Namespaces_Controller.getInstance()
+    # extras_indexed_for_categories = d4s_extras_controller.get_extras_indexed_for_namespaces(namespace_dict, my_extra)
+
+    extras_indexed_for_categories = D4S_Namespaces_Extra_Util().get_extras_indexed_for_namespaces(namespace_dict,
+                                                                                                  my_extra)
+    return extras_indexed_for_categories
+
+
+def get_namespaces_dict():
+    d4s_extras_controller = get_d4s_namespace_controller()
+
+    if d4s_extras_controller is not None:
+        return d4s_extras_controller.get_dict_ctg_namespaces()
+    else:
+        log.info("local_extras_controller is null, returning empty dictionary for namespaces")
+        return {}
+
+
+def get_extra_for_category(extras_indexed_for_categories, key_category):
+    if key_category in extras_indexed_for_categories:
+        catalogue_namespace = extras_indexed_for_categories[key_category]
+        return catalogue_namespace.extras
+
+    return []
+
+
+def get_systemtype_value_from_extras(package, extras=None):
+    '''Returns the value of metadata fied read from key 'metadatatype'
+    stored into extra fields if it exists, 'No Type' otherwise'''
+    systemtype_dict = get_systemtype_field_dict_from_session()
+
+    no_type = 'No Type'
+
+    if extras is None:
+        return no_type
+
+    for extra in extras:
+        k, v = extra['key'], extra['value']
+        log.debug("key is %s" % k)
+        log.debug("value is %s" % v)
+        if k == str(systemtype_dict['id']):
+            return v
+
+    return no_type
+
+
+def get_namespace_separator_from_session():
+    '''Returns the character used to separate namespace from fieldname'''
+
+    separator = session.get(namespaceseparator_field)
+
+    if separator is None:
+        log.info(namespaceseparator_field + " not found in session, loading from config")
+    else:
+        log.debug(namespaceseparator_field + " found in session: %s" % separator)
+        return separator
+
+    namespace_sep = config.get('ckan.d4science_theme.' + namespaceseparator_field)
+
+    if namespace_sep is None:
+        log.info(
+            namespaceseparator_field + " field does not exist in production.ini, returning default value %s" % namespaceseparator_field_default_value)
+        namespace_sep = namespaceseparator_field_default_value
+
+    log.debug("Setting %s" % namespace_sep + " in session for key %s" % namespaceseparator_field)
+    session[namespaceseparator_field] = namespace_sep
+    return namespace_sep
+
+
+def get_extras(package_extras, auto_clean=False, subs=None, exclude=None):
+    ''' Used for outputting package extras
+
+    :param package_extras: the package extras
+    :type package_extras: dict
+    :param auto_clean: If true capitalize and replace -_ with spaces
+    :type auto_clean: bool
+    :param subs: substitutes to use instead of given keys
+    :type subs: dict {'key': 'replacement'}
+    :param exclude: keys to exclude
+    :type exclude: list of strings
+    '''
+
+    # If exclude is not supplied use values defined in the config
+    if not exclude:
+        exclude = g.package_hide_extras
+    output = []
+    for extra in package_extras:
+        if extra.get('state') == 'deleted':
+            continue
+        k, v = extra['key'], extra['value']
+        if k in exclude:
+            continue
+        if subs and k in subs:
+            k = subs[k]
+        elif auto_clean:
+            k = k.replace('_', ' ').replace('-', ' ').title()
+        if isinstance(v, (list, tuple)):
+            v = ", ".join(map(str, v))
+        output.append((k, v))
+    return output
+
+
+def purge_namespace_to_fieldname(fieldname):
+    separator = get_namespace_separator_from_session()
+
+    if fieldname is None:
+        return ""
+
+    if separator not in fieldname:
+        return fieldname
+
+    end = fieldname.index(separator) + 1
+    max_l = len(fieldname)
+    if end < max_l:
+        return fieldname[end:max_l]
+    return fieldname
+
+
+def purge_namespace_to_string(facet):
+    if not c.search_facets or \
+            not c.search_facets.get(facet) or \
+            not c.search_facets.get(facet).get('items'):
+        return ""
+
+    facet_name = c.search_facets.get(facet)
+    print(("facet_name " + str(facet_name)))
+    end = str(facet_name).index(":")
+    if end <= len(facet_name):
+        return facet_name[:end]
+    return facet_name
+
+
+def count_facet_items_dict(facet, limit=None, exclude_active=False):
+    if not c.search_facets or \
+            not c.search_facets.get(facet) or \
+            not c.search_facets.get(facet).get('items'):
+        return 0
+    facets = []
+    for facet_item in c.search_facets.get(facet)['items']:
+        if not len(facet_item['name'].strip()):
+            continue
+        if not (facet, facet_item['name']) in list(request.args.items()):
+            facets.append(dict(active=False, **facet_item))
+        elif not exclude_active:
+            facets.append(dict(active=True, **facet_item))
+
+            #    for count,
+    # print "facets " + str(facets)
+    total = len(facets)
+    log.debug("total facet: %s" % facet + " are %d" % total)
+    return total
+
+
+def random_color():
+    rgbl = [255, 0, 0]
+    random.shuffle(rgbl)
+    return tuple(rgbl)
+
+
+def check_url(the_url):
+    try:
+        urllib.request.urlopen(the_url)
+        return True
+    except urllib.error.HTTPError as e:
+        # print(e.code)
+        return False
+    except urllib.error.URLError as e:
+        # print(e.args)
+        return False
+    except Exception as error:
+        # print(error)
+        return False
+
+
+def get_color_for_type(systemtype_field_value):
+    '''Return a color assigned to a system type'''
+
+    systemtypecolors = session.get(systemtype_field_colors)
+    # log.info("color: getting color for type: %s" %systemtype_field_value)
+
+    if systemtypecolors is None:
+        log.info("color: " + systemtype_field_colors + " not found in session, creating new one")
+        systemtypecolors = {}
+        session[systemtype_field_colors] = systemtypecolors
+    else:
+        log.debug("color: " + systemtype_field_colors + " found in session having value: %s" % systemtypecolors)
+
+    e_color = systemtypecolors.get(systemtype_field_value)
+
+    if e_color is None:
+        usedcolorsLen = len(systemtypecolors)
+        colorsLen = len(systemtype_rgb_colors)
+        index = usedcolorsLen if usedcolorsLen < colorsLen else random.randint(0, colorsLen - 1)
+        e_color = systemtype_rgb_colors[index]
+        # log.debug("color: adding color %s" %e_color +" index is: "+str(index))
+        systemtypecolors[systemtype_field_value] = e_color
+        session[systemtype_field_colors] = systemtypecolors
+
+    session.save()
+    # log.debug("color: returning color %s" %e_color +" for type: "+systemtype_field_value)
+    return e_color
+
+
+def ordered_dictionary(list_to_be_sorted, property='name', ordering="asc"):
+    # print ("dict %s" %list_to_be_sorted)
+
+    ord = False if ordering == "asc" else True
+
+    if list_to_be_sorted:
+        return sorted(list_to_be_sorted, key=itemgetter(property), reverse=ord)
+
+    return list_to_be_sorted
+
+
+def qrcode_for_url(url):
+    if url:
+        try:
+            qr_code = D4S_QrCode(url)
+            image_path = qr_code.get_qrcode_path()
+            with open(image_path, "rb") as image_file:
+                return base64.b64encode(image_file.read())
+            return ""
+        except Exception as error:
+            log.error("Error on getting qrcode for url: " + url + "error: %s" % error)
+
+    return ""
+
+
+def get_list_of_organizations(limit=10, sort='packages'):
+    to_browse_organizations = []
+    try:
+        data = {}
+
+        if sort:
+            data['sort'] = sort
+
+        data['limit'] = limit
+        data['all_fields'] = True
+        ordered_organizations = []
+        ordered_organizations = logic.get_action('organization_list')({}, data)
+
+        for organization in ordered_organizations:
+            try:
+                to_browse_obj = {}
+
+                if not organization['name']:
+                    continue
+
+                to_browse_obj['name'] = organization['name']
+
+                if 'package_count' in organization:
+                    to_browse_obj['package_count'] = organization['package_count']
+
+                if 'display_name' in organization:
+                    to_browse_obj['display_name'] = organization['display_name']
+
+                image_url = get_url_to_icon_for_ckan_entity(organization['name'], 'organization', False)
+
+                # Using ICON as first option
+                if image_url:
+                    to_browse_obj['url'] = image_url
+                # Using object image_url as second one
+                elif 'image_url' in organization and organization['image_url']:
+                    to_browse_obj['url'] = organization['image_url']
+                # Default placeholder
+                else:
+                    to_browse_obj['url'] = h.url_for_static('/images/organisations/icon/placeholder-organization.png')
+
+                to_browse_organizations.append(to_browse_obj)
+            except (logic.NotFound, logic.ValidationError, logic.NotAuthorized) as error:
+                # SILENT
+                log.warn("Error on putting organization: %s" % error)
+
+        log.info("browse %d" % len(ordered_organizations) + " organisation/s")
+    except (logic.NotFound, logic.ValidationError, logic.NotAuthorized) as error:
+        log.error("Error on getting organizations: %s" % error)
+        return []
+
+    return to_browse_organizations
+
+
+def get_list_of_groups(limit=10, sort='package_count'):
+    to_browse_groups = []
+    try:
+        data = {}
+        if sort:
+            data['sort'] = sort
+
+        data['limit'] = limit
+        data['all_fields'] = True
+        ordered_groups = []
+        ordered_groups = logic.get_action('group_list')({}, data)
+
+        log.debug("group_list: "+ ", ".join(ordered_groups))
+
+        for group in ordered_groups:
+            # print "\n\ngroup %s" %group
+            try:
+                to_browse_obj = {}
+
+                if not group['name']:
+                    continue
+
+                to_browse_obj['name'] = group['name']
+
+                if 'package_count' in group:
+                    to_browse_obj['package_count'] = group['package_count']
+
+                if 'display_name' in group:
+                    to_browse_obj['display_name'] = group['display_name']
+
+                if 'image_url' in group and group['image_url']:
+                    to_browse_obj['url'] = group['image_url']
+                else:
+                    to_browse_obj['url'] = get_url_to_icon_for_ckan_entity(group['name'], 'group')
+
+                to_browse_groups.append(to_browse_obj)
+            except (logic.NotFound, logic.ValidationError, logic.NotAuthorized) as error:
+                # SILENT
+                log.warn("Error on putting group: %s" % error)
+
+        log.info("browse %d" % len(ordered_groups) + " organisation/s")
+    except (logic.NotFound, logic.ValidationError, logic.NotAuthorized) as error:
+        log.error("Error on getting group: %s" % error)
+        return []
+
+    return to_browse_groups
+
+
+def get_browse_info_for_organisations_or_groups(type='organization', limit=10, sort_field=None):
+    sort = None
+    if sort_field:
+        sort = sort_field
+
+    if type == 'organization':
+        if sort:
+            return get_list_of_organizations(limit, sort)
+        else:
+            return get_list_of_organizations(limit)
+
+    elif type == 'group':
+        if sort:
+            return get_list_of_groups(limit, sort)
+        else:
+            return get_list_of_groups(limit)
+
+    return []
+
+
+def get_image_display_for_group(item_id):
+    if item_id:
+        try:
+            item_obj = model.Group.get(item_id)
+
+            if item_obj and item_obj.image_url:
+                return item_obj.image_url
+            else:
+                return h.url_for_static('/images/groups/icon/placeholder-group.png')
+
+        except Exception as error:
+            log.error("Error on getting item obj: %s" % item_id + "error: %s" % error)
+
+
+def get_application_path():
+    if getattr(sys, 'frozen', False):
+        # If the application is run as a bundle, the pyInstaller bootloader
+        # extends the sys module by a flag frozen=True and sets the app
+        # path into variable _MEIPASS'.
+        application_path = sys._MEIPASS
+    else:
+        application_path = os.path.dirname(os.path.abspath(__file__))
+
+    return application_path
+
+
+'''
+Get icon url for input entity type
+@:param default_placeholder if True returns the URL of default image, otherwise None.
+'''
+
+
+def get_url_to_icon_for_ckan_entity(item_name, entity_type=None, default_placeholder=True):
+    if not entity_type or not item_name:
+        return None
+
+    dir_images_full_path = get_application_path() + "/public/images"
+    dir_images_relative_path = "/images"
+
+    if entity_type == 'group':
+        dir_images_full_path += "/groups"
+        dir_images_relative_path += "/groups"
+        placeholder_icon = "placeholder-group.png"
+    elif entity_type == 'organization':
+        dir_images_full_path += "/organisations"
+        dir_images_relative_path += "/organisations"
+        placeholder_icon = "placeholder-organization.png"
+    elif entity_type == 'type':
+        dir_images_full_path += "/types"
+        dir_images_relative_path += "/types"
+        placeholder_icon = "placeholder-type.png"
+    else:
+        return None
+
+    icon_path = dir_images_full_path + "/icon/" + item_name.lower() + ".png"
+    if os.path.isfile(icon_path):
+        return h.url_for_static(dir_images_relative_path + "/icon/" + item_name.lower() + ".png")
+    elif default_placeholder:
+        return h.url_for_static(dir_images_relative_path + "/icon/" + placeholder_icon)
+
+    return None
+
+
+def get_user_info(user_id_or_name):
+    if user_id_or_name:
+        try:
+
+            item_obj = model.User.get(user_id_or_name)
+
+            if item_obj:
+                return item_obj
+
+            return None
+        except Exception as error:
+            log.error("Error on getting item obj: %s" % user_id_or_name + "error: %s" % error)
+
+    return None
+
+
+'''
+Search the value of my_search_string into input file {ckan_po_file} or the default file ckan.po provided as CKAN language
+and returns its translate
+'''
+
+
+def get_ckan_translate_for(ckan_po_file, my_search_string):
+    my_translate = session.get(TRANSLATE_OF_ + my_search_string)
+
+    if not my_search_string:
+        return ""
+
+    if my_translate:
+        log.info("Translate of '%s' " % my_search_string + " found in session as: %s" % my_translate)
+        return my_translate
+
+    if not ckan_po_file:
+        ckan_po_file = "/usr/lib/ckan/default/src/ckan/ckan/i18n/en_GB/LC_MESSAGES/ckan.po"
+
+    numlines = 0
+    numfound = 0
+    found = 0
+    line_text = ""
+
+    try:
+        infile = open(ckan_po_file, "r")
+
+        for line in infile:
+            numlines += 1
+            if found > 0:
+                numfound += 1
+                line_text += str(line)
+                found = 0  # reset found
+
+            # found += line.upper().count(my_search_string.upper())
+            found += line.count(my_search_string)
+
+            if found > 0:
+                log.debug("The search string '%s'" % my_search_string + " was found. Read the line: %s" % str(line))
+
+        infile.close()
+
+    except Exception as e:
+        print(("Exception during parsing the file %s" % ckan_po_file, e))
+
+    log.info("Recap: '%s' was found" % my_search_string + " %i times " % numfound + "in %i lines" % numlines)
+    log.debug("Line text is: %s" % line_text)
+
+    pattern = '"([A-Za-z0-9_ \./\\-]*)"'
+    m = re.search(pattern, line_text)
+
+    try:
+        my_translate = m.group()
+    except Exception as e:
+        print(("Pattern %s" % my_search_string + " not found ", e))
+
+    if my_translate:
+        log.debug("Replacing quotas...")
+        my_translate = my_translate.replace("\"", "")
+
+    log.info("Found the string '%s'" % my_translate + " that translating '%s'" % my_search_string)
+
+    session[TRANSLATE_OF_ + my_search_string] = my_translate
+    session.save()
+
+    return my_translate
+
+
+def get_location_to_bboxes():
+    config = configparser.ConfigParser()
+    config.optionxform = str
+    location_to_bboxes = {}
+    try:
+        bboxes_file = get_application_path() + "/public/location_to_bboxes.ini"
+        log.debug("bboxes_file is: '%s'" % bboxes_file)
+        config.read(bboxes_file)
+        for section_name in config.sections():
+            log.debug('Location to bboxes Section: ' + section_name)
+            # print '  Options:', parser.options(section_name)
+            for name, value in config.items(section_name):
+                location_to_bboxes[name] = value.replace(",", "%2C")
+
+        ordDictBboxes = collections.OrderedDict(sorted(location_to_bboxes.items()))
+        log.debug("Ordered 'bboxes_file' dict: '%s'" % ordDictBboxes)
+        return ordDictBboxes
+    except Exception as error:
+        log.error("Error on reading file: %s" % bboxes_file + "error: %s" % error)
+
+def get_content_moderator_system_placeholder():
+    return systemtype_cms_fields_placeholders
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/plugin.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/plugin.py
new file mode 100644
index 0000000..5143a72
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/plugin.py
@@ -0,0 +1,470 @@
+# encoding: utf-8
+from logging import getLogger
+
+import ckan.plugins as plugins
+from ckanext.d4science_theme import helpers
+import ckan.plugins.toolkit as toolkit
+import ckan.lib.dictization.model_save as model_save
+import ckan.model as model
+import ckan.lib.helpers as h
+import sqlalchemy as sa
+from ckanext.d4science_theme.controllers.organization import OrganizationVREController
+from ckanext.d4science_theme.controllers.home import d4SHomeController
+from ckanext.d4science_theme.controllers.systemtype import d4STypeController
+from ckanext.d4science_theme.controllers.organization import OrganizationVREController
+#from ckan.controllers.home import HomeController
+from ckan.config.middleware.common_middleware import TrackingMiddleware
+#from ckan.plugins import IRoutes
+from flask import Blueprint, render_template
+
+from ckan.common import (
+   g
+)
+from flask import Flask, g
+from ckan.lib.app_globals import app_globals
+import ckan.plugins.toolkit as toolkit
+
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it 
+# ISTI-CNR Pisa (ITALY)
+
+log = getLogger(__name__)
+
+d4s_ctg_namespaces_controller = None
+
+def remove_check_replicated_custom_key(schema):
+    if schema is not None:
+        schema.pop('__before', None)
+    
+    return schema
+
+#CREATED BY FRANCESCO MANGIACRAPA FOR OVERRIDING THE package_extras_save FROM dictization.model_save.py
+def _package_extras_save(extra_dicts, obj, context):
+    ''' It can save repeated extras as key-value '''
+    allow_partial_update = context.get("allow_partial_update", False)
+    if extra_dicts is None and allow_partial_update:
+        return
+     
+    model = context["model"]
+    session = context["session"]
+     
+    #ADDED BY FRANCESCO MANGIACRAPA
+    log.debug("extra_dicts: "+ str(extra_dicts))
+    #print "extra_dicts: "+str(extra_dicts)
+     
+    extras_list = obj.extras_list
+    #extras = dict((extra.key, extra) for extra in extras_list)
+    old_extras = {}
+    extras = {}
+    for extra in extras_list or []:
+        old_extras.setdefault(extra.key, []).append(extra.value)
+        extras.setdefault(extra.key, []).append(extra)
+    
+    #ADDED BY FRANCESCO MANGIACRAPA       
+    #print "old_extras: "+str(old_extras)
+    
+    new_extras = {}
+    for extra_dict in extra_dicts or []:
+        #print 'extra_dict key: '+extra_dict["key"] + ', value: '+extra_dict["value"]
+        #new_extras.setdefault(extra_dict["key"], []).append(extra_dict["value"])
+        if extra_dict.get("deleted"):
+            log.debug("extra_dict deleted: "+str(extra_dict["key"]))
+            #print 'extra_dict deleted: '+extra_dict["key"]
+            continue
+        
+        #if extra_dict['value'] is not None and not extra_dict["value"] == "":
+        if extra_dict['value'] is not None:
+            new_extras.setdefault(extra_dict["key"], []).append(extra_dict["value"])
+    
+    #ADDED BY FRANCESCO MANGIACRAPA
+    log.debug("new_extras: "+str(new_extras))
+    #print "new_extras: "+str(new_extras)
+    
+    #new
+    for key in set(new_extras.keys()) - set(old_extras.keys()):
+        state = 'active'
+        log.debug("adding key: "+str(key))
+        #print "adding key: "+str(key)
+        extra_lst = new_extras[key]
+        for extra in extra_lst:
+            extra = model.PackageExtra(state=state, key=key, value=extra)
+            session.add(extra)
+            extras_list.append(extra)
+    
+    #deleted
+    for key in set(old_extras.keys()) - set(new_extras.keys()):
+        log.debug("deleting key: "+str(key))
+        #print "deleting key: "+str(key)
+        extra_lst = extras[key]
+        for extra in extra_lst:
+            state = 'deleted'
+            extra.state = state
+            extras_list.remove(extra)
+            
+    #changed
+    for key in set(new_extras.keys()) & set(old_extras.keys()):
+        #for each value of new list
+        for value in new_extras[key]:
+            old_occur = old_extras[key].count(value)
+            new_occur = new_extras[key].count(value)
+            log.debug("value: "+str(value) + ", new_occur: "+str(new_occur)+ ", old_occur: "+str(old_occur))
+            #print "value: "+str(value)  + ", new_occur: "+str(new_occur) + ", old_occur: "+str(old_occur)
+            # it is an old value deleted or not
+            if value in old_extras[key]:
+                if old_occur == new_occur:
+                    #print "extra - occurrences of: "+str(value)  +", are equal into both list"
+                    log.debug("extra - occurrences of: "+str(value) +", are equal into both list")
+                    #there is a little bug, this code return always the first element, so I'm fixing with #FIX-STATUS
+                    extra_values = get_package_for_value(extras[key], value)
+                    #extras_list.append(extra)
+                    for extra in extra_values:
+                        state = 'active'
+                        extra.state = state
+                        session.add(extra)
+                        #print "extra updated: "+str(extra)
+                        log.debug("extra updated: "+str(extra))
+                
+                elif new_occur > old_occur:
+                    #print "extra - a new occurrence of: "+str(value)  +", is present into new list, adding it to old list"
+                    log.debug("extra - a new occurrence of: "+str(value) +", is present into new list, adding it to old list")
+                    state = 'active'
+                    extra = model.PackageExtra(state=state, key=key, value=value)
+                    extra.state = state
+                    session.add(extra)
+                    extras_list.append(extra)
+                    old_extras[key].append(value)
+                    log.debug("old extra values updated: "+str(old_extras[key]))
+                    #print "old extra values updated: "+str(old_extras[key])
+                
+                else:
+                    #remove all occurrences deleted - this code could be optimized, it is run several times but could be performed one shot
+                    countDelete = old_occur-new_occur
+                    log.debug("extra - occurrence of: "+str(value) +", is not present into new list, removing "+str(countDelete) + " occurrence/s from old list")
+                    #print "extra - occurrence of: "+str(value)  +", is not present into new list, removing "+str(countDelete)+" occurrence/s from old list"
+                    extra_values = get_package_for_value(extras[key], value)
+                    for idx, extra in enumerate(extra_values):
+                        if idx < countDelete:
+                            #print "extra - occurrence of: "+str(value)  +", is not present into new list, removing it from old list"
+                            log.debug("pkg extra deleting: "+str(extra.value))
+                            #print "pkg extra deleting: "+str(extra.value)
+                            state = 'deleted'
+                            extra.state = state
+                        
+                        else:
+                            #print "pkg extra reactivating: "+str(extra.value)
+                            log.debug("pkg extra reactivating: "+str(extra.value))
+                            state = 'active'
+                            extra.state = state
+                            session.add(extra)
+            
+            else:
+                #print "extra new value: "+str(value)
+                log.debug("extra new value: "+str(value))
+                state = 'active'
+                extra = model.PackageExtra(state=state, key=key, value=value)
+                extra.state = state
+                session.add(extra)
+                extras_list.append(extra)
+        
+        
+        #for each value of old list
+        for value in old_extras[key]:
+            #if value is not present in new list
+            if value not in new_extras[key]:
+                extra_values = get_package_for_value(extras[key], value)
+                for extra in extra_values:
+                    #print "not present extra deleting: "+str(extra)
+                    log.debug("not present extra deleting: "+str(extra))
+                    state = 'deleted'
+                    extra.state = state
+
+
+#ADDED BY FRANCESCO MANGIACRAPA
+def get_package_for_value(list_package, value):
+    ''' Returns a list of packages containing the value passed in input
+    '''
+    lst = []
+    for x in list_package:
+        if x.value == value:
+            lst.append(x)
+    else:
+        return lst
+    
+    return lst
+
+#OVERRIDING BASE SQL ALCHEMY ENGINE INSTANCE
+def _init_TrackingMiddleware(self, app, config):
+    self.app = app
+    log.debug('TrackingMiddleware d4Science instance')
+    sqlalchemy_url = config.get('sqlalchemy.url')
+    log.debug('sqlalchemy_url read: '+str(sqlalchemy_url))
+    
+    sqlalchemy_pool = config.get('sqlalchemy.pool_size')
+    if sqlalchemy_pool is None:
+        sqlalchemy_pool = 5
+    
+    log.debug('sqlalchemy_pool read: '+str(sqlalchemy_pool))
+    sqlalchemy_overflow = config.get('sqlalchemy.max_overflow')
+    
+    if sqlalchemy_overflow is None:
+        sqlalchemy_overflow = 10;
+    
+    log.debug('sqlalchemy_overflow read: '+str(sqlalchemy_overflow))
+    
+    try:
+        self.engine = sa.create_engine(sqlalchemy_url, pool_size=int(sqlalchemy_pool), max_overflow=int(sqlalchemy_overflow))
+    except TypeError as e:
+        log.error('pool size does not work: ' +str(e.args))
+        self.engine = sa.create_engine(sqlalchemy_url)
+            
+
+
+class D4Science_ThemePlugin(plugins.SingletonPlugin, toolkit.DefaultDatasetForm):
+    plugins.implements(plugins.IConfigurer)
+    plugins.implements(plugins.IDatasetForm)
+    plugins.implements(plugins.ITemplateHelpers)
+    plugins.implements(plugins.IFacets)
+    #plugins.implements(IRoutes, inherit=True)
+
+    #ckan 2.10
+    plugins.implements(plugins.IBlueprint)
+    
+    # IConfigurer
+    def update_config(self, config_):
+        # Add this plugin's templates dir to CKAN's extra_template_paths, so
+        # that CKAN will use this plugin's custom templates.
+        toolkit.add_template_directory(config_, 'templates')
+        
+        # Add this plugin's public dir to CKAN's extra_public_paths, so
+        # that CKAN will use this plugin's custom static files.
+        toolkit.add_public_directory(config_, 'public')
+        
+        # Register this plugin's fanstatic directory with CKAN.
+        # Here, 'fanstatic' is the path to the fanstatic directory
+        # (relative to this plugin.py file), and 'example_theme' is the name
+        # that we'll use to refer to this fanstatic directory from CKAN
+        # templates.
+        toolkit.add_resource('assets', 'd4science_theme')
+        # toolkit.add_resource('assets', 'd4science_scripts')
+    
+    #IDatasetForm
+    def create_package_schema(self):
+        # let's grab the default schema in our plugin
+        schema = super(D4Science_ThemePlugin, self).create_package_schema()
+        schema = remove_check_replicated_custom_key(schema)
+        #d.package_dict_save = _package_dict_save
+        return schema
+    
+    #IDatasetForm
+    def update_package_schema(self):
+        schema = super(D4Science_ThemePlugin, self).update_package_schema()
+        schema = remove_check_replicated_custom_key(schema)
+        return schema
+    
+    #IDatasetForm
+    def show_package_schema(self):
+        schema = super(D4Science_ThemePlugin, self).show_package_schema()
+        schema = remove_check_replicated_custom_key(schema)
+        return schema
+    
+    #IDatasetForm
+    def is_fallback(self):
+        # Return True to register this plugin as the default handler for package types not handled by any other IDatasetForm plugin
+        return False
+    
+    #IDatasetForm
+    def package_types(self):
+        # This plugin doesn't handle any special package types, it just
+        # registers itself as the default (above).
+        return []
+    
+    
+    #ITemplateHelpers
+    def get_helpers(self):
+        log.info("get_helpers called...")
+        '''Register functions as a template
+        helper function.
+        '''
+        # Template helper function names should begin with the name of the
+        # extension they belong to, to avoid clashing with functions from
+        # other extensions.
+        return {
+            'd4science_theme_get_user_role_for_group_or_org': helpers.get_user_role_for_group_or_org,
+            'd4science_theme_get_parents_for_group': helpers.get_parents_for_group,
+            'get_header_param': helpers.get_header_param,
+            'get_request_param': helpers.get_request_param,
+            'get_cookie_value': helpers.get_cookie_value,
+            'd4science_theme_markdown_extract_html' : helpers.markdown_extract_html,
+            'd4science_theme_get_systemtype_value_from_extras' : helpers.get_systemtype_value_from_extras,
+            'd4science_theme_get_systemtype_field_dict_from_session' : helpers.get_systemtype_field_dict_from_session,
+            'd4science_theme_get_namespace_separator_from_session' : helpers.get_namespace_separator_from_session,
+            'd4science_theme_get_extras' : helpers.get_extras,
+            'd4science_theme_count_facet_items_dict' : helpers.count_facet_items_dict,
+            'd4science_theme_purge_namespace_to_facet': helpers.purge_namespace_to_fieldname,
+            'd4science_get_color_for_type': helpers.get_color_for_type,
+            'd4science_get_d4s_namespace_controller': helpers.get_d4s_namespace_controller,
+            'd4science_get_extras_indexed_for_namespaces': helpers.get_extras_indexed_for_namespaces,
+            'd4science_get_namespaces_dict': helpers.get_namespaces_dict,
+            'd4science_get_extra_for_category' : helpers.get_extra_for_category,
+            'd4science_get_ordered_dictionary': helpers.ordered_dictionary,
+            'd4science_get_qrcode_for_url': helpers.qrcode_for_url,
+            'd4science_get_list_of_organizations': helpers.get_list_of_organizations,
+            'd4science_get_image_display_for_group': helpers.get_image_display_for_group,
+            'd4science_get_list_of_groups': helpers.get_list_of_groups,
+            'd4science_get_browse_info_for_organisations_or_groups': helpers.get_browse_info_for_organisations_or_groups,
+            'd4science_get_user_info': helpers.get_user_info,
+            'd4science_get_url_to_icon_for_ckan_entity' : helpers.get_url_to_icon_for_ckan_entity,
+            'd4science_get_ckan_translate_for' : helpers.get_ckan_translate_for,
+            'd4science_get_location_to_bboxes' : helpers.get_location_to_bboxes,
+            'd4science_get_content_moderator_system_placeholder': helpers.get_content_moderator_system_placeholder,
+        }
+    
+    #Overriding package_extras_save method
+    model_save.package_extras_save = _package_extras_save
+    
+    #Overriding index home controller - rimosso in ckan 2.10
+    #d4sHC = d4SHomeController()
+    # HomeController.index = d4sHC.index
+    
+    #OVERRIDING BASE SQL ALCHEMY ENGINE INSTANCE
+    TrackingMiddleware.__init__ = _init_TrackingMiddleware
+
+    global d4s_ctg_namespaces_controller
+    
+    #if d4s_ctg_namespaces_controller is None:
+    #    log.info("d4s_ctg_namespaces_controller instancing...")
+    #    d4s_ctg_namespaces_controller = helpers.get_d4s_namespace_controller()
+    #    log.info("d4s_ctg_namespaces_controller instancied %s" % d4s_ctg_namespaces_controller)
+
+
+    #IFacets
+    def dataset_facets(self, facets_dict, package_type):
+        facets_dict = self._update_facets(facets_dict)
+        return facets_dict
+    
+    def group_facets(self, facets_dict, group_type, package_type):
+        # facets_dict = self._update_facets(facets_dict)
+        return facets_dict
+    
+    def organization_facets(self, facets_dict, organization_type, package_type):
+        # facets_dict = self._update_facets(facets_dict)
+        return facets_dict
+    
+    def _update_facets(self, facets_dict):
+        '''Add 'metadatatype' to facets if not already present.'''
+        
+        log.debug("facets_dict: ")
+        log.debug(', '.join(facets_dict))
+        
+        metadatatype = helpers.get_systemtype_field_dict_from_session()
+
+        '''Adding system:type'''
+        facet_title = helpers.purge_namespace_to_fieldname(str(metadatatype['id']))
+        facet_title = plugins.toolkit._(facet_title.capitalize() + 's')
+        facets_dict = self._add_or_update_facet(metadatatype['name'],facet_title, facets_dict)
+        
+        log.info("facets dict after update: " + ', '.join(facets_dict))
+        log.info("site_url is: " + g.site_url)
+        
+        #ADD IT IN THE CUSTOMIZATION?
+        if g.site_url:
+            
+            dev_sites = ['https://ckan-d-d4s.d4science.org']
+            #GRSF Catalogues. 'Status of the Record' must be distributed everywhere, see #23398
+            grsf_sites = ['https://ckan-grsf-admin2.d4science.org', 'https://ckan-grsf.pre.d4science.org', 'https://ckan-grsf.d4science.org', 'https://ckan-grsf-pre.d4science.org']
+            sbd_sites = ['https://ckan.sobigdata.d4science.net', 'https://ckan-sobigdata.d4science.org',
+                         'https://ckan-sobigdata2.d4science.org']
+
+            if g.site_url in dev_sites:
+                '''Adding Status of the GRSF record'''
+                facets_dict = self._add_or_update_facet("StatusoftheRecord", "Status of the Record", facets_dict,
+                                                        display_after_facet='groups')
+                
+                facets_dict = self._add_or_update_facet("Anno", "Anno", facets_dict,
+                                                        display_after_facet='groups')
+
+            elif g.site_url in grsf_sites:
+                '''Adding Status of the GRSF record'''
+                # facets_dict = self._add_or_update_facet("StatusoftheGRSFrecord", "Status of the GRSF record", facets_dict, display_after_facet='groups')
+                # Fixing #23348
+                facets_dict = self._add_or_update_facet("StatusoftheRecord", "Status of the Record", facets_dict,
+                                                        display_after_facet='groups')
+            elif g.site_url in sbd_sites:
+                '''Adding the field Availability '''
+                facets_dict = self._add_or_update_facet("Availability", "Availability", facets_dict,
+                                                        display_after_facet='groups')
+        
+        return facets_dict
+    
+    def init_template_globals(app):
+        from ckan.lib.app_globals import app_globals
+        app.jinja_env.globals.update(g=app_globals)
+
+    #changed to migrate to ckan 2.10:
+    def get_blueprint(self):
+        d4sHC = d4SHomeController()
+        d4sTC = d4STypeController()
+        d4sOC = OrganizationVREController()
+
+        blueprint = Blueprint('d4s', self.__module__)
+        
+        def tags():
+            return render_template('tag/index.html')
+
+        def groups():
+            return render_template('group/index.html')
+
+        rules = [
+            ('/', 'index', d4sHC.index),
+            ('/types', 'types', d4sTC.index),
+            ('/organization_vre', 'organization_vre', d4sOC.index),
+            ('/tags', 'tags', tags),
+            ('/groups', 'groups', groups),
+        ]
+        for rule in rules:
+            blueprint.add_url_rule(*rule)
+
+        return blueprint
+
+    # def before_map(self, map):
+    #     """This IRoutes implementation overrides the standard
+    #     ``/user/register`` behaviour with a custom controller.  You
+    #     might instead use it to provide a completely new page, for
+    #     example.
+    #     Note that we have also provided a custom register form
+    #     template at ``theme/templates/user/register.html``.
+    #     """
+    #     # Hook in our custom user controller at the points of creation
+    #     # and edition.
+    #     #
+    #     #map.connect('/type', controller='ckanext.d4science_theme.controllers.type::d4STypeController', action='index')
+    #     map.connect('/type', controller='ckanext.d4science_theme.controllers.systemtype:d4STypeController', action='index')
+    #     ''' Added by Francesco Mangiacrapa, see: #8964 '''
+    #     organization_vre = OrganizationVREController()
+    #     map.connect('/organization_vre', controller='ckanext.d4science_theme.controllers.organization:OrganizationVREController', action='index')
+    #     map.connect('/organization_vre/{id}', controller='ckanext.d4science_theme.controllers.organization:OrganizationVREController', action='read')
+    #     map.redirect('/types', "/type")
+    #     return map
+        
+    
+    def _add_or_update_facet(self, facet_key, facet_value, facets_dict, display_after_facet='organization'):
+        
+        #Updating ordering of facets_dict OrderedDict
+        if str(facet_key) not in facets_dict:
+
+            new_orderded_facets_dict=facets_dict.__class__()
+            for key, value in list(facets_dict.items()):
+                new_orderded_facets_dict[key]=value
+                # #the field 'metadatatype' will be inserted after following key
+                if key==display_after_facet:
+                    new_orderded_facets_dict[facet_key]=facet_value
+                    
+            facets_dict.clear()
+            facets_dict.update(new_orderded_facets_dict)
+            log.debug("facets_dict ordered: ")
+            log.debug(', '.join(facets_dict))
+        
+        return facets_dict
+
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/.gitignore b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/D4ScienceDataCataloguelogo.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/D4ScienceDataCataloguelogo.png
new file mode 100644
index 0000000..27dce14
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/D4ScienceDataCataloguelogo.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/D4ScienceDataCataloguelogo2.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/D4ScienceDataCataloguelogo2.png
new file mode 100644
index 0000000..1c378c5
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/D4ScienceDataCataloguelogo2.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/bg-noise.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/bg-noise.png
new file mode 100644
index 0000000..40828c6
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/bg-noise.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/bg-pattern.svg b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/bg-pattern.svg
new file mode 100644
index 0000000..0a3e7c8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/bg-pattern.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="385.2" width="845.7" viewBox="0 0 845.7 385.2"><g stroke="#fff" stroke-miterlimit="10" fill="none"><path d="M179.2 85.2L0 170.5l28.1-85.3L137 12.4z"/><path d="M219.9 150l-40.7-64.8L137 12.4 219.9 50zM304 75l-84.1 75V50l150-25.3z"/><path d="M448 124.8L304 75l65.9-50.3 50 25.3zM759.2 98.4L619.9 150V50l70.3-50z"/><path d="M800 170.5l-40.8-72.1-69-98.4 137.9 85.2zM569.9 91.4L448 124.8 419.9 50l100-37.6z"/><path d="M619.9 150l-50-58.6-50-79 100 37.6zM89.6 200l-43.9 50L0 170.5l179.2-85.3z"/><path d="M294.9 282.9L89.6 200l89.6-114.8 40.7 64.8z"/><path d="M319.9 250l-25 32.9-75-132.9L304 75z"/><path d="M464.9 158.2l-145 91.8L304 75l144 49.8zM697.5 217.9l-50.9-8.8-26.7-59.1 139.3-51.6z"/><path d="M845.7 250l-148.2-32.1 61.7-119.5 40.8 72.1zM519.9 250l-55-91.8-16.9-33.4 121.9-33.4zM646.6 209.1L519.9 250l50-158.6 50 58.6zM137 312.4L28.1 385.2 45.7 250l43.9-50z"/><path d="M219.9 350L137 312.4 89.6 200l205.3 82.9z"/><path d="M369.9 324.7l-150 25.3 75-67.1 25-32.9z"/><path d="M419.9 350l-50-25.3-50-74.7 145-91.8zM690.2 300l-70.3 50 26.7-140.9 50.9 8.8z"/><path d="M828.1 385.2L690.2 300l7.3-82.1L845.7 250zM519.9 312.4l-100 37.6 45-191.8 55 91.8zM619.9 350l-100-37.6V250l126.7-40.9z"/></g></svg>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/ckan-logo-footer.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/ckan-logo-footer.png
new file mode 100644
index 0000000..09aa4ca
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/ckan-logo-footer.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4ScienceDataCatalogue.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4ScienceDataCatalogue.png
new file mode 100644
index 0000000..8b7d380
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4ScienceDataCatalogue.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4s_tagcloud.js b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4s_tagcloud.js
new file mode 100644
index 0000000..aa3c487
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4s_tagcloud.js
@@ -0,0 +1,58 @@
+/*!
+ * d4s_tagcloud.js
+ * D4science Tag Cloud which using Tag Cloud Plugin for JQuery
+ *
+ * jquery.tagcloud.js
+ * created by Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ */
+loadTagCloudJS = function (elementIDtoCloud, rgb_start, rgb_end) {
+	
+	//console.log('start: '+rgb_start)
+	//console.log('end: '+rgb_end)
+	
+	if(!rgb_start)
+		rgb_start = '#C0C0C0';
+	
+	if(!rgb_end)
+		rgb_end = '#000066';
+
+	var script = document.createElement('script');
+		script.onload = function() {
+			/*console.log("TagCloud json loaded and ready");*/
+   		$.fn.tagcloud.defaults = {
+  			size: {start: 13, end: 20, unit: 'px'},
+  			color: {start: rgb_start, end: rgb_end}
+  		}
+  		$('#'+elementIDtoCloud +' a').tagcloud();
+	};
+	
+	script.type = "text/javascript";
+	script.src = "jquery.tagcloud.js";
+	document.getElementsByTagName('head')[0].appendChild(script);
+}
+
+loadCloud = function (elementIDtoCloud, rgb_start, rgb_end) {
+
+	if(!window.jQuery){
+  	 var script = document.createElement('script');
+		script.onload = function() {
+  		/*console.log("JQuery loaded and ready");*/
+   	loadTagCloudJS(elementIDtoCloud,rgb_start,rgb_end);
+	};
+	
+   script.type = "text/javascript";
+   script.src = "https://code.jquery.com/jquery-1.11.0.min.js";
+   document.getElementsByTagName('head')[0].appendChild(script);
+  
+	}else {
+		loadTagCloudJS(elementIDtoCloud,rgb_start,rgb_end);
+	}
+
+	/*SHUFFLE TAGS*/
+	var cloud = document.querySelector('#'+elementIDtoCloud);
+	if (cloud == null)
+		return;
+	for (var i = cloud.children.length; i >= 0; i--) {
+    	cloud.appendChild(cloud.children[Math.random() * i | 0]);
+	}
+}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4science.ico b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4science.ico
new file mode 100644
index 0000000..718bf5d
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4science.ico differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4science_logo.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4science_logo.png
new file mode 100644
index 0000000..3b87305
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/d4science_logo.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/favicon.ico b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/favicon.ico
new file mode 100644
index 0000000..718bf5d
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/favicon.ico differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/gCube_70.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/gCube_70.png
new file mode 100644
index 0000000..018d52c
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/gCube_70.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/gcubedatacataloguelogo.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/gcubedatacataloguelogo.png
new file mode 100644
index 0000000..1b4bf52
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/gcubedatacataloguelogo.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/grsf/GRSF_for_admins_logo.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/grsf/GRSF_for_admins_logo.png
new file mode 100644
index 0000000..dbf83de
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/grsf/GRSF_for_admins_logo.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/groups/icon/placeholder-group.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/groups/icon/placeholder-group.png
new file mode 100644
index 0000000..1ece150
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/groups/icon/placeholder-group.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/d4sciencelabs.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/d4sciencelabs.png
new file mode 100644
index 0000000..7d1a75e
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/d4sciencelabs.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/emodnet.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/emodnet.png
new file mode 100644
index 0000000..0724a33
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/emodnet.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/fao.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/fao.png
new file mode 100644
index 0000000..13d5ef0
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/fao.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/grsf.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/grsf.png
new file mode 100644
index 0000000..91ccbbb
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/grsf.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/d4sciencelabs.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/d4sciencelabs.png
new file mode 100644
index 0000000..e0b8d80
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/d4sciencelabs.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/emodnet.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/emodnet.png
new file mode 100644
index 0000000..4eb8091
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/emodnet.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/fao.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/fao.png
new file mode 100644
index 0000000..aa815b4
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/fao.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/grsf.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/grsf.png
new file mode 100644
index 0000000..4343813
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/grsf.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/imarine.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/imarine.png
new file mode 100644
index 0000000..9d7a311
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/imarine.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/placeholder-organization.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/placeholder-organization.png
new file mode 100644
index 0000000..30616f2
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/placeholder-organization.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/rprototypinglab.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/rprototypinglab.png
new file mode 100644
index 0000000..743f19c
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/icon/rprototypinglab.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/imarine.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/imarine.png
new file mode 100644
index 0000000..875348a
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/imarine.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/rprototypinglab.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/rprototypinglab.png
new file mode 100644
index 0000000..472294b
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/organisations/rprototypinglab.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/codelist.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/codelist.png
new file mode 100644
index 0000000..5cb017a
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/codelist.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/dataset.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/dataset.png
new file mode 100644
index 0000000..8ded500
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/dataset.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/dsd.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/dsd.png
new file mode 100644
index 0000000..101975b
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/dsd.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/metadata.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/metadata.png
new file mode 100644
index 0000000..84d395e
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/metadata.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/placeholder-type.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/placeholder-type.png
new file mode 100644
index 0000000..1ca5afb
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/placeholder-type.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/researchobject.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/researchobject.png
new file mode 100644
index 0000000..cab2b45
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/researchobject.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/series.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/series.png
new file mode 100644
index 0000000..573d43f
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/series.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/service.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/service.png
new file mode 100644
index 0000000..54dd849
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/service.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/trainingmaterial.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/trainingmaterial.png
new file mode 100644
index 0000000..38ea713
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/trainingmaterial.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/virtualresearchenvironment.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/virtualresearchenvironment.png
new file mode 100644
index 0000000..91a8a97
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/icon/virtualresearchenvironment.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/placeholder-type.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/placeholder-type.png
new file mode 100644
index 0000000..d09e87e
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/images/types/placeholder-type.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/jquery.tagcloud.js b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/jquery.tagcloud.js
new file mode 100644
index 0000000..4e5d5a3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/jquery.tagcloud.js
@@ -0,0 +1,92 @@
+/*!
+ * jquery.tagcloud.js
+ * A Simple Tag Cloud Plugin for JQuery
+ *
+ * https://github.com/addywaddy/jquery.tagcloud.js
+ * created by Adam Groves
+ */
+(function($) {
+
+  /*global jQuery*/
+  "use strict";
+
+  var compareWeights = function(a, b)
+  {
+    return a - b;
+  };
+
+  // Converts hex to an RGB array
+  var toRGB = function(code) {
+    if (code.length === 4) {
+      code = code.replace(/(\w)(\w)(\w)/gi, "\$1\$1\$2\$2\$3\$3");
+    }
+    var hex = /(\w{2})(\w{2})(\w{2})/.exec(code);
+    return [parseInt(hex[1], 16), parseInt(hex[2], 16), parseInt(hex[3], 16)];
+  };
+
+  // Converts an RGB array to hex
+  var toHex = function(ary) {
+    return "#" + jQuery.map(ary, function(i) {
+      var hex =  i.toString(16);
+      hex = (hex.length === 1) ? "0" + hex : hex;
+      return hex;
+    }).join("");
+  };
+
+  var colorIncrement = function(color, range) {
+    return jQuery.map(toRGB(color.end), function(n, i) {
+      return (n - toRGB(color.start)[i])/range;
+    });
+  };
+
+  var tagColor = function(color, increment, weighting) {
+    var rgb = jQuery.map(toRGB(color.start), function(n, i) {
+      var ref = Math.round(n + (increment[i] * weighting));
+      if (ref > 255) {
+        ref = 255;
+      } else {
+        if (ref < 0) {
+          ref = 0;
+        }
+      }
+      return ref;
+    });
+    return toHex(rgb);
+  };
+
+  $.fn.tagcloud = function(options) {
+
+    var opts = $.extend({}, $.fn.tagcloud.defaults, options);
+    var tagWeights = this.map(function(){
+      return $(this).attr("rel");
+    });
+    tagWeights = jQuery.makeArray(tagWeights).sort(compareWeights);
+    var lowest = tagWeights[0];
+    var highest = tagWeights.pop();
+    var range = highest - lowest;
+    if(range === 0) {range = 1;}
+    // Sizes
+    var fontIncr, colorIncr;
+    if (opts.size) {
+      fontIncr = (opts.size.end - opts.size.start)/range;
+    }
+    // Colors
+    if (opts.color) {
+      colorIncr = colorIncrement (opts.color, range);
+    }
+    return this.each(function() {
+      var weighting = $(this).attr("rel") - lowest;
+      if (opts.size) {
+        $(this).css({"font-size": opts.size.start + (weighting * fontIncr) + opts.size.unit});
+      }
+      if (opts.color) {
+        $(this).css({"color": tagColor(opts.color, colorIncr, weighting)});
+      }
+    });
+  };
+
+  $.fn.tagcloud.defaults = {
+    size: {start: 14, end: 18, unit: "pt"}
+  };
+
+})(jQuery);
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/location_to_bboxes.ini b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/location_to_bboxes.ini
new file mode 100644
index 0000000..e7f14c2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/location_to_bboxes.ini
@@ -0,0 +1,16 @@
+[location_to_bboxes_epsg_4326]
+Antarctica=-180,-90,180,-63.2706604895
+Brazil=-73.9872354804,-33.7683777809,-34.7299934555,5.24448639569
+France=-54.5247541978,2.05338918702,9.56001631027,51.1485061713
+Greece=20.1500159034,34.9199876979,26.6041955909,41.8269046087
+Italy=6.7499552751,36.619987291,18.4802470232,47.1153931748
+Ivory Coast=-8.60288021487,4.33828847902,-2.56218950033,10.5240607772
+Mexico=-117.12776,14.5388286402,-86.811982388,32.72083
+Nigeria=2.69170169436,4.24059418377,14.5771777686,13.8659239771
+Philippines=117.17427453,5.58100332277,126.537423944,18.5052273625
+Portugal=-9.52657060387,36.838268541,-6.3890876937,42.280468655
+Puerto Rico=-67.2424275377,17.946553453,-65.5910037909,18.5206011011
+Slovenia=13.6981099789,45.4523163926,16.5648083839,46.8523859727
+Thailand=97.3758964376,5.69138418215,105.589038527,20.4178496363
+United Kingdom=-7.57216793459,49.959999905,1.68153079591,58.6350001085
+United States=-171.791110603,18.91619,-66.96466,71.3577635769
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/oai2_style.xsl b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/oai2_style.xsl
new file mode 100644
index 0000000..2a41373
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/oai2_style.xsl
@@ -0,0 +1,690 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+
+  XSL Transform to convert OAI 2.0 responses into XHTML
+
+  By Christopher Gutteridge, University of Southampton
+
+  Updated by Francesco Mangiacrapa ISTI-CNR, Pisa, Italy
+
+-->
+
+<!-- 
+  
+Copyright (c) 2000-2004 University of Southampton, UK. SO17 1BJ.
+
+EPrints 2 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.
+
+EPrints 2 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 EPrints 2; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+-->
+
+
+<!--
+  
+  All the elements really needed for EPrints are done but if
+  you want to use this XSL for other OAI archive you may want
+  to make some minor changes or additions.
+
+  Not Done
+    The 'about' section of 'record'
+    The 'compession' part of 'identify'
+    The optional attributes of 'resumptionToken'
+    The optional 'setDescription' container of 'set'
+
+  All the links just link to oai_dc versions of records.
+
+-->
+<xsl:stylesheet
+    version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:oai="http://www.openarchives.org/OAI/2.0/"
+>
+
+<xsl:output method="html"/>
+
+
+
+<xsl:template name="style">
+td.value {
+	vertical-align: top;
+	padding-left: 1em;
+	padding: 3px;
+}
+td.key {
+	background-color: #e0e0ff;
+	padding: 3px;
+	text-align: right;
+	border: 1px solid #c0c0c0;
+	white-space: nowrap;
+	font-weight: bold;
+	vertical-align: top;
+}
+.dcdata td.key {
+	background-color: #ffffe0;
+}
+body {
+	margin: 1em 2em 1em 2em;
+}
+h1, h2, h3 {
+	font-family: sans-serif;
+	clear: left;
+}
+h1 {
+	padding-bottom: 2px;
+	margin-bottom: 0px;
+}
+h2 {
+	margin-bottom: 0.5em;
+}
+h3 {
+	margin-bottom: 0.3em;
+	font-size: medium;
+}
+
+h5 {
+	color: gray;
+    	font-size: 12px;
+    	margin: 0;
+    	padding-top: 5px;
+}
+
+.about-xsl {
+	font-size: 12px;
+	font-family: "Arial";
+	color: gray;
+}
+
+.link {
+	border: 1px outset #88f;
+	background-color: #c0c0ff;
+	padding: 1px 4px 1px 4px;
+	font-size: 80%;
+	text-decoration: none;
+	font-weight: bold;
+	font-family: sans-serif;
+	color: black;
+}
+.link:hover {
+	color: red;
+}
+.link:active {
+	color: red;
+	border: 1px inset #88f;
+	background-color: #a0a0df;
+}
+.oaiRecord, .oaiRecordTitle {
+	background-color: #f0f0ff;
+	border-style: solid;
+	border-color: #d0d0d0;
+}
+h2.oaiRecordTitle {
+	background-color: #e0e0ff;
+	font-size: medium;
+	font-weight: bold;
+	padding: 10px;
+	border-width: 2px 2px 0px 2px;
+	margin: 0px;
+}
+.oaiRecord {
+	margin-bottom: 3em;
+	border-width: 2px;
+	padding: 10px;
+}
+
+.results {
+	margin-bottom: 1.5em;
+}
+ul.quicklinks {
+	margin-top: 3px;
+	padding: 4px;
+	text-align: left;
+	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #ccc;
+	clear: left;
+	list-style-type: none;
+}
+ul.quicklinks li {
+	font-size: 80%;
+	#display: inline;
+	list-stlye: none;
+	font-family: sans-serif;
+ 	padding-left: 12px;
+}
+
+.oai-footer{
+	border-top: 1px solid #ccc;
+}
+
+p.intro {
+	font-size: 12px;
+	font-family: "Arial";
+	color: gray;
+}
+<xsl:call-template name='xmlstyle' />
+</xsl:template>
+
+<xsl:variable name='identifier' select="substring-before(concat(substring-after(/oai:OAI-PMH/oai:request,'identifier='),'&amp;'),'&amp;')" />
+
+<xsl:template match="/">
+<html>
+  <head>
+    <title>OAI 2.0 Request Results</title>
+    <style><xsl:call-template name="style"/></style>
+  </head>
+  <body>
+    <h1>OAI 2.0 Request Results</h1>
+    <p class="intro">You are viewing an HTML version of the XML OAI response. More information about <a href="#moreinfo">this XSLT</a>. <br/>Return to <a href="../oai"> OAI-PMH 2.0 Home</a> for this Repository</p>
+    <xsl:call-template name="quicklinks"/>
+    <xsl:apply-templates select="/oai:OAI-PMH" />
+    <xsl:call-template name="oai-footer"/>
+  </body>
+</html>
+</xsl:template>
+
+<xsl:template name="quicklinks">
+ <h5>OAI-PMH Requests:</h5>
+    <ul class="quicklinks">
+      <li><a href="?verb=Identify">Identify</a></li>
+      <li><a href="?verb=ListRecords&amp;metadataPrefix=oai_dc">ListRecords</a></li>
+      <li><a href="?verb=ListSets">ListSets</a></li>
+      <li><a href="?verb=ListMetadataFormats">ListMetadataFormats</a></li>
+      <li><a href="?verb=ListIdentifiers&amp;metadataPrefix=oai_dc">ListIdentifiers</a></li>
+    </ul>
+</xsl:template>
+
+
+<xsl:template name="oai-footer">
+<div class="oai-footer">
+       <h5><a name="moreinfo">About the XSLT</a></h5>
+    <div class="about-xsl">An XSLT file has converted the <a href="http://www.openarchives.org">OAI-PMH 2.0</a> responses into XHTML which looks nice in a browser which supports XSLT. The XSLT file was created by <a href="http://www.ecs.soton.ac.uk/people/cjg">Christopher Gutteridge</a> at the University of Southampton as part of the <a href="http://software.eprints.org">GNU EPrints system</a>, and is freely redistributable under the <a href="http://www.gnu.org">GPL</a>. <br/> The XSLT file was updated by <a href="http://www.isti.cnr.it/about/people.php?search=Mangiacrapa+Francesco">Francesco Mangiacrapa</a> at the ISTI-CNR of Pisa, Italy</div></div>
+</xsl:template>
+
+
+
+<xsl:template match="/oai:OAI-PMH">
+  <table class="values">
+    <tr><td class="key">Datestamp of response</td>
+    <td class="value"><xsl:value-of select="oai:responseDate"/></td></tr>
+    <tr><td class="key">Request URL</td>
+    <td class="value"><xsl:value-of select="oai:request"/></td></tr>
+  </table>
+<!--  verb: [<xsl:value-of select="oai:request/@verb" />]<br /> -->
+  <xsl:choose>
+    <xsl:when test="oai:error">
+      <h2>OAI Error(s)</h2>
+      <p>The request could not be completed due to the following error or errors.</p>
+      <div class="results">
+        <xsl:apply-templates select="oai:error"/>
+      </div>
+    </xsl:when>
+    <xsl:otherwise>
+      <p>Request was of type: <b><xsl:value-of select="oai:request/@verb"/></b></p>
+      <div class="results">
+        <xsl:apply-templates select="oai:Identify" />
+        <xsl:apply-templates select="oai:GetRecord"/>
+        <xsl:apply-templates select="oai:ListRecords"/>
+        <xsl:apply-templates select="oai:ListSets"/>
+        <xsl:apply-templates select="oai:ListMetadataFormats"/>
+        <xsl:apply-templates select="oai:ListIdentifiers"/>
+      </div>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+<!-- ERROR -->
+
+<xsl:template match="/oai:OAI-PMH/oai:error">
+  <table class="values">
+    <tr><td class="key">Error Code</td>
+    <td class="value"><xsl:value-of select="@code"/></td></tr>
+  </table>
+  <p class="error"><xsl:value-of select="." /></p>
+</xsl:template>
+
+<!-- IDENTIFY -->
+
+<xsl:template match="/oai:OAI-PMH/oai:Identify">
+  <table class="values">
+    <tr><td class="key">Repository Name</td>
+    <td class="value"><xsl:value-of select="oai:repositoryName"/></td></tr>
+    <tr><td class="key">Base URL</td>
+    <td class="value"><xsl:value-of select="oai:baseURL"/></td></tr>
+    <tr><td class="key">Protocol Version</td>
+    <td class="value"><xsl:value-of select="oai:protocolVersion"/></td></tr>
+    <tr><td class="key">Earliest Datestamp</td>
+    <td class="value"><xsl:value-of select="oai:earliestDatestamp"/></td></tr>
+    <tr><td class="key">Deleted Record Policy</td>
+    <td class="value"><xsl:value-of select="oai:deletedRecord"/></td></tr>
+    <tr><td class="key">Granularity</td>
+    <td class="value"><xsl:value-of select="oai:granularity"/></td></tr>
+    <xsl:apply-templates select="oai:adminEmail"/>
+  </table>
+  <xsl:apply-templates select="oai:description"/>
+<!--no warning about unsupported descriptions -->
+</xsl:template>
+
+<xsl:template match="/oai:OAI-PMH/oai:Identify/oai:adminEmail">
+    <tr><td class="key">Admin Email</td>
+    <td class="value"><xsl:value-of select="."/></td></tr>
+</xsl:template>
+
+<!--
+   Identify / Unsupported Description
+-->
+
+<xsl:template match="oai:description/*" priority="-100">
+  <h2>Unsupported Description Type</h2>
+  <p>The XSL currently does not support this type of description.</p>
+  <div class="xmlSource">
+    <xsl:apply-templates select="." mode='xmlMarkup' />
+  </div>
+</xsl:template>
+
+
+<!--
+   Identify / OAI-Identifier
+-->
+
+<xsl:template match="id:oai-identifier" xmlns:id="http://www.openarchives.org/OAI/2.0/oai-identifier">
+  <h2>OAI-Identifier</h2>
+  <table class="values">
+    <tr><td class="key">Scheme</td>
+    <td class="value"><xsl:value-of select="id:scheme"/></td></tr>
+    <tr><td class="key">Repository Identifier</td>
+    <td class="value"><xsl:value-of select="id:repositoryIdentifier"/></td></tr>
+    <tr><td class="key">Delimiter</td>
+    <td class="value"><xsl:value-of select="id:delimiter"/></td></tr>
+    <tr><td class="key">Sample OAI Identifier</td>
+    <td class="value"><xsl:value-of select="id:sampleIdentifier"/></td></tr>
+  </table>
+</xsl:template>
+
+
+<!--
+   Identify / EPrints
+-->
+
+<xsl:template match="ep:eprints" xmlns:ep="http://www.openarchives.org/OAI/1.1/eprints">
+  <h2>EPrints Description</h2>
+  <h3>Content</h3>
+  <xsl:apply-templates select="ep:content"/>
+  <xsl:if test="ep:submissionPolicy">
+    <h3>Submission Policy</h3>
+    <xsl:apply-templates select="ep:submissionPolicy"/>
+  </xsl:if>
+  <h3>Metadata Policy</h3>
+  <xsl:apply-templates select="ep:metadataPolicy"/>
+  <h3>Data Policy</h3>
+  <xsl:apply-templates select="ep:dataPolicy"/>
+  <xsl:if test="ep:content">
+    <h3>Content</h3>
+    <xsl:apply-templates select="ep:content"/>
+  </xsl:if>
+  <xsl:apply-templates select="ep:comment"/>
+</xsl:template>
+
+<xsl:template match="ep:content|ep:dataPolicy|ep:metadataPolicy|ep:submissionPolicy" xmlns:ep="http://www.openarchives.org/OAI/1.1/eprints">
+  <xsl:if test="ep:text">
+    <p><xsl:value-of select="ep:text" /></p>
+  </xsl:if>
+  <xsl:if test="ep:URL">
+    <div><a href="{ep:URL}"><xsl:value-of select="ep:URL" /></a></div>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="ep:comment" xmlns:ep="http://www.openarchives.org/OAI/1.1/eprints">
+  <h3>Comment</h3>
+  <div><xsl:value-of select="."/></div>
+</xsl:template>
+
+
+<!--
+   Identify / Friends
+-->
+
+<xsl:template match="fr:friends" xmlns:fr="http://www.openarchives.org/OAI/2.0/friends/">
+  <h2>Friends</h2>
+  <ul>
+    <xsl:apply-templates select="fr:baseURL"/>
+  </ul>
+</xsl:template>
+
+<xsl:template match="fr:baseURL" xmlns:fr="http://www.openarchives.org/OAI/2.0/friends/">
+  <li><xsl:value-of select="."/>
+<xsl:text> </xsl:text>
+<a class="link" href="{.}?verb=Identify">Identify</a></li>
+</xsl:template>
+
+
+<!--
+   Identify / Branding
+-->
+
+<xsl:template match="br:branding" xmlns:br="http://www.openarchives.org/OAI/2.0/branding/">
+  <h2>Branding</h2>
+  <xsl:apply-templates select="br:collectionIcon"/>
+  <xsl:apply-templates select="br:metadataRendering"/>
+</xsl:template>
+
+<xsl:template match="br:collectionIcon" xmlns:br="http://www.openarchives.org/OAI/2.0/branding/">
+  <h3>Icon</h3>
+  <xsl:choose>
+    <xsl:when test="link!=''">
+      <a href="{br:link}"><img src="{br:url}" alt="{br:title}" width="{br:width}" height="{br:height}" border="0" /></a>
+    </xsl:when>
+    <xsl:otherwise>
+      <img src="{br:url}" alt="{br:title}" width="{br:width}" height="{br:height}" border="0" />
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="br:metadataRendering" xmlns:br="http://www.openarchives.org/OAI/2.0/branding/">
+  <h3>Metadata Rendering Rule</h3>
+  <table class="values">
+    <tr><td class="key">URL</td>
+    <td class="value"><xsl:value-of select="."/></td></tr>
+    <tr><td class="key">Namespace</td>
+    <td class="value"><xsl:value-of select="@metadataNamespace"/></td></tr>
+    <tr><td class="key">Mime Type</td>
+    <td class="value"><xsl:value-of select="@mimetype"/></td></tr>
+  </table>
+</xsl:template>
+
+
+
+<!--
+   Identify / Gateway
+-->
+
+<xsl:template match="gw:gateway" xmlns:gw="http://www.openarchives.org/OAI/2.0/gateway/x">
+  <h2>Gateway Information</h2>
+  <table class="values">
+    <tr><td class="key">Source</td>
+    <td class="value"><xsl:value-of select="gw:source"/></td></tr>
+    <tr><td class="key">Description</td>
+    <td class="value"><xsl:value-of select="gw:gatewayDescription"/></td></tr>
+    <xsl:apply-templates select="gw:gatewayAdmin"/>
+    <xsl:if test="gw:gatewayURL">
+      <tr><td class="key">URL</td>
+      <td class="value"><xsl:value-of select="gw:gatewayURL"/></td></tr>
+    </xsl:if>
+    <xsl:if test="gw:gatewayNotes">
+      <tr><td class="key">Notes</td>
+      <td class="value"><xsl:value-of select="gw:gatewayNotes"/></td></tr>
+    </xsl:if>
+  </table>
+</xsl:template>
+
+<xsl:template match="gw:gatewayAdmin" xmlns:gw="http://www.openarchives.org/OAI/2.0/gateway/">
+  <tr><td class="key">Admin</td>
+  <td class="value"><xsl:value-of select="."/></td></tr>
+</xsl:template>
+
+
+<!-- GetRecord -->
+
+<xsl:template match="oai:GetRecord">
+  <xsl:apply-templates select="oai:record" />
+</xsl:template>
+
+<!-- ListRecords -->
+
+<xsl:template match="oai:ListRecords">
+  <xsl:apply-templates select="oai:record" />
+  <xsl:apply-templates select="oai:resumptionToken" />
+</xsl:template>
+
+<!-- ListIdentifiers -->
+
+<xsl:template match="oai:ListIdentifiers">
+  <xsl:apply-templates select="oai:header" />
+  <xsl:apply-templates select="oai:resumptionToken" />
+</xsl:template>
+
+<!-- ListSets -->
+
+<xsl:template match="oai:ListSets">
+  <xsl:apply-templates select="oai:set" />
+  <xsl:apply-templates select="oai:resumptionToken" />
+</xsl:template>
+
+<xsl:template match="oai:set">
+  <h3>Set</h3>
+  <table class="values">
+    <tr><td class="key">setName</td>
+    <td class="value"><xsl:value-of select="oai:setName"/></td></tr>
+    <xsl:apply-templates select="oai:setSpec" />
+  </table>
+</xsl:template>
+
+<!-- ListMetadataFormats -->
+
+<xsl:template match="oai:ListMetadataFormats">
+  <xsl:choose>
+    <xsl:when test="$identifier">
+      <p>This is a list of metadata formats available for the record "<xsl:value-of select='$identifier' />". Use these links to view the metadata: <xsl:apply-templates select="oai:metadataFormat/oai:metadataPrefix" /></p>
+    </xsl:when>
+    <xsl:otherwise>
+      <p>This is a list of metadata formats available from this archive.</p>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:apply-templates select="oai:metadataFormat" />
+</xsl:template>
+
+<xsl:template match="oai:metadataFormat">
+  <h3>Metadata Format</h3>
+  <table class="values">
+    <tr><td class="key">metadataPrefix</td>
+    <td class="value"><xsl:value-of select="oai:metadataPrefix"/></td></tr>
+    <tr><td class="key">metadataNamespace</td>
+    <td class="value"><xsl:value-of select="oai:metadataNamespace"/></td></tr>
+    <tr><td class="key">schema</td>
+    <td class="value"><a href="{oai:schema}"><xsl:value-of select="oai:schema"/></a></td></tr>
+  </table>
+</xsl:template>
+
+<xsl:template match="oai:metadataPrefix">
+      <xsl:text> </xsl:text><a class="link" href="?verb=GetRecord&amp;metadataPrefix={.}&amp;identifier={$identifier}"><xsl:value-of select='.' /></a>
+</xsl:template>
+
+<!-- record object -->
+
+<xsl:template match="oai:record">
+  <h3 class="oaiRecordTitle">OAI Record: <xsl:value-of select="oai:header/oai:identifier"/></h3>
+  <div class="oaiRecord">
+    <xsl:apply-templates select="oai:header" />
+    <xsl:apply-templates select="oai:metadata" />
+    <xsl:apply-templates select="oai:about" />
+  </div>
+</xsl:template>
+
+<xsl:template match="oai:header">
+  <h3>OAI Record Header</h3>
+  <table class="values">
+    <tr><td class="key">OAI Identifier</td>
+    <td class="value">
+      <xsl:value-of select="oai:identifier"/>
+      <xsl:text> </xsl:text><a class="link" href="?verb=GetRecord&amp;metadataPrefix=oai_dc&amp;identifier={oai:identifier}">oai_dc</a>
+      <xsl:text> </xsl:text><a class="link" href="?verb=GetRecord&amp;metadataPrefix=rdf&amp;identifier={oai:identifier}">rdf</a>
+    </td></tr>
+    <tr><td class="key">Datestamp</td>
+    <td class="value"><xsl:value-of select="oai:datestamp"/></td></tr>
+  <xsl:apply-templates select="oai:setSpec" />
+  </table>
+  <xsl:if test="@status='deleted'">
+    <p>This record has been deleted.</p>
+  </xsl:if>
+</xsl:template>
+
+
+<xsl:template match="oai:about">
+  <p>"about" part of record container not supported by the XSL</p>
+</xsl:template>
+
+<xsl:template match="oai:metadata">
+  &#160;
+  <div class="metadata">
+    <xsl:apply-templates select="*" />
+  </div>
+</xsl:template>
+
+
+
+
+<!-- oai setSpec object -->
+
+<xsl:template match="oai:setSpec">
+  <tr><td class="key">setSpec</td>
+  <td class="value"><xsl:value-of select="."/>
+    <xsl:text> </xsl:text><a class="link" href="?verb=ListIdentifiers&amp;metadataPrefix=oai_dc&amp;set={.}">Identifiers</a>
+    <xsl:text> </xsl:text><a class="link" href="?verb=ListRecords&amp;metadataPrefix=oai_dc&amp;set={.}">Records</a>
+  </td></tr>
+</xsl:template>
+
+
+
+<!-- oai resumptionToken -->
+
+<xsl:template match="oai:resumptionToken">
+   <p>There are more results.</p>
+   <table class="values">
+     <tr><td class="key">resumptionToken:</td>
+     <td class="value"><xsl:value-of select="."/>
+<xsl:text> </xsl:text>
+<a class="link" href="?verb={/oai:OAI-PMH/oai:request/@verb}&amp;resumptionToken={.}">Resume</a></td></tr>
+   </table>
+</xsl:template>
+
+<!-- unknown metadata format -->
+
+<xsl:template match="oai:metadata/*" priority='-100'>
+  <h3>Unknown Metadata Format</h3>
+  <div class="xmlSource">
+    <xsl:apply-templates select="." mode='xmlMarkup' />
+  </div>
+</xsl:template>
+
+<!-- oai_dc record -->
+
+<xsl:template match="oai_dc:dc"  xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" >
+  <div class="dcdata">
+    <h3>Dublin Core Metadata (oai_dc)</h3>
+    <table class="dcdata">
+      <xsl:apply-templates select="*" />
+    </table>
+  </div>
+</xsl:template>
+
+<xsl:template match="dc:title" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Title</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:creator" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Author or Creator</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:subject" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Subject and Keywords</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:description" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Description</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:publisher" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Publisher</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:contributor" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Other Contributor</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:date" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Date</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:type" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Resource Type</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:format" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Format</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:identifier" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Resource Identifier</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:source" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Source</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:language" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Language</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:relation" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Relation</td><td class="value">
+  <xsl:choose>
+    <xsl:when test='starts-with(.,"http" )'>
+      <xsl:choose>
+        <xsl:when test='string-length(.) &gt; 50'>
+          <a class="link" href="{.}">URL</a>
+          <i> URL not shown as it is very long.</i>
+        </xsl:when>
+        <xsl:otherwise>
+          <a href="{.}"><xsl:value-of select="."/></a>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="."/>
+    </xsl:otherwise>
+  </xsl:choose>
+</td></tr></xsl:template>
+
+<xsl:template match="dc:coverage" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Coverage</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<xsl:template match="dc:rights" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<tr><td class="key">Rights Management</td><td class="value"><xsl:value-of select="."/></td></tr></xsl:template>
+
+<!-- XML Pretty Maker -->
+
+<xsl:template match="node()" mode='xmlMarkup'>
+  <div class="xmlBlock">
+    &lt;<span class="xmlTagName"><xsl:value-of select='name(.)' /></span><xsl:apply-templates select="@*" mode='xmlMarkup'/>&gt;<xsl:apply-templates select="node()" mode='xmlMarkup' />&lt;/<span class="xmlTagName"><xsl:value-of select='name(.)' /></span>&gt;
+  </div>
+</xsl:template>
+
+<xsl:template match="text()" mode='xmlMarkup'><span class="xmlText"><xsl:value-of select='.' /></span></xsl:template>
+
+<xsl:template match="@*" mode='xmlMarkup'>
+  <xsl:text> </xsl:text><span class="xmlAttrName"><xsl:value-of select='name()' /></span>="<span class="xmlAttrValue"><xsl:value-of select='.' /></span>"
+</xsl:template>
+
+<xsl:template name="xmlstyle">
+.xmlSource {
+	font-size: 70%;
+	border: solid #c0c0a0 1px;
+	background-color: #ffffe0;
+	padding: 2em 2em 2em 0em;
+}
+.xmlBlock {
+	padding-left: 2em;
+}
+.xmlTagName {
+	color: #800000;
+	font-weight: bold;
+}
+.xmlAttrName {
+	font-weight: bold;
+}
+.xmlAttrValue {
+	color: #0000c0;
+}
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/pageloading.gif b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/pageloading.gif
new file mode 100644
index 0000000..ea92a4c
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/pageloading.gif differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/parthenos/logo-parthenos.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/parthenos/logo-parthenos.png
new file mode 100644
index 0000000..7fd8e9b
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/parthenos/logo-parthenos.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/placeholder_types.png b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/placeholder_types.png
new file mode 100644
index 0000000..cc33636
Binary files /dev/null and b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/public/placeholder_types.png differ
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/qrcodelink/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/qrcodelink/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/qrcodelink/generate_qrcode.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/qrcodelink/generate_qrcode.py
new file mode 100644
index 0000000..1909226
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/qrcodelink/generate_qrcode.py
@@ -0,0 +1,80 @@
+import os
+import tempfile
+import logging
+import pyqrcode
+import time
+
+# Created by Francesco Mangiacrapa
+# francesco.mangiacrapa@isti.cnr.it
+# ISTI-CNR Pisa (ITALY)
+
+CATALINA_HOME = 'CATALINA_HOME'
+log = logging.getLogger(__name__)
+
+temp_dir = None
+qr_code_dir = None
+qr_code_dir_name = "qr_code_for_catalogue"
+
+
+class D4S_QrCode():
+    def __init__(self, qr_code_url=None):
+        self._qr_code_url = qr_code_url
+        global temp_dir
+        if temp_dir is None:
+            D4S_QrCode.init_temp_dir()
+            if temp_dir is None:
+                raise Exception('No temp directory found!')
+
+    def get_qrcode_path(self):
+        image_name = self._qr_code_url.rsplit('/', 1)[-1]
+        image_name+=".svg"
+        image_path = os.path.join(qr_code_dir, image_name)
+        # ONLY IF QRCODE DOES NOT EXIST THEN IT WILL BE CREATED
+        if not os.path.isfile(image_path):
+            url = pyqrcode.create(self._qr_code_url)
+            url.svg(image_path, scale=3)
+            log.debug("Created QRCode image: " + image_name)
+
+        attempt = 0
+        while not os.path.exists(image_path) and attempt < 3:
+            time.sleep(1)
+            attempt += 1
+
+        if os.path.isfile(image_path):
+            log.info("QRcode image exists at: " + image_path)
+        else:
+            log.error("%s isn't a file!" % image_path)
+
+        return image_path
+
+    @classmethod
+    def init_temp_dir(cls):
+        global temp_dir
+        global qr_code_dir_name
+        global qr_code_dir
+        try:
+            temp_dir = str(os.environ[CATALINA_HOME])
+            temp_dir = os.path.join(temp_dir, "temp")
+        except KeyError as error:
+            log.error("No environment variable for: %s" % CATALINA_HOME)
+
+        if temp_dir is None:
+            temp_dir = tempfile.gettempdir()  # using system tmp dir
+
+        log.debug("Temp dir is: %s" % temp_dir)
+
+        qr_code_dir = os.path.join(temp_dir, qr_code_dir_name)
+
+        if not os.path.exists(qr_code_dir):
+            os.makedirs(qr_code_dir)
+
+    def get_temp_directory(self):
+        return temp_dir
+
+    def get_qr_code_dir(self):
+        return qr_code_dir
+
+
+# D4S_QrCode.init_temp_dir()
+#qr_code = D4S_QrCode("http://data.d4science.org/ctlg/BiodiversityLab/distribution_of_the_giant_squid_architeuthis")
+#print qr_code.get_qrcode_path()
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/activity_streams/activity_stream_email_notifications.text b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/activity_streams/activity_stream_email_notifications.text
new file mode 100644
index 0000000..505710b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/activity_streams/activity_stream_email_notifications.text
@@ -0,0 +1,7 @@
+{% set num = activities|length %}{{ ngettext("You have {num} new activity on your {site_title} dashboard", "You have {num} new activities on your {site_title} dashboard", num).format(site_title=g.site_title if g else site_title, num=num) }} {{ _('To view your dashboard, click on this link:') }}
+
+{% url_for 'dashboard.index', _external=True %}
+
+{{ _('You can turn off these email notifications in your {site_title} preferences. To change your preferences, click on this link:').format(site_title=g.site_title if g else site_title) }}
+
+{% url_for 'user.edit', _external=True %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/base.html
new file mode 100644
index 0000000..806d8c9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/base.html
@@ -0,0 +1,12 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Administration') }}{% endblock %}
+
+{% block breadcrumb_content %}{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('admin.index', _('Sysadmins'), icon='gavel') }}
+  {{ h.build_nav_icon('admin.config', _('Config'), icon='gear') }}
+  {{ h.build_nav_icon('admin.trash', _('Trash'), icon='trash') }}
+  {{ h.build_extra_admin_nav() }}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/config.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/config.html
new file mode 100644
index 0000000..0c29625
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/config.html
@@ -0,0 +1,72 @@
+{% import 'macros/autoform.html' as autoform %}
+
+{% extends "admin/base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% block primary_content_inner %}
+
+  {{ form.errors(error_summary) }}
+
+  <form method='post' action="" id="admin-config-form" enctype="multipart/form-data">
+    {% block admin_form %}
+    {{ h.csrf_input() }}
+
+      {{ form.input('ckan.site_title', id='field-ckan-site-title', label=_('Site Title'), value=data['ckan.site_title'], error=error, classes=['control-medium']) }}
+
+      {{ form.input('ckan.theme', id='field-ckan-main-css', label=_('Custom Stylesheet'), value=data['ckan.theme'], error=error, classes=['control-medium']) }}
+
+      {{ form.input('ckan.site_description', id='field-ckan-site-description', label=_('Site Tag Line'), value=data['ckan.site_description'], error=error, classes=['control-medium']) }}
+
+      {% set field_url = 'ckan.site_logo' %}
+      {% set is_upload = data[field_url] and not data[field_url].startswith('http') %}
+      {% set is_url = data[field_url] and data[field_url].startswith('http') %}
+      {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload, upload_label = _('Site logo'), url_label=_('Site logo'),  field_url=field_url, field_upload='logo_upload', field_clear='clear_logo_upload' )}}
+  
+      {{ form.markdown('ckan.site_about', id='field-ckan-site-about', label=_('About'), value=data['ckan.site_about'], error=error, placeholder=_('About page text')) }}
+
+      {{ form.markdown('ckan.site_intro_text', id='field-ckan-site-intro-text', label=_('Intro Text'), value=data['ckan.site_intro_text'], error=error, placeholder=_('Text on home page')) }}
+
+      {{ form.textarea('ckan.site_custom_css', id='field-ckan-site-custom-css', label=_('Custom CSS'), value=data['ckan.site_custom_css'], error=error, placeholder=_('Customisable css inserted into the page header')) }}
+
+      {{ form.select('ckan.homepage_style', id='field-homepage-style', label=_('Homepage'), options=homepages, selected=data['ckan.homepage_style'], error=error) }}
+      {% endblock %}
+      <div class="form-actions">
+        <a href="{% url_for 'admin.reset_config' %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to reset the config?') }}">{{ _('Reset') }}</a>
+        <button type="submit" class="btn btn-primary" name="save">{{ _('Update Config') }}</button>
+      </div>
+  </form>
+{% endblock %}
+
+{% block secondary_content %}
+  <div class="module module-narrow module-shallow">
+    <h2 class="module-heading">
+      <i class="fa fa-info-circle"></i>
+      {{ _('CKAN config options') }}
+    </h2>
+    <div class="module-content">
+      {% block admin_form_help %}
+        {% set about_url = h.url_for('home.about') %}
+        {% set home_url = h.url_for('home.index') %}
+        {% set docs_url = "http://docs.ckan.org/en/{0}/theming".format(g.ckan_doc_version) %}
+        {% trans %}
+          <p><strong>Site Title:</strong> This is the title of this CKAN instance
+            It appears in various places throughout CKAN.</p>
+          <p><strong>Custom Stylesheet:</strong> Define an alternative main CSS file.</p>
+          <p><strong>Site Tag Logo:</strong> This is the logo that appears in the
+            header of all the CKAN instance templates.</p>
+          <p><strong>About:</strong> This text will appear on this CKAN instances
+            <a href="{{ about_url }}">about page</a>.</p>
+          <p><strong>Intro Text:</strong> This text will appear on this CKAN instances
+            <a href="{{ home_url }}">home page</a> as a welcome to visitors.</p>
+          <p><strong>Custom CSS:</strong> This is a block of CSS that appears in
+            <code>&lt;head&gt;</code> tag of every page. If you wish to customize
+            the templates more fully we recommend
+            <a href="{{ docs_url }}" target="_blank" rel="noreferrer">reading the documentation</a>.</p>
+          <p><strong>Homepage:</strong> This is for choosing a predefined layout for
+            the modules that appear on your homepage.</p>
+      {% endtrans %}
+    {% endblock %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/confirm_reset.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/confirm_reset.html
new file mode 100644
index 0000000..3e5a716
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/confirm_reset.html
@@ -0,0 +1,14 @@
+{% extends "admin/base.html" %}
+
+{% block subtitle %}{{ _("Confirm Reset") }}{% endblock %}
+
+{% block primary_content_inner %}
+  <form action="{% url_for 'admin.reset_config' %}" method="post">
+    {{ h.csrf_input() }} 
+    <p>{{ _('Are you sure you want to reset the config?') }}</p>
+    <p class="form-actions">
+      <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+      <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Reset') }}</button>
+    </p>
+  </form>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/index.html
new file mode 100644
index 0000000..d6e7439
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/index.html
@@ -0,0 +1,84 @@
+{% extends "admin/base.html" %}
+
+{% block primary_content_inner %}
+  <h2>{{ _('Current Sysadmins') }}</h2>
+
+  <table class="table table-header table-hover table-bordered">
+    <thead>
+      <tr>
+        <th>{{ _('User') }}</th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for user in sysadmins %}
+        <tr>
+          <td>{{ h.linked_user(user) }}</td>
+          <td>
+            <div class="btn-group pull-right">
+              <form method="POST" action="{% url_for 'user.sysadmin' %}">
+                {{ h.csrf_input() }}
+                <input type="hidden" value="{{ user }}" name="username" />
+                <input type="hidden" value="0" name="status" />
+                <button
+                  type="submit"
+                  class="btn btn-danger btn-sm"
+                  title="{{ _('Revoke Sysadmin permission') }}"
+                >
+                  <i class="fa fa-times"></i>
+                </button>
+              </form>
+            </div>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+
+  <hr />
+
+  <h2>{{ _('Promote user to Sysadmin') }}</h2>
+
+  <form method="POST" action="{% url_for 'user.sysadmin' %}">
+    {{ h.csrf_input() }}
+    <div class="row">
+      <div class="col">
+
+        <div class="form-group">
+          <input
+            id="promote-username" type="text" name="username" placeholder="Username"
+            value="" class="control-medium" data-module="autocomplete"
+            data-module-source="/api/2/util/user/autocomplete?ignore_self=true&q=?"
+          >
+          <input type="hidden" value="1" name="status" />
+        </div>
+
+        <div class="form-actions">
+          <button
+            type="submit"
+            class="btn btn-primary"
+            title="{{ _('Promote user to Sysadmin') }}"
+          >{{ _('Promote') }}</button>
+        </div>
+
+      </div>
+    </div>
+  </form>
+{% endblock %}
+
+{% block secondary_content %}
+  <div class="module module-narrow module-shallow">
+    <h2 class="module-heading">
+      <i class="fa fa-info-circle"></i>
+      {{ _('Administer CKAN') }}
+    </h2>
+    <div class="module-content">
+
+      {% set docs_url = "http://docs.ckan.org/en/{0}/sysadmin-guide.html".format(g.ckan_doc_version) %}
+      {% trans %}
+        <p>As a sysadmin user you have full control over this CKAN instance. Proceed with care!</p>
+        <p>For guidance on using sysadmin features, see the CKAN  <a href="{{ docs_url }}" target="_blank" rel="noreferrer">sysadmin guide</a></p>
+      {% endtrans %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/snippets/confirm_delete.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/snippets/confirm_delete.html
new file mode 100644
index 0000000..d4f0a0d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/snippets/confirm_delete.html
@@ -0,0 +1,24 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+      <p>
+        {{ _(messages.confirm[ent_type]) }}
+      </p>
+        <p class="form-actions">
+          <form id="{{ ent_type }}-confirm-delete-form" action="{{ h.url_for('admin.trash') }}" method="POST">
+            {{ h.csrf_input() }} 
+            <button class="btn btn-danger" type="submit" name="cancel">Cancel</button>
+            <button class="btn btn-primary" type="submit" name="action" value="{{ ent_type }}">{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/snippets/data_type.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/snippets/data_type.html
new file mode 100644
index 0000000..c328439
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/snippets/data_type.html
@@ -0,0 +1,57 @@
+<div class="accordion" id="accordion-{{ ent_type }}">
+  <div class="accordion-item">
+    <h2 class="accordion-header" id="heading-{{ ent_type }}">
+      <button class="accordion-button p-2" type="button" data-bs-toggle="collapse" data-bs-target="#{{ ent_type }}"
+        aria-expanded="true" aria-controls="{{ ent_type }}">
+        {% if ent_type == "package" %} <i class='fa fa-sitemap p-2'></i>
+          {% elif ent_type == 'group' %} <i class='fa fa-group p-2'></i>
+          {% else %} <i class="fa fa-building p-2"></i>
+        {% endif %}
+        {% if ent_type == 'package' %}
+          {{ _('Deleted datasets') }}
+        {% elif ent_type == 'organization' %}
+          {{ _('Deleted organizations') }}
+        {% elif ent_type == 'group' %}
+          {{ _('Deleted groups') }}
+        {% endif %}
+      </button>
+    </h2>
+
+{# entities list can be of different types #}
+{% set items = [] %}
+
+    <!-- expanded by default to prevent problems with disabled js -->
+    <div id="{{ ent_type }}" class="accordion-collapse collapse show p-2" aria-labelledby="heading-{{ ent_type }}"
+      data-bs-parent="#accordion-{{ ent_type }}">
+      <ul class="{{ ent_type }}-list">
+        {% for entity in entities %}
+        {% set title = entity.title or entity.name %}
+          {% do items.append(title) %}
+        <li>
+          <a href="{{ h.url_for(entity.type + '.read', id=entity.name) }}" title="{{ title }}">
+            {{ title|truncate(80) }}
+          </a>
+        </li>
+        {% else %}
+        <p>
+          {{ _(messages.empty[ent_type]) }}
+        </p>
+        {% endfor %}
+      </ul>
+
+      <!-- show button only if there is entity to purge -->
+      {% if items|length > 0 %}
+      <form method="POST" class="d-flex justify-content-end" action="{{ h.url_for('admin.trash') }}"
+        id="form-purge-{{ ent_type }}">
+        {{ h.csrf_input() }}
+        <input type="hidden" name="action" value="{{ent_type}}">
+        <a href="{{ h.url_for('admin.trash', name=ent_type) }}" class="btn btn-danger purge-all"
+          data-module="confirm-action" data-module-with-data=true
+          data-module-content="{{ _(messages.confirm[ent_type]) }}">
+          {{ _('Purge') }}
+        </a>
+      </form>
+      {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/trash.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/trash.html
new file mode 100644
index 0000000..f3331a6
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/admin/trash.html
@@ -0,0 +1,38 @@
+{% extends "admin/base.html" %}
+
+{% block primary_content_inner %}
+<form method="POST" action="{{ h.url_for('admin.trash') }}" id="form-purge-all">
+  {{ h.csrf_input() }} 
+  <div class="form-actions">
+    <input type="hidden" name="action" value="all">
+    <a class="btn btn-danger purge-all"
+       type="submit"
+       href="{{ h.url_for('admin.trash', name='all') }}"
+       data-module="confirm-action"
+       data-module-with-data=true
+       data-module-content="{{ _('Are you sure you want to purge everything?') }}">
+      {{ _('Purge all') }}
+    </a>
+  </div>
+</form>
+
+{% for ent_type, entities in data.items() %}
+  {% snippet "admin/snippets/data_type.html", ent_type=ent_type, entities=entities, messages=messages %}
+{% endfor %}
+{% endblock %}
+
+{% block secondary_content %}
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="fa fa-info-circle"></i>
+    {{ _("Trash") }}
+  </h2>
+  <div class="module-content">
+    <p>
+      {% trans %}
+      Purge deleted datasets, organizations or groups forever and irreversibly.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/ajax_snippets/custom_fields.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/ajax_snippets/custom_fields.html
new file mode 100644
index 0000000..90f7344
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/ajax_snippets/custom_fields.html
@@ -0,0 +1,4 @@
+{# Snippet for unit testing custom-fields.js #}
+<div>
+  {% snippet 'snippets/custom_form_fields.html', extras=[{'key': 'key', 'value': 'value'}], errors={} %}
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/ajax_snippets/follow_button.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/ajax_snippets/follow_button.html
new file mode 100644
index 0000000..9dc09c9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/ajax_snippets/follow_button.html
@@ -0,0 +1 @@
+{{ h.follow_button(type, id) }}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/base.html
new file mode 100644
index 0000000..192d8e3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/base.html
@@ -0,0 +1,130 @@
+{# Allows the DOCTYPE to be set on a page by page basis #}
+{%- block doctype %}<!DOCTYPE html>{% endblock -%}
+
+{# Allows custom attributes to be added to the <html> tag #}
+{%- block htmltag -%}
+{% set lang = h.lang() %}
+<!--[if IE 9]> <html lang="{{ lang }}" class="ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html lang="{{ lang }}" {% if h.is_rtl_language()  %} dir="rtl" {% endif %} > <!--<![endif]-->
+{%- endblock -%}
+
+  {# Allows custom attributes to be added to the <head> tag #}
+  <head{% block headtag %}{% endblock %}>
+    {#
+    Add custom meta tags to the page. Call super() to get the default tags
+    such as charset, viewport and generator.
+
+    Example:
+
+    {% block meta %}
+      {{ super() }}
+      <meta name="description" value="My website description" />
+    {% endblock %}
+
+    #}
+    {%- block meta -%}
+      <meta charset="utf-8" />
+      <meta name="csrf_field_name" content="{{ g.csrf_field_name }}" />
+      <meta name="{{ g.csrf_field_name }}" content="{{ csrf_token() }}" />
+
+      {% block meta_generator %}<meta name="generator" content="ckan {{ h.ckan_version() }}" />{% endblock %}
+      {% block meta_viewport %}<meta name="viewport" content="width=device-width, initial-scale=1.0">{% endblock %}
+    {%- endblock -%}
+
+    {#
+    Add a custom title to the page by extending the title block. Call super()
+    to get the default page title.
+
+    Example:
+
+      {% block title %}My Subtitle - {{ super() }}{% endblock %}
+
+    #}
+    <title>
+      {%- block title -%}
+        {%- block subtitle %}{% endblock -%}
+        {%- if self.subtitle()|trim %} {{ g.template_title_delimiter }} {% endif -%}
+        {{ g.site_title }}
+      {%- endblock -%}
+    </title>
+
+    {#
+    The links block allows you to add additonal content before the stylesheets
+    such as rss feeds and favicons in the same way as the meta block.
+    #}
+    {% block links -%}
+      <link rel="shortcut icon" href="{{ g.favicon }}" />
+    {% endblock -%}
+
+    {#
+    The styles block allows you to add additonal stylesheets to the page in
+    the same way as the meta block. Use super() to include the default
+    stylesheets before or after your own.
+
+    Example:
+
+      {% block styles %}
+        {{ super() }}
+        <link rel="stylesheet" href="/base/css/custom.css" />
+      {% endblock %}
+    #}
+    {%- block styles %}
+      {# TODO: store just name of asset instead of path to it. #}
+      {% set theme = h.get_rtl_theme() if h.is_rtl_language() else g.theme %}
+      {% asset theme %}
+      {% asset 'd4science_theme/d4science-js' %}
+      {% asset 'd4science_theme/d4science-css' %}
+    {% endblock %}
+
+    {% block head_extras %}
+      {# defined in the config.ini under "ckan.template_head_end" #}
+      {{ g.template_head_end | safe }}
+    {% endblock %}
+
+    {# render all assets included in styles block #}
+    {{ h.render_assets('style') }}
+    {%- block custom_styles %}
+      {%- if g.site_custom_css -%}
+      <style>
+        {{ g.site_custom_css | safe }}
+      </style>
+      {%- endif %}
+    {% endblock %}
+  </head>
+
+  {# Allows custom attributes to be added to the <body> tag #}
+  <body{% block bodytag %} data-site-root="{{ h.url_for('home.index', locale='default', qualified=true) }}" data-locale-root="{{ h.url_for('home.index', qualified=true) }}" {% endblock %}>
+
+    {#
+    The page block allows you to add content to the page. Most of the time it is
+    recommended that you extend one of the page.html templates in order to get
+    the site header and footer. If you need a clean page then this is the
+    block to use.
+
+    Example:
+
+      {% block page %}
+        <div>Some other page content</div>
+      {% endblock %}
+    #}
+    {%- block page %}{% endblock -%}
+
+    {#
+    DO NOT USE THIS BLOCK FOR ADDING SCRIPTS
+    Scripts should be loaded by the {% assets %} tag except in very special
+    circumstances
+    #}
+    {%- block scripts %}
+    {% endblock -%}
+
+    {% block body_extras -%}
+      {# defined in the config.ini under "ckan.template_footer_end" #}
+      {{ g.template_footer_end | safe }}
+    {%- endblock %}
+
+    {# render all assets included in scripts block and everywhere else #}
+    {# make sure there are no calls to `asset` tag after this point #}
+    {{ h.render_assets('style') }}
+    {{ h.render_assets('script') }}
+  </body>
+</html>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/dataviewer/base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/dataviewer/base.html
new file mode 100644
index 0000000..9f3d714
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/dataviewer/base.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+{% block subtitle %}{{ h.dataset_display_name(package) }} {{ g.template_title_delimiter }} {{h.resource_display_name(resource) }}{% endblock %}
+
+{# remove any scripts #}
+{% block scripts %}
+  <script>
+    var preload_resource = {{ h.literal(h.dump_json(resource)) }};
+  </script>
+{% endblock %}
+
+{# remove any ckan styles #}
+{% block styles %}{% endblock %}
+
+{% block custom_styles %}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/primer.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/primer.html
new file mode 100644
index 0000000..fe4ddc8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/primer.html
@@ -0,0 +1,100 @@
+{% extends "page.html" %}
+
+{% block toolbar %}
+{% snippet 'development/snippets/breadcrumb.html', stage=1 %}
+{% snippet 'development/snippets/breadcrumb.html', stage=2 %}
+{% snippet 'development/snippets/breadcrumb.html', stage=3 %}
+{% endblock %}
+
+{% block actions_content %}
+{% snippet 'development/snippets/actions.html' %}
+{% endblock %}
+
+{% block secondary_content %}
+{% snippet 'development/snippets/context.html' %}
+
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading"><i class="fa fa-info-circle"></i> Helper text</h2>
+  <div class="module-content">{{ lipsum(1) }}</div>
+</div>
+
+{% snippet 'development/snippets/nav.html', heading='Navigation' %}
+{% snippet 'development/snippets/nav.html', heading='Active Navigation', show_active=true %}
+{% snippet 'development/snippets/nav.html', heading='Icon Navigation', show_icons=true %}
+{% snippet 'development/snippets/facet.html', heading='Facet List', show_icons=true %}
+{% endblock %}
+
+{% block primary_content %}
+{% snippet 'development/snippets/page_header.html' %}
+
+<div class="module-content">
+  <div class="input-group input-group-lg search-giant">
+    <input type="text" class="search form-control" name="q" value="" autocomplete="off" placeholder="Search something...">
+    <span class="input-group-btn">
+        <button class="btn btn-default" type="submit">
+          <i class="fa fa-search"></i>
+          <span class="sr-only">Search</span>
+        </button>
+      </span>
+  </div>
+</div>
+
+<div class="module-content">
+  <h1 class="page-heading">Top level heading (h1)</h1>
+  <h2>Some Rendered Markdown (h2)</h2>
+  <div class="embedded-content">
+    <h1>Heading 1</h1>
+    {{ lipsum(1) }}
+    <h2>Heading 2</h2>
+    {{ lipsum(1) }}
+    <h3>Heading 3</h3>
+    {{ lipsum(1) }}
+  </div>
+</div>
+
+<div class="module-content">
+  <hr>
+  <h2>Forms</h2>
+</div>
+{% snippet 'development/snippets/form.html' %}
+{% snippet 'development/snippets/form.html', error=['This field has an error'] %}
+
+<div class="module-content">
+  <hr>
+  <h2>Form stages</h2>
+</div>
+{% snippet 'development/snippets/form_stages.html' %}
+
+
+<div class="module-content m-bottom">
+  <h2>Datasets</h2>
+  <hr>
+  {% snippet 'snippets/package_list.html', packages=[
+  {'name': "test", 'title': 'Dataset #1', 'type': 'dataset', 'notes': lipsum(1), 'tracking_summary':{'recent': 10}},
+  {'name': "test", 'title': 'Dataset #2', 'type': 'dataset', 'notes': lipsum(0), 'tracking_summary':{'recent': 5}},
+  {'name': "test", 'title': 'Dataset #3', 'type': 'dataset', 'notes': lipsum(1), 'tracking_summary':{'recent': 10}},
+  {'name': "test", 'title': 'Dataset #4', 'type': 'dataset', 'notes': lipsum(1), 'tracking_summary':{'recent': 10}}
+  ] %}
+</div>
+
+<div class="module-content p-top">
+  <hr class="m-top">
+  <h2>Media Grid</h2>
+</div>
+{% snippet 'development/snippets/media_grid.html', groups=[
+{'name': "test", 'display_name': 'Group #1', 'type': 'group', 'description': lipsum(0), 'packages': 0},
+{'name': "test", 'display_name': 'Group #2', 'type': 'group', 'description': lipsum(1), 'packages': 1},
+{'name': "test", 'display_name': 'Group #3', 'type': 'group', 'description': lipsum(1), 'packages': 10},
+{'name': "test", 'display_name': 'Group #4', 'type': 'group', 'description': lipsum(1), 'packages': 200},
+{'name': "test", 'display_name': 'Group #5', 'type': 'group', 'description': lipsum(1), 'packages': 10},
+{'name': "test", 'display_name': 'Group #6', 'type': 'group', 'description': lipsum(0), 'packages': 5}
+] %}
+
+<div class="module-content">
+  <h2>Pagination</h2>
+</div>
+{% snippet 'development/snippets/pagination.html', total=5, current=1 %}
+{% snippet 'development/snippets/pagination.html', total=5, current=3 %}
+{% snippet 'development/snippets/pagination.html', total=5, current=5 %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/actions.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/actions.html
new file mode 100644
index 0000000..fe9519c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/actions.html
@@ -0,0 +1,2 @@
+<li><a class="btn btn-default" href="#"><i class="fa fa-wrench"></i> Button</a></li>
+<li><a class="btn btn-primary" href="#"><i class="fa fa-wrench"></i> Primary Button</a></li>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/breadcrumb.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/breadcrumb.html
new file mode 100644
index 0000000..9a1e371
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/breadcrumb.html
@@ -0,0 +1,7 @@
+<div class="toolbar">
+  <ol class="breadcrumb">
+    {% snippet 'snippets/home_breadcrumb_item.html' %}
+    {% if stage > 1 %}<li{% if stage == 2 %} class="active"{% endif %}><a href="#">{% if stage == 2 %}Active {% endif %}Breadcrumb Item</a></li>{% endif %}
+    {% if stage > 2 %}<li class="active"><a href="#">Active Breadcrumb Item</a></li>{% endif %}
+  </ol>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/context.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/context.html
new file mode 100644
index 0000000..936d928
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/context.html
@@ -0,0 +1,26 @@
+<div class="module context-info">
+  <section class="module-content">
+    <div class="image">
+      <a href="#">
+        <img src="{{ h.url_for_static('/base/images/placeholder-organization.png') }}" width="200">
+      </a>
+    </div>
+    <h1 class="heading">{{ title }}</h1>
+    <p class="description">
+      {{ h.markdown_extract(lipsum(1), 160) }}
+    </p>
+    <p class="read-more">
+      <a href="#">read more</a>
+    </p>
+      <div class="nums">
+        <dl>
+          <dt>Stat #1</dt>
+          <dd>{{ h.SI_number_span(11111) }}</dd>
+        </dl>
+        <dl>
+          <dt>Stat #2</dt>
+          <dd>{{ h.SI_number_span(111) }}</dd>
+        </dl>
+      </div>
+  </section>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/facet.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/facet.html
new file mode 100644
index 0000000..9f872cd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/facet.html
@@ -0,0 +1,15 @@
+<section class="module module-narrow">
+  {% with items=(("First", true), ("Second", false), ("Third", true), ("Fourth", false), ("Last", false)) %}
+    <h2 class="module-heading"><i class="fa fa-filter"></i>  Facet List</h2>
+    <nav>
+      <ul class="list-unstyled nav nav-simple nav-facet">
+        {% for value, active in items %}
+          <li class="nav-item{{ ' active' if active }}"><a href="#">{{ value }}</a></li>
+        {% endfor %}
+      </ul>
+    </nav>
+    <p class="module-footer">
+      <a href="#" class="read-more">Read More</a>
+    </p>
+  {% endwith %}
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/form.html
new file mode 100644
index 0000000..800fa0b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/form.html
@@ -0,0 +1,27 @@
+{% import 'macros/form.html' as form %}
+
+<section class="module">
+  <form class="module-content">
+    {{ form.input('standard', label=_('Standard'), placeholder=_('Standard Input'), value='', error=error, classes=[]) }}
+    {{ form.input('standard', label=_('Medium'), placeholder=_('Medium Width Input'), value='', error=error, classes=['control-medium']) }}
+    {{ form.input('standard', label=_('Full'), placeholder=_('Full Width Input'), value='', error=error, classes=['control-full']) }}
+    {{ form.input('standard', label=_('Large'), placeholder=_('Large Input'), value='', error=error, classes=['control-full', 'control-large']) }}
+    {{ form.prepend('slug', label=_('Prepend'), prepend='prefix', placeholder=_('Prepend Input'), value='', error=error, classes=[]) }}
+    {{ form.custom(
+      names=('custom_key', 'custom_value', 'custom_deleted'),
+      id='field-custom',
+      label=_('Custom Field (empty)'),
+      values=(),
+      error=error ) }}
+    {{ form.custom(
+      names=('custom_key', 'custom_value', 'custom_deleted'),
+      id='field-custom',
+      label=_('Custom Field'),
+      values=('key', 'value', true),
+      error=error ) }}
+    {{ form.markdown('desc', id='field-description', label=_('Markdown'), placeholder='Some nice placeholder text', error=error) }}
+    {{ form.textarea('desc', id='field-description', label=_('Textarea'), placeholder='Some nice placeholder text', error=error) }}
+    {{ form.select('year', label=_('Select'), options=[{'value': 2010}, {'value': 2011}], selected=2011, error=error) }}
+    {{ form.checkbox('remember', label="This is my checkbox", checked=true, error=error) }}
+  </form>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/form_stages.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/form_stages.html
new file mode 100644
index 0000000..409f0f5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/form_stages.html
@@ -0,0 +1,30 @@
+<div class="module">
+  <div class="module-content">
+    {% snippet 'package/snippets/stages.html', stages=['active'] %}
+  </div>
+</div>
+<div class="module">
+  <div class="module-content">
+    {% snippet 'package/snippets/stages.html', stages=['complete', 'active'] %}
+  </div>
+</div>
+<div class="module">
+  <div class="module-content">
+    {% snippet 'package/snippets/stages.html', stages=['complete', 'complete', 'active'] %}
+  </div>
+</div>
+<div class="module">
+  <div class="module-content">
+    {% snippet 'package/snippets/stages.html', stages=['complete', 'active', 'complete'] %}
+  </div>
+</div>
+<div class="module">
+  <div class="module-content">
+    {% snippet 'package/snippets/stages.html', stages=['active', 'complete', 'complete'] %}
+  </div>
+</div>
+<div class="module">
+  <div class="module-content">
+    {% snippet 'package/snippets/stages.html', stages=['active', 'complete'] %}
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/list.html
new file mode 100644
index 0000000..48dbd87
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/list.html
@@ -0,0 +1,14 @@
+<section class="module module-narrow">
+  {% with items=(("First", false), ("Second", true), ("Third", true), ("Fourth", false), ("Last", false)) %}
+    <h1 class="module-heading">{{ heading }}</h1>
+    <nav>
+      <ul class="list-unstyled simple-list">
+        {% for value, active in items %}
+          <li>
+            {% if show_icons %}<i class="fa fa-cog"></i> {% endif %}{{ value }}
+          </li>
+        {% endfor %}
+      </ul>
+    </nav>
+  {% endwith %}
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/media_grid.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/media_grid.html
new file mode 100644
index 0000000..0ef561f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/media_grid.html
@@ -0,0 +1,5 @@
+<section class="module">
+  <div class="module-content">
+    {% snippet 'group/snippets/group_list.html', groups=groups %}
+  </div>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/module.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/module.html
new file mode 100644
index 0000000..bc9c8e1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/module.html
@@ -0,0 +1,21 @@
+{% with classes = classes or [], hn = heading_level or 1 %}
+  <section class="module{{ ' ' ~ classes|join(' ') if classes }}">
+    {% if heading_link %}
+      <h{{ hn }} class="module-heading"><a href="#">{{ heading }}</a></h{{ hn }}>
+    {% elif heading_action %}
+      <h{{ hn }} class="module-heading">{{ heading }}</h{{ hn }}>
+    {% elif heading_icon %}
+      <h{{ hn }} class="module-heading"><i class="fa fa-wrench"></i> {{ heading }}</h{{ hn }}>
+    {% else %}
+      <h{{ hn }} class="module-heading">{{ heading }}</h{{ hn }}>
+    {% endif %}
+    <div class="module-content">
+      {{ lipsum(1) }}
+    </div>
+    {% if footer %}
+      <p class="module-footer">
+        <a class="read-more" href="#">Another Link</a>
+      </p>
+    {% endif %}
+  </section>
+{% endwith %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/nav.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/nav.html
new file mode 100644
index 0000000..da5d917
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/nav.html
@@ -0,0 +1,14 @@
+<section class="module module-narrow">
+  {% with items=(("First", true), ("Second", false), ("Third", true), ("Fourth", false), ("Last", false)) %}
+    <h2 class="module-heading">{{ heading }}</h2>
+    <nav>
+      <ul class="list-unstyled nav nav-simple">
+        {% for value, active in items %}
+          <li class="nav-item{{ ' active' if show_active and active }}">
+            <a href="#">{% if show_icons %}<i class="fa fa-cog"></i> {% endif %}{{ value }}</a>
+          </li>
+        {% endfor %}
+      </ul>
+    </nav>
+  {% endwith %}
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/page_header.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/page_header.html
new file mode 100644
index 0000000..cfc49c9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/page_header.html
@@ -0,0 +1,11 @@
+{% with items=(("First", true), ("Second", false), ("Third", false)) %}
+  <header class="module-content page-header">
+    <ul class="nav nav-tabs">
+      {% for value, active in items %}
+        <li{{ ' class=active' if active }}>
+          <a href="#"><i class="fa fa-cog"></i> {{ value }}</a>
+        </li>
+      {% endfor %}
+    </ul>
+  </header>
+{% endwith %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/pagination.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/pagination.html
new file mode 100644
index 0000000..1a375f0
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/pagination.html
@@ -0,0 +1,11 @@
+<section class="module">
+  <div class="module-content pagination-wrapper">
+    <ul class="pagination">
+      {% if current != 1 %}<li><a href="#page={{ current - 1 }}">«</a></li>{% endif %}
+      {% for index in range(1, total+1) %}
+        <li{% if index == current %} class="active"{% endif %}><a href="#page={{ index }}">{{ index }}</a></li>
+      {% endfor %}
+      {% if current != total %}<li><a href="#page={{ current + 1 }}">»</a></li>{% endif %}
+    </ul>
+  </div>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/simple-input.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/simple-input.html
new file mode 100644
index 0000000..00d4d25
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/development/snippets/simple-input.html
@@ -0,0 +1,4 @@
+<section class="module module-narrow module-shallow simple-input">
+  <h2 class="module-heading"><i class="fa fa-link"></i> Module Narrow Input</h2>
+  <div class="module-content field"><input type="text" class="form-control" value="simple-input" /></div>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/invite_user.txt b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/invite_user.txt
new file mode 100644
index 0000000..d9deffe
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/invite_user.txt
@@ -0,0 +1,19 @@
+{% trans %}
+Dear {{ user_name }},
+
+You have been invited to {{ site_title }}.
+
+A user has already been created for you with the username {{ user_name }}. You can change it later.
+
+You have been added to the {{ group_type }} {{ group_title }} with the following role: {{ role_name }}.
+
+To accept this invite, please reset your password at:
+
+   {{ reset_link }}
+
+
+Have a nice day.
+
+--
+Message sent by {{ site_title }} ({{ site_url }})
+{% endtrans %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/invite_user_subject.txt b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/invite_user_subject.txt
new file mode 100644
index 0000000..1e992c1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/invite_user_subject.txt
@@ -0,0 +1,3 @@
+{% trans %}
+Invite for {{ site_title }}
+{% endtrans %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/reset_password.txt b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/reset_password.txt
new file mode 100644
index 0000000..19936fa
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/reset_password.txt
@@ -0,0 +1,14 @@
+{% trans %}
+Dear {{ user_name }},
+
+You have requested your password on {{ site_title }} to be reset.
+
+Please click the following link to confirm this request:
+
+   {{ reset_link }}
+
+Have a nice day.
+
+--
+Message sent by {{ site_title }} ({{ site_url }})
+{% endtrans %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/reset_password_subject.txt b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/reset_password_subject.txt
new file mode 100644
index 0000000..4a8941c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/emails/reset_password_subject.txt
@@ -0,0 +1,3 @@
+{% trans %}
+Reset your password - {{ site_title }}
+{% endtrans %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/error_document_template.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/error_document_template.html
new file mode 100644
index 0000000..51acb19
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/error_document_template.html
@@ -0,0 +1,31 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ gettext('Error %(error_code)s', error_code=code) }}{% endblock %}
+
+{% block primary %}
+  <article class="module">
+    <div class="module-content">
+      {% if name %}
+      <h1>{{ code }} {{ name }}</h1>
+      {% endif %}
+      {{ content}}
+    </div>
+    {% block login_redirect %}
+    {% if show_login_redirect_link %}
+    <div class="module-content">
+      {{ _("You might need to login to access this page.") }} <a href="{{ h.url_for('user.login') }}">{{ _("Click here to login") }}</a> 
+    </div>
+  {% endif %}
+  {% endblock %}
+  </article>
+{% endblock %}
+
+{% block breadcrumb %}
+{% endblock %}
+
+{% block flash %}
+  {# eat the flash messages caused by the 404 #}
+  {% set flash_messages = h.get_flashed_messages() %}
+{% endblock %}
+
+{% block secondary %}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/footer.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/footer.html
new file mode 100644
index 0000000..f149c21
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/footer.html
@@ -0,0 +1,20 @@
+{% block header_hide_container_content %}
+{% set hideParameter = h.get_request_param('hh', None) %}
+{% set hide = h.get_cookie_value('ckan_hide_header') %}
+<footer class="site-footer-d4science">
+{% if hide=='true' %}
+{# Updated and unified the footer, see #18126 #}
+<div>
+<a href="http://www.gcube-system.org" target="_blank" title="gCube System">gCube</a> Catalogue powered by <a href="http://ckan.org" target="_blank" title="CKAN">CKAN</a>
+&nbsp|&nbsp
+Access this catalogue using the <a href="https://wiki.gcube-system.org/gcube/GCat_Service" target="_blank" title="gCat Service">gCat APIs</a>
+</div>
+{% else %}
+<div>
+<a href="http://www.gcube-system.org" target="_blank" title="gCube System">gCube</a> Catalogue powered by <a href="http://ckan.org" target="_blank" title="CKAN">CKAN</a>
+&nbsp|&nbsp
+Access this catalogue using the <a href="https://wiki.gcube-system.org/gcube/GCat_Service" target="_blank" title="gCat Service">gCat APIs</a>
+</div>
+{% endif %}
+</footer>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/about.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/about.html
new file mode 100644
index 0000000..07461cf
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/about.html
@@ -0,0 +1,16 @@
+{% extends "group/read_base.html" %}
+
+{% block subtitle %}{{ _('About') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h1>{% block page_heading %}{{ group_dict.display_name }}{% endblock %}</h1>
+  {% block group_description %}
+    {% if group_dict.description %}
+      {{ h.render_markdown(group_dict.description) }}
+  	{% endif %}
+  {% endblock %}
+
+  {% block group_extras %}
+    {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(group_dict.extras) %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/admins.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/admins.html
new file mode 100644
index 0000000..ee98a8a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/admins.html
@@ -0,0 +1,10 @@
+{% extends "group/read_base.html" %}
+
+{% block subtitle %}{{ _('Administrators') }} {{ g.template_title_delimiter }} {{ group_dict.title or group_dict.name }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ _('Administrators') }}{% endblock %}</h1>
+  {% block admins_list %}
+    {% snippet "user/snippets/followers.html", followers=admins %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/base_form_page.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/base_form_page.html
new file mode 100644
index 0000000..5dea2ef
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/base_form_page.html
@@ -0,0 +1,13 @@
+{% extends "group/edit_base.html" %}
+
+
+{% block primary_content_inner %}
+  <h1 class="{% block page_heading_class %}page-heading{% endblock %}">
+    {% block page_heading %}
+      {{ h.humanize_entity_type('group', group_type, 'form label') or _('Group Form'), }}
+    {% endblock %}
+  </h1>
+  {% block form %}
+    {{ form | safe }}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/confirm_delete.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/confirm_delete.html
new file mode 100644
index 0000000..8c4b2e6
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/confirm_delete.html
@@ -0,0 +1,22 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete group - {name}?').format(name=group_dict.name) }}</p>
+        <p class="form-actions">
+          <form id="group-confirm-delete-form" action="{% url_for group_type+'.delete', id=group_dict.name %}" method="post">
+            {{ h.csrf_input() }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/confirm_delete_member.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/confirm_delete_member.html
new file mode 100644
index 0000000..4f31781
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/confirm_delete_member.html
@@ -0,0 +1,23 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete member - {name}?').format(name=user_dict.name) }}</p>
+        <p class="form-actions">
+          <form action="{% url_for group_type+'.member_delete', id=group_id %}" method="post">
+            {{ h.csrf_input() }} 
+            <input type="hidden" name="user" value="{{ user_id }}" />
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/edit.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/edit.html
new file mode 100644
index 0000000..31dcd29
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/edit.html
@@ -0,0 +1,12 @@
+{% extends "group/base_form_page.html" %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for h.humanize_entity_type('group', group_type, 'breadcrumb') or _('Groups'), named_route=group_type+'.index' %}</li>
+  {% block breadcrumb_content_inner %}
+    <li>{% link_for group.display_name|truncate(35), named_route=group_type+'.read', id=group.name, title=group.display_name %}</li>
+    <li class="active">{% link_for _('Manage'), named_route=group_type+'.edit', id=group.name %}</li>
+  {% endblock %}
+{% endblock %}
+
+{% block page_heading_class %}hide-heading{% endblock %}
+{% block page_heading %}{{ h.humanize_entity_type('group', group_type, 'edit label') or _('Edit Group') }}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/edit_base.html
new file mode 100644
index 0000000..ec92493
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/edit_base.html
@@ -0,0 +1,19 @@
+{% extends "page.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block subtitle %}{{ _('Manage') }} {{ g.template_title_delimiter }} {{ group_dict.display_name }} {{ g.template_title_delimiter }} {{ h.humanize_entity_type('group', group_type, 'page title') or _('Groups') }}{% endblock %}
+
+{% set group = group_dict %}
+
+{% block content_action %}
+  {% link_for _('View'), named_route=group_type+'.read', id=group_dict.name, class_='btn btn-default', icon='eye' %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(group_type + '.edit', _('Edit'), id=group_dict.name, icon='pencil-square') }}
+  {{ h.build_nav_icon(group_type + '.members', _('Members'), id=group_dict.name, icon='users') }}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "group/snippets/info.html", group=group_dict, show_nums=false %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/followers.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/followers.html
new file mode 100644
index 0000000..c51255c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/followers.html
@@ -0,0 +1,10 @@
+{% extends "group/read_base.html" %}
+
+{% block subtitle %}{{ _('Followers') }} {{ g.template_title_delimiter }} {{ group_dict.title or group_dict.name }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ _('Followers') }}{% endblock %}</h1>
+  {% block followers_list %}
+    {% snippet "user/snippets/followers.html", followers=followers %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/index.html
new file mode 100644
index 0000000..1501bc8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/index.html
@@ -0,0 +1,44 @@
+{% extends "page.html" %}
+
+
+{% block subtitle %}{{ h.humanize_entity_type('group', group_type, 'page title') or _('Groups') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for h.humanize_entity_type('group', group_type, 'breadcrumb') or _('Groups'), named_route=group_type+'.index' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('group_create') %}
+    {% link_for h.humanize_entity_type('group', group_type, 'add link') or _('Add Group'), named_route=group_type+'.new', class_='btn btn-primary', icon='plus-square' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{{ h.humanize_entity_type('group', group_type, 'page title') or _('Groups') }}</h1>
+  {% block groups_search_form %}
+    {% snippet 'snippets/search_form.html', form_id='group-search-form', type=group_type, query=q, sorting_selected=sort_by_selected, count=page.item_count, placeholder=h.humanize_entity_type('group', group_type, 'search placeholder') or _('Search groups...'), show_empty=request.args, no_bottom_border=true if page.items, sorting = [(_('Name Ascending'), 'title asc'), (_('Name Descending'), 'title desc')] %}
+  {% endblock %}
+  {% block groups_list %}
+    {% if page.items or request.args %}
+      {% if page.items %}
+        {% snippet "group/snippets/group_list.html", groups=page.items %}
+      {% endif %}
+    {% else %}
+      <p class="empty">
+        {{ h.humanize_entity_type('group', group_type, 'no any objects') or _('There are currently no groups for this site') }}.
+        {% if h.check_access('group_create') %}
+          {% link_for _('How about creating one?'), named_route=group_type+'.new' %}</a>.
+        {% endif %}
+      </p>
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ page.pager(q=q or '', sort=sort_by_selected or '') }}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "group/snippets/helper.html", group_type=group_type %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/member_new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/member_new.html
new file mode 100644
index 0000000..3234f71
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/member_new.html
@@ -0,0 +1,101 @@
+{% extends "group/edit_base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% set user = user_dict %}
+
+{% block primary_content_inner %}
+  {% link_for _('Back to all members'), named_route=group_type+'.members', id=group.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  <h1 class="page-heading">
+    {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
+  </h1>
+  {% block form %}
+  <form class="dataset-form add-member-form" method='post' id="add-member-form">
+    {{ h.csrf_input() }}
+    <div class="row">
+      <div class="col-md-5">
+        <div class="form-group control-medium">
+          {% if not user %}
+            <label class="form-label" for="username">
+              {{ _('Existing User') }}
+            </label>
+            <p>
+              {{ _('If you wish to add an existing user, search for their username below.') }}
+            </p>
+          {% endif %}
+          <div class="controls">
+            {% if user %}
+              <input type="hidden" name="username" value="{{ user.name }}" />
+              <input id="username" name="username" type="text" value="{{ user.name }}"
+              disabled="True" class="form-control control-medium">
+            {% else %}
+              <input id="username" type="text" name="username" placeholder="Username"
+              value="" class="control-medium" data-module="autocomplete"
+              data-module-source="/api/2/util/user/autocomplete?ignore_self=true&q=?">
+            {% endif %}
+          </div>
+        </div>
+      </div>
+      {% if not user %}
+      <div class="col-md-2 add-member-or-wrap">
+        <div class="add-member-or">
+          {{ _('or') }}
+        </div>
+      </div>
+      <div class="col-md-5">
+        <div class="form-group control-medium">
+          <label class="form-label" for="email">
+            {{ _('New User') }}
+          </label>
+          <p>
+            {{ _('If you wish to invite a new user, enter their email address.') }}
+          </p>
+          <div class="controls">
+            <input id="email" type="text" name="email" placeholder="Email address" class="form-control">
+          </div>
+        </div>
+      </div>
+      {% endif %}
+    </div>
+
+    {% if user and user.name == c.user and user_role == 'admin' %}
+      {% set format_attrs = {'data-module': 'autocomplete', 'disabled': 'disabled'} %}
+      {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
+      {{ form.hidden('role', value=user_role) }}
+    {% else %}
+      {% set format_attrs = {'data-module': 'autocomplete'} %}
+      {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
+    {% endif %}
+
+    <div class="form-actions">
+      {% if user %}
+        <a href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user.id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
+        <button class="btn btn-primary" type="submit" name="submit" >
+          {{ _('Save') }}
+        </button>
+      {% else %}
+        <button class="btn btn-primary" type="submit" name="submit" >
+          {{ _('Add Member') }}
+        </button>
+      {% endif %}
+    </div>
+  </form>
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {{ super() }}
+  <div class="module module-narrow module-shallow">
+    <h2 class="module-heading">
+      <i class="fa fa-lg fa-info-circle"></i>
+      {{ _('What are roles?') }}
+    </h2>
+    <div class="module-content">
+      {% trans %}
+         <p><strong>Admin:</strong> Can edit group information, as well as
+           manage organization members.</p>
+         <p><strong>Member:</strong> Can add/remove datasets from groups</p>
+      {% endtrans %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/members.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/members.html
new file mode 100644
index 0000000..31d09ef
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/members.html
@@ -0,0 +1,38 @@
+{% extends "group/edit_base.html" %}
+
+{% block subtitle %}{{ _('Members') }} {{ g.template_title_delimiter }} {{ group_dict.display_name }} {{ g.template_title_delimiter }} {{ h.humanize_entity_type('group', group_type, 'page title') or _('Groups') }}{% endblock %}
+
+{% block page_primary_action %}
+  {% link_for _('Add Member'), named_route=group_type+'.member_new', id=group_dict.id, class_='btn btn-primary', icon='plus-square' %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h3 class="page-heading">{{ _('{0} members'.format(members|length)) }}</h3>
+  <table class="table table-header table-hover table-bordered" id="member-table">
+    <thead>
+      <tr>
+        <th>{{ _('User') }}</th>
+        <th>{{ _('Role') }}</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for user_id, user, role in members %}
+      <tr>
+        <td class="media">
+          {{ h.linked_user(user_id, maxlength=20) }}
+        </td>
+        <td>{{ role }}</td>
+        <td>
+          <div class="btn-group pull-right">
+            <a class="btn btn-default btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" title="{{ _('Edit') }}">
+              <i class="fa fa-wrench"></i>
+            </a>
+            <a class="btn btn-danger btn-sm" href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
+          </div>
+        </td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/new.html
new file mode 100644
index 0000000..69230a3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/new.html
@@ -0,0 +1,25 @@
+{% extends "group/base_form_page.html" %}
+
+{% set label = h.humanize_entity_type('group', group_type, 'create title') or _('Create a Group') %}
+
+
+{% block subtitle %}{{ label }}{% endblock %}
+
+{% block page_heading %}{{ label }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{{ h.nav_link(
+        h.humanize_entity_type('group', group_type, 'breadcrumb') or _('Groups'),
+        named_route=group_type+'.index') }}</li>
+  <li class="active">
+    {{ h.nav_link(
+        label,
+        named_route=group_type~'.new') }}
+  </li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "group/snippets/helper.html", group_type=group_type %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/new_group_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/new_group_form.html
new file mode 100644
index 0000000..7fb4ccd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/new_group_form.html
@@ -0,0 +1,25 @@
+{% extends "group/snippets/group_form.html" %}
+
+{#
+  As the form is rendered as a seperate page we take advantage of this by
+  overriding the form blocks depending on the current context
+  #}
+{% block dataset_fields %}
+  {% if action == "edit" %}{{ super() }}{% endif %}
+{% endblock %}
+
+{% block custom_fields %}
+  {% if action == "edit" %}{{ super() }}{% endif %}
+{% endblock %}
+
+{% block save_text %}
+  {%- if action == "edit" -%}
+    {{ h.humanize_entity_type('group', group_type, 'update label') or _('Update Group') }}
+  {%- else -%}
+    {{ h.humanize_entity_type('group', group_type, 'create label') or _('Create Group') }}
+  {%- endif -%}
+{% endblock %}
+
+{% block delete_button %}
+  {% if action == "edit" %}{{ super() }}{% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/read.html
new file mode 100644
index 0000000..ff69aa7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/read.html
@@ -0,0 +1,42 @@
+{% extends "group/read_base.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block primary_content_inner %}
+  {% block groups_search_form %}
+    {% set facets = {
+      'fields': fields_grouped,
+      'search': search_facets,
+      'titles': facet_titles,
+      'translated_fields': translated_fields,
+      'remove_field': remove_field }
+    %}
+    {% set sorting = [
+      (_('Relevance'), 'score desc, metadata_modified desc'),
+      (_('Name Ascending'), 'title_string asc'),
+      (_('Name Descending'), 'title_string desc'),
+      (_('Last Modified'), 'metadata_modified desc'),
+      (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+    %}
+    {% snippet 'snippets/search_form.html', form_id='group-datasets-search-form', type=dataset_type, query=q, sorting=sorting, sorting_selected=sort_by_selected, count=page.item_count, facets=facets, placeholder=h.humanize_entity_type('package', dataset_type, 'search placeholder') or _('Search datasets...'), show_empty=request.args, fields=fields %}
+  {% endblock %}
+  {% block packages_list %}
+    {% if page.items %}
+      {{ h.snippet('snippets/package_list.html', packages=page.items) }}
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ page.pager(q=q) }}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {{ super() }}
+  <div class="filters">
+    <div>
+      {% for facet in facet_titles %}
+        {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id}, search_facets=search_facets) }}
+      {% endfor %}
+    </div>
+    <a class="close no-text hide-filters"><i class="fa fa-times-circle"></i><span class="text">close</span></a>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/read_base.html
new file mode 100644
index 0000000..75c869b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/read_base.html
@@ -0,0 +1,29 @@
+{% extends "page.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block subtitle %}{{ group_dict.display_name }} {{ g.template_title_delimiter }} {{ h.humanize_entity_type('group', group_type, 'page title') or _('Groups') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for h.humanize_entity_type('group', group_type, 'breadcrumb') or _('Groups'), named_route=group_type+'.index' %}</li>
+  <li class="active">{% link_for group_dict.display_name|truncate(35), named_route=group_type+'.read', id=group_dict.name, title=group_dict.display_name %}</li>
+{% endblock %}
+
+{% block content_action %}
+  {% if h.check_access('group_update', {'id': group_dict.id}) %}
+    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-default', icon='wrench' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(group_type + '.read', h.humanize_entity_type('package', dataset_type, 'content tab') or _('Datasets'), id=group_dict.name, icon='sitemap') }}
+  {{ h.build_nav_icon(group_type + '.about', _('About'), id=group_dict.name, icon='info-circle') }}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "group/snippets/info.html", group=group_dict, show_nums=true %}
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "group/snippets/feeds.html" %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/feeds.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/feeds.html
new file mode 100644
index 0000000..26de3a6
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/feeds.html
@@ -0,0 +1,2 @@
+{%- set dataset_feed = h.url_for('feeds.group', id=group_dict.name) -%}
+<link rel="alternate" type="application/atom+xml" title="{{ g.site_title }} - {{ _('Datasets in group: {group}').format(group=group_dict.display_name) }}" href="{{ dataset_feed }}" />
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_form.html
new file mode 100644
index 0000000..2e752b5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_form.html
@@ -0,0 +1,45 @@
+{% import 'macros/form.html' as form %}
+
+
+<form id="group-edit" class="dataset-form" method="post" data-module="basic-form" enctype="multipart/form-data">
+  {{ h.csrf_input() }} 
+  {% block error_summary %}
+    {{ form.errors(error_summary) }}
+  {% endblock %}
+
+  {% block basic_fields %}
+    {% set attrs = {'data-module': 'slug-preview-target', 'class': 'form-control'} %}
+    {{ form.input('title', label=_('Name'), id='field-name', placeholder=h.humanize_entity_type('group', group_type, 'name placeholder') or _('My Group'), value=data.title, error=errors.title, classes=['control-full'], attrs=attrs) }}
+
+    {# Perhaps these should be moved into the controller? #}
+    {% set prefix = h.url_for(group_type + '.read', id='') %}
+    {% set domain = h.url_for(group_type + '.read', id='', qualified=true) %}
+    {% set domain = domain|replace("http://", "")|replace("https://", "") %}
+    {% set attrs = {'data-module': 'slug-preview-slug', 'class': 'form-control input-sm', 'data-module-prefix': domain, 'data-module-placeholder': '<' + group_type + '>'} %}
+
+    {{ form.prepend('name', label=_('URL'), prepend=prefix, id='field-url', placeholder=_('my-' + group_type), value=data.name, error=errors.name, attrs=attrs, is_required=true) }}
+
+    {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=h.humanize_entity_type('group', group_type, 'description placeholder') or _('A little information about my group...'), value=data.description, error=errors.description) }}
+
+    {% set is_upload = data.image_url and not data.image_url.startswith('http') %}
+    {% set is_url = data.image_url and data.image_url.startswith('http') %}
+
+    {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload) }}
+
+  {% endblock %}
+
+  {% block custom_fields %}
+    {% snippet 'snippets/custom_form_fields.html', extras=data.extras, errors=errors, limit=3 %}
+  {% endblock %}
+
+  {{ form.required_message() }}
+
+  <div class="form-actions">
+    {% block delete_button %}
+      {% if h.check_access('group_delete', {'id': data.id})  %}
+        <a class="btn btn-danger pull-left" href="{% url_for group_type+'.delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ h.humanize_entity_type('group', group_type, 'delete confirmation') or _('Are you sure you want to delete this Group?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+      {% endif %}
+    {% endblock %}
+    <button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ h.humanize_entity_type('group', group_type, 'save label') or _('Save Group') }}{% endblock %}</button>
+  </div>
+</form>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_item.html
new file mode 100644
index 0000000..1908ca6
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_item.html
@@ -0,0 +1,50 @@
+{#
+Renders a media item for a group. This should be used in a list.
+
+group - A group dict.
+
+Example:
+
+    <ul class="media-grid">
+      {% for group in groups %}
+        {% snippet "group/snippets/group_item.html", group=group %}
+      {% endfor %}
+    </ul>
+#}
+{% set type = group.type or 'group' %}
+{% set url = h.url_for(type ~ '.read', id=group.name) %}
+{% block item %}
+<li class="media-item">
+  {% block item_inner %}
+  {% block image %}
+    <img src="{{ group.image_display_url or h.url_for_static('/base/images/placeholder-group.png') }}" alt="{{ group.name }}" class="media-image img-fluid">
+  {% endblock %}
+  {% block title %}
+    <h2 class="media-heading">{{ group.display_name }}</h2>
+  {% endblock %}
+  {% block description %}
+    {% if group.description %}
+      <p class="media-description">{{ h.markdown_extract(group.description, extract_length=80) }}</p>
+    {% endif %}
+  {% endblock %}
+  {% block datasets %}
+    {% if group.package_count %}
+      <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', group.package_count).format(num=group.package_count) }}</strong>
+    {% elif group.package_count == 0 %}
+      <span class="count">{{ _('0 Datasets') }}</span>
+    {% endif %}
+  {% endblock %}
+  {% block link %}
+  <a href="{{ url }}" title="{{ _('View {name}').format(name=group.display_name) }}" class="media-view">
+    <span>{{ _('View {name}').format(name=group.display_name) }}</span>
+  </a>
+  {% endblock %}
+  {% if group.user_member %}
+    <input name="group_remove.{{ group.id }}" value="{{ _('Remove') }}" type="submit" class="btn btn-danger btn-sm media-edit" title="{{ _('Remove dataset from this group') }}"/>
+  {% endif %}
+  {% endblock %}
+</li>
+{% endblock %}
+{% if position is divisibleby 3 %}
+  <li class="clearfix js-hide"></li>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_list.html
new file mode 100644
index 0000000..d171296
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/group_list.html
@@ -0,0 +1,19 @@
+{#
+Display a grid of group items.
+
+groups - A list of groups.
+
+Example:
+
+    {% snippet "group/snippets/group_list.html" %}
+
+#}
+{% block group_list %}
+<ul class="media-grid" data-module="media-grid">
+	{% block group_list_inner %}
+  {% for group in groups %}
+    {% snippet "group/snippets/group_item.html", group=group, position=loop.index %}
+  {% endfor %}
+  {% endblock %}
+</ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/helper.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/helper.html
new file mode 100644
index 0000000..7061646
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/helper.html
@@ -0,0 +1,27 @@
+{#
+  Displays a sidebard module with information about group.
+
+  group_type    - The type of group.
+
+  Example:
+
+  {% snippet "group/snippets/helper.html", group_type=group_type %}
+
+  #}
+
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="fa fa-info-circle"></i>
+    {{ _('What are Groups?') }}
+  </h2>
+  <div class="module-content">
+    <p>
+      {% trans %}
+        You can use CKAN Groups to create and manage collections of datasets.
+        This could be to catalogue datasets for a particular project or team,
+        or on a particular theme, or as a very simple way to help people find
+        and search your own published datasets.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/info.html
new file mode 100644
index 0000000..5916124
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/group/snippets/info.html
@@ -0,0 +1,54 @@
+{% set dataset_type = h.default_package_type() %}
+
+{% block info %}
+<div class="module context-info">
+  <section class="module-content">
+    {% block inner %}
+    {% block image %}
+    <div class="image">
+      <a href="{{ group.url }}">
+        <img src="{{ group.image_display_url or h.url_for_static('/base/images/placeholder-group.png') }}" width="190" height="118" alt="{{ group.name }}" />
+      </a>
+    </div>
+    {% endblock %}
+    {% block heading %}
+    <h1 class="heading">
+      {{ group.display_name }}
+      {% if group.state == 'deleted' %}
+        [{{ _('Deleted') }}]
+      {% endif %}
+    </h1>
+    {% endblock %}
+    {% block description %}
+    {% if group.description %}
+      <p class="description">
+        {{ h.markdown_extract(group.description, 180) }}
+      </p>
+      <p class="read-more">
+        {% link_for _('read more'), named_route='group.about', id=group.name %}
+      </p>
+    {% endif %}
+    {% endblock %}
+    {% if show_nums %}
+      {% block nums %}
+      <div class="nums">
+        <dl>
+          <dt>{{ _('Followers') }}</dt>
+          <dd data-module="followers-counter" data-module-id="{{ group.id }}" data-module-num_followers="{{ group.num_followers }}">{{ h.SI_number_span(group.num_followers) }}</dd>
+        </dl>
+        <dl>
+          <dt>{{ h.humanize_entity_type('package', dataset_type, 'facet label') or _('Datasets') }}</dt>
+          <dd>{{ h.SI_number_span(group.package_count) }}</dd>
+        </dl>
+      </div>
+      {% endblock %}
+      {% block follow %}
+      <div class="follow_button">
+        {{ h.follow_button('group', group.id) }}
+      </div>
+      {% endblock %}
+    {% endif %}
+    {% endblock %}
+  </section>
+</div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/header.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/header.html
new file mode 100644
index 0000000..b3b1f17
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/header.html
@@ -0,0 +1,123 @@
+{% set dataset_type = h.default_package_type() %}
+
+{% block header_wrapper %} {% block header_account %}
+<div class="account-masthead">
+  <div class="container">
+    {% block header_account_container_content %} {% if c.userobj %}
+    <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+      <ul class="list-unstyled">
+        {% block header_account_logged %} {% if c.userobj.sysadmin %}
+        <li>
+          <a href="{{ h.url_for('admin.index') }}" title="{{ _('Sysadmin settings') }}">
+            <i class="fa fa-gavel" aria-hidden="true"></i>
+            <span class="text">{{ _('Admin') }}</span>
+          </a>
+        </li>
+        {% endif %}
+        {% block header_account_profile %}
+        <li>
+          <a href="{{ h.url_for('user.read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+            {{ h.user_image((c.user if c and c.user else ''), size=22) }}
+            <span class="username">{{ c.userobj.display_name }}</span>
+          </a>
+        </li>
+        {% endblock %}
+        {% block header_dashboard %}
+          <li>
+            <a href="{{ h.url_for('dashboard.datasets') }}" title="{{ _("View dashboard") }}">
+              <i class="fa fa-tachometer" aria-hidden="true"></i>
+              <span class="text">{{ _('Dashboard') }}</span>
+            </a>
+          </li>
+        {% endblock %}
+        {% block header_account_settings_link %}
+        <li>
+          <a href="{{ h.url_for('user.edit', id=c.userobj.name) }}" title="{{ _('Profile settings') }}">
+            <i class="fa fa-cog" aria-hidden="true"></i>
+            <span class="text">{{ _('Profile settings') }}</span>
+          </a>
+        </li>
+        {% endblock %} {% block header_account_log_out_link %}
+        <li>
+          <a href="{{ h.url_for('user.logout') }}" title="{{ _('Log out') }}">
+            <i class="fa fa-sign-out" aria-hidden="true"></i>
+            <span class="text">{{ _('Log out') }}</span>
+          </a>
+        </li>
+        {% endblock %} {% endblock %}
+      </ul>
+    </div>
+    {% else %}
+    <nav class="account not-authed" aria-label="{{ _('Account') }}">
+      <ul class="list-unstyled">
+        {% block header_account_notlogged %}
+        <li>{% link_for _('Log in'), named_route='user.login' %}</li>
+        {% if h.check_access('user_create') %}
+        <li>{% link_for _('Register'), named_route='user.register', class_='sub' %}</li>
+        {% endif %} {% endblock %}
+      </ul>
+    </nav>
+    {% endif %} {% endblock %}
+  </div>
+</div>
+{% endblock %}
+<header class="masthead">
+  <div class="container">
+    {% block header_debug %} {% if g.debug and not g.debug_supress_header %}
+    <div class="debug">Blueprint : {{ g.blueprint }}<br />View : {{ g.view }}</div>
+    {% endif %} {% endblock %}
+    <nav class="navbar navbar-expand-lg navbar-light">
+      <hgroup class="{{ g.header_class }} navbar-left">
+
+      {% block header_logo %}
+      {% if g.site_logo %}
+      <a class="logo" href="{{ h.url_for('home.index') }}">
+        <img src="{{ h.url_for_static_or_external(g.site_logo) }}" alt="{{ g.site_title }}"
+          title="{{ g.site_title }}" />
+      </a>
+      {% else %}
+      <h1>
+        <a href="{{ h.url_for('home.index') }}">{{ g.site_title }}</a>
+      </h1>
+      {% if g.site_description %}
+      <h2>{{ g.site_description }}</h2>
+      {% endif %}
+      {% endif %}
+      {% endblock %}
+
+       </hgroup>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navigation-toggle"
+        aria-controls="main-navigation-toggle" aria-expanded="false" aria-label="{{ _('Toggle navigation') }}">
+        <span class="fa fa-bars text-white"></span>
+      </button>
+
+      <div class="main-navbar collapse navbar-collapse" id="main-navigation-toggle">
+        <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
+          {% block header_site_navigation %}
+            {% block header_site_navigation_tabs %}
+              {% set org_type = h.default_group_type('organization') %}
+              {% set group_type = h.default_group_type('group') %}
+
+		          {{ h.build_nav_main(
+		            (dataset_type ~ '.search', h.humanize_entity_type('package', dataset_type, 'main nav') or _('Datasets'), ["dataset", "resource"]),
+		            (org_type ~ '.index',
+                  h.humanize_entity_type('organization', org_type, 'main nav') or _('Organizations'), ['organization']),
+		            (group_type ~ '.index',
+                  h.humanize_entity_type('group', group_type, 'main nav') or _('Groups'), ['group']),
+		            ('home.about', _('About')) ) }}
+	          {% endblock %}
+          </ul>
+
+      {% endblock %}
+      {% block header_site_search %}
+          <form class="d-flex site-search" action="{% url_for dataset_type ~ '.search' %}" method="get">
+              <label class="d-none" for="field-sitewide-search">{% block header_site_search_label %}{{ h.humanize_entity_type('package', dataset_type, 'search_placeholder') or _('Search Datasets...') }}{% endblock %}</label>
+              <input id="field-sitewide-search" class="form-control me-2"  type="text" name="q" placeholder="{{ _('Search') }}" aria-label="{{ h.humanize_entity_type('package', dataset_type, 'search_placeholder') or _('Search datasets...') }}"/>
+              <button class="btn" type="submit" aria-label="{{ _('Submit') }}"><i class="fa fa-search"></i></button>
+          </form>
+      {% endblock %}
+      </div>
+    </nav>
+  </div>
+</header>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/about.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/about.html
new file mode 100644
index 0000000..8ed25d8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/about.html
@@ -0,0 +1,24 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('About') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('About'), named_route='home.about' %}</li>
+{% endblock %}
+
+{% block primary %}
+  <article class="module" role="main">
+    <div class="module-content">
+      {% block about %}
+        {% if g.site_about %}
+          {{ h.render_markdown(g.site_about) }}
+        {% else %}
+          <h1 class="page-heading">{{ _('About') }}</h1>
+          {% snippet 'home/snippets/about_text.html' %}
+        {% endif %}
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block secondary %}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/index.html
new file mode 100644
index 0000000..c14d4e0
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/index.html
@@ -0,0 +1,18 @@
+{% extends "page.html" %}
+{% set homepage_style = ( g.homepage_style or '1' ) %}
+
+{% block subtitle %}{{ _("Welcome") }}{% endblock %}
+
+{% block maintag %}{% endblock %}
+{% block toolbar %}{% endblock %}
+
+{% block content %}
+  <div class="homepage layout-{{ homepage_style }}">
+    <div id="content" class="container">
+      {{ self.flash() }}
+    </div>
+    {% block primary_content %}
+      {% snippet "home/layout{0}.html".format(homepage_style), search_facets=search_facets %}
+    {% endblock %}
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/layout1.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/layout1.html
new file mode 100644
index 0000000..840f03a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/layout1.html
@@ -0,0 +1,106 @@
+<!--Added by Francesco Mangiacrapa-->
+<script src="d4s_tagcloud.js"></script>
+
+
+<div role="main">
+  <div class="container">
+    <div class="row">
+        {% block promoted %}
+          {% snippet 'home/snippets/promoted.html' %}
+        {% endblock %}
+    </div>
+  </div>
+</div>
+
+<div role="main" class="hero">
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-6">
+        {% block search %}
+          {% snippet 'home/snippets/search.html' %}
+        {% endblock %}
+      </div>
+     <div class="col-sm-6">
+       {% block stats %}
+          {% snippet 'home/snippets/stats.html' %}
+        {% endblock %}
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<!--{#
+<div role="main" class="hero">
+  <div class="container">
+  <h3>Search for Organisations</h3>
+  <div class="row row1">
+  </div>
+  <div>
+</div>
+#} -->
+
+
+{% block search_for_organizations %}
+{# Added by Francesco Mangiacrapa, see: #8964 #}
+	<script type="text/javascript" >
+	
+	showBreadcrumbIntoSession = function () {
+		CKAN_D4S_Breadcrumb_Manager.setSessionStorageItem("showbreadcrumb", "true");
+		CKAN_D4S_Breadcrumb_Manager.checkBreadcrumbShow();
+	}
+	
+	if(window.addEventListener){
+		window.addEventListener('load', showBreadcrumbIntoSession)
+	}else{
+		window.attachEvent('onload', showBreadcrumbIntoSession)
+	}
+	</script>
+
+	{% snippet 'home/snippets/search_for_organisations.html' %}
+{% endblock %}
+
+{% block search_for_groups %}
+   {% snippet 'home/snippets/search_for_groups.html' %}
+{% endblock %}
+
+{% block search_for_types %}
+   {% snippet 'home/snippets/search_for_types.html' %}
+{% endblock %}
+
+<!-- ADD THE SNIPPET 'home/snippets/search_for_location.html' TO ACTIVE BROWSE BY BBOX -->
+{# 	
+ {% block search_for_location %}
+	{% snippet 'home/snippets/search_for_location.html' %}
+ {% endblock %}
+
+#}
+
+<div class="hero home-popular">
+  <div class="container">
+    <div class="row row-1">
+        {% block popular_formats %}
+          {% snippet 'home/snippets/popular_formats.html' %}
+        {% endblock %}
+    </div>
+    <div  class="row row-2">
+       {% block popular_tags %}
+          {% snippet 'home/snippets/popular_tags.html' %}
+        {% endblock %}
+    </div>
+    <!-- {#{% block recent_activity %}
+      <!-- Added by Francesco Mangiacrapa. see: #6572 -->
+      {% if c.userobj and c.userobj.sysadmin %}
+      <div class="box">
+        <header class="module-heading">
+        <h3>Recent activity</h3>
+        </header>
+        <div class="module-content">
+          {{ h.recently_changed_packages_activity_stream(limit=4) }}
+        </div>
+        </div>
+        {%endif%}
+    {% endblock %} #} -->
+  </div>
+</div>
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/robots.txt b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/robots.txt
new file mode 100644
index 0000000..ca60362
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/robots.txt
@@ -0,0 +1,12 @@
+User-agent: *
+{% block all_user_agents -%}
+Disallow: /dataset/rate/
+Disallow: /revision/
+Disallow: /dataset/*/history
+Disallow: /api/
+Crawl-Delay: 10
+{%- endblock %}
+
+{% block additional_user_agents -%}
+{%- endblock %}
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/about_text.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/about_text.html
new file mode 100644
index 0000000..21deb89
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/about_text.html
@@ -0,0 +1,20 @@
+{% trans %}
+<p>CKAN is the world’s leading open-source data portal platform.</p>
+
+<p>CKAN is a complete out-of-the-box software solution that makes data
+accessible and usable – by providing tools to streamline publishing, sharing,
+finding and using data (including storage of data and provision of robust data
+APIs). CKAN is aimed at data publishers (national and regional governments,
+companies and organizations) wanting to make their data open and available.</p>
+
+<p>CKAN is used by governments and user groups worldwide and powers a variety
+of official and community data portals including portals for local, national
+and international government, such as the UK’s <a href="https://data.gov.uk">data.gov.uk</a> and the
+United States <a href="https://catalog.data.gov/">catalog.data.gov</a>, the Brazilian <a href="https://dados.gov.br/">dados.gov.br</a>, Dutch and
+Netherland government portals, as well as city and municipal sites in the US,
+UK, Argentina, Finland and elsewhere.</p>
+
+<p>CKAN: <a href="https://ckan.org/">https://ckan.org/</a><br />
+CKAN Showcases: <a href="https://ckan.org/showcase">https://ckan.org/showcase</a><br />
+Features overview: <a href="https://ckan.org/features/">https://ckan.org/features/</a></p>
+{% endtrans %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/featured_group.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/featured_group.html
new file mode 100644
index 0000000..f411c1e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/featured_group.html
@@ -0,0 +1,7 @@
+{% set groups = h.get_featured_groups() %}
+
+{% for group in groups %}
+  <div class="card box">
+    {% snippet 'snippets/group_item.html', group=group %}
+  </div>
+{% endfor %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/featured_organization.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/featured_organization.html
new file mode 100644
index 0000000..d13d18e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/featured_organization.html
@@ -0,0 +1,7 @@
+{% set organizations = h.get_featured_organizations() %}
+
+{% for organization in organizations %}
+  <div class="box">
+    {% snippet 'snippets/organization_item.html', organization=organization %}
+  </div>
+{% endfor %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/popular_formats.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/popular_formats.html
new file mode 100644
index 0000000..d35306a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/popular_formats.html
@@ -0,0 +1,27 @@
+{% set formats = h.get_facet_items_dict('res_format', limit=30) %}
+<style>
+#pop-formats {
+	 line-height: 1.3;
+    padding: 5px 15px 10px;
+    word-break: break-all;
+}
+
+#pop-formats a + a{
+	margin-left: 5px;
+}
+</style>
+<div>
+      <h3 style="padding-left: 15px;">Popular Formats</h3>
+		  		<div id="pop-formats">
+		  		  
+    				{% for tag in formats %}
+					{% set weight = 30 - loop.index %}
+      				<a href="{% url_for controller='dataset', action='search', res_format=tag.name %}" rel={{weight}}>{{ h.truncate(tag.display_name, 26) }}</a>
+    				{% endfor %}
+  				</div>
+</div>
+     	  	
+<script type="text/javascript" >
+loadCloud('pop-formats','#33cccc','#003366')
+//loadCloud('pop-formats')
+</script>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/popular_tags.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/popular_tags.html
new file mode 100644
index 0000000..585e55e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/popular_tags.html
@@ -0,0 +1,30 @@
+{% set tags = h.get_facet_items_dict('tags', c.search_facets, limit=3) %}
+
+<style>
+#pop-tags {
+    line-height: 1.3;
+    padding: 5px 15px 10px;
+    word-break: break-all;
+}
+
+#pop-tags a + a {
+    margin-left: 5px;
+}
+</style>
+<div>
+    <h3 style="padding-left: 15px;">{{ _('Popular Tags') }}</h3>
+    <div id="pop-tags">
+        {% for tag in tags %}
+            {% set weight = 30 - loop.index %}
+            <a href="{{ h.url_for('dataset.search', tags=tag['name']) }}" rel="{{ weight }}">{{ h.truncate(tag['display_name'], 26) }}</a>
+        {% endfor %}
+    </div>
+    <p style="float: right; margin-bottom: 15px;">
+        <a href="/tags">See All {{_('Tags')}}</a>
+    </p>
+</div>
+
+<script type="text/javascript">
+loadCloud('pop-tags','#99ccff', '#003399')
+</script>
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/promoted.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/promoted.html
new file mode 100644
index 0000000..ab4dcd3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/promoted.html
@@ -0,0 +1,27 @@
+{% set intro = g.site_intro_text %}
+
+<div class="module-content box">
+ 	<header>
+    {% if intro %}
+      {{ h.render_markdown(intro) }}
+    {% else %}
+       {% block home_image %}
+    <section class='featured media-overlay hidden-phone'>
+      {% block home_image_content %}
+        <a class="media-image" href="#" style="text-align:center;">
+          <img src="gcubedatacataloguelogo.png" alt="Placeholder" width="409" height="54" />
+        </a>
+      {% endblock %}
+    </section>
+  {% endblock %}
+    <div class="page-heading">
+    <h3>Welcome to the {{g.site_title}}!</h3>
+      <p style='font-size:14px !important; text-align: justify;'>
+Here you will find data and other resources hosted by the D4Science.org infrastructure.</p> 
+<p style='text-align: justify;'>The catalogue contains a wealth of resources resulting from several activities, projects and communities including BlueBRIDGE (<a href="http://www.bluebridge-vres.eu" title="BlueBRIDGE" target="_blank">www.bluebridge-vres.eu</a>), i-Marine (<a href="http://www.i-marine.eu" title="i-Marine" target="_blank">www.i-marine.eu</a>), SoBigData.eu (<a href="http://www.sobigdata.eu" title="SoBigData.eu" target="_blank">www.sobigdata.eu</a>), and (FAO <a href="http://www.fao.org" title="FAO" target="_blank">www.fao.org</a>).
+</p> 
+<p style='text-align: justify;'>All the products are accompanied with rich descriptions capturing general attributes, e.g. title and creator(s), as well as usage policies and licences.</p>
+     </div>
+    {% endif %}
+  </header>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search.html
new file mode 100644
index 0000000..bb27776
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search.html
@@ -0,0 +1,22 @@
+{% set tags = h.get_facet_items_dict('tags', search_facets, limit=3) %}
+{% set placeholder = _('E.g. environment') %}
+{% set dataset_type = h.default_package_type() %}
+
+<div class="module-search card box">
+  <form class="module-content search-form" method="get" action="{% url_for dataset_type ~ '.search' %}">
+    <h3 class="heading">{{ _("Search data") }}</h3>
+    <div class="search-input form-group search-giant">
+      <input aria-label="{% block header_site_search_label %}{{ h.humanize_entity_type('package', dataset_type, 'search placeholder') or _('Search datasets') }}{% endblock %}" id="field-main-search" type="text" class="form-control" name="q" value="" autocomplete="off" placeholder="{% block search_placeholder %}{{ placeholder }}{% endblock %}" />
+      <button class="btn" type="submit" aria-labelledby="search-label">
+        <i class="fa fa-search"></i>
+        <span class="sr-only" id="search-label">{{ _('Search') }}</span>
+      </button>
+    </div>
+  </form>
+  {#<div class="tags">
+    <h3>{{ _('Popular tags') }}</h3>
+    {% for tag in tags %}
+      <a class="tag" href="{% url_for 'dataset.search', tags=tag.list %}" title="{{ tag.display_name }}">{{ tag.display_name|truncate(22) }}</a>
+    {% endfor %}
+  </div>#}
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_groups.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_groups.html
new file mode 100644
index 0000000..6f31bfd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_groups.html
@@ -0,0 +1,35 @@
+{% set groups = h.d4science_get_browse_info_for_organisations_or_groups(type='group', limit=10) %}
+{% set type = 'group' %}
+{% if groups|length > 0 %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by {{_('Groups')}}</h3>
+	
+	 <div id="search-for-groups">
+	 <table class="media-grid-homepage" data-module="media-grid">
+	{% for index in range(0,groups|length)  %}
+	{% set offset = 5 %}
+	{% set group = groups[index] %}
+	{% if index % offset == 0 %}
+		 <tr>
+		 {% endif %}
+		 <td class="media-item-homepage">
+	        {% set url = h.url_for(type ~ '_read', action='read', id=group['name']) %}
+	        <a href="{{ url }}" title="{{ _('View {name}').format(name=group['display_name']) }}">
+			  <!--<i class="fa fa-address-book fa-3x background-circle color-white"></i> -->
+	             <img class="logo-homepage" src="{{ group['url'] }}" alt="{{ group['name'] }}" title="{{ _('{name}').format(name=group['display_name']) }} group">
+	        <p class="media-heading-homepage">{{ group['display_name'] }}&nbsp(<span class="statistics-show">{{group['package_count']}}</span>)</p>
+	        </a>
+	    </td>
+		 {% if (index+offset+1) % offset == 0 %}
+		 </tr>
+		{% endif %}
+	{% endfor %}
+	</table>
+	</div>
+	<p style="float: right; margin-top: 15px">
+	<a href="/groups">See All {{_('Groups')}}</a>
+	</p>
+  </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_location.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_location.html
new file mode 100644
index 0000000..4b88bd2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_location.html
@@ -0,0 +1,44 @@
+{% set alternative_url_dataset = h.url_for(controller='dataset', action='search') %}
+{% set locations = h.d4science_get_location_to_bboxes() %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by Location Extent</h3>
+	<div id="search-for-extent">
+		 <table class="media-grid-homepage" data-module="media-grid">
+		 	{% set offset = 5 %}
+			{% for key, value in locations.items()  %}
+			{% set index = loop.index0 %}
+			{% if index % offset == 0 %}
+				 <tr>
+				 {% endif %}
+				 <td class="media-item-homepage">
+			        {% set loc = key %}
+			        {% set bbox = value %}
+			        <a href="{{ alternative_url_dataset }}?q=&ext_bbox={{ bbox }}" title="Browse by {{ loc }}'s BBOX">
+			        {{ loc }}</a>
+			    </td>
+				 {% if (index+offset+1) % offset == 0 %}
+				 </tr>
+				{% endif %}
+			{% endfor %}
+		</table>
+	 </div>
+	 <div id="search-for-location">
+	 {# ADDED BY FRANCESCO MANGIACRAPA SEE #12651 #}
+	 {% snippet 'spatial/snippets/spatial_query.html', alternative_url=alternative_url_dataset %}
+	 {# END #}
+	  </div>
+  </div>
+  <script type="text/javascript" >
+	
+	expandMap = function () {
+		map.zoomIn();
+	}
+	
+	if(window.addEventListener){
+		window.addEventListener('load', expandMap)
+	}else{
+		window.attachEvent('onload', expandMap)
+	}
+	</script>
+</div>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_organisations.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_organisations.html
new file mode 100644
index 0000000..65b8acb
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_organisations.html
@@ -0,0 +1,33 @@
+{% set organizations = h.d4science_get_browse_info_for_organisations_or_groups(type='organization', limit=10) %}
+{% set type = 'organization' %}
+{% if organizations|length > 1 %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by {{_('Organizations')}}</h3>
+	 <div id="search-for-organizations">
+	 <table class="media-grid-homepage" data-module="media-grid">
+	{% for index in range(0,organizations|length)  %}
+	{% set offset = 5 %}
+	{% set organization = organizations[index] %}
+	{% if index % offset == 0 %}
+		 <tr>
+		 {% endif %}
+		 <td class="media-item-homepage">
+	        {% set url = h.url_for(type ~ '_read', action='read', id=organization['name']) %}
+	        <a href="{{ url }}" title="{{ _('View {name}').format(name=organization['display_name']) }}">
+	        <img class="logo-homepage" src="{{ organization['url'] }}" alt="{{ organization['name'] }}" title="{{ _('{name}').format(name=organization['display_name']) }} organization">
+	        <p class="media-heading-homepage">{{ organization['display_name'] }}&nbsp(<span class="statistics-show">{{organization['package_count']}}</span>)</p>
+	        </a>
+	    </td>
+		 {% if (index+offset+1) % offset == 0 %}
+		 </tr>
+		{% endif %}
+	{% endfor %}
+	</table>
+	</div>
+	<p style="float: right; margin-top: 15px">
+	<a href="/organization">See All {{_('Organizations')}}</a>
+	</p>
+  </div>
+</div>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_types.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_types.html
new file mode 100644
index 0000000..014bd38
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/search_for_types.html
@@ -0,0 +1,37 @@
+{% set metadatatype = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+{% set metadatatypes = h.get_facet_items_dict(metadatatype['name'], limit=10) %}
+{% if metadatatypes|length > 0 %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by {{_('Types')}}</h3>
+	
+	 <div id="search-for-types">
+	 <table class="media-grid-homepage" data-module="media-grid">
+	{% for index in range(0,metadatatypes|length)  %}
+	{% set offset = 5 %}
+	{% set type = metadatatypes[index] %}
+	{% if index % offset == 0 %}
+		 <tr>
+		 {% endif %}
+		 <td class="media-item-homepage">
+			{% set img_url = h.d4science_get_url_to_icon_for_ckan_entity(type.name, entity_type='type') %}
+	       <a href="{% url_for controller='dataset', action='search', systemtype=type.name %}"  title="{{ _('View {name}').format(name=type.name) }}">
+			 <img class="logo-homepage" src="{{ img_url }}" alt="{{ type.display_name }}" title="{{ _('{name}').format(name=type.display_name) }} group"/>
+	        <p class="media-heading-homepage">
+	        {{ h.truncate(type.display_name, 26) }}
+	        (<span class="statistics-show">{{type.count}}</span>)
+	        </a>
+		  </p>
+	    </td>
+		 {% if (index+offset+1) % offset == 0 %}
+		 </tr>
+		{% endif %}
+	{% endfor %}
+	</table>
+	</div>
+	<p style="float: right; margin-top: 15px">
+	<a href="/types">See All {{_('Types')}}</a>
+	</p>
+  </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/stats.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/stats.html
new file mode 100644
index 0000000..c70d596
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/home/snippets/stats.html
@@ -0,0 +1,29 @@
+{% set stats = h.get_site_statistics() %}
+
+<div class="module-stats">
+  <div class="card box">
+    <h3>{{ _('{0} statistics').format(g.site_title) }}</h3>
+    <ul>
+      {% block stats_group %}
+      <li>
+        <a href="{{ h.url_for('dataset.search') }}">
+          <strong>{{ h.SI_number_span(stats.dataset_count) }}</strong>
+          {{ _('dataset') if stats.dataset_count == 1 else _('datasets') }}
+        </a>
+      </li>
+      <li>
+        <a href="{{ h.url_for('organization.index') }}">
+          <strong>{{ h.SI_number_span(stats.organization_count) }}</strong>
+          {{ _('organization') if stats.organization_count == 1 else _('organizations') }}
+        </a>
+      </li>
+      <li>
+        <a href="{{ h.url_for('group.index') }}">
+          <strong>{{ h.SI_number_span(stats.group_count) }}</strong>
+          {{ _('group') if stats.group_count == 1 else _('groups') }}
+        </a>
+      </li>
+      {% endblock %}
+    </ul>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/autoform.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/autoform.html
new file mode 100644
index 0000000..c469b81
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/autoform.html
@@ -0,0 +1,70 @@
+{#
+Builds a form from the supplied form_info list/tuple. All form info dicts
+can also contain an "extra_info" key which will add some help text after the
+input element.
+
+form_info     - A list of dicts describing the form field to build.
+data          - The form data object.
+errors        - The form errors object.
+error_summary - A list of errors to display above the fields.
+
+Example
+
+  {% set form_info = [
+      {'name': 'ckan.site_title', 'control': 'input', 'label': _('Site Title'), 'placeholder': ''},
+      {'name': 'ckan.theme', 'control': 'select', 'options': styles, 'label': _('Style'), 'placeholder': ''},
+      {'name': 'ckan.site_description', 'control': 'input', 'label': _('Site Tag Line'), 'placeholder': ''},
+      {'name': 'ckan.site_logo', 'control': 'input', 'label': _('Site Tag Logo'), 'placeholder': ''},
+      {'name': 'ckan.site_about', 'control': 'markdown', 'label': _('About'), 'placeholder': _('About page text')},
+      {'name': 'ckan.site_intro_text', 'control': 'markdown', 'label': _('Intro Text'), 'placeholder': _('Text on home page')},
+      {'name': 'ckan.site_custom_css', 'control': 'textarea', 'label': _('Custom CSS'), 'placeholder': _('Customisable css inserted into the page header')},
+      ] %}
+
+  {% import 'macros/autoform.html' as autoform %}
+  {{ autoform.generate(form_info, data, errors) }}
+
+#}
+{% import 'macros/form.html' as form %}
+{%- macro generate(form_info=[], data={}, errors={}, error_summary=[]) -%}
+  {{ form.errors(error_summary) if error_summary }}
+
+  {% for item in form_info %}
+    {% set name = item.name %}
+    {% set value = data.get(name) %}
+    {% set error = errors.get(name) %}
+    {% set id = 'field-%s' % (name|lower|replace('_', '-')|replace('.', '-')) %}
+
+    {% set control = item.control or 'input' %}
+    {% set label = item.label %}
+    {% set placeholder = item.placeholder %}
+
+    {% set classes = item.classes or [] %}
+    {% set classes = ['control-medium'] if not classes and control == 'input' %}
+
+    {% if control == 'select' %}
+      {% call form.select(name, id=id, label=label, options=item.options, selected=value, error=error) %}
+        {% if item.extra_info %}{{ form.info(item.extra_info) }}{% endif %}
+      {% endcall %}
+    {% elif control == 'html' %}
+      <div class="form-group control-medium">
+        <div class="controls">
+          {{ item.html }}
+        </div>
+      </div>
+    {% elif control == 'image_upload' %}
+      {% set field_url = item.field_url or 'image_url' %}
+      {% set is_upload = data[field_url] and not data[field_url].startswith('http') %}
+      {% set is_url = data[field_url] and data[field_url].startswith('http') %}
+
+      {% set field_upload = item.field_upload or 'image_upload' %}
+      {% set field_clear = item.field_clear or 'clear_upload' %}
+
+      {{ form.image_upload(data, errors, is_upload_enabled=item.upload_enabled, is_url=is_url, is_upload=is_upload, upload_label = _('Site logo'), url_label=_('Site logo'),
+                field_url=field_url, field_upload=field_upload, field_clear=field_clear)}}
+    {% else %}
+      {% call form[control](name, id=id, label=label, placeholder=placeholder, value=value, error=error, classes=classes) %}
+        {% if item.extra_info %}{{ form.info(item.extra_info) }}{% endif %}
+      {% endcall %}
+    {% endif %}
+  {% endfor %}
+{%- endmacro -%}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form.html
new file mode 100644
index 0000000..f33b7ab
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form.html
@@ -0,0 +1,36 @@
+{#
+All macros were split into their own template file in `templates/macros/form/`)
+and here, we are importing them all to maintain backward compatibility.
+#}
+
+{% from 'macros/form/input.html' import input %}
+{% from "macros/form/input_block.html" import input_block %}
+{% from 'macros/form/checkbox.html' import checkbox %}
+{% from 'macros/form/select.html' import select %}
+{% from "macros/form/attributes.html" import attributes %}
+{% from "macros/form/markdown.html" import markdown %}
+{% from "macros/form/textarea.html" import textarea %}s
+{% from "macros/form/prepend.html" import prepend %}
+{% from "macros/form/custom.html" import custom %}
+{% from "macros/form/errors.html" import errors %}
+{% from "macros/form/info.html" import info %}
+{% from "macros/form/hidden.html" import hidden %}
+{% from "macros/form/hidden_from_list.html" import hidden_from_list %}
+{% from "macros/form/required_message.html" import required_message %}
+{% from "macros/form/image_upload.html" import image_upload %}
+
+{% set input = input %}
+{% set input_block = input_block %}
+{% set checkbox = checkbox %}
+{% set select = select %}
+{% set attributes = attributes %}
+{% set markdown = markdown %}
+{% set textarea = textarea %}
+{% set prepend = prepend %}
+{% set custom = custom %}
+{% set errors = errors %}
+{% set info = info %}
+{% set hidden = hidden %}
+{% set hidden_from_list = hidden_from_list %}
+{% set required_message = required_message %}
+{% set image_upload = image_upload %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/attributes.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/attributes.html
new file mode 100644
index 0000000..47359a6
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/attributes.html
@@ -0,0 +1,17 @@
+{#
+Builds a space seperated list of html attributes from a dict of key/value pairs.
+Generally only used internally by macros.
+
+attrs - A dict of attribute/value pairs
+
+Example
+
+{% import 'macros/form.html' as form %}
+{{ form.attributes({}) }}
+
+#}
+{%- macro attributes(attrs={}) -%}
+{%- for key, value in attrs.items() -%}
+{{ " " }}{{ key }}{% if value != "" %}="{{ value }}"{% endif %}
+{%- endfor -%}
+{%- endmacro -%}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/checkbox.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/checkbox.html
new file mode 100644
index 0000000..130720f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/checkbox.html
@@ -0,0 +1,34 @@
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Builds a single checkbox input.
+
+name        - The name of the form parameter.
+id          - The id to use on the input and label. Convention is to prefix with 'field-'.
+label       - The human readable label.
+value       - The value of the input.
+checked     - If true the checkbox will be checked
+error       - An error string for the field or just true to highlight the field.
+classes     - An array of classes to apply to the form-group.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Example:
+
+{% import 'macros/form.html' as form %}
+{{ form.checkbox('remember', checked=true) }}
+
+#}
+{% macro checkbox(name, id='', label='', value='', checked=false, placeholder='', error="", classes=[], attrs={}, is_required=false) %}
+{%- set extra_html = caller() if caller -%}
+<div class="form-group{{ " " ~ classes | join(" ") }}{% if error %} error{% endif %}">
+<div class="controls">
+    <label class="checkbox" for="{{ id or name }}">
+    <input id="{{ id or name }}" type="checkbox" name="{{ name }}" value="{{ value | empty_and_escape }}" {{ "checked " if checked }} {{ attributes(attrs) }} />
+    {{ label or name }}
+    {% if is_required %}<span title="{{ _("This field is required") }}" class="control-required">*</span> {% endif %}
+    {% if error and error is iterable %}<strong class="error-inline">{{ error|join(', ') }}</strong>{% endif %}
+    </label>
+    {{ extra_html }}
+</div>
+</div>
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/custom.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/custom.html
new file mode 100644
index 0000000..4503b05
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/custom.html
@@ -0,0 +1,61 @@
+{% from "macros/form/input_block.html" import input_block %}
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Creates all the markup required for an custom key/value input. These are usually
+used to let the user provide custom meta data. Each "field" has three inputs
+one for the key, one for the value and a checkbox to remove it. So the arguments
+for this macro are nearly all tuples containing values for the
+(key, value, delete) fields respectively.
+
+name        - A tuple of names for the three fields.
+id          - An id string to be used for each input.
+label       - The human readable label for the main label.
+values      - A tuple of values for the (key, value, delete) fields. If delete
+is truthy the checkbox will be checked.
+placeholder - A tuple of placeholder text for the (key, value) fields.
+error       - A list of error strings for the field or just true to highlight the field.
+classes     - An array of classes to apply to the form-group.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Examples:
+
+{% import 'macros/form.html' as form %}
+{{ form.custom(
+names=('custom_key', 'custom_value', 'custom_deleted'),
+id='field-custom',
+label=_('Custom Field'),
+values=(extra.key, extra.value, extra.deleted),
+error=''
+) }}
+#}
+{% macro custom(names=(), id="", label="", values=(), placeholders=(), error="", classes=[], attrs={}, is_required=false, key_values=()) %}
+{%- set classes = (classes|list) -%}
+{%- set label_id = (id or names[0]) ~ "-key" -%}
+{%- set extra_html = caller() if caller -%}
+{%- do classes.append('control-custom') -%}
+
+{% call input_block(label_id, label or name, error, classes, control_classes=["editor"], extra_html=extra_html, is_required=is_required) %}
+<div class="row">
+    <div class="col-md-6">
+    <div class="input-group" {{ attributes(attrs) }}>
+        <label class="input-group-text">{{ _('Key') }}</label>
+        <input class="form-control" id="{{ id or names[0] }}-key" type="text" name="{{ names[0] }}" value="{{ values[0] | empty_and_escape }}" placeholder="{{ placeholders[0] }}" />
+    </div>
+    </div>
+    <div class="col-md-6 d-flex flex-row-reverse">
+    {% if values[0] or values[1] or error %}
+    <label class="checkbox pull-right" for="{{ id or names[2] }}-remove">
+        <input type="checkbox" id="{{ id or names[2] }}-remove" name="{{ names[2] }}"{% if values[2] %} checked{% endif %} />
+        <span class="btn btn-danger"><span class="fa fa-trash"></span><span class="sr-only">{{ _('Remove') }}</span></span>
+    </label>
+    {% endif %}
+    <div class="input-group" {{ attributes(attrs) }}>
+        <label for="{{ id or names[1] }}-value" class="input-group-text">{{ _('Value') }}</label>
+        <input class="form-control" id="{{ id or names[1] }}-value" type="text" name="{{ names[1] }}" value="{{ values[1] | empty_and_escape }}" placeholder="{{ placeholders[1] }}" />
+    </div>
+    </div>
+</div>
+
+{% endcall %}
+{% endmacro %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/errors.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/errors.html
new file mode 100644
index 0000000..9f55bad
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/errors.html
@@ -0,0 +1,26 @@
+{#
+Builds a list of errors for the current form.
+
+errors  - A dict of field/message pairs.
+type    - The alert-* class that should be applied (default: "error")
+classes - A list of classes to apply to the wrapper (default: [])
+
+Example:
+
+{% import 'macros/form.html' as form %}
+{{ form.errors(error_summary, type="warning") }}
+
+#}
+
+{% macro errors(errors={}, type="error", classes=[]) %}
+{% if errors %}
+<div class="error-explanation alert alert-{{ type }}{{ " " ~ classes | join(' ') }}">
+<p>{{ _('The form contains invalid entries:') }}</p>
+<ul>
+    {% for key, error in errors.items() %}
+    <li data-field-label="{{ key }}">{% if key %}{{ key }}: {% endif %}{{ error }}</li>
+    {% endfor %}
+</ul>
+</div>
+{% endif %}
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/hidden.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/hidden.html
new file mode 100644
index 0000000..ad46447
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/hidden.html
@@ -0,0 +1,14 @@
+{#
+Builds a single hidden input.
+
+name  - name of the hidden input
+value - value of the hidden input
+
+Example
+{% import 'macros/form.html' as form %}
+{{ form.hidden('name', 'value') }}
+
+#}
+{% macro hidden(name, value) %}
+<input type="hidden" name="{{ name }}" value="{{ value }}" />
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/hidden_from_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/hidden_from_list.html
new file mode 100644
index 0000000..60e0d16
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/hidden_from_list.html
@@ -0,0 +1,28 @@
+{% from "macros/form/hidden.html" import hidden %}
+
+{#
+Contructs hidden inputs for each name-value pair.
+
+fields - [('name1', 'value1'), ('name2', 'value2'), ...]
+
+Two parameter for excluding several names or name-value pairs.
+
+except_names - list of names to be excluded
+except       - list of name-value pairs to be excluded
+
+
+Example:
+{% import 'macros/form.html' as form %}
+{% form.hidden_from_list(fields=c.fields, except=[('topic', 'xyz')]) %}
+{% form.hidden_from_list(fields=c.fields, except_names=['time_min', 'time_max']) %}
+#}
+{% macro hidden_from_list(fields, except_names=None, except=None) %}
+{% set except_names = except_names or [] %}
+{% set except = except or [] %}
+
+{% for name, value in fields %}
+{% if name and value and name not in except_names and (name, value) not in except %}
+{{ hidden(name, value) }}
+{% endif %}
+{% endfor %}
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/image_upload.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/image_upload.html
new file mode 100644
index 0000000..1f35a0b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/image_upload.html
@@ -0,0 +1,59 @@
+{% from 'macros/form/input.html' import input %}
+{% from 'macros/form/checkbox.html' import checkbox %}
+
+{#
+Builds a file upload for input
+
+Example
+{% import 'macros/form.html' as form %}
+{{ form.image_upload(data, errors, is_upload_enabled=true) }}
+
+#}
+{% macro image_upload(data, errors, field_url='image_url', field_upload='image_upload', field_clear='clear_upload',
+                    is_url=false, is_upload=false, is_upload_enabled=false, placeholder=false,
+                    url_label='', upload_label='', field_name='image_url')  %}
+{% set placeholder = placeholder if placeholder else _('http://example.com/my-image.jpg') %}
+{% set url_label = url_label or _('Image URL')  %}
+{% set upload_label = upload_label or _('Image')  %}
+{% set previous_upload = data['previous_upload'] %}
+
+{% if field_url == 'url' and field_upload == 'upload' %}
+    {# backwards compatibility for old resource forms that still call the `forms.image_upload()` macro, eg ckanext-scheming #}
+    {% snippet 'package/snippets/resource_upload_field.html',
+    data=data,
+    errors=errors,
+    is_url=is_url,
+    is_upload=is_upload,
+    is_upload_enabled=is_upload_enabled,
+    url_label=url_label,
+    upload_label=upload_label,
+    placeholder=placeholder %}
+{% else %}
+    {% if is_upload_enabled %}
+    <div class="image-upload"
+            data-module="image-upload"
+            data-module-is_url="{{ 'true' if is_url else 'false' }}"
+            data-module-is_upload="{{ 'true' if is_upload else 'false' }}"
+            data-module-field_url="{{ field_url }}"
+            data-module-field_upload="{{ field_upload }}"
+            data-module-field_clear="{{ field_clear }}"
+            data-module-upload_label="{{ upload_label }}"
+            data-module-field_name="{{ field_name }}"
+            data-module-previous_upload="{{ 'true' if previous_upload else 'false' }}">
+    {% endif %}
+
+
+    {{ input(field_url, label=url_label, id='field-image-url', type='url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) }}
+
+
+    {% if is_upload_enabled %}
+    {{ input(field_upload, label=upload_label, id='field-image-upload', type='file', placeholder='', value='', error='', classes=['control-full']) }}
+    {% if is_upload %}
+        {{ checkbox(field_clear, label=_('Clear Upload'), id='field-clear-upload', value='true', error='', classes=['control-full']) }}
+    {% endif %}
+    {% endif %}
+
+    {% if is_upload_enabled %}</div>{% endif %}
+{% endif %}
+
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/info.html
new file mode 100644
index 0000000..54ecc84
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/info.html
@@ -0,0 +1,24 @@
+{#
+Renders an info box with a description. This will usually be used with in a
+call block when creating an input element.
+
+text    - The text to include in the box.
+inline  - If true displays the info box inline with the input.
+classes - A list of classes to add to the info box.
+
+Example
+
+{% import 'macros/form.html' as form %}
+{% call form.input('name') %}
+{{ form.info(_('My useful help text')) }}
+{% endcall %}
+
+#}
+{% macro info(text='', inline=false, classes=[]) %}
+{%- if text -%}
+<div class="info-block{{ ' info-inline' if inline }}{{ " " ~ classes | join(' ') }}">
+<i class="fa fa-info-circle"></i>
+{{ text }}
+</div>
+{%- endif -%}
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/input.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/input.html
new file mode 100644
index 0000000..d7f7c29
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/input.html
@@ -0,0 +1,30 @@
+{% from "macros/form/input_block.html" import input_block %}
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Creates all the markup required for an input element. Handles matching labels to
+inputs, error messages and other useful elements.
+
+name        - The name of the form parameter.
+id          - The id to use on the input and label. Convention is to prefix with 'field-'.
+label       - The human readable label.
+value       - The value of the input.
+placeholder - Some placeholder text.
+type        - The type of input eg. email, url, date (default: text).
+error       - A list of error strings for the field or just true to highlight the field.
+classes     - An array of classes to apply to the form-group.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Examples:
+
+{% import 'macros/form.html' as form %}
+{{ form.input('title', label=_('Title'), value=data.title, error=errors.title) }}
+
+#}
+{% macro input(name, id='', label='', value='', placeholder='', type='text', error="", classes=[], attrs={'class': 'form-control'}, is_required=false) %}
+{%- set extra_html = caller() if caller -%}
+
+{% call input_block(id or name, label or name, error, classes, extra_html=extra_html, is_required=is_required) %} 
+<input id="{{ id or name }}" type="{{ type }}" name="{{ name }}" value="{{ value | empty_and_escape }}" placeholder="{{ placeholder }}" {{ attributes(attrs) }} />
+{% endcall %} 
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/input_block.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/input_block.html
new file mode 100644
index 0000000..6f7e691
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/input_block.html
@@ -0,0 +1,32 @@
+{#
+A generic input_block for providing the default markup for CKAN form elements.
+It is expected to be called using a {% call %} block, the contents of which
+will be inserted into the .controls element.
+
+for     - The id for the input that the label should match.
+label   - A human readable label.
+error   - A list of error strings for the field or just true.
+classes - An array of custom classes for the outer element.
+control_classes - An array of custom classes for the .control wrapper.
+extra_html - An html string to be inserted after the errors eg. info text.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Example:
+
+{% import 'macros/form.html' as form %}
+{% call form.input_block("field", "My Field") %}
+<input id="field" type="text" name="{{ name }}" value="{{ value | empty_and_escape }}" />
+{% endcall %}
+
+#}
+
+{% macro input_block(for, label="", error="", classes=[], control_classes=[], extra_html="", is_required=false) %}
+<div class="form-group{{ " error" if error }}{{ " " ~ classes | join(' ') }}">
+<label class="form-label" for="{{ for }}">{% if is_required %}<span title="{{ _("This field is required") }}" class="control-required">*</span> {% endif %}{{ label or _('Custom') }}</label>
+<div class="controls{{ " " ~ control_classes | join(' ') }}">
+{{ caller() }}
+{% if error and error is iterable %}<span class="error-block">{{ error|join(', ') }}</span>{% endif %}
+{{ extra_html }}
+</div>
+</div>
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/markdown.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/markdown.html
new file mode 100644
index 0000000..59b4a1d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/markdown.html
@@ -0,0 +1,33 @@
+{% from "macros/form/input_block.html" import input_block %}
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Creates all the markup required for a Markdown textarea element. Handles
+matching labels to inputs, selected item and error messages.
+
+name        - The name of the form parameter.
+id          - The id to use on the input and label. Convention is to prefix with 'field-'.
+label       - The human readable label.
+value       - The value of the input.
+placeholder - Some placeholder text.
+error       - A list of error strings for the field or just true to highlight the field.
+classes     - An array of classes to apply to the form-group.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Examples:
+
+{% import 'macros/form.html' as form %}
+{{ form.markdown('desc', id='field-description', label=_('Description'), value=data.desc, error=errors.desc) }}
+
+#}
+{% macro markdown(name, id='', label='', value='', placeholder='', error="", classes=[], attrs={'class': 'form-control'}, is_required=false) %}
+{% set classes = (classes|list) %}
+{% do classes.append('control-full') %}
+{% set markdown_tooltip = "<pre><p>__Bold text__ or _italic text_</p><p># title<br>## secondary title<br>### etc</p><p>* list<br>* of<br>* items</p><p>http://auto.link.ed/</p></pre><p><b><a href='http://daringfireball.net/projects/markdown/syntax' target='_blank'>Full markdown syntax</a></b></p><p class='text-muted'><b>Please note:</b> HTML tags are stripped out for security reasons</p>" %}
+
+{%- set extra_html = caller() if caller -%}
+{% call input_block(id or name, label or name, error, classes, control_classes=["editor"], extra_html=extra_html, is_required=is_required) %}
+<textarea id="{{ id or name }}" name="{{ name }}" cols="20" rows="5" placeholder="{{ placeholder }}" {{ attributes(attrs) }}>{{ value | empty_and_escape }}</textarea>
+<span class="editor-info-block">{% trans %}You can use <a href="#markdown" title="Markdown quick reference" data-bs-toggle="popover" data-bs-content="{{ markdown_tooltip }}" data-bs-html="true">Markdown formatting</a> here{% endtrans %}</span>
+{% endcall %}
+{% endmacro %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/prepend.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/prepend.html
new file mode 100644
index 0000000..1441343
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/prepend.html
@@ -0,0 +1,38 @@
+{% from "macros/form/input_block.html" import input_block %}
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Creates all the markup required for an input element with a prefixed segment.
+These are useful for showing url slugs and other fields where the input
+information forms only part of the saved data.
+
+name        - The name of the form parameter.
+id          - The id to use on the input and label. Convention is to prefix with 'field-'.
+label       - The human readable label.
+prepend     - The text that will be prepended before the input.
+value       - The value of the input.
+which will use the name key as the value.
+placeholder - Some placeholder text.
+error       - A list of error strings for the field  or just true to highlight the field.
+classes     - An array of classes to apply to the form-group.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Examples:
+
+{% import 'macros/form.html' as form %}
+{{ form.prepend('slug', id='field-slug', prepend='/dataset/', label=_('Slug'), value=data.slug, error=errors.slug) }}
+
+#}
+{% macro prepend(name, id='', label='', prepend='', value='', placeholder='', type='text', error="", classes=[], attrs={'class': 'form-control'}, is_required=false) %}
+{# We manually append the error here as it needs to be inside the .input-group block #}
+{% set classes = (classes|list) %}
+{% do classes.append('error') if error %}
+{%- set extra_html = caller() if caller -%}
+{% call input_block(id or name, label or name, error='', classes=classes, extra_html=extra_html, is_required=is_required) %}
+<div class="input-group">
+    {% if prepend %}<label class="input-group-text">{{ prepend }}</label>{%- endif -%}
+    <input id="{{ id or name }}" type="{{ type }}" name="{{ name }}" value="{{ value | empty_and_escape }}" placeholder="{{ placeholder }}" {{ attributes(attrs) }} />
+    {% if error and error is iterable %}<span class="error-block">{{ error|join(', ') }}</span>{% endif %}
+</div>
+{% endcall %}
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/required_message.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/required_message.html
new file mode 100644
index 0000000..f5a4cc7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/required_message.html
@@ -0,0 +1,13 @@
+{#
+Outputs the "* Required field" message for the bottom of formss
+
+Example
+{% import 'macros/form.html' as form %}
+{{ form.required_message() }}
+
+#}
+{% macro required_message() %}
+<p class="control-required-message">
+    <span class="control-required">*</span> {{ _("Required field") }}
+</p>
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/select.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/select.html
new file mode 100644
index 0000000..15a1025
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/select.html
@@ -0,0 +1,50 @@
+{% from "macros/form/input_block.html" import input_block %}
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Creates all the markup required for an select element. Handles matching labels to
+inputs and error messages.
+
+A field should be a dict with a "value" key and an optional "text" key which
+will be displayed to the user. We use a dict to easily allow extension in
+future should extra options be required.
+
+name        - The name of the form parameter.
+id          - The id to use on the input and label. Convention is to prefix with 'field-'.
+label       - The human readable label.
+options     - A list/tuple of fields to be used as <options>.
+    selected    - The value of the selected <option>.
+    error       - A list of error strings for the field or just true to highlight the field.
+    classes     - An array of classes to apply to the form-group.
+    is_required - Boolean of whether this input is requred for the form to validate
+
+    Examples:
+
+    {% import 'macros/form.html' as form %}
+    {{ form.select('year', label=_('Year'), options=[{'value':2010, 'text': 2010},{'value': 2011, 'text': 2011}], selected=2011, error=errors.year) }}
+
+    Or only with values if they are the same as text:
+    {{ form.select('year', label=_('Year'), options=[{'value':2010},{'value': 2011}], selected=2011, error=errors.year) }}
+
+    Complete example:
+    {{ form.select('the_data_type', id='the_data_type', label=_('Data Type'), options=[
+        {'value': '0', 'text': _('[Choose Data Type]')}
+        , {'value': '1', 'text': _('Private data')}
+        , {'value': '2', 'text': _('Not private data')}
+    ], selected=data.the_data_type if data.the_data_type else '0', is_required=true) }}
+
+#}
+
+{% macro select(name, id='', label='', options='', selected='', error='', classes=[], attrs={'class': 'form-control'}, is_required=false) %}
+{% set classes = (classes|list) %}
+{% do classes.append('control-select') %}
+
+{%- set extra_html = caller() if caller -%}
+{% call input_block(id or name, label or name, error, classes, extra_html=extra_html, is_required=is_required) %}
+<select id="{{ id or name }}" name="{{ name }}" {{ attributes(attrs) }}>
+    {% for option in options %}
+<option value="{{ option.value }}"{% if option.value == selected %} selected{% endif %}>{{ option.text or option.value }}</option>
+{% endfor %}
+</select>
+{% endcall %}
+{% endmacro %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/textarea.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/textarea.html
new file mode 100644
index 0000000..b3cd085
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/macros/form/textarea.html
@@ -0,0 +1,31 @@
+{% from "macros/form/input_block.html" import input_block %}
+{% from "macros/form/attributes.html" import attributes %}
+
+{#
+Creates all the markup required for a plain textarea element. Handles
+matching labels to inputs, selected item and error messages.
+
+name        - The name of the form parameter.
+id          - The id to use on the input and label. Convention is to prefix with 'field-'.
+label       - The human readable label.
+value       - The value of the input.
+placeholder - Some placeholder text.
+error       - A list of error strings for the field or just true to highlight the field.
+classes     - An array of classes to apply to the form-group.
+is_required - Boolean of whether this input is requred for the form to validate
+
+Examples:
+
+{% import 'macros/form.html' as form %}
+{{ form.textarea('desc', id='field-description', label=_('Description'), value=data.desc, error=errors.desc) }}
+
+#}
+{% macro textarea(name, id='', label='', value='', placeholder='', error="", classes=[], attrs={'class': 'form-control'}, is_required=false, rows=5, cols=20) %}
+{% set classes = (classes|list) %}
+{% do classes.append('control-full') %}
+
+{%- set extra_html = caller() if caller -%}
+{% call input_block(id or name, label or name, error, classes, extra_html=extra_html, is_required=is_required) %}
+<textarea id="{{ id or name }}" name="{{ name }}" cols="{{ cols }}" rows="{{ rows }}" placeholder="{{ placeholder }}" {{ attributes(attrs) }}>{{ value | empty_and_escape }}</textarea>
+{% endcall %}
+{% endmacro %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/about.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/about.html
new file mode 100644
index 0000000..806225a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/about.html
@@ -0,0 +1,15 @@
+{% extends "organization/read_base.html" %}
+
+{% block subtitle %}{{ _('About') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h1>{% block page_heading %}{{ group_dict.display_name }}{% endblock %}</h1>
+  {% block organization_description %}
+    {% if group_dict.description %}
+      {{ h.render_markdown(group_dict.description) }}
+    {% endif %}
+  {% endblock %}
+  {% block organization_extras %}
+    {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(group_dict.extras) %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/admins.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/admins.html
new file mode 100644
index 0000000..30e505c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/admins.html
@@ -0,0 +1,10 @@
+{% extends "organization/read_base.html" %}
+
+{% block subtitle %}{{ _('Administrators') }} {{ g.template_title_delimiter }} {{ group_dict.title or group_dict.name }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ _('Administrators') }}{% endblock %}</h1>
+  {% block admins_list %}
+    {% snippet "user/snippets/followers.html", followers=admins %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/base_form_page.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/base_form_page.html
new file mode 100644
index 0000000..9a875dd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/base_form_page.html
@@ -0,0 +1,10 @@
+{% extends "organization/edit_base.html" %}
+
+{% block primary_content_inner %}
+  <h1 class="{% block page_heading_class %}page-heading{% endblock %}">
+    {% block page_heading %}{{ h.humanize_entity_type('organization', group_type, 'form label') or _('Organization Form') }}{% endblock %}
+  </h1>
+  {% block form %}
+    {{ form | safe }}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/bulk_process.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/bulk_process.html
new file mode 100644
index 0000000..68f00f3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/bulk_process.html
@@ -0,0 +1,114 @@
+{% extends "organization/edit_base.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+
+{% block subtitle %}{{ h.humanize_entity_type('package', dataset_type, 'edit label') or _('Edit datasets') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block page_primary_action %}
+  {% snippet 'snippets/add_dataset.html', group=group_dict.id %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <div class="row">
+    <h1 class="hide-heading">{{ h.humanize_entity_type('package', dataset_type, 'edit label') or _('Edit datasets') }}</h1>
+    <div class="primary col-md-12">
+      <h3 class="page-heading">
+        {% block page_heading %}
+          {%- if page.item_count -%}
+            {{ page.item_count }} datasets{{ _(" found for \"{query}\"").format(query=q) if q }}
+          {%- elif request.args -%}
+            {{ _('Sorry no datasets found for "{query}"').format(query=q) }}
+          {%- else -%}
+            {{ _('Datasets') }}
+          {%- endif -%}
+        {% endblock %}
+      </h3>
+
+      {% block search_form %}
+        {% set sorting = [
+            (_('Name Ascending'), 'title_string asc'),
+            (_('Name Descending'), 'title_string desc'),
+            (_('Last Modified'), 'metadata_modified desc') ]
+                %}
+        {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type=dataset_type, query=q, count=page.item_count, sorting=sorting, sorting_selected=sort_by_selected, no_title=true, search_class=' ' %}
+      {% endblock %}
+
+      {% block form %}
+        {% if page.item_count %}
+          <form method="POST" data-module="basic-form">
+            {{ h.csrf_input() }}
+            <table class="table table-bordered table-header table-hover table-bulk-edit table-edit-hover" data-module="table-selectable-rows">
+              <col width="8">
+              <col width="120">
+              <thead>
+                <tr>
+                  <th></th>
+                  <th class="table-actions">
+                    <div class="btn-group">
+                      <button name="bulk_action.public" value="public" class="btn btn-default" type="submit">
+                        <i class="fa fa-eye"></i>
+                        {{ _('Make public') }}
+                      </button>
+                      <button name="bulk_action.private" value="private" class="btn btn-default" type="submit">
+                        <i class="fa fa-eye-slash"></i>
+                        {{ _('Make private') }}
+                      </button>
+                    </div>
+                    <div class="btn-group">
+                      <button name="bulk_action.delete" value="delete" class="btn btn-danger" type="submit">
+                        <i class="fa fa-times"></i>
+                        {{ _('Delete') }}
+                      </button>
+                    </div>
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {% for package in packages %}
+                  {% set title = package.title or package.name %}
+                  {% set notes = h.markdown_extract(package.notes, extract_length=180) %}
+                  <tr>
+                    <td>
+                      <input type="checkbox" name="dataset_{{ package.id }}">
+                    </td>
+                    <td class="context">
+                      <a href="{% url_for package.type ~ '.edit', id=package.name %}" class="edit pull-right">
+                        {{ _('Edit') }}
+                      </a>
+                      <h3 class="dataset-heading">
+                        <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" title="{{ title }}">
+                          {{ title|truncate(80) }}
+                        </a>
+                        {% if package.get('state', '').startswith('draft') %}
+                          <span class="label label-info">{{ _('Draft') }}</span>
+                        {% elif package.get('state', '').startswith('deleted') %}
+                          <span class="label label-danger">{{ _('Deleted') }}</span>
+                        {% endif %}
+                        {% if package.private %}
+                          <span class="label label-danger">{{ _('Private') }}</span>
+                        {% endif %}
+                      </h3>
+                      {% if notes %}
+                        <p>{{ notes|urlize }}</p>
+                      {% endif %}
+                    </td>
+                  </tr>
+                {% endfor %}
+              </tbody>
+            </table>
+          </form>
+        {% else %}
+          <p class="empty">{{ _('This organization has no datasets associated to it') }}</p>
+        {% endif %}
+      {% endblock %}
+    </div>
+  </div>
+  {{ page.pager() }}
+{% endblock %}
+
+{% block secondary_content %}
+    {{  super() }}
+    {% for facet in c.facet_titles %}
+    {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':group_dict.id}, search_facets=search_facets) }}
+  {% endfor %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/confirm_delete.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/confirm_delete.html
new file mode 100644
index 0000000..f69f450
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/confirm_delete.html
@@ -0,0 +1,22 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete organization - {name}?').format(name=group_dict.name) }}</p>
+        <p class="form-actions">
+          <form id="organization-confirm-delete-form" action="{{ h.url_for(group_type + '.delete', id=group_dict.id) }}" method="post">
+            {{ h.csrf_input() }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/confirm_delete_member.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/confirm_delete_member.html
new file mode 100644
index 0000000..cc690ae
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/confirm_delete_member.html
@@ -0,0 +1,23 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete member - {name}?').format(name=user_dict.name) }}</p>
+        <p class="form-actions">
+          <form action="{{ h.url_for(group_type + '.member_delete', id=group_id, user=user_id) }}" method="post">
+            {{ h.csrf_input() }}
+            <input type="hidden" name="user" value="{{ user_id }}" />
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/edit.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/edit.html
new file mode 100644
index 0000000..e54d830
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/edit.html
@@ -0,0 +1,14 @@
+{% extends "organization/base_form_page.html" %}
+
+{% block subtitle %}{{ _('Edit') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for h.humanize_entity_type('organization', group_type, 'breadcrumb') or _('Organizations'), named_route=group_type+'.index' %}</li>
+  {% block breadcrumb_content_inner %}
+    <li>{% link_for organization.display_name|truncate(35), named_route=group_type+'.read', id=organization.name, title=organization.display_name %}</li>
+    <li class="active">{% link_for _('Manage'), named_route=group_type+'.edit', id=organization.name %}</li>
+  {% endblock %}
+{% endblock %}
+
+{% block page_heading_class %}hide-heading{% endblock %}
+{% block page_heading %}{{ _('Edit Organization') }}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/edit_base.html
new file mode 100644
index 0000000..91d9140
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/edit_base.html
@@ -0,0 +1,26 @@
+{% extends "page.html" %}
+{% set dataset_type = h.default_package_type() %}
+{% set organization = group_dict %}
+
+{% block subtitle %}{{ group_dict.display_name }} {{ g.template_title_delimiter }} {{ h.humanize_entity_type('organization', group_type, 'page title') or _('Organizations') }}{% endblock %}
+
+
+{% block content_action %}
+  {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
+    {% link_for _('View'), named_route=group_type+'.read', id=organization.name, class_='btn btn-default', icon='eye'%}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(group_type + '.edit', _('Edit'), id=group_dict.name, icon='pencil-square') }}
+  {{ h.build_nav_icon(group_type + '.bulk_process', h.humanize_entity_type('package', dataset_type, 'content tab') or _('Datasets'), id=group_dict.name, icon='sitemap') }}
+  {{ h.build_nav_icon(group_type + '.members', _('Members'), id=group_dict.name, icon='users') }}
+{% endblock %}
+
+{% block secondary_content %}
+  {% if organization %}
+    {% snippet 'snippets/organization.html', organization=organization %}
+  {% else %}
+    {{ super() }}
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/index.html
new file mode 100644
index 0000000..e60e718
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/index.html
@@ -0,0 +1,43 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ h.humanize_entity_type('organization', group_type, 'page title') or _('Organizations') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for h.humanize_entity_type('organization', group_type, 'breadcrumb') or _('Organizations'), named_route=group_type+'.index' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('organization_create') %}
+    {% link_for h.humanize_entity_type('organization', group_type, 'add link') or _('Add Organization'), named_route=group_type ~ '.new', class_='btn btn-primary', icon='plus-square' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ h.humanize_entity_type('organization', group_type, 'page title') or _('Organizations') }}{% endblock %}</h1>
+  {% block organizations_search_form %}
+    {% snippet 'snippets/search_form.html', form_id='organization-search-form', type=group_type, query=q, sorting_selected=sort_by_selected, count=page.item_count, placeholder=h.humanize_entity_type('organization', group_type, 'search placeholder') or _('Search organizations...'), show_empty=request.args, no_bottom_border=true if page.items, sorting = [(_('Name Ascending'), 'title asc'), (_('Name Descending'), 'title desc')] %}
+  {% endblock %}
+  {% block organizations_list %}
+    {% if page.items or request.args %}
+      {% if page.items %}
+        {% snippet "organization/snippets/organization_list.html", organizations=page.items %}
+      {% endif %}
+    {% else %}
+      <p class="empty">
+        {{ _('There are currently no organizations for this site') }}.
+        {% if h.check_access('organization_create') %}
+          {% link_for _('How about creating one?'), named_route=group_type+'.new' %}</a>.
+        {% endif %}
+      </p>
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ page.pager(q=q or '', sort=sort_by_selected or '') }}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "organization/snippets/helper.html", group_type=group_type %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/member_new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/member_new.html
new file mode 100644
index 0000000..39957b8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/member_new.html
@@ -0,0 +1,106 @@
+{% extends "organization/edit_base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% set user = user_dict %}
+
+{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block primary_content_inner %}
+  {% link_for _('Back to all members'), named_route=group_type+'.members', id=organization.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  <h1 class="page-heading">
+    {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
+  </h1>
+  {% block form %}
+  <form class="dataset-form add-member-form" method='post'>
+    {{ h.csrf_input() }}
+    <div class="row">
+      <div class="col-md-5">
+        <div class="form-group control-medium">
+          {% if not user %}
+            <label class="form-label" for="username">
+              {{ _('Existing User') }}
+            </label>
+            <p>
+              {{ _('If you wish to add an existing user, search for their username below.') }}
+            </p>
+          {% endif %}
+          <div class="controls">
+            {% if user %}
+              <input type="hidden" name="username" value="{{ user.name }}" />
+              <input id="username" name="username" type="text" value="{{ user.name }}"
+              disabled="True" class="form-control">
+            {% else %}
+                <input id="username" type="text" name="username" placeholder="{{ _('Username') }}"
+                value="" class="control-medium" data-module="autocomplete"
+                data-module-source="/api/2/util/user/autocomplete?ignore_self=true&q=?">
+            {% endif %}
+          </div>
+        </div>
+      </div>
+      {% if not user %}
+      <div class="col-md-2 add-member-or-wrap">
+        <div class="add-member-or">
+          {{ _('or') }}
+        </div>
+      </div>
+      <div class="col-md-5">
+        <div class="form-group control-medium">
+          <label class="form-label" for="email">
+            {{ _('New User') }}
+          </label>
+          <p>
+            {{ _('If you wish to invite a new user, enter their email address.') }}
+          </p>
+          <div class="controls">
+            <input id="email" type="email" name="email" class="form-control" placeholder="{{ _('Email address') }}" >
+          </div>
+        </div>
+      </div>
+      {% endif %}
+    </div>
+
+    {% if user and user.name == c.user and user_role == 'admin' %}
+      {% set format_attrs = {'data-module': 'autocomplete', 'disabled': 'disabled'} %}
+      {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
+      {{ form.hidden('role', value=user_role) }}
+    {% else %}
+      {% set format_attrs = {'data-module': 'autocomplete'} %}
+      {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }}
+    {% endif %}
+
+    <div class="form-actions">
+      {% if user %}
+        <a href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user.id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
+        <button class="btn btn-primary" type="submit" name="submit" >
+          {{ _('Update Member') }}
+        </button>
+      {% else %}
+        <button class="btn btn-primary" type="submit" name="submit" >
+          {{ _('Add Member') }}
+        </button>
+      {% endif %}
+    </div>
+  </form>
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+{{ super() }}
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="fa fa-lg fa-info-circle"></i>
+    {{ _('What are roles?') }}
+  </h2>
+  <div class="module-content">
+    {% trans %}
+      <p><strong>Admin:</strong> Can add/edit and delete datasets, as well as
+        manage organization members.</p>
+      <p><strong>Editor:</strong> Can add and edit datasets, but not manage
+        organization members.</p>
+      <p><strong>Member:</strong> Can view the organization's private
+        datasets, but not add new datasets.</p>
+    {% endtrans %}
+  </div>
+</div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/members.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/members.html
new file mode 100644
index 0000000..0438094
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/members.html
@@ -0,0 +1,43 @@
+{% extends "organization/edit_base.html" %}
+
+{% block subtitle %}{{ _('Members') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('organization_update', {'id': organization.id}) %}
+
+    {% link_for _('Add Member'), named_route=group_type+'.member_new', id=group_dict.id, class_='btn btn-primary', icon='plus-square' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  {% set count = members|length %}
+  {% set members_count = ungettext('{count} member', '{count} members', count).format(count=count) %}
+  <h3 class="page-heading">{{ members_count }}</h3>
+  <table class="table table-header table-hover table-bordered">
+    <thead>
+      <tr>
+          <th>{{ _('User') }}</th>
+          <th>{{ _('Role') }}</th>
+          <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for user_id, user, role in members %}
+        <tr>
+          <td class="media">
+            {{ h.linked_user(user_id, maxlength=20) }}
+          </td>
+          <td>{{ role }}</td>
+          <td>
+            <div class="btn-group pull-right">
+                <a class="btn btn-default btn-sm" href="{{ h.url_for(group_type + '.member_new', id=group_dict.id, user=user_id) }}" title="{{ _('Edit') }}">
+                <i class="fa fa-wrench"></i>
+              </a>
+              <a class="btn btn-danger btn-sm" href="{{ h.url_for(group_type + '.member_delete', id=group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
+            </div>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/new.html
new file mode 100644
index 0000000..5161cfd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/new.html
@@ -0,0 +1,19 @@
+{% extends "organization/base_form_page.html" %}
+
+{% set title = h.humanize_entity_type('organization', group_type, 'create title') or _('Create an Organization')%}
+
+
+{% block subtitle %}{{ title }}{% endblock %}
+
+{% block page_heading %}{{ title }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{{ h.nav_link(h.humanize_entity_type('organization', group_type, 'breadcrumb') or _('Organizations'), named_route=group_type+'.index') }}</li>
+  <li class="active">{{ h.nav_link(title, named_route=group_type+'.new') }}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "organization/snippets/helper.html", group_type=group_type %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/new_organization_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/new_organization_form.html
new file mode 100644
index 0000000..0bd7c09
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/new_organization_form.html
@@ -0,0 +1,27 @@
+{% extends "organization/snippets/organization_form.html" %}
+
+
+{#
+  As the form is rendered as a seperate page we take advantage of this by
+  overriding the form blocks depending on the current context
+  #}
+
+{% block dataset_fields %}
+  {% if action == "edit" %}{{ super() }}{% endif %}
+{% endblock %}
+
+{% block custom_fields %}
+  {% if action == "edit" %}{{ super() }}{% endif %}
+{% endblock %}
+
+{% block save_text %}
+  {%- if action == "edit" -%}
+    {{ h.humanize_entity_type('organization', group_type, 'update label') or _('Update Organization') }}
+  {%- else -%}
+    {{ h.humanize_entity_type('organization', group_type, 'create label') or _('Create Organization') }}
+  {%- endif -%}
+{% endblock %}
+
+{% block delete_button %}
+  {% if action == "edit" %}{{ super() }}{% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/read.html
new file mode 100644
index 0000000..f0b0720
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/read.html
@@ -0,0 +1,47 @@
+{% extends "organization/read_base.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block page_primary_action %}
+  {% if h.check_access('package_create', {'owner_org': group_dict.id}) %}
+    {% snippet 'snippets/add_dataset.html', group=group_dict.id %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+    {% block groups_search_form %}
+      {% set facets = {
+        'fields': fields_grouped,
+        'search': search_facets,
+        'titles': facet_titles,
+        'translated_fields': translated_fields,
+        'remove_field': remove_field }
+      %}
+      {% set sorting = [
+        (_('Relevance'), 'score desc, metadata_modified desc'),
+        (_('Name Ascending'), 'title_string asc'),
+        (_('Name Descending'), 'title_string desc'),
+        (_('Last Modified'), 'metadata_modified desc'),
+        (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+      %}
+      {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type=dataset_type, query=q, sorting=sorting, sorting_selected=sort_by_selected, count=page.item_count, facets=facets, placeholder=h.humanize_entity_type('package', dataset_type, 'search_placeholder') or _('Search datasets...'), show_empty=request.args, fields=fields %}
+    {% endblock %}
+  {% block packages_list %}
+    {% if page.items %}
+      {{ h.snippet('snippets/package_list.html', packages=page.items) }}
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ page.pager(q=q) }}
+  {% endblock %}
+{% endblock %}
+
+{% block organization_facets %}
+  <div class="filters">
+    <div>
+      {% for facet in facet_titles %}
+        {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id}, search_facets=search_facets) }}
+      {% endfor %}
+    </div>
+    <a class="close no-text hide-filters"><i class="fa fa-times-circle"></i><span class="text">close</span></a>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/read_base.html
new file mode 100644
index 0000000..0d17bbf
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/read_base.html
@@ -0,0 +1,30 @@
+{% extends "page.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block subtitle %}{{ group_dict.display_name }} {{ g.template_title_delimiter }} {{ h.humanize_entity_type('organization', group_type, 'page title') or _('Organizations') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for h.humanize_entity_type('organization', group_type, 'breadcrumb') or _('Organizations'), named_route=group_type+'.index' %}</li>
+  <li class="active">{% link_for group_dict.display_name|truncate(35), named_route=group_type+'.read', id=group_dict.name, title=group_dict.display_name %}</li>
+{% endblock %}
+
+{% block content_action %}
+  {% if h.check_access('organization_update', {'id': group_dict.id}) %}
+    {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-default', icon='wrench' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(group_type + '.read', h.humanize_entity_type('package', dataset_type, 'content tab') or _('Datasets'), id=group_dict.name, icon='sitemap') }}
+  {{ h.build_nav_icon(group_type + '.about', _('About'), id=group_dict.name, icon='info-circle') }}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'snippets/organization.html', organization=group_dict, show_nums=true, group_type=group_type %}
+  {% block organization_facets %}{% endblock %}
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "organization/snippets/feeds.html" %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/feeds.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/feeds.html
new file mode 100644
index 0000000..5252e6a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/feeds.html
@@ -0,0 +1,2 @@
+{%- set dataset_feed = h.url_for('feeds.organization', id=group_dict.name) -%}
+<link rel="alternate" type="application/atom+xml" title="{{ g.site_title }} - {{ _('Datasets in organization: {group}').format(group=group_dict.display_name) }}" href="{{ dataset_feed }}" />
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/helper.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/helper.html
new file mode 100644
index 0000000..c221926
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/helper.html
@@ -0,0 +1,27 @@
+{#
+  Displays a sidebard module with information about organizations.
+
+  group_type    - The type of organization.
+
+  Example:
+
+  {% snippet "organization/snippets/helper.html", group_type=group_type %}
+
+  #}
+
+
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="fa fa-info-circle"></i>
+    {{ _('What are Organizations?') }}
+  </h2>
+  <div class="module-content">
+    <p>
+      {% trans %}
+        CKAN Organizations are used to create, manage and publish collections
+        of datasets. Users can have different roles within an Organization,
+        depending on their level of authorisation to create, edit and publish.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_form.html
new file mode 100644
index 0000000..127a1bc
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_form.html
@@ -0,0 +1,45 @@
+{% import 'macros/form.html' as form %}
+
+
+<form id='organization-edit-form' class="dataset-form" method="post" data-module="basic-form" enctype="multipart/form-data">
+  {{ h.csrf_input() }} 
+  {% block error_summary %}
+    {{ form.errors(error_summary) }}
+  {% endblock %}
+
+  {% block basic_fields %}
+    {% set attrs = {'data-module': 'slug-preview-target', 'class': 'form-control'} %}
+    {{ form.input('title', label=_('Name'), id='field-name', placeholder=h.humanize_entity_type('organization', group_type, 'name placeholder') or _('My Organization'), value=data.title, error=errors.title, classes=['control-full'], attrs=attrs) }}
+
+    {# Perhaps these should be moved into the controller? #}
+    {% set prefix = h.url_for(group_type + '.read', id='') %}
+    {% set domain = h.url_for(group_type + '.read', id='', qualified=true) %}
+    {% set domain = domain|replace("http://", "")|replace("https://", "") %}
+    {% set attrs = {'data-module': 'slug-preview-slug', 'class': 'form-control input-sm', 'data-module-prefix': domain, 'data-module-placeholder': '<' + group_type + '>'} %}
+
+    {{ form.prepend('name', label=_('URL'), prepend=prefix, id='field-url', placeholder=_('my-' + group_type), value=data.name, error=errors.name, attrs=attrs, is_required=true) }}
+
+    {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=h.humanize_entity_type('organization', group_type, 'description placeholder') or _('A little information about my organization...'), value=data.description, error=errors.description) }}
+
+    {% set is_upload = data.image_url and not data.image_url.startswith('http') %}
+    {% set is_url = data.image_url and data.image_url.startswith('http') %}
+
+    {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload) }}
+
+  {% endblock %}
+
+  {% block custom_fields %}
+    {% snippet 'snippets/custom_form_fields.html', extras=data.extras, errors=errors, limit=3 %}
+  {% endblock %}
+
+  {{ form.required_message() }}
+
+  <div class="form-actions">
+    {% block delete_button %}
+      {% if h.check_access('organization_delete', {'id': data.id})  %}
+        <a class="btn btn-danger pull-left" href="{% url_for group_type+'.delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ h.humanize_entity_type('organization', group_type, 'delete confirmation') or _('Are you sure you want to delete this Organization? Note*: Deleting cannot be performed while public or private datasets belong to this organization.') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+      {% endif %}
+    {% endblock %}
+    <button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ h.humanize_entity_type('organization', group_type, 'save label') or _('Save Organization') }}{% endblock %}</button>
+  </div>
+</form>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_item.html
new file mode 100644
index 0000000..69e792b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_item.html
@@ -0,0 +1,51 @@
+{#
+Renders a media item for a organization. This should be used in a list.
+
+organization - A organization dict.
+
+Example:
+
+    <ul class="media-grid">
+      {% for organization in organizations %}
+        {% snippet "organization/snippets/organization_item.html", organization=organization %}
+      {% endfor %}
+    </ul>
+#}
+{% set url = h.url_for(organization.type ~ '.read', id=organization.name) %}
+{% block item %}
+<li class="media-item">
+  {% block item_inner %}
+  {% block image %}
+    <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ organization.name }}" class="img-fluid media-image">
+  {% endblock %}
+  {% block title %}
+    <h2 class="media-heading">{{ organization.display_name }}</h2>
+  {% endblock %}
+  {% block description %}
+    {% if organization.description %}
+      <p class="media-description">{{ h.markdown_extract(organization.description, extract_length=80) }}</p>
+    {% endif %}
+  {% endblock %}
+  {% block datasets %}
+    {% if organization.package_count %}
+      <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', organization.package_count).format(num=organization.package_count) }}</strong>
+    {% else %}
+      <span class="count">{{ _('0 Datasets') }}</span>
+    {% endif %}
+  {% endblock %}
+  {% block capacity %}
+    {% if show_capacity and organization.capacity %}
+    <p><span class="label label-default">{{ h.roles_translated().get(organization.capacity, organization.capacity) }}</span></p>
+    {% endif %}
+  {% endblock %}
+  {% block link %}
+  <a href="{{ url }}" title="{{ _('View {organization_name}').format(organization_name=organization.display_name) }}" class="media-view">
+    <span>{{ _('View {organization_name}').format(organization_name=organization.display_name) }}</span>
+  </a>
+  {% endblock %}
+  {% endblock %}
+</li>
+{% endblock %}
+{% if position is divisibleby 3 %}
+  <li class="clearfix js-hide"></li>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_list.html
new file mode 100644
index 0000000..e3e2604
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization/snippets/organization_list.html
@@ -0,0 +1,19 @@
+{#
+Display a grid of organization items.
+
+organizations - A list of organizations.
+
+Example:
+
+    {% snippet "organization/snippets/organization_list.html" %}
+
+#}
+{% block organization_list %}
+<ul class="media-grid" data-module="media-grid">
+  {% block organization_list_inner %}
+  {% for organization in organizations %}
+    {% snippet "organization/snippets/organization_item.html", organization=organization, position=loop.index, show_capacity=show_capacity %}
+  {% endfor %}
+   {% endblock %}
+</ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization_vre/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization_vre/index.html
new file mode 100644
index 0000000..f9c4c00
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization_vre/index.html
@@ -0,0 +1,47 @@
+{% extends "page.html" %}
+
+{# Added by Francesco Mangiacrapa; see: 8964 #}
+{% block toolbar %}
+{% endblock %}
+
+{% block subtitle %}{{ _('Organizations') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('organization_create') %}
+    {% link_for _('Add Organization'), controller='organization', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ _('Organizations') }}{% endblock %}</h1>
+  {% block organizations_search_form %}
+    {% snippet 'snippets/search_form.html', form_id='organization-search-form', type='organization', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search organizations...'), show_empty=request.args, no_bottom_border=true if c.page.items %}
+  {% endblock %}
+  {% block organizations_list %}
+    {% if c.page.items or request.args %}
+      {% if c.page.items %}
+        {% snippet "organization/snippets/organization_list.html", organizations=c.page.items %}
+      {% endif %}
+    {% else %}
+      <p class="empty">
+        {{ _('There are currently no organizations for this site') }}.
+        {% if h.check_access('organization_create') %}
+          {% link_for _('How about creating one?'), controller='organization', action='new' %}</a>.
+        {% endif %}
+      </p>
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ c.page.pager(q=c.q or '', sort=c.sort_by_selected or '') }}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "organization/snippets/helper.html" %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization_vre/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization_vre/read.html
new file mode 100644
index 0000000..60ae76d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/organization_vre/read.html
@@ -0,0 +1,61 @@
+{% extends "organization/read_base.html" %}
+
+{% block page_primary_action %}
+	{#Added by Francesco Mangiacrapa; see: 8964 #}
+	<script type="text/javascript" >
+		showBreadcrumbIntoSession = function () {
+			CKAN_D4S_Breadcrumb_Manager.setSessionStorageItem("showbreadcrumb", "false");
+			CKAN_D4S_Breadcrumb_Manager.checkBreadcrumbShow();
+		}
+		
+		if(window.addEventListener){
+			window.addEventListener('load', showBreadcrumbIntoSession)
+		}else{
+			window.attachEvent('onload', showBreadcrumbIntoSession)
+		}
+	</script>
+
+  {% if h.check_access('package_create', {'owner_org': c.group_dict.id}) %}
+  {# CODE ADDED BY Francesco Mangiacrapa #}
+  {% set hide = h.get_cookie_value('ckan_hide_header') %}
+  {% if hide=='true' %}
+  {# NOT SHOW 'Manage' #}
+  {% else %}
+  {% link_for _('Add Dataset'), controller='dataset', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+  {% endif %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+    {% block groups_search_form %}
+      {% set facets = {
+        'fields': c.fields_grouped,
+        'search': c.search_facets,
+        'titles': c.facet_titles,
+        'translated_fields': c.translated_fields,
+        'remove_field': c.remove_field }
+      %}
+      {% set sorting = [
+        (_('Relevance'), 'score desc, metadata_modified desc'),
+        (_('Name Ascending'), 'title_string asc'),
+        (_('Name Descending'), 'title_string desc'),
+        (_('Last Modified'), 'metadata_modified desc'),
+        (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+      %}
+      {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.args, fields=c.fields %}
+    {% endblock %}
+  {% block packages_list %}
+    {% if c.page.items %}
+      {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ c.page.pager(q=c.q) }}
+  {% endblock %}
+{% endblock %}
+
+{% block organization_facets %}
+  {% for facet in c.facet_titles %}
+    {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
+  {% endfor %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/base.html
new file mode 100644
index 0000000..a4f52c5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/base.html
@@ -0,0 +1,26 @@
+{% extends "page.html" %}
+
+{% set pkg = pkg_dict %}
+{% set dataset_type = dataset_type or pkg.type or 'dataset' %}
+
+{% block breadcrumb_content_selected %} class="active"{% endblock %}
+
+{% block subtitle %}{{ _(dataset_type.title()) }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {% if pkg %}
+    {% set dataset = h.dataset_display_name(pkg) %}
+    {% if pkg.organization %}
+      {% set organization = h.get_translated(pkg.organization, 'title') or pkg.organization.name %}
+      {% set group_type = pkg.organization.type %}
+      <li>{% link_for h.humanize_entity_type('organization', group_type, 'breadcrumb') or _('Organizations'), named_route=group_type ~ '.index' %}</li>
+      <li>{% link_for organization|truncate(30), named_route=group_type ~ '.read', id=pkg.organization.name, title=organization %}</li>
+    {% else %}
+      <li>{% link_for _(dataset_type.title()), named_route=dataset_type ~ '.search' %}</li>
+    {% endif %}
+    <li{{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), named_route=pkg.type ~ '.read', id=pkg.name, title=dataset %}</li>
+  {% else %}
+    <li>{% link_for _(dataset_type.title()), named_route=dataset_type ~ '.search' %}</li>
+    <li class="active"><a href="">{{ h.humanize_entity_type('package', dataset_type, 'create label') or _('Create Dataset') }}</a></li>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/base_form_page.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/base_form_page.html
new file mode 100644
index 0000000..fe2b7d5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/base_form_page.html
@@ -0,0 +1,36 @@
+{% extends "package/edit_base.html" %}
+
+{% block primary_content %}
+  <section class="module">
+    {% block page_header %}{% endblock %}
+    <div class="module-content">
+      {% block primary_content_inner %}
+        {% block form %}
+          {{- h.snippet(form_snippet, pkg_dict=pkg_dict, **form_vars) -}}
+        {% endblock %}
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  {% block info_module %}
+    <section class="module module-narrow module-shallow">
+      <h2 class="module-heading"><i class="fa fa-info-circle"></i> {{ _('What are datasets?') }}</h2>
+      <div class="module-content">
+        <p>
+          {% trans %}
+          A CKAN Dataset is a collection of data resources (such as files),
+          together with a description and other information, at a fixed URL.
+          Datasets are what users see when searching for data.
+          {% endtrans %}
+        </p>
+      </div>
+    </section>
+  {% endblock %}
+
+  {% block resources_module %}
+    {# TODO: Pass in a list of previously created resources and the current package dict #}
+    {% snippet "package/snippets/resources.html", pkg={}, action='new_resource' %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/collaborator_new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/collaborator_new.html
new file mode 100644
index 0000000..6492813
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/collaborator_new.html
@@ -0,0 +1,77 @@
+{% extends "package/edit_base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% block subtitle %}{{ _('Edit Collaborator') if user else _('Add Collaborator') }} - {{ super() }}{% endblock %}
+
+{% block primary_content_inner %}
+  {% link_for _('Back to all collaborators'), named_route='dataset.collaborators_read', id=pkg_dict.name, class_='btn btn-default pull-right', icon='arrow-left' %}
+  <h1 class="page-heading">
+    {% block page_heading %}{{ _('Edit Collaborator') if user else _('Add Collaborator') }}{% endblock %}
+  </h1>
+  {% block form %}
+  <form class="dataset-form add-member-form" method='post'>
+    {{ h.csrf_input() }}
+    <div class="row">
+      <div class="col-md-5">
+        <div class="form-group control-medium">
+          {% if not user %}
+            <label class="form-label" for="username">
+              {{ _('Existing User') }}
+            </label>
+            <p>
+              {{ _('If you wish to add an existing user, search for their username below.') }}
+            </p>
+          {% endif %}
+          <div class="controls">
+            {% if user %}
+              <input type="hidden" name="username" value="{{ user.name }}" />
+              <input id="username" name="username" type="text" value="{{ user.name }}"
+              disabled="True" class="form-control">
+            {% else %}
+                <input id="username" type="text" name="username" placeholder="{{ _('Username') }}"
+              value="" class="control-medium" data-module="autocomplete"
+              data-module-source="/api/2/util/user/autocomplete?q=?">
+            {% endif %}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    {% set format_attrs = {'data-module': 'autocomplete'} %}
+    {{ form.select('capacity', label=_('Role'), options=capacities, selected=user_capacity, error='', attrs=format_attrs) }}
+    <div class="form-actions">
+      {% if user %}
+        <a href="{{ h.url_for('dataset.collaborator_delete', id=pkg_dict.id, user_id=user.name) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this collaborator?') }}">{{ _('Delete') }}</a>
+        <button class="btn btn-primary" type="submit" name="submit" >
+          {{ _('Update Collaborator') }}
+        </button>
+      {% else %}
+        <button class="btn btn-primary" type="submit" name="submit" >
+          {{ _('Add Collaborator') }}
+        </button>
+      {% endif %}
+    </div>
+  </form>
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+{{ super() }}
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="fa fa-lg fa-info-circle"></i>
+    {{ _('What are the available roles?') }}
+  </h2>
+  <div class="module-content">
+    {% if h.check_config_permission('allow_admin_collaborators') %}
+      {% trans %}
+        <p><strong>Admin:</strong> In addition to managing the dataset, admins can add and remove collaborators from a dataset.</p>
+      {% endtrans %}
+    {% endif %}
+    {% trans %}
+      <p><strong>Editor:</strong> Editors can edit the dataset and its resources, as well accessing the dataset if private.</p>
+      <p><strong>Member:</strong> Members can access the dataset if private, but not edit it.</p>
+    {% endtrans %}
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/collaborators.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/collaborators.html
new file mode 100644
index 0000000..0ff1f7b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/collaborators.html
@@ -0,0 +1,43 @@
+{% extends "package/edit_base.html" %}
+
+{% block subtitle %}{{ _('Collaborators') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('package_collaborator_create', {'id': pkg_dict.id})%}
+    {% link_for _('Add Collaborators'), named_route='dataset.new_collaborator', id=pkg_dict.name, class_='btn btn-primary', icon='plus-square' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  {% set collaborators = h.get_collaborators(pkg_dict['id'])%}
+  {% set count = collaborators|length %}
+  {% set collaborators_count = ungettext('{count} collaborator', '{count} collaborators', count).format(count=count) %}
+  <h3 class="page-heading">{{ collaborators_count }}</h3>
+  <table class="table table-header table-hover table-bordered">
+    <thead>
+      <tr>
+          <th>{{ _('User') }}</th>
+          <th>{{ _('Role') }}</th>
+          <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for user_id, capacity in collaborators %}
+        <tr>
+          <td class="media">
+            {{ h.linked_user(user_id, maxlength=20) }}
+          </td>
+          <td>{{ capacity }}</td>
+          <td>
+            <div class="btn-group pull-right">
+                <a class="btn btn-default btn-sm" href="{{ h.url_for('dataset.new_collaborator', id=pkg_dict.name, user_id=user_id) }}" title="{{ _('Edit') }}">
+                <i class="fa fa-wrench"></i>
+              </a>
+              <a class="btn btn-danger btn-sm" href="{{ h.url_for('dataset.collaborator_delete', id=pkg_dict.name, user_id=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this collaborator?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
+            </div>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/confirm_delete.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/confirm_delete.html
new file mode 100644
index 0000000..9f44b90
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/collaborators/confirm_delete.html
@@ -0,0 +1,22 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete collaborator - {name}?').format(name=user_dict.name) }}</p>
+        <p class="form-actions">
+          <form id="collaborator-confirm-delete-form" action="{{ h.url_for(package_type + '.collaborator_delete', id=package_id, user_id=user_id) }}" method="post">
+            {{ h.csrf_input() }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/confirm_delete.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/confirm_delete.html
new file mode 100644
index 0000000..dbde2da
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/confirm_delete.html
@@ -0,0 +1,23 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        {% set dataset = h.dataset_display_name(pkg_dict) %}
+        <p>{{ _('Are you sure you want to delete dataset - {name}?').format(name=dataset) }}</p>
+        <p class="form-actions">
+          <form id='confirm-dataset-delete-form' action="{% url_for pkg_dict.type ~ '.delete', id=pkg_dict.name %}" method="post">
+            {{ h.csrf_input() }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/confirm_delete_resource.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/confirm_delete_resource.html
new file mode 100644
index 0000000..925b72f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/confirm_delete_resource.html
@@ -0,0 +1,22 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete resource - {name}?').format(name=h.resource_display_name(resource_dict)) }}</p>
+        <p class="form-actions">
+          <form id='confirm-resource-delete-form' action="{% url_for 'resource.delete', resource_id=resource_dict.id, id=pkg_id %}" method="post">
+            {{ h.csrf_input() }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit.html
new file mode 100644
index 0000000..7e0c3d8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit.html
@@ -0,0 +1,7 @@
+{% extends 'package/edit_base.html' %}
+
+{% block primary_content_inner %}
+    {% block form %}
+	{{- h.snippet(form_snippet, pkg_dict=pkg_dict, **form_vars) -}}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit_base.html
new file mode 100644
index 0000000..74c23ef
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit_base.html
@@ -0,0 +1,26 @@
+{% extends 'package/base.html' %}
+
+{% block breadcrumb_content_selected %}{% endblock %}
+
+{% block breadcrumb_content %}
+    {{ super() }}
+    {% if pkg %}
+	<li class="active">{% link_for _('Edit'), named_route=pkg.type ~ '.edit', id=pkg.name %}</li>
+    {% endif %}
+{% endblock %}
+
+{% block content_action %}
+    {% link_for h.humanize_entity_type('package', pkg.type, 'view label') or _('View dataset'), named_route=pkg.type ~ '.read', id=pkg.name, class_='btn btn-default', icon='eye' %}
+{% endblock %}
+
+{% block content_primary_nav %}
+    {{ h.build_nav_icon(pkg.type ~ '.edit', _('Edit metadata'), id=pkg.name, icon='pencil-square') }}
+    {{ h.build_nav_icon(pkg.type ~ '.resources', _('Resources'), id=pkg.name, icon='bars') }}
+    {% if h.check_config_permission('allow_dataset_collaborators') and h.check_access('package_collaborator_create', {'id': pkg_dict.id}) %}
+        {{ h.build_nav_icon(pkg.type ~ '.collaborators_read', _('Collaborators'), id=pkg.name, icon='users')}}
+    {% endif %}
+{% endblock %}
+
+{% block secondary_content %}
+    {% snippet 'package/snippets/info.html', pkg=pkg, hide_follow_button=true %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit_view.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit_view.html
new file mode 100644
index 0000000..9b2f5a9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/edit_view.html
@@ -0,0 +1,25 @@
+{% extends "package/view_edit_base.html" %}
+
+{% block subtitle %}{{ _('Edit view') }} {{ g.template_title_delimiter }} {{ h.resource_display_name(resource) }}{% endblock %}
+{% block form_title %}{{ _('Edit view') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  <li class="active"><a href="#">{{ _('Edit view') }}</a></li>
+{% endblock %}
+
+{% block content_primary_nav %}
+  <li class="active"><a href="#"><i class="fa fa-pencil-square"></i> {{ _('Edit view') }}</a></li>
+{% endblock %}
+
+{% block form %}
+  <form class="dataset-form dataset-resource-form" method="post" data-module="basic-form resource-form">
+    {{ h.csrf_input() }} 
+    {% include 'package/snippets/view_form.html' %}
+    <div class="form-actions">
+      <button class="btn btn-danger pull-left" name="delete" value="Delete"> {{ _('Delete') }} </button>
+      <button class="btn btn-default {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
+      <button class="btn btn-primary" name="save" value="Save" type="submit">{{ _('Update') }}</button>
+    </div>
+  </form>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/followers.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/followers.html
new file mode 100644
index 0000000..5e6cfbb
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/followers.html
@@ -0,0 +1,10 @@
+{% extends "package/read_base.html" %}
+
+{% block subtitle %}{{ _('Followers') }} {{ g.template_title_delimiter }} {{ h.dataset_display_name(pkg_dict) }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ _('Followers') }}{% endblock %}</h1>
+  {% block followers_list %}
+    {% snippet "user/snippets/followers.html", followers=followers %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/group_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/group_list.html
new file mode 100644
index 0000000..e911a04
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/group_list.html
@@ -0,0 +1,30 @@
+{% extends "package/read_base.html" %}
+{% import 'macros/form.html' as form %}
+
+{% set default_group_type = h.default_group_type('group') %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ h.humanize_entity_type('group', default_group_type, 'page title') or _('Groups') }}</h2>
+
+  {% if group_dropdown %}
+    <form class="add-to-group" method="post">
+      {{ h.csrf_input() }}
+      <select id="field-add_group" name="group_added" data-module="autocomplete">
+        {% for option in group_dropdown %}
+          <option value="{{ option[0] }}"> {{ option[1] }}</option>
+        {% endfor %}
+      </select>
+      <button type="submit" class="btn btn-primary" title="{{ _('Associate this group with this dataset') }}">{{ _('Add to group') }}</button>
+    </form>
+  {% endif %}
+
+  {% if pkg_dict.groups %}
+    <form method="post">
+      {{ h.csrf_input() }}
+      {% snippet 'group/snippets/group_list.html', groups=pkg_dict.groups %}
+    </form>
+  {% else %}
+    <p class="empty">{{ h.humanize_entity_type('group', default_group_type, 'no associated label') or _('There are no groups associated with this dataset') }}</p>
+  {% endif %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new.html
new file mode 100644
index 0000000..9caefc4
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new.html
@@ -0,0 +1,10 @@
+{% if not h.organizations_available('create_dataset')
+  and not h.check_config_permission('ckan.auth.create_unowned_dataset') %}
+
+  {% include "package/snippets/cannot_create_package.html" %}
+
+{% else %}
+  {% extends "package/base_form_page.html" %}
+
+  {% block subtitle %}{{ h.humanize_entity_type('package', dataset_type, 'create title') or _('Create Dataset') }}{% endblock %}
+{% endif  %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_package_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_package_form.html
new file mode 100644
index 0000000..d6669f1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_package_form.html
@@ -0,0 +1,27 @@
+{% extends 'package/snippets/package_form.html' %}
+
+{% block stages %}
+  {% if form_style != 'edit' %}
+    {{ super() }}
+  {% endif %}
+{% endblock %}
+
+{% block save_button_text %}
+  {% if form_style != 'edit' %}
+    {{ super() }}
+  {% else %}
+    {{ h.humanize_entity_type('package', pkg_dict.type, 'update label') or _('Update Dataset') }}
+  {% endif %}
+{% endblock %}
+
+{% block cancel_button %}
+  {% if form_style != 'edit' %}
+    {{ super() }}
+  {% endif %}
+{% endblock %}
+
+{% block delete_button %}
+  {% if form_style == 'edit' and h.check_access('package_delete', {'id': pkg_dict.id}) %}
+    {{ super() }}
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_resource.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_resource.html
new file mode 100644
index 0000000..370df27
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_resource.html
@@ -0,0 +1,24 @@
+{% extends "package/base_form_page.html" %}
+
+{% set logged_in = true if c.userobj else false %}
+
+{% block subtitle %}{{ _('Add data to the dataset') }}{% endblock %}
+
+{% block breadcrumb_content_selected %}{% endblock %}
+{% block breadcrumb_content %}
+  {{ super() }}
+  {% if pkg %}
+    <li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
+  {% endif %}
+{% endblock %}
+
+{% block form %}{% snippet resource_form_snippet, data=data, errors=errors, error_summary=error_summary, include_metadata=false, pkg_name=pkg_name, stage=stage, dataset_type=dataset_type %}{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'package/snippets/resource_help.html' %}
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  {% asset 'vendor/fileupload' %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_resource_not_draft.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_resource_not_draft.html
new file mode 100644
index 0000000..4b56382
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_resource_not_draft.html
@@ -0,0 +1,21 @@
+{% extends "package/resource_edit_base.html" %}
+
+{% block subtitle %}{{ _('Add resource') }} {{ g.template_title_delimiter }} {{ h.dataset_display_name(pkg) }}{% endblock %}
+{% block form_title %}{{ _('Add resource') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  <li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
+{% endblock %}
+
+{% block form %}
+  {% snippet resource_form_snippet, data=data, errors=errors, error_summary=error_summary, include_metadata=false, pkg_name=pkg_name, stage=stage, dataset_type=dataset_type %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  <li class="active"><a href="#"><i class="fa fa-pencil-square"></i> {{ _('New resource') }}</a></li>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'package/snippets/resource_help.html' %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_view.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_view.html
new file mode 100644
index 0000000..af4d0aa
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/new_view.html
@@ -0,0 +1,33 @@
+{% extends "package/view_edit_base.html" %}
+
+{% block subtitle %}{{ _('Add view') }} {{ g.template_title_delimiter }} {{ h.resource_display_name(resource) }}{% endblock %}
+{% block form_title %}{{ _('Add view') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  <li class="active"><a href="#">{{ _('Add view') }}</a></li>
+{% endblock %}
+
+{% block content_primary_nav %}
+  <li class="active"><a href="#"><i class="fa fa-pencil-square"></i> {{ _('Add view') }}</a></li>
+{% endblock %}
+
+{% block form %}
+  {% if resource_view.view_type == 'recline_view' and not datastore_available %}
+    <p class="text-info">
+      <i class="fa fa-info-circle"></i>
+      {% trans %}
+      Data Explorer views may be slow and unreliable unless the DataStore extension is enabled. For more information, please see the <a href='http://docs.ckan.org/en/latest/maintaining/data-viewer.html#viewing-structured-data-the-data-explorer' target='_blank'>Data Explorer documentation</a>.
+      {% endtrans %}
+    </p>
+  {% endif %}
+
+  <form class="dataset-form dataset-resource-form" method="post" data-module="basic-form resource-form">
+    {{ h.csrf_input() }} 
+    {% include 'package/snippets/view_form.html' %}
+    <div class="form-actions">
+        <button class="btn btn-default {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" type="submit">{{ _('Preview') }}</button>
+        <button class="btn btn-primary" name="save" value="Save" type="submit">{% block save_button_text %}{{ _('Add') }}{% endblock %}</button>
+    </div>
+  </form>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/read.html
new file mode 100644
index 0000000..22aa51c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/read.html
@@ -0,0 +1,46 @@
+{% extends "package/read_base.html" %}
+
+{% block primary_content_inner %}
+  {{ super() }}
+  {% block package_description %}
+    {% if pkg.private %}
+      <span class="dataset-private badge badge-inverse pull-right">
+        <i class="fa fa-lock"></i>
+        {{ _('Private') }}
+      </span>
+    {% endif %}
+    <h1>
+      {% block page_heading %}
+        {{ h.dataset_display_name(pkg) }}
+        {% if pkg.state.startswith('draft') %}
+          [{{ _('Draft') }}]
+        {% endif %}
+        {% if pkg.state == 'deleted' %}
+          [{{ _('Deleted') }}]
+        {% endif %}
+      {% endblock %}
+    </h1>
+    {% block package_notes %}
+      {% if pkg.notes %}
+        <div class="notes embedded-content">
+          {{ h.render_markdown(h.get_translated(pkg, 'notes')) }}
+        </div>
+      {% endif %}
+    {% endblock %}
+    {# FIXME why is this here? seems wrong #}
+    <span class="insert-comment-thread"></span>
+  {% endblock %}
+
+  {% block package_resources %}
+    {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
+  {% endblock %}
+
+  {% block package_tags %}
+    {% snippet "package/snippets/tags.html", tags=pkg.tags %}
+  {% endblock %}
+
+  {% block package_additional_info %}
+    {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
+  {% endblock %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/read_base.html
new file mode 100644
index 0000000..f8e1ce1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/read_base.html
@@ -0,0 +1,48 @@
+{% extends "package/base.html" %}
+
+{% set default_group_type = h.default_group_type('group') %}
+
+{% block subtitle %}{{ h.dataset_display_name(pkg) }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
+{% block head_extras -%}
+  {{ super() }}
+  {% set description = h.markdown_extract(pkg.notes, extract_length=200)|forceescape %}
+  <meta property="og:title" content="{{ h.dataset_display_name(pkg) }} - {{ g.site_title }}">
+  <meta property="og:description" content="{{ description|forceescape|trim }}">
+{% endblock -%}
+
+{% block content_action %}
+  {% if h.check_access('package_update', {'id':pkg.id }) %}
+    {% link_for _('Manage'), named_route=pkg.type ~ '.edit', id=pkg.name, class_='btn btn-light', icon='wrench' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(dataset_type ~ '.read', _('Dataset'),  id=pkg.name, icon='sitemap') }}
+  {{ h.build_nav_icon(dataset_type ~ '.groups', h.humanize_entity_type('group', default_group_type, 'content tab') or _('Groups'), id=pkg.name, icon='users') }}
+{% endblock %}
+
+{% block secondary_content %}
+
+  {% block secondary_help_content %}{% endblock %}
+
+  {% block package_info %}
+    {% snippet 'package/snippets/info.html', pkg=pkg %}
+  {% endblock %}
+
+  {% block package_organization %}
+    {% if pkg.organization %}
+      {% set org = h.get_organization(pkg.organization.id) %}
+      {% snippet "snippets/organization.html", organization=org, has_context_title=true %}
+    {% endif %}
+  {% endblock %}
+
+  {% block package_social %}
+    {% snippet "snippets/social.html" %}
+  {% endblock %}
+
+  {% block package_license %}
+    {% snippet "snippets/license.html", pkg_dict=pkg %}
+  {% endblock %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_edit.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_edit.html
new file mode 100644
index 0000000..cb482bd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_edit.html
@@ -0,0 +1,14 @@
+{% extends "package/resource_edit_base.html" %}
+
+{% block subtitle %}{{ _('Edit') }} {{ g.template_title_delimiter }} {{ h.resource_display_name(res) }} {{ g.template_title_delimiter }} {{ h.dataset_display_name(pkg) }}{% endblock %}
+
+{% block form %}
+  {% snippet 'package/snippets/resource_edit_form.html',
+    data=data,
+    errors=errors,
+    error_summary=error_summary,
+    pkg_name=pkg.name,
+    form_action=form_action,
+    resource_form_snippet=resource_form_snippet,
+    dataset_type=dataset_type %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_edit_base.html
new file mode 100644
index 0000000..4d6fce5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_edit_base.html
@@ -0,0 +1,41 @@
+{% extends "package/base.html" %}
+
+{% set logged_in = true if c.userobj else false %}
+{% set res = resource %}
+
+{% block breadcrumb_content_selected %}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  {% if res %}
+      <li>{% link_for h.resource_display_name(res)|truncate(30), named_route=pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id, title=h.resource_display_name(res) %}</li>
+      <li{% block breadcrumb_edit_selected %} class="active"{% endblock %}><a href="">{{ _('Edit') }}</a></li>
+  {% endif %}
+{% endblock %}
+
+{% block content_action %}
+    {% link_for _('All resources'), named_route=pkg.type ~ '.resources', id=pkg.name, class_='btn btn-default', icon='arrow-left' %}
+    {% if res %}
+	{% link_for _('View resource'), named_route=pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='eye' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(pkg.type ~ '_resource.edit', _('Edit resource'), id=pkg.name, resource_id=res.id, icon='pencil-square') }}
+  {% block inner_primary_nav %}{% endblock %}
+  {{ h.build_nav_icon(pkg.type ~ '_resource.views', _('Views'), id=pkg.name, resource_id=res.id, icon='bars') }}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block form_title %}{{ _('Edit resource') }}{% endblock %}</h1>
+  {% block form %}{% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'package/snippets/resource_info.html', res=res %}
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  {% asset 'vendor/fileupload' %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_read.html
new file mode 100644
index 0000000..4e9ef36
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_read.html
@@ -0,0 +1,218 @@
+{% extends "package/base.html" %}
+
+{% set res = resource %}
+
+{% block head_extras -%}
+  {{ super() }}
+  {% set description = h.markdown_extract(h.get_translated(res, 'description'), extract_length=200) if res.description else h.markdown_extract(h.get_translated(package, 'notes'), extract_length=200) %}
+  <meta property="og:title" content="{{ h.dataset_display_name(package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}">
+  <meta property="og:description" content="{{ description|forceescape }}">
+{% endblock -%}
+
+{% block subtitle %}{{ h.dataset_display_name(package) }} {{ g.template_title_delimiter }} {{ h.resource_display_name(res) }}{% endblock %}
+
+{% block breadcrumb_content_selected %}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  <li class="active"><a href="" title="{{ h.resource_display_name(res) }}">{{ h.resource_display_name(res)|truncate(30) }}</a></li>
+{% endblock %}
+
+{% block pre_primary %}
+  {% block resource %}
+    <section class="module module-resource" role="complementary">
+      {% block resource_inner %}
+      <div class="module-content">
+        <div class="actions">
+          {% block resource_actions %}
+            <ul>
+              {% block resource_actions_inner %}
+                {% block action_manage %}
+                  {% if h.check_access('package_update', {'id':pkg.id }) %}
+                    <li>{% link_for _('Manage'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='wrench' %}</li>
+                  {% endif %}
+                {% endblock action_manage %}
+                <li>
+                  <div class="btn-group">
+                    {% if res.url and h.is_url(res.url) %}
+                      <a class="btn btn-primary resource-url-analytics" href="{{ res.url }}">
+                        {% if res.resource_type in ('listing', 'service') %}
+                          <i class="fa fa-eye"></i> {{ _('View') }}
+                        {% elif  res.resource_type == 'api' %}
+                          <i class="fa fa-key"></i> {{ _('API Endpoint') }}
+                        {% elif not res.has_views and not res.url_type == 'upload' %}
+                          <i class="fa fa-external-link"></i> {{ _('Go to resource') }}
+                        {% else %}
+                          <i class="fa fa-arrow-circle-down"></i> {{ _('Download') }}
+                        {% endif %}
+                      </a>
+                    {% endif %}
+                    {% block download_resource_button %}
+                      {% if res.datastore_active %}
+                        <button class="btn btn-primary dropdown-toggle" role="button" id="dropdownDownloadFormat" data-bs-toggle="dropdown" aria-expanded="false" aria-label="{{ _('List of downloadable formats') }}">
+                          {% if not res.url or not h.is_url(res.url) %}
+                            {{ _('Download') }}&nbsp;
+                          {% endif %}
+                          <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="dropdownDownloadFormat">
+                          <li>
+                            <a class="dropdown-item" href="{{ h.url_for('datastore.dump', resource_id=res.id, bom=True) }}"
+                              target="_blank" rel="noreferrer"><span>CSV</span></a>
+                          </li>
+                          <li>
+                            <a class="dropdown-item" href="{{ h.url_for('datastore.dump', resource_id=res.id, format='tsv', bom=True) }}"
+                              target="_blank" rel="noreferrer"><span>TSV</span></a>
+                          </li>
+                          <li>
+                              <a class="dropdown-item" href="{{ h.url_for('datastore.dump', resource_id=res.id, format='json') }}"
+                              target="_blank" rel="noreferrer"><span>JSON</span></a>
+                          </li>
+                          <li>
+                              <a class="dropdown-item" href="{{ h.url_for('datastore.dump', resource_id=res.id, format='xml') }}"
+                              target="_blank" rel="noreferrer"><span>XML</span></a>
+                          </li>
+                        </ul>
+                      {% endif %}
+                    {% endblock %}
+                  </div>
+                </li>
+              {% endblock %}
+            </ul>
+          {% endblock %}
+        </div>
+        {% block resource_content %}
+          {% block resource_read_title %}<h1 class="page-heading" title="{{ h.resource_display_name(res) }}">{{ h.resource_display_name(res) | truncate(50) }}</h1>{% endblock %}
+          {% block resource_read_url %}
+            {% if res.url and h.is_url(res.url) %}
+              <p class="text-muted ellipsis">{{ _('URL:') }} <a class="resource-url-analytics" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
+            {% elif res.url %}
+              <p class="text-muted break-word">{{ _('URL:') }} {{ res.url }}</p>
+            {% endif %}
+          {% endblock %}
+          <div class="prose notes" property="rdfs:label">
+            {% if res.description %}
+              {{ h.render_markdown(res.description) }}
+            {% endif %}
+            {% if not res.description and package.notes %}
+              <h3>{{ _('Dataset description:') }}</h3>
+              <blockquote>{{ h.markdown_extract(h.get_translated(package, 'notes')) }}</blockquote>
+              <p>{% trans dataset=h.get_translated(package, 'title'), url=h.url_for(package.type ~ '.read', id=package.name) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
+            {% endif %}
+          </div>
+        {% endblock %}
+      {% block data_preview %}
+      {% block resource_view %}
+        {% block resource_view_nav %}
+          {% snippet "package/snippets/resource_views_list.html",
+             views=resource_views,
+             pkg=pkg,
+             is_edit=false,
+             view_id=current_resource_view['id'],
+             resource=resource,
+             extra_class="nav-tabs"
+           %}
+        {% endblock %}
+          {% block resource_view_content %}
+            <div class="resource-view">
+              {% if resource_views %}
+                  {% for resource_view in resource_views %}
+                    {% if resource_view == current_resource_view %}
+                      {% snippet 'package/snippets/resource_view.html',
+                         resource_view=resource_view,
+                         resource=resource,
+                         package=package
+                       %}
+                    {% endif %}
+                  {% endfor %}
+              {% else %}
+                {# Views not created #}
+                <div class="data-viewer-info">
+                  <p>{{ _("There are no views created for this resource yet.") }}</p>
+                  {% if h.check_access('resource_view_create', {'resource_id': resource.id}) %}
+                    <p class="text-muted">
+                      <i class="fa fa-info-circle"></i>
+                      {{ _("Not seeing the views you were expecting?")}}
+                      <a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target="#data-view-info">
+                        {{ _('Click here for more information.') }}</a>
+                    </p>
+                    <div id="data-view-info" class="collapse">
+                      <p>{{ _('Here are some reasons you may not be seeing expected views:') }}</p>
+                      <ul>
+                        <li>{{ _("No view has been created that is suitable for this resource")}}</li>
+                        <li>{{ _("The site administrators may not have enabled the relevant view plugins")}}</li>
+                        <li>{{ _("If a view requires the DataStore, the DataStore plugin may not be enabled, or the data may not have been pushed to the DataStore, or the DataStore hasn't finished processing the data yet")}}</li>
+                      </ul>
+                    </div>
+                  {% endif %}
+                </div>
+              {% endif %}
+            </div>
+          {% endblock %}
+        </div>
+      {% endblock %}
+      {% endblock %}
+      {% endblock %}
+    </section>
+  {% endblock %}
+{% endblock %}
+
+{% block primary_content %}
+  {% block resource_additional_information %}
+    {% if res %}
+      <section class="module">
+        {% block resource_additional_information_inner %}
+        <div class="module-content">
+          <h2>{{ _('Additional Information') }}</h2>
+          <table class="table table-striped table-bordered table-condensed" data-module="table-toggle-more">
+            <thead>
+              <tr>
+                <th scope="col">{{ _('Field') }}</th>
+                <th scope="col">{{ _('Value') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <th scope="row">{{ _('Data last updated') }}</th>
+                <td>{{ h.render_datetime(res.last_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('Metadata last updated') }}</th>
+                <td>{{ h.render_datetime(res.metadata_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('Created') }}</th>
+                <td>{{ h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('Format') }}</th>
+                <td>{{ res.format or res.mimetype_inner or res.mimetype or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('License') }}</th>
+                <td>{% snippet "snippets/license.html", pkg_dict=pkg, text_only=True %}</td>
+              </tr>
+              {% for key, value in h.format_resource_items(res.items()) %}
+                {% if key not in ('created', 'metadata modified', 'last modified', 'format') %}
+                  <tr class="toggle-more"><th scope="row">{{ key | capitalize }}</th><td>{{ value }}</td></tr>
+                {% endif %}
+              {% endfor %}
+            </tbody>
+          </table>
+        </div>
+        {% endblock %}
+      </section>
+    {% endif %}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+
+  {% block resources_list %}
+    {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id, action='read' %}
+  {% endblock %}
+
+  {% block resource_license %}
+    {% snippet "snippets/social.html" %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_views.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_views.html
new file mode 100644
index 0000000..6906215
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resource_views.html
@@ -0,0 +1,29 @@
+{% import 'macros/form.html' as form %}
+{% extends "package/resource_edit_base.html" %}
+
+{% block subtitle %}{{ _('View') }} {{ g.template_title_delimiter }} {{ h.resource_display_name(res) }}{% endblock %}
+
+{% block page_primary_action %}
+  <div class="dropdown btn-group">
+    <a class="btn btn-primary dropdown-toggle" role="button" id="dropdownView" data-bs-toggle="dropdown" aria-expanded="false" href="#">
+      <i class="fa fa-plus-square"></i>
+      {{ _('New view') }}
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu" aria-labelledby="dropdownView">
+      {% for option in h.get_allowed_view_types(resource, pkg_dict)  %}
+        {% set url = h.url_for(pkg_dict.type ~ '_resource.edit_view', id=pkg_dict.name, resource_id=resource.id, view_type=option[0]) %}
+        <li><a href="{{ url }}" class="dropdown-item"><i class="fa fa-{{ option[2] }}"></i> {{ option[1] }}</a></li>
+      {% endfor %}
+    </ul>
+  </div>
+  {% asset 'vendor/reorder' %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  {% if views %}
+    {% snippet "package/snippets/resource_views_list.html", views=views, pkg=pkg, is_edit=true, extra_attributes='data-module = resource-view-reorder data-module-id=' + resource.id, extra_class='flex-column resource-view-list nav-pills nav-stacked' %}
+  {% else %}
+    <p class="empty">{{ _('This resource has no views') }}</p>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resources.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resources.html
new file mode 100644
index 0000000..a5088c9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/resources.html
@@ -0,0 +1,31 @@
+{% extends "package/edit_base.html" %}
+
+{% set has_reorder = pkg_dict and pkg_dict.resources and pkg_dict.resources|length > 0 %}
+
+{% block subtitle %}{{ _('Resources') }} {{ g.template_title_delimiter }} {{ h.dataset_display_name(pkg) }}{% endblock %}
+
+{% block page_primary_action %}
+  {% link_for _('Add new resource'), named_route=pkg_dict.type ~ '_resource.new', id=pkg_dict.name, class_='btn btn-primary', icon='plus' %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  {% if pkg.resources %}
+    <ul class="resource-list"{% if has_reorder %} data-module="resource-reorder" data-module-id="{{ pkg.id }}"{% endif %}>
+      {% set can_edit = h.check_access('package_update', {'id':pkg.id }) %}
+      {% for resource in pkg.resources %}
+        {% snippet 'package/snippets/resource_item.html', pkg=pkg, res=resource, url_is_edit=true, can_edit=can_edit %}
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans url=h.url_for(pkg.type ~ '_resource.new', id=pkg.name) %}
+      <p class="empty">This dataset has no data, <a href="{{ url }}">why not add some?</a></p>
+    {% endtrans %}
+  {% endif %}
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  {% if has_reorder %}
+    {% asset 'vendor/reorder' %}
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/search.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/search.html
new file mode 100644
index 0000000..0809ef2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/search.html
@@ -0,0 +1,90 @@
+{% extends "page.html" %}
+{% import 'macros/form.html' as form %}
+
+{% block subtitle %}{{ _(dataset_type.title()) }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_(dataset_type.title() + 's'), named_route='%s.search' % dataset_type) }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      {% block page_primary_action %}
+        {% if h.check_access('package_create') %}
+          {# ADDED BY FRANCESCO MANGIACRAPA, 'ADD DATASET' IS SHOWN ONLY TO USER SYSADMIN' #7188 #}
+			    {% if c.userobj and c.userobj.sysadmin %}
+            <div class="page_primary_action">
+              {{ h.snippet ('snippets/add_dataset.html', dataset_type=dataset_type) }}
+            </div>
+          {% endif %}
+        {% endif %}
+      {% endblock %}
+      {% block form %}
+        {% set facets = {
+          'fields': fields_grouped,
+          'search': search_facets,
+          'titles': facet_titles,
+          'translated_fields': translated_fields,
+          'remove_field': remove_field }
+        %}
+        {% set sorting = [
+          (_('Relevance'), 'score desc, metadata_modified desc'),
+          (_('Name Ascending'), 'title_string asc'),
+          (_('Name Descending'), 'title_string desc'),
+          (_('Last Modified'), 'metadata_modified desc'),
+          (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+        %}
+        {% snippet 'snippets/search_form.html', form_id='dataset-search-form', type=dataset_type, query=q, sorting=sorting, sorting_selected=sort_by_selected, count=page.item_count, placeholder=h.humanize_entity_type('package', dataset_type, 'search placeholder') or _('Search datasets...'), facets=facets, show_empty=request.args, error=query_error, fields=fields %}
+      {% endblock %}
+      {% block package_search_results_list %}
+        {{ h.snippet('snippets/package_list.html', packages=page.items) }}
+      {% endblock %}
+    </div>
+
+    {% block page_pagination %}
+      {{ page.pager(q=q) }}
+    {% endblock %}
+  </section>
+
+  {% block package_search_results_api %}
+    <section class="module">
+      <div class="module-content">
+        {% block package_search_results_api_inner %}
+          <small>
+            {# Commented by Francesco, see Support #18126  #}
+            {#
+              {% set api_link = h.link_to(_('API'), h.url_for('api.get_api', ver=3)) %}
+              {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version)) %}
+              {% if g.dumps_url -%}
+                {% set dump_link = h.link_to(_('full {format} dump').format(format=g.dumps_format), g.dumps_url) %}
+                {% trans %}
+                You can also access this registry using the {{ api_link }} (see {{ api_doc_link }}) or download a {{ dump_link }}.
+            {% endtrans %}
+              {% else %}
+            {% trans %}
+            You can also access this registry using the {{ api_link }} (see {{ api_doc_link}}).
+            {% endtrans %}
+              {%- endif %}
+          #}
+          </small>
+        {% endblock %}
+      </div>
+    </section>
+  {% endblock %}
+{% endblock %}
+
+
+{% block secondary_content %}
+  <div class="filters">
+    <div>
+      <!--ADDED BY FRANCESCO MANGIACRAPA-->
+      {% snippet "spatial/snippets/spatial_query.html" %}
+      <!--END ADD-->
+      {% for facet in facet_titles %}
+        {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, search_facets=search_facets) }}
+      {% endfor %}
+    </div>
+    <a class="close no-text hide-filters"><i class="fa fa-times-circle"></i><span class="text">close</span></a>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/additional_info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/additional_info.html
new file mode 100644
index 0000000..d4070ce
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/additional_info.html
@@ -0,0 +1,95 @@
+<section class="additional-info">
+  <h3>{{ _('Additional Info') }}</h3>
+  <table class="table table-striped table-bordered table-condensed">
+    <thead>
+      <tr>
+        <th scope="col">{{ _('Field') }}</th>
+        <th scope="col">{{ _('Value') }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% block package_additional_info %}
+        {% if pkg_dict.url %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _('Source') }}</th>
+            {% if h.is_url(pkg_dict.url) %}
+              <td class="dataset-details" property="foaf:homepage">
+                <a href="{{ pkg_dict.url }}" rel="foaf:homepage" target="_blank">
+                  {{ pkg_dict.url }}
+                </a>
+              </td>
+            {% else %}
+              <td class="dataset-details" property="foaf:homepage">{{ pkg_dict.url }}</td>
+            {% endif %}
+          </tr>
+        {% endif %}
+
+        {% if pkg_dict.author_email %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Author") }}</th>
+            <td class="dataset-details" property="dc:creator">{{ h.mail_to(email_address=pkg_dict.author_email, name=pkg_dict.author) }}</td>
+          </tr>
+        {% elif pkg_dict.author %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Author") }}</th>
+            <td class="dataset-details" property="dc:creator">{{ pkg_dict.author }}</td>
+          </tr>
+        {% endif %}
+
+        {% if pkg_dict.maintainer_email %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
+            <td class="dataset-details" property="dc:contributor">{{ h.mail_to(email_address=pkg_dict.maintainer_email, name=pkg_dict.maintainer) }}</td>
+          </tr>
+        {% elif pkg_dict.maintainer %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
+            <td class="dataset-details" property="dc:contributor">{{ pkg_dict.maintainer }}</td>
+          </tr>
+        {% endif %}
+
+        {% if pkg_dict.version %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Version") }}</th>
+            <td class="dataset-details">{{ pkg_dict.version }}</td>
+          </tr>
+        {% endif %}
+
+        {% if h.check_access('package_update',{'id':pkg_dict.id}) %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("State") }}</th>
+            <td class="dataset-details">{{ _(pkg_dict.state) }}</td>
+          </tr>
+        {% endif %}
+        {% if pkg_dict.metadata_modified %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Last Updated") }}</th>
+            <td class="dataset-details">
+                {% snippet 'snippets/local_friendly_datetime.html', datetime_obj=pkg_dict.metadata_modified %}
+            </td>
+          </tr>
+        {% endif %}
+        {% if pkg_dict.metadata_created %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Created") }}</th>
+
+            <td class="dataset-details">
+                {% snippet 'snippets/local_friendly_datetime.html', datetime_obj=pkg_dict.metadata_created %}
+            </td>
+          </tr>
+        {% endif %}
+
+      {% block extras scoped %}
+        {% for extra in h.sorted_extras(pkg_dict.extras) %}
+          {% set key, value = extra %}
+          <tr rel="dc:relation" resource="_:extra{{ i }}">
+            <th scope="row" class="dataset-label" property="rdfs:label">{{ _(key|e) }}</th>
+            <td class="dataset-details" property="rdf:value">{{ value }}</td>
+          </tr>
+        {% endfor %}
+      {% endblock %}
+
+      {% endblock %}
+    </tbody>
+  </table>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/cannot_create_package.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/cannot_create_package.html
new file mode 100644
index 0000000..c94f6a1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/cannot_create_package.html
@@ -0,0 +1,27 @@
+{% extends "package/base_form_page.html" %}
+
+{% block primary_content %}
+
+{% block page_header %}{% endblock %}
+    <section class="module">
+        <div class="module-content">
+          {% block primary_content_inner %}
+              {%  if h.check_access('organization_create') %}
+                <div class="alert alert-warning">{{ _('Before you can create a dataset you need to create an organization.') }}</div>
+
+                  <a class='btn btn-primary' href="{{ h.url_for('organization.new') }}">
+                    {{ _('Create a new organization') }}
+                  </a>
+
+              {% else %}
+                   <div class="alert alert-danger">
+                      <p> {{ _('There are no organizations to which you can assign this dataset.') }} </p>
+                      <p>{{ _('Ask a system administrator to create an organization before you can continue.') }}</p>
+                   </div>
+
+              {% endif %}
+
+            {% endblock %}
+        </div>
+    </section>
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/info.html
new file mode 100644
index 0000000..20678ff
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/info.html
@@ -0,0 +1,41 @@
+{#
+Displays a sidebar module with information for given package
+
+pkg    - The package dict that owns the resources.
+
+Example:
+
+  {% snippet "package/snippets/info.html", pkg=pkg %}
+
+#}
+{% block package_info %}
+  {% if pkg %}
+    <section class="module module-narrow">
+      <div class="module context-info">
+        <div class="module-content">
+          {% block package_info_inner %}
+            {% block heading %}
+              <h1 class="heading">{{ h.dataset_display_name(pkg) }}</h1>
+            {% endblock %}
+            {% block nums %}
+              {% set num_followers = h.follow_count('dataset', pkg.id) %}
+              <div class="nums">
+                <dl>
+                  <dt>{{ _('Followers') }}</dt>
+                  <dd data-module="followers-counter" data-module-id="{{ pkg.id }}" data-module-num_followers="{{ num_followers }}">{{ h.SI_number_span(num_followers) }}</dd>
+                </dl>
+              </div>
+            {% endblock %}
+            {% block follow_button %}
+              {% if not hide_follow_button %}
+                <div class="follow_button">
+                  {{ h.follow_button('dataset', pkg.id) }}
+                </div>
+              {% endif %}
+            {% endblock %}
+          {% endblock %}
+        </div>
+      </div>
+    </section>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/new_package_breadcrumb.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/new_package_breadcrumb.html
new file mode 100644
index 0000000..b5c9ed2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/new_package_breadcrumb.html
@@ -0,0 +1,2 @@
+<li>{% link_for h.humanize_entity_type('package', dataset_type, 'breadcrumb') or _('Datasets'), named_route='dataset.search' %}</li>
+<li class="active">{% link_for h.humanize_entity_type('package', dataset_type, 'create label') or _('Create Dataset'), named_route='dataset.new' %}</li>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_basic_fields.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_basic_fields.html
new file mode 100644
index 0000000..bf80ff1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_basic_fields.html
@@ -0,0 +1,123 @@
+{% import 'macros/form.html' as form %}
+
+{% set default_group_type = h.default_group_type('organization') %}
+
+{% block package_basic_fields_title %}
+  {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. A descriptive title'), value=data.title, error=errors.title, classes=['control-full', 'control-large'], attrs={'data-module': 'slug-preview-target', 'class': 'form-control'}) }}
+{% endblock %}
+
+{% block package_basic_fields_url %}
+  {% set prefix = h.url_for('dataset.read', id='') %}
+  {% set domain = h.url_for('dataset.read', id='', qualified=true) %}
+  {% set domain = domain|replace("http://", "")|replace("https://", "") %}
+  {% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain, 'data-module-placeholder': '<dataset>', 'class': 'form-control input-sm'} %}
+
+  {{ form.prepend('name', id='field-name', label=_('URL'), prepend=prefix, placeholder=_('eg. my-dataset'), value=data.name, error=errors.name, attrs=attrs, is_required=true) }}
+{% endblock %}
+
+{% block package_basic_fields_custom %}{% endblock %}
+
+{% block package_basic_fields_description %}
+  {{ form.markdown('notes', id='field-notes', label=_('Description'), placeholder=_('eg. Some useful notes about the data'), value=data.notes, error=errors.notes) }}
+{% endblock %}
+
+{% block package_basic_fields_tags %}
+  {% set tag_attrs = {'data-module': 'autocomplete', 'data-module-tags': '', 'data-module-source': '/api/2/util/tag/autocomplete?incomplete=?'} %}
+  {{ form.input('tag_string', id='field-tags', label=_('Tags'), placeholder=_('eg. economy, mental health, government'), value=data.tag_string, error=errors.tags, classes=['control-full'], attrs=tag_attrs) }}
+{% endblock %}
+
+{% block package_basic_fields_license %}
+  <div class="form-group control-full">
+    {% set error = errors.license_id %}
+    <label class="form-label" for="field-license">{{ _("License") }}</label>
+    <div class="controls">
+      <select id="field-license" name="license_id" data-module="autocomplete">
+        {% set existing_license_id = data.get('license_id') %}
+        {% set empty_license = _('Please select the license') %}
+        <option value="">{{ empty_license }}</option>
+        {% for license_id, license_desc in h.license_options(existing_license_id) %}
+          <option value="{{ license_id }}" {% if existing_license_id == license_id %}selected="selected"{% endif %}>{{ license_desc }}</option>
+        {% endfor %}
+      </select>
+      {% if error %}<span class="error-block">{{ error }}</span>{% endif %}
+      <span class="info-block">
+        <i class="fa fa-info-circle"></i>
+        {% trans %}
+        License definitions and additional information can be found
+        at <a href="http://opendefinition.org/licenses/">opendefinition.org</a>
+        {% endtrans %}
+      </span>
+    </div>
+  </div>
+{% endblock %}
+
+{% block package_basic_fields_org %}
+  {# if we have a default group then this wants remembering #}
+  {% if data.group_id %}
+    <input type="hidden" name="groups__0__id" value="{{ data.group_id }}" />
+  {% endif %}
+
+  {% set dataset_is_draft = data.get('state', 'draft').startswith('draft') or data.get('state', 'none') ==  'none' %}
+  {% set dataset_has_organization = data.owner_org or data.group_id %}
+  {% set organizations_available = h.organizations_available('create_dataset') %}
+  {% set user_can_update_owner_org = h.can_update_owner_org(data, organizations_available) %}
+  {% set user_is_sysadmin = h.check_access('sysadmin') %}
+  {% set show_organizations_selector = organizations_available and user_can_update_owner_org %}
+  {% set show_visibility_selector = dataset_has_organization or (organizations_available and (user_is_sysadmin or dataset_is_draft)) %}
+
+  {% if show_organizations_selector and show_visibility_selector %}
+    <div data-module="dataset-visibility">
+  {% endif %}
+
+  {% if show_organizations_selector %}
+    {% set existing_org = data.owner_org or data.group_id %}
+    <div class="form-group control-medium">
+      <label for="field-organizations" class="form-label">{{ h.humanize_entity_type('organization', default_group_type, 'default label') or _('Organization') }}</label>
+      <div class="controls">
+        <select id="field-organizations" name="owner_org" data-module="autocomplete">
+          {% if h.check_config_permission('create_unowned_dataset') %}
+            <option value="" {% if not selected_org and data.id %} selected="selected" {% endif %}>{{ h.humanize_entity_type('organization', default_group_type, 'no label') or _('No Organization') }}</option>
+          {% endif %}
+          {% for organization in organizations_available %}
+            {# get out first org from users list only if there is not an existing org #}
+          {% set selected_org = (existing_org and existing_org == organization.id) or (not existing_org and not data.id and organization.id == organizations_available[0].id) %}
+          <option value="{{ organization.id }}" {% if selected_org %} selected="selected" {% endif %}>{{ organization.display_name }}</option>
+          {% endfor %}
+        </select>
+      </div>
+    </div>
+    {% endif %}
+
+    {% if show_visibility_selector %}
+    {% block package_metadata_fields_visibility %}
+    <div class="form-group control-medium">
+      <label for="field-private" class="form-label">{{ _('Visibility') }}</label>
+      <div class="controls">
+        <select id="field-private" name="private" class="form-control">
+          {% for option in [('True', _('Private')), ('False', _('Public'))] %}
+          <option value="{{ option[0] }}" {% if option[0] == data.private|trim %}selected="selected"{% endif %}>{{ option[1] }}</option>
+          {% endfor %}
+        </select>
+      </div>
+    </div>
+    {% endblock %}
+    {% endif %}
+
+    {% if show_organizations_selector and show_visibility_selector %}
+  </div>
+  {% endif %}
+
+
+  {% if data.id and h.check_access('package_delete', {'id': data.id}) and data.state != 'active' %}
+  <div class="form-group control-medium">
+    <label for="field-state" class="form-label">{{ _('State') }}</label>
+    <div class="controls">
+      <select class="form-control" id="field-state" name="state">
+        <option value="active" {% if data.get('state', 'none') == 'active' %} selected="selected" {% endif %}>{{ _('Active') }}</option>
+        <option value="deleted" {% if data.get('state', 'none') == 'deleted' %} selected="selected" {% endif %}>{{ _('Deleted') }}</option>
+      </select>
+    </div>
+  </div>
+  {% endif %}
+
+  {% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_form.html
new file mode 100644
index 0000000..3d9bfd9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_form.html
@@ -0,0 +1,49 @@
+{% import 'macros/form.html' as form %}
+{% set action = g.form_action or '' %}
+
+{# This provides a full page that renders a form for adding a dataset. It can
+then itself be extended to add/remove blocks of functionality. #}
+<form id="dataset-edit" class="dataset-form" method="post" action="{{ action }}" data-module="basic-form" novalidate>
+  {{ h.csrf_input() }}
+  {% block stages %}
+    {{ h.snippet('package/snippets/stages.html', stages=stage, dataset_type=dataset_type) }}
+  {% endblock %}
+
+  <input type="hidden" name="_ckan_phase" value="dataset_new_1" />
+  {# pkg_name used in 3 stage edit #}
+  <input type="hidden" name="pkg_name" value="{{ data.id }}" />
+  {% block errors %}{{ form.errors(error_summary) }}{% endblock %}
+
+  {% block basic_fields %}
+    {% snippet 'package/snippets/package_basic_fields.html', data=data, errors=errors %}
+  {% endblock %}
+
+  {% block metadata_fields %}
+    {% snippet 'package/snippets/package_metadata_fields.html', data=data, errors=errors %}
+  {% endblock %}
+
+  {% block form_actions %}
+    <div class="form-actions">
+      {% block disclaimer %}
+        <p class="action-info small">
+          {%- trans -%}
+          The <i>data license</i> you select above only applies to the contents
+          of any resource files that you add to this dataset. By submitting
+          this form, you agree to release the <i>metadata</i> values that you
+          enter into the form under the
+          <a href="http://opendatacommons.org/licenses/odbl/1-0/">Open Database License</a>.
+          {%- endtrans -%}
+        </p>
+      {% endblock %}
+      {% block delete_button %}
+        {% if h.check_access('package_delete', {'id': data.id}) and not data.state == 'deleted' %}
+          <a class="btn btn-danger pull-left" href="{% url_for dataset_type ~ '.delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ h.humanize_entity_type('package', dataset_type, 'delete confirmation') or _('Are you sure you want to delete this dataset?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+        {% endif %}
+      {% endblock %}
+      {% block save_button %}
+        <button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('Next: Add Data') }}{% endblock %}</button>
+      {% endblock %}
+      {{ form.required_message() }}
+    </div>
+  {% endblock %}
+</form>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_metadata_fields.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_metadata_fields.html
new file mode 100644
index 0000000..b398818
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/package_metadata_fields.html
@@ -0,0 +1,34 @@
+{% import 'macros/form.html' as form %}
+
+{% block package_metadata_fields %}
+
+  {% block package_metadata_fields_url %}
+    {{ form.input('url', label=_('Source'), id='field-url', placeholder=_('http://example.com/dataset.json'), value=data.url, error=errors.url, classes=['control-medium']) }}
+  {% endblock %}
+
+  {% block package_metadata_fields_version %}
+    {{ form.input('version', label=_('Version'), id='field-version', placeholder=_('1.0'), value=data.version, error=errors.version, classes=['control-medium']) }}
+  {% endblock %}
+
+  {% block package_metadata_author %}
+    {{ form.input('author', label=_('Author'), id='field-author', placeholder=_('Joe Bloggs'), value=data.author, error=errors.author, classes=['control-medium']) }}
+
+    {{ form.input('author_email', label=_('Author Email'), id='field-author-email', placeholder=_('joe@example.com'), value=data.author_email, error=errors.author_email, classes=['control-medium']) }}
+  {% endblock %}
+
+  {% block package_metadata_fields_maintainer %}
+    {{ form.input('maintainer', label=_('Maintainer'), id='field-maintainer', placeholder=_('Joe Bloggs'), value=data.maintainer, error=errors.maintainer, classes=['control-medium']) }}
+
+    {{ form.input('maintainer_email', label=_('Maintainer Email'), id='field-maintainer-email', placeholder=_('joe@example.com'), value=data.maintainer_email, error=errors.maintainer_email, classes=['control-medium']) }}
+  {% endblock %}
+
+  {% block package_metadata_fields_custom %}
+    {% block custom_fields %}
+      {% snippet 'snippets/custom_form_fields.html', extras=data.extras, errors=errors, limit=3 %}
+    {% endblock %}
+  {% endblock %}
+
+  {% block dataset_fields %}
+  {% endblock %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_edit_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_edit_form.html
new file mode 100644
index 0000000..205ed36
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_edit_form.html
@@ -0,0 +1,12 @@
+{% set stage = stage or 1 %}
+{% set include_metadata = include_metadata or false %}
+
+{% extends resource_form_snippet %}
+
+{% block stages %}{% endblock %}
+
+{% block previous_button %}{% endblock %}
+
+{% block again_button %}{% endblock %}
+
+{% block save_button_text %}{{ _('Update Resource') }}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_form.html
new file mode 100644
index 0000000..7b63eaa
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_form.html
@@ -0,0 +1,95 @@
+{% import 'macros/form.html' as form %}
+
+{% set data = data or {} %}
+{% set errors = errors or {} %}
+{% set action = form_action or h.url_for(dataset_type ~ '_resource.new', id=pkg_name) %}
+
+
+<form id="resource-edit" class="dataset-form dataset-resource-form" method="post" action="{{ action }}" data-module="basic-form resource-form" enctype="multipart/form-data">
+  {{ h.csrf_input() }} 
+  {% block stages %}
+    {# An empty stages variable will not show the stages #}
+    {% if stage %}
+      {{ h.snippet('package/snippets/stages.html', stages=stage, pkg_name=pkg_name, dataset_type=dataset_type) }}
+    {% endif %}
+  {% endblock %}
+
+  {% block errors %}{{ form.errors(error_summary) }}{% endblock %}
+
+  <input name="id" value="{{ data.id }}" type="hidden"/>
+
+  {% block basic_fields %}
+    {% block basic_fields_url %}
+      {% set is_upload = (data.url_type == 'upload') %}
+      {% snippet 'package/snippets/resource_upload_field.html',
+        data=data,
+        errors=errors,
+        is_url=data.url and not is_upload,
+        is_upload=is_upload,
+        is_upload_enabled=h.uploads_enabled(),
+        url_label=_('URL'),
+        upload_label=_('File'),
+        placeholder=_('http://example.com/external-data.csv') %}
+    {% endblock %}
+
+    {% block basic_fields_name %}
+      {{ form.input('name', id='field-name', label=_('Name'), placeholder=_('eg. January 2011 Gold Prices'), value=data.name, error=errors.name, classes=['control-full']) }}
+    {% endblock %}
+
+    {% block basic_fields_description %}
+      {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('Some useful notes about the data'), value=data.description, error=errors.description) }}
+    {% endblock %}
+
+    {% block basic_fields_format %}
+      {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/resource/format_autocomplete?incomplete=?'} %}
+      {% call form.input('format', id='field-format', label=_('Format'), placeholder=_('eg. CSV, XML or JSON'), value=data.format, error=errors.format, classes=['control-medium'], attrs=format_attrs) %}
+        <span class="info-block info-block-small">
+          <i class="fa fa-info-circle"></i>
+          {{ _('This will be guessed automatically. Leave blank if you wish') }}
+        </span>
+      {% endcall %}
+    {% endblock %}
+  {% endblock basic_fields %}
+
+  {% block metadata_fields %}
+    {% if include_metadata %}
+      {# TODO: Where do these come from, they don't exist in /package/new_package_form.html #}
+      {# {{ form.select('resource_type', id='field-type', label=_('Resource Type'), options=[{'value': 'empty', 'text': _('Select a type…')}], selected="empty", error=errors.type) }} #}
+
+      {{ form.input('last_modified', id='field-last-modified', label=_('Last Modified'), placeholder=_('eg. 2012-06-05'), value=data.last_modified, error=errors.last_modified, classes=[]) }}
+
+      {{ form.input('size', id='field-size', label=_('File Size'), placeholder=_('eg. 1024'), value=data.size, error=errors.size, classes=[]) }}
+
+      {{ form.input('mimetype', id='field-mimetype', label=_('MIME Type'), placeholder=_('eg. application/json'), value=data.mimetype, error=errors.mimetype, classes=[]) }}
+
+      {{ form.input('mimetype_inner', id='field-mimetype-inner', label=_('MIME Type'), placeholder=_('eg. application/json'), value=data.mimetype_inner, error=errors.mimetype_inner, classes=[]) }}
+    {% endif %}
+  {% endblock %}
+
+  <div class="form-actions">
+    {% block delete_button %}
+      {% if data.id %}
+        {% if h.check_access('resource_delete', {'id': data.id})  %}
+          <a class="btn btn-danger pull-left" href="{% url_for dataset_type ~ '_resource.delete', resource_id=data.id, id=pkg_name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+        {% endif %}
+      {% endif %}
+    {% endblock %}
+    {% if stage %}
+      {% block previous_button %}
+        <button class="btn btn-default" name="save" value="go-dataset" type="submit">{{ _('Previous') }}</button>
+      {% endblock %}
+    {% endif %}
+    {% block again_button %}
+      <button class="btn btn-default" name="save" value="again" type="submit">{{ _('Save & add another') }}</button>
+    {% endblock %}
+    {% if stage %}
+      {% block save_button %}
+        <button class="btn btn-primary" name="save" value="go-metadata" type="submit">{% block save_button_text %}{{ _('Finish') }}{% endblock %}</button>
+      {% endblock %}
+    {% else %}
+      {% block add_button %}
+        <button class="btn btn-primary" name="save" value="go-dataset-complete" type="submit">{{ _('Add') }}</button>
+      {% endblock %}
+    {% endif %}
+  </div>
+</form>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_help.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_help.html
new file mode 100644
index 0000000..d17ecb1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_help.html
@@ -0,0 +1,6 @@
+<section class="module module-narrow module-shallow">
+  <h2 class="module-heading"><i class="fa fa-info-circle"></i> {{ _('What\'s a resource?') }}</h2>
+  <div class="module-content">
+    <p>{{ _('A resource can be any file or link to a file containing useful data.') }}</p>
+  </div>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_info.html
new file mode 100644
index 0000000..f7996a4
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_info.html
@@ -0,0 +1,25 @@
+{#
+Displays a sidebar module with information for given resource
+
+res    - The resource dict
+
+Example:
+
+  {% snippet "package/snippets/resource_info.html", res=res %}
+
+#}
+<div class="module context-info">
+  <div class="module-content">
+    {% block page_title %}
+      <h1 class="heading">{{ h.resource_display_name(res) or res.id }}</h1>
+    {% endblock %}
+    {% block resource_info %}
+      <div class="nums">
+        <dl>
+          <dt>{{ _('Format') }}</dt>
+          <dd>{{ h.get_translated(res, 'format') }}</dd>
+        </dl>
+      </div>
+    {% endblock %}
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_item.html
new file mode 100644
index 0000000..31d1c56
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_item.html
@@ -0,0 +1,82 @@
+{#
+  Renders a single resource with icons and view links.
+
+  res - A resource dict to render
+  pkg - A package dict that the resource belongs to
+  can_edit - Whether the user is allowed to edit the resource
+  url_is_edit - Whether the link to the resource should be to editing it (set to False to make the link view the resource)
+  url - URL of the resource details page(resource edit/read depending on url_is_edit, by default).
+
+  Example:
+
+    {% snippet "package/snippets/resource_item.html", res=resource, pkg=pkg, can_edit=True, url_is_edit=False %}
+
+#}
+{% set url_action = pkg.type ~ ('_resource.edit' if url_is_edit and can_edit else '_resource.read') %}
+{% set url = url or h.url_for(url_action, id=pkg.name, resource_id=res.id) %}
+
+<li class="resource-item" data-id="{{ res.id }}">
+  {% block resource_item_title %}
+  <a class="heading" href="{{ url }}" title="{{ res.name or res.description }}">
+    {{ h.resource_display_name(res) | truncate(50) }}<span class="format-label" property="dc:format" data-format="{{ res.format.lower() or 'data' }}">{{ h.get_translated(res, 'format') }}</span>
+    {{ h.popular('views', res.tracking_summary.total, min=10) if res.tracking_summary }}
+  </a>
+  {% endblock %}
+  {% block resource_item_description %}
+    <p class="description">
+      {% if res.description %}
+        {{ h.markdown_extract(h.get_translated(res, 'description'), extract_length=80) }}
+      {% endif %}
+    </p>
+  {% endblock %}
+  {% block resource_item_explore %}
+  {% if not url_is_edit %}
+  <div class="dropdown btn-group">
+    <a href="#" class="btn btn-primary dropdown-toggle" type="button" id="dropdownExplorer" data-bs-toggle="dropdown" aria-expanded="false">
+      <i class="fa fa-share"></i>
+      {{ _('Explore') }}
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu" aria-labelledby="dropdownExplorer">
+      {% block resource_item_explore_links %}
+        {% block explore_view %}
+          <li>
+            <a class="dropdown-item" href="{{ url }}">
+              {% if res.has_views %}
+                <i class="fa fa-chart-bar"></i>
+                {{ _('Preview') }}
+              {% else %}
+                <i class="fa fa-info-circle"></i>
+                {{ _('More information') }}
+              {% endif %}
+            </a>
+          </li>
+        {% endblock explore_view %}
+
+        {% if res.url and h.is_url(res.url) %}
+      <li>
+        <a class="dropdown-item resource-url-analytics" href="{{ res.url }}" target="_blank" rel="noreferrer">
+          {% if res.has_views or res.url_type == 'upload' %}
+            <i class="fa fa-arrow-circle-down"></i>
+            {{ _('Download') }}
+          {% else %}
+            <i class="fa fa-external-link"></i>
+            {{ _('Go to resource') }}
+          {% endif %}
+        </a>
+      </li>
+      {% endif %}
+      {% if can_edit %}
+      <li>
+        <a class="dropdown-item" href="{{ h.url_for(pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id) }}">
+          <i class="fa fa-pencil-square"></i>
+          {{ _('Edit') }}
+        </a>
+      </li>
+      {% endif %}
+      {% endblock %}
+    </ul>
+  </div>
+  {% endif %}
+  {% endblock %}
+</li>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_upload_field.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_upload_field.html
new file mode 100644
index 0000000..121506e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_upload_field.html
@@ -0,0 +1,114 @@
+{#
+Resource upload form field that allows switching between:
+  URL  <->  Unset  <->  File upload (when enabled)
+
+The "url" field is
+New uploaded files are saved as "upload", and "name" field is
+updated with the file name if not already set.
+
+When removing a file upload a special "clear_upload" field is passed
+
+data - resource form data fields
+errors - errors on resource form fields
+is_url - true if resource using url (not file upload)
+is_upload - true if resource using file upload (not url)
+is_upload_enabled - true if site supports file uploads
+url_label - label for URL field (default: "URL")
+upload_label - label for upload field (default: "File")
+menu_label - label for button menu (default: "Data")
+placeholder - placeholder text for url field
+#}
+{% import "macros/form.html" as form %}
+
+{% set first_button = 'resource-upload-button' if is_upload_enabled else 'resource-link-button' %}
+
+{% macro remove_button(js='') %}
+  <button type="button" class="btn btn-danger btn-remove-url"
+    onclick="
+      document.getElementById('resource-url-none').checked = true;
+      document.getElementById('{{ first_button }}').focus();
+      {{ js }}
+    ">{{ _('Remove') }}</button>
+{% endmacro %}
+
+<div data-module="resource-upload-field" class="resource-upload-field form-group">
+  <input type="radio" id="resource-url-none" name="url_type" value="" {{
+    'checked' if not data.url and not data.url_type else '' }}>
+  <div class="select-type">
+    <label id="resource-menu-label" class="form-label"
+      >{{ menu_label or _('Data') }}</label>
+    <div role="group" aria-labelledby="resource-menu-label">
+      {% block url_type_select %}
+        {% if is_upload_enabled %}
+          <button type="button" class="btn btn-default" id="resource-upload-button"
+            title="{{ _('Upload a file on your computer') }}"
+            onclick="
+              document.getElementById('resource-url-upload').checked = true;
+              document.getElementById('field-resource-upload').click();
+            "><i class="fa fa-cloud-upload"></i>{{ _("Upload") }}</button>
+        {% endif %}
+        <button type="button" class="btn btn-default" id="resource-link-button"
+          title="{{ _('Link to a URL on the internet (you can also link to an API)') }}"
+            onclick="
+              document.getElementById('resource-url-link').checked = true;
+              document.getElementById('field-resource-url').focus();
+            "><i class="fa fa-globe"></i>{{ _('Link') }}</button>
+      {% endblock %}
+    </div>
+  </div>
+
+  {% block url_type_fields %}
+    {% if is_upload_enabled %}
+      <input type="radio" id="resource-url-upload" name="url_type" value="upload" {{
+        'checked' if is_upload else '' }}>
+      <div class="select-type">
+        {% block upload_controls %}
+          {% if is_upload %}
+            {# for existing uploads we show the file name in a readonly input box #}
+            <input type="checkbox" id="field-clear-upload" value="true">
+            <div class="upload-type">
+              <button type="button" class="btn btn-danger btn-remove-url"
+                onclick="
+                  document.getElementById('field-clear-upload').checked = true;
+                  document.getElementById('field-resource-upload').focus();
+                ">{{ _('Clear Upload') }}</button>
+              <label class="form-label">{{ upload_label or _('File') }}</label>
+              <div class="controls">
+                {% set existing_name = data.get('url', '').split('/')[-1].split('?')[0].split('#')[0] %}
+                <input value="{{ existing_name }}" class="form-control" readonly>
+              </div>
+            </div>
+          {% endif %}
+          <div class="upload-type">
+            {{ remove_button(
+              js="$('#field-resource-upload').replaceWith($('#field-resource-upload').val('').clone(true))") }}
+            {{ form.input(
+              'upload',
+              label=upload_label or _('File'),
+              id='field-resource-upload',
+              type='file',
+              classes=['control-full']) }}
+          </div>
+        {% endblock %}
+      </div>
+    {% endif %}
+
+    <input type="radio" id="resource-url-link" name="url_type" value="" {{
+      'checked' if is_url else '' }}>
+    <div class="select-type">
+      {% block link_controls %}
+        {{ remove_button(
+          js="$('#field-resource-url').val('')") }}
+        {{ form.input(
+          'url',
+          label=url_label or _('URL'),
+          id='field-resource-url',
+          type='url',
+          placeholder=placeholder,
+          value=data.get('url'),
+          error=errors.get('url'),
+          classes=['control-full']) }}
+      {% endblock %}
+    </div>
+  {% endblock %}
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view.html
new file mode 100644
index 0000000..4eb3d6a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view.html
@@ -0,0 +1,92 @@
+{% import 'macros/form.html' as form %}
+
+{% block resource_view %}
+  <div id="view-{{ resource_view['id'] }}" class="resource-view" data-id="{{ resource_view['id'] }}" data-title="{{ resource_view['title'] }}" data-description="{{ resource_view['descripion'] }}">
+  <div class="actions">
+    <a class="btn btn-default"
+       target="_blank"
+       rel="noreferrer"
+       href="{{ h.url_for('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
+      <i class="fa fa-arrows-alt"></i>
+      {{ _("Fullscreen") }}
+    </a>
+    <a class="btn btn-default"
+       href="#embed-{{ resource_view['id'] }}"
+       data-module="resource-view-embed"
+       data-module-id="{{ resource_view['id'] }}"
+       data-module-url="{{ h.url_for('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
+      <i class="fa fa-code"></i>
+      {{ _("Embed") }}
+    </a>
+  </div>
+  <p class="desc">{{ h.render_markdown(resource_view['description']) }}</p>
+    <div class="m-top ckanext-datapreview">
+      {% if not to_preview and h.resource_view_is_filterable(resource_view) %}
+        {% snippet 'package/snippets/resource_view_filters.html', resource=resource %}
+      {% endif %}
+      {% if not h.resource_view_is_iframed(resource_view) %}
+        {{ h.rendered_resource_view(resource_view, resource, package) }}
+      {% else %}
+        <div class="data-viewer-error js-hide">
+          <p class="text-danger">
+            <i class="fa fa-info-circle"></i>
+            {{ _('This resource view is not available at the moment.') }}
+            <a href="#" data-bs-toggle="collapse" data-bs-target="#data-view-error">
+              {{ _('Click here for more information.') }}
+            </a>
+          </p>
+          <p id="data-view-error" class="collapse"></p>
+          <p>
+            <a href="{{ resource.url }}" class="btn btn-default btn-lg resource-url-analytics" target="_blank" rel="noreferrer">
+              <i class="fa fa-lg fa-arrow-circle-down"></i>
+              {{ _('Download resource') }}
+            </a>
+          </p>
+        </div>
+        {% if not to_preview %}
+          {% set current_filters = request.args.get('filters') %}
+          {% if current_filters %}
+            {% set src = h.url_for(package['type'] ~ '_resource.view', id=package['name'],
+              resource_id=resource['id'],
+              view_id=resource_view['id'],
+              filters=current_filters, qualified=true)  %}
+          {% else %}
+            {% set src = h.url_for(package['type'] ~ '_resource.view', id=package['name'],
+              resource_id=resource['id'],
+              view_id=resource_view['id'], qualified=true)  %}
+          {% endif %}
+        {% else %}
+          {# When previewing we need to stick the whole resource_view as a param as there is no other way to pass to information on to the iframe #}
+          {% set src = h.url_for(package['type'] ~ '_resource.view', id=package['name'], resource_id=resource['id'], qualified=true) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
+        {% endif %}
+        <iframe title="Data viewer" src="{{ src }}" frameborder="0" width="100%" data-module="data-viewer">
+          <p>{{ _('Your browser does not support iframes.') }}</p>
+        </iframe>
+      {% endif %}
+    </div>
+    <div id="embed-{{ resource_view['id'] }}" class="modal fade resource-view-embed">
+      <div class="modal-dialog">
+    <div class="modal-content">
+
+      <div class="modal-header">
+        <h3 class="modal-title">{{ _("Embed resource view") }}</h3>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ _('Close') }}"></button>
+
+      </div>
+      <div class="modal-body">
+        <p class="embed-content">{{ _("You can copy and paste the embed code into a CMS or blog software that supports raw HTML") }}</p>
+        <div class="row">
+          <div class="col-md-6">
+            {{ form.input("width", label=_("Width"), value=700, classes=["control-full"]) }}
+          </div>
+          <div class="col-md-6">
+            {{ form.input("height", label=_("Height"), value=400, classes=["control-full"]) }}
+          </div>
+        </div>
+        {{ form.textarea("code", label=_("Code"), value="", classes=["pre"], rows=3) }}
+      </div>
+      </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view_embed.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view_embed.html
new file mode 100644
index 0000000..336a51c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view_embed.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{%- block styles %}
+  {{ super() }}
+{% endblock %}
+
+{%- block page %}
+   {{ h.rendered_resource_view(resource_view, resource, package) }}
+{% endblock -%}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view_filters.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view_filters.html
new file mode 100644
index 0000000..304b051
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_view_filters.html
@@ -0,0 +1,8 @@
+{% asset 'base/view-filters' %}
+<div
+  class="resource-view-filters"
+  data-module="resource-view-filters"
+  data-module-resource-id="{{ resource['id'] }}"
+  data-module-fields="{{ h.dump_json(h.resource_view_get_fields(resource)) }}"
+  >
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_views_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_views_list.html
new file mode 100644
index 0000000..57904fc
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_views_list.html
@@ -0,0 +1,15 @@
+{% if views %}
+  <ul class="nav {{ extra_class }}" {{ extra_attributes }}>
+  {% set current_filters = request.args.get('filters') %}
+  {% for view in views %}
+  	{% set is_selected = true if view_id == view.id else false %}
+    {% snippet "package/snippets/resource_views_list_item.html",
+       view=view,
+       pkg=pkg,
+       is_edit=is_edit,
+       is_selected=is_selected,
+       current_filters=current_filters
+    %}
+  {% endfor %}
+</ul>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_views_list_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_views_list_item.html
new file mode 100644
index 0000000..0508800
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resource_views_list_item.html
@@ -0,0 +1,19 @@
+{% set action = 'resource.edit_view' if is_edit else 'resource.read' %}
+
+{% if current_filters %}
+  {% set url = h.url_for(action, id=pkg.name,
+                         resource_id=view.resource_id, view_id=view.id,
+                         filters=current_filters) %}
+{% else %}
+  {% set url = h.url_for(action, id=pkg.name,
+                         resource_id=view.resource_id, view_id=view.id) %}
+{% endif %}
+
+<li data-id="{{ view.id }}">
+  {% set tab_class = "nav-link active" if is_selected else "nav-link" %}
+
+  <a class="{{ tab_class }}" href="{{ url }}" data-id="{{ view.id }}">
+    <i class="fa icon fa-{{ h.resource_view_icon(view) }}"></i>
+    {{ view.title }}
+  </a>
+</li>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resources.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resources.html
new file mode 100644
index 0000000..7e91ed5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resources.html
@@ -0,0 +1,34 @@
+{#
+Displays a sidebar module with navigation containing the provided resources.
+If no resources are provided then the module will not be displayed.
+
+pkg       - The package dict that owns the resources.
+active    - The id of the currently displayed resource.
+action    - The resource action to use (default: 'read', meaning route 'resource.read').
+
+Example:
+
+  {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id %}
+
+#}
+{% set resources = pkg.resources or [] %}
+{% if resources %}
+  {% block resources %}
+    <section class="module module-narrow resources">
+      {% block resources_inner %}
+        {% block resources_title %}
+          <h2 class="module-heading"><i class="fa fa-copy"></i> {{ _("Resources") }}</h2>
+        {% endblock %}
+        {% block resources_list %}
+          <ul class="list-unstyled nav nav-simple">
+            {% for resource in resources %}
+              <li class="nav-item{{ ' active' if active == resource.id }}">
+                <a href="{{ h.url_for('%s_resource.%s' % (pkg.type, (action or 'read')), id=pkg.name, resource_id=resource.id, inner_span=true) }}" title="{{ h.resource_display_name(resource) }}">{{ h.resource_display_name(resource)|truncate(25) }}</a>
+              </li>
+            {% endfor %}
+          </ul>
+        {% endblock %}
+      {% endblock %}
+    </section>
+  {% endblock %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resources_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resources_list.html
new file mode 100644
index 0000000..9c6dd63
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/resources_list.html
@@ -0,0 +1,37 @@
+{#
+  Renders a list of resources with icons and view links.
+
+  resources - A list of resources (dicts) to render
+  pkg - A package dict that the resources belong to.
+
+  Example:
+
+  {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
+
+  #}
+
+<section id="dataset-resources" class="resources">
+  <h2>{{ _('Data and Resources') }}</h2>
+  {% block resource_list %}
+    {% if resources %}
+      <ul class="{% block resource_list_class %}resource-list{% endblock %}">
+        {% block resource_list_inner %}
+          {% set can_edit = can_edit or h.check_access('package_update', {'id':pkg.id }) %}
+          {% for resource in resources %}
+            {% snippet 'package/snippets/resource_item.html', pkg=pkg, res=resource, can_edit=can_edit %}
+          {% endfor %}
+        {% endblock %}
+      </ul>
+    {% else %}
+      {% block resource_list_empty %}
+        {% if h.check_access('resource_create', {'package_id': pkg['id']}) %}
+          {% trans url=h.url_for(pkg.type ~ '_resource.new', id=pkg.name) %}
+          <p class="empty">This dataset has no data, <a href="{{ url }}">why not add some?</a></p>
+          {% endtrans %}
+        {% else %}
+          <p class="empty">{{ _('This dataset has no data') }}</p>
+        {% endif %}
+      {% endblock %}
+    {% endif %}
+  {% endblock %}
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/stages.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/stages.html
new file mode 100644
index 0000000..7c624bd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/stages.html
@@ -0,0 +1,42 @@
+{#
+Inserts a stepped progress indicator for the new package form. Each stage can
+have one of three states, "uncomplete", "complete" and "active".
+
+stages - A list of states for each of the three stages. Missing stages default
+         to "uncomplete".
+
+Example:
+
+    {% snippet 'package/snippets/stages.html', stages=['active'] %}
+    {% snippet 'package/snippets/stages.html', stages=['complete', 'active'] %}
+    {% snippet 'package/snippets/stages.html', stages=['active', 'complete'] %}
+
+#}
+{% set s1 = stages[0] or 'active' %}
+{% set s2 = stages[1] or 'uncomplete' %}
+{% set dataset_type = dataset_type or h.default_package_type() %}
+
+{% if s1 != 'uncomplete' %}{% set class = 'stage-1' %}{% endif %}
+{% if s2 != 'uncomplete' %}{% set class = 'stage-2' %}{% endif %}
+
+<ol class="stages {{ class }}">
+  <li class="first {{ s1 }}">
+    {% if s1 != 'complete' %}
+      <span class="highlight">{{ h.humanize_entity_type('package', dataset_type, 'create label') or _('Create Dataset') }}</span>
+    {% else %}
+      <button class="highlight" name="save" value="go-dataset" type="submit">{{ h.humanize_entity_type('package', dataset_type, 'create label') or _('Create Dataset') }}</button>
+    {% endif %}
+  </li>
+  <li class="last {{ s2 }}">
+    {% if s2 != 'complete' %}
+      <span class="highlight">{{ _('Add data') }}</span>
+    {% else %}
+      {% if s1 == 'active' %}
+        {# stage 1 #}
+        <button class="highlight" name="save" value="go-resources" type="submit">{{ _('Add data') }}</button>
+      {% else %}
+        {% link_for _('Add data'), named_route='dataset.new', class_="highlight" %}
+      {% endif %}
+    {% endif %}
+  </li>
+</ol>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/tags.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/tags.html
new file mode 100644
index 0000000..22d1886
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/tags.html
@@ -0,0 +1,15 @@
+{#
+  Renders tags
+
+  tags - a list of tag dicts
+
+  Example:
+
+  {% snippet "package/snippets/tags.html", tags=pkg.tags %}
+
+#}
+{% if tags %}
+  <section class="tags">
+    {% snippet 'snippets/tag_list.html', tags=tags, _class='tag-list' %}
+  </section>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_form.html
new file mode 100644
index 0000000..6d30a5e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_form.html
@@ -0,0 +1,19 @@
+{% import 'macros/form.html' as form %}
+
+{% set data = data or {} %}
+{% set errors = errors or {} %}
+
+{{ form.errors(error_summary) }}
+
+{{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. My View'), value=data.title, error=errors.title, classes=['control-full', 'control-large'], is_required=true) }}
+{{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Information about my view'), value=data.description, error=errors.description) }}
+
+{% block view_form_filters %}
+  {% snippet 'package/snippets/view_form_filters.html', resource=resource, resource_view=resource_view %}
+{% endblock %}
+
+{# form template is defined in ResouceView extention point #}
+
+{% if form_template %}
+  {% include form_template %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_form_filters.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_form_filters.html
new file mode 100644
index 0000000..2677908
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_form_filters.html
@@ -0,0 +1,48 @@
+{% import 'macros/form.html' as form %}
+
+{% macro filtersInputs(name, selectName, inputName, label='', options='', error='', filters={}, classes=[], attrs={}, is_required=false) %}
+  {% set classes = (classes|list) %}
+  {% do classes.append('control-select') %}
+
+  {%- set extra_html = caller() if caller -%}
+  {% call form.input_block(id or name, label or name, error, classes, extra_html=extra_html, is_required=is_required) %}
+  <div class="resource-view-filters">
+    {% for field in filters %}
+      {% for value in filters[field] %}
+        {{ selectAndInput(selectName, inputName, selectOptions=options, selected=field, inputValue=value, attrs=attrs) }}
+      {% endfor %}
+    {% endfor %}
+    </div>
+    <a href="#" class="btn btn-primary resource-view-add-filter">{{ _('Add Filter') }}</a>
+  {% endcall %}
+{% endmacro %}
+
+{% macro selectAndInput(selectName, inputName, selectOptions='', selected='', inputValue='', attrs={}) %}
+  <div>
+  <select id="{{ selectName }}" name="{{ selectName }}" {{ form.attributes(attrs) }}>
+    {% for option in selectOptions %}
+      <option value="{{ option }}"{% if option == selected %} selected{% endif %}>{{ option }}</option>
+    {% endfor %}
+  </select>
+  <input type="text" name="{{ inputName }}" value="{{ inputValue }}" />
+  <span title="{{ _('Remove Filter') }}" class="resource-view-remove-filter icon fa fa-times"></span>
+  </div>
+{% endmacro %}
+
+{% set fields = h.resource_view_get_fields(resource) %}
+{% set templateFilterInputs = selectAndInput('filter_fields', 'filter_values', selectOptions=fields) %}
+{% set filters = resource_view['filters'] %}
+
+<div
+  data-module = "resource-view-filters-form"
+  data-module-resource-id = "{{ resource['id'] }}"
+  data-module-template-filter-inputs = "{{ h.remove_linebreaks(templateFilterInputs) }}"
+  data-module-filters-selector = ".resource-view-filters"
+  data-module-add-filter-selector = ".resource-view-add-filter"
+  data-module-remove-filter-selector = ".resource-view-remove-filter"
+  >
+  {{
+      filtersInputs('filters', 'filter_fields', 'filter_values',
+          label=_('Filters'), options=fields, filters=filters, classes=["control-filters"])
+  }}
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_help.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_help.html
new file mode 100644
index 0000000..a594621
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/snippets/view_help.html
@@ -0,0 +1,6 @@
+<section class="module module-narrow module-shallow">
+  <h2 class="module-heading"><i class="fa fa-info-circle"></i> {{ _('What\'s a view?') }}</h2>
+  <div class="module-content">
+    <p>{{ _('A view is a representation of the data held against a resource') }}</p>
+  </div>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/view_edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/view_edit_base.html
new file mode 100644
index 0000000..2df15f5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/package/view_edit_base.html
@@ -0,0 +1,55 @@
+{% extends "package/resource_edit_base.html" %}
+
+{% set logged_in = true if c.userobj else false %}
+{% set res = resource %}
+
+{% block breadcrumb_edit_selected %}{% endblock %}
+
+{% block content_action %}
+  {% link_for _('All views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='arrow-left' %}
+  {% if res %}
+    {% set url = h.url_for(pkg.type ~ '_resource.read', id=pkg.name, resource_id=res.id) ~ '?view_id=' ~ resource_view.id %}
+    <a href="{{ url }}" class="btn btn-default"><i class="fa fa-eye"></i> {{ _('View view') }}</a>
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}{% endblock %}
+
+{% block primary_content_inner %}
+  {% block form %}{% endblock %}
+{% endblock %}
+
+{% block main_content %}
+  {% if h.resource_view_full_page(resource_view) %}
+    {{ self.flash() }}
+    {{ self.toolbar() }}
+    <div class="wrapper no-nav">
+      {{ self.primary_content() }}
+    </div>
+  {% else %}
+    {{ super() }}
+  {% endif %}
+
+  {% if to_preview and h.resource_view_display_preview(resource_view) %}
+    <div class="row wrapper no-nav view-preview-container">
+      <section class="module module-narrow module-shallow">
+        <h2 class="module-heading">
+          <i class="fa fa-image"></i> {{ _('View preview') }}
+        </h2>
+        <div class="module-content">
+          {% snippet 'package/snippets/resource_view.html', resource_view=resource_view, resource=resource, package=package, to_preview=True %}
+        </div>
+      </section>
+    </div>
+  {% endif %}
+{% endblock %}
+
+{% block secondary %}
+  {% if not h.resource_view_full_page(resource_view) %}
+    {{ super() }}
+  {% endif %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'package/snippets/view_help.html' %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/page.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/page.html
new file mode 100644
index 0000000..507ee17
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/page.html
@@ -0,0 +1,137 @@
+{% extends "base.html" %}
+
+{%- block page -%}
+
+  {% block skip %}
+    <div class="visually-hidden-focusable"><a href="#content">{{ _('Skip to main content') }}</a></div>
+  {% endblock %}
+
+  {#
+  Override the header on a page by page basis by extending this block. If
+  making sitewide header changes it is preferable to override the header.html
+  file.
+  #}
+  {%- block header %}
+    {% include "header.html" %}
+  {% endblock -%}
+
+  {# The content block allows you to replace the content of the page if needed #}
+  {%- block content %}
+    {% block maintag %}<div class="main">{% endblock %}
+      <div id="content" class="container">
+        {% block main_content %}
+          {% block flash %}
+            <div class="flash-messages">
+              {% block flash_inner %}
+                {% for category, message in h.get_flashed_messages(with_categories=true) %}
+                  <div class="alert alert-dismissible fade show {{ category }}">
+                    {{ h.literal(message) }}
+                  </div>
+                {% endfor %}
+              {% endblock %}
+            </div>
+          {% endblock %}
+
+          {% block toolbar %}
+            <div class="toolbar" role="navigation" aria-label="{{ _('Breadcrumb') }}">
+              {% block breadcrumb %}
+                {% if self.breadcrumb_content() | trim %}
+                  <ol class="breadcrumb">
+                    {% snippet 'snippets/home_breadcrumb_item.html' %}
+                    {% block breadcrumb_content %}{% endblock %}
+                  </ol>
+                {% endif %}
+              {% endblock %}
+            </div>
+          {% endblock %}
+
+          <div class="row wrapper{% block wrapper_class %}{% endblock %}{% if self.secondary()|trim == '' or c.action=='resource_read' %} no-nav{% endif %}">
+            {#
+            The pre_primary block can be used to add content to before the
+            rendering of the main content columns of the page.
+            #}
+            {% block pre_primary %}
+            {% endblock %}
+
+            {% block secondary %}
+              <aside class="secondary col-md-3">
+                {#
+                The secondary_content block can be used to add content to the
+                sidebar of the page. This is the main block that is likely to be
+                used within a template.
+
+                Example:
+
+                  {% block secondary_content %}
+                    <h2>A sidebar item</h2>
+                    <p>Some content for the item</p>
+                  {% endblock %}
+                #}
+                {% block secondary_content %}{% endblock %}
+              </aside>
+            {% endblock %}
+
+            {% block primary %}
+              <div class="primary col-md-9 col-xs-12" role="main">
+                {#
+                The primary_content block can be used to add content to the page.
+                This is the main block that is likely to be used within a template.
+
+                Example:
+
+                  {% block primary_content %}
+                    <h1>My page content</h1>
+                    <p>Some content for the page</p>
+                  {% endblock %}
+                #}
+                {% block primary_content %}
+                  <article class="module">
+                    {% block page_header %}
+                      <header class="module-content page-header">
+                        {% if self.content_action() | trim %}
+                          <div class="content_action">
+                            {% block content_action %}{% endblock %}
+                          </div>
+                        {% endif %}
+                        <ul class="nav nav-tabs">
+                          {% block content_primary_nav %}{% endblock %}
+                        </ul>
+                      </header>
+                    {% endblock %}
+                    <div class="module-content">
+                      {% if self.page_primary_action() | trim %}
+                        <div class="page_primary_action">
+                          {% block page_primary_action %}{% endblock %}
+                        </div>
+                      {% endif %}
+                      {% block primary_content_inner %}
+                      {% endblock %}
+                    </div>
+                  </article>
+                {% endblock %}
+              </div>
+            {% endblock %}
+          </div>
+        {% endblock %}
+      </div>
+    </div>
+  {% endblock -%}
+
+  {#
+  Override the footer on a page by page basis by extending this block. If
+  making sitewide header changes it is preferable to override the footer.html-u
+  file.
+  #}
+  {%- block footer %}
+    {% include "footer.html" %}
+  {% endblock -%}
+{%- endblock -%}
+
+{%- block scripts %}
+  {% asset 'base/main' %}
+  {% asset 'base/ckan' %}
+  {% if g.tracking_enabled %}
+    {% asset 'base/tracking' %}
+  {% endif %}
+  {{ super() }}
+{% endblock -%}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/revision/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/revision/__init__.py
new file mode 100644
index 0000000..b9445d5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/revision/__init__.py
@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+# empty file needed for pylons to find templates in this directory
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/add_dataset.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/add_dataset.html
new file mode 100644
index 0000000..bfe63ae
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/add_dataset.html
@@ -0,0 +1,11 @@
+{# Adds 'Add Dataset' button #}
+
+{% set dataset_type = dataset_type if dataset_type else h.default_package_type() %}
+{% set link_label = h.humanize_entity_type('package', dataset_type, 'add link') or _("Add Dataset") %}
+{% set route_name = dataset_type ~ '.new' %}
+
+{% if group %}
+    {% link_for link_label, named_route=route_name, group=group, class_='btn btn-primary', icon='plus-square' %}
+{% else %}
+    {% link_for link_label, named_route=route_name, class_='btn btn-primary', icon='plus-square' %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/additional_info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/additional_info.html
new file mode 100644
index 0000000..fb21cdf
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/additional_info.html
@@ -0,0 +1,25 @@
+{# This snippet creates an Additional Info Table
+
+extras is a list of tuples of the form (key, value)
+
+#}
+{% if extras %}
+  <h3>{{ _('Additional Info') }}</h3>
+  <table class="table table-striped table-bordered table-condensed">
+    <thead>
+      <tr>
+        <th scope="col">{{ _('Field') }}</th>
+        <th scope="col">{{ _('Value') }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for extra in extras %}
+        {% set key, value = extra %}
+        <tr rel="dc:relation" resource="_:extra{{ i }}">
+          <th scope="row" class="dataset-label" property="rdfs:label">{{ _(key|e) }}</th>
+          <td class="dataset-details" property="rdf:value">{{ value }}</td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context.html
new file mode 100644
index 0000000..edca7e1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context.html
@@ -0,0 +1,10 @@
+{%if type == 'user' %}
+  <h4>{{ dict.name }}</h4>
+  {% snippet 'snippets/context/user.html', id=dict.id, name=dict.name, about=dict.about, is_me='false', num_followers=dict.num_followers, number_created_packages=dict.number_created_packages %}
+{%elif type == 'dataset' %}
+  <h4>{{ dict.title }}</h4>
+  {% snippet 'snippets/context/dataset.html', id=dict.id, name=dict.name, notes=dict.notes, num_resources=dict.num_resources, num_tags=dict.num_tags %}
+{%elif type == 'group' %}
+  <h4>{{ dict.title }}</h4>
+  {% snippet 'snippets/context/group.html', id=dict.id, name=dict.name, description=dict.description, num_followers=dict.num_followers, package_count=dict.package_count %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/dataset.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/dataset.html
new file mode 100644
index 0000000..ea0a262
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/dataset.html
@@ -0,0 +1,21 @@
+<div class="popover-context profile-info">
+  {% if notes != 'null' %}
+    {% set notes = notes|striptags %}
+    <p class="about" title="{{ notes }}">
+      {{ notes|truncate(160) }}
+    </p>
+  {% endif %}
+  <div class="btn-group">
+    {{ h.follow_button('dataset', id) }}
+  </div>
+  <div class="nums">
+    <dl>
+      <dt>{{ _('Resources') }}</dt>
+      <dd>{{ h.SI_number_span(num_resources) }}</dd>
+    </dl>
+    <dl>
+      <dt>{{ _('Tags') }}</dt>
+      <dd>{{ h.SI_number_span(num_tags) }}</dd>
+    </dl>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/group.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/group.html
new file mode 100644
index 0000000..95a7d7b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/group.html
@@ -0,0 +1,23 @@
+{% set dataset_type = h.default_package_type() %}
+
+<div class="context-info">
+  {% if description != 'null' %}
+    {% set description = description|striptags %}
+    <p class="about" title="{{ description }}">
+      {{ description|truncate(160) }}
+    </p>
+  {% endif %}
+  <div class="btn-group">
+    {{ h.follow_button('group', id) }}
+  </div>
+  <div class="nums">
+    <dl>
+      <dt>{{ _('Followers') }}</dt>
+      <dd>{{ h.SI_number_span(num_followers) }}</dd>
+    </dl>
+    <dl>
+      <dt>{{ h.humanize_entity_type('package', dataset_type, 'facet label') or _('Datasets') }}</dt>
+      <dd>{{ h.SI_number_span(package_count) }}</dd>
+    </dl>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/user.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/user.html
new file mode 100644
index 0000000..ab8589f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/context/user.html
@@ -0,0 +1,25 @@
+{% set dataset_type = h.default_package_type() %}
+
+<div class="context-info">
+  {% if about != 'null' %}
+    {% set about = about|striptags %}
+    <p class="about" title="{{ about }}">
+      {{ about|truncate(160) }}
+    </p>
+  {% endif %}
+  <div class="btn-group">
+    {% if is_me == 'false' %}
+      {{ h.follow_button('user', id) }}
+    {% endif %}
+  </div>
+  <div class="nums">
+    <dl>
+      <dt>{{ _('Followers') }}</dt>
+      <dd>{{ h.SI_number_span(num_followers) }}</dd>
+    </dl>
+    <dl>
+      <dt>{{ h.humanize_entity_type('package', dataset_type, 'facet label') or _('Datasets') }}</dt>
+      <dd>{{ h.SI_number_span(number_created_packages) }}</dd>
+    </dl>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/csrf_input.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/csrf_input.html
new file mode 100644
index 0000000..b495045
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/csrf_input.html
@@ -0,0 +1,2 @@
+{# Adds a csrf_token to the forms as a hidden input. #}
+<input type="hidden" name="{{ g.csrf_field_name }}" value="{{ csrf_token() }}"/>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/custom_form_fields.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/custom_form_fields.html
new file mode 100644
index 0000000..95fbf30
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/custom_form_fields.html
@@ -0,0 +1,54 @@
+{#
+  Adds a block of custom form fields.
+  
+  extras - The fields to add.
+  errors - A dict of errors for the fields.
+  limit  - The total number of fields that should be output.
+  Example:
+  
+    {% snippet 'snippets/custom_form_fields.html', extras=data.extras, errors=errors, limit=3 %}
+  
+  #}
+  {% import "macros/form.html" as form %}
+  <!-- reading placeholder used by D4Science Content Moderator System, see #22854 -->
+  {% set d4science_cms_obj_placeholders = h.d4science_get_content_moderator_system_placeholder() %}
+  {% set d4science_system_type_obj = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+  <!-- System fields enabled for sysadmin #27731 -->
+  {% set is_sys_admin = true if (c.userobj and c.userobj.sysadmin) else false %}
+  <div data-module="custom-fields">
+    <!-- skipping system_type and D4Science CMS fields into form, see #22854 -->
+    {% for extra in extras %}
+      {% set is_system_field = extra.key.startswith(d4science_cms_obj_placeholders.prefix) or extra.key.startswith(d4science_system_type_obj.id) %}
+      {% set apply_classes = [] %}
+      {% if is_system_field and not is_sys_admin %}
+          {% set apply_classes = ['disabled-div'] %}
+      {% endif %}
+      {% set prefix = 'extras__%d__' % loop.index0 %}
+      {{ form.custom(
+        names=(prefix ~ 'key', prefix ~ 'value', prefix ~ 'deleted'),
+        id='field-extras-%d' % loop.index,
+        label=_('Custom Field'),
+        values=(extra.key, extra.value, extra.deleted),
+        classes=apply_classes,
+        error=errors[prefix ~ 'key'] or errors[prefix ~ 'value']
+      ) }}
+    {% endfor %}
+  
+    {# Add a max of 3 empty columns #}
+    {% set total_extras = extras|count %}
+    {% set empty_extras = (limit or 3) - total_extras %}
+    {% if empty_extras <= 0 %}{% set empty_extras = 1 %}{% endif %}
+  
+    {% for extra in range(total_extras, total_extras + empty_extras) %}
+      {% set index = loop.index0 + (extras|count) %}
+      {% set prefix = 'extras__%d__' % index %}
+      {{ form.custom(
+        names=(prefix ~ 'key', prefix ~ 'value', prefix ~ 'deleted'),
+        id='field-extras-%d' % index,
+        label=_('Custom Field'),
+        values=(extra.key, extra.value, extra.deleted),
+        error=errors[prefix ~ 'key'] or errors[prefix ~ 'value']
+      ) }}
+    {% endfor %}
+  </div>
+  
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/datapusher_status.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/datapusher_status.html
new file mode 100644
index 0000000..8cd6a39
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/datapusher_status.html
@@ -0,0 +1,14 @@
+{# Datapusher status indicator
+
+resource: the resource
+
+#}
+{% if resource.datastore_active %}
+  {% set job = h.datapusher_status(resource.id) %}
+  {% set title =  _('Datapusher status: {status}.').format(status=job.status) %}
+  {% if job.status == 'unknown' %}
+    <i title="{{ _(title) }}" class="fa datapusher-status status-{{ job.status }} fa-circle fa-lg"></i>
+  {% else %}
+    <a href="{{ job.job_url }}" class="datapusher-status-link" title="{{ _(title) }}"><i class="fa datapusher-status status-{{ job.status }} fa-circle fa-lg"></i></a>
+  {% endif %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/disqus_trackback.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/disqus_trackback.html
new file mode 100644
index 0000000..64a5cb7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/disqus_trackback.html
@@ -0,0 +1,4 @@
+<section class="module module-narrow module-shallow disqus-trackback simple-input">
+  <h2 class="module-heading"><i class="fa fa-link"></i> {{ _('Trackback URL') }}</h2>
+  <div class="field module-content"><input type="text" value="http://trackback.com" /></div>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/facet_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/facet_list.html
new file mode 100644
index 0000000..fad6fc1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/facet_list.html
@@ -0,0 +1,100 @@
+{#
+	Construct a facet module populated with links to filtered results.
+	
+	name
+	  The field name identifying the facet field, eg. "tags"
+	
+	title
+	  The title of the facet, eg. "Tags", or "Tag Cloud"
+	
+	label_function
+	  Renders the human-readable label for each facet value.
+	  If defined, this should be a callable that accepts a `facet_item`.
+	  eg. lambda facet_item: facet_item.display_name.upper()
+	  By default it displays the facet item's display name, which should
+	  usually be good enough
+	
+	if_empty
+	  A string, which if defined, and the list of possible facet items is empty,
+	  is displayed in lieu of an empty list.
+	
+	count_label
+	  A callable which accepts an integer, and returns a string.  This controls
+	  how a facet-item's count is displayed.
+	
+	extras
+	  Extra info passed into the add/remove params to make the url
+	
+	alternative_url
+	  URL to use when building the necessary URLs, instead of the default
+	  ones returned by url_for. Useful eg for dataset types.
+	
+	hide_empty
+	  Do not show facet if there are none, Default: false.
+	
+	within_tertiary
+	  Boolean for when a facet list should appear in the the right column of the
+	  page and not the left column.
+	
+	#}
+	{% block facet_list %}
+	  {% set hide_empty = hide_empty or false %}
+	  {% with items = items or h.get_facet_items_dict(name) %}
+		{% if items or not hide_empty %}
+		  {% if within_tertiary %}
+			{% set nav_class = 'nav nav-pills nav-stacked' %}
+			{% set nav_item_class = ' ' %}
+			{% set wrapper_class = 'nav-facet nav-facet-tertiary' %}
+		  {% endif %}
+		  {% block facet_list_item %}
+			<section class="{{ wrapper_class or 'module module-narrow module-shallow' }}">
+			  {% block facet_list_heading %}
+				<h2 class="module-heading">
+				  <i class="icon-medium icon-filter"></i>
+				  {% set title = title or h.get_facet_title(name) %}
+				  {{ title }}
+				</h2>
+			  {% endblock %}
+			  {% block facet_list_items %}
+				{% with items = items or h.get_facet_items_dict(name) %}
+				{% if items %}
+				  <nav>
+					<ul class="{{ nav_class or 'unstyled nav nav-simple nav-facet' }}">
+					  {% for item in items %}
+				 
+						{% set href = h.remove_url_param(name, item.name, extras=extras, alternative_url=alternative_url) if item.active else h.add_url_param(new_params={name: item.name}, extras=extras, alternative_url=alternative_url) %}
+						{% set label = label_function(item) if label_function else item.display_name %}
+						{# Updated by Francesco Mangiacrapa, see #11747 #}
+						{# 
+						{% set label_truncated = h.truncate(label, 22) if not label_function else label %}
+						#}
+						{% set count = count_label(item['count']) if count_label else ('(%d)' % item['count']) %}
+						  <li class="{{ nav_item_class or 'nav-item' }}{% if item.active %} active{% endif %}">
+							<a href="{{ href }}" title="{{ label if label != label_truncated else '' }}">
+							  <span>{{ label }} </span><span style="font-size: 12px">{{ count }}</span>
+							</a>
+						  </li>
+					  {% endfor %}
+					</ul>
+				  </nav>
+	
+				  <p class="module-footer">
+					{% if h.get_param_int('_%s_limit' % name) %}
+					  {% if h.has_more_facets(name) %}
+						<a href="{{ h.remove_url_param('_%s_limit' % name, replace=0, extras=extras, alternative_url=alternative_url) }}" class="read-more">{{ _('Show More {facet_type}').format(facet_type=title) }}</a>
+					  {% endif %}
+					{% else %}
+					  <a href="{{ h.remove_url_param('_%s_limit' % name, extras=extras, alternative_url=alternative_url) }}" class="read-more">{{ _('Show Only Popular {facet_type}').format(facet_type=title) }}</a>
+					{% endif %}
+				  </p>
+				{% else %}
+				  <p class="module-content empty">{{ _('There are no {facet_type} that match this search').format(facet_type=title) }}</p>
+				{% endif %}
+				{% endwith %}
+			  {% endblock %}
+			</section>
+		  {% endblock %}
+		{% endif %}
+	  {% endwith %}
+	{% endblock %}
+	
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/follow_button.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/follow_button.html
new file mode 100644
index 0000000..a3b6f06
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/follow_button.html
@@ -0,0 +1,11 @@
+{% if following %}
+  <a href="{{ h.url_for(obj_type + '.unfollow', id=obj_id) }}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="{{ obj_type }}" data-module-id="{{ obj_id }}" data-module-action="unfollow">
+    <i class="fa fa-times-circle"></i>
+    {{ _('Unfollow') }}
+  </a>
+{% else %}
+  <a href="{{ h.url_for(obj_type + '.follow', id=obj_id) }}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="{{ obj_type }}" data-module-id="{{ obj_id }}" data-module-action="follow">
+    <i class="fa fa-plus-circle"></i>
+    {{ _('Follow') }}
+  </a>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/group.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/group.html
new file mode 100644
index 0000000..e06f0d9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/group.html
@@ -0,0 +1,25 @@
+{#
+Embeds a group within the sidebar of a page.
+
+group    - The group dict.
+
+Example:
+
+    {% snippet 'snippets/group, group=c.group_dict %}
+
+#}
+{% with url=h.url_for('group.read', id=group.name) %}
+  <section class="module module-narrow module-shallow group">
+    <div class="module-content media media-vertical">
+      <a class="media-image" href="{{ url }}">
+        <img src="{{ group.image_display_url or h.url_for_static('/base/images/placeholder-group.png') }}" class="img-responsive" width="200" height="125" alt="{{ group.name }}" />
+      </a>
+      <div class="media-content">
+        <h3 class="media-heading"><a href="{{ url }}">{{ group.title or group.name }}</a></h3>
+        {% if group.description %}
+          <p>{{ h.markdown_extract(group.description, 120) }}</p>
+        {% endif %}
+      </div>
+    </div>
+  </section>
+{% endwith %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/group_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/group_item.html
new file mode 100644
index 0000000..8fc5bc1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/group_item.html
@@ -0,0 +1,27 @@
+{% block group_item %}
+  <section class="group-list module module-narrow module-shallow">
+    {% block group_item_header %}
+      <header class="module-heading">
+        {% set title = group.title or group.name %}
+        {% block group_item_header_image %}
+          <a class="module-image" href="{{ h.url_for(group.type ~ '.read', id=group.name) }}">
+            <img src="{{ group.image_display_url or h.url_for_static('/base/images/placeholder-group.png') }}" alt="{{ group.name }}" />
+          </a>
+        {% endblock %}
+        {% block group_item_header_title %}
+          <h3 class="media-heading"><a href="{{ h.url_for(group.type ~ '.read', id=group.name) }}">{{ group.title or group.name }}</a></h3>
+        {% endblock %}
+        {% block group_item_header_description %}
+          {% if group.description %}
+              <p>{{ h.markdown_extract(group.description, 120)|urlize }}</p>
+          {% endif %}
+        {% endblock %}
+      </header>
+    {% endblock %}
+    {% block group_item_content %}
+      {% set list_class = "list-unstyled dataset-list" %}
+      {% set item_class = "dataset-item module-content" %}
+      {% snippet 'snippets/package_list.html', packages=group.packages, list_class=list_class, item_class=item_class %}
+    {% endblock %}
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/home_breadcrumb_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/home_breadcrumb_item.html
new file mode 100644
index 0000000..09ee14f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/home_breadcrumb_item.html
@@ -0,0 +1,2 @@
+{# Used to insert the home icon into a breadcrumb #}
+<li class="home"><a href="{{ h.url_for('home.index') }}" aria-label="{{ _('Home') }}"><i class="fa fa-home"></i><span> {{ _('Home') }}</span></a></li>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/language_selector.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/language_selector.html
new file mode 100644
index 0000000..16c3877
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/language_selector.html
@@ -0,0 +1,17 @@
+{% set current_lang = request.environ.CKAN_LANG %}
+<form class="lang-select" action="{% url_for 'util.internal_redirect' %}" data-module="select-switch" method="POST">
+  {{ h.csrf_input() }} 
+  <div class="form-group">
+    <label for="field-lang-select">{{ _('Language') }}</label>
+    <select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown" data-module-container-class="lang-container">
+      {% for locale in h.get_available_locales() %}
+        <option value="{% url_for h.current_url(), locale=locale.short_name %}" {% if locale.short_name == current_lang %}selected="selected"{% endif %}>
+          {{ locale.display_name or locale.english_name }}
+        </option>
+      {% endfor %}
+    </select>
+  </div>
+  <button class="btn btn-default d-none " type="submit">{{ _('Go') }}</button>
+</form>
+
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/license.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/license.html
new file mode 100644
index 0000000..397d0a9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/license.html
@@ -0,0 +1,37 @@
+{% macro license_string(pkg_dict) %}
+  {% if 'license_url' in pkg_dict %}
+    <a href="{{ pkg_dict.license_url }}" rel="dc:rights">{{ pkg_dict.license_title }}</a>
+  {% else %}
+    {% if pkg_dict.license_id %}
+      <span property="dc:rights">{{ pkg_dict.license_title }}</span>
+    {% else %}
+      <span>{{ _('No License Provided') }}</span>
+    {% endif %}
+  {% endif %}
+{% endmacro %}
+
+{% block license %}
+  {% if text_only %}
+    {{ license_string(pkg_dict) }}
+  {% else %}
+      {% block license_wrapper %}
+        <section class="module module-narrow module-shallow license">
+          {% block license_title %}
+            <h2 class="module-heading"><i class="fa fa-lock"></i> {{ _('License') }}</h2>
+          {% endblock %}
+          {% block license_content %}
+            <p class="module-content">
+              {% block license_content_inner %}
+                {{ license_string(pkg_dict) }}
+                {% if pkg_dict.isopen %}
+                  <a href="http://opendefinition.org/okd/" title="{{ _('This dataset satisfies the Open Definition.') }}">
+                      <img class="open-data" src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="[Open Data]" />
+                  </a>
+                {% endif %}
+              {% endblock %}
+            </p>
+          {% endblock %}
+        </section>
+      {% endblock %}
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/local_friendly_datetime.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/local_friendly_datetime.html
new file mode 100644
index 0000000..912cf0b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/local_friendly_datetime.html
@@ -0,0 +1,14 @@
+{#
+Displays a datetime that can be converted to a users timezone using JavaScript.
+In the data-datetime attribute, the date is rendered in ISO 8601 format.
+
+datetime_obj   - the datetime object to display
+
+Example:
+
+    {% snippet 'snippets/local_friendly_datetime.html', datetime_obj=pkg_dict.metadata_created %}
+
+#}
+<span class="automatic-local-datetime" data-datetime="{{ h.render_datetime(datetime_obj, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
+    {{ h.render_datetime(datetime_obj, with_hours=True) }}
+</span>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/organization.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/organization.html
new file mode 100644
index 0000000..755a9be
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/organization.html
@@ -0,0 +1,73 @@
+{#
+  Embeds a organization within the sidebar of a page.
+
+  organization    - The organization dict.
+  has_context_title - Boolean for whether to display a module-heading for when
+  this snippet appears within a non-organization template
+  (e.g. dataset page sidebar)
+
+  Example:
+
+  {% snippet 'snippets/organization, organization=c.group_dict %}
+
+  #}
+
+{% set url = h.url_for(organization.type + '.read', id=organization.name, ) %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block info %}
+  <div class="module module-narrow module-shallow context-info">
+    {% if has_context_title %}
+      <h2 class="module-heading"><i class="fa fa-building"></i> {{ h.humanize_entity_type('organization', organization.type, 'sidebar label') or _('Organization') }}</h2>
+    {% endif %}
+    <section class="module-content">
+      {% block inner %}
+      {% block image %}
+        <div class="image">
+          <a href="{{ url }}">
+            <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" width="200" alt="{{ organization.name }}" />
+          </a>
+        </div>
+      {% endblock %}
+      {% block heading %}
+      <h1 class="heading">{{ organization.title or organization.name }}
+        {% if organization.state == 'deleted' %}
+          [{{ _('Deleted') }}]
+        {% endif %}
+      </h1>
+      {% endblock %}
+      {% block description %}
+      {% if organization.description %}
+        <p class="description">
+          {{ h.markdown_extract(organization.description, 180) }}
+        </p>
+        <p class="read-more">
+          {% link_for _('read more'), named_route=organization.type ~ '.about', id=organization.name %}
+        </p>
+      {% else %}
+        <p class="empty">{{ h.humanize_entity_type('organization', organization.type, 'no description') or _('There is no description for this organization') }}</p>
+      {% endif %}
+      {% endblock %}
+      {% if show_nums %}
+        {% block nums %}
+        <div class="nums">
+          <dl>
+            <dt>{{ _('Followers') }}</dt>
+            <dd data-module="followers-counter" data-module-id="{{ organization.id }}" data-module-num_followers="{{ organization.num_followers }}">{{ h.SI_number_span(organization.num_followers) }}</dd>
+          </dl>
+          <dl>
+            <dt>{{ h.humanize_entity_type('package', dataset_type, 'facet label') or _('Datasets') }}</dt>
+            <dd>{{ h.SI_number_span(organization.package_count) }}</dd>
+          </dl>
+        </div>
+        {% endblock %}
+        {% block follow %}
+        <div class="follow_button">
+          {{ h.follow_button('group', organization.id) }}
+        </div>
+        {% endblock %}
+      {% endif %}
+      {% endblock %}
+    </section>
+  </div>
+  {% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/organization_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/organization_item.html
new file mode 100644
index 0000000..9bd7e22
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/organization_item.html
@@ -0,0 +1,27 @@
+{% set url=h.url_for(organization.type ~ '.read', id=organization.name) %}
+{% block organization_item %}
+  <section class="group-list module module-narrow module-shallow">
+    {% block organization_item_header %}
+      <header class="module-heading">
+        {% block organization_item_header_image %}
+        <a class="module-image" href="{{ url }}">
+          <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ organization.name }}" />
+        </a>
+        {% endblock %}
+        {% block organization_item_header_title %}
+          <h3 class="media-heading"><a href="{{ url }}">{{ organization.title or organization.name }}</a></h3>
+        {% endblock %}
+        {% block organization_item_header_description %}
+          {% if organization.description %}
+              <p>{{ h.markdown_extract(organization.description, 120)|urlize }}</p>
+          {% endif %}
+        {% endblock %}
+      </header>
+    {% endblock %}
+    {% block organization_item_content %}
+      {% set list_class = "list-unstyled dataset-list" %}
+      {% set item_class = "dataset-item module-content" %}
+      {% snippet 'snippets/package_list.html', packages=organization.packages, list_class=list_class, item_class=item_class %}
+    {% endblock %}
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/package_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/package_item.html
new file mode 100644
index 0000000..801d9c8
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/package_item.html
@@ -0,0 +1,70 @@
+{#
+Displays a single of dataset.
+
+package        - A package to display.
+item_class     - The class name to use on the list item.
+hide_resources - If true hides the resources (default: false).
+
+Example:
+
+  {% snippet 'snippets/package_item.html', package=c.datasets[0] %}
+
+#}
+{% set title = package.title or package.name %}
+{% set notes = h.markdown_extract(package.notes, extract_length=180) %}
+
+{% block package_item %}
+  <li class="{{ item_class or "dataset-item" }}">
+    {% block content %}
+      <div class="dataset-content">
+        {% block heading %}
+          <h2 class="dataset-heading">
+            {% block heading_private %}
+              {% if package.private %}
+                <span class="dataset-private badge bg-secondary">
+                    <i class="fa fa-lock"></i>
+                    {{ _('Private') }}
+                </span>
+              {% endif %}
+            {% endblock %}
+            {% block heading_title %}
+    <a href="{{ h.url_for('%s.read' % package.type, id=package.name) }}" title="{{ title }}">
+      {{title|truncate(80)}}
+    </a>
+            {% endblock %}
+            {% block heading_meta %}
+              {% if package.get('state', '').startswith('draft') %}
+                <span class="badge bg-info">{{ _('Draft') }}</span>
+              {% elif package.get('state', '').startswith('deleted') %}
+                <span class="badge bg-danger">{{ _('Deleted') }}</span>
+              {% endif %}
+              {{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }}
+            {% endblock %}
+          </h2>
+        {% endblock %}
+        {% block notes %}
+          {% if notes %}
+            <div>{{ notes|urlize }}</div>
+          {% else %}
+            <p class="empty">{{ h.humanize_entity_type('package', package.type, 'no description') or _("There is no description for this dataset") }}</p>
+          {% endif %}
+        {% endblock %}
+      </div>
+      {% block resources %}
+        {% if package.resources and not hide_resources %}
+          {% block resources_outer %}
+            <ul class="dataset-resources list-unstyled">
+              {% block resources_inner %}
+                {% for resource in h.dict_list_reduce(package.resources, 'format') %}
+                <li>
+                  <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="badge badge-default" data-format="{{ resource.lower() }}">{{ resource }}</a>
+                </li>
+                {% endfor %}
+              {% endblock %}
+            </ul>
+          {% endblock %}
+        {% endif %}
+      {% endblock %}
+    {% endblock %}
+  </li>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/package_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/package_list.html
new file mode 100644
index 0000000..634b1a1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/package_list.html
@@ -0,0 +1,24 @@
+{#
+Displays a list of datasets.
+
+packages       - A list of packages to display.
+list_class     - The class name for the list item.
+item_class     - The class name to use on each item.
+hide_resources - If true hides the resources (default: false).
+
+Example:
+
+  {% snippet 'snippets/package_list.html', packages=c.datasets %}
+
+#}
+{% block package_list %}
+  {% if packages %}
+    <ul class="{{ list_class or 'dataset-list list-unstyled' }}">
+    	{% block package_list_inner %}
+	      {% for package in packages %}
+	        {% snippet 'snippets/package_item.html', package=package, item_class=item_class, hide_resources=hide_resources %}
+	      {% endfor %}
+	    {% endblock %}
+    </ul>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/popular.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/popular.html
new file mode 100644
index 0000000..1663fad
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/popular.html
@@ -0,0 +1,4 @@
+{# show the popularity icon #}
+{% if number >= min %}
+<i class="fa-solid fa-fire-flame-curved popular" title="{{ _('Popular') }}: {{ title.format(number=number) }}"></i>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/private.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/private.html
new file mode 100644
index 0000000..70c86ae
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/private.html
@@ -0,0 +1,3 @@
+<section class="module module-narrow module-shallow group">
+  <h2 class="module-heading">{{ _('Private')  }}</h2>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/search_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/search_form.html
new file mode 100644
index 0000000..9d755c2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/search_form.html
@@ -0,0 +1,90 @@
+{% import 'macros/form.html' as form %}
+
+{% set placeholder = placeholder if placeholder else _('Search datasets...') %}
+{% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
+{% set search_class = search_class if search_class else 'search-giant' %}
+{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
+{% set form_id = form_id if form_id else false %}
+
+<form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
+
+  {% block search_input %}
+    <div class="input-group search-input-group">
+      <input aria-label="{% block header_site_search_label %}{{ placeholder }}{% endblock %}" id="field-giant-search" type="text" class="form-control input-lg" name="q" value="{{ query }}" autocomplete="off" placeholder="{{ placeholder }}">
+      {% block search_input_button %}
+      <span class="input-group-btn">
+        <button class="btn btn-default btn-lg" type="submit" value="search" aria-label="{{_('Submit')}}">
+          <i class="fa fa-search"></i>
+        </button>
+      </span>
+      {% endblock %}
+    </div>
+  {% endblock %}
+
+  {% block search_search_fields %}
+    {% if fields -%}
+      <span>{{ form.hidden_from_list(fields=fields) }}</span>
+    {%- endif %}
+  {% endblock %}
+
+  {% block search_sortby %}
+    {% if sorting %}
+      <div class="form-group control-order-by">
+        <label for="field-order-by">{{ _('Order by') }}</label>
+        <select id="field-order-by" name="sort" class="form-control form-select">
+          {% for label, value in sorting %}
+            {% if label and value %}
+              <option value="{{ value }}"{% if sorting_selected == value %} selected="selected"{% endif %}>{{ label }}</option>
+            {% endif %}
+          {% endfor %}
+        </select>
+        {% block search_sortby_button %}
+        <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
+        {% endblock %}
+      </div>
+    {% endif %}
+  {% endblock %}
+
+  {% block search_title %}
+    {% if not error %}
+      <h1>{% snippet 'snippets/search_result_text.html', query=query, count=count, type=type %}</h1>
+    {% else %}
+      <h2>Error</h2>
+    {% endif %}
+  {% endblock %}
+
+  {% block search_facets %}
+    {% if facets %}
+      <p class="filter-list">
+        {% for field in facets.fields %}
+          {% set search_facets_items = facets.search.get(field)['items'] if facets.search and field in facets.search else [] %}
+          <span class="facet">{{ facets.titles.get(field) }}:</span>
+          {% for value in facets.fields[field] %}
+            <span class="filtered pill">
+              {%- if facets.translated_fields and (field,value) in facets.translated_fields -%}
+                {{ facets.translated_fields[(field,value)] }}
+              {%- else -%}
+                {{ h.list_dict_filter(search_facets_items, 'name', 'display_name', value) }}
+              {%- endif %}
+              <a href="{{ facets.remove_field(field, value) }}" class="remove" title="{{ _('Remove') }}"><i class="fa fa-times"></i></a>
+            </span>
+          {% endfor %}
+        {% endfor %}
+      </p>
+      <a class="show-filters btn btn-default">{{ _('Filter Results') }}</a>
+    {% endif %}
+  {% endblock %}
+
+</form>
+
+{% if show_empty and count == 0 and not error %}
+  {% trans %}
+    <p class="extra">Please try another search.</p>
+  {% endtrans %}
+{% endif %}
+
+{% if error %}
+  {% trans %}
+    <p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p>
+  {% endtrans %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/search_result_text.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/search_result_text.html
new file mode 100644
index 0000000..ffc6794
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/search_result_text.html
@@ -0,0 +1,58 @@
+{#
+
+Displays a test for results of a search.
+
+query        - The text that was searched for
+count        - The number of results for the search
+type         - Search result type (dataset, group, organization)
+
+Example:
+
+  {% snippet 'snippets/search_result_text.html', query=query, count=count, type='dataset' %}
+
+#}
+{% if type == 'dataset' %}
+  {% set text_query = ungettext('{number} dataset found for "{query}"', '{number} datasets found for "{query}"', count) %}
+  {% set text_query_none = _('No datasets found for "{query}"') %}
+  {% set text_no_query = ungettext('{number} dataset found', '{number} datasets found', count) %}
+  {% set text_no_query_none = _('No datasets found') %}
+
+{% elif type == 'group' %}
+  {% set text_query = ungettext('{number} group found for "{query}"', '{number} groups found for "{query}"', count) %}
+  {% set text_query_none = _('No groups found for "{query}"') %}
+  {% set text_no_query = ungettext('{number} group found', '{number} groups found', count) %}
+  {% set text_no_query_none = _('No groups found') %}
+
+{% elif type == 'organization' %}
+  {% set text_query = ungettext('{number} organization found for "{query}"', '{number} organizations found for "{query}"', count) %}
+  {% set text_query_none = _('No organizations found for "{query}"') %}
+  {% set text_no_query = ungettext('{number} organization found', '{number} organizations found', count) %}
+  {% set text_no_query_none = _('No organizations found') %}
+
+{% else %}
+  {% set text_query_singular = '{number} ' + type + ' found for "{query}"' %}
+  {% set text_query_plural = '{number} ' + type + 's found for "{query}"' %}
+  {% set text_query_none_plural = 'No ' + type + 's found for "{query}"' %}
+  {% set text_no_query_singular = '{number} ' + type + ' found' %}        
+  {% set text_no_query_plural = '{number} ' + type + 's found' %}
+  {% set text_no_query_none_plural = 'No ' + type + 's found' %}      
+
+  {% set text_query = ungettext(text_query_singular, text_query_plural, count) %}
+  {% set text_query_none = _(text_query_none_plural) %}
+  {% set text_no_query = ungettext(text_no_query_singular, text_no_query_plural, count) %}
+  {% set text_no_query_none = _(text_no_query_none_plural) %}
+{%- endif -%}
+
+{% if query %}
+  {%- if count -%}
+    {{ text_query.format(number=h.localised_number(count), query=query, type=type) }}
+  {%- else -%}
+    {{ text_query_none.format(query=query, type=type) }}
+  {%- endif -%}
+{%- else -%}
+  {%- if count -%}
+    {{ text_no_query.format(number=h.localised_number(count), type=type) }}
+  {%- else -%}
+    {{ text_no_query_none.format(type=type) }}
+  {%- endif -%}
+{%- endif -%}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/simple_search.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/simple_search.html
new file mode 100644
index 0000000..6bc6a53
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/simple_search.html
@@ -0,0 +1,17 @@
+{% set input_class = input_class or 'search-giant' %}
+<form class="dataset-search {{ form_class }}" method="GET" data-module="select-switch">
+  <span class="form-group {{ input_class }}">
+    <input type="text" class="search form-control" name="q" value="{{ q }}" autocomplete="off" placeholder="{{ placeholder }}" />
+    <button type="submit"><i class="fa fa-search"></i> <span>{{ _('Search') }}</span></button>
+  </span>
+  <span class="form-select form-group control-order-by">
+    <label for="field-order-by">{{ _('Order by') }}</label>
+    <select id="field-order-by" name="sort" class="form-control">
+      {% set sort_items = [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
+      {% for item in sort_items + (extra_sort or []) %}
+        <option value="{{ item[1] }}"{% if sort==item[1] %} selected="selected"{% endif %}>{{ item[0] }}</option>
+      {% endfor %}
+    </select>
+    <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
+  </span>
+</form>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/social.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/social.html
new file mode 100644
index 0000000..16da6b6
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/social.html
@@ -0,0 +1,14 @@
+{% set current_url = h.full_current_url() %}
+{% block social %}
+  <section class="module module-narrow social">
+    {% block social_title %}
+      <h2 class="module-heading"><i class="fa fa-share-square"></i> {{ _('Social') }}</h2>
+    {% endblock %}
+    {% block social_nav %}
+      <ul class="nav nav-simple">
+        <li class="nav-item"><a href="https://twitter.com/share?url={{ current_url }}" target="_blank"><i class="fa-brands fa-twitter-square"></i> Twitter</a></li>
+        <li class="nav-item"><a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank"><i class="fa-brands fa-facebook-square"></i> Facebook</a></li>
+      </ul>
+    {% endblock %}
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/tag_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/tag_list.html
new file mode 100644
index 0000000..77f753e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/snippets/tag_list.html
@@ -0,0 +1,20 @@
+{#
+  Render a list of tags linking to the dataset search page
+
+  tags - list of tag dicts
+
+  Example:
+
+    {% snippet 'snippets/tag_list.html', tags=tags, _class='tag-list' %}
+
+#}
+{% set _class = _class or 'tag-list' %}
+{% block tag_list %}
+  <ul class="{{ _class }}">
+    {% for tag in tags %}
+      <li>
+        <a class="{% block tag_list_item_class %}tag{% endblock %}" href="{% url_for 'dataset.search', tags=tag.name %}" title="{{ tag.display_name }}">{{ tag.display_name|truncate(22) }}</a>
+      </li>
+    {% endfor %}
+  </ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/index.html
new file mode 100644
index 0000000..81e3b31
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/index.html
@@ -0,0 +1,35 @@
+{% extends "page.html" %}
+
+
+{% block subtitle %}{{ _('Tags') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Tags'), controller='d4s', action='tags' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{# {% set tags = h.get_facet_items_dict('tags', c.search_facets, limit=3) %} #}
+
+{% block primary_content_inner %}
+  {% set tags = h.get_facet_items_dict('tags', c.search_facets, limit=None) %}
+
+  <h1 class="hide-heading">{{ _('Tags') }}</h1>
+  {% block tag_form %}
+    {% snippet "tag/snippets/tag_form.html", tags=tags, sorting_selected=sortby %}
+  {% endblock %}
+
+  {% block tag_list %}
+    {% if tags|length >= 1 %}
+      {% snippet "tag/snippets/tag_list.html", tags=tags %}
+    {% else %}
+      <p class="empty">There are no {{ _('Tags') }}</p>
+    {% endif %}
+  {% endblock %}
+
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "tag/snippets/helper.html" %}
+{% endblock %}
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/helper.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/helper.html
new file mode 100644
index 0000000..2ec30b3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/helper.html
@@ -0,0 +1,13 @@
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="icon-info-sign"></i>
+    {{ _('What are Tags?') }}
+  </h2>
+  <div class="module-content">
+    <p>
+      {% trans %}
+      Tags are keywords or labels that help categorize and filter datasets within the catalogue. They provide a way to quickly identify the main topics, themes, or attributes of a dataset. By tagging datasets with relevant keywords, users can easily search and find datasets that match their interests or needs. Tags improve discoverability and make it easier to organize and manage the datasets in the catalogue.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/tag_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/tag_form.html
new file mode 100644
index 0000000..a152a4d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/tag_form.html
@@ -0,0 +1,52 @@
+{% import 'macros/form.html' as form %}
+
+{% set sorting = [(_('Name Ascending'), 'name_asc'), (_('Name Descending'), 'name_desc'), (_('Number Of Ascending'), 'count_asc'), (_('Number Of Descending'), 'count_desc')] %}
+{% set search_class = search_class if search_class else 'search-giant' %}
+{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
+{% set form_id = form_id if form_id else false %}
+
+<form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
+
+  {% block search_sortby %}
+    {% if sorting %}
+      <div class="form-select control-group control-order-by">
+        <label for="field-order-by">{{ _('Order by') }}</label>
+        <select id="field-order-by" name="sort">
+          {% for label, value in sorting %}
+            {% if label and value %}
+              <option value="{{ value }}"{% if sorting_selected == value %} selected="selected"{% endif %}>{{ label }}</option>
+            {% endif %}
+          {% endfor %}
+        </select>
+        {% block search_sortby_button %}
+        <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
+        {% endblock %}
+      </div>
+    {% endif %}
+  {% endblock %}
+
+  {% block search_title %}
+  <h2>
+    {{ tags|length }}
+    {% if tags|length > 1 %}
+     {{ _('Tags') }}
+    {% else %}
+     {{ _('Tag') }}
+    {% endif %}
+    found
+  </h2>
+  {% endblock %}
+
+</form>
+
+{% if show_empty and count == 0 and not error %}
+  {% trans %}
+    <p class="extra">Please try another search.</p>
+  {% endtrans %}
+{% endif %}
+
+{% if error %}
+  {% trans %}
+    <p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p>
+  {% endtrans %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/tag_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/tag_list.html
new file mode 100644
index 0000000..199ebc1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tag/snippets/tag_list.html
@@ -0,0 +1,9 @@
+{% block tag_list %}
+<ul class="media-grid" data-module="media-grid">
+  {% block tag_list_inner %}
+  {% for tag in tags %}
+    {% snippet "tag/snippets/tag_item.html", tag=tag, position=loop.index %}
+  {% endfor %}
+  {% endblock %}
+</ul>
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/broken_helper_as_attribute.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/broken_helper_as_attribute.html
new file mode 100644
index 0000000..b592887
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/broken_helper_as_attribute.html
@@ -0,0 +1,5 @@
+{% extends 'page.html' %}
+
+{% block page %}
+    {{ h.not_here() }}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/broken_helper_as_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/broken_helper_as_item.html
new file mode 100644
index 0000000..d19d2e0
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/broken_helper_as_item.html
@@ -0,0 +1,5 @@
+{% extends 'page.html' %}
+
+{% block page %}
+    {{ h['not_here']() }}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/flash_messages.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/flash_messages.html
new file mode 100644
index 0000000..95c5315
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/flash_messages.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Hello</title>
+    </head>
+    <body>
+        Flash messages:
+        {% for category, message in h.get_flashed_messages(with_categories=true) %}
+          <div>
+            {{ category }}: {{ h.literal(message) }}
+          </div>
+        {% endfor %}
+    </body>
+</html>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/helper_as_attribute.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/helper_as_attribute.html
new file mode 100644
index 0000000..8e22f36
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/helper_as_attribute.html
@@ -0,0 +1,5 @@
+{% extends 'page.html' %}
+
+{% block page %}
+    My lang is: {{ h.lang() }}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/helper_as_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/helper_as_item.html
new file mode 100644
index 0000000..4907461
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/helper_as_item.html
@@ -0,0 +1,5 @@
+{% extends 'page.html' %}
+
+{% block page %}
+    My lang is: {{ h['lang']() }}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/mock_json_resource_preview_template.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/mock_json_resource_preview_template.html
new file mode 100644
index 0000000..20630de
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/mock_json_resource_preview_template.html
@@ -0,0 +1,17 @@
+{% extends 'dataviewer/base.html' %}
+
+{% block page %}
+  <div>
+    <pre data-module="mock-json-preview">
+      <div class="loading">
+        {{ _('Loading...') }}
+      </div>
+    </pre>
+  </div>
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+
+  <script src="mock-json-preview.js"></script>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/mock_resource_preview_template.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/mock_resource_preview_template.html
new file mode 100644
index 0000000..9bea46d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/tests/mock_resource_preview_template.html
@@ -0,0 +1,17 @@
+{% extends 'dataviewer/base.html' %}
+
+{% block page %}
+  <div>
+    <pre data-module="mock-preview">
+      <div class="loading">
+        {{ _('Loading...') }}
+      </div>
+    </pre>
+  </div>
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+
+  <script src="mock-preview.js"></script>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/index.html
new file mode 100644
index 0000000..44658ce
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/index.html
@@ -0,0 +1,83 @@
+
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Tags') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Tags'), controller='d4s', action='tags' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% set tags = h.get_facet_items_dict('tags', c.search_facets, limit=3) %}
+{% set sortby = h.get_request_param('sort') %}
+{% if sortby %}
+  {% set list = sortby.split('_') %}
+{% else %}
+  {% set list = ['name', 'asc'] %}
+{% endif %}
+{% set tags = h.d4science_get_ordered_dictionary(tags, list[0], list[1]) %}
+
+{% block primary_content_inner %}
+
+<h1 class="hide-heading">{{ _('Tags') }}</h1>
+{% block tag_form %}
+  {% snippet "tag/snippets/tag_form.html", tags=tags, sorting_selected=sortby %}
+{% endblock %}
+
+{% block tag_list %}
+  {% if tags|length >= 1 %}
+    {% snippet "tag/snippets/tag_list.html", tags=tags %}
+  {% else %}
+    <p class="empty">There are no {{ _('Tags') }}</p>
+  {% endif %}
+{% endblock %}
+
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "tag/snippets/helper.html" %}
+{% endblock %}
+
+
+{# {% extends "page.html" %}
+
+{% block subtitle %}{{ _('Types') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Types'), controller='d4s', action='index' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% set metadatatype = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+{% set metadatatypes = h.get_facet_items_dict(metadatatype['name']) %}
+{% set sortby = h.get_request_param('sort') %}
+{% if sortby %}
+{% set list = sortby.split('_') %}
+{% else %}
+{% set list = ['name', 'asc'] %}
+{% endif %}
+{% set metadatatypes = h.d4science_get_ordered_dictionary(metadatatypes, list[0], list[1]) %}
+
+
+{% block primary_content_inner %}
+
+<h1 class="hide-heading">{{ _('Types') }}</h1>
+{% block type_form %}
+  {% snippet "type/snippets/type_form.html", metadatatypes=metadatatypes, sorting_selected=sortby %}
+{% endblock %}
+
+{% block type_list %}
+   {% if metadatatypes|length >= 1 %}
+      {% snippet "type/snippets/type_list.html", metadatatypes=metadatatypes %}
+    {% else %}
+      <p class="empty">There are no {{ _('Types') }}</p>
+ {% endif %}
+{% endblock %}
+
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "type/snippets/helper.html" %}
+{% endblock %} #}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/helper.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/helper.html
new file mode 100644
index 0000000..20e827e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/helper.html
@@ -0,0 +1,14 @@
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="icon-info-sign"></i>
+    {{ _('What are Types?') }}
+  </h2>
+  <div class="module-content">
+    <p>
+      {% trans %}
+      Types are used to filter catalogue items by their typology, e.g. datasets, methods, services.
+      Every typology is characterised by a specific set of attributes, controlled vocabularies and formats carefully describing the specific class of items.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_form.html
new file mode 100644
index 0000000..00f5d25
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_form.html
@@ -0,0 +1,52 @@
+{% import 'macros/form.html' as form %}
+
+{% set sorting = [(_('Name Ascending'), 'name_asc'), (_('Name Descending'), 'name_desc'), (_('Number Of Ascending'), 'count_asc'), (_('Number Of Descending'), 'count_desc')] %}
+{% set search_class = search_class if search_class else 'search-giant' %}
+{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
+{% set form_id = form_id if form_id else false %}
+
+<form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
+
+  {% block search_sortby %}
+    {% if sorting %}
+      <div class="form-select control-group control-order-by">
+        <label for="field-order-by">{{ _('Order by') }}</label>
+        <select id="field-order-by" name="sort">
+          {% for label, value in sorting %}
+            {% if label and value %}
+              <option value="{{ value }}"{% if sorting_selected == value %} selected="selected"{% endif %}>{{ label }}</option>
+            {% endif %}
+          {% endfor %}
+        </select>
+        {% block search_sortby_button %}
+        <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
+        {% endblock %}
+      </div>
+    {% endif %}
+  {% endblock %}
+
+  {% block search_title %}
+  <h2>
+    {{metadatatypes|length}}
+    {% if metadatatypes|length > 1 %}
+     {{ _('Types') }}
+    {% else %}
+     {{ _('Type') }}
+    {% endif %}
+    found
+  </h2>
+  {% endblock %}
+
+</form>
+
+{% if show_empty and count == 0 and not error %}
+  {% trans %}
+    <p class="extra">Please try another search.</p>
+  {% endtrans %}
+{% endif %}
+
+{% if error %}
+  {% trans %}
+    <p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p>
+  {% endtrans %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_item.html
new file mode 100644
index 0000000..465f791
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_item.html
@@ -0,0 +1,39 @@
+{#
+Renders a media item for a type. This should be used in a list.
+
+type - A type dict.
+
+Example:
+<style>
+.center-cropped {
+  width: 100px;
+  height: 100px;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+</style>
+
+    <ul class="media-grid">
+      {% for type in types %}
+        {% snippet "type/snippets/type_item.html", type=type %}
+      {% endfor %}
+    </ul>
+#}
+{% block item %}
+
+<li class="media-item">
+  {% block item_inner %}
+    {% block image %}
+    {% set img_url = h.d4science_get_url_to_icon_for_ckan_entity(type.name, entity_type='type') %}
+      <div class="d4s-center-cropped"><img src="{{ img_url }}" alt="{{ type.name }}" title="{{ _('{name}').format(name=type.display_name) }} type"></div>
+    {% endblock %}
+    {% block title %}
+      <!--<h3 class="media-heading">{{ type.display_name }}</h3>-->
+    {% endblock %}
+    {% block link %}
+    <h3> <a class="media-heading" href="{% url_for controller='dataset', action='search', systemtype=type.name %}" title="{{ _('View {name}').format(name=type.display_name) }} {{ _('datasets')}}">{{ h.truncate(type.display_name, 26) }}</a>
+    </a>({{type.count}})</h3>
+    {% endblock %}
+  {% endblock %}
+</li>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_list.html
new file mode 100644
index 0000000..2b5845c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/type/snippets/type_list.html
@@ -0,0 +1,19 @@
+{#
+Display a grid of type items.
+
+groups - A list of types.
+
+Example:
+
+    {% snippet "type/snippets/type_item.htm" %}
+
+#}
+{% block type_list %}
+<ul class="media-grid" data-module="media-grid">
+	{% block type_list_inner %}
+  {% for type in metadatatypes %}
+    {% snippet "type/snippets/type_item.html", type=type, position=loop.index %}
+  {% endfor %}
+  {% endblock %}
+</ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/api_tokens.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/api_tokens.html
new file mode 100644
index 0000000..0aa5bc1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/api_tokens.html
@@ -0,0 +1,42 @@
+{% extends "user/read_base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% block page_primary_action %}
+  {% if h.check_access('api_token_create', {'user': user['name']}) %}
+    <form method="POST" class="form">
+      {{ h.csrf_input() }}
+      {% block errors %}{{ form.errors(error_summary) }}{% endblock %}
+
+      {% block base_fields %}
+        <div class="form-group ">
+            {{ form.input('name', label='Name', is_required=True, value=data.name, error=errors.name) }}
+        </div>
+      {% endblock base_fields %}
+      {% block additional_fields %}
+      {% endblock additional_fields %}
+      {% block form_actions %}
+        <button class="btn btn-primary" type="submit" value="create">
+          {{ _('Create API Token') }}
+        </button>
+      {% endblock form_actions %}
+    </form>
+  {% endif %}
+{% endblock page_primary_action %}
+
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">
+    {% block page_heading %}{{ _('API Tokens') }}{% endblock %}
+  </h2>
+
+  {% block token_list %}
+    {% if tokens %}
+      {% snippet 'user/snippets/api_token_list.html', tokens=tokens, user=user %}
+    {% else %}
+      <p class="empty">
+        {{ _('You haven\'t created any API Tokens.') }}
+      </p>
+    {% endif %}
+  {% endblock token_list %}
+{% endblock primary_content_inner %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/confirm_delete.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/confirm_delete.html
new file mode 100644
index 0000000..f7d7112
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/confirm_delete.html
@@ -0,0 +1,22 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete user - {name}?').format(name=user_dict.name) }}</p>
+        <p class="form-actions">
+          <form id="user-confirm-delete-form" action="{{ h.url_for('user.delete', id=user_dict.id) }}" method="post">
+            {{ h.csrf_input() }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard.html
new file mode 100644
index 0000000..25a5eda
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard.html
@@ -0,0 +1,43 @@
+{% extends "user/edit_base.html" %}
+
+{% set user = current_user %}
+{% set org_type = h.default_group_type('organization') %}
+{% set group_type = h.default_group_type('group') %}
+{% set dataset_type = h.default_package_type() %}
+
+
+{% block breadcrumb_content %}
+  <li class="active"><a href="{{ h.url_for('dashboard.datasets') }}">{{ _('Dashboard') }}</a></li>
+{% endblock %}
+
+{% block secondary %}{% endblock %}
+
+{% block primary %}
+  <article class="module">
+    {% block page_header %}
+      <header class="module-content page-header hug">
+        <div class="content_action">
+          {% link_for _('Profile settings'), named_route='user.edit', id=user.name, class_='btn btn-default', icon='cog' %}
+        </div>
+      {% block content_primary_nav %}
+        <ul class="nav nav-tabs">
+          {% block dashboard_nav_links %}
+            {{ h.build_nav_icon('dashboard.datasets', h.humanize_entity_type('package', dataset_type, 'my label') or _('My Datasets'), icon='sitemap') }}
+            {{ h.build_nav_icon('dashboard.organizations', h.humanize_entity_type('organization', org_type, 'my label') or _('My Organizations'), icon='building') }}
+            {{ h.build_nav_icon('dashboard.groups', h.humanize_entity_type('group', group_type, 'my label') or _('My Groups'), icon='users') }}
+          {% endblock dashboard_nav_links %}
+        </ul>
+     {% endblock %}
+      </header>
+    {% endblock %}
+    <div class="module-content">
+      {% if self.page_primary_action() | trim %}
+        <div class="page_primary_action">
+          {% block page_primary_action %}{% endblock %}
+        </div>
+      {% endif %}
+      {% block primary_content_inner %}
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_datasets.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_datasets.html
new file mode 100644
index 0000000..f2f8ae5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_datasets.html
@@ -0,0 +1,22 @@
+{% extends "user/dashboard.html" %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block page_primary_action %}
+  {% if h.check_access('package_create') %}
+    {% snippet 'snippets/add_dataset.html' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ h.humanize_entity_type('package', dataset_type, 'my label') or _('My Datasets') }}</h2>
+  {% if user_dict.datasets %}
+    {% snippet 'snippets/package_list.html', packages=user_dict.datasets %}
+  {% else %}
+    <p class="empty">
+      {{ _('You haven\'t created any datasets.') }}
+      {% if h.check_access('package_create') %}
+        {% link_for _('Create one now?'), named_route=dataset_type ~ '.new' %}
+      {% endif %}
+    </p>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_groups.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_groups.html
new file mode 100644
index 0000000..e5fb24f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_groups.html
@@ -0,0 +1,26 @@
+{% extends "user/dashboard.html" %}
+
+{% set group_type = h.default_group_type('group') %}
+
+{% block page_primary_action %}
+  {% if h.check_access('group_create') %}
+    {% link_for h.humanize_entity_type('group', group_type, 'add link') or _('Add Group'), named_route=group_type ~ '.new', class_="btn btn-primary", icon="plus-square" %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ h.humanize_entity_type('group', group_type, 'my label') or _('My Groups') }}</h2>
+  {% set groups = h.groups_available(am_member=True) %}
+  {% if groups %}
+    <div class="wide">
+      {% snippet "group/snippets/group_list.html", groups=groups %}
+    </div>
+  {% else %}
+    <p class="empty">
+      {{ h.humanize_entity_type('group', group_type, 'you not member') or _('You are not a member of any groups.') }}
+      {% if h.check_access('group_create') %}
+        {% link_for _('Create one now?'), named_route=group_type ~ '.new' %}
+      {% endif %}
+    </p>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_organizations.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_organizations.html
new file mode 100644
index 0000000..187566e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/dashboard_organizations.html
@@ -0,0 +1,27 @@
+{% extends "user/dashboard.html" %}
+
+{% set group_type = h.default_group_type('organization') %}
+
+{% block page_primary_action %}
+  {% if h.check_access('organization_create') %}
+    {% link_for h.humanize_entity_type('organization', group_type, 'add link') or _('Add Organization'), named_route=group_type ~ '.new', class_="btn btn-primary", icon="plus-square" %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ h.humanize_entity_type('organization', group_type, 'my label') or _('My Organizations') }}</h2>
+  {% set organizations = h.organizations_available(permission='manage_group',
+    include_dataset_count=True) %}
+  {% if organizations %}
+    <div class="wide">
+      {% snippet "organization/snippets/organization_list.html", organizations=organizations, show_capacity=True %}
+    </div>
+  {% else %}
+    <p class="empty">
+      {{ h.humanize_entity_type('organization', group_type, 'you not member') or _('You are not a member of any organizations.') }}
+      {% if h.check_access('organization_create') %}
+        {% link_for _('Create one now?'), named_route=group_type ~ '.new' %}
+      {% endif %}
+    </p>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit.html
new file mode 100644
index 0000000..5771589
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit.html
@@ -0,0 +1,25 @@
+{% extends 'user/edit_base.html' %}
+
+{% block actions_content %}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li><a href="{{ h.url_for('user.index') }}">{{ _('Users') }}</a></li>
+  <li><a href="{{ h.url_for('user.read', id=user_dict.name) }}">{{ user_dict.display_name }}</a></li>
+  <li class="active"><a href="#">{{ _('Manage') }}</a></li>
+{% endblock %}
+
+{% block primary_content_inner %}
+  {{ form | safe }}
+{% endblock %}
+
+{% block secondary_content %}
+  <section class="module module-narrow module-shallow">
+    <h2 class="module-heading"><i class="fa fa-info-circle"></i> {{ _('Account Info') }}</h2>
+    <div class="module-content">
+      {% trans %}
+        Your profile lets other CKAN users know about who you are and what you
+        do.
+      {% endtrans %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit_base.html
new file mode 100644
index 0000000..76c6f45
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit_base.html
@@ -0,0 +1,11 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Manage') }} {{ g.template_title_delimiter }} {{ user_dict.display_name }} {{ g.template_title_delimiter }} {{ _('Users') }}{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div class="module-content">
+      {% block primary_content_inner %}{% endblock %}
+    </div>
+  </article>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit_user_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit_user_form.html
new file mode 100644
index 0000000..1241728
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/edit_user_form.html
@@ -0,0 +1,96 @@
+{% import 'macros/form.html' as form %}
+
+{% block form %}
+  <form id="user-edit-form" class="dataset-form" method="post" action="{{ action }}" enctype="multipart/form-data">
+    {{ h.csrf_input() }}
+    {% block form_errors %}{{ form.errors(error_summary) }}{% endblock %}
+
+    {% block core_fields %}
+      <fieldset>
+        <legend>{{ _('Change details') }}</legend>
+        {{ form.input('name', label=_('Username'), id='field-username', value=data.name, error=errors.name, classes=['control-medium'], attrs={'readonly': '', 'class': 'form-control'}) }}
+
+        {{ form.input('fullname', label=_('Full name'), id='field-fullname', value=data.fullname, error=errors.fullname, placeholder=_('eg. Joe Bloggs'), classes=['control-medium']) }}
+
+        {{ form.input('email', label=_('Email'), id='field-email', type='email', value=data.email, error=errors.email, placeholder=_('eg. joe@example.com'), classes=['control-medium'], is_required=true) }}
+
+        {{ form.markdown('about', label=_('About'), id='field-about', value=data.about, error=errors.about, placeholder=_('A little information about yourself')) }}
+
+        {% set is_upload = data.image_url and not data.image_url.startswith('http') %}
+        {% set is_url = data.image_url and data.image_url.startswith('http') %}
+
+        {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload, upload_label=_('Profile picture'), url_label=_('Profile picture URL') ) }}
+      </fieldset>
+    {% endblock %}
+
+    {% block extra_fields %}
+    {% if g.userobj.sysadmin and data.state == 'deleted' %}
+      {% call form.checkbox('activate_user', label=_('Reactivate User'), id='activate_user', value=True, checked=false) %}
+      {% set helper_text = _('This account is deactivated, if you want to reactivate it, please click on checkbox.') %}
+      {{ form.info(helper_text, classes='info-help-tight') }}
+      {% endcall %}
+    {% endif %}
+    {% endblock %}
+
+    {% if is_sysadmin and current_user.name != data.name %}
+    {% block sysadmin_password %}
+      <fieldset>
+      <legend>{{ _('Change ' + data.name|capitalize + "'s" + ' password') }}</legend>
+      {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
+      {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
+      </fieldset>
+    {% endblock %}
+
+    {% block sysadmin_old_password %}
+      <fieldset>
+        <legend>{{ _('Sysadmin password') }}</legend>
+        {{ form.input('old_password',
+                      type='password',
+                      label=_('Sysadmin Password'),
+                      id='field-password-old',
+                      value=data.oldpassword,
+                      error=errors.oldpassword,
+                      classes=['control-medium'],
+                      attrs={'autocomplete': 'off', 'class': 'form-control'}
+                      ) }}
+
+      </fieldset>
+    {% endblock %}
+
+    {% else %}
+    {% block change_password %}
+      <fieldset>
+        <legend>{{ _('Change password') }}</legend>
+        {{ form.input('old_password',
+                      type='password',
+                      label=_('Old Password'),
+                      id='field-password-old',
+                      value=data.oldpassword,
+                      error=errors.oldpassword,
+                      classes=['control-medium'],
+                      attrs={'autocomplete': 'off', 'class': 'form-control'}
+                      ) }}
+
+        {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
+
+        {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
+      </fieldset>
+    {% endblock %}
+    {% endif %}
+
+    <div class="form-actions">
+      {% block form_actions %}
+      {% set is_deleted = data.state == 'deleted' %}
+      {% if not is_deleted %}
+        {% block delete_button %}
+          {% if h.check_access('user_delete', {'id': data.id})  %}
+            <a class="btn btn-danger pull-left" href="{% url_for 'user_delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this User?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+          {% endif %}
+        {% endblock %}
+        {% endif %}
+        {{ form.required_message() }}
+        <button class="btn btn-primary" type="submit" name="save">{{ _('Reactivate Profile') if is_deleted else _('Update Profile') }}</button>
+      {% endblock %}
+    </div>
+  </form>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/followers.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/followers.html
new file mode 100644
index 0000000..d0c1b9a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/followers.html
@@ -0,0 +1,12 @@
+{% extends "user/read.html" %}
+
+{% block subtitle %}{{ _('Followers') }}{% endblock %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">
+  	{% block page_heading %}{{ _('Followers') }}{% endblock %}
+  </h2>
+  {% block followers_list %}
+    {% snippet "user/snippets/followers.html", followers=followers %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/list.html
new file mode 100644
index 0000000..08296fb
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/list.html
@@ -0,0 +1,33 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('All Users') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Users'), named_route='user.index') }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div class="module-content">
+      <h1 class="page-heading">
+        {% block page_heading %}{{ _('Users') }}{% endblock %}
+      </h1>
+      {% block users_list %}
+        <ul class="user-list">
+          {% block users_list_inner %}
+            {% for user in page.items %}
+              <li>{{ h.linked_user(user['name'], maxlength=20) }}</li>
+            {% endfor %}
+          {% endblock %}
+        </ul>
+      {% endblock %}
+    </div>
+    {% block page_pagination %}
+      {{ page.pager(q=q, order_by=order_by) }}
+    {% endblock %}
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'user/snippets/user_search.html', q=q %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/login.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/login.html
new file mode 100644
index 0000000..432505e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/login.html
@@ -0,0 +1,54 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Login') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Login'), named_route='user.login') }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      <h1 class="page-heading">{% block page_heading %}{{ _('Login') }}{% endblock %}</h1>
+      {% block form %}
+        {% snippet "user/snippets/login_form.html", error_summary=error_summary %}
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  {% if h.check_access('user_create') %}
+  {% block help_register %}
+  <section class="module module-narrow module-shallow">
+    {% block help_register_inner %}
+      <h2 class="module-heading">{{ _('Need an Account?') }}</h2>
+      <div class="module-content">
+        <p>{% trans %}Then sign right up, it only takes a minute.{% endtrans %}</p>
+        <p class="action">
+        {% block help_register_button %}
+          <a class="btn btn-default" href="{{ h.url_for('user.register') }}">{{ _('Create an Account') }}</a>
+        {% endblock %}
+        </p>
+      </div>
+    {% endblock %}
+  </section>
+  {% endblock %}
+  {% endif %}
+
+  {% block help_forgotten %}
+  <section class="module module-narrow module-shallow">
+    {% block help_forgotten_inner %}
+    <h2 class="module-heading">{{ _('Forgotten your password?') }}</h2>
+    <div class="module-content">
+      <p>{% trans %}No problem, use our password recovery form to reset it.{% endtrans %}</p>
+      <p class="action">
+        {% block help_forgotten_button %}
+        <a class="btn btn-default" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot your password?') }}</a>
+        {% endblock %}
+      </p>
+    </div>
+    {% endblock %}
+  </section>
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/logout.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/logout.html
new file mode 100644
index 0000000..9d1460a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/logout.html
@@ -0,0 +1,14 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Logged Out') }}{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      <h1 class="page-heading">
+      	{% block page_heading %}{{ _('Logged Out') }}{% endblock %}
+      </h1>
+      <p>{% trans %}You are now logged out.{% endtrans %}</p>
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/logout_first.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/logout_first.html
new file mode 100644
index 0000000..1aacd6f
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/logout_first.html
@@ -0,0 +1,26 @@
+{% import 'macros/form.html' as form %}
+{% extends "user/login.html" %}
+
+{% set logout_url = h.url_for('user.logout') %}
+
+{% block actions %}{% endblock %}
+
+{% block form %}
+  <div class="alert alert-danger">{{ _("You're already logged in as {user}.").format(user=current_user.name) }} <a href="{{ logout_url }}">{{ _('Logout') }}</a>?</div>
+    {{ form.input('login', label=_('Username'), id='field-login', value="", error="", classes=["control-full"], attrs={"disabled": "disabled"}) }}
+    {{ form.input('password', label=_('Password'), id='field-password', type="password", value="", error="", classes=["control-full"], attrs={"disabled": "disabled"}) }}
+    {{ form.checkbox('remember', label=_('Remember me'), id='field-remember', checked=true, attrs={"disabled": "disabled"}) }}
+    <div class="form-actions">
+      <button class="btn btn-primary disabled" type="submit" disabled>{{ _('Log in') }}</button>
+    </div>
+{% endblock %}
+
+{% block secondary_content %}
+  <section class="module module-narrow module-shallow">
+    <h2 class="module-heading">{{ _("You're already logged in") }}</h2>
+    <div class="module-content">
+      <p>{{ _("You need to log out before you can log in with another account.") }}</p>
+      <p class="action"><a class="btn btn-default" href="{{ logout_url }}">{{ _("Log out now") }}</a></p>
+    </div>
+  </section>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/new.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/new.html
new file mode 100644
index 0000000..62d8de9
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/new.html
@@ -0,0 +1,33 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Register') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Registration'), named_route='user.register') }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div class="module-content">
+      {% block primary_content_inner %}
+      <h1 class="page-heading">
+        {% block page_heading %}{{ _('Register for an Account') }}{% endblock %}
+      </h1>
+      {{ form | safe }}
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+  {% block help %}
+  <section class="module module-narrow module-shallow">
+    {% block help_inner %}
+    <h2 class="module-heading">{{ _('Why Sign Up?') }}</h2>
+    <div class="module-content">
+      <p>{% trans %}Create datasets, groups and other exciting things{% endtrans %}</p>
+    </div>
+    {% endblock %}
+  </section>
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/new_user_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/new_user_form.html
new file mode 100644
index 0000000..f28304a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/new_user_form.html
@@ -0,0 +1,41 @@
+{% import "macros/form.html" as form %}
+
+{% block form %}
+  <form id="user-register-form" action="" method="post" enctype="multipart/form-data">
+    {{ h.csrf_input() }}
+    {{ form.errors(error_summary) }}
+
+    {% block core_fields %}
+      {% block required_core_fields %}
+        {{ form.input("name", id="field-username", label=_("Username"), placeholder=_("username"), value=data.name, error=errors.name, classes=["control-medium"], is_required=True) }}
+        {{ form.input("fullname", id="field-fullname", label=_("Full Name"), placeholder=_("Joe Bloggs"), value=data.fullname, error=errors.fullname, classes=["control-medium"]) }}
+        {{ form.input("email", id="field-email", label=_("Email"), type="email", placeholder=_("joe@example.com"), value=data.email, error=errors.email, classes=["control-medium"], is_required=True) }}
+        {{ form.input("password1", id="field-password", label=_("Password"), type="password", placeholder="••••••••", value=data.password1, error=errors.password1, classes=["control-medium"], is_required=True) }}
+        {{ form.input("password2", id="field-confirm-password", label=_("Confirm"), type="password", placeholder="••••••••", value=data.password2, error=errors.password2, classes=["control-medium"], is_required=True) }}
+      {% endblock %}
+
+      {% block optional_core_fields %}
+        {% set is_upload = data.image_url and not data.image_url.startswith('http') %}
+        {% set is_url = data.image_url and data.image_url.startswith('http') %}
+        {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload, upload_label=_('Profile picture'), url_label=_('Profile picture URL')) }}
+      {% endblock %}
+    {% endblock %}
+
+    {% block extra_fields %}
+    {% endblock %}
+
+    {% block captcha %}
+      {% if g.recaptcha_publickey %}
+        {% snippet "user/snippets/recaptcha.html", public_key=g.recaptcha_publickey %}
+      {% endif %}
+    {% endblock %}
+
+    {{ form.required_message() }}
+
+    <div class="form-actions">
+      {% block form_actions %}
+      <button class="btn btn-primary" type="submit" name="save">{{ _("Create Account") }}</button>
+      {% endblock %}
+    </div>
+  </form>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/perform_reset.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/perform_reset.html
new file mode 100644
index 0000000..a7f9a27
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/perform_reset.html
@@ -0,0 +1,51 @@
+{% extends "page.html" %}
+{% import "macros/form.html" as form %}
+
+{% block subtitle %}{{ _('Reset Your Password') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{{ _('Password Reset') }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    {% block primary_content_inner %}
+    <div class="module-content">
+      <h1 class="page-heading">
+        {% block page_heading %}{{ _('Reset Your Password') }}{% endblock %}
+      </h1>
+      {% block form %}
+        <form action="" method="post">
+          {{ h.csrf_input() }} 
+          {{ form.errors(error_summary) }}
+          {% if user_dict['state'] == 'pending' %}
+            <p>{{ _('You can also change username. It can not be modified later.') }}</p>
+            {{ form.input("name", id="field-name", label=_("Username"), type="text", value=user_dict["name"],
+               error='', attrs={'autocomplete': 'no', 'class': 'form-control control-medium'}, classes=["form-group"]) }}
+          {% endif %}
+          {{ form.input("password1", id="field-password", label=_("Password"), type="password", value='', error='', attrs={'autocomplete': 'no', 'class': 'form-control control-medium'}, classes=["form-group"]) }}
+          {{ form.input("password2", id="field-confirm-password", label=_("Confirm"), type="password", value='', error='', attrs={'autocomplete': 'no', 'class': 'form-control control-medium'}, classes=["form-group"]) }}
+          <div class="form-actions">
+            {% block form_button %}
+            <button class="btn btn-primary" type="submit" name="save">{{ _("Update Password") }}</button>
+            {% endblock %}
+          </div>
+        </form>
+      {% endblock %}
+    </div>
+    {% endblock %}
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+  {% block help %}
+  <section class="module module-narrow module-shallow">
+    {% block help_inner %}
+    <h2 class="module-heading">{{ _('How does this work?') }}</h2>
+    <div class="module-content">
+      <p>{% trans %}Simply enter a new password and we'll update your account{% endtrans %}</p>
+    </div>
+    {% endblock %}
+  </section>
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/read.html
new file mode 100644
index 0000000..b5203e1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/read.html
@@ -0,0 +1,32 @@
+{% extends "user/read_base.html" %}
+
+{% block page_primary_action %}
+  {% if h.check_access('package_create') and user.datasets %}
+    {% snippet 'snippets/add_dataset.html' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">
+    {% block page_heading %}{{ _('Datasets') }}{% endblock %}
+  </h2>
+  {% block package_list %}
+  {% if user.datasets %}
+    {% snippet 'snippets/package_list.html', packages=user.datasets %}
+  {% else %}
+
+    {% if is_myself %}
+      <p class="empty">
+        {{ _('You haven\'t created any datasets.') }}
+        {% if h.check_access('package_create') %}
+          {% link_for _('Create one now?'), named_route='dataset.new' %}
+        {% endif %}
+      </p>
+    {% else %}
+      <p class="empty">
+        {{ _('User hasn\'t created any datasets.') }}
+      </p>
+    {% endif %}
+  {% endif %}
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/read_base.html
new file mode 100644
index 0000000..b764d74
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/read_base.html
@@ -0,0 +1,110 @@
+{% extends "page.html" %}
+
+{% set user = user_dict %}
+{% set dataset_type = h.default_package_type() %}
+
+{% block subtitle %}{{ user.display_name }} {{ g.template_title_delimiter }} {{ _('Users') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ h.build_nav('user.index', _('Users')) }}
+  {{ h.build_nav('user.read', user.display_name|truncate(35), id=user.name) }}
+{% endblock %}
+
+{% block content_action %}
+  {% if h.check_access('user_update', user) %}
+    {% link_for _('Manage'), named_route='user.edit', id=user.name, class_='btn btn-default', icon='wrench' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('user.read', h.humanize_entity_type('package', dataset_type, 'content tab') or _('Datasets'), id=user.name, icon='sitemap') }}
+  {% if h.check_access('api_token_list', {'user': user['name']}) %}
+    {{ h.build_nav_icon('user.api_tokens', _('API Tokens'), id=user.name, icon='key') }}
+  {% endif %}
+{% endblock %}
+
+{% block secondary_content %}
+<div class="module context-info">
+  <section class="module-content">
+    {% block secondary_content_inner %}
+      {% block user_image %}
+      <div class="image">{{ h.user_image(user.id, size=270) }}</div>
+      {% endblock %}
+      {% block user_heading %}
+      <h1 class="heading">{{ user.display_name }}</h1>
+      {% endblock %}
+      {% block user_about %}
+      {% if about_formatted %}
+        {{ about_formatted }}
+      {% else %}
+        <p class="empty">
+          {% if is_myself %}
+            {% trans %}You have not provided a biography.{% endtrans %}
+          {% else %}
+            {% trans %}This user has no biography.{% endtrans %}
+          {% endif %}
+        </p>
+      {% endif %}
+      {% endblock %}
+      {% block user_nums %}
+      <div class="nums">
+        <dl>
+          <dt>{{ _('Followers') }}</dt>
+          <dd data-module="followers-counter" data-module-id="{{ user.id }}" data-module-num_followers="{{ user.num_followers }}">{{ h.SI_number_span(user.num_followers) }}</dd>
+        </dl>
+        <dl>
+          <dt>{{ h.humanize_entity_type('package', dataset_type, 'facet label') or _('Datasets') }}</dt>
+          <dd>{{ h.SI_number_span(user.number_created_packages) }}</dd>
+        </dl>
+      </div>
+      {% endblock %}
+      {% if is_myself == false %}
+        {% block user_follow %}
+        <div class="follow_button">
+          {{ h.follow_button('user', user.id) }}</li>
+        </div>
+        {% endblock %}
+      {% endif %}
+      {% block user_info %}
+      <div class="info">
+        <dl>
+          {% if user.name.startswith('http://') or user.name.startswith('https://') %}
+            <dt>{{ _('Open ID') }}</dt>
+            <dd>{{ user.name|urlize(25) }}{# Be great if this just showed the domain #}</dd>
+          {% else %}
+            <dt>{{ _('Username') }}</dt>
+            <dd>{{ user.name }}</dd>
+          {% endif %}
+        </dl>
+        {% if is_myself %}
+          <dl>
+            <dt>{{ _('Email') }} <span class="label label-default" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
+            <dd>{{ user.email }}</dd>
+          </dl>
+        {% endif %}
+        <dl>
+          <dt>{{ _('Member Since') }}</dt>
+          <dd>{{ h.render_datetime(user.created) }}</dd>
+        </dl>
+        {% if is_sysadmin %}
+        <dl>
+          <dt>{{_('Last Active') }}</dt>
+          <dd>{{ h.time_ago_from_timestamp(user.last_active) }}</dd>
+        </dl>
+        {% endif %}
+        <dl>
+          <dt>{{ _('State') }}</dt>
+          <dd>{{ _(user.state) }}</dd>
+        </dl>
+        {% if is_myself %}
+          <dl>
+            <dt class="key">{{ _('API Key') }} <span class="label label-default" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
+            <dd class="value"><code>{{ user.apikey }}</code></dd>
+          </dl>
+        {% endif %}
+      </div>
+      {% endblock %}
+    {% endblock %}
+  </section>
+</div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/request_reset.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/request_reset.html
new file mode 100644
index 0000000..329265d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/request_reset.html
@@ -0,0 +1,46 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Reset your password') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Password Reset'), named_route='user.request_reset' %}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div class="module-content">
+      {% block primary_content_inner %}
+      <h1 class="page-heading">{{ _('Reset your password') }}</h1>
+      {% block form %}
+        <form action="" method="post">
+          {{ h.csrf_input() }} 
+          <div class="form-group">
+            <label for="field-username">{{ _('Email or username') }}</label>
+            <input id="field-username" class="control-medium form-control" name="user" value="" type="text" />
+          </div>
+          <div class="form-actions">
+            {% block form_button %}
+            <button class="btn btn-primary" type="submit" name="reset">{{ _("Request Reset") }}</button>
+            {% endblock %}
+          </div>
+        </form>
+      {% endblock %}
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+  {% block help %}
+  <section class="module module-narrow module-shallow">
+    {% block help_inner %}
+    <h2 class="module-heading">{{ _('How does this work?') }}</h2>
+    <div class="module-content">
+      <p>{% trans %}Enter your email address or username into the box and we
+        will send you an email with a link to enter a new password.
+        {% endtrans %}</p>
+    </div>
+    {% endblock %}
+  </section>
+  {% endblock %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/api_token_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/api_token_list.html
new file mode 100644
index 0000000..7e4d050
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/api_token_list.html
@@ -0,0 +1,52 @@
+{#
+  Template variables:
+
+  user - currently viewed user
+  tokens - list of ApiToken entities
+
+  #}
+
+<table class="table table-stripped table-condensed table-header table-hover table-bordered">
+  <thead>
+    <tr>
+      {% block head_cells %}
+        {% block head_cell_token %}<th scope="col">{{ _('Token') }}</th>{% endblock %}
+        {% block head_cell_last_access %}<th scope="col">{{ _('Last access') }}</th>{% endblock %}
+        {% block head_cell_actions %}<th scope="col">{{ _('Actions') }}</th>{% endblock %}
+      {% endblock head_cells %}
+    </tr>
+  </thead>
+  <tbody>
+    {% for token in tokens %}
+      <tr>
+        {% block token_cells scoped %}
+          {% block token_cell_token %}
+            <td colspan="1">
+              <code>
+                {{ token.name }}
+              </code>
+            </td>
+          {% endblock token_cell_token %}
+          {% block token_cell_last_access %}
+            <td>
+              {{ h.render_datetime(token.last_access, with_hours=True) or _('Never') }}
+            </td>
+          {% endblock token_cell_last_access %}
+          {% block token_cell_actions %}
+            <td>
+              {% set action = h.url_for("user.api_token_revoke", id=user['name'], jti=token['id']) %}
+              <form action="{{ action }}" method="POST">
+                {{ h.csrf_input() }}
+                <div class="btn-group">
+                  <button type="submit" href="{{ action }}" class="btn btn-danger btn-sm" title="{{ _('Revoke') }}" data-module="confirm-action">
+                    <i class="fa fa-times"></i>
+                  </button>
+                </div>
+              </form>
+            </td>
+          {% endblock token_cell_actions %}
+        {% endblock token_cells %}
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/followers.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/followers.html
new file mode 100644
index 0000000..742faec
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/followers.html
@@ -0,0 +1,10 @@
+{% if followers %}
+  <ul class="user-list">
+    {% for follower in followers %}
+      {# HACK: (for group/admins) follower can be the id of the user or a user_dict #}
+      <li>{{ h.linked_user(follower.name or follower, maxlength=20) }}</li>
+    {% endfor %}
+  </ul>
+{% else %}
+  <p class="empty">{{ _('No followers') }}</p>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/login_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/login_form.html
new file mode 100644
index 0000000..7426031
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/login_form.html
@@ -0,0 +1,32 @@
+{#
+Renders the login form.
+
+action        - The url that the form should be submitted to.
+error_summary - A tuple/list of form errors.
+
+Example:
+
+  {% snippet "user/snippets/login_form.html", action=g.login_handler, error_summary=error_summary %}
+
+#}
+{% import 'macros/form.html' as form %}
+
+{% set username_error = true if error_summary %}
+{% set password_error = true if error_summary %}
+
+<form action="{{ action }}" method="post">
+  {{ h.csrf_input() }}
+  {{ form.errors(errors=error_summary) }}
+
+  {{ form.input('login', label=_("Username or Email"), id='field-login', value="", error=username_error, classes=["control-medium"]) }}
+
+  {{ form.input('password', label=_("Password"), id='field-password', type="password", value="", error=password_error, classes=["control-medium"]) }}
+
+  {{ form.checkbox('remember', label=_("Remember me"), id='field-remember', checked=true, value="63072000") }}
+
+  <div class="form-actions">
+    {% block login_button %}
+    <button class="btn btn-primary" type="submit">{{ _('Login') }}</button>
+    {% endblock %}
+  </div>
+</form>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/placeholder.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/placeholder.html
new file mode 100644
index 0000000..c881d6b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/placeholder.html
@@ -0,0 +1,2 @@
+<img class="user-image" width="{{ size }}" height="{{ size }}" src="{{ h.url_for_static('/base/images/placeholder-user.png') }}" alt="{{ user_name }}" />
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/recaptcha.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/recaptcha.html
new file mode 100644
index 0000000..0f0f7e7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/recaptcha.html
@@ -0,0 +1,18 @@
+<div class="form-group">
+  <div class="controls">
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <div class="g-recaptcha" data-sitekey="{{ public_key }}"></div>
+
+    <noscript>
+      <div style="width: 304px; height: 352px; position: relative;">
+        <div style="width: 304px; height: 352px; position: absolute;">
+          <iframe title="Recaptcha" src="https://www.google.com/recaptcha/api/fallback?k={{ public_key }}" frameborder="0" scrolling="no" style="width: 304px; height:352px"></iframe>
+        </div>
+
+        <div style="width: 250px; height: 80px; position: absolute; bottom: 21px; left: 25px; margin: 0; padding: 0; right: 25px;">
+          <textarea id="g-recaptcha-response" name="g-recaptcha-response" style="width: 250px; height: 80px; border: 1px solid #c1c1c1;	margin: 0; padding: 0; resize: none;" class="g-recaptcha-response"></textarea>
+        </div>
+      </div>
+    </noscript>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/user_search.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/user_search.html
new file mode 100644
index 0000000..c9d268b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates/user/snippets/user_search.html
@@ -0,0 +1,13 @@
+<section class="module module-narrow module-shallow simple-input">
+  <h2 class="module-heading">{{ _('Users') }}</h2>
+  <form class="module-content field-bordered" action="{% url_for 'user.index' %}" method="get" id="user-search-form">
+    <div class="field">
+      <label for="field-user-search">{{ _('Search Users') }}</label>
+      <input id="field-user-search" value="{{ q }}" class="field form-control" name="q" placeholder="{{ _('Search') }}" />
+      <button class="btn-search" type="submit"><i class="fa fa-search"></i></button>
+    </div>
+  </form>
+  <ul class="nav nav-simple">
+    <li class="nav-item">{{ h.nav_link(_('All Users'), named_route='user.index') }}</li>
+  </ul>
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/.gitignore b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/base.html
new file mode 100644
index 0000000..85848b7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/base.html
@@ -0,0 +1,121 @@
+{# Allows the DOCTYPE to be set on a page by page basis #}
+{%- block doctype %}<!DOCTYPE html>{% endblock -%}
+
+{# Allows custom attributes to be added to the <html> tag #}
+{%- block htmltag -%}
+{% set lang = h.lang() %}
+<!--[if IE 9]> <html lang="{{ lang }}" class="ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html lang="{{ lang }}" {% if h.is_rtl_language()  %} dir="rtl" {% endif %} > <!--<![endif]-->
+{%- endblock -%}
+
+  {# Allows custom attributes to be added to the <head> tag #}
+  <head{% block headtag %}{% endblock %}>
+    {#
+    Add custom meta tags to the page. Call super() to get the default tags
+    such as charset, viewport and generator.
+
+    Example:
+
+    {% block meta %}
+      {{ super() }}
+      <meta name="description" value="My website description" />
+    {% endblock %}
+
+    #}
+    {%- block meta -%}
+      <meta charset="utf-8" />
+      <meta name="csrf_field_name" content="{{ g.csrf_field_name }}" />
+      <meta name="{{ g.csrf_field_name }}" content="{{ csrf_token() }}" />
+
+      {% block meta_generator %}<meta name="generator" content="ckan {{ h.ckan_version() }}" />{% endblock %}
+      {% block meta_viewport %}<meta name="viewport" content="width=device-width, initial-scale=1.0">{% endblock %}
+    {%- endblock -%}
+
+    {#
+    Add a custom title to the page by extending the title block. Call super()
+    to get the default page title.
+
+    Example:
+
+      {% block title %}My Subtitle - {{ super() }}{% endblock %}
+
+    #}
+    <title>
+      {%- block title -%}
+        {%- block subtitle %}{% endblock -%}
+        {%- if self.subtitle()|trim %} {{ g.template_title_delimiter }} {% endif -%}
+        {{ g.site_title }}
+      {%- endblock -%}
+    </title>
+
+    {#
+    The links block allows you to add additonal content before the stylesheets
+    such as rss feeds and favicons in the same way as the meta block.
+    #}
+    {% block links -%}
+      <link rel="shortcut icon" href="{{ g.favicon }}" />
+    {% endblock -%}
+
+    {#
+    The styles block allows you to add additonal stylesheets to the page in
+    the same way as the meta block. Use super() to include the default
+    stylesheets before or after your own.
+
+    Example:
+
+      {% block styles %}
+        {{ super() }}
+        <link rel="stylesheet" href="/base/css/custom.css" />
+      {% endblock %}
+    #}
+    {%- block styles %}
+      {# TODO: store just name of asset instead of path to it. #}
+      {% set theme = h.get_rtl_theme() if h.is_rtl_language() else g.theme %}
+      {% asset theme %}
+            
+      {% asset 'd4science_theme/d4science-js' %}
+      {% asset 'd4science_theme/d4science-css' %}
+    {% endblock %}
+
+    {# render all assets included in styles block #}
+    {{ h.render_assets('style') }}
+    {%- block custom_styles %}
+      {%- if g.site_custom_css -%}
+      <style>
+        {{ g.site_custom_css | safe }}
+      </style>
+      {%- endif %}
+    {% endblock %}
+  </head>
+
+  {# Allows custom attributes to be added to the <body> tag #}
+  <body{% block bodytag %} data-site-root="{{ h.url_for('home.index', locale='default', qualified=true) }}" data-locale-root="{{ h.url_for('home.index', qualified=true) }}" {% endblock %}>
+
+    {#
+    The page block allows you to add content to the page. Most of the time it is
+    recommended that you extend one of the page.html templates in order to get
+    the site header and footer. If you need a clean page then this is the
+    block to use.
+
+    Example:
+
+      {% block page %}
+        <div>Some other page content</div>
+      {% endblock %}
+    #}
+    {%- block page %}{% endblock -%}
+
+    {#
+    DO NOT USE THIS BLOCK FOR ADDING SCRIPTS
+    Scripts should be loaded by the {% assets %} tag except in very special
+    circumstances
+    #}
+    {%- block scripts %}
+    {% endblock -%}
+
+    {# render all assets included in scripts block and everywhere else #}
+    {# make sure there are no calls to `asset` tag after this point #}
+    {{ h.render_assets('style') }}
+    {{ h.render_assets('script') }}
+  </body>
+</html>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/footer.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/footer.html
new file mode 100644
index 0000000..f149c21
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/footer.html
@@ -0,0 +1,20 @@
+{% block header_hide_container_content %}
+{% set hideParameter = h.get_request_param('hh', None) %}
+{% set hide = h.get_cookie_value('ckan_hide_header') %}
+<footer class="site-footer-d4science">
+{% if hide=='true' %}
+{# Updated and unified the footer, see #18126 #}
+<div>
+<a href="http://www.gcube-system.org" target="_blank" title="gCube System">gCube</a> Catalogue powered by <a href="http://ckan.org" target="_blank" title="CKAN">CKAN</a>
+&nbsp|&nbsp
+Access this catalogue using the <a href="https://wiki.gcube-system.org/gcube/GCat_Service" target="_blank" title="gCat Service">gCat APIs</a>
+</div>
+{% else %}
+<div>
+<a href="http://www.gcube-system.org" target="_blank" title="gCube System">gCube</a> Catalogue powered by <a href="http://ckan.org" target="_blank" title="CKAN">CKAN</a>
+&nbsp|&nbsp
+Access this catalogue using the <a href="https://wiki.gcube-system.org/gcube/GCat_Service" target="_blank" title="gCat Service">gCat APIs</a>
+</div>
+{% endif %}
+</footer>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/read_base.html
new file mode 100644
index 0000000..23014cd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/read_base.html
@@ -0,0 +1,36 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
+  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
+{% endblock %}
+
+{% block content_action %}
+  {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
+    {% link_for _('Manage'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('group.read', _('Datasets'), id=c.group_dict.name) }}
+   <!-- Added by Francesco Mangiacrapa. see: #6572 -->
+  {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
+  {% set role_for_user = h.d4science_theme_get_user_role_for_group_or_org(c.group_dict.id, c.userobj.name) %}
+       {% if (role_for_user and role_for_user == 'admin') or c.userobj.sysadmin %}
+       <!-- activity in generale sembra non essere più supportato in cakan 2.10 -->
+  			{#{{ h.build_nav_icon('group.activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}#}
+  		 {% endif %}
+  {% endif %}
+  {{ h.build_nav_icon('group.about', _('About'), id=c.group_dict.name) }}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "group/snippets/info.html", group=c.group_dict, show_nums=true %}
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "group/snippets/feeds.html" %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_form.html
new file mode 100644
index 0000000..fffd192
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_form.html
@@ -0,0 +1,108 @@
+{% import 'macros/form.html' as form %}
+
+{# SCRIPT ADDED BY FRACESCO MANGIACRAPA, SEE 20425 #}
+<script>
+
+hideButton = false;
+
+function hideEditButton() {
+  hideButton = true;
+}
+
+function hideFirstButton () {
+  console.log('hideButton: '+hideButton);
+
+  if(hideButton){
+    var theIdSection = document.getElementById('hide-edit');
+    console.log('theIdSection: '+theIdSection);
+
+    var el = theIdSection.getElementsByTagName('button')[0]
+
+    if(typeof el !== "undefined") {
+      el.style.display='none';
+    } else {
+      setTimeout(hideFirstButton, 200); // try again in 200 milliseconds
+    }
+  }
+}
+
+if(window.addEventListener){
+  window.addEventListener('load', hideFirstButton);
+}else{
+  window.attachEvent('onload', hideFirstButton);
+}
+</script>
+
+<form id="group-edit" class="dataset-form form-horizontal" method="post" data-module="basic-form" enctype="multipart/form-data">
+  {{ h.csrf_input() }}
+  {% block error_summary %}
+    {{ form.errors(error_summary) }}
+  {% endblock %}
+
+  {% block basic_fields %}
+    {% set attrs = {'data-module': 'slug-preview-target'} %}
+    {# DIV ADDED BY FRACESCO MANGIACRAPA, SEE 20425 #}
+    <div id="hide-edit">
+    {{ form.input('title', label=_('Name'), id='field-name', placeholder=_('My Group'), value=data.title, error=errors.title, classes=['control-full'], attrs=attrs) }}
+    </div>
+    {# Perhaps these should be moved into the controller? #}
+    {% set prefix = h.url_for(controller='group', action='read', id='') %}
+    {% set domain = h.url_for(controller='group', action='read', id='', qualified=true) %}
+    {% set domain = domain|replace("http://", "")|replace("https://", "") %}
+    {% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain, 'data-module-placeholder': '<group>'} %}
+    
+    {# CODE ADDED BY FRACESCO MANGIACRAPA, SEE 20425 #}
+    {% set hide = h.get_cookie_value('ckan_hide_header') %}
+    {% if hide=='true' %}
+      <script>hideEditButton()</script>
+    {% endif %}
+
+    {{ form.prepend('name', label=_('URL'), prepend=prefix, id='field-url', placeholder=_('my-group'), value=data.name, error=errors.name, attrs=attrs, is_required=true) }}
+  
+    {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=_('A little information about my group...'), value=data.description, error=errors.description) }}
+
+    {% set is_upload = data.image_url and not data.image_url.startswith('http') %}
+    {% set is_url = data.image_url and data.image_url.startswith('http') %}
+
+    {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload) }}
+
+  {% endblock %}
+
+  {% block custom_fields %}
+    {% for extra in data.extras %}
+      {% set prefix = 'extras__%d__' % loop.index0 %}
+      {{ form.custom(
+        names=(prefix ~ 'key', prefix ~ 'value', prefix ~ 'deleted'),
+        id='field-extras-%d' % loop.index,
+        label=_('Custom Field'),
+        values=(extra.key, extra.value, extra.deleted),
+        error=errors[prefix ~ 'key'] or errors[prefix ~ 'value']
+      ) }}
+    {% endfor %}
+
+    {# Add a max if 3 empty columns #}
+    {% for extra in range(data.extras|count, 3) %}
+      {% set index = (loop.index0 + data.extras|count) %}
+      {% set prefix = 'extras__%d__' % index %}
+      {{ form.custom(
+        names=(prefix ~ 'key', prefix ~ 'value', prefix ~ 'deleted'),
+        id='field-extras-%d' % index,
+        label=_('Custom Field'),
+        values=(extra.key, extra.value, extra.deleted),
+        error=errors[prefix ~ 'key'] or errors[prefix ~ 'value']
+      ) }}
+    {% endfor %}
+  {% endblock %}
+
+  {{ form.required_message() }}
+
+  <div class="form-actions">
+    {% block delete_button %}
+      {% if h.check_access('group_delete', {'id': data.id})  %}
+        {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Group?')}) %}
+        <a class="btn btn-danger pull-left" href="{% url_for controller='group', action='delete', id=data.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+      {% endif %}
+    {% endblock %}
+    <button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ _('Save Group') }}{% endblock %}</button>
+  </div>
+</form>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_item.html
new file mode 100644
index 0000000..3f9e5ad
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_item.html
@@ -0,0 +1,65 @@
+{#
+Renders a media item for a group. This should be used in a list.
+
+group - A group dict.
+
+Example:
+
+    <ul class="media-grid">
+      {% for group in groups %}
+        {% snippet "group/snippets/group_item.html", group=group %}
+      {% endfor %}
+    </ul>
+#}
+
+
+{# Updated By Francesco Mangiacrapa, related to breadcrumb for Group #}
+{% set type = group.type or 'group' %}
+{% set url = h.url_for(type ~ '_read', action='read', id=group.name) %}
+{% block item %}
+<li class="media-item">
+  {% block breadcrumb %}
+  <div id="group_breadcrumb" style="font-size: 12px !important;">
+  {% set parents = h.d4science_theme_get_parents_for_group(group.name) %}
+  {% for parent in parents recursive %}
+  <span> 
+  {% link_for parent.title, controller='group', action='read', id=parent.name %}
+  {% if loop.last == False %}
+  {% endif %}
+  </span>
+  {% endfor %}
+  </div>
+  {% endblock %}
+  {% block item_inner %}
+  {% block image %}
+    <img src="{{ group.image_display_url or h.url_for_static('/base/images/placeholder-group.png') }}" alt="{{ group.name }}" class="media-image">
+  {% endblock %}
+  {% block title %}
+    <a href="{{ url }}" title="{{ _('View {name}').format(name=group.display_name) }}"><h3 class="media-heading">{{ group.display_name }} <span style="font-size: 12px;"></span></h3></a>
+  {% endblock %}
+  {% block description %}
+    {% if group.description %}
+      <p>{{ h.d4science_theme_markdown_extract_html(group.description, extract_length=80, allow_html=True) }}</p>
+    {% endif %}
+  {% endblock %}
+  {% block datasets %}
+    {% if group.package_count %}
+      <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', group.package_count).format(num=group.package_count) }}</strong>
+    {% elif group.package_count == 0 %}
+     <!-- <span class="count">{# {{ _('0 Datasets') }} #}</span>-->
+    {% endif %}
+  {% endblock %}
+  {% if group.user_member %}
+  	{# Added By Francesco Mangiacrapa, related to Task #5196 #}
+  	{% set username_id = c.userobj.id %}
+  	{% set role_for_user = h.d4science_theme_get_user_role_for_group_or_org(group.id, username_id) %}
+	{% if role_for_user and role_for_user == 'admin' %}
+    <input name="group_remove.{{ group.id }}" value="{{ _('Remove') }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove dataset from this group') }}"/>
+   {% endif %}
+  {% endif %}
+  {% endblock %}
+</li>
+{% endblock %}
+{% if position is divisibleby 3 %}
+  <li class="clearfix js-hide"></li>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_list.html
new file mode 100644
index 0000000..a9810d3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_list.html
@@ -0,0 +1,56 @@
+{# CREATED BY FRANCESCO MANGIACRAPA
+Display a grid of group items.
+
+groups - A list of groups.
+
+Example:
+
+    {% snippet "group/snippets/group_list.html" %}
+
+#}
+
+<script>
+changeView = function (divId) {
+   var e = document.getElementById(divId);
+   var vis = e.style.display;
+	
+   if(vis=='block'){
+     e.style.display = 'none';
+     document.getElementById("hierarchy").innerHTML = "Show Hierarchy";
+   }else {
+     e.style.display = 'block';
+     document.getElementById("hierarchy").innerHTML = "Hide Hierarchy";
+   }	
+}
+</script>
+
+{#
+Display a hierarchical tree of groups
+
+
+Example:
+
+    {% snippet "group/snippets/group_tree.html" %}
+
+#}
+
+
+<div style=" margin-top: 5px; margin-bottom: 10px;">
+<a id="hierarchy" href="javascript:changeView('Groups_Hierarchy');">Show Hierarchy</a>
+</div>
+<div id='Groups_Hierarchy' style="display: none;">
+<h3>Group Hierarchy</h3>
+<div id="publisher-tree" style="margin-bottom: 5px; margin-top: 5px;">
+     {% snippet 'group/snippets/group_tree.html', top_nodes=top_nodes %}
+</div>
+</div>
+
+{% block group_list %}
+<ul class="media-grid" data-module="media-grid">
+	{% block group_list_inner %}
+  {% for group in groups %}
+    {% snippet "group/snippets/group_item.html", group=group, position=loop.index, top_nodes=top_nodes %}
+  {% endfor %}
+  {% endblock %}
+</ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_list_simple.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_list_simple.html
new file mode 100644
index 0000000..7dcfe47
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_list_simple.html
@@ -0,0 +1,20 @@
+{# ADDED BY FRANCESCO MANGIACRAPA IT'S CALLED BY 
+ snippet 'package/group_list.html', groups=c.pkg_dict.groups 
+Display a grid of group items.
+
+groups - A list of groups.
+
+Example:
+
+    {% snippet "group/snippets/group_list_simple.html" %}
+
+#}
+{% block group_list %}
+<ul class="media-grid" data-module="media-grid">
+	{% block group_list_inner %}
+  {% for group in groups %}
+    {% snippet "group/snippets/group_item.html", group=group, position=loop.index %}
+  {% endfor %}
+  {% endblock %}
+</ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_tree.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_tree.html
new file mode 100644
index 0000000..233bde2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/group/snippets/group_tree.html
@@ -0,0 +1,32 @@
+{#
+Displays a tree of organzations
+
+NB This template can be slow because it is recursive and uses link_for. At
+DGU we speeded up display of the tree 10 times (necessary as we have 1000 
+organizations) by replacing this template with a recursive code routine:
+https://github.com/datagovuk/ckanext-dgu/blob/5fb78b354517c2198245bdc9c98fb5d6c82c6bcc/ckanext/dgu/lib/helpers.py#L140 
+
+orgs    - List of organizations
+
+Example:
+
+  {% snippet 'group/snippets/group_tree.html', top_nodes=h.get_action('group_tree', {'type': 'group'}) %}
+
+#}
+<ul>
+  {% for node in top_nodes recursive %}
+    <li id="node_{{ node.name }}">
+      {% if node.highlighted %}
+        <strong>
+      {% endif %}
+      {% link_for node.title, controller='group', action='read', id=node.name %}
+      {% if node.highlighted %}
+        </strong>
+      {% endif %}
+
+      {% if node.children %}
+        <ul> {{ loop(node.children) }} </ul>
+      {% endif %}
+    </li>
+  {% endfor %}
+</ul>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/header.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/header.html
new file mode 100644
index 0000000..be88626
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/header.html
@@ -0,0 +1,145 @@
+{# FOLLOWING BLOCK IS ADDED BY FRANCESCO MANGIACRAPA #}
+{% block header_hide_container_content %}
+{% set hide = h.get_cookie_value('ckan_hide_header') %}
+{% if hide=='true' %}
+	{# HIDE HEADER #}
+{% else %}
+{% block header_wrapper %}
+{% block header_account %}
+   <script>
+       displayLogin = function(){
+       	var e = document.getElementById("toLogin").style.display="inline";
+       };
+    </script>
+  	 <header id="toLogin" style="display:none" class="account-masthead">
+    <div class="container">
+      {% block header_account_container_content %}
+        {% if c.userobj %}
+          <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+            <ul class="unstyled">
+              {% block header_account_logged %}
+              {% if c.userobj.sysadmin %}
+                <li>
+                  <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
+                    <i class="icon-legal" aria-hidden="true"></i>
+                    <span class="text">{{ _('Admin') }}</span>
+                  </a>
+                </li>
+              {% endif %}
+              <li>
+                <a href="{{ h.url_for(controller='user', action='read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+                  {{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
+                  <span class="username">{{ c.userobj.display_name }}</span>
+                </a>
+              </li>
+              <!-- strano perché nella documentazione esiste ed è usato allo stesso modo, ma su localhost/api/3/action/dashboard_activity_list non funziona :/ -->
+              <!-- {# {% set new_activities = h.d4science_theme_get_new_activities() %} 
+              <li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
+                {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities) %}
+                <a href="{{ h.url_for(controller='user', action='dashboard') }}" title="{{ notifications_tooltip }}">
+                  <i class="icon-dashboard" aria-hidden="true"></i>
+                  <span class="text">{{ _('Dashboard') }}</span>
+                  <span class="badge">{{ new_activities }}</span>
+                </a>
+              </li> #} -->
+              {% block header_account_settings_link %}
+                <li>
+                  <a href="{{ h.url_for(controller='user', action='edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
+                    <i class="icon-cog" aria-hidden="true"></i>
+                    <span class="text">{{ _('Settings') }}</span>
+                  </a>
+                </li>
+              {% endblock %}
+              {% block header_account_log_out_link %}
+                <li>
+                  <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
+                    <i class="icon-signout" aria-hidden="true"></i>
+                    <span class="text">{{ _('Log out') }}</span>
+                  </a>
+                </li>
+              {% endblock %}
+              {% endblock %}
+            </ul>
+          </div>
+        {% else %}
+          <nav class="account not-authed">
+            <ul class="unstyled">
+              {% block header_account_notlogged %}
+              <li>{% link_for _('Log in'), controller='user', action='login' %}</li>
+              {% if h.check_access('user_create') %}
+                <li>{# Comment by Francesco Mangiacrapa {% link_for _('Register'), controller='user', action='register', class_='sub' %}#}</li>
+              {% endif %}
+              {% endblock %}
+            </ul>
+          </nav>
+        {% endif %}
+      {% endblock %}
+    </div>
+  </header>
+{% endblock %}
+<header class="navbar navbar-static-top masthead">
+	{# ADDED BY FRANCESCO MANGIACRAPA TO HIDE LOGIN #}
+  <a href="javascript:displayLogin();" style="font-size:10px; color: #FFF">_</a>
+  {% block header_debug %}
+    {% if g.debug and not g.debug_supress_header %}
+      <div class="debug">Controller : {{ c.controller }}<br/>Action : {{ c.action }}</div>
+    {% endif %}
+  {% endblock %}
+  <div class="container">
+    <button data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar" type="button">
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    {# The .header-image class hides the main text and uses image replacement for the title #}
+    <hgroup class="{{ g.header_class }} pull-left">
+
+      {% block header_logo %}
+        {% if g.site_logo %}
+          <a class="logo" href="{{ h.url_for('home') }}"><img src="{{ h.url_for_static_or_external(g.site_logo) }}" alt="{{ g.site_title }}" title="{{ g.site_title }}" /></a>
+        {% else %}
+          <h1>
+            <a href="{{ h.url_for('home') }}">{{ g.site_title }}</a>
+          </h1>
+          {% if g.site_description %}<h2>{{ g.site_description }}</h2>{% endif %}
+        {% endif %}
+      {% endblock %}
+
+    </hgroup>
+
+    <div class="nav-collapse collapse">
+      {# UPDATED BY FRANCESCO MANGIACRAPA: REMOVED  ('about', _('About'))#}
+      {% block header_site_navigation %}
+        <nav class="section navigation">
+          <ul class="nav nav-pills">
+            {% block header_site_navigation_tabs %}
+              
+              <!-- ckan 2.10 : -->
+              {{ h.build_nav_main(
+                ('dataset.search','search'),
+                ('organization.index','organizations_index'),
+                ('group.index','group_index')
+              ) }}
+              {#<!--<li>{% link_for _('Types'), controller='d4STypeController', action='index' %}</li>-->#}
+            {% endblock %}
+          </ul>
+        </nav>
+      {% endblock %}
+
+      {% block header_site_search %}
+      <!-- cambiato 'package' to 'dataset'-->
+        <form class="section site-search simple-input" action="{% url_for controller='dataset', action='search' %}" method="get"> 
+          <div class="field">
+            <label for="field-sitewide-search">{% block header_site_search_label %}{{ _('Search Datasets') }}{% endblock %}</label>
+            <input id="field-sitewide-search" type="text" name="q" placeholder="{{ _('Search') }}" />
+            <button class="btn-search" type="submit"><i class="icon-search"></i></button>
+          </div>
+        </form>
+      {% endblock %}
+
+    </div>
+  </div>
+</header>
+{% endblock %}
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/index.html
new file mode 100644
index 0000000..4e308a5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/index.html
@@ -0,0 +1 @@
+{% ckan_extends %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/layout2.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/layout2.html
new file mode 100644
index 0000000..047d6aa
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/layout2.html
@@ -0,0 +1,108 @@
+<!--Added by Francesco Mangiacrapa-->
+<script src="d4s_tagcloud.js"></script>
+
+
+<div role="main">
+  <div class="container">
+    <div class="row">
+        {% block promoted %}
+          {% snippet 'home/snippets/promoted.html' %}
+        {% endblock %}
+    </div>
+  </div>
+</div>
+
+<div role="main" class="hero">
+  <div class="container">
+    <div class="row row1">
+      <div class="span6 col1">
+        {% block search %}
+          {% snippet 'home/snippets/search.html' %}
+        {% endblock %}
+      </div>
+     <div class="span6 col2">
+       {% block stats %}
+          {% snippet 'home/snippets/stats.html' %}
+        {% endblock %}
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<!--
+<div role="main" class="hero">
+  <div class="container">
+  <h3>Search for Organisations</h3>
+  <div class="row row1">
+  </div>
+  <div>
+</div>
+-->
+
+
+{% block search_for_organizations %}
+{# Added by Francesco Mangiacrapa, see: #8964 #}
+	<script type="text/javascript" >
+	
+	showBreadcrumbIntoSession = function () {
+		CKAN_D4S_Breadcrumb_Manager.setSessionStorageItem("showbreadcrumb", "true");
+		CKAN_D4S_Breadcrumb_Manager.checkBreadcrumbShow();
+	}
+	
+	if(window.addEventListener){
+		window.addEventListener('load', showBreadcrumbIntoSession)
+	}else{
+		window.attachEvent('onload', showBreadcrumbIntoSession)
+	}
+	</script>
+
+	{% snippet 'home/snippets/search_for_organisations.html' %}
+{% endblock %}
+
+{% block search_for_groups %}
+   {% snippet 'home/snippets/search_for_groups.html' %}
+{% endblock %}
+
+{% block search_for_types %}
+   {% snippet 'home/snippets/search_for_types.html' %}
+{% endblock %}
+
+<!-- ADD THE SNIPPET 'home/snippets/search_for_location.html' TO ACTIVE BROWSE BY BBOX -->
+{# 	
+ {% block search_for_location %}
+	{% snippet 'home/snippets/search_for_location.html' %}
+ {% endblock %}
+
+#}
+
+
+
+<div class="hero home-popular">
+  <div class="container">
+    <div class="row row1">
+        {% block popular_formats %}
+          {% snippet 'home/snippets/popular_formats.html' %}
+        {% endblock %}
+    </div>
+    <div  class="row row2">
+       {% block popular_tags %}
+          {% snippet 'home/snippets/popular_tags.html' %}
+        {% endblock %}
+    </div>
+    {% block recent_activity %}
+     <!-- Added by Francesco Mangiacrapa. see: #6572 -->
+     {% if c.userobj and c.userobj.sysadmin %}
+     <div class="box">
+    	<header class="module-heading">
+      <h3>Recent activity</h3>
+    	</header>
+    	<div class="module-content">
+      	{{ h.recently_changed_packages_activity_stream(limit=4) }}
+    	</div>
+  		</div>
+  		{%endif%}
+	{% endblock %}
+  </div>
+</div>
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/featured_organization.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/featured_organization.html
new file mode 100644
index 0000000..7cf9ddb
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/featured_organization.html
@@ -0,0 +1,7 @@
+{% set organizations = h.get_featured_organizations() %}
+
+{% for organization in organizations %}
+  <div class="box">
+    {% snippet 'snippets/organization_item.html', organization=organization, truncate=50, truncate_title=35 %}
+  </div>
+{% endfor %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_formats.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_formats.html
new file mode 100644
index 0000000..d35306a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_formats.html
@@ -0,0 +1,27 @@
+{% set formats = h.get_facet_items_dict('res_format', limit=30) %}
+<style>
+#pop-formats {
+	 line-height: 1.3;
+    padding: 5px 15px 10px;
+    word-break: break-all;
+}
+
+#pop-formats a + a{
+	margin-left: 5px;
+}
+</style>
+<div>
+      <h3 style="padding-left: 15px;">Popular Formats</h3>
+		  		<div id="pop-formats">
+		  		  
+    				{% for tag in formats %}
+					{% set weight = 30 - loop.index %}
+      				<a href="{% url_for controller='dataset', action='search', res_format=tag.name %}" rel={{weight}}>{{ h.truncate(tag.display_name, 26) }}</a>
+    				{% endfor %}
+  				</div>
+</div>
+     	  	
+<script type="text/javascript" >
+loadCloud('pop-formats','#33cccc','#003366')
+//loadCloud('pop-formats')
+</script>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_groups.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_groups.html
new file mode 100644
index 0000000..05017ea
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_groups.html
@@ -0,0 +1,25 @@
+{% set groups = h.get_facet_items_dict('groups', limit=30) %}
+<style>
+#pop-groups {
+	 line-height: 1.3;
+    padding: 5px 15px 10px;
+    word-break: break-all;
+}
+
+#pop-groups a + a{
+	margin-left: 5px;
+}
+</style>
+<div>
+      <h3 style="padding-left: 15px;">Popular Groups</h3>
+		  		<div id="pop-groups">
+    				{% for group in groups %}
+					{% set weight = 30 - loop.index %}
+      				<a href="{% url_for controller='dataset', action='search', groups=group.name %}" rel={{weight}}>{{ h.truncate(group.display_name, 26) }}</a>
+    				{% endfor %}
+  				</div>
+</div>
+     	  	
+<script type="text/javascript" >
+loadCloud('pop-groups')
+</script>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_metadatatypes.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_metadatatypes.html
new file mode 100644
index 0000000..f1b1faa
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_metadatatypes.html
@@ -0,0 +1,31 @@
+{% set metadatatype = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+{% set metadatatypes = h.get_facet_items_dict(metadatatype['name'], limit=30) %}
+
+<style>
+#pop-types {
+	 line-height: 1.3;
+    padding: 5px 15px 10px;
+    word-break: break-all;
+}
+
+#pop-types a + a{
+	margin-left: 5px;
+}
+</style>
+
+
+<div>
+      <h3 style="padding-left: 15px;">Popular {{ metadatatype['title'].capitalize() }}s</h3>
+		  		<div id="pop-types">
+    				{% for type in metadatatypes %}
+					{% set weight = 30 - loop.index %}
+						<a href="{% url_for controller='dataset', action='search', systemtype=type.name %}" rel={{weight}}>{{ h.truncate(type.display_name, 26) }}</a>
+    				{% endfor %}
+  				</div>
+</div>
+     	  	
+<script type="text/javascript" >
+loadCloud('pop-types','#33cccc','#003366')
+//loadCloud('pop-types','#2A3990','#8DB93E')
+//loadCloud('pop-types')
+</script>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_tags.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_tags.html
new file mode 100644
index 0000000..2794970
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/popular_tags.html
@@ -0,0 +1,30 @@
+{% set tags = h.get_facet_items_dict('tags', limit=30) %}
+<style>
+#pop-tags {
+	 line-height: 1.3;
+    padding: 5px 15px 10px;
+    word-break: break-all;
+}
+
+#pop-tags a + a{
+	margin-left: 5px;
+}
+</style>
+<div>
+      <h3 style="padding-left: 15px;">{{ _('Popular Tags') }}</h3>
+		  		<div id="pop-tags">
+		  		  
+    				{% for tag in tags %}
+					{% set weight = 30 - loop.index %}
+      				<a href="{% url_for controller='dataset', action='search', tags=tag.list %}" rel={{weight}}>{{ h.truncate(tag.display_name, 26) }}</a>
+    				{% endfor %}
+  				</div>
+  				<p style="float: right; margin-bottom: 15px;">
+					<a href="/tag">See All {{_('Tags')}}</a>
+				</p>
+</div>
+     	  	
+<script type="text/javascript" >
+loadCloud('pop-tags','#99ccff', '#003399')
+//loadCloud('pop-tags')
+</script>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/promoted.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/promoted.html
new file mode 100644
index 0000000..ab4dcd3
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/promoted.html
@@ -0,0 +1,27 @@
+{% set intro = g.site_intro_text %}
+
+<div class="module-content box">
+ 	<header>
+    {% if intro %}
+      {{ h.render_markdown(intro) }}
+    {% else %}
+       {% block home_image %}
+    <section class='featured media-overlay hidden-phone'>
+      {% block home_image_content %}
+        <a class="media-image" href="#" style="text-align:center;">
+          <img src="gcubedatacataloguelogo.png" alt="Placeholder" width="409" height="54" />
+        </a>
+      {% endblock %}
+    </section>
+  {% endblock %}
+    <div class="page-heading">
+    <h3>Welcome to the {{g.site_title}}!</h3>
+      <p style='font-size:14px !important; text-align: justify;'>
+Here you will find data and other resources hosted by the D4Science.org infrastructure.</p> 
+<p style='text-align: justify;'>The catalogue contains a wealth of resources resulting from several activities, projects and communities including BlueBRIDGE (<a href="http://www.bluebridge-vres.eu" title="BlueBRIDGE" target="_blank">www.bluebridge-vres.eu</a>), i-Marine (<a href="http://www.i-marine.eu" title="i-Marine" target="_blank">www.i-marine.eu</a>), SoBigData.eu (<a href="http://www.sobigdata.eu" title="SoBigData.eu" target="_blank">www.sobigdata.eu</a>), and (FAO <a href="http://www.fao.org" title="FAO" target="_blank">www.fao.org</a>).
+</p> 
+<p style='text-align: justify;'>All the products are accompanied with rich descriptions capturing general attributes, e.g. title and creator(s), as well as usage policies and licences.</p>
+     </div>
+    {% endif %}
+  </header>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search.html
new file mode 100644
index 0000000..2835041
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search.html
@@ -0,0 +1,26 @@
+{#{% set tags = h.get_facet_items_dict('tags', limit=3) %}#}
+{% set placeholder = _('Insert keywords here') %}
+
+<div class="module module-search module-narrow module-shallow box">
+  <!-- ckan 2.10 changed url_for controller=package to dataset-->
+  <form class="module-content search-form" method="get" action="{% url_for controller='dataset', action='search' %}">
+    <h3 class="heading">{{ _('Datasets') }} Search</h3>
+    <div class="search-input control-group search-giant">
+      <input type="text" class="search" name="q" value="" autocomplete="off" placeholder="{% block search_placeholder %}{{ placeholder }}{% endblock %}" />
+      <button type="submit" title="Search">
+        <i class="icon-search"></i>
+        <span>{{ _('Search') }}</span>
+      </button>
+    </div>
+    <div>
+    	<a href="{{ h.url_for(controller='dataset', action='search') }}">See All {{ _('Datasets') }}</a>
+    	<a href="/tag" style="float: right;">See All {{ _('Tags') }}</a>    
+    </div>
+  </form>
+<!--  <div class="tags">
+    <h3>{{ _('Popular tags') }}</h3>
+    {% for tag in tags %}
+      <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
+    {% endfor %}
+  </div>-->
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_groups.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_groups.html
new file mode 100644
index 0000000..6f31bfd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_groups.html
@@ -0,0 +1,35 @@
+{% set groups = h.d4science_get_browse_info_for_organisations_or_groups(type='group', limit=10) %}
+{% set type = 'group' %}
+{% if groups|length > 0 %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by {{_('Groups')}}</h3>
+	
+	 <div id="search-for-groups">
+	 <table class="media-grid-homepage" data-module="media-grid">
+	{% for index in range(0,groups|length)  %}
+	{% set offset = 5 %}
+	{% set group = groups[index] %}
+	{% if index % offset == 0 %}
+		 <tr>
+		 {% endif %}
+		 <td class="media-item-homepage">
+	        {% set url = h.url_for(type ~ '_read', action='read', id=group['name']) %}
+	        <a href="{{ url }}" title="{{ _('View {name}').format(name=group['display_name']) }}">
+			  <!--<i class="fa fa-address-book fa-3x background-circle color-white"></i> -->
+	             <img class="logo-homepage" src="{{ group['url'] }}" alt="{{ group['name'] }}" title="{{ _('{name}').format(name=group['display_name']) }} group">
+	        <p class="media-heading-homepage">{{ group['display_name'] }}&nbsp(<span class="statistics-show">{{group['package_count']}}</span>)</p>
+	        </a>
+	    </td>
+		 {% if (index+offset+1) % offset == 0 %}
+		 </tr>
+		{% endif %}
+	{% endfor %}
+	</table>
+	</div>
+	<p style="float: right; margin-top: 15px">
+	<a href="/groups">See All {{_('Groups')}}</a>
+	</p>
+  </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_location.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_location.html
new file mode 100644
index 0000000..4b88bd2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_location.html
@@ -0,0 +1,44 @@
+{% set alternative_url_dataset = h.url_for(controller='dataset', action='search') %}
+{% set locations = h.d4science_get_location_to_bboxes() %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by Location Extent</h3>
+	<div id="search-for-extent">
+		 <table class="media-grid-homepage" data-module="media-grid">
+		 	{% set offset = 5 %}
+			{% for key, value in locations.items()  %}
+			{% set index = loop.index0 %}
+			{% if index % offset == 0 %}
+				 <tr>
+				 {% endif %}
+				 <td class="media-item-homepage">
+			        {% set loc = key %}
+			        {% set bbox = value %}
+			        <a href="{{ alternative_url_dataset }}?q=&ext_bbox={{ bbox }}" title="Browse by {{ loc }}'s BBOX">
+			        {{ loc }}</a>
+			    </td>
+				 {% if (index+offset+1) % offset == 0 %}
+				 </tr>
+				{% endif %}
+			{% endfor %}
+		</table>
+	 </div>
+	 <div id="search-for-location">
+	 {# ADDED BY FRANCESCO MANGIACRAPA SEE #12651 #}
+	 {% snippet 'spatial/snippets/spatial_query.html', alternative_url=alternative_url_dataset %}
+	 {# END #}
+	  </div>
+  </div>
+  <script type="text/javascript" >
+	
+	expandMap = function () {
+		map.zoomIn();
+	}
+	
+	if(window.addEventListener){
+		window.addEventListener('load', expandMap)
+	}else{
+		window.attachEvent('onload', expandMap)
+	}
+	</script>
+</div>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_organisations.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_organisations.html
new file mode 100644
index 0000000..65b8acb
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_organisations.html
@@ -0,0 +1,33 @@
+{% set organizations = h.d4science_get_browse_info_for_organisations_or_groups(type='organization', limit=10) %}
+{% set type = 'organization' %}
+{% if organizations|length > 1 %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by {{_('Organizations')}}</h3>
+	 <div id="search-for-organizations">
+	 <table class="media-grid-homepage" data-module="media-grid">
+	{% for index in range(0,organizations|length)  %}
+	{% set offset = 5 %}
+	{% set organization = organizations[index] %}
+	{% if index % offset == 0 %}
+		 <tr>
+		 {% endif %}
+		 <td class="media-item-homepage">
+	        {% set url = h.url_for(type ~ '_read', action='read', id=organization['name']) %}
+	        <a href="{{ url }}" title="{{ _('View {name}').format(name=organization['display_name']) }}">
+	        <img class="logo-homepage" src="{{ organization['url'] }}" alt="{{ organization['name'] }}" title="{{ _('{name}').format(name=organization['display_name']) }} organization">
+	        <p class="media-heading-homepage">{{ organization['display_name'] }}&nbsp(<span class="statistics-show">{{organization['package_count']}}</span>)</p>
+	        </a>
+	    </td>
+		 {% if (index+offset+1) % offset == 0 %}
+		 </tr>
+		{% endif %}
+	{% endfor %}
+	</table>
+	</div>
+	<p style="float: right; margin-top: 15px">
+	<a href="/organization">See All {{_('Organizations')}}</a>
+	</p>
+  </div>
+</div>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_types.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_types.html
new file mode 100644
index 0000000..014bd38
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/search_for_types.html
@@ -0,0 +1,37 @@
+{% set metadatatype = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+{% set metadatatypes = h.get_facet_items_dict(metadatatype['name'], limit=10) %}
+{% if metadatatypes|length > 0 %}
+<div role="main" class="hero">
+  <div class="container">
+	<h3>Browse by {{_('Types')}}</h3>
+	
+	 <div id="search-for-types">
+	 <table class="media-grid-homepage" data-module="media-grid">
+	{% for index in range(0,metadatatypes|length)  %}
+	{% set offset = 5 %}
+	{% set type = metadatatypes[index] %}
+	{% if index % offset == 0 %}
+		 <tr>
+		 {% endif %}
+		 <td class="media-item-homepage">
+			{% set img_url = h.d4science_get_url_to_icon_for_ckan_entity(type.name, entity_type='type') %}
+	       <a href="{% url_for controller='dataset', action='search', systemtype=type.name %}"  title="{{ _('View {name}').format(name=type.name) }}">
+			 <img class="logo-homepage" src="{{ img_url }}" alt="{{ type.display_name }}" title="{{ _('{name}').format(name=type.display_name) }} group"/>
+	        <p class="media-heading-homepage">
+	        {{ h.truncate(type.display_name, 26) }}
+	        (<span class="statistics-show">{{type.count}}</span>)
+	        </a>
+		  </p>
+	    </td>
+		 {% if (index+offset+1) % offset == 0 %}
+		 </tr>
+		{% endif %}
+	{% endfor %}
+	</table>
+	</div>
+	<p style="float: right; margin-top: 15px">
+	<a href="/types">See All {{_('Types')}}</a>
+	</p>
+  </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/stats.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/stats.html
new file mode 100644
index 0000000..be54cac
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/home/snippets/stats.html
@@ -0,0 +1,43 @@
+{% set stats = h.get_site_statistics() %}
+{% set systemtypefacet = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+{% set count_systemtypefacet = h.d4science_theme_count_facet_items_dict(systemtypefacet['name']) %}
+
+<div class="box stats">
+  <div class="inner">
+    <h3>{{ _('{0} statistics').format(g.site_title) }}</h3>
+    <ul>
+      {% block stats_group %}
+      <li>
+        <a href="{{ h.url_for(controller='dataset', action='search') }}">
+          <b>{{ h.SI_number_span(stats.dataset_count) }}</b>
+          {{ _('dataset') if stats.dataset_count == 1 else _('datasets') }}
+        </a>
+      </li>
+      {% if stats.organization_count > 0 %}
+      <li>
+        <a href="{{ h.url_for(controller='organization', action='index') }}">
+          <b>{{ h.SI_number_span(stats.organization_count) }}</b>
+          {{ _('organization') if stats.organization_count == 1 else _('organizations') }}
+        </a>
+      </li>
+      {% endif %}
+      {% if stats.group_count > 0 %}
+      <li>
+        <a href="{{ h.url_for(controller='group', action='index') }}">
+          <b>{{ h.SI_number_span(stats.group_count) }}</b>
+          {{ _('group') if stats.group_count == 1 else _('groups') }}
+        </a>
+      </li>
+      {% endif %}
+      {% if count_systemtypefacet > 0 %}
+      <li>
+        <a href="{{ h.url_for(controller='d4STypeController', action='index') }}">
+          <b>{{ h.SI_number_span(count_systemtypefacet) }}</b>
+          {{ _(systemtypefacet['title']) if count_systemtypefacet <= 1 else _(systemtypefacet['title'])+'s' }}
+        </a>
+      </li>
+      {% endif %}
+      {% endblock %}
+    </ul>
+  </div>
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/read.html
new file mode 100644
index 0000000..77b3d6e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/read.html
@@ -0,0 +1,47 @@
+{% extends "organization/read_base.html" %}
+
+{% block page_primary_action %}
+  {% if h.check_access('package_create', {'owner_org': c.group_dict.id}) %}
+  {# CODE ADDED BY Francesco Mangiacrapa #}
+  {% set hide = h.get_cookie_value('ckan_hide_header') %}
+  {% if hide=='true' %}
+  {# NOT SHOW 'Manage' #}
+  {% else %}
+  {% link_for _('Add Dataset'), controller='dataset', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+  {% endif %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+    {% block groups_search_form %}
+      {% set facets = {
+        'fields': c.fields_grouped,
+        'search': c.search_facets,
+        'titles': c.facet_titles,
+        'translated_fields': c.translated_fields,
+        'remove_field': c.remove_field }
+      %}
+      {% set sorting = [
+        (_('Relevance'), 'score desc, metadata_modified desc'),
+        (_('Name Ascending'), 'title_string asc'),
+        (_('Name Descending'), 'title_string desc'),
+        (_('Last Modified'), 'metadata_modified desc'),
+        (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+      %}
+      {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.args, fields=c.fields %}
+    {% endblock %}
+  {% block packages_list %}
+    {% if c.page.items %}
+      {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ c.page.pager(q=c.q) }}
+  {% endblock %}
+{% endblock %}
+
+{% block organization_facets %}
+  {% for facet in c.facet_titles %}
+    {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
+  {% endfor %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/read_base.html
new file mode 100644
index 0000000..019512a
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/read_base.html
@@ -0,0 +1,34 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
+{% endblock %}
+
+{% block content_action %}
+  {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
+  {# CODE ADDED BY Francesco Mangiacrapa #}
+  {% set hide = h.get_cookie_value('ckan_hide_header') %}
+  {% if hide=='true' %}
+  {# NOT SHOW 'Manage' #}
+  {% else %}
+  {% link_for _('Manage'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
+  {% endif %}
+  {% endif %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'snippets/organization.html', organization=c.group_dict, show_nums=true %}
+  {# ADDED BY FRANCESCO MANGIACRAPA SEE #12651 #}
+  {% set alternative_url = h.url_for(controller='organization', action='read', id=c.group_dict.name) %}
+  {% snippet 'spatial/snippets/spatial_query.html', alternative_url=alternative_url %}
+  {# END #}
+  {% block organization_facets %}{% endblock %}
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "organization/snippets/feeds.html" %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/snippets/organization_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/snippets/organization_item.html
new file mode 100644
index 0000000..2f1da6e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization/snippets/organization_item.html
@@ -0,0 +1,44 @@
+{#
+Renders a media item for a organization. This should be used in a list.
+
+organization - A organization dict.
+
+Example:
+
+    <ul class="media-grid">
+      {% for organization in organizations %}
+        {% snippet "organization/snippets/organization_item.html", organization=organization %}
+      {% endfor %}
+    </ul>
+#}
+{% set url = h.url_for(organization.type ~ '_read', action='read', id=organization.name) %}
+{% block item %}
+<li class="media-item">
+  {% block item_inner %}
+  {% block image %}
+    <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ organization.name }}" class="media-image">
+  {% endblock %}
+  {% block title %}
+    <h3 class="media-heading">{{ organization.display_name }}</h3>
+  {% endblock %}
+  {% block description %}
+    {% if organization.description %}
+      <p>{{ h.markdown_extract(organization.description, extract_length=80) }}</p>
+    {% endif %}
+  {% endblock %}
+  {% block datasets %}
+    {% if organization.package_count %}
+      <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', organization.package_count).format(num=organization.package_count) }}</strong>
+    {% endif %}
+  {% endblock %}
+  {% block link %}
+  <a href="{{ url }}" title="{{ _('View {organization_name}').format(organization_name=organization.display_name) }}" class="media-view">
+    <span>{{ _('View {organization_name}').format(organization_name=organization.display_name) }}</span>
+  </a>
+  {% endblock %}
+  {% endblock %}
+</li>
+{% endblock %}
+{% if position is divisibleby 3 %}
+  <li class="clearfix js-hide"></li>
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization_vre/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization_vre/index.html
new file mode 100644
index 0000000..f9c4c00
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization_vre/index.html
@@ -0,0 +1,47 @@
+{% extends "page.html" %}
+
+{# Added by Francesco Mangiacrapa; see: 8964 #}
+{% block toolbar %}
+{% endblock %}
+
+{% block subtitle %}{{ _('Organizations') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('organization_create') %}
+    {% link_for _('Add Organization'), controller='organization', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block page_heading %}{{ _('Organizations') }}{% endblock %}</h1>
+  {% block organizations_search_form %}
+    {% snippet 'snippets/search_form.html', form_id='organization-search-form', type='organization', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search organizations...'), show_empty=request.args, no_bottom_border=true if c.page.items %}
+  {% endblock %}
+  {% block organizations_list %}
+    {% if c.page.items or request.args %}
+      {% if c.page.items %}
+        {% snippet "organization/snippets/organization_list.html", organizations=c.page.items %}
+      {% endif %}
+    {% else %}
+      <p class="empty">
+        {{ _('There are currently no organizations for this site') }}.
+        {% if h.check_access('organization_create') %}
+          {% link_for _('How about creating one?'), controller='organization', action='new' %}</a>.
+        {% endif %}
+      </p>
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ c.page.pager(q=c.q or '', sort=c.sort_by_selected or '') }}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "organization/snippets/helper.html" %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization_vre/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization_vre/read.html
new file mode 100644
index 0000000..60ae76d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/organization_vre/read.html
@@ -0,0 +1,61 @@
+{% extends "organization/read_base.html" %}
+
+{% block page_primary_action %}
+	{#Added by Francesco Mangiacrapa; see: 8964 #}
+	<script type="text/javascript" >
+		showBreadcrumbIntoSession = function () {
+			CKAN_D4S_Breadcrumb_Manager.setSessionStorageItem("showbreadcrumb", "false");
+			CKAN_D4S_Breadcrumb_Manager.checkBreadcrumbShow();
+		}
+		
+		if(window.addEventListener){
+			window.addEventListener('load', showBreadcrumbIntoSession)
+		}else{
+			window.attachEvent('onload', showBreadcrumbIntoSession)
+		}
+	</script>
+
+  {% if h.check_access('package_create', {'owner_org': c.group_dict.id}) %}
+  {# CODE ADDED BY Francesco Mangiacrapa #}
+  {% set hide = h.get_cookie_value('ckan_hide_header') %}
+  {% if hide=='true' %}
+  {# NOT SHOW 'Manage' #}
+  {% else %}
+  {% link_for _('Add Dataset'), controller='dataset', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+  {% endif %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+    {% block groups_search_form %}
+      {% set facets = {
+        'fields': c.fields_grouped,
+        'search': c.search_facets,
+        'titles': c.facet_titles,
+        'translated_fields': c.translated_fields,
+        'remove_field': c.remove_field }
+      %}
+      {% set sorting = [
+        (_('Relevance'), 'score desc, metadata_modified desc'),
+        (_('Name Ascending'), 'title_string asc'),
+        (_('Name Descending'), 'title_string desc'),
+        (_('Last Modified'), 'metadata_modified desc'),
+        (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+      %}
+      {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.args, fields=c.fields %}
+    {% endblock %}
+  {% block packages_list %}
+    {% if c.page.items %}
+      {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
+    {% endif %}
+  {% endblock %}
+  {% block page_pagination %}
+    {{ c.page.pager(q=c.q) }}
+  {% endblock %}
+{% endblock %}
+
+{% block organization_facets %}
+  {% for facet in c.facet_titles %}
+    {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
+  {% endfor %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/base.html
new file mode 100644
index 0000000..f48121e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/base.html
@@ -0,0 +1,24 @@
+{% extends "page.html" %}
+
+{% set pkg = c.pkg_dict or pkg_dict %}
+
+{% block breadcrumb_content_selected %} class="active"{% endblock %}
+
+{% block subtitle %}{{ _('Datasets') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {% if pkg %}
+    {% set dataset = pkg.title or pkg.name %}
+    {% if pkg.organization %}
+      {% set organization = pkg.organization.title or pkg.organization.name %}
+      <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+      <li>{% link_for organization|truncate(30), controller='organization', action='read', id=pkg.organization.name %}</li>
+    {% else %}
+      <li>{% link_for _('Datasets'), controller='dataset', action='search' %}</li>
+    {% endif %}
+    <li{{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), controller='dataset', action='read', id=pkg.name %}</li>
+  {% else %}
+    <li>{% link_for _('Datasets'), controller='dataset', action='search' %}</li>
+    <li class="active"><a href="">{{ _('Create Dataset') }}</a></li>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/group_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/group_list.html
new file mode 100644
index 0000000..fe23b46
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/group_list.html
@@ -0,0 +1,44 @@
+{% extends "package/read_base.html" %}
+{% import 'macros/form.html' as form %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ _('Groups') }}</h2>
+  {% if c.group_dropdown %}
+  {# ADDED BY FRANCESCO MANGIACRAPA, related to TASK #5196 #}
+     {% if c.userobj %}
+     	{% set username_id = c.userobj.id %}
+      {% set whereAdmin = [] %}
+     	{% for option in c.group_dropdown %}
+     		{% set role_for_user = h.d4science_theme_get_user_role_for_group_or_org(option[0], username_id) %}
+	  		{% if role_for_user and role_for_user == 'admin' %}
+	  			{% do whereAdmin.append(option) %}
+	  		{% else %}
+	  		{# SYSADMIN #}	
+	  		{% if c.userobj.sysadmin %}
+	  		{% do whereAdmin.append(option) %}
+	  		{% endif %}
+	  		{% endif %}
+     	{% endfor %}
+     	{% if whereAdmin %}
+              	<form method="post" class="form-horizontal">
+          		<select id="field-add_group" name="group_added" data-module="autocomplete">
+           		{% for option in whereAdmin %}
+             		<option value="{{ option[0] }}"> {{ option[1] }}</option>
+           		{% endfor %}
+         		</select>
+         		<button type="submit" class="btn btn-primary" title="{{ _('Associate this group with this dataset') }}">{{ _('Add to group') }}</button>
+       			</form>
+     	{% endif %}
+     {% endif %}
+  {% endif %}
+
+
+  {% if c.pkg_dict.groups %}
+    <form method="post">
+      {% snippet 'group/snippets/group_list_simple.html', groups=c.pkg_dict.groups %}
+    </form>
+  {% else %}
+    <p class="empty">{{ _('There are no groups associated with this dataset') }}</p>
+  {% endif %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/read.html
new file mode 100644
index 0000000..a851298
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/read.html
@@ -0,0 +1,59 @@
+{% ckan_extends %}
+{% set dataset_extent = h.get_pkg_dict_extra(c.pkg_dict, 'spatial', '') %}
+{% set d4science_cms_obj_placeholders = h.d4science_get_content_moderator_system_placeholder() %}
+{% set moderation_item_status = h.get_pkg_dict_extra(c.pkg_dict,d4science_cms_obj_placeholders.item_status,'') %}
+
+{% block primary_content_inner %}
+{% if moderation_item_status %}
+ <span class="label pull-right" style='margin-left:5px; padding:3px;'>
+    {{ moderation_item_status }}
+ </span>
+{% endif %}
+  {% block package_description %}
+    {% if pkg.private %}
+      <span class="dataset-private label label-inverse pull-right">
+        <i class="icon-lock"></i>
+        {{ _('Private') }}
+      </span>
+    {% endif %}
+    <div class="principaltitle">
+      {% block page_heading %}
+        {{ pkg.title or pkg.name }}
+        {% if pkg.state.startswith('draft') %}
+          [{{ _('Draft') }}]
+        {% endif %}
+        {% if pkg.state == 'deleted' %}
+          [{{ _('Deleted') }}]
+        {% endif %}
+      {% endblock %}
+    </div>
+    {% block package_notes %}
+      {% if pkg.notes %}
+        <div class="notes embedded-content" style="white-space:pre-line;">
+          {{ h.render_markdown(pkg.notes) }}
+        </div>
+      {% endif %}
+    {% endblock %}
+    {# FIXME why is this here? seems wrong #}
+    <span class="insert-comment-thread"></span>
+  {% endblock %}
+  
+    
+  {% if dataset_extent %}
+    {% snippet "spatial/snippets/dataset_map.html", extent=dataset_extent %}
+  {% endif %}
+  
+  {% block package_tags %}
+  <div class="sectiontitle">{{_('Tags')}}</div>
+    {% snippet "package/snippets/tags.html", tags=pkg.tags %}
+  {% endblock %}
+
+  {% block package_resources %}
+    {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
+  {% endblock %}
+
+  {% block package_additional_info %}
+    {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
+  {% endblock %}
+  
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/read_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/read_base.html
new file mode 100644
index 0000000..a723063
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/read_base.html
@@ -0,0 +1,116 @@
+{# CODE UPDATED BY Francesco Mangiacrapa 
+   USE TO DEBUG
+   {% print "role for user: "+role_for_user %}
+   {% print "role for user:" +role_for_user  %}
+   {% print "username_id = "+username_id  %}
+   {% print "pkg_creator_user_id= "+pkg_creator_user_id %}
+#}
+
+
+{% extends "package/base.html" %}
+
+{% block subtitle %}{{ pkg.title or pkg.name }} - {{ super() }}{% endblock %}
+
+{% block head_extras -%}
+  {{ super() }}
+  {% set description = h.d4science_theme_markdown_extract_html(pkg.notes, extract_length=200)|forceescape %}
+  <meta property="og:title" content="{{ h.dataset_display_name(pkg) }} - {{ g.site_title }}">
+  <meta property="og:description" content="{{ description|forceescape|trim }}">
+{% endblock -%}
+
+{% block content_action %}
+<!-- Added by Francesco Mangiacrapa: it notifies the package id selected -->
+<meta id="product-selected" content="{{pkg.id}}">
+<script>
+//console.log(productId)
+postProduct = function(){
+	var productId = document.getElementById('product-selected').content;
+	CKAN_D4S_HTMLMessage_Util.postHeightToPortlet(true, productId);
+}
+
+if(window.addEventListener){
+  window.addEventListener('load', postProduct)
+}else{
+  window.attachEvent('onload', postProduct)
+}
+</script>
+  {% if h.check_access('package_update', {'id':pkg.id }) %}
+  {# CODE ADDED BY Francesco Mangiacrapa #}
+    {% set hide = h.get_cookie_value('ckan_hide_header') %}
+    {# INTO PORTAL - FROM D4SCIENCE PORTAL #}
+    {% if hide and hide == 'true' %}
+       {% set username_id = c.userobj.id %}
+       {% set pkg_creator_user_id = pkg.creator_user_id %}
+       {% set role_for_user = h.d4science_theme_get_user_role_for_group_or_org(pkg.organization.id, username_id) %}
+       {% if role_for_user %}
+           {% if role_for_user == 'admin' %}
+              {% link_for _('Manage'), controller='dataset', action='edit', id=pkg.name, class_='btn', icon='wrench' %}
+           {% else %}
+              {% if role_for_user == 'editor' %}
+              {# IF THE USER HAS ROLE EDITOR HE/SHE CAN EDIT ONLY ITS DATASET, see related ticket #5119 #}
+                 {% if username_id == pkg_creator_user_id %}
+                    {% link_for _('Manage'), controller='dataset', action='edit', id=pkg.name, class_='btn', icon='wrench' %}
+                 {% endif %}
+              {% endif %}
+              {# NOT SHOW 'Manage' #}
+          {% endif %}
+       {% endif %}
+   {% else %}
+      {% link_for _('Manage'), controller='dataset', action='edit', id=pkg.name, class_='btn', icon='wrench' %}
+   {% endif %}
+ {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }}
+  {{ h.build_nav_icon('dataset_groups', _('Groups'), id=pkg.name) }}
+  <!-- Added by Francesco Mangiacrapa. see: #6572 -->
+  {% if h.check_access('package_update', {'id':pkg.id }) %}
+  {% set role_for_user = h.d4science_theme_get_user_role_for_group_or_org(pkg.organization.id, c.userobj.name) %}
+       {% if role_for_user and role_for_user == 'admin' %}
+  				{{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }}
+  		{% endif %}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+    {% block package_revision_info %}
+      {% if c.revision_date %}
+        <div class="module info alert alert-info">
+          <p class="module-content">
+            {% set timestamp = h.render_datetime(c.revision_date, with_hours=True) %}
+            {% set url = h.url_for(controller='dataset', action='read', id=pkg.name) %}
+
+            {% trans timestamp=timestamp, url=url %}This is an old revision of this dataset, as edited at {{ timestamp }}. It may differ significantly from the <a href="{{ url }}">current revision</a>.{% endtrans %}
+          </p>
+        </div>
+      {% endif %}
+    {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+
+  {% block secondary_help_content %}{% endblock %}
+
+  {% block package_info %}
+    {% snippet 'package/snippets/info.html', pkg=pkg %}
+  {% endblock %}
+
+  {% block package_organization %}
+    {% if pkg.organization %}
+      {% set org = h.get_organization(pkg.organization.name) %}
+      {% snippet "snippets/organization.html", organization=org, has_context_title=true %}
+    {% endif %}
+  {% endblock %}
+
+  {% block package_social %}
+  	{# See: #7055
+    {% snippet "snippets/social.html" %}
+  	#}
+  {% endblock %}
+
+  {% block package_license %}
+    {% snippet "snippets/license.html", pkg_dict=pkg %}
+  {% endblock %}
+
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/resource_edit_base.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/resource_edit_base.html
new file mode 100644
index 0000000..6caa585
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/resource_edit_base.html
@@ -0,0 +1,51 @@
+{% extends "package/base.html" %}
+
+{% set logged_in = true if c.userobj else false %}
+{% set res = c.resource %}
+
+{% block breadcrumb_content_selected %}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  {% if res %}
+    <li>{% link_for h.resource_display_name(res)|truncate(30), controller='dataset', action='resource_read', id=pkg.name, resource_id=res.id %}</li>
+    <li{% block breadcrumb_edit_selected %} class="active"{% endblock %}><a href="">{{ _('Edit') }}</a></li>
+  {% endif %}
+{% endblock %}
+
+{% block content_action %}
+  {% link_for _('All resources'), controller='dataset', action='resources', id=pkg.name, class_='btn', icon='arrow-left' %}
+  {% if res %}
+    {% link_for _('View resource'), controller='dataset', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn', icon='eye-open' %}
+  {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('resource_edit', _('Edit resource'), id=pkg.name, resource_id=res.id) }}
+  {# Updated by Francesco Mangiacrapa #11303 #}
+  {# if 'datapusher' in g.plugins #}
+  {# {{ h.build_nav_icon('resource_data', _('DataStore'), id=pkg.name, resource_id=res.id) }} #}
+  {# {% endif %} #}
+  {# {{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }} #}
+  {% set is_sys_admin = true if (c.userobj and c.userobj.sysadmin) else false %}
+  {% if is_sys_admin %}
+  	{% if 'datapusher' in g.plugins %}
+    	{{ h.build_nav_icon('resource_data', _('DataStore'), id=pkg.name, resource_id=res.id) }}
+  	{% endif %}
+  	{{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }}
+  {% endif %}
+{% endblock %}
+
+{% block primary_content_inner %}
+  <h1 class="hide-heading">{% block form_title %}{{ _('Edit resource') }}{% endblock %}</h1>
+  {% block form %}{% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'package/snippets/resource_info.html', res=res %}
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  {% resource 'vendor/fileupload' %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/resource_read.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/resource_read.html
new file mode 100644
index 0000000..066624e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/resource_read.html
@@ -0,0 +1,187 @@
+{% extends "package/base.html" %}
+
+{% set res = c.resource %}
+
+{% block head_extras -%}
+  {{ super() }}
+  {% set description = h.markdown_extract(res.description, extract_length=200) if res.description else h.markdown_extract(c.package.notes, extract_length=200) %}
+  <meta property="og:title" content="{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}">
+  <meta property="og:description" content="{{ description|forceescape }}">
+{% endblock -%}
+
+{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
+
+{% block breadcrumb_content_selected %}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ super() }}
+  <li class="active"><a href="">{{ h.resource_display_name(res)|truncate(30) }}</a></li>
+{% endblock %}
+
+{% block pre_primary %}
+{# Added by Francesco Mangiacrapa #}
+<script type="text/javascript" >
+//handles the click event
+function handleClick(event, element, url) {
+    window.open(url, "_blank", null);
+    return false;
+}
+</script>
+  {% block resource %}
+    <section class="module module-resource">
+      {% block resource_inner %}
+      <div class="module-content">
+        <div class="actions">
+          {% block resource_actions %}
+          <ul>
+            {% block resource_actions_inner %}
+            {% if h.check_access('package_update', {'id':pkg.id }) %}
+              <li>{% link_for _('Manage'), controller='dataset', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %}</li>
+            {% endif %}
+            {% if res.url and h.is_url(res.url) %}
+              <li>
+                <a class="btn btn-primary resource-url-analytics resource-type-{{ res.resource_type }}" href="#" onclick="return handleClick(event, this, '{{ res.url }}');">
+                  {% if res.resource_type in ('listing', 'service') %}
+                    <i class="icon-eye-open"></i> {{ _('View') }}
+                  {% elif  res.resource_type == 'api' %}
+                    <i class="icon-key"></i> {{ _('API Endpoint') }}
+                  {% elif not res.has_views or not res.can_be_previewed %}
+                    <i class="icon-external-link"></i> {{ _('Go to resource') }}
+                  {% else %}
+                    <i class="icon-download"></i> {{ _('Download') }}
+                  {% endif %}
+                </a>
+              </li>
+            {% endif %}
+            {% if 'datastore' in g.plugins %}
+              <li>{% snippet 'package/snippets/data_api_button.html', resource=res, datastore_root_url=c.datastore_api %}</li>
+            {% endif %}
+            {% endblock %}
+          </ul>
+          {% endblock %}
+        </div>
+        {% block resource_content %}
+          {% block resource_read_title %}<h1 class="page-heading">{{ h.resource_display_name(res) | truncate(50) }}</h1>{% endblock %}
+          {% block resource_read_url %}
+            {% if res.url and h.is_url(res.url) %}
+              <p class="muted ellipsis">{{ _('URL:') }} <a href="{{ res.url }}" title="{{ res.url }}" target="_blank">{{ res.url }}</a></p>
+            {% elif res.url %}
+              <p class="muted ellipsis">{{ _('URL:') }} {{ res.url }}</p>
+            {% endif %}
+          {% endblock %}
+          <div class="prose notes" property="rdfs:label">
+            {% if res.description %}
+              {{ h.render_markdown(res.description) }}
+            {% endif %}
+            {% if not res.description and c.package.notes %}
+              <h3>{{ _('From the dataset abstract') }}</h3>
+              <blockquote>{{ h.d4science_theme_markdown_extract_html(c.package.get('notes')) }}</blockquote>
+              <p>{% trans dataset=c.package.title, url=h.url_for(controller='dataset', action='read', id=c.package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
+            {% endif %}
+          </div>
+        {% endblock %}
+      </div>
+      {% block data_preview %}
+      {% block resource_view %}
+        {% block resource_view_nav %}
+          {% set resource_preview = h.resource_preview(c.resource, c.package) %}
+          {% snippet "package/snippets/resource_views_list.html",
+             views=resource_views,
+             pkg=pkg,
+             is_edit=false,
+             view_id=current_resource_view['id'],
+             resource_preview=resource_preview,
+             resource=c.resource,
+             extra_class="nav-tabs-plain"
+           %}
+        {% endblock %}
+        <div class="module-content">
+          {% block resource_view_content %}
+            <div class="resource-view">
+              {% set resource_preview = h.resource_preview(c.resource, c.package) %}
+              {% set views_created = res.has_views or resource_preview %}
+              {% if views_created %}
+                {% if resource_preview and not current_resource_view %}
+                  {{ h.resource_preview(c.resource, c.package) }}
+                {% else %}
+                  {% for resource_view in resource_views %}
+                    {% if resource_view == current_resource_view %}
+                      {% snippet 'package/snippets/resource_view.html',
+                         resource_view=resource_view,
+                         resource=c.resource,
+                         package=c.package
+                       %}
+                    {% endif %}
+                  {% endfor %}
+                {% endif %}
+                {# REMOVED View not created cases by Francesco Mangiacrapa #}
+              {% endif %}
+            </div>
+          {% endblock %}
+        </div>
+      {% endblock %}
+      {% endblock %}
+      {% endblock %}
+    </section>
+  {% endblock %}
+{% endblock %}
+
+{% block primary_content %}
+  {% block resource_additional_information %}
+    {% if res %}
+      <section class="module">
+        {% block resource_additional_information_inner %}
+        <div class="module-content">
+          <h2>{{ _('Additional Information') }}</h2>
+          <table class="table table-striped table-bordered table-condensed" data-module="table-toggle-more">
+            <thead>
+              <tr>
+                <th scope="col">{{ _('Field') }}</th>
+                <th scope="col">{{ _('Value') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <th scope="row">{{ _('Last updated') }}</th>
+                {# {{ h.render_datetime(res.last_modified) or h.render_datetime(res.revision_timestamp) or h.render_datetime(res.created) or _('unknown') }} #}
+                <!-- Task #9467: FIX RELEASED by Francesco Mangiacrapa -->
+                <td>{{ h.render_datetime(res.last_modified) or h.render_datetime(res.revision_timestamp) or h.render_datetime(res.Created) or h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('Created') }}</th>
+               {# {{ h.render_datetime(res.Created) or h.render_datetime(res.created) or _('unknown') }} #}
+               <!-- Task #9467: FIX RELEASED by Francesco Mangiacrapa -->
+                <td>{{ h.render_datetime(res.Created) or h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('Format') }}</th>
+                <td>{{ res.mimetype_inner or res.mimetype or res.format or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{{ _('License') }}</th>
+                <td>{% snippet "snippets/license.html", pkg_dict=pkg, text_only=True %}</td>
+              </tr>
+              {% for key, value in h.format_resource_items(res.items()) %}
+                <tr class="toggle-more"><th scope="row">{{ key }}</th><td>{{ value }}</td></tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        </div>
+        {% endblock %}
+      </section>
+    {% endif %}
+  {% endblock %}
+{% endblock %}
+
+{% block secondary_content %}
+
+  {% block resources_list %}
+    {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id %}
+  {% endblock %}
+
+  {% block resource_license %}
+  	{# See: #7055
+    {% snippet "snippets/social.html" %}
+   #}
+  {% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/search.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/search.html
new file mode 100644
index 0000000..c508bcf
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/search.html
@@ -0,0 +1,90 @@
+{% extends "page.html" %}
+{% import 'macros/form.html' as form %}
+
+{% block subtitle %}{{ _("Datasets") }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Datasets'), controller='dataset', action='search', highlight_actions = 'new index') }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      {% block page_primary_action %}
+        {% if h.check_access('package_create') %}
+        {# ADDED BY FRANCESCO MANGIACRAPA, 'ADD DATASET' IS SHOWN ONLY TO USER SYSADMIN' #7188 #}
+			{% if c.userobj and c.userobj.sysadmin %}
+          <div class="page_primary_action">
+            {% link_for _('Add Dataset'), controller='dataset', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
+          </div>
+          {% endif %}
+        {% endif %}
+      {% endblock %}
+      {% block form %}
+        {% set facets = {
+          'fields': c.fields_grouped,
+          'search': c.search_facets,
+          'titles': c.facet_titles,
+          'translated_fields': c.translated_fields,
+          'remove_field': c.remove_field }
+        %}
+        {% set sorting = [
+          (_('Relevance'), 'score desc, metadata_modified desc'),
+          (_('Name Ascending'), 'title_string asc'),
+          (_('Name Descending'), 'title_string desc'),
+          (_('Last Modified'), 'metadata_modified desc'),
+          (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+        %}
+        {% snippet 'snippets/search_form.html', form_id='dataset-search-form', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, show_empty=request.args, error=c.query_error, fields=c.fields %}
+      {% endblock %}
+      {% block package_search_results_list %}
+        {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
+      {% endblock %}
+    </div>
+
+    {% block page_pagination %}
+      {{ c.page.pager(q=c.q) }}
+    {% endblock %}
+  </section>
+
+  {% block package_search_results_api %}
+  <section class="module">
+    <div class="module-content">
+      {% block package_search_results_api_inner %}
+      <small>
+      {# Commented by Francesco, see Support #18126  #}
+      {#
+        {% set api_link = h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=3)) %}
+        {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version)) %}
+        {% if g.dumps_url -%}
+          {% set dump_link = h.link_to(_('full {format} dump').format(format=g.dumps_format), g.dumps_url) %}
+          {% trans %}
+            You can also access this registry using the {{ api_link }} (see {{ api_doc_link }}) or download a {{ dump_link }}.
+          {% endtrans %}
+        {% else %}
+          {% trans %}
+            You can also access this registry using the {{ api_link }} (see {{ api_doc_link}}).
+          {% endtrans %}
+        {%- endif %}
+      #}
+      </small>
+      {% endblock %}
+    </div>
+  </section>
+  {% endblock %}
+{% endblock %}
+
+
+{% block secondary_content %}
+<div class="filters">
+  <div>
+  	<!--ADDED BY FRANCESCO MANGIACRAPA-->
+  	{% snippet "spatial/snippets/spatial_query.html" %}
+ 	<!--END ADD-->
+    {% for facet in c.facet_titles %}
+      {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet) }}
+    {% endfor %}
+  </div>
+  <a class="close no-text hide-filters"><i class="icon-remove-sign"></i><span class="text">close</span></a>
+</div>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/additional_info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/additional_info.html
new file mode 100644
index 0000000..e058199
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/additional_info.html
@@ -0,0 +1,150 @@
+{% set key_item_url = _('Item') + ' URL' %}
+
+<script type="text/javascript" src="/fanstatic/d4science_theme/d4science_scripts.js"></script>
+
+<script>
+  //ADDED by Francesco Mangiacrapa
+  jsonToHTML = function(containerID, cssClassToTable) {
+		CKAN_D4S_JSON_Util.jsonToHTML(containerID, cssClassToTable);
+  }
+</script>
+
+<section class="additional-info">
+    {% block extras scoped %}
+      {#
+      This performs a sort
+      {% for extra in h.sorted_extras(pkg_dict.extras) %}
+      #}
+    {% if pkg_dict.extras %}
+    	{# Added by Francesco Mangiacrapa, see 17901 #}
+    	{% set extra_item_url = h.get_pkg_dict_extra(pkg_dict,key_item_url) %}
+      {% if extra_item_url %}
+      	<div><div class="sectiontitle">{{ key_item_url }}</div>
+      	<table class="qr-code-table">
+      		<tr>
+	      		<td><a href={{ extra_item_url }} target="_blank">{{ extra_item_url }}</a></td>
+	      		<td>{% snippet "package/snippets/qrcode_show.html", package_url=extra_item_url %}</td>
+      		</tr>
+      	</table></div>
+      {% endif %}
+      {% set extras_indexed_for_categories = h.d4science_get_extras_indexed_for_namespaces(pkg_dict.extras) %}
+      {% for k_cat in extras_indexed_for_categories %}
+        {% set category_idx = extras_indexed_for_categories[k_cat] %}
+        {% if(k_cat!='nocategory') %}
+          <div><div class="sectiontitle">{{category_idx.category.title}}</div>
+               {% if category_idx.category.description %}
+                <div class="notes embedded-content"><p>Description: {{category_idx.category.description}}</p></div>
+               {% endif %}
+                <table class="table table-striped table-bordered table-condensed">
+                <thead>
+                  <tr>
+                    <th scope="col">{{ _('Field') }}</th>
+                    <th scope="col">{{ _('Value') }}</th>
+                  </tr>
+                </thead>
+                <tbody>
+	              {% set my_extras = h.d4science_get_extra_for_category(extras_indexed_for_categories, k_cat) %}
+					  {% snippet "package/snippets/extras_table.html", my_extras=my_extras, key_item_url=key_item_url %}
+                </tbody>
+                </table>
+          </div>
+        {% endif %}
+      {% endfor %}
+      {% set my_extras = h.d4science_get_extra_for_category(extras_indexed_for_categories, 'nocategory') %}
+      {% if my_extras|length > 0 %}
+        <div><div class="sectiontitle">{{ _('Additional Info') }}</div>
+        <table class="table table-striped table-bordered table-condensed">
+        <thead>
+          <tr>
+            <th scope="col">{{ _('Field') }}</th>
+            <th scope="col">{{ _('Value') }}</th>
+          </tr>
+        </thead>
+        <tbody>
+	      {% snippet "package/snippets/extras_table.html", my_extras=my_extras, key_item_url=key_item_url %}
+        </tbody>
+        </table>
+        </div>
+      {% endif %}
+    {% endif %}
+    {% endblock %}
+  <div class="sectiontitle">{{ _('Management Info') }}</div>
+  <table class="table table-striped table-bordered table-condensed">
+    <thead>
+      <tr>
+        <th scope="col">{{ _('Field') }}</th>
+        <th scope="col">{{ _('Value') }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% block package_additional_info %}
+        {% if pkg_dict.url %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _('Source') }}</th>
+            {% if h.is_url(pkg_dict.url) %}
+              <td class="dataset-details" property="foaf:homepage">{{ h.link_to(pkg_dict.url, pkg_dict.url, rel='foaf:homepage', target='_blank') }}</td>
+            {% else %}
+              <td class="dataset-details" property="foaf:homepage">{{ pkg_dict.url }}</td>
+            {% endif %}
+          </tr>
+        {% endif %}
+
+        {% if pkg_dict.author_email %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Author") }}</th>
+            <td class="dataset-details" property="dc:creator">{{ h.mail_to(email_address=pkg_dict.author_email, name=pkg_dict.author) }}</td>
+          </tr>
+        {% elif pkg_dict.author %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Author") }}</th>
+            <td class="dataset-details" property="dc:creator">{{ pkg_dict.author }}</td>
+          </tr>
+        {% endif %}
+        {# Added by Francesco Mangiacrapa #}
+        {% set user_maintainer = h.d4science_get_user_info(pkg_dict.maintainer) %}
+        {% if pkg_dict.maintainer_email %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
+            <td class="dataset-details" property="dc:contributor">{{ h.mail_to(email_address=pkg_dict.maintainer_email, name=user_maintainer.fullname if (user_maintainer and user_maintainer.fullname) else pkg_dict.maintainer) }}</td>
+          </tr>
+        {% elif pkg_dict.maintainer %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
+            <td class="dataset-details" property="dc:contributor">{{ user_maintainer.fullname if (user_maintainer and user_maintainer.fullname) else pkg_dict.maintainer }}</td>
+          </tr>
+        {% endif %}
+
+        {% if pkg_dict.version %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Version") }}</th>
+            <td class="dataset-details">{{ pkg_dict.version }}</td>
+          </tr>
+        {% endif %}
+
+        {% if h.check_access('package_update',{'id':pkg_dict.id}) %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("State") }}</th>
+            <td class="dataset-details">{{ _(pkg_dict.state) }}</td>
+          </tr>
+        {% endif %}
+        {% if pkg_dict.metadata_modified %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Last Updated") }}</th>
+            <td class="dataset-details">
+                {% snippet 'snippets/local_friendly_datetime.html', datetime_obj=pkg_dict.metadata_modified %}
+            </td>
+          </tr>
+        {% endif %}
+        {% if pkg_dict.metadata_created %}
+          <tr>
+            <th scope="row" class="dataset-label">{{ _("Created") }}</th>
+
+            <td class="dataset-details">
+                {% snippet 'snippets/local_friendly_datetime.html', datetime_obj=pkg_dict.metadata_created %}
+            </td>
+          </tr>
+        {% endif %}
+          </tbody>
+  </table>
+      {% endblock %}
+</section>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/extras_table.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/extras_table.html
new file mode 100644
index 0000000..062ac19
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/extras_table.html
@@ -0,0 +1,59 @@
+<!-- Applying "Show more"/"Show less" to 'spatial field', see #23298 -->
+<script type="text/javascript">
+function manageLongField(containerID, n) {
+	try {
+		var str = document.getElementById(containerID).innerHTML;
+		if (str && str.length <= n) {
+			return str;
+		}
+
+		var newContent = "<div><input type='checkbox' class='read-more-state' id='post-"+containerID+"'' /><label for='post-"+containerID+"'' class='read-more-trigger'></label><p class='read-more-wrap'>";
+		newContent += str.substring(0, n);
+		newContent += "<span class='read-more-target'>";
+		newContent += str.substring(n, str.length);
+		newContent += "</span></p></div>"
+
+		document.getElementById(containerID).innerHTML = newContent
+	} catch (e) {
+		console.log('invalid containerID ' + containerID, e);
+	}
+}
+</script>
+<!-- reading placeholder used by D4Science Content Moderator System, see #22854 -->
+{% set d4science_cms_obj_placeholders = h.d4science_get_content_moderator_system_placeholder() %}
+{% for extra_lnk in my_extras %}
+{% set index = loop.index %}
+  {% for k in extra_lnk.keys() %}
+    {# Added by Francesco Mangiacrapa, see: #21701 #}
+    {% set extra_value = extra_lnk[k] %}
+    <!-- showing only extra fields with no empty values -->
+    {% if extra_value is defined and extra_value|length %}
+        {# Added by Francesco Mangiacrapa, see: #7055 #}
+        {% set isHttp = extra_value.startswith(('http://', 'https://')) %}
+        <tr rel="dc:relation" resource="_:extra{{ i }}">
+        <!-- no showing ITEM URL and D4Science CMS fields into table -->
+        {% if k != key_item_url and (not k.startswith(d4science_cms_obj_placeholders.prefix)) %}
+           <th scope="row" class="dataset-label" property="rdfs:label">{{ _(k) }}</th>
+           {% if isHttp %}
+                {% if k ==  'graphic-preview-file'%}
+                  <td class="dataset-details" property="rdf:value"><img src={{ extra_value }} alt={{ extra_value }}></td>
+                {% else %}
+                  <td class="dataset-details" property="rdf:value"><a href={{ extra_value }} target="_blank">{{ extra_value }}</a></td>
+                {% endif %}
+           {% elif k == 'responsible-party' %}
+             <td class="dataset-details" property="rdf:value"><div id="responsible-party-extra-{{index}}" class="d4s-json-table">{{ extra_value }}</div><script>jsonToHTML('responsible-party-extra-{{index}}')</script></td>
+           {% elif k == 'dataset-reference-date' %}
+             <td class="dataset-details" property="rdf:value"><div id="dataset-reference-date-extra-{{index}}" class="d4s-json-table">{{ extra_value }}</div><script>jsonToHTML('dataset-reference-date-extra-{{index}}')</script></td>
+           {% elif k == 'coupled-resource' %}
+             <td class="dataset-details" property="rdf:value"><div id="coupled-resource-date-extra-{{index}}" class="d4s-json-table">{{ extra_value }}</div><script>jsonToHTML('coupled-resource-date-extra-{{index}}')</script></td>
+           {% elif k.startswith('Zenodo') %}
+             <td class="dataset-details" property="rdf:value"><div id="related-identifier-extra-{{index}}" class="d4s-json-table">{{ extra_value }}</div><script>jsonToHTML('related-identifier-extra-{{index}}')</script></td>
+            {% elif k == 'spatial' %}
+             <td class="dataset-details" property="rdf:value"><div id='spatial-{{index}}'>{{ extra_value }}</div><script>manageLongField('spatial-{{index}}', 150)</script></td>
+           {% else %}
+             <td class="dataset-details" property="rdf:value">{{ extra_value }}</td>
+           {% endif %}
+       {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/info.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/info.html
new file mode 100644
index 0000000..2658c11
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/info.html
@@ -0,0 +1,47 @@
+{#
+Displays a sidebard module with information for given package
+
+pkg    - The package dict that owns the resources.
+
+Example:
+
+  {% snippet "package/snippets/info.html", pkg=pkg %}
+
+#}
+{% block package_info %}
+  {% if pkg %}
+    <section class="module module-narrow">
+      <div class="module context-info">
+        <div class="module-content">
+          {% block package_info_inner %}
+            {% block heading %}
+              <div class="infotitle">{{ h.dataset_display_name(pkg) }}</div>
+            {% endblock %}
+			  {% if pkg.extras %}  	
+			   {% for extra in pkg.extras if extra['key'] == 'graphic-preview-file' %}
+			   <div class="graphic-preview-style">
+			  	 	<div><a href={{ extra['value'] }} target="_blank"><img src={{ extra['value'] }} alt='graphic-preview-file'>Show Graphic</a></div>
+			  	</div>	
+			  	{% endfor %}
+			  {% endif %}
+            {% block nums %}
+              <div class="nums">
+                <dl>
+                  <dt>{{ _('Followers') }}</dt>
+                  <dd>{{ h.SI_number_span(h.follow_count('dataset', pkg.id)) }}</dd>
+                </dl>
+              </div>
+            {% endblock %}
+            {% block follow_button %}
+              {% if not hide_follow_button %}
+                <div class="follow_button">
+                  {{ h.follow_button('dataset', pkg.name) }}
+                </div>
+              {% endif %}
+            {% endblock %}
+          {% endblock %}
+        </div>
+      </div>
+    </section>
+  {% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/qrcode_show.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/qrcode_show.html
new file mode 100644
index 0000000..a0ec361
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/qrcode_show.html
@@ -0,0 +1,6 @@
+{% set qr_code_image = h.d4science_get_qrcode_for_url(package_url) %}
+{% block package_qrcode_for_url %}
+	<div style="padding: 1px;"><img src='data:image/svg+xml;base64, {{ qr_code_image }}' alt={{ package_url }}> </div>
+{% endblock %}
+
+      
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resource_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resource_form.html
new file mode 100644
index 0000000..2fab14e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resource_form.html
@@ -0,0 +1,96 @@
+{% import 'macros/form.html' as form %}
+
+{% set data = data or {} %}
+{% set errors = errors or {} %}
+{% set action = form_action or h.url_for(controller='dataset', action='new_resource', id=pkg_name) %}
+
+<form id="resource-edit" class="dataset-form dataset-resource-form form-horizontal" method="post" action="{{ action }}" data-module="basic-form resource-form" enctype="multipart/form-data" novalidate>
+  {% block stages %}
+    {# An empty stages variable will not show the stages #}
+    {% if stage %}
+      {{ h.snippet('package/snippets/stages.html', stages=stage, pkg_name=pkg_name) }}
+    {% endif %}
+  {% endblock %}
+
+  {% block errors %}{{ form.errors(error_summary) }}{% endblock %}
+
+  <input name="id" value="{{ data.id }}" type="hidden"/>
+
+  {% block basic_fields %}
+    {% block basic_fields_url %}
+      {% set is_upload = (data.url_type == 'upload') %}
+
+      {# Updated by Francesco Mangiacrapa #11303 #}
+      {% set is_sys_admin = true if (c.userobj and c.userobj.sysadmin) else false %}
+      {% set enabling_upload = true if(is_sys_admin and h.uploads_enabled()) else false %}
+      {{ form.image_upload(data, errors, field_url='url', field_upload='upload', field_clear='clear_upload',
+         is_upload_enabled=enabling_upload, is_url=data.url and not is_upload, is_upload=is_upload,
+         upload_label=_('Data'), url_label=_('URL'), placeholder=_('http://example.com/external-data.csv')) }}
+
+      {# OLD CODE
+      {{ form.image_upload(data, errors, field_url='url', field_upload='upload', field_clear='clear_upload',
+         is_upload_enabled=h.uploads_enabled(), is_url=data.url and not is_upload, is_upload=is_upload,
+         upload_label=_('Data'), url_label=_('URL'), placeholder=_('http://example.com/external-data.csv')) }}
+      #}
+    {% endblock %}
+
+    {% block basic_fields_name %}
+      {{ form.input('name', id='field-name', label=_('Name'), placeholder=_('eg. January 2011 Gold Prices'), value=data.name, error=errors.name, classes=['control-full']) }}
+    {% endblock %}
+
+    {% block basic_fields_description %}
+      {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('Some useful notes about the data'), value=data.description, error=errors.description) }}
+    {% endblock %}
+
+    {% block basic_fields_format %}
+      {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/resource/format_autocomplete?incomplete=?'} %}
+      {% call form.input('format', id='field-format', label=_('Format'), placeholder=_('eg. CSV, XML or JSON'), value=data.format, error=errors.format, classes=['control-medium'], attrs=format_attrs) %}
+        <span class="info-block info-block-small">
+          <i class="icon-info-sign"></i>
+          {{ _('This will be guessed automatically. Leave blank if you wish') }}
+        </span>
+      {% endcall %}
+    {% endblock %}
+  {% endblock basic_fields %}
+
+  {% block metadata_fields %}
+    {% if include_metadata %}
+      {# TODO: Where do these come from, they don't exist in /package/new_package_form.html #}
+      {# {{ form.select('resource_type', id='field-type', label=_('Resource Type'), options=[{'value': 'empty', 'text': _('Select a type…')}], selected="empty", error=errors.type) }} #}
+
+      {{ form.input('last_modified', id='field-last-modified', label=_('Last Modified'), placeholder=_('eg. 2012-06-05'), value=data.last_modified, error=errors.last_modified, classes=[]) }}
+
+      {{ form.input('size', id='field-size', label=_('File Size'), placeholder=_('eg. 1024'), value=data.size, error=errors.size, classes=[]) }}
+
+      {{ form.input('mimetype', id='field-mimetype', label=_('MIME Type'), placeholder=_('eg. application/json'), value=data.mimetype, error=errors.mimetype, classes=[]) }}
+
+      {{ form.input('mimetype_inner', id='field-mimetype-inner', label=_('MIME Type'), placeholder=_('eg. application/json'), value=data.mimetype_inner, error=errors.mimetype_inner, classes=[]) }}
+    {% endif %}
+  {% endblock %}
+
+  <div class="form-actions">
+    {% block delete_button %}
+      {% if data.id %}
+        {% if h.check_access('resource_delete', {'id': data.id})  %}
+          {% set locale = h.dump_json({'content': _('Are you sure you want to delete this resource?')}) %}
+          <a class="btn btn-danger pull-left" href="{% url_for controller='dataset', action='resource_delete', resource_id=data.id, id=pkg_name %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+        {% endif %}
+      {% endif %}
+    {% endblock %}
+    {% if stage %}
+      {% block previous_button %}
+        <button class="btn" name="save" value="go-dataset" type="submit">{{ _('Previous') }}</button>
+      {% endblock %}
+      {% block again_button %}
+        <button class="btn" name="save" value="again" type="submit">{{ _('Save & add another') }}</button>
+        {% endblock %}
+      {% block save_button %}
+      <button class="btn btn-primary" name="save" value="go-metadata" type="submit">{% block save_button_text %}{{ _('Finish') }}{% endblock %}</button>
+      {% endblock %}
+    {% else %}
+      {% block add_button %}
+      <button class="btn btn-primary" name="save" value="go-dataset-complete" type="submit">{{ _('Add') }}</button>
+      {% endblock %}
+    {% endif %}
+  </div>
+</form>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resource_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resource_item.html
new file mode 100644
index 0000000..9d1c462
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resource_item.html
@@ -0,0 +1,106 @@
+{% set can_edit = h.check_access('package_update', {'id':pkg.id }) %}
+{% set url_action = 'resource_edit' if url_is_edit and can_edit else 'resource_read' %}
+{% set url = h.url_for(controller='dataset', action=url_action, id=pkg.name, resource_id=res.id) %}
+<li class="resource-item" data-id="{{ res.id }}">
+{# Added by Francesco Mangiacrapa block custom_view_on_resources see:4851 #}
+{% block custom_view_on_resources %}
+{% set user = c.user %}
+{% if user %}
+  {% block resource_item_title %}
+  <a class="heading" href="{{ url }}" title="{{ res.name or res.description }}">
+    {{ h.resource_display_name(res) | truncate(50) }}<span class="format-label" property="dc:format" data-format="{{ res.format.lower() or 'data' }}">{{ res.format }}</span>
+    {{ h.popular('views', res.tracking_summary.total, min=10) }}
+  </a>
+  {% endblock %}
+  {% block resource_item_description %}
+    <p class="description">
+      {% if res.description %}
+        {{ h.markdown_extract(res.description, extract_length=80) }}
+      {% endif %}
+    </p>
+  {% endblock %}
+  {% block resource_item_explore %}
+  {% if not url_is_edit %}
+   {# Only if can edit, explorer button is shown with several facility #}
+  {% if can_edit %}
+  <div class="dropdown btn-group">
+    <a href="#" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+      <i class="icon-share-alt"></i>
+      {{ _('Explore') }}
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      {% block resource_item_explore_links %}
+      <li>
+        <a href="{{ url }}">
+          {% if res.has_views %}
+            <i class="icon-bar-chart"></i>
+            {{ _('Preview') }}
+          {% else %}
+            <i class="icon-info-sign"></i>
+            {{ _('More information') }}
+          {% endif %}
+        </a>
+      </li>
+      {% if res.url and h.is_url(res.url) %}
+      {# Added by Francesco Mangiacrapa #}
+      <script type="text/javascript" >
+      //handles the click event
+      function handleClick(event, element, url) {
+      window.open(url, "_blank", null);
+      return false;
+      }
+      </script>
+      {# Comment by Francesco Mangiacrapa, in order to avoid "Download" and "Go to Resource" facilities through the Explore button #}
+      <!--<li>
+        <a class="resource-url-analytics" href="#" onclick="return handleClick(event, this, '{{ res.url }}');">
+          {% if res.has_views %}
+            <i class="icon-download"></i>
+            {{ _('Download') }}
+          {% else %}
+            <i class="icon-external-link"></i>
+            {{ _('Go to resource') }}
+          {% endif %}
+        </a>
+      </li>-->
+      {% endif %}
+      {#{% if can_edit %}#}
+      <li>
+        <a href="{{ h.url_for(controller='dataset', action='resource_edit', id=pkg.name, resource_id=res.id) }}">
+          <i class="icon-edit"></i>
+          {{ _('Edit') }}
+        </a>
+      </li>
+      {#{% endif %}#}
+      {% endblock %}
+    </ul>
+  </div>
+  {% else %}
+  <a href="{{ url }}" title="Go to {{ url }}">
+  {{ _('Go to resource') }}
+  </a>
+  {% endif %}
+  {% endif %}
+  {% endblock %}
+{% else %}
+ {% block resource_item_title2 %}
+ {# Updated by Francesco Mangiacrapa, see: #10056 #}
+  <a class="heading" href="javascript:CKAN_D4S_Functions_Util.showPopupD4S(null, 'myPopup_{{res.id}}', '250px');">
+    {{ h.resource_display_name(res) | truncate(50) }}<span class="format-label" property="dc:format" data-format="{{ res.format.lower() or 'data' }}">{{ res.format }}</span>
+    {{ h.popular('views', res.tracking_summary.total, min=10) }}
+  </a>
+  {% endblock %}
+  <div class="popupD4S" onclick="CKAN_D4S_Functions_Util.showPopupD4S(event, 'myPopup_{{res.id}}', '250px')">
+  {% block resource_item_description2 %}
+    <p class="description">
+      {% if res.description %}
+        {{ h.markdown_extract(res.description, extract_length=80) }}
+      {% endif %}
+    </p>
+  {% endblock %}
+ <span class="popuptext" id="myPopup_{{res.id}}">The resource: '{{ h.resource_display_name(res) | truncate(30) }}' is not accessible as guest user. You must login to access it!</span>
+  </div>
+{% endif %}
+{% endblock %}
+</li>
+
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resources.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resources.html
new file mode 100644
index 0000000..63bd8f2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resources.html
@@ -0,0 +1,34 @@
+{#
+Displays a sidebard module with navigation containing the provided resources.
+If no resources are provided then the module will not be displayed.
+
+pkg       - The package dict that owns the resources.
+active    - The id of the currently displayed resource.
+action    - The controller action to use (default: 'resource_read').
+
+Example:
+
+  {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id %}
+
+#}
+{% set resources = pkg.resources or [] %}
+{% if resources %}
+  {% block resources %}
+    <section class="module module-narrow resources">
+      {% block resources_inner %}
+        {% block resources_title %}
+          <h2 title="All Resources of: {{ pkg.title }}" class="module-heading"><i class="icon-copy"></i> All {{ _("Resources") }}</h2>
+        {% endblock %}
+        {% block resources_list %}
+          <ul class="unstyled nav nav-simple">
+            {% for resource in resources %}
+              <li title="{{ resource.name }}" class="nav-item{{ ' active' if active == resource.id }}">
+                {% link_for h.resource_display_name(resource)|truncate(25), controller='dataset', action=action or 'resource_read', id=pkg.name, resource_id=resource.id, inner_span=true %}
+              </li>
+            {% endfor %}
+          </ul>
+        {% endblock %}
+      {% endblock %}
+    </section>
+  {% endblock %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resources_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resources_list.html
new file mode 100644
index 0000000..8b3e23d
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/package/snippets/resources_list.html
@@ -0,0 +1,76 @@
+{# 
+Renders a list of resources with icons and view links.
+
+resources - A list of resources to render
+pkg - A package object that the resources belong to.
+
+Example:
+
+  {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
+
+#}
+
+<script type="text/javascript" >
+
+//Task #10389
+window.addEventListener("message",
+ function (e) {
+ 
+ 		 var curr_loc = window.location.toString()
+ 		 var orgin = e.origin.toString()
+ 		 if(curr_loc.startsWith(orgin)){
+ 		  	//alert("ignoring message from myself");
+      	return; 
+ 		 }
+ 		 //console.log("origin: "+e.data)
+ 		 if(e.data == null)
+ 		 	return;
+ 		 	
+ 		 var pMess = JSON.parse(e.data)
+ 		 //console.log(pMess.explore_vres_landing_page)
+ 		 window.linktogateway = pMess.explore_vres_landing_page;
+ 		 goToHomeLink("resource-private")
+ },false);
+
+//Task #10389
+goToHomeLink = function (divId) {
+	
+	var myDiv = document.getElementById(divId);
+	var myHost = window.linktogateway.substring(0, window.linktogateway.lastIndexOf("/"));
+	console.log("my host: "+myHost)
+	
+	if(myDiv && myHost){
+		myDiv.innerHTML= myDiv.innerHTML + ". <a target=\"_blank\" href="+myHost+"/home"+">Go to Login...</a>";
+	}
+		
+}
+</script>
+
+<section id="dataset-resources" class="resources">
+  <div class="sectiontitle">{{ _('Data and Resources') }}</div>
+  {% set user = c.user %}
+  {# Added by Francesco Mangiacrapa #10389 #}
+  {% if not user %}
+  <div id="resource-private" class="required-access">To access the resources you must log in</div>
+  {% endif %}
+ {# end #}
+  {% block resource_list %}
+    {% if resources %}
+      <ul class="{% block resource_list_class %}resource-list{% endblock %}">
+        {% block resource_list_inner %}
+          {% for resource in resources %}
+            {% snippet 'package/snippets/resource_item.html', pkg=pkg, res=resource %}
+          {% endfor %}
+        {% endblock %}
+      </ul>
+    {% else %}
+      {% if h.check_access('resource_create', {'package_id': pkg['id']}) %}
+          {% trans url=h.url_for(controller='dataset', action='new_resource', id=pkg.name) %}
+            <p class="empty">This dataset has no data, <a href="{{ url }}">why not add some?</a></p>
+          {% endtrans %}
+      {% else %}
+          <p class="empty">{{ _('This dataset has no data') }}</p>
+      {% endif %}
+    {% endif %}
+    {% endblock %}
+</section>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/page.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/page.html
new file mode 100644
index 0000000..ed706cc
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/page.html
@@ -0,0 +1,134 @@
+{% extends "base.html" %}
+
+{%- block page -%}
+
+  {% block skip %}
+    <div class="visually-hidden-focusable"><a href="#content">{{ _('Skip to main content') }}</a></div>
+  {% endblock %}
+
+  {#
+  Override the header on a page by page basis by extending this block. If
+  making sitewide header changes it is preferable to override the header.html
+  file.
+  #}
+  {%- block header %}
+    {% include "header.html" %}
+  {% endblock -%}
+
+  {# The content block allows you to replace the content of the page if needed #}
+  {%- block content %}
+    {% block maintag %}<div class="main">{% endblock %}
+      <div id="content" class="container">
+        {% block main_content %}
+          {% block flash %}
+            <div class="flash-messages">
+              {% block flash_inner %}
+                {% for category, message in h.get_flashed_messages(with_categories=true) %}
+                  <div class="alert alert-dismissible fade show {{ category }}">
+                    {{ h.literal(message) }}
+                  </div>
+                {% endfor %}
+              {% endblock %}
+            </div>
+          {% endblock %}
+
+          {% block toolbar %}
+            <div class="toolbar" role="navigation" aria-label="{{ _('Breadcrumb') }}">
+              {% block breadcrumb %}
+                {% if self.breadcrumb_content() | trim %}
+                  <ol class="breadcrumb">
+                    {% snippet 'snippets/home_breadcrumb_item.html' %}
+                    {% block breadcrumb_content %}{% endblock %}
+                  </ol>
+                {% endif %}
+              {% endblock %}
+            </div>
+          {% endblock %}
+
+          <div class="row wrapper{% block wrapper_class %}{% endblock %}{% if self.secondary()|trim == '' or c.action=='resource_read' %} no-nav{% endif %}">
+            {#
+            The pre_primary block can be used to add content to before the
+            rendering of the main content columns of the page.
+            #}
+            {% block pre_primary %}
+            {% endblock %}
+
+            {% block secondary %}
+              <aside class="secondary col-md-3">
+                {#
+                The secondary_content block can be used to add content to the
+                sidebar of the page. This is the main block that is likely to be
+                used within a template.
+
+                Example:
+
+                  {% block secondary_content %}
+                    <h2>A sidebar item</h2>
+                    <p>Some content for the item</p>
+                  {% endblock %}
+                #}
+                {% block secondary_content %}{% endblock %}
+              </aside>
+            {% endblock %}
+
+            {% block primary %}
+              <div class="primary col-md-9 col-xs-12" role="main">
+                {#
+                The primary_content block can be used to add content to the page.
+                This is the main block that is likely to be used within a template.
+
+                Example:
+
+                  {% block primary_content %}
+                    <h1>My page content</h1>
+                    <p>Some content for the page</p>
+                  {% endblock %}
+                #}
+                {% block primary_content %}
+                  <article class="module">
+                    {% block page_header %}
+                      <header class="module-content page-header">
+                        {% if self.content_action() | trim %}
+                          <div class="content_action">
+                            {% block content_action %}{% endblock %}
+                          </div>
+                        {% endif %}
+                        <ul class="nav nav-tabs">
+                          {% block content_primary_nav %}{% endblock %}
+                        </ul>
+                      </header>
+                    {% endblock %}
+                    <div class="module-content">
+                      {% if self.page_primary_action() | trim %}
+                        <div class="page_primary_action">
+                          {% block page_primary_action %}{% endblock %}
+                        </div>
+                      {% endif %}
+                      {% block primary_content_inner %}
+                      {% endblock %}
+                    </div>
+                  </article>
+                {% endblock %}
+              </div>
+            {% endblock %}
+          </div>
+        {% endblock %}
+      </div>
+    </div>
+  {% endblock -%}
+
+  {#
+  Override the footer on a page by page basis by extending this block. If
+  making sitewide header changes it is preferable to override the footer.html-u
+  file.
+  #}
+  {%- block footer %}
+    {% include "footer.html" %}
+  {% endblock -%}
+{%- endblock -%}
+
+{%- block scripts %}
+  {% asset 'base/main' %}
+  {% asset 'base/ckan' %}
+  {{ super() }}
+{% endblock -%}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/custom_form_fields.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/custom_form_fields.html
new file mode 100644
index 0000000..f0af62b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/custom_form_fields.html
@@ -0,0 +1,51 @@
+{#
+Adds a block of custom form fields.
+
+extras - The fields to add.
+errors - A dict of errors for the fields.
+limit  - The total number of fields that should be output.
+Example:
+
+  {% snippet 'snippets/custom_form_fields.html', extras=data.extras, errors=errors, limit=3 %}
+
+#}
+{% import "macros/form.html" as form %}
+<!-- reading placeholder used by D4Science Content Moderator System, see #22854 -->
+{% set d4science_cms_obj_placeholders = h.d4science_get_content_moderator_system_placeholder() %}
+{% set d4science_system_type_obj = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+<div data-module="custom-fields">
+  <!-- skipping system_type and D4Science CMS fields into form, see #22854 -->
+  {% for extra in extras %}
+    {% set is_system_field = extra.key.startswith(d4science_cms_obj_placeholders.prefix) or extra.key.startswith(d4science_system_type_obj.id) %}
+    {% set apply_classes = [] %}
+    {% if is_system_field %}
+        {% set apply_classes = ['disabled-div'] %}
+    {% endif %}
+    {% set prefix = 'extras__%d__' % loop.index0 %}
+    {{ form.custom(
+      names=(prefix ~ 'key', prefix ~ 'value', prefix ~ 'deleted'),
+      id='field-extras-%d' % loop.index,
+      label=_('Custom Field'),
+      values=(extra.key, extra.value, extra.deleted),
+      classes=apply_classes,
+      error=errors[prefix ~ 'key'] or errors[prefix ~ 'value']
+    ) }}
+  {% endfor %}
+
+  {# Add a max of 3 empty columns #}
+  {% set total_extras = extras|count %}
+  {% set empty_extras = (limit or 3) - total_extras %}
+  {% if empty_extras <= 0 %}{% set empty_extras = 1 %}{% endif %}
+
+  {% for extra in range(total_extras, total_extras + empty_extras) %}
+    {% set index = loop.index0 + (extras|count) %}
+    {% set prefix = 'extras__%d__' % index %}
+    {{ form.custom(
+      names=(prefix ~ 'key', prefix ~ 'value', prefix ~ 'deleted'),
+      id='field-extras-%d' % index,
+      label=_('Custom Field'),
+      values=(extra.key, extra.value, extra.deleted),
+      error=errors[prefix ~ 'key'] or errors[prefix ~ 'value']
+    ) }}
+  {% endfor %}
+</div>
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/facet_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/facet_list.html
new file mode 100644
index 0000000..e985503
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/facet_list.html
@@ -0,0 +1,99 @@
+{#
+Construct a facet module populated with links to filtered results.
+
+name
+  The field name identifying the facet field, eg. "tags"
+
+title
+  The title of the facet, eg. "Tags", or "Tag Cloud"
+
+label_function
+  Renders the human-readable label for each facet value.
+  If defined, this should be a callable that accepts a `facet_item`.
+  eg. lambda facet_item: facet_item.display_name.upper()
+  By default it displays the facet item's display name, which should
+  usually be good enough
+
+if_empty
+  A string, which if defined, and the list of possible facet items is empty,
+  is displayed in lieu of an empty list.
+
+count_label
+  A callable which accepts an integer, and returns a string.  This controls
+  how a facet-item's count is displayed.
+
+extras
+  Extra info passed into the add/remove params to make the url
+
+alternative_url
+  URL to use when building the necessary URLs, instead of the default
+  ones returned by url_for. Useful eg for dataset types.
+
+hide_empty
+  Do not show facet if there are none, Default: false.
+
+within_tertiary
+  Boolean for when a facet list should appear in the the right column of the
+  page and not the left column.
+
+#}
+{% block facet_list %}
+  {% set hide_empty = hide_empty or false %}
+  {% with items = items or h.get_facet_items_dict(name) %}
+    {% if items or not hide_empty %}
+      {% if within_tertiary %}
+        {% set nav_class = 'nav nav-pills nav-stacked' %}
+        {% set nav_item_class = ' ' %}
+        {% set wrapper_class = 'nav-facet nav-facet-tertiary' %}
+      {% endif %}
+      {% block facet_list_item %}
+        <section class="{{ wrapper_class or 'module module-narrow module-shallow' }}">
+          {% block facet_list_heading %}
+            <h2 class="module-heading">
+              <i class="icon-medium icon-filter"></i>
+              {% set title = title or h.get_facet_title(name) %}
+              {{ title }}
+            </h2>
+          {% endblock %}
+          {% block facet_list_items %}
+            {% with items = items or h.get_facet_items_dict(name) %}
+            {% if items %}
+              <nav>
+                <ul class="{{ nav_class or 'unstyled nav nav-simple nav-facet' }}">
+                  {% for item in items %}
+             
+                    {% set href = h.remove_url_param(name, item.name, extras=extras, alternative_url=alternative_url) if item.active else h.add_url_param(new_params={name: item.name}, extras=extras, alternative_url=alternative_url) %}
+                    {% set label = label_function(item) if label_function else item.display_name %}
+                    {# Updated by Francesco Mangiacrapa, see #11747 #}
+                    {# 
+                    {% set label_truncated = h.truncate(label, 22) if not label_function else label %}
+                    #}
+                    {% set count = count_label(item['count']) if count_label else ('(%d)' % item['count']) %}
+                      <li class="{{ nav_item_class or 'nav-item' }}{% if item.active %} active{% endif %}">
+                        <a href="{{ href }}" title="{{ label if label != label_truncated else '' }}">
+                          <span>{{ label }} </span><span style="font-size: 12px">{{ count }}</span>
+                        </a>
+                      </li>
+                  {% endfor %}
+                </ul>
+              </nav>
+
+              <p class="module-footer">
+                {% if h.get_param_int('_%s_limit' % name) %}
+                  {% if h.has_more_facets(name) %}
+                    <a href="{{ h.remove_url_param('_%s_limit' % name, replace=0, extras=extras, alternative_url=alternative_url) }}" class="read-more">{{ _('Show More {facet_type}').format(facet_type=title) }}</a>
+                  {% endif %}
+                {% else %}
+                  <a href="{{ h.remove_url_param('_%s_limit' % name, extras=extras, alternative_url=alternative_url) }}" class="read-more">{{ _('Show Only Popular {facet_type}').format(facet_type=title) }}</a>
+                {% endif %}
+              </p>
+            {% else %}
+              <p class="module-content empty">{{ _('There are no {facet_type} that match this search').format(facet_type=title) }}</p>
+            {% endif %}
+            {% endwith %}
+          {% endblock %}
+        </section>
+      {% endblock %}
+    {% endif %}
+  {% endwith %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/package_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/package_item.html
new file mode 100644
index 0000000..ca2d067
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/package_item.html
@@ -0,0 +1,133 @@
+{#
+Displays a single of dataset.
+
+package        - A package to display.
+item_class     - The class name to use on the list item.
+hide_resources - If true hides the resources (default: false).
+banner         - If true displays a popular banner (default: false).
+truncate       - The length to trucate the description to (default: 180)
+truncate_title - The length to truncate the title to (default: 80).
+
+Example:
+
+  {% snippet 'snippets/package_item.html', package=c.datasets[0] %}
+
+#}
+
+{% set truncate = truncate or 180 %}
+{% set truncate_title = truncate_title or 80 %}
+{% set title = package.title or package.name %}
+{% set notes = h.markdown_extract(package.notes, extract_length=truncate) %}
+{% set acquired =  h.is_dataset_acquired(package) %}
+{% set owner = h.is_owner(package) %}
+
+{#
+{% resource 'd4science_theme/custom.css' %}
+CHANGED BY FRANCESCO.MANGIACRAPA
+#}
+
+{% block package_item_content %}
+
+{% if package.private and not h.can_read(package) %}
+<li class="{{ item_class or "dataset-item" }}">
+    <div class="dataset-content">
+      <h3 class="dataset-heading">
+        {% if package.private and not h.can_read(package) %}
+          <span class="dataset-private label label-inverse">
+            <i class="icon-lock"></i>
+            {{ _('Private') }}
+          </span>
+        {% endif %}
+        {% if acquired and not owner %}
+          <span class="dataset-private label label-acquired">
+            <i class="icon-shopping-cart"></i>
+            {{ _('Acquired') }}
+          </span>
+        {% endif %}
+       
+        <!-- Customizations Acquire Button -->
+        {% if package.private and not h.can_read(package) %}
+            {# {{ _(h.truncate(title, truncate_title)) }} #} <!-- THIS IS PACKAGE TITLE -->
+            Dataset
+             <div class="divider"/>
+            {{ h.acquire_button(package) }}
+        {% else %}
+            {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='dataset', action='read', id=package.name)) }}
+        {% endif %}
+        <!-- End of customizations Acquire Button -->
+        
+        {% if package.get('state', '').startswith('draft') %}
+          <span class="label label-info">{{ _('Draft') }}</span>
+        {% elif package.get('state', '').startswith('deleted') %}
+          <span class="label label-important">{{ _('Deleted') }}</span>
+        {% endif %}
+        {{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }}
+      </h3>
+      {% if banner %}
+        <span class="banner">{{ _('Popular') }}</span>
+      {% endif %}
+      {% if notes %}
+       <!-- <div>{{ notes|urlize }}</div>--><!-- THIS IS PACKAGE DESCRIPTION -->
+      {% endif %}
+    </div>
+</li>
+{% else %}
+<li class="{{ item_class or "dataset-item" }}">
+    <div class="dataset-content">
+      <h3 class="dataset-heading">
+        {% if package.private and not h.can_read(package) %}
+          <span class="dataset-private label label-inverse">
+            <i class="icon-lock"></i>
+            {{ _('Private') }}
+          </span>
+        {% endif %}
+        {% if acquired and not owner %}
+          <span class="dataset-private label label-acquired">
+            <i class="icon-shopping-cart"></i>
+            {{ _('Acquired') }}
+          </span>
+        {% endif %}
+        {% if owner %}
+          <span class="dataset-private label label-owner">
+            <i class="icon-user"></i>
+            {{ _('Owner') }}
+          </span>
+        {% endif %}
+        
+        <!-- Customizations Acquire Button -->
+        {% if package.private and not h.can_read(package) %}
+            {{ _(h.truncate(title, truncate_title)) }}
+             <div class="divider"/>
+            {{ h.acquire_button(package) }}
+        {% else %}
+            {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='dataset', action='read', id=package.name)) }}
+        {% endif %}
+        <!-- End of customizations Acquire Button -->
+        
+        {% if package.get('state', '').startswith('draft') %}
+          <span class="label label-info">{{ _('Draft') }}</span>
+        {% elif package.get('state', '').startswith('deleted') %}
+          <span class="label label-important">{{ _('Deleted') }}</span>
+        {% endif %}
+        {{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }}
+      </h3>
+      {% if banner %}
+        <span class="banner">{{ _('Popular') }}</span>
+      {% endif %}
+      {% if notes %}
+        <div>{{ notes|urlize }}</div>
+      {% endif %}
+    </div>
+    {% if package.resources and not hide_resources %}
+      <ul class="dataset-resources unstyled">
+        {% for resource in h.dict_list_reduce(package.resources, 'format') %}
+          <li>
+            <a href="{{ h.url_for(controller='dataset', action='read', id=package.name) }}" class="label" data-format="{{ resource.lower() }}">{{ resource }}</a>
+          </li>
+        {% endfor %}
+      </ul>
+    {% endif %}
+  
+</li>
+{% endif %}
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/tag_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/tag_list.html
new file mode 100644
index 0000000..c14f6d1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/snippets/tag_list.html
@@ -0,0 +1,18 @@
+{#
+render a list of tags linking to the dataset search page
+tags: list of tags
+
+Removed truncate function by Francesco Mangiacrapa
+   {{ h.truncate(tag.display_name, 22) }}
+   
+#}
+{% set _class = _class or 'tag-list' %}
+{% block tag_list %}
+  <ul class="{{ _class }}">
+    {% for tag in tags %}
+      <li>
+        <a class="{% block tag_list_item_class %}tag{% endblock %}" href="{% url_for controller='dataset', action='search', tags=tag.name %}">{{ tag.display_name }}</a>
+      </li>
+    {% endfor %}
+  </ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/index.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/index.html
new file mode 100644
index 0000000..a1e1d72
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/index.html
@@ -0,0 +1,41 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Types') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Types'), controller='d4s', action='index' %}</li>
+{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% set metadatatype = h.d4science_theme_get_systemtype_field_dict_from_session() %}
+{% set metadatatypes = h.get_facet_items_dict(metadatatype['name']) %}
+{% set sortby = h.get_request_param('sort') %}
+{% if sortby %}
+{% set list = sortby.split('_') %}
+{% else %}
+{% set list = ['name', 'asc'] %}
+{% endif %}
+{% set metadatatypes = h.d4science_get_ordered_dictionary(metadatatypes, list[0], list[1]) %}
+
+
+{% block primary_content_inner %}
+
+<h1 class="hide-heading">{{ _('Types') }}</h1>
+{% block type_form %}
+  {% snippet "type/snippets/type_form.html", metadatatypes=metadatatypes, sorting_selected=sortby %}
+{% endblock %}
+
+{% block type_list %}
+   {% if metadatatypes|length >= 1 %}
+      {% snippet "type/snippets/type_list.html", metadatatypes=metadatatypes %}
+    {% else %}
+      <p class="empty">There are no {{ _('Types') }}</p>
+ {% endif %}
+{% endblock %}
+
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "type/snippets/helper.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/helper.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/helper.html
new file mode 100644
index 0000000..20e827e
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/helper.html
@@ -0,0 +1,14 @@
+<div class="module module-narrow module-shallow">
+  <h2 class="module-heading">
+    <i class="icon-info-sign"></i>
+    {{ _('What are Types?') }}
+  </h2>
+  <div class="module-content">
+    <p>
+      {% trans %}
+      Types are used to filter catalogue items by their typology, e.g. datasets, methods, services.
+      Every typology is characterised by a specific set of attributes, controlled vocabularies and formats carefully describing the specific class of items.
+      {% endtrans %}
+    </p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_form.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_form.html
new file mode 100644
index 0000000..00f5d25
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_form.html
@@ -0,0 +1,52 @@
+{% import 'macros/form.html' as form %}
+
+{% set sorting = [(_('Name Ascending'), 'name_asc'), (_('Name Descending'), 'name_desc'), (_('Number Of Ascending'), 'count_asc'), (_('Number Of Descending'), 'count_desc')] %}
+{% set search_class = search_class if search_class else 'search-giant' %}
+{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
+{% set form_id = form_id if form_id else false %}
+
+<form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
+
+  {% block search_sortby %}
+    {% if sorting %}
+      <div class="form-select control-group control-order-by">
+        <label for="field-order-by">{{ _('Order by') }}</label>
+        <select id="field-order-by" name="sort">
+          {% for label, value in sorting %}
+            {% if label and value %}
+              <option value="{{ value }}"{% if sorting_selected == value %} selected="selected"{% endif %}>{{ label }}</option>
+            {% endif %}
+          {% endfor %}
+        </select>
+        {% block search_sortby_button %}
+        <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
+        {% endblock %}
+      </div>
+    {% endif %}
+  {% endblock %}
+
+  {% block search_title %}
+  <h2>
+    {{metadatatypes|length}}
+    {% if metadatatypes|length > 1 %}
+     {{ _('Types') }}
+    {% else %}
+     {{ _('Type') }}
+    {% endif %}
+    found
+  </h2>
+  {% endblock %}
+
+</form>
+
+{% if show_empty and count == 0 and not error %}
+  {% trans %}
+    <p class="extra">Please try another search.</p>
+  {% endtrans %}
+{% endif %}
+
+{% if error %}
+  {% trans %}
+    <p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p>
+  {% endtrans %}
+{% endif %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_item.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_item.html
new file mode 100644
index 0000000..465f791
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_item.html
@@ -0,0 +1,39 @@
+{#
+Renders a media item for a type. This should be used in a list.
+
+type - A type dict.
+
+Example:
+<style>
+.center-cropped {
+  width: 100px;
+  height: 100px;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+</style>
+
+    <ul class="media-grid">
+      {% for type in types %}
+        {% snippet "type/snippets/type_item.html", type=type %}
+      {% endfor %}
+    </ul>
+#}
+{% block item %}
+
+<li class="media-item">
+  {% block item_inner %}
+    {% block image %}
+    {% set img_url = h.d4science_get_url_to_icon_for_ckan_entity(type.name, entity_type='type') %}
+      <div class="d4s-center-cropped"><img src="{{ img_url }}" alt="{{ type.name }}" title="{{ _('{name}').format(name=type.display_name) }} type"></div>
+    {% endblock %}
+    {% block title %}
+      <!--<h3 class="media-heading">{{ type.display_name }}</h3>-->
+    {% endblock %}
+    {% block link %}
+    <h3> <a class="media-heading" href="{% url_for controller='dataset', action='search', systemtype=type.name %}" title="{{ _('View {name}').format(name=type.display_name) }} {{ _('datasets')}}">{{ h.truncate(type.display_name, 26) }}</a>
+    </a>({{type.count}})</h3>
+    {% endblock %}
+  {% endblock %}
+</li>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_list.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_list.html
new file mode 100644
index 0000000..2b5845c
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/type/snippets/type_list.html
@@ -0,0 +1,19 @@
+{#
+Display a grid of type items.
+
+groups - A list of types.
+
+Example:
+
+    {% snippet "type/snippets/type_item.htm" %}
+
+#}
+{% block type_list %}
+<ul class="media-grid" data-module="media-grid">
+	{% block type_list_inner %}
+  {% for type in metadatatypes %}
+    {% snippet "type/snippets/type_item.html", type=type, position=loop.index %}
+  {% endfor %}
+  {% endblock %}
+</ul>
+{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard.html
new file mode 100644
index 0000000..7a8ecbd
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard.html
@@ -0,0 +1,54 @@
+{% ckan_extends %}
+
+{% set user = c.userobj %}
+
+{% block breadcrumb_content %}
+  <li class="active"><a href="{{ h.url_for(controller='user', action='dashboard') }}">{{ _('Dashboard') }}</a></li>
+{% endblock %}
+
+{% block secondary %}{% endblock %}
+
+{% block primary %}
+  <article class="module">
+    {% block page_header %}
+    {# CODE ADDED BY Francesco Mangiacrapa #}
+    {% set hide = h.get_cookie_value('ckan_hide_header') %}
+    {% if hide=='true' %}
+    {# NOT SHOW 'Edit settings' #}
+    {% else %}
+      <header class="module-content page-header hug">
+         <div class="content_action">
+         {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %}
+         </div>
+        <ul class="nav nav-tabs">
+          {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
+          {{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }}
+          {{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }}
+          {{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }}
+        </ul>
+      </header>
+    {% endif %}
+    {% endblock %}
+    <div class="module-content">
+      {% if self.page_primary_action() | trim %}
+        <div class="page_primary_action">
+          {% block page_primary_action %}{% endblock %}
+        </div>
+      {% endif %}
+      {% block primary_content_inner %}
+        <div data-module="dashboard">
+          {% snippet 'user/snippets/followee_dropdown.html', context=c.dashboard_activity_stream_context, followees=c.followee_list %}
+          <h2 class="page-heading">
+            {% block page_heading %}
+              {{ _('News feed') }}
+            {% endblock %}
+            <small>{{ _("Activity from items that I'm following") }}</small>
+          </h2>
+          {% block activity_stream %}
+            {{ c.dashboard_activity_stream }}
+          {% endblock %}
+        </div>
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_datasets.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_datasets.html
new file mode 100644
index 0000000..f2810e5
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_datasets.html
@@ -0,0 +1,65 @@
+{#{% extends "user/dashboard.html" %}#}
+{# CREATED BY FRANCESCO MANGIACRAPA #}
+
+{% ckan_extends %}
+{% set user = c.userobj %}
+
+{% block breadcrumb_content %}
+{% endblock %}
+
+{% block primary %}
+  <article class="module">
+    {% block page_header %}
+    {# CODE ADDED BY Francesco Mangiacrapa #}
+    {% set hide = h.get_cookie_value('ckan_hide_header') %}
+    {% if hide=='true' %}
+    {# NOT SHOW 'Edit settings' #}
+    {% else %}
+      <header class="module-content page-header hug">
+         <div class="content_action">
+         {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %}
+         </div>
+        <ul class="nav nav-tabs">
+          {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
+          {{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }}
+          {{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }}
+          {{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }}
+        </ul>
+      </header>
+    {% endif %}
+    {% endblock %}
+    <div class="module-content">
+      {% if self.page_primary_action() | trim %}
+        <div class="page_primary_action">
+          {% block page_primary_action %}
+          {% set hide = h.get_cookie_value('ckan_hide_header') %}
+          {% if hide=='true' %}
+          {# NOT SHOW 'Edit settings' #}
+          {% else %}
+          {% if h.check_access('package_create') %}
+          {% link_for _('Add Dataset'), controller='dataset', action='new', class_="btn btn-primary", icon="plus-sign-alt" %}
+          {% endif %}
+          {% endif %}
+          {% endblock %}
+        </div>
+      {% endif %}
+      {% block primary_content_inner %}
+      <h2 class="hide-heading">{{ _('My Datasets') }}</h2>
+      {% if c.user_dict.datasets %}
+      {% snippet 'snippets/package_list.html', packages=c.user_dict.datasets %}
+      {% else %}
+      <p class="empty">
+      {{ _('You haven\'t created any datasets.') }}
+      {% if h.check_access('package_create') %}
+        {#{% link_for _('Create one now?'), controller='dataset', action='new' %}#} 
+      {% endif %}
+      </p>
+    {% endif %}
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block dashboard_activity_stream_context %}{% endblock %}
+
+{% block secondary %}{% endblock %}
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_groups.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_groups.html
new file mode 100644
index 0000000..ecbd041
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_groups.html
@@ -0,0 +1,65 @@
+{#{% extends "user/dashboard.html" %}#}
+
+{#{% extends "user/dashboard.html" %}#}
+{# CREATED BY FRANCESCO MANGIACRAPA #}
+
+{% ckan_extends %}
+{% set user = c.userobj %}
+
+{% block breadcrumb_content %}
+{% endblock %}
+
+{% block primary %}
+  <article class="module">
+    {% block page_header %}
+    {# CODE ADDED BY Francesco Mangiacrapa #}
+    {% set hide = h.get_cookie_value('ckan_hide_header') %}
+    {% if hide=='true' %}
+    {# NOT SHOW 'Edit settings' #}
+    {% else %}
+      <header class="module-content page-header hug">
+         <div class="content_action">
+         {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %}
+         </div>
+        <ul class="nav nav-tabs">
+          {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
+          {{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }}
+          {{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }}
+          {{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }}
+        </ul>
+      </header>
+    {% endif %}
+    {% endblock %}
+    <div class="module-content">
+      {% if self.page_primary_action() | trim %}
+        <div class="page_primary_action">
+         {% block page_primary_action %}
+  {% if h.check_access('group_create') %}
+    {% link_for _('Add Group'), controller='group', action='new', class_="btn btn-primary", icon="plus-sign-alt" %}
+  {% endif %}
+{% endblock %}
+        </div>
+      {% endif %}
+     {% block primary_content_inner %}
+     <h2 class="hide-heading">{{ _('My Groups') }}</h2>
+     {% set groups = h.groups_available(am_member=True) %}
+     {% if groups %}
+     <div class="wide">
+      {% snippet "group/snippets/group_list_simple.html", groups=groups %}
+    </div>
+    {% else %}
+    <p class="empty">
+      {{ _('You are not a member of any groups.') }}
+      {% if h.check_access('group_create') %}
+        {% link_for _('Create one now?'), controller='group', action='new' %}
+      {% endif %}
+    </p>
+  {% endif %}
+{% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block dashboard_activity_stream_context %}{% endblock %}
+
+{% block secondary %}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_organizations.html b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_organizations.html
new file mode 100644
index 0000000..1d2f8d7
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/templates2.6/user/dashboard_organizations.html
@@ -0,0 +1,66 @@
+{#{% extends "user/dashboard.html" %}#}
+
+{#{% extends "user/dashboard.html" %}#}
+{# CREATED BY FRANCESCO MANGIACRAPA #}
+
+{% ckan_extends %}
+{% set user = c.userobj %}
+
+{% block breadcrumb_content %}
+{% endblock %}
+
+{% block primary %}
+  <article class="module">
+    {% block page_header %}
+    {# CODE ADDED BY Francesco Mangiacrapa #}
+    {% set hide = h.get_cookie_value('ckan_hide_header') %}
+    {% if hide=='true' %}
+    {# NOT SHOW 'Edit settings' #}
+    {% else %}
+      <header class="module-content page-header hug">
+         <div class="content_action">
+         {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %}
+         </div>
+        <ul class="nav nav-tabs">
+          {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
+          {{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }}
+          {{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }}
+          {{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }}
+        </ul>
+      </header>
+    {% endif %}
+    {% endblock %}
+    <div class="module-content">
+      {% if self.page_primary_action() | trim %}
+        <div class="page_primary_action">
+{% block page_primary_action %}
+  {% if h.check_access('organization_create') %}
+    {% link_for _('Add Organization'), controller='organization', action='new', class_="btn btn-primary", icon="plus-sign-alt" %}
+  {% endif %}
+{% endblock %}
+        </div>
+      {% endif %}
+
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ _('My Organizations') }}</h2>
+  {% set organizations = h.organizations_available() %}
+  {% if organizations %}
+    <div class="wide">
+      {% snippet "organization/snippets/organization_list.html", organizations=organizations %}
+    </div>
+  {% else %}
+    <p class="empty">
+      {{ _('You are not a member of any organizations.') }}
+      {% if h.check_access('organization_create') %}
+        {% link_for _('Create one now?'), controller='organization', action='new' %}
+      {% endif %}
+    </p>
+  {% endif %}
+{% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block dashboard_activity_stream_context %}{% endblock %}
+
+{% block secondary %}{% endblock %}
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/tests/__init__.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/tests/test_plugin.py b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/tests/test_plugin.py
new file mode 100644
index 0000000..2a75bc2
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/ckanext/d4science_theme/tests/test_plugin.py
@@ -0,0 +1,5 @@
+"""Tests for plugin.py."""
+import ckanext.d4science_theme.plugin as plugin
+
+def test_plugin():
+    pass
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/requirements.txt b/compose/2.10/src/ckanext-d4science_theme/requirements.txt
new file mode 100644
index 0000000..55f2a9b
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/requirements.txt
@@ -0,0 +1,3 @@
+webhelpers2
+xmltodict
+pyqrcode
diff --git a/compose/2.10/src/ckanext-d4science_theme/setup.cfg b/compose/2.10/src/ckanext-d4science_theme/setup.cfg
new file mode 100644
index 0000000..7964587
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/setup.cfg
@@ -0,0 +1,44 @@
+# [extract_messages]
+# keywords = translate isPlural
+# add_comments = TRANSLATORS:
+# output_file = i18n/ckanext-d4science_theme.pot
+# width = 80
+
+# [init_catalog]
+# domain = ckanext-d4science_theme
+# input_file = i18n/ckanext-d4science_theme.pot
+# output_dir = i18n
+
+# [update_catalog]
+# domain = ckanext-d4science_theme
+# input_file = i18n/ckanext-d4science_theme.pot
+# output_dir = i18n
+# previous = true
+
+# [compile_catalog]
+# domain = ckanext-d4science_theme
+# directory = i18n
+# statistics = true
+[compile_catalog]
+domain = ckanext-d4science_theme
+directory = ../ckanext-d4science/ckanext/d4science/i18n
+statistics = true
+
+[extract_messages]
+add_comments = TRANSLATORS:
+output_file = ckan/i18n/ckan.pot
+width = 80
+
+[init_catalog]
+domain = ckan
+input_file = ckan/i18n/ckan.pot
+output_dir = ckan/i18n
+
+[update_catalog]
+domain = ckan
+input_file = ckan/i18n/ckan.pot
+output_dir = ckan/i18n
+previous = true
+
+[upload_sphinx]
+upload-dir = build/sphinx/html
\ No newline at end of file
diff --git a/compose/2.10/src/ckanext-d4science_theme/setup.py b/compose/2.10/src/ckanext-d4science_theme/setup.py
new file mode 100644
index 0000000..d3a3ba1
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/setup.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+from setuptools import setup, find_packages  # Always prefer setuptools over distutils
+from codecs import open  # To use a consistent encoding
+from os import path
+
+here = path.abspath(path.dirname(__file__))
+
+# Get the long description from the relevant file
+with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
+setup(
+    name='''ckanext-d4science_theme''',
+
+    # Versions should comply with PEP440.  For a discussion on single-sourcing
+    # the version across setup.py and the project code, see
+    # http://packaging.python.org/en/latest/tutorial.html#version
+    version='0.0.1',
+
+    description='''"D4Science Data Catalog extension for CKAN",
+    D4Science offers services for seamless access and analysis to a wide spectrum of data including biological and ecological data, 
+        geospatial data, statistical data and semi-structured data from multiple authoritative data providers and information systems.
+        These services can be exploited both via web based graphical user interfaces and web based protocols for programmatic access, 
+        e.g. OAI-PMH, CSW, WFS, SDMX. This offering nicely complements specific and community-specific applications.''',
+    long_description=long_description,
+
+    # The project's main homepage.
+    url='https://github.com//ckanext-d4science_theme',
+
+    # Author details
+    author='''Francesco Mangiacrapa''',
+    author_email='''francesco.mangiacrapa@isti.cnr.it''',
+
+    # Choose your license
+    license='AGPL',
+
+    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
+    classifiers=[
+        # How mature is this project? Common values are
+        # 3 - Alpha
+        # 4 - Beta
+        # 5 - Production/Stable
+        'Development Status :: 4 - Beta',
+
+        # Pick your license as you wish (should match "license" above)
+        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+    ],
+
+
+    # What does your project relate to?
+    keywords='''CKAN "D4Science Data Catalogue" gCube''',
+
+    # You can just specify the packages manually here if your project is
+    # simple. Or you can use find_packages().
+    packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
+
+    # List run-time dependencies here.  These will be installed by pip when your
+    # project is installed. For an analysis of "install_requires" vs pip's
+    # requirements files see:
+    # https://packaging.python.org/en/latest/technical.html#install-requires-vs-requirements-files
+    install_requires=[],
+
+    # If there are data files included in your packages that need to be
+    # installed, specify them here.  If using Python 2.6 or less, then these
+    # have to be included in MANIFEST.in as well.
+    include_package_data=True,
+    package_data={
+    },
+
+    # Although 'package_data' is the preferred approach, in some case you may
+    # need to place data files outside of your packages.
+    # see http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files
+    # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
+    data_files=[],
+
+    # To provide executable scripts, use entry points in preference to the
+    # "scripts" keyword. Entry points provide cross-platform support and allow
+    # pip to create the appropriate form of executable for the target platform.
+    entry_points='''
+        [ckan.plugins]
+        d4science_theme=ckanext.d4science_theme.plugin:D4Science_ThemePlugin
+	[babel.extractors]
+	ckan = ckan.lib.extract:extract_ckan
+    ''',
+
+    # If you are changing from the default layout of your extension, you may
+    # have to change the message extractors, you can read more about babel
+    # message extraction at
+    # http://babel.pocoo.org/docs/messages/#extraction-method-mapping-and-configuration
+    message_extractors={
+        'ckanext': [
+            ('**.py', 'python', None),
+            ('**.js', 'javascript', None),
+            ('**/templates/**.html', 'ckan', None),
+        ],
+    }
+)
diff --git a/compose/2.10/src/ckanext-d4science_theme/test.ini b/compose/2.10/src/ckanext-d4science_theme/test.ini
new file mode 100644
index 0000000..74c10cf
--- /dev/null
+++ b/compose/2.10/src/ckanext-d4science_theme/test.ini
@@ -0,0 +1,49 @@
+[DEFAULT]
+debug = false
+smtp_server = localhost
+error_email_from = paste@localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = config:../../src/ckan/test-core.ini
+
+# Insert any custom config settings to be used when running your extension's
+# tests here.
+
+
+# Logging configuration
+[loggers]
+keys = root, ckan, sqlalchemy
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_ckan]
+qualname = ckan
+handlers =
+level = INFO
+
+[logger_sqlalchemy]
+handlers =
+qualname = sqlalchemy.engine
+level = WARN
+
+[handler_console]
+class = StreamHandler
+args = (sys.stdout,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
diff --git a/images/ckan/2.10/Dockerfile b/images/ckan/2.10/Dockerfile
new file mode 100644
index 0000000..3b78ed6
--- /dev/null
+++ b/images/ckan/2.10/Dockerfile
@@ -0,0 +1,190 @@
+##################
+### Build CKAN ###
+##################
+FROM alpine:3.17.2 as ckanbuild
+
+# Used by Github Actions to tag the image with
+ENV IMAGE_TAG=2.10.4
+
+# Set CKAN version to build
+ENV GIT_URL=https://github.com/ckan/ckan.git
+ENV GIT_BRANCH=ckan-2.10.4
+
+# Set src dirs
+ENV SRC_DIR=/srv/app/src
+ENV PIP_SRC=${SRC_DIR}
+
+WORKDIR ${SRC_DIR}
+
+# Packages to build CKAN requirements and plugins
+RUN apk add --no-cache \
+        python3 \
+        python3-dev \
+        git \
+        curl \
+        postgresql-dev \
+        linux-headers \
+        gcc \
+        make \
+        g++ \
+        autoconf \
+        automake \
+        libtool \
+        patch \
+        musl-dev \
+        pcre-dev \
+        pcre \
+        libffi-dev \
+        libxml2-dev \
+        libxslt-dev
+
+# Create the src directory
+RUN mkdir -p ${SRC_DIR}
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python ${SRC_DIR}/get-pip.py
+
+# Downgrade setuptools so that CKAN requirements can be built
+RUN pip install setuptools==44.1.0
+
+# Fetch and build CKAN and requirements
+RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
+# Copy patches and apply patches script
+COPY ./patches ${SRC_DIR}/patches
+COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh
+# Apply patches
+# RUN ${SRC_DIR}/apply_ckan_patches.sh
+RUN rm -rf /srv/app/src/ckan/.git
+RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt
+RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2
+
+
+###########################
+### Default-Extensions ####
+###########################
+FROM alpine:3.17.2 as extbuild
+
+# Set src dirs
+ENV SRC_DIR=/srv/app/src
+ENV PIP_SRC=${SRC_DIR}
+
+# List of default extensions
+ENV DEFAULT_EXTENSIONS envvars
+
+# Locations and tags, please use specific tags or revisions
+ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
+ENV ENVVARS_GIT_BRANCH=0.0.2
+
+RUN apk add --no-cache \
+        python3 \
+        python3-dev \
+        git \
+        curl 
+
+# Create the src directory
+RUN mkdir -p ${SRC_DIR}
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python ${SRC_DIR}/get-pip.py
+
+# Fetch and build the default CKAN extensions
+RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
+
+############
+### MAIN ###
+############
+FROM alpine:3.17.2
+
+LABEL maintainer="Keitaro Inc <info@keitaro.com>"
+LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
+
+ENV APP_DIR=/srv/app
+ENV SRC_DIR=/srv/app/src
+ENV CKAN_DIR=${SRC_DIR}/ckan
+ENV DATA_DIR=/srv/app/data
+ENV PIP_SRC=${SRC_DIR}
+ENV CKAN_SITE_URL=http://localhost:5000
+ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
+
+# Install necessary packages to run CKAN
+RUN apk add --no-cache \
+        python3 \
+        bash \
+        git \
+        gettext \
+        curl \
+        postgresql-client \
+        libmagic \
+        pcre \
+        libxslt \
+        libxml2 \
+        tzdata \
+        apache2-utils && \
+    # Create SRC_DIR
+    mkdir -p ${SRC_DIR}
+
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python ${SRC_DIR}/get-pip.py
+
+# Get artifacts from build stages
+COPY --from=ckanbuild /wheels /srv/app/wheels
+COPY --from=extbuild /wheels /srv/app/ext_wheels
+COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR}
+
+# Additional install steps for build stages artifacts
+RUN pip install --no-index --find-links=/srv/app/wheels uWSGI==2.0.20 gevent==22.10.2
+
+# Create a local user and group to run the app
+RUN addgroup -g 92 -S ckan && \
+    adduser -u 92 -h /srv/app -H -D -S -G ckan ckan
+
+WORKDIR ${CKAN_DIR}
+
+# Install CKAN
+RUN pip install -e /srv/app/src/ckan && \
+    cp who.ini ${APP_DIR} && \
+    pip install --no-index --find-links=/srv/app/wheels -r requirements.txt && \
+    # Install default CKAN extensions
+    pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
+    # Create and update CKAN config
+    # Set timezone
+    echo "UTC" >  /etc/timezone && \
+    # Generate CKAN config
+    ckan generate config ${APP_DIR}/production.ini && \
+    ckan config-tool ${APP_DIR}/production.ini "beaker.session.secret = " && \
+    # Configure plugins
+    ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \
+    # Create the data directory
+    mkdir ${DATA_DIR} && \
+    # Webassets can't be loaded from env variables at runtime, it needs to be in the config so that it is created
+    ckan config-tool ${APP_DIR}/production.ini "ckan.webassets.path = ${DATA_DIR}/webassets" && \
+    # Set the default level for extensions to INFO
+    ckan config-tool ${APP_DIR}/production.ini -s logger_ckanext -e level=INFO && \
+    # Change ownership to app user
+    chown -R ckan:ckan /srv/app
+
+# Remove wheels
+RUN rm -rf /srv/app/wheels /srv/app/ext_wheels
+
+# Copy necessary scripts
+COPY setup/app ${APP_DIR}
+
+WORKDIR ${APP_DIR}
+
+# Create entrypoint directory for children image scripts
+ONBUILD RUN mkdir docker-entrypoint.d
+
+# Create afterinit directory for children image scripts
+ONBUILD RUN mkdir docker-afterinit.d
+
+EXPOSE 5000
+
+HEALTHCHECK --interval=10s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
+
+USER ckan
+
+CMD ["/srv/app/start_ckan.sh"]
diff --git a/images/ckan/2.10/Dockerfile.focal b/images/ckan/2.10/Dockerfile.focal
new file mode 100644
index 0000000..84ec629
--- /dev/null
+++ b/images/ckan/2.10/Dockerfile.focal
@@ -0,0 +1,242 @@
+##################
+### Build CKAN ###
+##################
+FROM ubuntu:focal-20210827 as ckanbuild
+
+# Used by Github Actions to tag the image with
+ENV IMAGE_TAG=2.10.4-focal
+
+# Set CKAN version to build
+ENV GIT_URL=https://github.com/ckan/ckan.git
+ENV GIT_BRANCH=ckan-2.10.4
+
+# Set timezone
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# Set Locale
+ENV LC_ALL=en_US.UTF-8
+
+# Set src dirs
+ENV SRC_DIR=/srv/app/src
+ENV PIP_SRC=${SRC_DIR}
+
+WORKDIR ${SRC_DIR}
+
+# Set the locale          
+RUN apt-get update
+RUN apt-get install --no-install-recommends -y locales
+RUN sed -i "/$LC_ALL/s/^# //g" /etc/locale.gen
+RUN dpkg-reconfigure --frontend=noninteractive locales 
+RUN update-locale LANG=${LC_ALL}
+
+# Instal apt-utils
+RUN apt-get install --no-install-recommends -y \
+        apt-utils
+
+# Packages to build CKAN requirements and plugins
+RUN apt-get install --no-install-recommends -y \
+        git \
+        curl \
+        ca-certificates \
+        python3 \
+        libpq-dev \
+        linux-headers-generic \
+	    gcc-10 \
+	    make \
+	    g++-10 \
+	    autoconf \
+	    automake \
+	    libtool \
+        patch \
+        libpcre3-dev \
+        libpcre3 \
+        python3-dev \
+        libffi-dev \
+        libxml2-dev \
+        libxslt-dev
+
+# Use gcc 10
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 --slave /usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-gcc-10
+
+# Link python to python3
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
+# Create the src directory
+RUN mkdir -p ${SRC_DIR}
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python ${SRC_DIR}/get-pip.py
+
+# Downgrade setuptools so that CKAN requirements can be built
+RUN pip install setuptools==44.1.0
+
+# Fetch and build CKAN and requirements
+RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
+# Copy patches and apply patches script
+COPY ./patches ${SRC_DIR}/patches
+COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh
+# Apply patches
+RUN ${SRC_DIR}/apply_ckan_patches.sh
+RUN rm -rf /srv/app/src/ckan/.git
+RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt
+RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2
+
+###########################
+### Default-Extensions ####
+###########################
+FROM ubuntu:focal-20210827 as extbuild
+
+# Set src dirs
+ENV SRC_DIR=/srv/app/src
+ENV PIP_SRC=${SRC_DIR}
+
+# List of default extensions
+ENV DEFAULT_EXTENSIONS envvars
+
+# Locations and tags, please use specific tags or revisions
+ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
+ENV ENVVARS_GIT_BRANCH=0.0.1
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+        git \
+        curl \
+        ca-certificates \
+        python3 \
+        python3-dev
+
+# Link python to python3
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
+# Create the src directory
+RUN mkdir -p ${SRC_DIR}
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python ${SRC_DIR}/get-pip.py
+
+# Downgrade setuptools so that CKAN requirements can be built
+RUN pip install setuptools==44.1.0
+
+# Fetch and build the default CKAN extensions
+RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
+
+############
+### MAIN ###
+############
+FROM ubuntu:focal-20210827
+
+LABEL maintainer="Keitaro Inc <info@keitaro.com>"
+LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
+
+# Set timezone
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# Set Locale
+ENV LC_ALL=en_US.UTF-8
+
+# Set the locale          
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y locales && \
+    sed -i "/$LC_ALL/s/^# //g" /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=${LC_ALL} && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV APP_DIR=/srv/app
+ENV SRC_DIR=/srv/app/src
+ENV CKAN_DIR=${SRC_DIR}/ckan
+ENV DATA_DIR=/srv/app/data
+ENV PIP_SRC=${SRC_DIR}
+ENV CKAN_SITE_URL=http://localhost:5000
+ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
+
+# Install necessary packages to run CKAN
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+        gettext \
+	curl \
+        ca-certificates \
+        libpq5 \
+        git \
+	postgresql-client \
+        python3 \
+	python3-distutils \
+	libpython3.8 \
+        libmagic1 \
+        libpcre3 \
+        libxslt1.1 \
+        libxml2 \
+        tzdata \
+        apache2-utils && \
+    rm -rf /var/lib/apt/lists/* && \
+    # Create SRC_DIR
+    mkdir -p ${SRC_DIR} && \
+    # Link python to python3
+    ln -s /usr/bin/python3 /usr/bin/python
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python ${SRC_DIR}/get-pip.py
+
+# Downgrade setuptools so that CKAN requirements can be built
+RUN pip install setuptools==44.1.0
+
+# Get artifacts from build stages
+COPY --from=ckanbuild /wheels /srv/app/wheels
+COPY --from=extbuild /wheels /srv/app/ext_wheels
+COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR}
+
+# Additional install steps for build stages artifacts
+RUN pip install --no-index --find-links=/srv/app/wheels uWSGI==2.0.20 gevent==22.10.2
+
+# Create a local user and group to run the app
+RUN groupadd -g 92 ckan && \
+    useradd -rm -d /srv/app -s /bin/bash -g ckan -u 92 ckan
+
+WORKDIR ${CKAN_DIR}
+
+# Install CKAN
+RUN pip install -e /srv/app/src/ckan && \
+    cp who.ini ${APP_DIR} && \
+    pip install --no-index --find-links=/srv/app/wheels -r requirements.txt && \
+    # Install default CKAN extensions
+    pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \
+    # Create and update CKAN config
+    # Generate CKAN config
+    ckan generate config ${APP_DIR}/production.ini && \
+    # Configure plugins
+    ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}" && \
+    # Create the data directory
+    mkdir ${DATA_DIR} && \
+    # Webassets can't be loaded from env variables at runtime, it needs to be in the config so that it is created
+    ckan config-tool ${APP_DIR}/production.ini "ckan.webassets.path = ${DATA_DIR}/webassets" && \
+    # Set the default level for extensions to INFO
+    ckan config-tool ${APP_DIR}/production.ini -s logger_ckanext -e level=INFO && \
+    # Change ownership to app user
+    chown -R ckan:ckan /srv/app
+
+# Remove wheels
+RUN rm -rf /srv/app/wheels /srv/app/ext_wheels
+
+# Copy necessary scripts
+COPY setup/app ${APP_DIR}
+
+WORKDIR ${APP_DIR}
+
+# Create entrypoint directory for children image scripts
+ONBUILD RUN mkdir docker-entrypoint.d
+
+# Create afterinit directory for children image scripts
+ONBUILD RUN mkdir docker-afterinit.d
+
+EXPOSE 5000
+
+HEALTHCHECK --interval=10s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
+
+USER ckan
+
+CMD ["/srv/app/start_ckan.sh"]
diff --git a/images/ckan/2.10/patches/.gitkeep b/images/ckan/2.10/patches/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/images/ckan/2.10/scripts/apply_ckan_patches.sh b/images/ckan/2.10/scripts/apply_ckan_patches.sh
new file mode 100755
index 0000000..a7bceb9
--- /dev/null
+++ b/images/ckan/2.10/scripts/apply_ckan_patches.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+shopt -s nullglob
+for patch in patches/*.patch; do
+    /usr/bin/patch -p0 -i $patch
+done
diff --git a/images/ckan/2.10/setup/app/extra_scripts.sh b/images/ckan/2.10/setup/app/extra_scripts.sh
new file mode 100755
index 0000000..80a70ef
--- /dev/null
+++ b/images/ckan/2.10/setup/app/extra_scripts.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# this is called before uwsgi is executed
+# uset his to add extra scripts before ckan is started
diff --git a/images/ckan/2.10/setup/app/maintenance/api/3/action/status_show/index.html b/images/ckan/2.10/setup/app/maintenance/api/3/action/status_show/index.html
new file mode 100644
index 0000000..50276ec
--- /dev/null
+++ b/images/ckan/2.10/setup/app/maintenance/api/3/action/status_show/index.html
@@ -0,0 +1,25 @@
+<!--
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+    <head>
+        <title>Maintenance</title>
+    </head>
+    <body>
+        <h1>Maintenance</h1>
+        <p>Our data portal is currently in maintenance, please try in a while.</p>
+    </body>
+</html>
diff --git a/images/ckan/2.10/setup/app/maintenance/index.html b/images/ckan/2.10/setup/app/maintenance/index.html
new file mode 100644
index 0000000..50276ec
--- /dev/null
+++ b/images/ckan/2.10/setup/app/maintenance/index.html
@@ -0,0 +1,25 @@
+<!--
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+    <head>
+        <title>Maintenance</title>
+    </head>
+    <body>
+        <h1>Maintenance</h1>
+        <p>Our data portal is currently in maintenance, please try in a while.</p>
+    </body>
+</html>
diff --git a/images/ckan/2.10/setup/app/maintenance/serve.py b/images/ckan/2.10/setup/app/maintenance/serve.py
new file mode 100644
index 0000000..77f3bd4
--- /dev/null
+++ b/images/ckan/2.10/setup/app/maintenance/serve.py
@@ -0,0 +1,35 @@
+"""
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+from http.server import ThreadingHTTPServer, SimpleHTTPRequestHandler
+import os
+
+PORT = 5000
+
+web_dir = os.path.join(os.path.dirname(__file__))
+os.chdir(web_dir)
+
+
+def run(server_class=ThreadingHTTPServer, handler_class=SimpleHTTPRequestHandler):
+    server_address = ("0.0.0.0", PORT)
+    httpd = server_class(server_address, handler_class)
+    print("Starting maintenance mode")
+    httpd.serve_forever()
+
+
+if __name__ == "__main__":
+    run()
+
diff --git a/images/ckan/2.10/setup/app/prerun.py b/images/ckan/2.10/setup/app/prerun.py
new file mode 100644
index 0000000..8fad1f7
--- /dev/null
+++ b/images/ckan/2.10/setup/app/prerun.py
@@ -0,0 +1,228 @@
+"""
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+from multiprocessing import connection
+
+import os
+import sys
+import subprocess
+import psycopg2
+from sqlalchemy.engine.url import make_url
+import urllib.request, urllib.error, urllib.parse, base64
+import re
+import json
+import time
+
+ckan_ini = os.environ.get('CKAN_INI', '/srv/app/production.ini')
+
+RETRY = 5
+
+def check_db_connection(retry=None):
+
+    print('[prerun] Start check_db_connection...')
+
+    if retry is None:
+        retry = RETRY
+    elif retry == 0:
+        print('[prerun] Giving up after 5 tries...')
+        sys.exit(1)
+
+    conn_str = os.environ.get('CKAN_SQLALCHEMY_URL', '')
+    try:
+        db_user = make_url(conn_str).username
+        db_passwd = make_url(conn_str).password
+        db_host = make_url(conn_str).host
+        db_name = make_url(conn_str).database
+        connection = psycopg2.connect(user=db_user,
+                               host=db_host,
+                               password=db_passwd,
+                               database=db_name)
+
+    except psycopg2.Error as e:
+        print((str(e)))
+        print('[prerun] Unable to connect to the database...try again in a while.')
+        import time
+        time.sleep(10)
+        check_db_connection(retry = retry - 1)
+    else:
+        connection.close()
+
+def check_solr_connection(retry=None):
+
+    print('[prerun] Start check_solr_connection...')
+
+    if retry is None:
+        retry = RETRY
+    elif retry == 0:
+        print('[prerun] Giving up after 5 tries...')
+        sys.exit(1)
+
+    url = os.environ.get('CKAN_SOLR_URL', '')
+    username = os.environ.get('CKAN_SOLR_USER', '')
+    password = os.environ.get('CKAN_SOLR_PASSWORD', '')
+    search_url = '{url}/schema/name?wt=json'.format(url=url)
+
+    try:
+        if not username:
+            connection = urllib.request.urlopen(search_url)
+        else:
+            request = urllib.request.Request(search_url)
+            base64string = base64.b64encode(bytes('%s:%s' % (username, password),'ascii'))
+            request.add_header("Authorization", "Basic %s" % base64string.decode('utf-8'))
+            connection = urllib.request.urlopen(request)
+    except urllib.error.URLError as e:
+        print('[prerun] Unable to connect to solr...try again in a while.')
+        import time
+        time.sleep(10)
+        check_solr_connection(retry = retry - 1)
+    else:
+        import re
+        conn_info = connection.read()
+        schema_name = json.loads(conn_info)
+        if 'ckan' in schema_name['name']:
+            print('[prerun] Succesfully connected to solr and CKAN schema loaded')
+        else:
+            print('[prerun] Succesfully connected to solr, but CKAN schema not found')
+            sys.exit(1)
+           
+def init_db():
+
+    print('[prerun] Start init_db...')
+
+    db_command = ['ckan', '-c', ckan_ini, 'db', 'init']
+
+    print('[prerun] Initializing or upgrading db - start using ckan db init')
+    try:
+        # run init scripts
+        subprocess.check_output(db_command, stderr=subprocess.STDOUT)
+
+        print('[prerun] Initializing or upgrading db - end')
+    except subprocess.CalledProcessError as e:
+        if 'OperationalError' in str(e.output):
+            print(e.output.decode('utf-8'))
+            print('[prerun] Database not ready, waiting a bit before exit...')
+            import time
+            time.sleep(5)
+            sys.exit(1)
+        else:
+            print(e.output.decode('utf-8'))
+            raise e
+    print('[prerun] Initializing or upgrading db - finish')
+
+
+def init_datastore():
+
+    conn_str = os.environ.get('CKAN_DATASTORE_WRITE_URL')
+    if not conn_str:
+        print('[prerun] Skipping datastore initialization')
+        return
+
+    datastore_perms_command = ['ckan', '-c', ckan_ini, 'datastore',
+                               'set-permissions']
+
+    db_user = make_url(conn_str).username
+    db_passwd = make_url(conn_str).password
+    db_host = make_url(conn_str).host
+    db_name = make_url(conn_str).database
+    connection = psycopg2.connect(user=db_user,
+                            host=db_host,
+                            password=db_passwd,
+                            database=db_name)
+    cursor = connection.cursor()
+
+    print('[prerun] Initializing datastore db - start')
+    try:
+        datastore_perms = subprocess.Popen(
+            datastore_perms_command,
+            stdout=subprocess.PIPE)
+
+        perms_sql = datastore_perms.stdout.read()
+        perms_sql = perms_sql.decode('utf-8')
+        perms_sql = perms_sql.replace("@"+db_host, "")
+        # Remove internal pg command as psycopg2 does not like it
+        perms_sql = re.sub('\\\\connect \"(.*)\"', '', perms_sql)
+        cursor.execute(perms_sql)
+        for notice in connection.notices:
+            print(notice)
+
+        connection.commit()
+
+        print('[prerun] Initializing datastore db - end')
+        print((datastore_perms.stdout.read()))
+    except psycopg2.Error as e:
+        print('[prerun] Could not initialize datastore')
+        print(e.decode('utf-8'))
+
+    except subprocess.CalledProcessError as e:
+        if 'OperationalError' in str(e.output):
+            print(e.output.decode('utf-8'))
+            print('[prerun] Database not ready, waiting a bit before exit...')
+            time.sleep(5)
+            sys.exit(1)
+        else:
+            print(e.output.decode('utf-8'))
+            raise e
+    finally:
+        cursor.close()
+        connection.close()
+
+
+def create_sysadmin():
+
+    print('[prerun] Start create_sysadmin...')
+
+    name = os.environ.get('CKAN_SYSADMIN_NAME')
+    password = os.environ.get('CKAN_SYSADMIN_PASSWORD')
+    email = os.environ.get('CKAN_SYSADMIN_EMAIL')
+
+    if name and password and email:
+
+        # Check if user exists
+        command = ['ckan', '-c', ckan_ini, 'user', 'show', name]
+
+        out = subprocess.check_output(command)
+        if 'User:None' not in re.sub(r'\s', '', out.decode('utf-8')):
+            print('[prerun] Sysadmin user exists, skipping creation')
+            return
+
+        # Create user
+        command = ['ckan', '-c', ckan_ini, 'user', 'add',
+                   name,
+                   'password=' + password,
+                   'email=' + email]
+
+        subprocess.call(command)
+        print(('[prerun] Created user {0}'.format(name)))
+
+        # Make it sysadmin
+        command = ['ckan', '-c', ckan_ini, 'sysadmin', 'add',
+                   name]
+
+        subprocess.call(command)
+        print(('[prerun] Made user {0} a sysadmin'.format(name)))
+
+if __name__ == '__main__':
+
+    maintenance = os.environ.get('MAINTENANCE_MODE', '').lower() == 'true'
+
+    if maintenance:
+        print('[prerun] Maintenance mode, skipping setup...')
+    else:
+        check_db_connection()
+        check_solr_connection()
+        init_db()
+        if os.environ.get('CKAN_DATASTORE_WRITE_URL'):
+            init_datastore()
+        create_sysadmin()
diff --git a/images/ckan/2.10/setup/app/start_ckan.sh b/images/ckan/2.10/setup/app/start_ckan.sh
new file mode 100755
index 0000000..a2e15ba
--- /dev/null
+++ b/images/ckan/2.10/setup/app/start_ckan.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Add ckan.datapusher.api_token to the CKAN config file (updated with corrected value later)
+ckan config-tool $APP_DIR/production.ini ckan.datapusher.api_token=xxx
+
+# Run any startup scripts provided by images extending this one
+if [[ -d "${APP_DIR}/docker-entrypoint.d" ]]
+then
+    for f in ${APP_DIR}/docker-entrypoint.d/*; do
+        case "$f" in
+            *.sh)     echo "$0: Running init file $f"; . "$f" ;;
+            *.py)     echo "$0: Running init file $f"; python "$f"; echo ;;
+            *)        echo "$0: Ignoring $f (not an sh or py file)" ;;
+        esac
+        echo
+    done
+fi
+
+# Add session secret from chart
+if [[ -z $BEAKER_SESSION_SECRET || -v $BEAKER_SESSION_SECRET || -z $JWT_ENCODE_SECRET || -v $JWT_ENCODE_SECRET || -z $JWT_DECODE_SECRET || -v $JWT_DECODE_SECRET ]];then
+  echo "Not all environment variables are set. Generating sessions..."
+else
+  echo "Setting session secrets from environment variables"
+  ckan config-tool $APP_DIR/production.ini "beaker.session.secret=$BEAKER_SESSION_SECRET"
+  ckan config-tool $APP_DIR/production.ini "api_token.jwt.encode.secret=$JWT_ENCODE_SECRET"
+  ckan config-tool $APP_DIR/production.ini "api_token.jwt.decode.secret=$JWT_DECODE_SECRET"
+fi
+
+if grep -E "beaker.session.secret ?= ?$" $APP_DIR/production.ini
+then
+    echo "Setting secrets in ini file"
+    ckan config-tool $APP_DIR/production.ini "beaker.session.secret=$(python3 -c 'import secrets; print(secrets.token_urlsafe())')"
+    ckan config-tool $APP_DIR/production.ini "WTF_CSRF_SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_urlsafe())')"
+    JWT_SECRET=$(python3 -c 'import secrets; print("string:" + secrets.token_urlsafe())')
+    ckan config-tool $APP_DIR/production.ini "api_token.jwt.encode.secret=$JWT_SECRET"
+    ckan config-tool $APP_DIR/production.ini "api_token.jwt.decode.secret=$JWT_SECRET"
+fi
+
+echo "Starting UWSGI with '${UWSGI_PROC_NO:-2}' workers"
+UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p ${UWSGI_PROC_NO:-2} -L --gevent-early-monkey-patch --vacuum --harakiri 50 -b 32768 --callable application"
+
+# Run the prerun script to init CKAN and create the default admin user
+python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; }
+
+echo "Set up ckan.datapusher.api_token in the CKAN config file"
+ckan config-tool $APP_DIR/production.ini "ckan.datapusher.api_token=$(ckan -c $APP_DIR/production.ini user token add ckan_admin datapusher | tail -n 1 | tr -d '\t')"
+
+# Check if we are in maintenance mode and if yes serve the maintenance pages
+if [ "$MAINTENANCE_MODE" = true ]; then PYTHONUNBUFFERED=1 python maintenance/serve.py; fi
+
+# Run any after prerun/init scripts provided by images extending this one
+if [[ -d "${APP_DIR}/docker-afterinit.d" ]]
+then
+    for f in ${APP_DIR}/docker-afterinit.d/*; do
+        case "$f" in
+            *.sh)     echo "$0: Running after prerun init file $f"; . "$f" ;;
+            *.py)     echo "$0: Running after prerun init file $f"; python "$f"; echo ;;
+            *)        echo "$0: Ignoring $f (not an sh or py file)" ;;
+        esac
+        echo
+    done
+fi
+
+# Enable development server if in development mode
+echo "DEVELOPMENT MODE: $DEVELOPMENT"
+if [ "$DEVELOPMENT" = true ]; then
+  echo "Starting development server"
+  ckan -c $APP_DIR/production.ini run -H 0.0.0.0
+fi
+
+# Check whether http basic auth password protection is enabled and enable basicauth routing on uwsgi respecfully
+if [ $? -eq 0 ]
+then
+  if [ "$PASSWORD_PROTECT" = true ]
+  then
+    if [ "$HTPASSWD_USER" ] || [ "$HTPASSWD_PASSWORD" ]
+    then
+      # Generate htpasswd file for basicauth
+      htpasswd -d -b -c /srv/app/.htpasswd $HTPASSWD_USER $HTPASSWD_PASSWORD
+      # Start uwsgi with basicauth
+      uwsgi --ini /srv/app/uwsgi.conf --pcre-jit $UWSGI_OPTS
+    else
+      echo "Missing HTPASSWD_USER or HTPASSWD_PASSWORD environment variables. Exiting..."
+      exit 1
+    fi
+  else
+    # Start uwsgi
+    uwsgi $UWSGI_OPTS
+  fi
+else
+  echo "[prerun] failed...not starting CKAN."
+fi
diff --git a/images/ckan/2.10/setup/app/uwsgi.conf b/images/ckan/2.10/setup/app/uwsgi.conf
new file mode 100644
index 0000000..6321d6d
--- /dev/null
+++ b/images/ckan/2.10/setup/app/uwsgi.conf
@@ -0,0 +1,2 @@
+[uwsgi]
+route = ^(?!/api).*$ basicauth:Restricted,/srv/app/.htpasswd
diff --git a/images/ckan/2.10/setup/app/wsgi.py b/images/ckan/2.10/setup/app/wsgi.py
new file mode 100644
index 0000000..63f3a7c
--- /dev/null
+++ b/images/ckan/2.10/setup/app/wsgi.py
@@ -0,0 +1,28 @@
+"""
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+# -*- coding: utf-8 -*-
+
+import os
+from ckan.config.middleware import make_app
+from ckan.cli import CKANConfigLoader
+from logging.config import fileConfig as loggingFileConfig
+config_filepath = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), u'production.ini')
+abspath = os.path.join(os.path.dirname(os.path.abspath(__file__)))
+loggingFileConfig(config_filepath)
+config = CKANConfigLoader(config_filepath).get_config()
+application = make_app(config)
diff --git a/images/datapusher/Dockerfile b/images/datapusher/Dockerfile
new file mode 100644
index 0000000..bd42b0c
--- /dev/null
+++ b/images/datapusher/Dockerfile
@@ -0,0 +1,106 @@
+#############
+### Build ###
+#############
+FROM alpine:3.13.7 as build
+
+# Used by Github Actions to tag the image with
+ENV IMAGE_TAG=0.0.17
+
+# Set datapusher version to build
+ENV GIT_URL https://github.com/keitaroinc/datapusher.git
+ENV GIT_BRANCH master
+ENV REQUIREMENTS_URL https://raw.githubusercontent.com/keitaroinc/datapusher/${GIT_BRANCH}/requirements.txt
+
+# Set src dirs
+ENV SRC_DIR=/srv/app/src
+ENV PIP_SRC=${SRC_DIR}
+
+WORKDIR ${SRC_DIR}
+
+# Packages to build datapusher
+RUN apk add --no-cache \
+        python3 \
+        curl \
+        gcc \
+        make \
+        g++ \
+        autoconf \
+        automake \
+        libtool \
+        git \
+        musl-dev \
+        python3-dev \
+        libffi-dev \
+        openssl-dev \
+        libxml2-dev \
+        libxslt-dev \
+        rust \
+        cargo
+
+# Create the src directory
+RUN mkdir -p ${SRC_DIR}
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python3 ${SRC_DIR}/get-pip.py
+
+# Fetch and build datapusher and requirements
+RUN pip wheel --wheel-dir=/wheels git+${GIT_URL}@${GIT_BRANCH}#egg=datapusher
+RUN pip wheel --wheel-dir=/wheels -r ${REQUIREMENTS_URL} 
+RUN curl -o /wheels/requirements.txt ${REQUIREMENTS_URL}
+
+# Get uwsgi and gevent from pip
+RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.12.0 greenlet==1.1.3
+
+
+############
+### MAIN ###
+############
+FROM alpine:3.13.7
+
+LABEL maintainer="Keitaro Inc <info@keitaro.com>"
+LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
+
+ENV APP_DIR=/srv/app
+ENV JOB_CONFIG ${APP_DIR}/datapusher_settings.py
+
+WORKDIR ${APP_DIR}
+
+RUN apk add --no-cache \
+        python3 \
+        curl \
+        libmagic \
+        libxslt
+
+# Install pip
+RUN curl -o /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python3 /tmp/get-pip.py
+
+# Get artifacts from build stages
+COPY --from=build /wheels /srv/app/wheels
+
+# Install uwsgi and gevent
+RUN pip install --no-index --find-links=/srv/app/wheels uwsgi==2.0.19.1 gevent==21.12.0
+
+# Create a local user and group to run the app
+RUN addgroup -g 92 -S ckan && \
+    adduser -u 92 -h /srv/app -H -D -S -G ckan ckan
+
+# Install datapusher
+RUN pip install --no-index --find-links=/srv/app/wheels datapusher && \
+    pip install --no-index --find-links=/srv/app/wheels -r /srv/app/wheels/requirements.txt && \
+    # Set timezone
+    echo "UTC" >  /etc/timezone && \
+    # Change ownership to app user
+    chown -R ckan:ckan /srv/app
+
+# Remove wheels
+RUN rm -rf /srv/app/wheels
+
+COPY setup ${APP_DIR}
+
+EXPOSE 8000
+
+USER ckan
+
+CMD ["uwsgi", "--socket=/tmp/uwsgi.sock", "--uid=92", "--gid=92", "--http=:8000", "--master", "--enable-threads", "--gevent=2000", "-p 2", "-L", "--wsgi-file=wsgi.py"]
diff --git a/images/datapusher/setup/datapusher_settings.py b/images/datapusher/setup/datapusher_settings.py
new file mode 100644
index 0000000..4bc28af
--- /dev/null
+++ b/images/datapusher/setup/datapusher_settings.py
@@ -0,0 +1,56 @@
+"""
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import uuid
+import os
+
+DEBUG = False
+TESTING = False
+SECRET_KEY = str(uuid.uuid4())
+USERNAME = str(uuid.uuid4())
+PASSWORD = str(uuid.uuid4())
+
+NAME = 'datapusher'
+
+# database
+
+SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/job_store.db'
+
+# webserver host and port
+
+HOST = '0.0.0.0'
+PORT = 8000
+
+# logging
+
+#FROM_EMAIL = 'server-error@example.com'
+#ADMINS = ['yourname@example.com']  # where to send emails
+
+#LOG_FILE = '/tmp/ckan_service.log'
+STDERR = True
+
+# Content length settings
+MAX_CONTENT_LENGTH = int(os.environ.get('DATAPUSHER_MAX_CONTENT_LENGTH', '1024000'))
+CHUNK_SIZE = int(os.environ.get('DATAPUSHER_CHUNK_SIZE', '16384'))
+CHUNK_INSERT_ROWS = int(os.environ.get('DATAPUSHER_CHUNK_INSERT_ROWS', '250'))
+DOWNLOAD_TIMEOUT = int(os.environ.get('DATAPUSHER_DOWNLOAD_TIMEOUT', '30'))
+
+# Verify SSL
+SSL_VERIFY = os.environ.get('DATAPUSHER_SSL_VERIFY', False)
+
+# Rewrite resource URL's when ckan callback url base is used
+REWRITE_RESOURCES = os.environ.get('DATAPUSHER_REWRITE_RESOURCES', False)
+REWRITE_URL = os.environ.get('DATAPUSHER_REWRITE_URL', 'http://ckan:5000/')
diff --git a/images/datapusher/setup/wsgi.py b/images/datapusher/setup/wsgi.py
new file mode 100644
index 0000000..5ce7c4b
--- /dev/null
+++ b/images/datapusher/setup/wsgi.py
@@ -0,0 +1,25 @@
+"""
+Copyright (c) 2016 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import os
+import sys
+
+import ckanserviceprovider.web as web
+web.init()
+
+import datapusher.jobs as jobs
+
+application = web.app
diff --git a/images/psql-init/Dockerfile b/images/psql-init/Dockerfile
new file mode 100644
index 0000000..65fdf5e
--- /dev/null
+++ b/images/psql-init/Dockerfile
@@ -0,0 +1,21 @@
+
+# Start with a lightweight base image
+FROM python:3.9-alpine
+
+# Used by Github Actions to tag the image with
+ENV IMAGE_TAG=0.0.1
+
+# Set the working directory in the container
+WORKDIR /srv
+
+# Copy the requirements file to the container
+COPY requirements.txt .
+
+# Install the Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application code to the container
+COPY psql-init/  .
+
+CMD ["python", "/srv/psql-init.py"]
+
diff --git a/images/psql-init/psql-init/psql-init.py b/images/psql-init/psql-init/psql-init.py
new file mode 100644
index 0000000..6eb25cb
--- /dev/null
+++ b/images/psql-init/psql-init/psql-init.py
@@ -0,0 +1,277 @@
+"""
+Copyright (c) 2020 Keitaro AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import os
+import sys
+import subprocess
+import re
+import psycopg2
+from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
+from psycopg2.extensions import AsIs
+from sqlalchemy.engine.url import make_url
+
+
+ckan_conn_str = os.environ.get('CKAN_SQLALCHEMY_URL', '')
+datastorerw_conn_str = os.environ.get('CKAN_DATASTORE_WRITE_URL', '')
+datastorero_conn_str = os.environ.get('CKAN_DATASTORE_READ_URL', '')
+
+master_user = os.environ.get('PSQL_MASTER', '')
+master_passwd = os.environ.get('PSQL_PASSWD', '')
+master_database = os.environ.get('PSQL_DB', '')
+
+
+class DB_Params:
+    def __init__(self, conn_str):
+        self.db_user = make_url(conn_str).username
+        self.db_passwd = make_url(conn_str).password
+        self.db_host = make_url(conn_str).host
+        self.db_name = make_url(conn_str).database
+
+
+def check_db_connection(db_params, retry=None):
+
+    print('Checking whether database is up...')
+
+    if retry is None:
+        retry = 20
+    elif retry == 0:
+        print('Giving up...')
+        sys.exit(1)
+
+    try:
+        con = psycopg2.connect(user=master_user,
+                               host=db_params.db_host,
+                               password=master_passwd,
+                               database=master_database)
+
+    except psycopg2.Error as e:
+        print((str(e)))
+        print('Unable to connect to the database...try again in a while.')
+        import time
+        time.sleep(30)
+        check_db_connection(db_params, retry=retry - 1)
+    else:
+        con.close()
+
+
+def create_user(db_params):
+    con = None
+    try:
+        con = psycopg2.connect(user=master_user,
+                               host=db_params.db_host,
+                               password=master_passwd,
+                               database=master_database)
+        con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
+        cur = con.cursor()
+        print("Creating user " + db_params.db_user.split("@")[0])
+        cur.execute('CREATE ROLE "%s" ' +
+                    'WITH ' +
+                    'LOGIN NOSUPERUSER INHERIT ' +
+                    'CREATEDB NOCREATEROLE NOREPLICATION ' +
+                    'PASSWORD %s',
+                    (AsIs(db_params.db_user.split("@")[0]),
+                     db_params.db_passwd,))
+    except(Exception, psycopg2.DatabaseError) as error:
+        print("ERROR DB: ", error)
+    finally:
+        cur.close()
+        con.close()
+
+
+def create_db(db_params):
+    con = None
+    try:
+        con = psycopg2.connect(user=master_user,
+                               host=db_params.db_host,
+                               password=master_passwd,
+                               database=master_database)
+        con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
+        cur = con.cursor()
+        cur.execute('GRANT "' + db_params.db_user.split("@")
+                    [0] + '" TO "' + master_user.split("@")[0] + '"')
+        print("Creating database " + db_params.db_name + " with owner " +
+              db_params.db_user.split("@")[0])
+        cur.execute('CREATE DATABASE ' + db_params.db_name + ' OWNER "' +
+                    db_params.db_user.split("@")[0] + '"')
+        cur.execute('GRANT ALL PRIVILEGES ON DATABASE ' +
+                    db_params.db_name + ' TO "' +
+                    db_params.db_user.split("@")[0] + '"')
+        if is_pg_buffercache_enabled(db_params) >= 1:
+            # FIXME: This is a known issue with pg_buffercache access
+            # For more info check this thread:
+            # https://www.postgresql.org/message-id/21009351582737086%40iva6-22e79380f52c.qloud-c.yandex.net
+            print("Granting privileges on pg_monitor to " +
+                  db_params.db_user.split("@")[0])
+            cur.execute('GRANT "pg_monitor" TO "' + db_params.db_user.split("@")[0] + '"')
+    except(Exception, psycopg2.DatabaseError) as error:
+        print("ERROR DB: ", error)
+    finally:
+        cur.close()
+        con.close()
+
+
+def is_pg_buffercache_enabled(db_params):
+    con = None
+    result = None
+    try:
+        con = psycopg2.connect(user=master_user,
+                               host=db_params.db_host,
+                               password=master_passwd,
+                               database=db_params.db_name)
+        con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
+        cur = con.cursor()
+        cur.execute("SELECT count(*) FROM pg_extension " +
+                    "WHERE extname = 'pg_buffercache'")
+        result = cur.fetchone()
+    except(Exception, psycopg2.DatabaseError) as error:
+        print("ERROR DB: ", error)
+    finally:
+        cur.close()
+        con.close()
+    return result[0]
+
+
+def set_datastore_permissions(datastore_rw_params, datastore_ro_params, sql):
+    con = None
+    try:
+        con = psycopg2.connect(user=master_user,
+                               host=datastore_rw_params.db_host,
+                               password=master_passwd,
+                               database=datastore_rw_params.db_name)
+        con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
+        cur = con.cursor()
+        cur.execute('GRANT CONNECT ON DATABASE ' +
+                    datastore_rw_params.db_name +
+                    ' TO ' + datastore_ro_params.db_user.split("@")[0])
+        if is_pg_buffercache_enabled(datastore_rw_params) >= 1:
+            print("Granting privileges on pg_monitor to " +
+                  datastore_ro_params.db_user.split("@")[0])
+            cur.execute('GRANT ALL PRIVILEGES ON TABLE pg_monitor TO ' +
+                        datastore_ro_params.db_user.split("@")[0])
+        print("Setting datastore permissions\n")
+        print(sql)
+        cur.execute(sql)
+        print("Datastore permissions applied.")
+    except Exception as error:
+        print("ERROR DB: ", error)
+    finally:
+        cur.close()
+        con.close()
+
+
+if master_user == '' or master_passwd == '' or master_database == '':
+    print("No master postgresql user provided.")
+    print("Cannot initialize default CKAN db resources. Exiting!")
+    sys.exit(1)
+
+print("Master DB: " + master_database + " Master User: " + master_user)
+
+ckan_db = DB_Params(ckan_conn_str)
+datastorerw_db = DB_Params(datastorerw_conn_str)
+datastorero_db = DB_Params(datastorero_conn_str)
+
+
+# Check to see whether we can connect to the database, exit after 10 mins
+check_db_connection(ckan_db)
+
+try:
+    create_user(ckan_db)
+except(Exception, psycopg2.DatabaseError) as error:
+    print("ERROR DB: ", error)
+
+try:
+    create_user(datastorerw_db)
+except(Exception, psycopg2.DatabaseError) as error:
+    print("ERROR DB: ", error)
+
+try:
+    create_user(datastorero_db)
+except(Exception, psycopg2.DatabaseError) as error:
+    print("ERROR DB: ", error)
+
+try:
+    create_db(ckan_db)
+except(Exception, psycopg2.DatabaseError) as error:
+    print("ERROR DB: ", error)
+
+try:
+    create_db(datastorerw_db)
+except(Exception, psycopg2.DatabaseError) as error:
+    print("ERROR DB: ", error)
+
+
+def execute_sql_script(ckan_dbp, datastorero_dbp, datastorerw_dbp, script_path):
+    # Connect to the database
+    conn = psycopg2.connect(
+        user=master_user,
+        host=datastorerw_dbp.db_host,
+        password=master_passwd,
+        database=datastorerw_dbp.db_name
+    )
+
+    try:
+        # Create a cursor
+        cur = conn.cursor()
+
+        # Execute the SQL script
+        with open(script_path, 'r') as f:
+            sql_script = f.read()
+
+        # Replace placeholders with actual values
+        
+        sql_script = sql_script.replace('{datastoredb}', datastorerw_dbp.db_name)
+        sql_script = sql_script.replace('{readuser}', datastorero_dbp.db_user)
+        sql_script = sql_script.replace('{writeuser}', datastorerw_dbp.db_user)
+        sql_script = sql_script.replace('{mainuser}', ckan_dbp.db_user)
+        sql_script = sql_script.replace('{maindb}', ckan_dbp.db_name)
+
+        print("CKAN DB User:", ckan_dbp.db_user)
+
+        # Execute the SQL script
+        cur.execute(sql_script)
+
+        # Commit the changes
+        conn.commit()
+
+        print("SQL script executed successfully.")
+
+        print("CKAN DB User:", ckan_dbp.db_user)
+        print("read/write DB User:", datastorerw_dbp.db_user)
+        print("read/write DB name:", datastorerw_dbp.db_name)
+        print("read/write host:", datastorerw_dbp.db_host)
+        print("read DB user:", datastorero_dbp.db_user)
+        print("read DB name:", datastorero_dbp.db_name)
+
+    except psycopg2.Error as e:
+        print(f"Error executing SQL script: {str(e)}")
+
+    finally:
+        # Close the cursor and the connection
+        cur.close()
+        conn.close()
+
+set_permissions = './set_permissions.sql'
+
+# Print the current working directory
+print("Current working directory:", os.getcwd())
+
+# Check if the file exists
+if os.path.isfile(set_permissions):
+    print("File exists.")
+    # Call the execute_sql_script function with the appropriate arguments
+    execute_sql_script(ckan_db, datastorero_db, datastorerw_db, set_permissions)
+else:
+    print("File not found.")
diff --git a/images/psql-init/psql-init/set_permissions.sql b/images/psql-init/psql-init/set_permissions.sql
new file mode 100644
index 0000000..e7be428
--- /dev/null
+++ b/images/psql-init/psql-init/set_permissions.sql
@@ -0,0 +1,108 @@
+/*
+This script configures the permissions for the datastore.
+
+It ensures that the datastore read-only user will only be able to select from
+the datastore database but has no create/write/edit permission or any
+permissions on other databases. You must execute this script as a database
+superuser on the PostgreSQL server that hosts your datastore database.
+
+For example, if PostgreSQL is running locally and the "postgres" user has the
+appropriate permissions (as in the default Ubuntu PostgreSQL install), you can
+run:
+
+    ckan -c /etc/ckan/default/ckan.ini datastore set-permissions | sudo -u postgres psql
+
+Or, if your PostgreSQL server is remote, you can pipe the permissions script
+over SSH:
+
+    ckan -c /etc/ckan/default/ckan.ini datastore set-permissions | ssh dbserver sudo -u postgres psql
+
+*/
+
+-- Most of the following commands apply to an explicit database or to the whole
+-- 'public' schema, and could be executed anywhere. But ALTER DEFAULT
+-- PERMISSIONS applies to the current database, and so we must be connected to
+-- the datastore DB:
+--\connect {datastoredb}
+
+-- revoke permissions for the read-only user
+REVOKE CREATE ON SCHEMA public FROM PUBLIC;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
+
+GRANT CREATE ON SCHEMA public TO {mainuser};
+GRANT USAGE ON SCHEMA public TO {mainuser};
+
+GRANT CREATE ON SCHEMA public TO {writeuser};
+GRANT USAGE ON SCHEMA public TO {writeuser};
+
+-- take connect permissions from main db
+REVOKE CONNECT ON DATABASE {maindb} FROM {readuser};
+
+-- grant select permissions for read-only user
+GRANT CONNECT ON DATABASE {datastoredb} TO {readuser};
+GRANT USAGE ON SCHEMA public TO {readuser};
+
+-- grant access to current tables and views to read-only user
+GRANT SELECT ON ALL TABLES IN SCHEMA public TO {readuser};
+
+-- grant access to new tables and views by default
+ALTER DEFAULT PRIVILEGES FOR USER {writeuser} IN SCHEMA public
+   GRANT SELECT ON TABLES TO {readuser};
+
+-- a view for listing valid table (resource id) and view names
+CREATE OR REPLACE VIEW "_table_metadata" AS
+    SELECT DISTINCT
+        substr(md5(dependee.relname || COALESCE(dependent.relname, '')), 0, 17) AS "_id",
+        dependee.relname AS name,
+        dependee.oid AS oid,
+        dependent.relname AS alias_of
+    FROM
+        pg_class AS dependee
+        LEFT OUTER JOIN pg_rewrite AS r ON r.ev_class = dependee.oid
+        LEFT OUTER JOIN pg_depend AS d ON d.objid = r.oid
+        LEFT OUTER JOIN pg_class AS dependent ON d.refobjid = dependent.oid
+    WHERE
+        (dependee.oid != dependent.oid OR dependent.oid IS NULL) AND
+        -- is a table (from pg_tables view definition)
+        -- or is a view (from pg_views view definition)
+        (dependee.relkind = 'r'::"char" OR dependee.relkind = 'v'::"char")
+        AND dependee.relnamespace = (
+            SELECT oid FROM pg_namespace WHERE nspname='public')
+    ORDER BY dependee.oid DESC;
+ALTER VIEW "_table_metadata" OWNER TO {writeuser};
+GRANT SELECT ON "_table_metadata" TO {readuser};
+
+-- _full_text fields are now updated by a trigger when set to NULL
+CREATE OR REPLACE FUNCTION populate_full_text_trigger() RETURNS trigger
+AS $body$
+    BEGIN
+        IF NEW._full_text IS NOT NULL THEN
+            RETURN NEW;
+        END IF;
+        NEW._full_text := (
+            SELECT to_tsvector(string_agg(value, ' '))
+            FROM json_each_text(row_to_json(NEW.*))
+            WHERE key NOT LIKE '\_%');
+        RETURN NEW;
+    END;
+$body$ LANGUAGE plpgsql;
+ALTER FUNCTION populate_full_text_trigger() OWNER TO {writeuser};
+
+-- migrate existing tables that don't have full text trigger applied
+DO $body$
+    BEGIN
+        EXECUTE coalesce(
+            (SELECT string_agg(
+                'CREATE TRIGGER zfulltext BEFORE INSERT OR UPDATE ON ' ||
+                quote_ident(relname) || ' FOR EACH ROW EXECUTE PROCEDURE ' ||
+                'populate_full_text_trigger();', ' ')
+            FROM pg_class
+            LEFT OUTER JOIN pg_trigger AS t
+                ON t.tgrelid = relname::regclass AND t.tgname = 'zfulltext'
+            WHERE relkind = 'r'::"char" AND t.tgname IS NULL
+                AND relnamespace = (
+                    SELECT oid FROM pg_namespace WHERE nspname='public')),
+            'SELECT 1;');
+    END;
+$body$;
+
diff --git a/images/psql-init/requirements.txt b/images/psql-init/requirements.txt
new file mode 100644
index 0000000..0662697
--- /dev/null
+++ b/images/psql-init/requirements.txt
@@ -0,0 +1,2 @@
+psycopg2-binary==2.9.3
+sqlalchemy==1.3.5