From db47920c64e3a90cabd7caa50d770a0993cf0e1f Mon Sep 17 00:00:00 2001
From: Albert Artur Kolozsvari <albertartk@gmail.com>
Date: Sun, 15 Dec 2024 09:58:33 +0000
Subject: [PATCH 1/4] Fix pre-commit lint checks

---
 .idea/runConfigurations/FAB.xml               |  2 +-
 .../generate_assessment_config.py             | 16 +++---
 .../generate_fund_round_config.py             |  3 --
 app/export_config/generate_fund_round_html.py |  8 ++-
 app/export_config/helpers.py                  |  2 +-
 app/shared/helpers.py                         | 14 ++---
 tasks/__init__.py                             |  3 +-
 tasks/export_tasks.py                         |  6 ++-
 tests/test_config_export.py                   | 19 +++----
 tests/test_form_import.py                     | 54 +++++++++----------
 10 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/.idea/runConfigurations/FAB.xml b/.idea/runConfigurations/FAB.xml
index d9a69d0..7c151ef 100644
--- a/.idea/runConfigurations/FAB.xml
+++ b/.idea/runConfigurations/FAB.xml
@@ -29,4 +29,4 @@
     <option name="INPUT_FILE" value="" />
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/app/export_config/generate_assessment_config.py b/app/export_config/generate_assessment_config.py
index c6d692f..b0baa91 100644
--- a/app/export_config/generate_assessment_config.py
+++ b/app/export_config/generate_assessment_config.py
@@ -6,8 +6,9 @@
 
 from app.all_questions.metadata_utils import form_json_to_assessment_display_types
 from app.db import db
-from app.db.models import Component, Section
+from app.db.models import Component
 from app.db.models import Criteria
+from app.db.models import Section
 from app.db.models import Subcriteria
 from app.db.models import Theme
 from app.db.models.application_config import READ_ONLY_COMPONENTS
@@ -15,7 +16,6 @@
 from app.export_config import helpers
 from app.export_config.generate_form import human_to_kebab_case
 
-
 # # TODO this is copied from fund-store metadata_utils for now
 # form_json_to_assessment_display_types = {
 #     "numberfield": "integer",
@@ -195,11 +195,11 @@ def build_assessment_config(criteria_list: list[Criteria]) -> dict:
     prompt=True,
 )
 def generate_assessment_config(
-        input_folder,
-        input_file,
-        output_folder,
-        output_file,
-        forms_dir,
+    input_folder,
+    input_file,
+    output_folder,
+    output_file,
+    forms_dir,
 ):
     with open(os.path.join(input_folder, input_file), "r") as f:
         input_data = json.load(f)
@@ -270,7 +270,7 @@ def generate_assessment_config_for_round(fund_config, round_config, base_output_
         round_id=round_id,
         fund_round_ids=fund_round_ids,
         fund_short_name=fund_short_name,
-        unscored=json.dumps(unscored)
+        unscored=json.dumps(unscored),
     )
     helpers.write_config(assess_output, "assessment_config", round_short_name, "assessment", base_output_dir)
 
diff --git a/app/export_config/generate_fund_round_config.py b/app/export_config/generate_fund_round_config.py
index 6245ad7..00e6577 100644
--- a/app/export_config/generate_fund_round_config.py
+++ b/app/export_config/generate_fund_round_config.py
@@ -188,6 +188,3 @@ def generate_config_for_round(round_id, base_output_dir=None):
         base_output_dir,
     )
     return fund_config, round_config
-
-
-
diff --git a/app/export_config/generate_fund_round_html.py b/app/export_config/generate_fund_round_html.py
index 02fd363..ebda84d 100644
--- a/app/export_config/generate_fund_round_html.py
+++ b/app/export_config/generate_fund_round_html.py
@@ -70,4 +70,10 @@ def generate_all_round_html(round_id, base_output_dir=None):
     html_content = frontend_html_prefix
     html_content += print_html(print_data)
     html_content += frontend_html_suffix
-    write_config(html_content, f"{fund.short_name.casefold()}_{round.short_name.casefold()}", round.short_name, "html", base_output_dir)
+    write_config(
+        html_content,
+        f"{fund.short_name.casefold()}_{round.short_name.casefold()}",
+        round.short_name,
+        "html",
+        base_output_dir,
+    )
diff --git a/app/export_config/helpers.py b/app/export_config/helpers.py
index 2cdbed3..c97f41a 100644
--- a/app/export_config/helpers.py
+++ b/app/export_config/helpers.py
@@ -25,7 +25,7 @@ def write_config(config, filename, round_short_name, config_type, base_output_di
         # Ensure the filename ends with .json
         if not filename.endswith(".json"):
             if any(
-                    filename.endswith(ext) for ext in [".py", ".html", ".txt", ".csv"]
+                filename.endswith(ext) for ext in [".py", ".html", ".txt", ".csv"]
             ):  # Add other file types as needed
                 raise ValueError(f"Invalid file type for form_json: {filename}")
             filename = f"{filename}.json"
diff --git a/app/shared/helpers.py b/app/shared/helpers.py
index 1c638f4..56cd55d 100644
--- a/app/shared/helpers.py
+++ b/app/shared/helpers.py
@@ -1,6 +1,7 @@
 import re
 from dataclasses import asdict
 from dataclasses import is_dataclass
+
 from wtforms.validators import ValidationError
 
 from app.db.models import Page
@@ -39,6 +40,7 @@ def get_all_pages_in_parent_form(db, page_id):
 
     return page_ids
 
+
 # This formatter will read all the errors and then convert them to the required format to support error-summary display
 def error_formatter(errors):
     error = None
@@ -46,13 +48,13 @@ def error_formatter(errors):
         errorsList = []
         for field, errors in errors.items():
             if isinstance(errors, list):
-                errorsList.extend([{'text': err, 'href': f'#{field}'} for err in errors])
+                errorsList.extend([{"text": err, "href": f"#{field}"} for err in errors])
             elif isinstance(errors, dict):
                 # Check if any of the datetime fields have errors
-                if any(len(errors.get(key, '')) > 0 for key in ['day', 'month', 'years', 'hour', 'minute']):
-                    errorsList.append({'text': "Enter valid datetime", 'href': f'#{field}'})
+                if any(len(errors.get(key, "")) > 0 for key in ["day", "month", "years", "hour", "minute"]):
+                    errorsList.append({"text": "Enter valid datetime", "href": f"#{field}"})
         if errorsList:
-            error = {'titleText': "There is a problem", 'errorList': errorsList}
+            error = {"titleText": "There is a problem", "errorList": errorsList}
     return error
 
 
@@ -61,5 +63,5 @@ def no_spaces_between_letters(form, field):
     # Regular expression to check for spaces between letters
     if not field.data:
         return
-    if re.search(r'\b\w+\s+\w+\b', field.data):  # Matches sequences with spaces in between
-        raise ValidationError("Spaces between letters are not allowed.")
\ No newline at end of file
+    if re.search(r"\b\w+\s+\w+\b", field.data):  # Matches sequences with spaces in between
+        raise ValidationError("Spaces between letters are not allowed.")
diff --git a/tasks/__init__.py b/tasks/__init__.py
index 0c1e3cd..1d1d669 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -3,7 +3,8 @@
 from tasks.db_tasks import create_test_data
 from tasks.db_tasks import init_migrations
 from tasks.db_tasks import recreate_local_dbs
-from tasks.export_tasks import generate_fund_and_round_config, generate_assessment_config
+from tasks.export_tasks import generate_assessment_config
+from tasks.export_tasks import generate_fund_and_round_config
 from tasks.export_tasks import generate_round_form_jsons
 from tasks.export_tasks import generate_round_html
 from tasks.export_tasks import publish_form_json_to_runner
diff --git a/tasks/export_tasks.py b/tasks/export_tasks.py
index 42f37bc..9e2e366 100644
--- a/tasks/export_tasks.py
+++ b/tasks/export_tasks.py
@@ -4,7 +4,9 @@
 import requests
 
 from app import app
-from app.export_config.generate_assessment_config import generate_assessment_config_for_round
+from app.export_config.generate_assessment_config import (
+    generate_assessment_config_for_round,
+)
 
 sys.path.insert(1, ".")
 from invoke import task  # noqa:E402
@@ -51,6 +53,7 @@ def generate_round_html(c, roundid):
     with app.app_context():
         generate_all_round_html(roundid)
 
+
 @task
 def generate_assessment_config(c, fund_config, round_config):
     if not fund_config and not round_config:
@@ -60,6 +63,7 @@ def generate_assessment_config(c, fund_config, round_config):
     with app.app_context():
         generate_assessment_config_for_round(fund_config, round_config)
 
+
 @task
 def publish_form_json_to_runner(c, filename):
 
diff --git a/tests/test_config_export.py b/tests/test_config_export.py
index 4c336c7..f14739d 100644
--- a/tests/test_config_export.py
+++ b/tests/test_config_export.py
@@ -202,7 +202,7 @@ def test_generate_form_jsons_for_round_valid_input(seed_dynamic_data, temp_outpu
                                 "options": {},
                                 "type": "Html",
                                 "content": '<p class="govuk-body"></p><p class="govuk-body">'
-                                           "We will ask you about:</p> <ul><li>Organisation Name</li></ul>",
+                                "We will ask you about:</p> <ul><li>Organisation Name</li></ul>",
                                 "schema": {},
                             }
                         ],
@@ -268,12 +268,12 @@ def test_generate_fund_round_html(seed_dynamic_data, temp_output_dir):
     expected_files = [
         {
             "path": temp_output_dir
-                    / round_short_name
-                    / "html"
-                    / f"{fund_short_name.casefold()}_{round_short_name.casefold()}_all_questions_en.html",
+            / round_short_name
+            / "html"
+            / f"{fund_short_name.casefold()}_{round_short_name.casefold()}_all_questions_en.html",
             "expected_output": frontend_html_prefix
-                               + '<div class="govuk-!-margin-bottom-8">\n  <h2 class="govuk-heading-m ">\n    Table of contents\n  </h2>\n  <ol class="govuk-list govuk-list--number">\n    <li>\n      <a class="govuk-link" href="#organisation-information">\n        Organisation Information\n      </a>\n    </li>\n  </ol>\n  <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible" />\n  <h2 class="govuk-heading-l" id="organisation-information">\n    1. Organisation Information\n  </h2>\n  <h3 class="govuk-heading-m">\n    1.1. About your organisation\n  </h3>\n  <h4 class="govuk-heading-s">\n    1.1.1. Organisation Name\n  </h4>\n  <div class="govuk-body all-questions-component">\n    <p class="govuk-body">\n      What is your organisation\'s name?\n    </p>\n    <p class="govuk-body">\n      This must match the registered legal organisation name\n    </p>\n  </div>\n  <div class="govuk-body all-questions-component">\n    <p class="govuk-body">\n      How is your organisation classified?\n    </p>\n    <ul class="govuk-list govuk-list--bullet">\n      <li class="">\n        Charity\n      </li>\n      <li class="">\n        Public Limited Company\n      </li>\n    </ul>\n  </div>\n</div>'  # noqa: E501
-                               + frontend_html_suffix,
+            + '<div class="govuk-!-margin-bottom-8">\n  <h2 class="govuk-heading-m ">\n    Table of contents\n  </h2>\n  <ol class="govuk-list govuk-list--number">\n    <li>\n      <a class="govuk-link" href="#organisation-information">\n        Organisation Information\n      </a>\n    </li>\n  </ol>\n  <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible" />\n  <h2 class="govuk-heading-l" id="organisation-information">\n    1. Organisation Information\n  </h2>\n  <h3 class="govuk-heading-m">\n    1.1. About your organisation\n  </h3>\n  <h4 class="govuk-heading-s">\n    1.1.1. Organisation Name\n  </h4>\n  <div class="govuk-body all-questions-component">\n    <p class="govuk-body">\n      What is your organisation\'s name?\n    </p>\n    <p class="govuk-body">\n      This must match the registered legal organisation name\n    </p>\n  </div>\n  <div class="govuk-body all-questions-component">\n    <p class="govuk-body">\n      How is your organisation classified?\n    </p>\n    <ul class="govuk-list govuk-list--bullet">\n      <li class="">\n        Charity\n      </li>\n      <li class="">\n        Public Limited Company\n      </li>\n    </ul>\n  </div>\n</div>'  # noqa: E501
+            + frontend_html_suffix,
         }
     ]
     for expected_file in expected_files:
