diff --git a/app/controllers/api/v0/themes_controller.rb b/app/controllers/api/v0/themes_controller.rb
new file mode 100644
index 0000000..ba48b82
--- /dev/null
+++ b/app/controllers/api/v0/themes_controller.rb
@@ -0,0 +1,49 @@
+module Api
+  module V0
+    class ThemesController < Api::V0::BaseController
+      before_action :authenticate
+      
+      def extract
+        # check if the user has permissions to use the themes API
+        @theme = Theme.find(params[:id])
+        raise Pundit::NotAuthorizedError unless Api::V0::ThemePolicy.new(@user, @theme).extract?
+        @answers = @theme.answers.where(plan_id: @user.plans.pluck(:id))
+        admin_answers = []
+        org_answers = []
+
+        if params[:admin_visible].present? && params[:admin_visible]
+          admin_answers =  @theme.answers.where(plan_id: @user.org.plans.privately_visible)
+        end
+
+        if params[:org_visible].present? && params[:org_visible]
+          org_answers =  @theme.answers.where(plan_id: @user.org.plans.organisationally_visible)
+        end
+
+        if params[:template_id].present? && params[:template_id]
+          @answers =  @answers.where(plan_id: @user.plans.where(template_id: params[:template_id]).pluck(:id))
+        end
+
+        if params[:question_id].present? && params[:question_id]
+          @answers =  @answers.where(question_id: params[:question_id])
+        end
+
+        if params[:start_date].present? && params[:start_date]
+          @answers =  @answers.where('answers.created_at >=?', params[:start_date])
+        end
+
+        if params[:end_date].present? && params[:end_date]
+          @answers =  @answers.where('answers.created_at <=?', params[:end_date])
+        end
+
+      end
+
+      def extract_params
+        params.permit(:id, :template_id, :question_id, :start_date, :end_date, :admin_visible, :org_visible)
+      end
+
+      def extract_filtering_params
+        extract_params.slice(:template_id, :question_id, :start_date, :end_date, :admin_visible, :org_visible)
+      end
+    end
+  end
+end
diff --git a/app/controllers/super_admin/themes_controller.rb b/app/controllers/super_admin/themes_controller.rb
index 75532fe..afdcca8 100644
--- a/app/controllers/super_admin/themes_controller.rb
+++ b/app/controllers/super_admin/themes_controller.rb
@@ -64,6 +64,7 @@
       end
       redirect_to(action: :index)
     end
+
     # Private instance methods
     private
 
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 4e8a3e5..fbc8aac 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -30,6 +30,11 @@
                   :question, :user, :plan, :question_options, :notes, :note_ids, :id,
                   :as => [:default, :admin]
 
+  scope :plan_id, ->(id) { where('answers.plan_id = ?', id) }
+  scope :question_id, ->(id) { where('answers.question_id = ?', id) }
+  scope :since, ->(date) { where('answers.created_at >= ?', date) if date }
+  scope :until, ->(date) { where('answers.created_at <= ?', date) if date }
+
   ##
   # Validations
 #  validates :user, :plan, :question, presence: true
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 4f0738e..d13ca7b 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -4,6 +4,7 @@
   # Associations
   has_and_belongs_to_many :questions, join_table: "questions_themes"
   has_and_belongs_to_many :guidances, join_table: "themes_in_guidance"
+  has_many :answers, through: :questions
 
   ##
   # Possibly needed for active_admin
diff --git a/app/models/token_permission_type.rb b/app/models/token_permission_type.rb
index 5770e6c..34c2b75 100644
--- a/app/models/token_permission_type.rb
+++ b/app/models/token_permission_type.rb
@@ -20,6 +20,7 @@
   PLANS       = TokenPermissionType.where(token_type: 'plans').first.freeze
   TEMPLATES   = TokenPermissionType.where(token_type: 'templates').first.freeze
   STATISTICS  = TokenPermissionType.where(token_type: 'statistics').first.freeze
+  THEMES      = TokenPermissionType.where(token_type: 'themes').first.freeze
 
 
   ##
diff --git a/app/policies/api/v0/theme_policy.rb b/app/policies/api/v0/theme_policy.rb
new file mode 100644
index 0000000..375a96a
--- /dev/null
+++ b/app/policies/api/v0/theme_policy.rb
@@ -0,0 +1,23 @@
+module Api
+    module V0
+      class ThemePolicy < ApplicationPolicy
+        attr_reader :user, :theme
+  
+        def initialize(user, theme)
+          raise Pundit::NotAuthorizedError, _("must be logged in") unless user
+          unless user.org.token_permission_types.include? TokenPermissionType::THEMES
+            raise Pundit::NotAuthorizedError, _("must have access to theme api")
+          end
+          @user = user
+          @theme = theme
+        end
+  
+        ##
+        # always allowed as index chooses which themes to display
+        def extract?
+          true
+        end
+  
+      end
+    end
+  end
\ No newline at end of file
diff --git a/app/policies/theme_policy.rb b/app/policies/theme_policy.rb
index 3767696..b725b78 100644
--- a/app/policies/theme_policy.rb
+++ b/app/policies/theme_policy.rb
@@ -1,7 +1,7 @@
 class ThemePolicy < ApplicationPolicy
   def initialize(user, *args)
     raise Pundit::NotAuthorizedError, _("must be logged in") unless user
