diff --git a/changelog.yml b/changelog.yml
index 1a48f453..1d98e7e3 100644
--- a/changelog.yml
+++ b/changelog.yml
@@ -3,6 +3,7 @@
   improvements:
     - text: "Allow SSH Keys to be loaded from the FS - #74"
       image: ssh_key_file.jpeg
+    - text: "Move metadata configuration features from Pro to Basic"
   bugs:
     - text: "Dark Theme: Render checkboxes in a lighter color"
     - text: "Fix Relative Parent links not working - #256"
diff --git a/lib/features.dart b/lib/features.dart
index 35fa7bed..12e5a69d 100644
--- a/lib/features.dart
+++ b/lib/features.dart
@@ -127,7 +127,7 @@ class Feature {
     DateTime(2020, 01, 05),
     tr("feature.yamlModifiedKey"),
     "",
-    true,
+    false,
   );
 
   static final noteSorting = Feature(
@@ -287,7 +287,7 @@ class Feature {
     DateTime(2020, 07, 30),
     tr("feature.metaDataTitle"),
     "",
-    true,
+    false,
   );
 
   static final yamlCreatedKey = Feature(
@@ -295,7 +295,7 @@ class Feature {
     DateTime(2020, 08, 02),
     tr("feature.yamlCreatedKey"),
     "",
-    true,
+    false,
   );
 
   static final yamlTagsKey = Feature(
@@ -303,7 +303,7 @@ class Feature {
     DateTime(2020, 08, 06),
     tr("feature.yamlTagsKey"),
     "",
-    true,
+    false,
   );
 
   static final customMetaData = Feature(
diff --git a/lib/screens/settings_note_metadata.dart b/lib/screens/settings_note_metadata.dart
index 09396a49..ce862130 100644
--- a/lib/screens/settings_note_metadata.dart
+++ b/lib/screens/settings_note_metadata.dart
@@ -88,82 +88,70 @@ class _NoteMetadataSettingsScreenState
             });
           },
         ),
-        ProOverlay(
-          feature: Feature.yamlModifiedKey,
-          child: ListPreference(
-            title: tr("settings.noteMetaData.modified"),
-            options: [
-              "modified",
-              "mod",
-              "lastmodified",
-              "lastmod",
-            ],
-            currentOption: settings.yamlModifiedKey,
-            onChange: (String newVal) {
-              setState(() {
-                settings.yamlModifiedKey = newVal;
-                settings.save();
-              });
-            },
-            enabled: settings.yamlHeaderEnabled,
-          ),
+        ListPreference(
+          title: tr("settings.noteMetaData.modified"),
+          options: [
+            "modified",
+            "mod",
+            "lastmodified",
+            "lastmod",
+          ],
+          currentOption: settings.yamlModifiedKey,
+          onChange: (String newVal) {
+            setState(() {
+              settings.yamlModifiedKey = newVal;
+              settings.save();
+            });
+          },
+          enabled: settings.yamlHeaderEnabled,
         ),
-        ProOverlay(
-          feature: Feature.yamlCreatedKey,
-          child: ListPreference(
-            title: tr("settings.noteMetaData.created"),
-            options: [
-              "created",
-              "date",
-            ],
-            currentOption: settings.yamlCreatedKey,
-            onChange: (String newVal) {
-              setState(() {
-                settings.yamlCreatedKey = newVal;
-                settings.save();
-              });
-            },
-            enabled: settings.yamlHeaderEnabled,
-          ),
+        ListPreference(
+          title: tr("settings.noteMetaData.created"),
+          options: [
+            "created",
+            "date",
+          ],
+          currentOption: settings.yamlCreatedKey,
+          onChange: (String newVal) {
+            setState(() {
+              settings.yamlCreatedKey = newVal;
+              settings.save();
+            });
+          },
+          enabled: settings.yamlHeaderEnabled,
         ),
-        ProOverlay(
-          feature: Feature.yamlTagsKey,
-          child: ListPreference(
-            title: tr("settings.noteMetaData.tags"),
-            options: [
-              "tags",
-              "categories",
-            ],
-            currentOption: settings.yamlTagsKey,
-            onChange: (String newVal) {
-              setState(() {
-                settings.yamlTagsKey = newVal;
-                settings.save();
-              });
-            },
-            enabled: settings.yamlHeaderEnabled,
-          ),
+        ListPreference(
+          title: tr("settings.noteMetaData.tags"),
+          options: [
+            "tags",
+            "categories",
+          ],
+          currentOption: settings.yamlTagsKey,
+          onChange: (String newVal) {
+            setState(() {
+              settings.yamlTagsKey = newVal;
+              settings.save();
+            });
+          },
+          enabled: settings.yamlHeaderEnabled,
         ),
-        ProOverlay(
-          feature: Feature.metaDataTitle,
-          child: ListPreference(
-            title: tr("settings.noteMetaData.titleMetaData.title"),
-            options: [
-              tr("settings.noteMetaData.titleMetaData.fromH1"),
-              if (settings.yamlHeaderEnabled)
-                tr("settings.noteMetaData.titleMetaData.fromYaml"),
-            ],
-            currentOption: settings.saveTitleInH1
-                ? tr("settings.noteMetaData.titleMetaData.fromH1")
-                : tr("settings.noteMetaData.titleMetaData.fromYaml"),
-            onChange: (String newVal) {
-              setState(() {
-                settings.saveTitleInH1 =
-                    newVal == tr("settings.noteMetaData.titleMetaData.fromH1");
-                settings.save();
-              });
-            },
-          ),
+        ListPreference(
+          title: tr("settings.noteMetaData.titleMetaData.title"),
+          options: [
+            tr("settings.noteMetaData.titleMetaData.fromH1"),
+            if (settings.yamlHeaderEnabled)
+              tr("settings.noteMetaData.titleMetaData.fromYaml"),
+          ],
+          currentOption: settings.saveTitleInH1
+              ? tr("settings.noteMetaData.titleMetaData.fromH1")
+              : tr("settings.noteMetaData.titleMetaData.fromYaml"),
+          onChange: (String newVal) {
+            setState(() {
+              settings.saveTitleInH1 =
+                  newVal == tr("settings.noteMetaData.titleMetaData.fromH1");
+              settings.save();
+            });
+          },
         ),
         ProOverlay(
           feature: Feature.customMetaData,