diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 8bd0bee3b..17fb384ff 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -44,7 +44,7 @@ form:
                     size: medium
                     classes: fancy
                     help: PLUGIN_ADMIN.TIMEZONE_HELP
-                    @data-options: '\Grav\Common\Utils::timezones'
+                    '@data-options': '\Grav\Common\Utils::timezones'
                     default: ''
                     options:
                         '': 'Default (Server Timezone)'
@@ -57,7 +57,7 @@ form:
                     label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
                     help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
                     placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
-                    @data-options: '\Grav\Common\Utils::dateFormats'
+                    '@data-options': '\Grav\Common\Utils::dateFormats'
                     options:
                         "": Auto Guess or Enter Custom
                     validate:
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index 5c577dbca..30d2d5df0 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -140,8 +140,8 @@ form:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      '@data-options': '\Grav\Common\Page\Pages::parents'
+                      '@data-default': '\Grav\Plugin\admin::route'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
@@ -151,7 +151,7 @@ form:
                       label: PLUGIN_ADMIN.PAGE_FILE
                       help: PLUGIN_ADMIN.PAGE_FILE_HELP
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::pageTypes'
+                      '@data-options': '\Grav\Common\Page\Pages::pageTypes'
 
                     header.body_classes:
                       type: text
@@ -204,7 +204,7 @@ form:
                   type: checkboxes
                   label: PLUGIN_ADMIN.PROCESS
                   toggleable: true
-                  @config-default: system.pages.process
+                  '@config-default': system.pages.process
                   default:
                     markdown: true
                     twig: false
@@ -219,7 +219,7 @@ form:
                   label: PLUGIN_ADMIN.DEFAULT_CHILD_TYPE
                   default: default
                   placeholder: PLUGIN_ADMIN.USE_GLOBAL
-                  @data-options: '\Grav\Common\Page\Pages::types'
+                  '@data-options': '\Grav\Common\Page\Pages::types'
 
                 header.routable:
                   type: toggle
@@ -262,7 +262,7 @@ form:
                   classes: fancy
                   label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
                   default: default
-                  @data-options: '\Grav\Common\Page\Pages::types'
+                  '@data-options': '\Grav\Common\Page\Pages::types'
 
                 header.order_by:
                   type: hidden
diff --git a/system/blueprints/pages/modular.yaml b/system/blueprints/pages/modular.yaml
index 5cdedf879..ce62ecd1c 100644
--- a/system/blueprints/pages/modular.yaml
+++ b/system/blueprints/pages/modular.yaml
@@ -16,9 +16,9 @@ form:
             header.content.items:
               type: select
               label: PLUGIN_ADMIN.ITEMS
-              default: @self.modular
+              default: '@self.modular'
               options:
-                @self.modular: Children
+                '@self.modular': Children
 
             header.content.order.by:
               type: select
diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml
index 11fc4bf5c..45ef1667d 100644
--- a/system/blueprints/pages/modular_new.yaml
+++ b/system/blueprints/pages/modular_new.yaml
@@ -29,8 +29,8 @@ form:
       type: select
       label: PLUGIN_ADMIN.PAGE
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
+      '@data-options': '\Grav\Common\Page\Pages::parents'
+      '@data-default': '\Grav\Plugin\admin::route'
       options:
         '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
       validate:
@@ -42,7 +42,7 @@ form:
       label: PLUGIN_ADMIN.MODULAR_TEMPLATE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
       default: default
-      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
       validate:
         required: true
 
diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
index bf40a733c..9cf3c77a5 100644
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -69,8 +69,8 @@ form:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      '@data-options': '\Grav\Common\Page\Pages::parents'
+                      '@data-default': '\Grav\Plugin\admin::route'
                       options:
                         '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:
@@ -81,7 +81,7 @@ form:
                       classes: fancy
                       label: PLUGIN_ADMIN.MODULAR_TEMPLATE
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
                       validate:
                         required: true
 
diff --git a/system/blueprints/pages/move.yaml b/system/blueprints/pages/move.yaml
index 8f12c7a13..4e7bf23e5 100644
--- a/system/blueprints/pages/move.yaml
+++ b/system/blueprints/pages/move.yaml
@@ -11,7 +11,7 @@ form:
       type: select
       label: PLUGIN_ADMIN.PARENT
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
+      '@data-options': '\Grav\Common\Page\Pages::parents'
+      '@data-default': '\Grav\Plugin\admin::route'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml
index 36dc2231f..80c05f375 100644
--- a/system/blueprints/pages/new.yaml
+++ b/system/blueprints/pages/new.yaml
@@ -31,8 +31,8 @@ form:
       type: select
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::getLastPageRoute'
+      '@data-options': '\Grav\Common\Page\Pages::parents'
+      '@data-default': '\Grav\Plugin\admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
@@ -43,8 +43,8 @@ form:
       classes: fancy
       label: PLUGIN_ADMIN.PAGE_FILE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
-      @data-options: '\Grav\Common\Page\Pages::types'
-      @data-default: '\Grav\Plugin\admin::getLastPageName'
+      '@data-options': '\Grav\Common\Page\Pages::types'
+      '@data-default': '\Grav\Plugin\admin::getLastPageName'
       validate:
         required: true
 
diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index 25116eadd..65f721554 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -69,8 +69,8 @@ form:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      '@data-options': '\Grav\Common\Page\Pages::parents'
+                      '@data-default': '\Grav\Plugin\admin::route'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
@@ -80,7 +80,7 @@ form:
                       label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
                       help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::types'
+                      '@data-options': '\Grav\Common\Page\Pages::types'
                       validate:
                         required: true
 
diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index 649a3d204..207421ae0 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -50,7 +50,7 @@ form:
                     label: PLUGIN_ADMIN.LANGUAGE
                     size: medium
                     classes: fancy
-                    @data-options: '\Grav\Plugin\admin::adminLanguages'
+                    '@data-options': '\Grav\Plugin\admin::adminLanguages'
                     default: 'en'
                     help: PLUGIN_ADMIN.LANGUAGE_HELP