@@ -325,9 +325,10 @@ def test_invalid_data_validate_json(data):
 
 def test_create_export_zip(temp_output_dir):
     test_data_path = Path("tests") / "test_data"
-    random_post_fix = ''.join(secrets.choice(string.ascii_uppercase + string.digits) for _ in range(5))
-    output = create_export_zip(directory_to_zip=test_data_path, zip_file_name="test_zip",
-                               random_post_fix=random_post_fix)
+    random_post_fix = "".join(secrets.choice(string.ascii_uppercase + string.digits) for _ in range(5))
+    output = create_export_zip(
+        directory_to_zip=test_data_path, zip_file_name="test_zip", random_post_fix=random_post_fix
+    )
     assert output
     output_path = Path(output)
     assert output_path.exists()
diff --git a/tests/test_form_import.py b/tests/test_form_import.py
index 8d2dcea..953b941 100644
--- a/tests/test_form_import.py
+++ b/tests/test_form_import.py
@@ -22,12 +22,12 @@
     "input_condition,exp_result",
     [
         (
-                test_form_json_condition_org_type_a,
-                test_condition_org_type_a,
+            test_form_json_condition_org_type_a,
+            test_condition_org_type_a,
         ),
         (
-                test_form_json_condition_org_type_c,
-                test_condition_org_type_c,
+            test_form_json_condition_org_type_c,
+            test_condition_org_type_c,
         ),
     ],
 )
@@ -102,28 +102,28 @@ def test_add_conditions_to_components(mocker, input_page, input_conditions, exp_
     "input_page, input_conditions, exp_condition_count",
     [
         (
-                [
-                    {"path": "/path-1", "next": [{"path": "next-a", "condition": "condition-a"}]},
-                    {"path": "/path-2", "next": [{"path": "next-a", "condition": "condition-a"}]},
-                    {"path": "/path-3", "next": [{"path": "next-a", "condition": "condition-a"}]}
-                ],
-                [
-                    asdict(
-                        Condition(
-                            name="condition-a",
-                            display_name="condition a",
-                            destination_page_path="page-b",
-                            value=ConditionValue(
-                                name="condition a",
-                                conditions=[
-                                    SubCondition(field={"name": "c1"}, operator="is", value={}, coordinator=None),
-                                    SubCondition(field={"name": "c1"}, operator="is", value={}, coordinator="or"),
-                                ],
-                            ),
-                        )
+            [
+                {"path": "/path-1", "next": [{"path": "next-a", "condition": "condition-a"}]},
+                {"path": "/path-2", "next": [{"path": "next-a", "condition": "condition-a"}]},
+                {"path": "/path-3", "next": [{"path": "next-a", "condition": "condition-a"}]},
+            ],
+            [
+                asdict(
+                    Condition(
+                        name="condition-a",
+                        display_name="condition a",
+                        destination_page_path="page-b",
+                        value=ConditionValue(
+                            name="condition a",
+                            conditions=[
+                                SubCondition(field={"name": "c1"}, operator="is", value={}, coordinator=None),
+                                SubCondition(field={"name": "c1"}, operator="is", value={}, coordinator="or"),
+                            ],
+                        ),
                     )
-                ],
-                1,
+                )
+            ],
+            1,
         ),
     ],
 )
@@ -134,8 +134,8 @@ def test_same_condition_used_in_different_pages(mocker, input_page, input_condit
 
     # Set up other necessary mocks and test data
     with mock.patch(
-            "app.import_config.load_form_json._build_condition",
-            return_value=Condition(name=None, display_name=None, destination_page_path=None, value=None),
+        "app.import_config.load_form_json._build_condition",
+        return_value=Condition(name=None, display_name=None, destination_page_path=None, value=None),
     ):
         for page in input_page:
             add_conditions_to_components(None, page, input_conditions, page_id=None)

From bea9e8e2a467a40deaf5d089e6cf53d248fded31 Mon Sep 17 00:00:00 2001
From: Albert Artur Kolozsvari <albertartk@gmail.com>
Date: Sun, 15 Dec 2024 10:06:20 +0000
Subject: [PATCH 2/4] Fix app/blueprints/fund_builder/routes.py manually

---
 app/blueprints/fund_builder/routes.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/blueprints/fund_builder/routes.py b/app/blueprints/fund_builder/routes.py
index 94ffde3..803f151 100644
--- a/app/blueprints/fund_builder/routes.py
+++ b/app/blueprints/fund_builder/routes.py
@@ -220,7 +220,9 @@ def build_application(round_id):
 @build_fund_bp.route("/fund/<fund_id>/round/<round_id>/clone")
 def clone_round(round_id, fund_id):
     cloned = clone_single_round(
-        round_id=round_id, new_fund_id=fund_id, new_short_name=f"R-C{randint(0, 999)}"  # nosec B311
+        round_id=round_id,
+        new_fund_id=fund_id,
+        new_short_name=f"R-C{randint(0, 999)}",  # nosec B311
     )
     flash(f"Cloned new round: {cloned.short_name}")
 

From d0d65f75d28f1b9a16df5e68ff79f99014ee6abe Mon Sep 17 00:00:00 2001
From: Albert Artur Kolozsvari <albertartk@gmail.com>
Date: Sun, 15 Dec 2024 04:07:26 +0000
Subject: [PATCH 3/4] Create/Update criteria and subcriteria

---
 app/blueprints/fund_builder/forms/criteria.py |  11 ++
 .../fund_builder/forms/subcriteria.py         |   9 ++
 app/blueprints/fund_builder/routes.py         | 150 ++++++++++++++++++
 .../templates/build_application.html          |  64 +++++++-
 .../fund_builder/templates/criteria.html      |  70 ++++++++
 .../fund_builder/templates/subcriteria.html   |  41 +++++
 .../templates/{create_section.html => .html}  |   0
 app/db/models/assessment_config.py            |  17 +-
 app/db/models/round.py                        |   8 +-
 app/db/queries/application.py                 |  77 ++++++++-
 10 files changed, 435 insertions(+), 12 deletions(-)
 create mode 100644 app/blueprints/fund_builder/forms/criteria.py
 create mode 100644 app/blueprints/fund_builder/forms/subcriteria.py
 create mode 100644 app/blueprints/fund_builder/templates/criteria.html
 create mode 100644 app/blueprints/fund_builder/templates/subcriteria.html
 rename app/blueprints/self_serve/templates/{create_section.html => .html} (100%)

diff --git a/app/blueprints/fund_builder/forms/criteria.py b/app/blueprints/fund_builder/forms/criteria.py
new file mode 100644
index 0000000..842465d
--- /dev/null
+++ b/app/blueprints/fund_builder/forms/criteria.py
@@ -0,0 +1,11 @@
+from flask_wtf import FlaskForm
+from wtforms import HiddenField
+from wtforms import StringField
+from wtforms.validators import DataRequired
+
+
+class CriteriaForm(FlaskForm):
+    round_id = HiddenField("Round ID")
+    criteria_id = HiddenField("Criteria ID")
+    name = StringField("Name", validators=[DataRequired()])
+    weighting = StringField("Weighting", validators=[DataRequired()])
diff --git a/app/blueprints/fund_builder/forms/subcriteria.py b/app/blueprints/fund_builder/forms/subcriteria.py
new file mode 100644
index 0000000..17bd3d6
--- /dev/null
+++ b/app/blueprints/fund_builder/forms/subcriteria.py
@@ -0,0 +1,9 @@
+from flask_wtf import FlaskForm
+from wtforms import HiddenField, StringField
+from wtforms.validators import DataRequired
+
+
+class SubcriteriaForm(FlaskForm):
+    criteria_id = HiddenField("Criteria ID")
+    subcriteria_id = HiddenField("Subcriteria ID")
+    name = StringField("Name", validators=[DataRequired()])
diff --git a/app/blueprints/fund_builder/routes.py b/app/blueprints/fund_builder/routes.py
index 803f151..2c7b2b5 100644
--- a/app/blueprints/fund_builder/routes.py
+++ b/app/blueprints/fund_builder/routes.py
@@ -20,10 +20,12 @@
 from fsd_utils.authentication.decorators import login_requested
 
 from app.all_questions.metadata_utils import generate_print_data_for_sections
+from app.blueprints.fund_builder.forms.criteria import CriteriaForm
 from app.blueprints.fund_builder.forms.fund import FundForm
 from app.blueprints.fund_builder.forms.round import RoundForm
 from app.blueprints.fund_builder.forms.round import get_datetime
 from app.blueprints.fund_builder.forms.section import SectionForm
+from app.blueprints.fund_builder.forms.subcriteria import SubcriteriaForm
 from app.db.models.fund import Fund
 from app.db.models.fund import FundingType
 from app.db.models.round import Round
@@ -32,14 +34,20 @@
 from app.db.queries.application import delete_form_from_section
 from app.db.queries.application import delete_section_from_round
 from app.db.queries.application import get_all_template_forms
+from app.db.queries.application import get_criteria_by_id
 from app.db.queries.application import get_form_by_id
 from app.db.queries.application import get_section_by_id
+from app.db.queries.application import get_subcriteria_by_id
+from app.db.queries.application import insert_new_criteria
 from app.db.queries.application import insert_new_section
+from app.db.queries.application import insert_new_subcriteria
 from app.db.queries.application import move_form_down
 from app.db.queries.application import move_form_up
 from app.db.queries.application import move_section_down
 from app.db.queries.application import move_section_up
+from app.db.queries.application import update_criteria
 from app.db.queries.application import update_section
+from app.db.queries.application import update_subcriteria
 from app.db.queries.fund import add_fund
 from app.db.queries.fund import get_all_funds
 from app.db.queries.fund import get_fund_by_id
@@ -89,6 +97,148 @@ def dashboard():
     return render_template("index.html")
 
 
+@build_fund_bp.route("/fund/round/<round_id>/criteria", methods=["GET", "POST"])
+def criteria(round_id):
+    round_obj = get_round_by_id(round_id)
+    fund_obj = get_fund_by_id(round_obj.fund_id)
+    form: CriteriaForm = CriteriaForm()
+    form.round_id.data = round_id
+    params = {
+        "round_id": str(round_id),
+    }
+    existing_criteria = None
+
+    if request.args.get("action") == "remove":
+        # to do: remove criteria
+        return redirect(url_for("build_fund_bp.build_application", round_id=round_id))
+    if request.args.get("action") == "move_up":
+        # to do: move_up criteria
+        return redirect(url_for("build_fund_bp.build_application", round_id=round_id))
+    if request.args.get("action") == "move_down":
+        # to do: move_down criteria
+        return redirect(url_for("build_fund_bp.build_application", round_id=round_id))
+
+    if form.validate_on_submit():
+        if form.criteria_id.data:
+            update_criteria(
+                form.criteria_id.data,
+                {
+                    "name": form.name.data,
+                    "weighting": form.weighting.data,
+                },
+            )
+        else:
+            insert_new_criteria(
+                {
+                    "round_id": form.round_id.data,
+                    "name": form.name.data,
+                    "weighting": form.weighting.data,
+                    "index": max(len(round_obj.criteria) + 1, 1),
+                }
+            )
+
+        return redirect(url_for("build_fund_bp.build_application", round_id=round_obj.round_id))
+
+    if criteria_id := request.args.get("criteria_id"):
+        existing_criteria = get_criteria_by_id(criteria_id)
+        form.criteria_id.data = criteria_id
+        form.name.data = existing_criteria.name
+        form.weighting.data = existing_criteria.weighting
+        params["criteria"] = existing_criteria
+
+    params["breadcrumb_items"] = [
+        {
+            "text": "Home",
+            "href": url_for(BUILD_FUND_BP_DASHBOARD),
+        },
+        {
+            "text": fund_obj.name_json["en"],
+            "href": url_for("build_fund_bp.view_fund", fund_id=fund_obj.fund_id),
+        },
+        {
+            "text": round_obj.title_json["en"],
+            "href": url_for("build_fund_bp.build_application", fund_id=fund_obj.fund_id, round_id=round_obj.round_id),
+        },
+        {
+            "text": existing_criteria.name if existing_criteria else "Add Criteria",
+            "href": "#",
+        },
+    ]
+
+    return render_template("criteria.html", form=form, **params)
+
+
+@build_fund_bp.route("/criteria/<criteria_id>/subcriteria", methods=["GET", "POST"])
+def subcriteria(criteria_id):
+    criteria = get_criteria_by_id(criteria_id)
+    form: SubcriteriaForm = SubcriteriaForm()
+    form.criteria_id.data = criteria_id
+    params = {
+        "criteria_id": str(criteria_id),
+    }
+    existing_subcriteria = None
+
+    if request.args.get("action") == "remove":
+        # to do: remove criteria
+        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+    if request.args.get("action") == "move_up":
+        # to do: move_up criteria
+        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+    if request.args.get("action") == "move_down":
+        # to do: move_down criteria
+        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+
+    if form.validate_on_submit():
+        if form.subcriteria_id.data:
+            update_subcriteria(
+                form.subcriteria_id.data,
+                {"name": form.name.data},
+            )
+        else:
+            insert_new_subcriteria(
+                {
+                    "criteria_id": form.criteria_id.data,
+                    "name": form.name.data,
+                    "criteria_index": max(len(criteria.subcriteria) + 1, 1),
+                }
+            )
+
+        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+
+    if subcriteria_id := request.args.get("subcriteria_id"):
+        existing_subcriteria = get_subcriteria_by_id(subcriteria_id)
+        form.subcriteria_id.data = subcriteria_id
+        form.name.data = existing_subcriteria.name
+        params["subcriteria"] = existing_subcriteria
+
+    params["breadcrumb_items"] = [
+        {
+            "text": "Home",
+            "href": url_for(BUILD_FUND_BP_DASHBOARD),
+        },
+        {
+            "text": criteria.round.fund.name_json["en"],
+            "href": url_for("build_fund_bp.view_fund", fund_id=criteria.round.fund_id),
+        },
+        {
+            "text": criteria.round.title_json["en"],
+            "href": url_for(
+                "build_fund_bp.build_application", fund_id=criteria.round.fund_id, round_id=criteria.round_id
+            ),
+        },
+        {
+            "text": criteria.name,
+            "href": url_for("build_fund_bp.criteria", round_id=criteria.round_id, criteria_id=criteria.criteria_id),
+        },
+        {
+            "text": existing_subcriteria.name if existing_subcriteria else "Add Subcriteria",
+            "href": "#",
+        },
+    ]
+
+    return render_template("subcriteria.html", form=form, **params)
+
+
 @build_fund_bp.route("/fund/round/<round_id>/section", methods=["GET", "POST"])
 def section(round_id):
     round_obj = get_round_by_id(round_id)
diff --git a/app/blueprints/fund_builder/templates/build_application.html b/app/blueprints/fund_builder/templates/build_application.html
index bd523d2..8026a63 100644
--- a/app/blueprints/fund_builder/templates/build_application.html
+++ b/app/blueprints/fund_builder/templates/build_application.html
@@ -22,15 +22,17 @@ <h2 class="govuk-heading-m">{{ fund.short_name }} - {{round.title_json["en"]}} (
     "classes": "govuk-button--secondary"
     })
     }}
