diff --git a/schemas/org.cinnamon.desktop.input-sources.gschema.xml.in b/schemas/org.cinnamon.desktop.input-sources.gschema.xml.in
index e56df1e..7d52f15 100644
--- a/schemas/org.cinnamon.desktop.input-sources.gschema.xml.in
+++ b/schemas/org.cinnamon.desktop.input-sources.gschema.xml.in
@@ -9,7 +9,9 @@
         The zero-based index into the input sources list specifying
         the current one in effect. The value is automatically capped
         to remain in the range [0, sources_length) as long as the
-        sources list isn't empty.
+        sources list isn’t empty.
+
+        DEPRECATED: This key is deprecated and ignored.
       </description>
     </key>
     <key name="sources" type="a(ss)">
@@ -18,12 +20,12 @@
       <description>
         List of input source identifiers available. Each source is
         specified as a tuple of 2 strings. The first string is the
-        type and can be one of 'xkb' or 'ibus'. For 'xkb' sources the
-        second string is 'xkb_layout+xkb_variant' or just 'xkb_layout'
-        if a XKB variant isn't needed. For 'ibus' sources the second
+        type and can be one of “xkb” or “ibus”. For “xkb” sources the
+        second string is “xkb_layout+xkb_variant” or just “xkb_layout”
+        if a XKB variant isn’t needed. For “ibus” sources the second
         string is the IBus engine name. An empty list means that the X
-        server's current XKB layout and variant won't be touched and
-        IBus won't be used.
+        server’s current XKB layout and variant won’t be touched and
+        IBus won’t be used.
       </description>
     </key>
     <key name="xkb-options" type="as">
@@ -31,7 +33,7 @@
       <summary>List of XKB options</summary>
       <description>
         List of XKB options. Each option is an XKB option string as
-        defined by xkeyboard-config's rules files.
+        defined by xkeyboard-config’s rules files.
       </description>
     </key>
     <key name="show-all-sources" type="b">
@@ -42,5 +44,13 @@
         System Settings.
       </description>
     </key>
+    <key name="per-window" type="b">
+      <default>false</default>
+      <summary>Use different input sources for each window</summary>
+      <description>
+        When enabled, input sources get attached to the currently
+        focused window when activated.
+      </description>
+    </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.cinnamon.desktop.interface.gschema.xml.in b/schemas/org.cinnamon.desktop.interface.gschema.xml.in
index c4699da..76abdb4 100644
--- a/schemas/org.cinnamon.desktop.interface.gschema.xml.in
+++ b/schemas/org.cinnamon.desktop.interface.gschema.xml.in
@@ -279,7 +279,7 @@
       <summary>Enable or disable gtk overlay scrollbars</summary>
     </key>
     <key name="keyboard-layout-show-flags" type="b">
-      <default>true</default>
+      <default>false</default>
       <summary>Prefer country flags to group names when showing keyboard layouts.</summary>
     </key>
     <key name="keyboard-layout-use-upper" type="b">
diff --git a/schemas/org.cinnamon.desktop.keybindings.wm.gschema.xml.in b/schemas/org.cinnamon.desktop.keybindings.wm.gschema.xml.in
index ed9ca9d..8ccb446 100644
--- a/schemas/org.cinnamon.desktop.keybindings.wm.gschema.xml.in
+++ b/schemas/org.cinnamon.desktop.keybindings.wm.gschema.xml.in
@@ -355,6 +355,15 @@
       <default><![CDATA[['XF86RotateWindows']]]></default>
       <summary>Rotates the built-in monitor configuration</summary>
     </key>
-
+    <key name="switch-input-source" type="as">
+      <default><![CDATA[['<Super>space','XF86Keyboard']]]></default>
+      <summary>Switch input source</summary>
+      <description>Binding to select the next input source</description>
+    </key>
+    <key name="switch-input-source-backward" type="as">
+      <default><![CDATA[['<Shift><Super>space','<Shift>XF86Keyboard']]]></default>
+      <summary>Switch input source backward</summary>
+      <description>Binding to select the previous input source</description>
+    </key>
   </schema>
 </schemalist>