-    @user = user 
+    @user = user
   end
   def index?
     @user.can_super_admin?
diff --git a/app/views/api/v0/themes/extract.jbuilder b/app/views/api/v0/themes/extract.jbuilder
new file mode 100644
index 0000000..1c05f2d
--- /dev/null
+++ b/app/views/api/v0/themes/extract.jbuilder
@@ -0,0 +1,15 @@
+json.theme @theme.title
+json.answers @answers do |a|
+  json.id a.id
+  json.answer a.text
+  json.created_at a.created_at
+  json.question do
+    json.id a.question.id
+    json.title a.question.text
+    json.type a.question.question_format.title
+  end
+  json.plan do
+    json.id a.plan.id
+    json.title a.plan.title
+  end
+end
diff --git a/app/views/shared/_create_plan_modal.html.erb b/app/views/shared/_create_plan_modal.html.erb
index 6523ae4..caf5a3f 100644
--- a/app/views/shared/_create_plan_modal.html.erb
+++ b/app/views/shared/_create_plan_modal.html.erb
@@ -5,7 +5,7 @@
       <h4 class="modal-title"><%= _('Create plan') %></h4>
     </div>
     <div class="modal-body">
-      <p><%= _('Would you like to create a plan based on the "%{name}" template?') % { name: @template.title }%></p>
+      <p><%= d_('dmpopidor', 'Would you like to create a plan based on the "%{name}" template?') % { name: @template.title }%></p>
     </div>
     <div class="modal-footer">
       <%= direct_link(@template, false, _('Yes')) %>
diff --git a/app/views/shared/export/_plan.erb b/app/views/shared/export/_plan.erb
index 8c05506..6410732 100644
--- a/app/views/shared/export/_plan.erb
+++ b/app/views/shared/export/_plan.erb
@@ -38,21 +38,24 @@
       <hr />
       <% phase[:sections].each do |section| %>
         <% if @show_sections_questions %>
-          <h3><%= section[:title] %></h3>
+          <h2><%= section[:title] %></h2>
         <% end %>
 
         <% section[:questions].each do |question| %>
           <div class="question">
-            <% if @show_sections_questions && !@public_plan %>
-              <p><%= raw question[:text].gsub(/<tr>(\s|<td>|<\/td>|&nbsp;)*(<\/tr>|<tr>)/,"") if question[:text].present?%></p>
-              <br>
-            <% end %>
             <% answer = @plan.answer(question[:id], false) %>
             <% blank = answer.present? ? answer.is_blank? : true %>
             <% options = answer.present? ? answer.question_options : [] %>
+
+            <% if @show_sections_questions && !@public_plan %>
+              <% if question[:text].present?%>
+                <h3><%= raw question[:text].gsub(/<tr>(\s|<td>|<\/td>|&nbsp;)*(<\/tr>|<tr>)/,"") unless @show_unanswered == false && blank %></h3>
+              <% end %>
+            <% end %>
             <%# case where question has not been answered sufficiently to display%>
             <% if @show_unanswered && (answer.blank? || (options.blank? && blank))%>
               <p><%= _('Question not answered.') -%></p>
+              <br>
             <% else %>
               <%# case where Question has options %>
               <% if options.present?%>
@@ -77,6 +80,7 @@
               <% elsif !blank %>
                 <p><%= raw answer.text %></p>
               <% end %>
+              <br>
             <% end %>
           </div>
         <% end %>
diff --git a/config/locale/dmpopidor.pot b/config/locale/dmpopidor.pot
index 066cb02..6898d0e 100644
--- a/config/locale/dmpopidor.pot
+++ b/config/locale/dmpopidor.pot
@@ -203,3 +203,6 @@
 
 msgid "Public, Administrator or organisational visibility is intended for finished plans. You must answer at least %{percentage}%% of the questions to enable these options. Note: test plans are set to private visibility by default."
 msgstr ""