-    <ul class="app-task-list__items">
-        {{ govukButton({
-                "text": "Add Section",
-                "href": url_for("build_fund_bp.section", round_id=round.round_id) ,
-        "classes": "govuk-button--secondary"
+    <h1 class="govuk-heading-l">Application</h1>
+    {{
+        govukButton({
+            "text": "Add Section",
+            "href": url_for("build_fund_bp.section", round_id=round.round_id) ,
+            "classes": "govuk-button--secondary"
         })
-        }}
+    }}
+    <ul class="app-task-list__items">
         {% for section in round.sections %}
-        <li class="">
+            <li class="">
                 <span class="app-task-list__task-name">
                     <h3 class="govuk-heading-m">{{ section.index }}. {{ section.name_in_apply_json["en"] }}</h3>
                 </span>
@@ -63,4 +65,52 @@ <h3 class="govuk-body">
             </li>
         {% endfor %}
     </ul>
+    <h1 class="govuk-heading-l">Assessment</h1>
+    {{
+        govukButton({
+            "text": "Add Criteria",
+            "href": url_for("build_fund_bp.criteria", round_id=round.round_id) ,
+            "classes": "govuk-button--secondary"
+        })
+    }}
+    <ul class="app-task-list__items">
+        {% for criteria in round.criteria %}
+            <li>
+                <span class="app-task-list__task-name">
+                    <h3 class="govuk-heading-m">{{ criteria.index }}. {{ criteria.name }}</h3>
+                </span>
+                <span class="app-task-list__task-actions">
+                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria", round_id=round.round_id, criteria_id=criteria.criteria_id) }}'>Edit</a>&nbsp;
+                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria",round_id=round.round_id, criteria_id=criteria.criteria_id, action="remove") }}'>Remove</a>&nbsp;
+                    {% if criteria.index > 1 %}
+                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria",round_id=round.round_id, index=criteria.index, action="move_up") }}'>Move up</a>&nbsp;
+                    {% endif %}
+                    {% if criteria.index < round.criteria | length %}
+                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria",round_id=round.round_id, index=criteria.index, action="move_down") }}'> Move down</a>
+                    {% endif %}
+                </span>
+                <ul class="app-task-list__items">
+                    {% for subcriteria in criteria.subcriteria %}
+                        <li class="app-task-list__item task-list__new-design">
+                            <span class="app-task-list__task-name">
+                                <h3 class="govuk-body">
+                                    {{ criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ subcriteria.name }}
+                                </h3>
+                            </span>
+                            <span class="app-task-list__task-actions">
+                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, subcriteria_id=subcriteria.subcriteria_id) }}'>Edit</a>&nbsp;
+                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, subcriteria_id=subcriteria.subcriteria_id, action="remove") }}'>Remove</a>&nbsp;
+                                {% if subcriteria.criteria_index > 1 %}
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, index=subcriteria.criteria_index, action="move_up") }}'>Move up</a>&nbsp;
+                                {% endif %}
+                                {% if subcriteria.criteria_index < criteria.subcriteria | length %}
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, index=subcriteria.criteria_index, action="move_down") }}'> Move down</a>
+                                {% endif %}
+                            </span>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </li>
+        {% endfor %}
+    </ul>
 {% endblock content %}
