diff --git a/themes/grav/templates/forms/fields/backup/array/array.html.twig b/themes/grav/templates/forms/fields/backup/array/array.html.twig
deleted file mode 100644
index 2bcd3144..00000000
--- a/themes/grav/templates/forms/fields/backup/array/array.html.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
diff --git a/themes/grav/templates/forms/fields/backup/array/array.yaml b/themes/grav/templates/forms/fields/backup/array/array.yaml
deleted file mode 100644
index 51c92fca..00000000
--- a/themes/grav/templates/forms/fields/backup/array/array.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-field:
- array:
- node: array
- key: name
- fields:
- name:
- type: text
- validation:
- required: true
- value:
- type: text
diff --git a/themes/grav/templates/forms/fields/backup/checkbox/checkbox.html.twig b/themes/grav/templates/forms/fields/backup/checkbox/checkbox.html.twig
deleted file mode 100644
index dfd5dd0d..00000000
--- a/themes/grav/templates/forms/fields/backup/checkbox/checkbox.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {{ field.label|e }} {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
diff --git a/themes/grav/templates/forms/fields/backup/checkbox/checkbox.yaml b/themes/grav/templates/forms/fields/backup/checkbox/checkbox.yaml
deleted file mode 100644
index b4071446..00000000
--- a/themes/grav/templates/forms/fields/backup/checkbox/checkbox.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-field:
- checkbox:
- node: boolean
- key: name
- fields:
- name:
- type: text
- validation:
- required: true
- value:
- type: text
diff --git a/themes/grav/templates/forms/fields/backup/checkboxes/checkboxes.html.twig b/themes/grav/templates/forms/fields/backup/checkboxes/checkboxes.html.twig
deleted file mode 100644
index 806a6957..00000000
--- a/themes/grav/templates/forms/fields/backup/checkboxes/checkboxes.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label|e }}
- {% else %}
- {{ field.label|e }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
- {% for key, text in field.options %}
- {% set checked = (field.use == 'keys' ? value[key] : key in value) %}
- {% set name = field.name|fieldName ~ '[' ~ (field.use == 'keys' ? key : '') ~ ']' %}
- {% set key = (field.use == 'keys' ? '1' : key) %}
-
-
- {{ text|e }}
-
- {% endfor %}
-
-
diff --git a/themes/grav/templates/forms/fields/backup/date/date.html.twig b/themes/grav/templates/forms/fields/backup/date/date.html.twig
deleted file mode 100644
index c8b9121c..00000000
--- a/themes/grav/templates/forms/fields/backup/date/date.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
-
-
diff --git a/themes/grav/templates/forms/fields/backup/datetime/datetime.html.twig b/themes/grav/templates/forms/fields/backup/datetime/datetime.html.twig
deleted file mode 100644
index c8b9121c..00000000
--- a/themes/grav/templates/forms/fields/backup/datetime/datetime.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
-
-
diff --git a/themes/grav/templates/forms/fields/backup/list/list.html.twig b/themes/grav/templates/forms/fields/backup/list/list.html.twig
deleted file mode 100644
index 5cf71b37..00000000
--- a/themes/grav/templates/forms/fields/backup/list/list.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% if field.fields %}
-{% set scope = scope ~ field.name|fieldName ~ '..' %}
-{% set schema = {'features':{'options':{'sortable_root':false, 'sortable_children':false}, 'schema':field.fields}} %}
-
-
{{ field.add }}
-
-
-
-
-
- {% if value|length %}
- {% for key, data in value %}
-
- {% for field in field.fields %}
-
- {% if field.type %}
- {% set value = data.value(field.name) %}
- {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
- {% endif %}
- {% endfor %}
-
- {% endfor %}
- {% endif %}
-
-
-
-
-{% endif %}
diff --git a/themes/grav/templates/forms/fields/backup/pages/pages.html.twig b/themes/grav/templates/forms/fields/backup/pages/pages.html.twig
deleted file mode 100644
index bd113af1..00000000
--- a/themes/grav/templates/forms/fields/backup/pages/pages.html.twig
+++ /dev/null
@@ -1,47 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-{% set base_depth = 0 %}
-
-{% macro options(field, pages, value, depth) %}
-
- {% if field.show_root and depth == 0 %}
- / (Root)
- {% set depth = depth +1 %}
- {% endif %}
-
- {% set indent = depth == 0 ? '' : repeat('-',depth) ~ ' ' %}
-
- {% for page in pages %}
- {% if page.routable() or field.show_all %}
-
- {{indent}} {{ page.menu }}
-
- {% endif %}
- {% if page.count > 0 and (field.show_modular or not page.modular()) %}
-
- {{ _self.options(field, page,value, depth + 1) }}
-
- {% endif %}
- {% endfor %}
-{% endmacro %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
- {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
- {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
- {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-
- {{ _self.options(field,pages,value, 0) }}
-
-
-
diff --git a/themes/grav/templates/forms/fields/backup/radio/radio.html.twig b/themes/grav/templates/forms/fields/backup/radio/radio.html.twig
deleted file mode 100644
index 868d6792..00000000
--- a/themes/grav/templates/forms/fields/backup/radio/radio.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
- {% for key, text in field.options %}
- {% set id = "radio_" ~ field.name ~ key %}
-
-
- {{ text }}
-
- {% endfor %}
-
-
diff --git a/themes/grav/templates/forms/fields/backup/section/section.html.twig b/themes/grav/templates/forms/fields/backup/section/section.html.twig
deleted file mode 100644
index 3347a7e0..00000000
--- a/themes/grav/templates/forms/fields/backup/section/section.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{% if field.title %}
-{{ field.title }}
-{% endif %}
-
-{% if field.text %}
-{{ field.text }}
-{% endif %}
-
-{% if field.underline %}
-
-{% endif %}
-
-{% if field.fields %}
-
- {% for field in field.fields %}
- {% if field.type %}
- {% set value = data.value(field.name) %}
- {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
- {% endif %}
- {% endfor %}
-
-{% endif %}
diff --git a/themes/grav/templates/forms/fields/backup/select/select.html.twig b/themes/grav/templates/forms/fields/backup/select/select.html.twig
deleted file mode 100644
index d8e79423..00000000
--- a/themes/grav/templates/forms/fields/backup/select/select.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
- {% for key, text in field.options %}
-
- {{ text }}
-
- {% endfor %}
-
-
-
diff --git a/themes/grav/templates/forms/fields/backup/spacer/spacer.html.twig b/themes/grav/templates/forms/fields/backup/spacer/spacer.html.twig
deleted file mode 100644
index 594bb18d..00000000
--- a/themes/grav/templates/forms/fields/backup/spacer/spacer.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/themes/grav/templates/forms/fields/backup/tab/tab.html.twig b/themes/grav/templates/forms/fields/backup/tab/tab.html.twig
deleted file mode 100644
index 0c7c8e70..00000000
--- a/themes/grav/templates/forms/fields/backup/tab/tab.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-{% if field.fields %}
-
- {% for field in field.fields %}
- {% if field.type %}
- {% set value = data.value(field.name) %}
- {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
- {% endif %}
- {% endfor %}
-
-{% endif %}
diff --git a/themes/grav/templates/forms/fields/backup/tabs/tabs.html.twig b/themes/grav/templates/forms/fields/backup/tabs/tabs.html.twig
deleted file mode 100644
index 6b0e0368..00000000
--- a/themes/grav/templates/forms/fields/backup/tabs/tabs.html.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
diff --git a/themes/grav/templates/forms/fields/backup/textarea/textarea.html.twig b/themes/grav/templates/forms/fields/backup/textarea/textarea.html.twig
deleted file mode 100644
index 8e6a6233..00000000
--- a/themes/grav/templates/forms/fields/backup/textarea/textarea.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
-
-
diff --git a/themes/grav/templates/forms/fields/backup/themeselect/themeselect.html.twig b/themes/grav/templates/forms/fields/backup/themeselect/themeselect.html.twig
deleted file mode 100644
index 2dfb247b..00000000
--- a/themes/grav/templates/forms/fields/backup/themeselect/themeselect.html.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
- {% for option, name in field.options %}
-
- {{ name }}
-
- {% endfor %}
- {% for theme in admin.themes %}
- {% set blueprints = theme.blueprints %}
-
- {{ blueprints.get('name') }}
-
- {% endfor %}
-
-
-
diff --git a/themes/grav/templates/forms/fields/backup/toggle/toggle.html.twig b/themes/grav/templates/forms/fields/backup/toggle/toggle.html.twig
deleted file mode 100644
index 37f172c2..00000000
--- a/themes/grav/templates/forms/fields/backup/toggle/toggle.html.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-{% set value = (value is same as(false) ? 0 : value) %}
-
-
diff --git a/themes/grav/templates/forms/fields/backup/unset/unset.html.twig b/themes/grav/templates/forms/fields/backup/unset/unset.html.twig
deleted file mode 100644
index e69de29b..00000000
diff --git a/themes/grav/templates/forms/fields/backup/upload/upload.html.twig b/themes/grav/templates/forms/fields/backup/upload/upload.html.twig
deleted file mode 100644
index ec46cb82..00000000
--- a/themes/grav/templates/forms/fields/backup/upload/upload.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-
-
-
- {% if field.help %}
- {{ field.label }}
- {% else %}
- {{ field.label }}
- {% endif %}
- {{ field.validate.required in ['on', 'true', 1] ? '* ' }}
-
-
-
-
-
diff --git a/themes/grav/templates/partials/blueprints.html.twig.bak b/themes/grav/templates/partials/blueprints.html.twig.bak
deleted file mode 100644
index f4acf7ff..00000000
--- a/themes/grav/templates/partials/blueprints.html.twig.bak
+++ /dev/null
@@ -1,23 +0,0 @@
-{% set form_id = form_id ? form_id : 'blueprints' %}
-
-