diff --git a/app/_config/templates-requirements.yml b/app/_config/templates-requirements.yml
index 2b34975..ed4d660 100644
--- a/app/_config/templates-requirements.yml
+++ b/app/_config/templates-requirements.yml
@@ -3,18 +3,6 @@ Name: webapp-templates-requirements
 After:
   - a2nt-cms-niceties-templates-requirements
 ---
-A2nt\CMSNiceties\Templates\DeferredRequirements:
-  nofontawesome: false
-  version: false
-  static_domain: false
-  deferred: true
-  noreact: true
-  nojquery: true
-  jquery_version: '3.7.1'
-  fontawesome_svg: false
-
-SilverStripe\FontAwesome\FontAwesomeField:
-  version: '6.5.1'
 
 SilverStripe\View\Requirements:
   disable_flush_combined: true
diff --git a/app/_config/templates-themes.yml b/app/_config/templates-themes.yml
index d505147..34f3b68 100644
--- a/app/_config/templates-themes.yml
+++ b/app/_config/templates-themes.yml
@@ -4,6 +4,20 @@ After:
   - webapp-options-elements
   - a2nt-cms-niceties-templates-themes
 ---
+
+A2nt\CMSNiceties\Templates\DeferredRequirements:
+  nofontawesome: false
+  version: false
+  static_domain: false
+  deferred: true
+  noreact: true
+  nojquery: true
+  jquery_version: '3.7.1'
+  fontawesome_svg: false
+
+SilverStripe\FontAwesome\FontAwesomeField:
+  version: '6.5.1'
+
 SilverStripe\View\SSViewer:
   source_file_comments: false
   themes:
@@ -25,5 +39,5 @@ Only:
   environment: dev
 ---
 SilverStripe\View\SSViewer:
-  source_file_comments: true
+  source_file_comments: false