diff --git a/app/blueprints/fund_builder/templates/criteria.html b/app/blueprints/fund_builder/templates/criteria.html
new file mode 100644
index 0000000..447b9e3
--- /dev/null
+++ b/app/blueprints/fund_builder/templates/criteria.html
@@ -0,0 +1,70 @@
+{% extends "base.html" %}
+{% set pageHeading %}
+    {% if form.criteria_id.data %}Update{% else %}Create{% endif %}&nbsp;Criteria
+{% endset %}
+
+{% from "macros/wtfToGovUk.html" import input %}
+{% from "macros/wtfToGovUk.html" import yes_no %}
+{%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
+{%- from "govuk_frontend_jinja/components/select/macro.html" import govukSelect -%}
+
+{% block content %}
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
+            <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
+            <form method="POST">
+                <div class="govuk-form-group">
+                    <h3 class="govuk-heading-m">Criteria Name</h3>
+                    {{ form.hidden_tag() }}
+                    {{ input(form.name) }}
+                    {{ input(form.weighting) }}
+                </div>
+                {{ govukButton({"text": "Save"}) }}
+            </form>
+        </div>
+    </div>
+    {% if form.criteria_id.data %}
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">
+                <h3 class="govuk-heading-m">Subcriteria of this criteria</h3>
+                {{
+                    govukButton({
+                        "text": "Add Subcriteria",
+                        "href": url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id),
+                        "classes": "govuk-button--secondary"
+                    })
+                }}
+                <ul class="app-task-list__items">
+                    {% for subcriteria in criteria.subcriteria %}
+                        <li>
+                            <span class="app-task-list__task-name">
+                                <h3 class="govuk-heading-m">{{ subcriteria.criteria_index }}. {{ subcriteria.name }}</h3>
+                            </span>
+                            <span class="app-task-list__task-actions">
+                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, subcriteria_id=subcriteria.subcriteria_id) }}'>Edit</a>&nbsp;
+                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, subcriteria_id=subcriteria.subcriteria_id, action="remove") }}'>Remove</a>&nbsp;
+                                {% if subcriteria.criteria_index > 1 %}
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, index=subcriteria.criteria_index, action="move_up") }}'>Move up</a>&nbsp;
+                                {% endif %}
+                                {% if subcriteria.criteria_index < criteria.subcriteria | length %}
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, index=subcriteria.criteria_index, action="move_down") }}'> Move down</a>
+                                {% endif %}
+                            </span>
+                            <ul class="app-task-list__items">
+                                {% for theme in subcriteria.themes %}
+                                    <li class="app-task-list__item task-list__new-design">
+                                        <span class="app-task-list__task-name">
+                                            <h3 class="govuk-body">
+                                                {{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ theme.name }}
+                                            </h3>
+                                        </span>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+    {% endif %}
+{% endblock content %}
diff --git a/app/blueprints/fund_builder/templates/subcriteria.html b/app/blueprints/fund_builder/templates/subcriteria.html
new file mode 100644
index 0000000..b9d9793
--- /dev/null
+++ b/app/blueprints/fund_builder/templates/subcriteria.html
@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+{% set pageHeading %}
+    {% if form.subcriteria_id.data %}Update{% else %}Create{% endif %}&nbsp;Subcriteria
+{% endset %}
+
+{% from "macros/wtfToGovUk.html" import input %}
+{% from "macros/wtfToGovUk.html" import yes_no %}
+{%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
+{%- from "govuk_frontend_jinja/components/select/macro.html" import govukSelect -%}
+
+{% block content %}
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
+            <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
+            <form method="POST">
+                <div class="govuk-form-group">
+                    <h3 class="govuk-heading-m">Subcriteria Name</h3>
+                    {{ form.hidden_tag() }}
+                    {{ input(form.name) }}
+                </div>
+                {{ govukButton({"text": "Save"}) }}
+            </form>
+        </div>
+    </div>
+    {% if form.subcriteria_id.data %}
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">
+                <h3 class="govuk-heading-m">Themes</h3>
+                {{
+                    govukButton({
+                        "text": "Add Themes",
+                        "href": "" ,
+                        "classes": "govuk-button--secondary"
+                    })
+                }}
+                <ul class="app-task-list__items">
+                </ul>
+            </div>
+        </div>
+    {% endif %}
+{% endblock content %}
diff --git a/app/blueprints/self_serve/templates/create_section.html b/app/blueprints/self_serve/templates/.html
similarity index 100%
rename from app/blueprints/self_serve/templates/create_section.html
rename to app/blueprints/self_serve/templates/.html
diff --git a/app/db/models/assessment_config.py b/app/db/models/assessment_config.py
index 0d906aa..dfd9f3d 100644
--- a/app/db/models/assessment_config.py
+++ b/app/db/models/assessment_config.py
@@ -10,6 +10,7 @@
 from sqlalchemy.dialects.postgresql import JSON
 from sqlalchemy.dialects.postgresql import REAL
 from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import relationship
 from sqlalchemy.types import Boolean
@@ -32,12 +33,18 @@ class Criteria(BaseModel):
         ForeignKey("round.round_id"),
         nullable=True,
     )
+    round = relationship("Round", back_populates="criteria")
     name = Column(String())
     weighting = Column(REAL(precision=2))
     template_name = Column("Template Name", String(), nullable=True)
     is_template = Column("is_template", Boolean, default=False, nullable=False)
     audit_info = Column("audit_info", JSON(none_as_null=True))
-    subcriteria: Mapped[List["Subcriteria"]] = relationship("Subcriteria")
+    subcriteria: Mapped[List["Subcriteria"]] = relationship(
+        "Subcriteria",
+        order_by="Subcriteria.criteria_index",
+        collection_class=ordering_list("criteria_index", count_from=1),
+        passive_deletes="all",
+    )
     index = Column(Integer())
     source_template_id = Column(UUID(as_uuid=True), nullable=True)
 
@@ -54,11 +61,17 @@ class Subcriteria(BaseModel):
         ForeignKey("criteria.criteria_id"),
         nullable=True,
     )
+    criteria = relationship("Criteria", back_populates="subcriteria")
     name = Column(String())
     template_name = Column(String(), nullable=True)
     is_template = Column("is_template", Boolean, default=False, nullable=False)
     audit_info = Column("audit_info", JSON(none_as_null=True))
-    themes: Mapped[List["Theme"]] = relationship("Theme")
+    themes: Mapped[List["Theme"]] = relationship(
+        "Theme",
+        order_by="Theme.subcriteria_index",
+        collection_class=ordering_list("subcriteria_index", count_from=1),
+        passive_deletes="all",
+    )
     criteria_index = Column(Integer())
     source_template_id = Column(UUID(as_uuid=True), nullable=True)
 
diff --git a/app/db/models/round.py b/app/db/models/round.py
index 09a4f8a..95c36fb 100644
--- a/app/db/models/round.py
+++ b/app/db/models/round.py
@@ -38,6 +38,7 @@ class Round(BaseModel):
         ForeignKey("fund.fund_id"),
         nullable=False,
     )
+    fund = relationship("Fund", back_populates="rounds")
     title_json = Column(JSON(none_as_null=True), nullable=False, unique=False)
     short_name = Column(db.String(), nullable=False, unique=False)
     opens = Column(DateTime())
@@ -57,7 +58,12 @@ class Round(BaseModel):
         collection_class=ordering_list("index", count_from=1),
         passive_deletes="all",
     )
-    criteria: Mapped[list["Criteria"]] = relationship("Criteria")
+    criteria: Mapped[list["Criteria"]] = relationship(
+        "Criteria",
+        order_by="Criteria.index",
+        collection_class=ordering_list("index", count_from=1),
+        passive_deletes="all",
+    )
     # several other fields to add
     application_reminder_sent = Column(Boolean, default=False, nullable=False)
     contact_us_banner_json = Column(JSON(none_as_null=True), nullable=True, unique=False)
diff --git a/app/db/queries/application.py b/app/db/queries/application.py
index 62ad9e1..e24877c 100644
--- a/app/db/queries/application.py
+++ b/app/db/queries/application.py
@@ -9,6 +9,8 @@
 from app.db.models import Lizt
 from app.db.models import Page
 from app.db.models import Section
+from app.db.models.assessment_config import Criteria
+from app.db.models.assessment_config import Subcriteria
 from app.db.models.round import Round
 from app.db.queries.round import get_round_by_id
 
@@ -22,6 +24,14 @@ def get_section_by_id(section_id) -> Section:
     return s
 
 
+def get_criteria_by_id(criteria_id) -> Criteria:
+    return db.session.query(Criteria).where(Criteria.criteria_id == criteria_id).one_or_none()
+
+
+def get_subcriteria_by_id(subcriteria_id) -> Subcriteria:
+    return db.session.query(Subcriteria).where(Subcriteria.subcriteria_id == subcriteria_id).one_or_none()
+
+
 def get_all_template_forms() -> list[Form]:
     return db.session.query(Form).where(Form.is_template == True).all()  # noqa:E712
 
@@ -155,7 +165,6 @@ def clone_single_form(form_id: str, new_section_id=None, section_index=0) -> For
     cloned_pages = []
     cloned_components = []
     for page_to_clone in form_to_clone.pages:
-
         cloned_page = _initiate_cloned_page(page_to_clone, new_form_id=clone.form_id)
         cloned_pages.append(cloned_page)
         cloned_components.extend(_initiate_cloned_components_for_page(page_to_clone.components, cloned_page.page_id))
@@ -171,7 +180,6 @@ def _initiate_cloned_components_for_page(
 ):
     cloned_components = []
     for component_to_clone in components_to_clone:
-
         cloned_component = _initiate_cloned_component(
             component_to_clone, new_page_id=new_page_id, new_theme_id=None
         )  # TODO how should themes work when cloning?
@@ -273,6 +281,43 @@ def insert_new_section(new_section_config):
     return section
 
 
+def insert_new_criteria(new_criteria_config):
+    criteria = Criteria(
+        criteria_id=uuid4(),
+        round_id=new_criteria_config.get("round_id", None),
+        name=new_criteria_config.get("name"),
+        weighting=new_criteria_config.get("weighting"),
+        template_name=new_criteria_config.get("template_name", None),
+        is_template=new_criteria_config.get("is_template", False),
+        source_template_id=new_criteria_config.get("source_template_id", None),
+        audit_info=new_criteria_config.get("audit_info", {}),
+        index=new_criteria_config.get("index"),
+    )
+
+    db.session.add(criteria)
+    db.session.commit()
+
+    return criteria
+
+
+def insert_new_subcriteria(new_subcriteria_config):
+    subcriteria = Subcriteria(
+        subcriteria_id=uuid4(),
+        criteria_id=new_subcriteria_config.get("criteria_id"),
+        name=new_subcriteria_config.get("name"),
+        template_name=new_subcriteria_config.get("template_name", None),
+        is_template=new_subcriteria_config.get("is_template", False),
+        source_template_id=new_subcriteria_config.get("source_template_id", None),
+        audit_info=new_subcriteria_config.get("audit_info", {}),
+        criteria_index=new_subcriteria_config.get("criteria_index"),
+    )
+
+    db.session.add(subcriteria)
+    db.session.commit()
+
+    return subcriteria
+
+
 def update_section(section_id, new_section_config):
     section = db.session.query(Section).where(Section.section_id == section_id).one_or_none()
     if section:
@@ -288,6 +333,34 @@ def update_section(section_id, new_section_config):
     return section
 
 
