diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index 1b9b166ee..472fb3b62 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -29,7 +29,6 @@ form:
 
             content:
                 type: markdown
-                showPreview: true
                 validate:
                   type: textarea
 
diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
index 393cde5fd..cd18d7f26 100644
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -19,13 +19,21 @@ form:
 
           fields:
             frontmatter:
-              type: frontmatter
+              classes: frontmatter
+              type: editor
               label: PLUGIN_ADMIN.FRONTMATTER
-
+              autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              showPreview: true
 
             uploads:
               type: pagemedia
diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index bed82d593..4c9a8d192 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -19,13 +19,21 @@ form:
 
           fields:
             frontmatter:
-              type: frontmatter
+              classes: frontmatter
+              type: editor
               label: PLUGIN_ADMIN.FRONTMATTER
               autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              showPreview: true
 
             uploads:
               type: pagemedia