+
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr ""
diff --git a/config/locale/en_GB/dmpopidor.po b/config/locale/en_GB/dmpopidor.po
index 7f8d208..1423736 100644
--- a/config/locale/en_GB/dmpopidor.po
+++ b/config/locale/en_GB/dmpopidor.po
@@ -201,3 +201,6 @@
 
 msgid "Public, Administrator or organisational visibility is intended for finished plans. You must answer at least %{percentage}%% of the questions to enable these options. Note: test plans are set to private visibility by default."
 msgstr "Public, Administrator or organisational visibility is intended for finished plans. You must answer at least %{percentage}%% of the questions to enable these options. Note: test plans are set to private visibility by default."
+
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Would you like to create a plan based on the \"%{name}\" template?"
\ No newline at end of file
diff --git a/config/locale/fr_FR/dmpopidor.po b/config/locale/fr_FR/dmpopidor.po
index e70dc73..b7f887c 100644
--- a/config/locale/fr_FR/dmpopidor.po
+++ b/config/locale/fr_FR/dmpopidor.po
@@ -199,4 +199,7 @@
 msgstr "Copier le lien"
 
 msgid "Public, Administrator or organisational visibility is intended for finished plans. You must answer at least %{percentage}%% of the questions to enable these options. Note: test plans are set to private visibility by default."
-msgstr "La visibilité par les administrateurs, par l’organisme ou par tous (public) concerne les plans partiellement remplis. Vous devez avoir répondu à au moins %{percentage}%% des questions afin d'activer l’une de ces options. Note : les plans de test sont privés par défaut."
\ No newline at end of file
+msgstr "La visibilité par les administrateurs, par l’organisme ou par tous (public) concerne les plans partiellement remplis. Vous devez avoir répondu à au moins %{percentage}%% des questions afin d'activer l’une de ces options. Note : les plans de test sont privés par défaut."
+
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Souhaitez-vous créer un plan basé sur le modèle \"%{name}\" ?"
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index b5599fe..3dc2f17 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -210,6 +210,11 @@
             get :plans
           end
         end
+        resources :themes, only: [] do
+          member do
+            get 'extract', to: 'themes#extract'
+          end
+        end
       end
     end
 
@@ -270,25 +275,25 @@
           patch 'publish', action: :publish, constraints: {format: [:json]}
           patch 'unpublish', action: :unpublish, constraints: {format: [:json]}
         end
-        
+
         # Used for the organisational and customizable views of index
         collection do
           get 'organisational'
           get 'customisable'
         end
-        
+
         resources :phases, only: [:show, :edit, :new, :create, :edit, :update, :destroy] do
           member do
             get 'preview'
           end
-          
+
           resources :sections, only: [:index, :show, :edit, :update, :create, :destroy] do
             resources :questions, only: [:show, :edit, :new, :update, :create, :destroy] do
             end
           end
         end
       end
-      
+
       resources :annotations, only: [:create, :destroy, :update] do ; end
 
       get 'template_options' => 'templates#template_options', constraints: {format: [:json]}
diff --git a/lib/tasks/dmpopidor_upgrade.rake b/lib/tasks/dmpopidor_upgrade.rake
new file mode 100644
index 0000000..7e2db38
--- /dev/null
+++ b/lib/tasks/dmpopidor_upgrade.rake
@@ -0,0 +1,39 @@
+require 'set'
+namespace :dmpopidor_upgrade do
+
+  desc "Upgrade to 2.1.0"
+  task v2_1_0: :environment do
+    Rake::Task['dmpopidor_upgrade:add_themes_token_permission_types'].execute
+    Rake::Task['dmpopidor_upgrade:grant_themes_api_to_all_orgs'].execute
+    Rake::Task['dmpopidor_upgrade:grant_themes_api_to_all_orgs'].execute
+  end
+
+
+  desc "Add the themes token permission type"
+  task add_themes_token_permission_types: :environment do
+    if TokenPermissionType.find_by(token_type: 'themes').nil?
+      TokenPermissionType.create!({token_type: 'themes',
+                                   text_description: 'allows a user access to the themes api endpoint'})
+    end
+  end
+
+  desc "Grant themes API to all orgs"
+  task grant_themes_api_to_all_orgs: :environment do
+    orgs = Org.where(is_other: false).select(:id) + Org.where(is_other: nil).select(:id)
+    orgs.each do |org|
+        org.grant_api!(TokenPermissionType.where(token_type: 'themes'))
+      end
+  end
+
+  desc "Grant all API to all orgs"
+  task grant_themes_api_to_all_orgs: :environment do
+    orgs = Org.where(is_other: false).select(:id) + Org.where(is_other: nil).select(:id)
+    orgs.each do |org|
+        org.grant_api!(TokenPermissionType.where(token_type: 'guidances'))
+        org.grant_api!(TokenPermissionType.where(token_type: 'plans'))
+        org.grant_api!(TokenPermissionType.where(token_type: 'templates'))
+        org.grant_api!(TokenPermissionType.where(token_type: 'statistics'))
+      end
+  end
+
+end