+def update_criteria(criteria_id, new_criteria_config):
+    criteria = db.session.query(Criteria).where(Criteria.criteria_id == criteria_id).one_or_none()
+    if criteria:
+        allowed_keys = ["round_id", "name", "weighting", "is_template", "audit_info", "index"]
+
+        for key, value in new_criteria_config.items():
+            if key in allowed_keys:
+                setattr(criteria, key, value)
+
+        db.session.commit()
+
+    return criteria
+
+
+def update_subcriteria(subcriteria_id, new_subcriteria_config):
+    subcriteria = db.session.query(Subcriteria).where(Subcriteria.subcriteria_id == subcriteria_id).one_or_none()
+    if subcriteria:
+        allowed_keys = ["name", "is_template", "audit_info", "criteria_index"]
+
+        for key, value in new_subcriteria_config.items():
+            if key in allowed_keys:
+                setattr(subcriteria, key, value)
+
+        db.session.commit()
+
+    return subcriteria
+
+
 def delete_section_from_round(round_id, section_id, cascade: bool = False):
     """Removes a section from the application config for a round. Uses `reorder()` on the
     round to update numbering so if there are 3 sections in a round numbered as follows:

From 9249ca45c317a722aa5b16e9e3ce6453e8f20e9b Mon Sep 17 00:00:00 2001
From: Albert Artur Kolozsvari <albertartk@gmail.com>
Date: Sun, 15 Dec 2024 21:52:42 +0000
Subject: [PATCH 4/4] Finish rest

---
 app/blueprints/fund_builder/forms/theme.py    |  10 +
 app/blueprints/fund_builder/routes.py         | 185 ++++++++++++++++--
 .../templates/build_application.html          |  47 ++++-
 .../fund_builder/templates/criteria.html      |  40 +++-
 .../fund_builder/templates/subcriteria.html   |  43 +++-
 .../fund_builder/templates/theme.html         |  70 +++++++
 app/db/models/application_config.py           |   9 +-
 app/db/models/assessment_config.py            |   8 +-
 app/db/queries/application.py                 | 168 ++++++++++++++++
 .../generate_assessment_config.py             | 111 +++++------
 10 files changed, 603 insertions(+), 88 deletions(-)
 create mode 100644 app/blueprints/fund_builder/forms/theme.py
 create mode 100644 app/blueprints/fund_builder/templates/theme.html

diff --git a/app/blueprints/fund_builder/forms/theme.py b/app/blueprints/fund_builder/forms/theme.py
new file mode 100644
index 0000000..7e32e9f
--- /dev/null
+++ b/app/blueprints/fund_builder/forms/theme.py
@@ -0,0 +1,10 @@
+from flask_wtf import FlaskForm
+from wtforms import HiddenField
+from wtforms import StringField
+from wtforms.validators import DataRequired
+
+
+class ThemeForm(FlaskForm):
+    theme_id = HiddenField("Theme ID")
+    subcriteria_id = HiddenField("Subcriteria ID")
+    name = StringField("Name", validators=[DataRequired()])
diff --git a/app/blueprints/fund_builder/routes.py b/app/blueprints/fund_builder/routes.py
index 2c7b2b5..a54d865 100644
--- a/app/blueprints/fund_builder/routes.py
+++ b/app/blueprints/fund_builder/routes.py
@@ -26,28 +26,45 @@
 from app.blueprints.fund_builder.forms.round import get_datetime
 from app.blueprints.fund_builder.forms.section import SectionForm
 from app.blueprints.fund_builder.forms.subcriteria import SubcriteriaForm
+from app.blueprints.fund_builder.forms.theme import ThemeForm
 from app.db.models.fund import Fund
 from app.db.models.fund import FundingType
 from app.db.models.round import Round
+from app.db.queries.application import assign_components_to_theme
 from app.db.queries.application import clone_single_form
 from app.db.queries.application import clone_single_round
+from app.db.queries.application import delete_component_from_theme
+from app.db.queries.application import delete_criteria_from_round
 from app.db.queries.application import delete_form_from_section
 from app.db.queries.application import delete_section_from_round
+from app.db.queries.application import delete_subcriteria_from_criteria
+from app.db.queries.application import delete_theme_from_subcriteria
 from app.db.queries.application import get_all_template_forms
 from app.db.queries.application import get_criteria_by_id
 from app.db.queries.application import get_form_by_id
 from app.db.queries.application import get_section_by_id
 from app.db.queries.application import get_subcriteria_by_id
+from app.db.queries.application import get_theme_by_id
 from app.db.queries.application import insert_new_criteria
 from app.db.queries.application import insert_new_section
 from app.db.queries.application import insert_new_subcriteria
+from app.db.queries.application import insert_new_theme
+from app.db.queries.application import move_component_down
+from app.db.queries.application import move_component_up
+from app.db.queries.application import move_criteria_down
+from app.db.queries.application import move_criteria_up
 from app.db.queries.application import move_form_down
 from app.db.queries.application import move_form_up
 from app.db.queries.application import move_section_down
 from app.db.queries.application import move_section_up
+from app.db.queries.application import move_subcriteria_down
+from app.db.queries.application import move_subcriteria_up
+from app.db.queries.application import move_theme_down
+from app.db.queries.application import move_theme_up
 from app.db.queries.application import update_criteria
 from app.db.queries.application import update_section
 from app.db.queries.application import update_subcriteria
+from app.db.queries.application import update_theme
 from app.db.queries.fund import add_fund
 from app.db.queries.fund import get_all_funds
 from app.db.queries.fund import get_fund_by_id
@@ -109,14 +126,22 @@ def criteria(round_id):
     existing_criteria = None
 
     if request.args.get("action") == "remove":
-        # to do: remove criteria
-        return redirect(url_for("build_fund_bp.build_application", round_id=round_id))
+        delete_criteria_from_round(criteria_id=request.args.get("criteria_id"), round_id=round_id)
+
+        # send them where they came from
+        return redirect(request.referrer)
+
     if request.args.get("action") == "move_up":
-        # to do: move_up criteria
-        return redirect(url_for("build_fund_bp.build_application", round_id=round_id))
+        move_criteria_up(round_id=round_id, index_to_move_up=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
+
     if request.args.get("action") == "move_down":
-        # to do: move_down criteria
-        return redirect(url_for("build_fund_bp.build_application", round_id=round_id))
+        move_criteria_down(round_id=round_id, index_to_move_down=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
 
     if form.validate_on_submit():
         if form.criteria_id.data:
@@ -137,7 +162,8 @@ def criteria(round_id):
                 }
             )
 
-        return redirect(url_for("build_fund_bp.build_application", round_id=round_obj.round_id))
+        # send them where they came from
+        return redirect(request.referrer)
 
     if criteria_id := request.args.get("criteria_id"):
         existing_criteria = get_criteria_by_id(criteria_id)
@@ -179,14 +205,22 @@ def subcriteria(criteria_id):
     existing_subcriteria = None
 
     if request.args.get("action") == "remove":
-        # to do: remove criteria
-        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+        delete_subcriteria_from_criteria(subcriteria_id=request.args.get("subcriteria_id"), criteria_id=criteria_id)
+
+        # send them where they came from
+        return redirect(request.referrer)
+
     if request.args.get("action") == "move_up":
-        # to do: move_up criteria
-        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+        move_subcriteria_up(criteria_id=criteria_id, index_to_move_up=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
+
     if request.args.get("action") == "move_down":
-        # to do: move_down criteria
-        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+        move_subcriteria_down(criteria_id=criteria_id, index_to_move_down=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
 
     if form.validate_on_submit():
         if form.subcriteria_id.data:
@@ -203,7 +237,8 @@ def subcriteria(criteria_id):
                 }
             )
 
-        return redirect(url_for("build_fund_bp.build_application", round_id=criteria.round_id))
+        # send them where they came from
+        return redirect(request.referrer)
 
     if subcriteria_id := request.args.get("subcriteria_id"):
         existing_subcriteria = get_subcriteria_by_id(subcriteria_id)
@@ -239,6 +274,104 @@ def subcriteria(criteria_id):
     return render_template("subcriteria.html", form=form, **params)
 
 
+@build_fund_bp.route("/subcriteria/<subcriteria_id>/theme", methods=["GET", "POST"])
+def theme(subcriteria_id):
+    subcriteria = get_subcriteria_by_id(subcriteria_id)
+    form: ThemeForm = ThemeForm()
+    form.subcriteria_id.data = subcriteria_id
+    params = {
+        "subcriteria_id": str(subcriteria_id),
+    }
+    existing_theme = None
+
+    if request.args.get("action") == "remove":
+        delete_theme_from_subcriteria(theme_id=request.args.get("theme_id"), subcriteria_id=subcriteria_id)
+
+        # send them where they came from
+        return redirect(request.referrer)
+
+    if request.args.get("action") == "move_up":
+        move_theme_up(subcriteria_id=subcriteria_id, index_to_move_up=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
+
+    if request.args.get("action") == "move_down":
+        move_theme_down(subcriteria_id=subcriteria_id, index_to_move_down=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
+
+    if form.validate_on_submit():
+        if form.theme_id.data:
+            update_theme(
+                form.theme_id.data,
+                {"name": form.name.data},
+            )
+        else:
+            insert_new_theme(
+                {
+                    "subcriteria_id": form.subcriteria_id.data,
+                    "name": form.name.data,
+                    "subcriteria_index": max(len(subcriteria.themes) + 1, 1),
+                }
+            )
+
+        # send them where they came from
+        return redirect(request.referrer)
+
+    if theme_id := request.args.get("theme_id"):
+        existing_theme = get_theme_by_id(theme_id)
+        form.theme_id.data = theme_id
+        form.name.data = existing_theme.name
+        params["theme"] = existing_theme
+        params["available_template_forms"] = [
+            {"text": f"{f.template_name} - {f.name_in_apply_json['en']}", "value": str(f.form_id)}
+            for f in get_all_template_forms()
+        ]
+
+    params["breadcrumb_items"] = [
+        {
+            "text": "Home",
+            "href": url_for(BUILD_FUND_BP_DASHBOARD),
+        },
+        {
+            "text": subcriteria.criteria.round.fund.name_json["en"],
+            "href": url_for("build_fund_bp.view_fund", fund_id=subcriteria.criteria.round.fund_id),
+        },
+        {
+            "text": subcriteria.criteria.round.title_json["en"],
+            "href": url_for(
+                "build_fund_bp.build_application",
+                fund_id=subcriteria.criteria.round.fund_id,
+                round_id=subcriteria.criteria.round_id,
+            ),
+        },
+        {
+            "text": subcriteria.criteria.name,
+            "href": url_for(
+                "build_fund_bp.criteria",
+                round_id=subcriteria.criteria.round_id,
+                criteria_id=subcriteria.criteria_id,
+            ),
+        },
+        {
+            "text": subcriteria.name,
+            "href": url_for(
+                "build_fund_bp.subcriteria",
+                subcriteria_id=subcriteria.subcriteria_id,
+                criteria_id=subcriteria.criteria_id,
+            ),
+        },
+        {
+            "text": existing_theme.name if existing_theme else "Add Theme",
+            "href": "#",
+        },
+    ]
+
+    return render_template("theme.html", form=form, **params)
+
+
 @build_fund_bp.route("/fund/round/<round_id>/section", methods=["GET", "POST"])
 def section(round_id):
     round_obj = get_round_by_id(round_id)
@@ -321,6 +454,28 @@ def configure_forms_in_section(round_id, section_id):
     return redirect(url_for("build_fund_bp.section", round_id=round_id, section_id=section_id))
 
 
+@build_fund_bp.route("/theme/<theme_id>/forms", methods=["POST", "GET"])
+def configure_forms_in_theme(theme_id):
+    theme = get_theme_by_id(theme_id=theme_id)
+    if request.method == "GET":
+        if request.args.get("action") == "remove":
+            component_id = request.args.get("component_id")
+            delete_component_from_theme(theme_id=theme_id, component_id=component_id)
+        if request.args.get("action") == "move_up":
+            move_component_up(theme_id=theme_id, index_to_move_up=int(request.args.get("index")))
+        if request.args.get("action") == "move_down":
+            move_component_down(theme_id=theme_id, index_to_move_down=int(request.args.get("index")))
+
+        # send them where they came from
+        return redirect(request.referrer)
+
+    # if request.method == "POST":
+    template_id = request.form.get("template_id")
+    assign_components_to_theme(template_id, theme)
+
+    return redirect(url_for("build_fund_bp.theme", subcriteria_id=theme.subcriteria_id, theme_id=theme_id))
+
+
 def all_funds_as_govuk_select_items(all_funds: list) -> list:
     """
     Reformats a list of funds into a list of display/value items that can be passed to a govUk select macro
