diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
index e5ce805a54..b15cd16055 100644
--- a/data/io.elementary.code.gschema.xml
+++ b/data/io.elementary.code.gschema.xml
@@ -56,7 +56,7 @@
 
   <schema path="/io/elementary/code/settings/" id="io.elementary.code.settings" gettext-domain="io.elementary.code">
     <key type="as" name="plugins-enabled">
-      <default>['brackets-completion', 'detect-indent', 'editorconfig', 'outline']</default>
+      <default>['brackets-completion', 'detect-indent', 'editorconfig']</default>
       <summary>Enabled Plugins</summary>
       <description>Enabled Plugins</description>
     </key>
@@ -82,13 +82,13 @@
     </key>
     <key name="show-right-margin" type="b">
       <default>false</default>
-      <summary>Show the right margin</summary>
-      <description>Specifies if the Source view should show the right margin or not.</description>
+      <summary>Show the line width guide</summary>
+      <description>Specifies if the Source view should show the line width guide or not.</description>
     </key>
     <key name="right-margin-position" type="i">
       <default>80</default>
-      <summary>Right margin position</summary>
-      <description>Specifies the right margin position.</description>
+      <summary>Line width guide position</summary>
+      <description>Specifies the line width guide position.</description>
     </key>
     <key name="highlight-matching-brackets" type="b">
       <default>true</default>
@@ -146,7 +146,7 @@
       <description>Switches between dark and light style</description>
     </key>
     <key name="follow-system-style" type="b">
-      <default>false</default>
+      <default>true</default>
       <summary>Follow the FreeDesktop.org dark style preference</summary>
       <description>Use the Dark style if the system prefers a dark style, or elementary Light otherwise. Overrides control of prefer-dark-style.</description>
     </key>