diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48825986d..7265b7c96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
   - Created a new Grid form widget for managing tabular data.
   - Widget identifiers have changed to remove the alias if it matches the default alias.
   - Add new form field type called `number`.
+  - You can now override partials for Relation controller by creating partials with `relation_` prefix in the controller view directory.
 
 * **Build 108** (2014-06-16)
   - Checkbox List form fields now use scrollbars for 10+ checkboxes.
diff --git a/modules/backend/models/user/fields.yaml b/modules/backend/models/user/fields.yaml
index fc4a06826..e712c5c82 100644
--- a/modules/backend/models/user/fields.yaml
+++ b/modules/backend/models/user/fields.yaml
@@ -60,7 +60,6 @@ secondaryTabs:
     avatar:
       label: backend::lang.user.avatar
       type: fileupload
-      options:
-        mode: image
-        image-height: 260
-        image-width: 260
+      mode: image
+      imageHeight: 260
+      imageWidth: 260
diff --git a/modules/cms/classes/asset/fields.yaml b/modules/cms/classes/asset/fields.yaml
index 774eeadbb..c22edae55 100644
--- a/modules/cms/classes/asset/fields.yaml
+++ b/modules/cms/classes/asset/fields.yaml
@@ -14,7 +14,6 @@ secondaryTabs:
   fields:
     content:
       tab: cms::lang.editor.content
-      type: codeeditor
       stretch: true
-      options:
-        language: css
\ No newline at end of file
+      type: codeeditor
+      language: css
\ No newline at end of file
diff --git a/modules/cms/classes/content/fields.yaml b/modules/cms/classes/content/fields.yaml
index 09aa6ca4e..cba834257 100644
--- a/modules/cms/classes/content/fields.yaml
+++ b/modules/cms/classes/content/fields.yaml
@@ -14,7 +14,6 @@ secondaryTabs:
   fields:
     content:
       tab: cms::lang.editor.content
-      type: codeeditor
       stretch: true
-      options:
-        language: html
\ No newline at end of file
+      type: codeeditor
+      language: html
\ No newline at end of file
diff --git a/modules/cms/classes/layout/fields.yaml b/modules/cms/classes/layout/fields.yaml
index 2984deb7d..2c6900cc1 100644
--- a/modules/cms/classes/layout/fields.yaml
+++ b/modules/cms/classes/layout/fields.yaml
@@ -21,14 +21,12 @@ secondaryTabs:
   fields:
     markup:
       tab: cms::lang.editor.markup
-      type: codeeditor
       stretch: true
-      options:
-        language: twig
+      type: codeeditor
+      language: twig
 
     code:
       tab: cms::lang.editor.code
-      type: codeeditor
       stretch: true
-      options:
-        language: php
+      type: codeeditor
+      language: php
diff --git a/modules/cms/classes/page/fields.yaml b/modules/cms/classes/page/fields.yaml
index b643a9f3e..2bd53432d 100644
--- a/modules/cms/classes/page/fields.yaml
+++ b/modules/cms/classes/page/fields.yaml
@@ -67,14 +67,12 @@ secondaryTabs:
   fields:
     markup:
       tab: cms::lang.editor.markup
-      type: codeeditor
       stretch: true
-      options:
-        language: twig
+      type: codeeditor
+      language: twig
 
     code:
       tab: cms::lang.editor.code
-      type: codeeditor
       stretch: true
-      options:
-        language: php
+      type: codeeditor
+      language: php
diff --git a/modules/cms/classes/partial/fields.yaml b/modules/cms/classes/partial/fields.yaml
index cd233d2b1..06f5b0e38 100644
--- a/modules/cms/classes/partial/fields.yaml
+++ b/modules/cms/classes/partial/fields.yaml
@@ -19,7 +19,6 @@ secondaryTabs:
   fields:
     markup:
       tab: cms::lang.editor.markup
-      type: codeeditor
       stretch: true
-      options:
-        language: twig
\ No newline at end of file
+      type: codeeditor
+      language: twig
\ No newline at end of file
diff --git a/modules/system/models/emaillayout/fields.yaml b/modules/system/models/emaillayout/fields.yaml
index afa61d804..1531fe855 100644
--- a/modules/system/models/emaillayout/fields.yaml
+++ b/modules/system/models/emaillayout/fields.yaml
@@ -24,15 +24,13 @@ secondaryTabs:
             type: codeeditor
             size: giant
             tab: system::lang.email_templates.content_html
-            options:
-                language: html
+            language: html
 
         content_css:
             type: codeeditor
             size: giant
             tab: system::lang.email_templates.content_css
-            options:
-                language: css
+            language: css
 
         content_text:
             type: textarea