@@ -810,7 +965,7 @@ def create_export_files(round_id):
     generate_form_jsons_for_round(round_id, base_output_dir)
     generate_all_round_html(round_id, base_output_dir)
     fund_config, round_config = generate_config_for_round(round_id, base_output_dir)
-    generate_assessment_config_for_round(fund_config, round_config, base_output_dir)
+    generate_assessment_config_for_round(round_config, base_output_dir)
     output_zip_path = create_export_zip(
         directory_to_zip=base_output_dir, zip_file_name=round_short_name, random_post_fix=random_post_fix
     )
diff --git a/app/blueprints/fund_builder/templates/build_application.html b/app/blueprints/fund_builder/templates/build_application.html
index 8026a63..7d00a48 100644
--- a/app/blueprints/fund_builder/templates/build_application.html
+++ b/app/blueprints/fund_builder/templates/build_application.html
@@ -81,12 +81,12 @@ <h3 class="govuk-heading-m">{{ criteria.index }}. {{ criteria.name }}</h3>
                 </span>
                 <span class="app-task-list__task-actions">
                     <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria", round_id=round.round_id, criteria_id=criteria.criteria_id) }}'>Edit</a>&nbsp;
-                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria",round_id=round.round_id, criteria_id=criteria.criteria_id, action="remove") }}'>Remove</a>&nbsp;
+                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria", round_id=round.round_id, criteria_id=criteria.criteria_id, action="remove") }}'>Remove</a>&nbsp;
                     {% if criteria.index > 1 %}
-                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria",round_id=round.round_id, index=criteria.index, action="move_up") }}'>Move up</a>&nbsp;
+                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria", round_id=round.round_id, index=criteria.index, action="move_up") }}'>Move up</a>&nbsp;
                     {% endif %}
                     {% if criteria.index < round.criteria | length %}
-                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria",round_id=round.round_id, index=criteria.index, action="move_down") }}'> Move down</a>
+                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.criteria", round_id=round.round_id, index=criteria.index, action="move_down") }}'> Move down</a>
                     {% endif %}
                 </span>
                 <ul class="app-task-list__items">
@@ -94,7 +94,7 @@ <h3 class="govuk-heading-m">{{ criteria.index }}. {{ criteria.name }}</h3>
                         <li class="app-task-list__item task-list__new-design">
                             <span class="app-task-list__task-name">
                                 <h3 class="govuk-body">
-                                    {{ criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ subcriteria.name }}
+                                    <strong>{{ criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ subcriteria.name }}</strong>
                                 </h3>
                             </span>
                             <span class="app-task-list__task-actions">
@@ -108,6 +108,45 @@ <h3 class="govuk-body">
                                 {% endif %}
                             </span>
                         </li>
+                        {% for theme in subcriteria.themes %}
+                            <li class="app-task-list__item task-list__new-design">
+                                <span class="app-task-list__task-name">
+                                    <h3 class="govuk-body">
+                                        <u>{{ criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ theme.name }}</u>
+                                    </h3>
+                                </span>
+                                <span class="app-task-list__task-actions">
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", theme_id=theme.theme_id, subcriteria_id=subcriteria.subcriteria_id) }}'>Edit</a>&nbsp;
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", theme_id=theme.theme_id, subcriteria_id=subcriteria.subcriteria_id, action="remove") }}'>Remove</a>&nbsp;
+                                    {% if theme.subcriteria_index > 1 %}
+                                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id, index=theme.subcriteria_index, action="move_up") }}'>Move up</a>&nbsp;
+                                    {% endif %}
+                                    {% if theme.subcriteria_index < subcriteria.themes | length %}
+                                        <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id, index=theme.subcriteria_index, action="move_down") }}'> Move down</a>
+                                    {% endif %}
+                                </span>
+                            </li>
+                            {% for component in theme.components %}
+                                <li class="app-task-list__item task-list__new-design">
+                                    <span class="app-task-list__task-name">
+                                        <h3 class="govuk-body">
+                                            {{ criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ component.theme_index }}.&nbsp;
+                                            {{ component.runner_component_name }}&nbsp;-&nbsp;
+                                            {{ (component.title[:50] + '...') if component.title and component.title|length > 50 else component.title }}
+                                        </h3>
+                                    </span>
+                                    <span class="app-task-list__task-actions">
+                                        <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', component_id=component.component_id, theme_id=theme.theme_id, action='remove') }}">Remove</a>&nbsp;
+                                        {% if component.theme_index > 1 %}
+                                            <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=theme.theme_id, index=component.theme_index, action='move_up') }}">Move up</a>&nbsp;
+                                        {% endif %}
+                                        {% if component.theme_index < theme.components | length %}
+                                            <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=theme.theme_id, index=component.theme_index, action='move_down') }}"> Move down</a>
+                                        {% endif %}
+                                    </span>
+                                </li>
+                            {% endfor %}
+                        {% endfor %}
                     {% endfor %}
                 </ul>
             </li>
diff --git a/app/blueprints/fund_builder/templates/criteria.html b/app/blueprints/fund_builder/templates/criteria.html
index 447b9e3..00550fe 100644
--- a/app/blueprints/fund_builder/templates/criteria.html
+++ b/app/blueprints/fund_builder/templates/criteria.html
@@ -12,6 +12,12 @@
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
             <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
+            <p class="govuk-body">Criteria can be:</p>
+            <ul class="app-task-list__items">
+                <li><span class="govuk-body">- Unscored</span></li>
+                <li><span class="govuk-body">- Scored</span></li>
+                <li><span class="govuk-body">- Declarations</span></li>
+            </ul>
             <form method="POST">
                 <div class="govuk-form-group">
                     <h3 class="govuk-heading-m">Criteria Name</h3>
@@ -38,7 +44,7 @@ <h3 class="govuk-heading-m">Subcriteria of this criteria</h3>
                     {% for subcriteria in criteria.subcriteria %}
                         <li>
                             <span class="app-task-list__task-name">
-                                <h3 class="govuk-heading-m">{{ subcriteria.criteria_index }}. {{ subcriteria.name }}</h3>
+                                <h3 class="govuk-heading-m">{{ subcriteria.criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}. {{ subcriteria.name }}</h3>
                             </span>
                             <span class="app-task-list__task-actions">
                                 <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.subcriteria", criteria_id=criteria.criteria_id, subcriteria_id=subcriteria.subcriteria_id) }}'>Edit</a>&nbsp;
@@ -55,10 +61,40 @@ <h3 class="govuk-heading-m">{{ subcriteria.criteria_index }}. {{ subcriteria.nam
                                     <li class="app-task-list__item task-list__new-design">
                                         <span class="app-task-list__task-name">
                                             <h3 class="govuk-body">
-                                                {{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ theme.name }}
+                                                <strong>{{ subcriteria.criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ theme.name }}</strong>
                                             </h3>
                                         </span>
+                                        <span class="app-task-list__task-actions">
+                                            <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", theme_id=theme.theme_id, subcriteria_id=subcriteria.subcriteria_id) }}'>Edit</a>&nbsp;
+                                            <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", theme_id=theme.theme_id, subcriteria_id=subcriteria.subcriteria_id, action="remove") }}'>Remove</a>&nbsp;
+                                            {% if theme.subcriteria_index > 1 %}
+                                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id, index=theme.subcriteria_index, action="move_up") }}'>Move up</a>&nbsp;
+                                            {% endif %}
+                                            {% if theme.subcriteria_index < subcriteria.themes | length %}
+                                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id, index=theme.subcriteria_index, action="move_down") }}'> Move down</a>
+                                            {% endif %}
+                                        </span>
                                     </li>
+                                    {% for component in theme.components %}
+                                        <li class="app-task-list__item task-list__new-design">
+                                            <span class="app-task-list__task-name">
+                                                <h3 class="govuk-body">
+                                                    {{ subcriteria.criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ component.theme_index }}.&nbsp;
+                                                    {{ component.runner_component_name }}&nbsp;-&nbsp;
+                                                    {{ (component.title[:50] + '...') if component.title and component.title|length > 50 else component.title }}
+                                                </h3>
+                                            </span>
+                                            <span class="app-task-list__task-actions">
+                                                <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', component_id=component.component_id, theme_id=theme.theme_id, action='remove') }}">Remove</a>&nbsp;
+                                                {% if component.theme_index > 1 %}
+                                                    <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=theme.theme_id, index=component.theme_index, action='move_up') }}">Move up</a>&nbsp;
+                                                {% endif %}
+                                                {% if component.theme_index < theme.components | length %}
+                                                    <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=theme.theme_id, index=component.theme_index, action='move_down') }}"> Move down</a>
+                                                {% endif %}
+                                            </span>
+                                        </li>
+                                    {% endfor %}
                                 {% endfor %}
                             </ul>
                         </li>
diff --git a/app/blueprints/fund_builder/templates/subcriteria.html b/app/blueprints/fund_builder/templates/subcriteria.html
index b9d9793..d29645c 100644
--- a/app/blueprints/fund_builder/templates/subcriteria.html
+++ b/app/blueprints/fund_builder/templates/subcriteria.html
@@ -25,15 +25,54 @@ <h3 class="govuk-heading-m">Subcriteria Name</h3>
     {% if form.subcriteria_id.data %}
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-full">
-                <h3 class="govuk-heading-m">Themes</h3>
+                <h3 class="govuk-heading-m">Themes of this subcriteria</h3>
                 {{
                     govukButton({
                         "text": "Add Themes",
-                        "href": "" ,
+                        "href": url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id),
                         "classes": "govuk-button--secondary"
                     })
                 }}
                 <ul class="app-task-list__items">
+                    {% for theme in subcriteria.themes %}
+                        <li>
+                            <span class="app-task-list__task-name">
+                                <h3 class="govuk-heading-m">{{ subcriteria.criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ theme.name }}</h3>
+                            </span>
+                            <span class="app-task-list__task-actions">
+                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", theme_id=theme.theme_id, subcriteria_id=subcriteria.subcriteria_id) }}'>Edit</a>&nbsp;
+                                <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", theme_id=theme.theme_id, subcriteria_id=subcriteria.subcriteria_id, action="remove") }}'>Remove</a>&nbsp;
+                                {% if theme.subcriteria_index > 1 %}
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id, index=theme.subcriteria_index, action="move_up") }}'>Move up</a>&nbsp;
+                                {% endif %}
+                                {% if theme.subcriteria_index < subcriteria.themes | length %}
+                                    <a class="govuk-link--no-visited-state" href='{{ url_for("build_fund_bp.theme", subcriteria_id=subcriteria.subcriteria_id, index=theme.subcriteria_index, action="move_down") }}'> Move down</a>
+                                {% endif %}
+                            </span>
+                            <ul class="app-task-list__items">
+                                {% for component in theme.components %}
+                                    <li class="app-task-list__item task-list__new-design">
+                                        <span class="app-task-list__task-name">
+                                            <h3 class="govuk-body">
+                                                {{ subcriteria.criteria.index }}.&nbsp;{{ subcriteria.criteria_index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ component.theme_index }}.&nbsp;
+                                                {{ component.runner_component_name }}&nbsp;-&nbsp;
+                                                {{ (component.title[:50] + '...') if component.title and component.title|length > 50 else component.title }}
+                                            </h3>
+                                        </span>
+                                        <span class="app-task-list__task-actions">
+                                            <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', component_id=component.component_id, theme_id=theme.theme_id, action='remove') }}">Remove</a>&nbsp;
+                                            {% if component.theme_index > 1 %}
+                                                <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=theme.theme_id, index=component.theme_index, action='move_up') }}">Move up</a>&nbsp;
+                                            {% endif %}
+                                            {% if component.theme_index < theme.components | length %}
+                                                <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=theme.theme_id, index=component.theme_index, action='move_down') }}"> Move down</a>
+                                            {% endif %}
+                                        </span>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </li>
+                    {% endfor %}
                 </ul>
             </div>
         </div>
diff --git a/app/blueprints/fund_builder/templates/theme.html b/app/blueprints/fund_builder/templates/theme.html
new file mode 100644
index 0000000..f9d7464
--- /dev/null
+++ b/app/blueprints/fund_builder/templates/theme.html
@@ -0,0 +1,70 @@
+{% extends "base.html" %}
+{% set pageHeading %}
+    {% if form.subcriteria_id.data %}Update{% else %}Create{% endif %}&nbsp;Theme
+{% endset %}
+
+{% from "macros/wtfToGovUk.html" import input %}
+{% from "macros/wtfToGovUk.html" import yes_no %}
+{%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
+{%- from "govuk_frontend_jinja/components/select/macro.html" import govukSelect -%}
+
+{% block content %}
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
+            <h1 class="govuk-heading-l">{{ pageHeading }}</h1>
+            <form method="POST">
+                <div class="govuk-form-group">
+                    <h3 class="govuk-heading-m">Theme Name</h3>
+                    {{ form.hidden_tag() }}
+                    {{ input(form.name) }}
+                </div>
+                {{ govukButton({"text": "Save"}) }}
+            </form>
+        </div>
+    </div>
+    {% if form.theme_id.data %}
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">
+                <span class="app-task-list__task-name">
+                    <h3 class="govuk-heading-m">Components of this theme's forms</h3>
+                </span>
+                <ul class="app-task-list__items">
+                    {% for component in theme.components %}
+                        <li class="app-task-list__item task-list__new-design">
+                            <span class="app-task-list__task-name">
+                                <h3 class="govuk-body">
+                                    {{ theme.subcriteria.criteria.index }}.&nbsp;{{ theme.subcriteria_index }}.&nbsp;{{ component.theme_index }}.&nbsp;
+                                    {{ component.runner_component_name }}&nbsp;-&nbsp;
+                                    {{ (component.title[:50] + '...') if component.title and component.title|length > 50 else component.title }}
+                                </h3>
+                            </span>
+                            <span class="app-task-list__task-actions">
+                                <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', component_id=component.component_id, theme_id=form.theme_id.data, action='remove') }}">Remove</a>&nbsp;
+                                {% if component.theme_index > 1 %}
+                                    <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=form.theme_id.data, index=component.theme_index, action='move_up') }}">Move up</a>&nbsp;
+                                {% endif %}
+                                {% if component.theme_index < theme.components | length %}
+                                    <a class="govuk-link--no-visited-state" href="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=form.theme_id.data, index=component.theme_index, action='move_down') }}"> Move down</a>
+                                {% endif %}
+                            </span>
+                        </li>
+                    {% endfor %}
+                </ul>
+                <h3 class="govuk-heading-m">Add Form From Template</h3>
+                <form method="POST" action="{{ url_for('build_fund_bp.configure_forms_in_theme', theme_id=form.theme_id.data) }}">
+                    {{
+                        govukSelect({
+                            "id": "template_id",
+                            "name": "template_id",
+                            "label": {
+                                "text": "Create form from template"
+                            },
+                            "items": available_template_forms
+                        })
+                    }}
+                    {{ govukButton({"text": "Add"}) }}
+                </form>
+            </div>
+        </div>
+    {% endif %}
+{% endblock content %}
diff --git a/app/db/models/application_config.py b/app/db/models/application_config.py
index b349431..1dd44f7 100644
--- a/app/db/models/application_config.py
+++ b/app/db/models/application_config.py
@@ -66,7 +66,6 @@ class ComponentType(Enum):
 
 @dataclass
 class Section(BaseModel):
-
     round_id = Column(
         UUID(as_uuid=True),
         ForeignKey("round.round_id"),
@@ -102,7 +101,6 @@ def as_dict(self, include_relationships=False):
 
 @dataclass
 class Form(BaseModel):
-
     section_id = Column(
         UUID(as_uuid=True),
         ForeignKey("section.section_id"),
@@ -156,7 +154,6 @@ def as_dict(self):
 
 @dataclass
 class Page(BaseModel):
-
     form_id = Column(
         UUID(as_uuid=True),
         ForeignKey("form.form_id"),
@@ -188,6 +185,7 @@ class Page(BaseModel):
         ForeignKey("formsection.form_section_id"),
         nullable=True,
     )
+    form = relationship("Form", back_populates="pages")
     form_section_id: Mapped[int | None] = mapped_column(ForeignKey(FormSection.form_section_id))
     formsection: Mapped[FormSection | None] = relationship()
 
@@ -225,7 +223,6 @@ def as_dict(self):
 
 @dataclass
 class Component(BaseModel):
-
     component_id = Column(
         UUID(as_uuid=True),
         primary_key=True,
@@ -236,6 +233,7 @@ class Component(BaseModel):
         ForeignKey("page.page_id"),
         nullable=True,  # will be null where this is a template and not linked to a page
     )
+    page = relationship("Page", back_populates="components")
     theme_id = Column(
         UUID(as_uuid=True),
         ForeignKey("theme.theme_id"),
@@ -257,7 +255,8 @@ class Component(BaseModel):
     conditions = Column(JSON(none_as_null=True))
     source_template_id = Column(UUID(as_uuid=True), nullable=True)
     runner_component_name = Column(
-        String(), nullable=True  # None for display only fields
+        String(),
+        nullable=True,  # None for display only fields
     )  # TODO add validation to make sure it's only letters, numbers and _
     list_id = Column(
         UUID(as_uuid=True),
diff --git a/app/db/models/assessment_config.py b/app/db/models/assessment_config.py
index dfd9f3d..59d0c72 100644
--- a/app/db/models/assessment_config.py
+++ b/app/db/models/assessment_config.py
@@ -88,10 +88,16 @@ class Theme(BaseModel):
         ForeignKey("subcriteria.subcriteria_id"),
         nullable=True,
     )
+    subcriteria = relationship("Subcriteria", back_populates="themes")
     name = Column(String())
     template_name = Column("Template Name", String(), nullable=True)
     is_template = Column("is_template", Boolean, default=False, nullable=False)
     audit_info = Column("audit_info", JSON(none_as_null=True))
-    components: Mapped[List["Component"]] = relationship("Component")
+    components: Mapped[List["Component"]] = relationship(
+        "Component",
+        order_by="Component.theme_index",
+        collection_class=ordering_list("theme_index", count_from=1),
+        passive_deletes="all",
+    )
     subcriteria_index = Column(Integer())
     source_template_id = Column(UUID(as_uuid=True), nullable=True)
diff --git a/app/db/queries/application.py b/app/db/queries/application.py
index e24877c..1c70a60 100644
--- a/app/db/queries/application.py
+++ b/app/db/queries/application.py
@@ -1,3 +1,4 @@
+from itertools import chain
 from uuid import uuid4
 
 from sqlalchemy import delete
@@ -11,6 +12,7 @@
 from app.db.models import Section
 from app.db.models.assessment_config import Criteria
 from app.db.models.assessment_config import Subcriteria
+from app.db.models.assessment_config import Theme
 from app.db.models.round import Round
 from app.db.queries.round import get_round_by_id
 
@@ -32,6 +34,10 @@ def get_subcriteria_by_id(subcriteria_id) -> Subcriteria:
     return db.session.query(Subcriteria).where(Subcriteria.subcriteria_id == subcriteria_id).one_or_none()
 
 
+def get_theme_by_id(theme_id) -> Theme:
+    return db.session.query(Theme).where(Theme.theme_id == theme_id).one_or_none()
+
+
 def get_all_template_forms() -> list[Form]:
     return db.session.query(Form).where(Form.is_template == True).all()  # noqa:E712
 
@@ -175,6 +181,21 @@ def clone_single_form(form_id: str, new_section_id=None, section_index=0) -> For
     return clone
 
 
+def assign_components_to_theme(form_id: str, theme: Theme):
+    form: Form = db.session.query(Form).where(Form.form_id == form_id).one_or_none()
+    new_theme_index = max(len(theme.components) + 1, 1)
+    components = list(chain.from_iterable([page.components for page in form.pages]))
+    for component in components:
+        if component.theme_id is not None:
+            continue
+
+        component.theme_id = theme.theme_id
+        component.theme_index = new_theme_index
+        new_theme_index += 1
+
+    db.session.commit()
+
+
 def _initiate_cloned_components_for_page(
     components_to_clone: list[Component], new_page_id: str = None, new_theme_id: str = None
 ):
@@ -318,6 +339,24 @@ def insert_new_subcriteria(new_subcriteria_config):
     return subcriteria
 
 
+def insert_new_theme(new_theme_config):
+    theme = Theme(
+        theme_id=uuid4(),
+        subcriteria_id=new_theme_config.get("subcriteria_id"),
+        name=new_theme_config.get("name"),
+        template_name=new_theme_config.get("template_name", None),
+        is_template=new_theme_config.get("is_template", False),
+        source_template_id=new_theme_config.get("source_template_id", None),
+        audit_info=new_theme_config.get("audit_info", {}),
+        subcriteria_index=new_theme_config.get("subcriteria_index"),
+    )
+
+    db.session.add(theme)
+    db.session.commit()
+
+    return theme
+
+
 def update_section(section_id, new_section_config):
     section = db.session.query(Section).where(Section.section_id == section_id).one_or_none()
     if section:
@@ -361,6 +400,20 @@ def update_subcriteria(subcriteria_id, new_subcriteria_config):
     return subcriteria
 
 
+def update_theme(theme_id, new_theme_config):
+    theme = db.session.query(Theme).where(Theme.theme_id == theme_id).one_or_none()
+    if theme:
+        allowed_keys = ["name", "is_template", "audit_info", "subcriteria_index"]
+
+        for key, value in new_theme_config.items():
+            if key in allowed_keys:
+                setattr(theme, key, value)
+
+        db.session.commit()
+
+    return theme
+
+
 def delete_section_from_round(round_id, section_id, cascade: bool = False):
     """Removes a section from the application config for a round. Uses `reorder()` on the
     round to update numbering so if there are 3 sections in a round numbered as follows:
@@ -498,6 +551,55 @@ def delete_form_from_section(section_id, form_id, cascade: bool = False):
     db.session.commit()
 
 
+def delete_criteria_from_round(criteria_id, round_id):
+    round = db.session.query(Round).where(Round.round_id == round_id).one_or_none()
+    criteria = db.session.query(Criteria).where(Criteria.criteria_id == criteria_id).one_or_none()
+
+    # cascade delete subscriteria attached to scriteria
+    for subcriteria in criteria.subcriteria:
+        delete_subcriteria_from_criteria(subcriteria_id=subcriteria.subcriteria_id, criteria_id=criteria.criteria_id)
+
+    db.session.delete(criteria)
+    round.criteria.reorder()
+    db.session.commit()
+
+
+def delete_subcriteria_from_criteria(subcriteria_id, criteria_id):
+    criteria = db.session.query(Criteria).where(Criteria.criteria_id == criteria_id).one_or_none()
+    subcriteria = db.session.query(Subcriteria).where(Subcriteria.subcriteria_id == subcriteria_id).one_or_none()
+
+    # cascade delete themes attached to subscriteria
+    for theme in subcriteria.themes:
+        delete_theme_from_subcriteria(theme_id=theme.theme_id, subcriteria_id=subcriteria_id)
+
+    db.session.delete(subcriteria)
+    criteria.subcriteria.reorder()
+    db.session.commit()
+
+
+def delete_theme_from_subcriteria(theme_id, subcriteria_id):
+    subcriteria = db.session.query(Subcriteria).where(Subcriteria.subcriteria_id == subcriteria_id).one_or_none()
+    theme = db.session.query(Theme).where(Theme.theme_id == theme_id).one_or_none()
+
+    # detach components from theme
+    for component in theme.components:
+        delete_component_from_theme(component_id=component.component_id, theme_id=theme.theme_id)
+
+    db.session.delete(theme)
+    subcriteria.themes.reorder()
+    db.session.commit()
+
+
+def delete_component_from_theme(component_id, theme_id):
+    theme = get_theme_by_id(theme_id=theme_id)
+    component = get_component_by_id(component_id=component_id)
+    component.theme_id = None
+    component.theme_index = None
+    theme.components.reorder()
+
+    db.session.commit()
+
+
 def delete_form(form_id, cascade: bool = False):
     """Deletes a form. If cascade==True, cascades this delete down through the hierarchy to
     pages within this form and then components on those pages. It DOES NOT update the section_index
@@ -822,6 +924,72 @@ def move_form_up(section_id, form_index_to_move_up: int):
     db.session.commit()
 
 
+def move_component_up(theme_id, index_to_move_up: int):
+    theme: Theme = get_theme_by_id(theme_id)
+    list_index_to_move_up = index_to_move_up - 1  # Need the 0-based index inside the list
+
+    theme.components = swap_elements_in_list(theme.components, list_index_to_move_up, list_index_to_move_up - 1)
+    db.session.commit()
+
+
+def move_component_down(theme_id, index_to_move_down: int):
+    theme: Theme = get_theme_by_id(theme_id)
+    list_index_to_move_down = index_to_move_down - 1  # Need the 0-based index inside the list
+
+    theme.components = swap_elements_in_list(theme.components, list_index_to_move_down, list_index_to_move_down + 1)
+    db.session.commit()
+
+
+def move_theme_up(subcriteria_id, index_to_move_up: int):
+    subcriteria: Subcriteria = get_subcriteria_by_id(subcriteria_id)
+    list_index_to_move_up = index_to_move_up - 1  # Need the 0-based index inside the list
+
+    subcriteria.themes = swap_elements_in_list(subcriteria.themes, list_index_to_move_up, list_index_to_move_up - 1)
+    db.session.commit()
+
+
+def move_theme_down(subcriteria_id, index_to_move_down: int):
+    subcriteria: Subcriteria = get_subcriteria_by_id(subcriteria_id)
+    list_index_to_move_down = index_to_move_down - 1  # Need the 0-based index inside the list
+
+    subcriteria.themes = swap_elements_in_list(subcriteria.themes, list_index_to_move_down, list_index_to_move_down + 1)
+    db.session.commit()
+
+
+def move_subcriteria_up(criteria_id, index_to_move_up: int):
+    criteria: Criteria = get_criteria_by_id(criteria_id)
+    list_index_to_move_up = index_to_move_up - 1  # Need the 0-based index inside the list
+
+    criteria.subcriteria = swap_elements_in_list(criteria.subcriteria, list_index_to_move_up, list_index_to_move_up - 1)
+    db.session.commit()
+
+
+def move_subcriteria_down(criteria_id, index_to_move_down: int):
+    criteria: Criteria = get_criteria_by_id(criteria_id)
+    list_index_to_move_down = index_to_move_down - 1  # Need the 0-based index inside the list
+
+    criteria.subcriteria = swap_elements_in_list(
+        criteria.subcriteria, list_index_to_move_down, list_index_to_move_down + 1
+    )
+    db.session.commit()
+
+
+def move_criteria_up(round_id, index_to_move_up: int):
+    round: Round = get_round_by_id(round_id)
+    list_index_to_move_up = index_to_move_up - 1  # Need the 0-based index inside the list
+
+    round.criteria = swap_elements_in_list(round.criteria, list_index_to_move_up, list_index_to_move_up - 1)
+    db.session.commit()
+
+
+def move_criteria_down(round_id, index_to_move_down: int):
+    round: Round = get_round_by_id(round_id)
+    list_index_to_move_down = index_to_move_down - 1  # Need the 0-based index inside the list
+
+    round.criteria = swap_elements_in_list(round.criteria, list_index_to_move_down, list_index_to_move_down + 1)
+    db.session.commit()
+
+
 def insert_list(list_config: dict, do_commit: bool = True) -> Lizt:
     new_list = Lizt(
         is_template=True,
diff --git a/app/export_config/generate_assessment_config.py b/app/export_config/generate_assessment_config.py
index b0baa91..540668e 100644
--- a/app/export_config/generate_assessment_config.py
+++ b/app/export_config/generate_assessment_config.py
@@ -1,4 +1,3 @@
-import copy
 import json
 import os
 
@@ -8,10 +7,9 @@
 from app.db import db
 from app.db.models import Component
 from app.db.models import Criteria
-from app.db.models import Section
 from app.db.models import Subcriteria
 from app.db.models import Theme
-from app.db.models.application_config import READ_ONLY_COMPONENTS
+from app.db.models.round import Round
 from app.db.queries.application import get_form_for_component
 from app.export_config import helpers
 from app.export_config.generate_form import human_to_kebab_case
@@ -212,67 +210,62 @@ def generate_assessment_config(
         json.dump(assessment_config, f)
 
 
-def generate_assessment_config_for_round(fund_config, round_config, base_output_dir):
-    # The following config is not tested for production use
-    # It is generated to make local testing easier - you can add an application to fab and export it with a basic
-    # auto-generated assessment config.
-    # Each form is a sub-critiera, each page a theme. Half scored, half unscored.
-    # The output in the assessment_store folder needs to be added to the
-    # assessment_mapping_fund_round file in assessment-store
-    fund_id = fund_config["id"]
+def generate_assessment_config_for_round(round_config, base_output_dir):
     round_id = round_config["id"]
-    fund_short_name = fund_config["short_name"]
-    round_short_name = round_config["short_name"]
-    fund_round = f"{str.upper(fund_short_name)}{str.upper(round_short_name)}"
-    fund_round_ids = f"{fund_id}:{round_id}"
+    round = db.session.query(Round).filter(Round.round_id == round_id).one_or_none()
 
+    unscored_criteria = ["unscored", "declarations"]
     unscored = []
-    sections = db.session.query(Section).filter(Section.round_id == round_id).order_by(Section.index).all()
-    for i, section in enumerate(sections, start=1):
-        criteria = {
-            "id": human_to_kebab_case(section.name_in_apply_json["en"]),
-            "name": section.name_in_apply_json["en"],
-            "sub_criteria": [],
-        }
-        unscored.append(criteria)
+    scored = []
+    for criteria in round.criteria:
+        criteria_slug_name = human_to_kebab_case(criteria.name)
+        is_unscored = criteria_slug_name in unscored_criteria
+
+        export_subcrieria = []
+        for subcriteria in criteria.subcriteria:
+            export_theme = []
+            for theme in subcriteria.themes:
+                answers = []
+                for component in theme.components:
+                    answers.append(
+                        {
+                            "field_id": component.runner_component_name,
+                            "form_name": component.page.form.runner_publish_name,
+                            "field_type": component.type.value[0].lower() + component.type.value[1:],
+                            "presentation_type": form_json_to_assessment_display_types.get(component.type.name, "text"),
+                            "question": component.title,
+                        }
+                    )
+
+                export_theme.append(
+                    {
+                        "id": human_to_kebab_case(theme.name),
+                        "name": theme.name,
+                        "answers": answers,
+                    }
+                )
 
-        for form in section.forms:
-            sc = {
-                "id": form.runner_publish_name,
-                "name": form.name_in_apply_json["en"],
-                "themes": [],
-            }
-            for page in form.pages:
-                if page.display_path == "summary":
-                    continue
-                theme = {
-                    "id": human_to_kebab_case(page.name_in_apply_json["en"]),
-                    "name": page.name_in_apply_json["en"],
-                    "answers": [],
+            export_subcrieria.append(
+                {
+                    "id": human_to_kebab_case(subcriteria.name),
+                    "name": subcriteria.name,
+                    "themes": export_theme,
                 }
-                for component in page.components:
-                    if component.type in READ_ONLY_COMPONENTS:
-                        continue
-                    answer = {
-                        "field_id": component.runner_component_name,
-                        "form_name": form.runner_publish_name,
-                        "field_type": component.type.value[0].lower() + component.type.value[1:],
-                        "presentation_type": form_json_to_assessment_display_types.get(component.type.name, "text"),
-                        "question": component.title,
-                    }
-                    theme["answers"].append(answer)
-                sc["themes"].append(theme)
-            criteria["sub_criteria"].append(sc)
-    assess_output = copy.deepcopy(helpers.assess_output)
-    assess_output = assess_output.substitute(
-        fund_round=fund_round,
-        fund_id=fund_id,
-        round_id=round_id,
-        fund_round_ids=fund_round_ids,
-        fund_short_name=fund_short_name,
-        unscored=json.dumps(unscored),
-    )
-    helpers.write_config(assess_output, "assessment_config", round_short_name, "assessment", base_output_dir)
+            )
+
+        export_crieria = {
+            "id": criteria_slug_name,
+            "name": criteria.name,
+            "sub_criteria": export_subcrieria,
+        }
+
+        if is_unscored:
+            unscored.append(export_crieria)
+        else:
+            scored.append(export_crieria)
+
+    helpers.write_config(unscored, "unscored", round.short_name, "assessment", base_output_dir)
+    helpers.write_config(scored, "scored", round.short_name, "assessment", base_output_dir)
 
 
 if __name__ == "__main__":