Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files

27 files changed, 458 insertions, 463 deletions

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 14959d8..aec793c 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,31 +1,27 @@
-desktop_gschemas_in_in = \
-	org.mate.accessibility-keyboard.gschema.xml.in.in \
-	org.mate.accessibility-startup.gschema.xml.in.in \
-	org.mate.applications-at-mobility.gschema.xml.in.in \
-	org.mate.applications-at-visual.gschema.xml.in.in \
-	org.mate.applications-browser.gschema.xml.in.in \
-	org.mate.applications-office.gschema.xml.in.in \
-	org.mate.applications-terminal.gschema.xml.in.in \
-	org.mate.background.gschema.xml.in.in \
-	org.mate.debug.gschema.xml.in.in \
-	org.mate.file-views.gschema.xml.in.in \
-	org.mate.interface.gschema.xml.in.in \
-	org.mate.lockdown.gschema.xml.in.in \
-	org.mate.peripherals-keyboard.gschema.xml.in.in \
-	org.mate.peripherals-mouse.gschema.xml.in.in \
-	org.mate.sound.gschema.xml.in.in \
-	org.mate.thumbnail-cache.gschema.xml.in.in \
-	org.mate.thumbnailers.gschema.xml.in.in \
-	org.mate.typing-break.gschema.xml.in.in
+desktop_gschemas_in = \
+	org.mate.accessibility-keyboard.gschema.xml.in \
+	org.mate.accessibility-startup.gschema.xml.in \
+	org.mate.applications-at-mobility.gschema.xml.in \
+	org.mate.applications-at-visual.gschema.xml.in \
+	org.mate.applications-browser.gschema.xml.in \
+	org.mate.applications-office.gschema.xml.in \
+	org.mate.applications-terminal.gschema.xml.in \
+	org.mate.background.gschema.xml.in \
+	org.mate.debug.gschema.xml.in \
+	org.mate.file-views.gschema.xml.in \
+	org.mate.interface.gschema.xml.in \
+	org.mate.lockdown.gschema.xml.in \
+	org.mate.peripherals-keyboard.gschema.xml.in \
+	org.mate.peripherals-mouse.gschema.xml.in \
+	org.mate.sound.gschema.xml.in \
+	org.mate.thumbnail-cache.gschema.xml.in \
+	org.mate.thumbnailers.gschema.xml.in \
+	org.mate.typing-break.gschema.xml.in
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
-desktop_gschemas_in = $(desktop_gschemas_in_in:.xml.in.in=.xml.in)
 gsettings_SCHEMAS = $(desktop_gschemas_in:.xml.in=.xml)
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/MateConf/gsettings
@@ -33,9 +29,8 @@ convert_DATA = mate-desktop.convert
 
 EXTRA_DIST = \
 	$(convert_DATA) \
-	$(desktop_gschemas_in_in)
+	$(desktop_gschemas_in)
 
 CLEANFILES = \
-	$(desktop_gschemas_in) \
 	$(gsettings_SCHEMAS) \
 	*.gschema.valid
diff --git a/schemas/org.mate.accessibility-keyboard.gschema.xml.in.in b/schemas/org.mate.accessibility-keyboard.gschema.xml.in
index f5f42fd..812497f 100644
--- a/schemas/org.mate.accessibility-keyboard.gschema.xml.in.in
+++ b/schemas/org.mate.accessibility-keyboard.gschema.xml.in
@@ -17,8 +17,8 @@
     </key>
     <key name="bouncekeys-delay" type="i">
       <default>300</default>
-      <_summary>minimum interval in milliseconds</_summary>
-      <_description>Ignore multiple presses of the _same_ key within @delay milliseconds.</_description>
+      <summary>minimum interval in milliseconds</summary>
+      <description>Ignore multiple presses of the _same_ key within @delay milliseconds.</description>
     </key>
     <key name="bouncekeys-beep-reject" type="b">
       <default>false</default>
@@ -28,26 +28,26 @@
     </key>
     <key name="mousekeys-max-speed" type="i">
       <default>10</default>
-      <_summary>Pixels per seconds</_summary>
-      <_description>How many pixels per second to move at the maximum speed.</_description>
+      <summary>Pixels per seconds</summary>
+      <description>How many pixels per second to move at the maximum speed.</description>
     </key>
     <key name="mousekeys-accel-time" type="i">
       <default>300</default>
-      <_summary>How long to accelerate in milliseconds</_summary>
-      <_description>How many milliseconds it takes to go from 0 to maximum speed.</_description>
+      <summary>How long to accelerate in milliseconds</summary>
+      <description>How many milliseconds it takes to go from 0 to maximum speed.</description>
     </key>
     <key name="mousekeys-init-delay" type="i">
       <default>300</default>
-      <_summary>Initial delay in milliseconds</_summary>
-      <_description>How many milliseconds to wait before mouse movement keys start to operate.</_description>
+      <summary>Initial delay in milliseconds</summary>
+      <description>How many milliseconds to wait before mouse movement keys start to operate.</description>
     </key>
     <key name="slowkeys-enable" type="b">
       <default>false</default>
     </key>
     <key name="slowkeys-delay" type="i">
       <default>300</default>
-      <_summary>Minimum interval in milliseconds</_summary>
-      <_description>Do not accept a key as being pressed unless held for @delay milliseconds.</_description>
+      <summary>Minimum interval in milliseconds</summary>
+      <description>Do not accept a key as being pressed unless held for @delay milliseconds.</description>
     </key>
     <key name="slowkeys-beep-press" type="b">
       <default>false</default>
@@ -63,11 +63,11 @@
     </key>
     <key name="stickykeys-two-key-off" type="b">
       <default>false</default>
-      <_description>Disable if two keys are pressed at the same time.</_description>
+      <description>Disable if two keys are pressed at the same time.</description>
     </key>
     <key name="stickykeys-modifier-beep" type="b">
       <default>false</default>
-      <_description>Beep when a modifier is pressed.</_description>
+      <description>Beep when a modifier is pressed.</description>
     </key>
     <key name="togglekeys-enable" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.accessibility-startup.gschema.xml.in.in b/schemas/org.mate.accessibility-startup.gschema.xml.in
index 5011c13..c2c3aec 100644
--- a/schemas/org.mate.accessibility-startup.gschema.xml.in.in
+++ b/schemas/org.mate.accessibility-startup.gschema.xml.in
@@ -2,8 +2,8 @@
   <schema id="org.mate.accessibility-startup" path="/org/mate/desktop/accessibility/startup/">
     <key name="exec-ats" type="as">
       <default>[]</default>
-      <_summary>Startup Assistive Technology Applications</_summary>
-      <_description>List of assistive technology applications to start when logging into the MATE desktop.</_description>
+      <summary>Startup Assistive Technology Applications</summary>
+      <description>List of assistive technology applications to start when logging into the MATE desktop.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.applications-at-mobility.gschema.xml.in b/schemas/org.mate.applications-at-mobility.gschema.xml.in
new file mode 100644
index 0000000..993f2ea
--- /dev/null
+++ b/schemas/org.mate.applications-at-mobility.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.applications-at-mobility" path="/org/mate/desktop/applications/at/mobility/">
+    <key name="exec" type="s">
+      <default>'dasher'</default>
+      <summary>Preferred Mobility assistive technology application</summary>
+      <description>Preferred Mobility assistive technology application to be used for login, menu, or command line.</description>
+    </key>
+    <key name="startup" type="b">
+      <default>false</default>
+      <summary>Start preferred Mobility assistive technology application</summary>
+      <description>MATE to start preferred Mobility assistive technology application during login.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.applications-at-mobility.gschema.xml.in.in b/schemas/org.mate.applications-at-mobility.gschema.xml.in.in
deleted file mode 100644
index 0e4b65e..0000000
--- a/schemas/org.mate.applications-at-mobility.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.applications-at-mobility" path="/org/mate/desktop/applications/at/mobility/">
-    <key name="exec" type="s">
-      <default>'dasher'</default>
-      <_summary>Preferred Mobility assistive technology application</_summary>
-      <_description>Preferred Mobility assistive technology application to be used for login, menu, or command line.</_description>
-    </key>
-    <key name="startup" type="b">
-      <default>false</default>
-      <_summary>Start preferred Mobility assistive technology application</_summary>
-      <_description>MATE to start preferred Mobility assistive technology application during login.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.applications-at-visual.gschema.xml.in b/schemas/org.mate.applications-at-visual.gschema.xml.in
new file mode 100644
index 0000000..23d9378
--- /dev/null
+++ b/schemas/org.mate.applications-at-visual.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.applications-at-visual" path="/org/mate/desktop/applications/at/visual/">
+    <key name="exec" type="s">
+      <default>'orca'</default>
+      <summary>Preferred Visual assistive technology application</summary>
+      <description>Preferred Visual assistive technology application be used for login, menu, or command line.</description>
+    </key>
+    <key name="startup" type="b">
+      <default>false</default>
+      <summary>Start preferred Visual assistive technology application</summary>
+      <description>MATE to start preferred Visual assistive technology application during login.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.applications-at-visual.gschema.xml.in.in b/schemas/org.mate.applications-at-visual.gschema.xml.in.in
deleted file mode 100644
index b7ac679..0000000
--- a/schemas/org.mate.applications-at-visual.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.applications-at-visual" path="/org/mate/desktop/applications/at/visual/">
-    <key name="exec" type="s">
-      <default>'orca'</default>
-      <_summary>Preferred Visual assistive technology application</_summary>
-      <_description>Preferred Visual assistive technology application be used for login, menu, or command line.</_description>
-    </key>
-    <key name="startup" type="b">
-      <default>false</default>
-      <_summary>Start preferred Visual assistive technology application</_summary>
-      <_description>MATE to start preferred Visual assistive technology application during login.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.applications-browser.gschema.xml.in.in b/schemas/org.mate.applications-browser.gschema.xml.in
index 57c49d3..47d009f 100644
--- a/schemas/org.mate.applications-browser.gschema.xml.in.in
+++ b/schemas/org.mate.applications-browser.gschema.xml.in
@@ -2,18 +2,18 @@
   <schema id="org.mate.applications-browser" path="/org/mate/desktop/applications/browser/">
     <key name="exec" type="s">
       <default>'mozilla'</default>
-      <_summary>Default browser</_summary>
-      <_description>Default browser for all URLs.</_description>
+      <summary>Default browser</summary>
+      <description>Default browser for all URLs.</description>
     </key>
     <key name="needs-term" type="b">
       <default>false</default>
-      <_summary>Browser needs terminal</_summary>
-      <_description>Whether the default browser needs a terminal to run.</_description>
+      <summary>Browser needs terminal</summary>
+      <description>Whether the default browser needs a terminal to run.</description>
     </key>
     <key name="nremote" type="b">
       <default>true</default>
-      <_summary>Browser understands remote</_summary>
-      <_description>Whether the default browser understands netscape remote.</_description>
+      <summary>Browser understands remote</summary>
+      <description>Whether the default browser understands netscape remote.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.applications-office.gschema.xml.in.in b/schemas/org.mate.applications-office.gschema.xml.in
index 5ad64cf..9ae3908 100644
--- a/schemas/org.mate.applications-office.gschema.xml.in.in
+++ b/schemas/org.mate.applications-office.gschema.xml.in
@@ -6,25 +6,25 @@
   <schema id="org.mate.applications-office.calendar" path="/org/mate/desktop/applications/calendar/">
     <key name="exec" type="s">
       <default>'evolution'</default>
-      <_summary>Default calendar</_summary>
-      <_description>Default calendar application</_description>
+      <summary>Default calendar</summary>
+      <description>Default calendar application</description>
     </key>
     <key name="needs-term" type="b">
       <default>false</default>
-      <_summary>Calendar needs terminal</_summary>
-      <_description>Whether the default calendar application needs a terminal to run</_description>
+      <summary>Calendar needs terminal</summary>
+      <description>Whether the default calendar application needs a terminal to run</description>
     </key>
   </schema>
   <schema id="org.mate.applications-office.tasks" path="/org/mate/desktop/applications/tasks/">
     <key name="exec" type="s">
       <default>'evolution'</default>
-      <_summary>Default tasks</_summary>
-      <_description>Default tasks application</_description>
+      <summary>Default tasks</summary>
+      <description>Default tasks application</description>
     </key>
     <key name="needs-term" type="b">
       <default>false</default>
-      <_summary>Tasks needs terminal</_summary>
-      <_description>Whether the default tasks application needs a terminal to run</_description>
+      <summary>Tasks needs terminal</summary>
+      <description>Whether the default tasks application needs a terminal to run</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.applications-terminal.gschema.xml.in.in b/schemas/org.mate.applications-terminal.gschema.xml.in
index adeca8f..8351509 100644
--- a/schemas/org.mate.applications-terminal.gschema.xml.in.in
+++ b/schemas/org.mate.applications-terminal.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema id="org.mate.applications-terminal" path="/org/mate/desktop/applications/terminal/">
     <key name="exec" type="s">
       <default>'mate-terminal'</default>
-      <_summary>Terminal application</_summary>
-      <_description>Terminal program to use when starting applications that require one.</_description>
+      <summary>Terminal application</summary>
+      <description>Terminal program to use when starting applications that require one.</description>
     </key>
     <key name="exec-arg" type="s">
       <default>'-x'</default>
-      <_summary>Exec Arguments</_summary>
-      <_description>Argument used to execute programs in the terminal defined by the 'exec' key.</_description>
+      <summary>Exec Arguments</summary>
+      <description>Argument used to execute programs in the terminal defined by the 'exec' key.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.background.gschema.xml.in.in b/schemas/org.mate.background.gschema.xml.in
index f367e91..50619d5 100644
--- a/schemas/org.mate.background.gschema.xml.in.in
+++ b/schemas/org.mate.background.gschema.xml.in
@@ -15,48 +15,48 @@
   <schema id="org.mate.background" path="/org/mate/desktop/background/">
     <key name="draw-background" type="b">
       <default>true</default>
-      <_summary>Draw Desktop Background</_summary>
-      <_description>Have MATE draw the desktop background.</_description>
+      <summary>Draw Desktop Background</summary>
+      <description>Have MATE draw the desktop background.</description>
     </key>
     <key name="show-desktop-icons" type="b">
       <default>true</default>
-      <_summary>Show Desktop Icons</_summary>
-      <_description>Have MATE file manager (Caja) draw the desktop icons.</_description>
+      <summary>Show Desktop Icons</summary>
+      <description>Have MATE file manager (Caja) draw the desktop icons.</description>
     </key>
     <key name="background-fade" type="b">
       <default>true</default>
-      <_summary>Fade the background on change</_summary>
-      <_description>If set to true, then MATE will change the desktop background with a fading effect.</_description>
+      <summary>Fade the background on change</summary>
+      <description>If set to true, then MATE will change the desktop background with a fading effect.</description>
     </key>
     <key name="picture-options" enum="org.mate.background.picture-options-enum">
       <default>'zoom'</default>
-      <_summary>Picture Options</_summary>
-      <_description>Determines how the image set by wallpaper_filename is rendered.  Possible values are "wallpaper", "centered", "scaled", "stretched", "zoom", "spanned".</_description>
+      <summary>Picture Options</summary>
+      <description>Determines how the image set by wallpaper_filename is rendered.  Possible values are "wallpaper", "centered", "scaled", "stretched", "zoom", "spanned".</description>
     </key>
     <key name="picture-filename" type="s">
       <default>'@datadir@/backgrounds/mate/desktop/Stripes.png'</default>
-      <_summary>Picture Filename</_summary>
-      <_description>File to use for the background image.</_description>
+      <summary>Picture Filename</summary>
+      <description>File to use for the background image.</description>
     </key>
     <key name="picture-opacity" type="i">
       <default>100</default>
-      <_summary>Picture Opacity</_summary>
-      <_description>Opacity with which to draw the background picture.</_description>
+      <summary>Picture Opacity</summary>
+      <description>Opacity with which to draw the background picture.</description>
     </key>
     <key name="primary-color" type="s">
       <default>'#5891BC'</default>
-      <_summary>Primary Color</_summary>
-      <_description>Left or Top color when drawing gradients, or the solid color.</_description>
+      <summary>Primary Color</summary>
+      <description>Left or Top color when drawing gradients, or the solid color.</description>
     </key>
     <key name="secondary-color" type="s">
       <default>'#3C8F25'</default>
-      <_summary>Secondary Color</_summary>
-      <_description>Right or Bottom color when drawing gradients, not used for solid color.</_description>
+      <summary>Secondary Color</summary>
+      <description>Right or Bottom color when drawing gradients, not used for solid color.</description>
     </key>
     <key name="color-shading-type" enum="org.mate.background.color-shading-type-enum">
       <default>'vertical-gradient'</default>
-      <_summary>Color Shading Type</_summary>
-      <_description>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid".</_description>
+      <summary>Color Shading Type</summary>
+      <description>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid".</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.debug.gschema.xml.in.in b/schemas/org.mate.debug.gschema.xml.in
index 63e7319..63e7319 100644
--- a/schemas/org.mate.debug.gschema.xml.in.in
+++ b/schemas/org.mate.debug.gschema.xml.in
diff --git a/schemas/org.mate.file-views.gschema.xml.in.in b/schemas/org.mate.file-views.gschema.xml.in
index 9396dd6..35b846a 100644
--- a/schemas/org.mate.file-views.gschema.xml.in.in
+++ b/schemas/org.mate.file-views.gschema.xml.in
@@ -2,8 +2,8 @@
   <schema id="org.mate.file-views" path="/org/mate/desktop/file-views/">
     <key name="icon-theme" type="s">
       <default>'crux_teal'</default>
-      <_summary>File Icon Theme</_summary>
-      <_description>Theme used for displaying file icons.</_description>
+      <summary>File Icon Theme</summary>
+      <description>Theme used for displaying file icons.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.interface.gschema.xml.in b/schemas/org.mate.interface.gschema.xml.in
new file mode 100644
index 0000000..dcd3a9c
--- /dev/null
+++ b/schemas/org.mate.interface.gschema.xml.in
@@ -0,0 +1,169 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.interface" path="/org/mate/desktop/interface/">
+    <key name="accessibility" type="b">
+      <default>false</default>
+      <summary>Enable Accessibility</summary>
+      <description>Whether Applications should have accessibility support.</description>
+    </key>
+    <key name="enable-animations" type="b">
+      <default>true</default>
+      <summary>Enable Animations</summary>
+      <description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</description>
+    </key>
+    <key name="menus-have-tearoff" type="b">
+      <default>false</default>
+      <summary>Menus Have Tearoff</summary>
+      <description>Whether menus should have a tearoff.</description>
+    </key>
+    <key name="can-change-accels" type="b">
+      <default>false</default>
+      <summary>Can Change Accels</summary>
+      <description>Whether the user can dynamically type a new accelerator when  positioned over an active menuitem.</description>
+    </key>
+    <key name="toolbar-style" type="s">
+      <default>'both-horiz'</default>
+      <summary>Toolbar Style</summary>
+      <description>Toolbar Style. Valid values are "both", "both-horiz", "icons", and "text".</description>
+    </key>
+    <key name="menus-have-icons" type="b">
+      <default>true</default>
+      <summary>Menus Have Icons</summary>
+      <description>Whether menus may display an icon next to a menu entry.</description>
+    </key>
+    <key name="buttons-have-icons" type="b">
+      <default>true</default>
+      <summary>Buttons Have Icons</summary>
+      <description>Whether buttons may display an icon in addition to the button text.</description>
+    </key>
+    <key name="menubar-detachable" type="b">
+      <default>false</default>
+      <summary>Menubar Detachable</summary>
+      <description>Whether the user can detach menubars and move them around.</description>
+    </key>
+    <key name="toolbar-detachable" type="b">
+      <default>false</default>
+      <summary>Toolbar Detachable</summary>
+      <description>Whether the user can detach toolbars and move them around.</description>
+    </key>
+    <key name="toolbar-icons-size" type="s">
+      <default>'large-toolbar'</default>
+      <summary>Toolbar Icon Size</summary>
+      <description>Size of icons in toolbars, either "small-toolbar" or "large-toolbar".</description>
+    </key>
+    <key name="cursor-blink" type="b">
+      <default>true</default>
+      <summary>Cursor Blink</summary>
+      <description>Whether the cursor should blink.</description>
+    </key>
+    <key name="cursor-blink-time" type="i">
+      <default>1200</default>
+      <summary>Cursor Blink Time</summary>
+      <description>Length of the cursor blink cycle, in milliseconds.</description>
+    </key>
+    <key name="icon-theme" type="s">
+      <default>'menta'</default>
+      <summary>Icon Theme</summary>
+      <description>Icon theme to use for the panel, caja etc.</description>
+    </key>
+    <key name="gtk-theme" type="s">
+      <default>'Menta'</default>
+      <summary>Gtk+ Theme</summary>
+      <description>Basename of the default theme used by gtk+.</description>
+    </key>
+    <key name="gtk-key-theme" type="s">
+      <default>'Default'</default>
+      <summary>Gtk+ Theme</summary>
+      <description>Basename of the default theme used by gtk+.</description>
+    </key>
+    <key name="gtk-color-scheme" type="s">
+      <default>''</default>
+      <summary>List of symbolic names and color equivalents</summary>
+      <description>A '\n' separated list of "name:color" as defined by the 'gtk-color-scheme' setting</description>
+    </key>
+    <key name="font-name" type="s">
+      <default>'Sans 10'</default>
+      <summary>Default font</summary>
+      <description>Name of the default font used by gtk+.</description>
+    </key>
+    <key name="gtk-im-preedit-style" type="s">
+      <default>'callback'</default>
+      <summary>GTK IM Preedit Style</summary>
+      <description>Name of the GTK+ input method Preedit Style used by gtk+.</description>
+    </key>
+    <key name="gtk-im-status-style" type="s">
+      <default>'callback'</default>
+      <summary>GTK IM Status Style</summary>
+      <description>Name of the GTK+ input method Status Style used by gtk+.</description>
+    </key>
+    <key name="gtk-im-module" type="s">
+      <default>''</default>
+      <summary>GTK IM Module</summary>
+      <description>Name of the input method module used by GTK+.</description>
+    </key>
+    <key name="gtk-dialogs-use-header" type="b">
+      <default>false</default>
+      <summary>Use GTK3 header bar</summary>
+      <description>Whether builtin GTK+ dialogs such as the file chooser, the color chooser or the font chooser will use a header bar at the top to show action widgets, or an action area at the bottom. This setting does not affect custom dialogs using GtkDialog directly, or message dialogs.</description>
+    </key>
+    <key name="gtk-overlay-scrolling" type="b">
+      <default>false</default>
+      <summary>Use GTK3 overlay scrolling</summary>
+      <description>Whether built-in GTK+ scrolled windows will use overlay scrolling. Overlay scrolling hides and reduces the size of the scrollbar until it gets focus.</description>
+    </key>
+    <key name="gtk-enable-animations" type="b">
+      <default>true</default>
+      <summary>Enable Gtk toolkit-wide animations</summary>
+      <description>Whether to enable toolkit-wide animations.</description>
+    </key>
+    <key name="document-font-name" type="s">
+      <default>'Sans 10'</default>
+      <summary>Document font</summary>
+      <description>Name of the default font used for reading documents.</description>
+    </key>
+    <key name="monospace-font-name" type="s">
+      <default>'Monospace 10'</default>
+      <summary>Monospace font</summary>
+      <description>Name of a monospaced (fixed-width) font for use in locations like terminals.</description>
+    </key>
+    <key name="use-custom-font" type="b">
+      <default>false</default>
+      <summary>Use Custom Font</summary>
+      <description>Whether to use a custom font in gtk+ applications.</description>
+    </key>
+    <key name="status-bar-meter-on-right" type="b">
+      <default>false</default>
+      <summary>Status Bar on Right</summary>
+      <description>Whether to display a status bar meter on the right.</description>
+    </key>
+    <key name="file-chooser-backend" type="s">
+      <default>'gio'</default>
+      <summary>Module for GtkFileChooser</summary>
+      <description>Module to use as the filesystem model for the GtkFileChooser widget.  Possible values are "gio" and "gtk+".</description>
+    </key>
+    <key name="menubar-accel" type="s">
+      <default>'F10'</default>
+      <summary>Menubar accelerator</summary>
+      <description>Keyboard shortcut to open the menu bars.</description>
+    </key>
+    <key name="show-input-method-menu" type="b">
+      <default>true</default>
+      <summary>Show the 'Input Methods' menu</summary>
+      <description>Whether the context menus of entries and text views  should offer to change the input method.</description>
+    </key>
+    <key name="show-unicode-menu" type="b">
+      <default>true</default>
+      <summary>Show the 'Unicode Control Character' menu</summary>
+      <description>Whether the context menus of entries and text views  should offer to insert control characters.</description>
+    </key>
+    <key name="gtk-decoration-layout" type="s">
+      <default>'menu:minimize,maximize,close'</default>
+      <summary>Titlebar layout of GTK3 client-side decorated windows</summary>
+      <description>This setting determines which buttons should be put in the titlebar of client-side decorated windows, and whether they should be placed at the left of right. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-decoration-layout.</description>
+    </key>
+    <key name="automatic-mnemonics" type="b">
+      <default>true</default>
+      <summary>Only show mnemonics on when the Alt key is pressed</summary>
+      <description>Whether mnemonics should be automatically shown and hidden when the user presses the Alt key.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.interface.gschema.xml.in.in b/schemas/org.mate.interface.gschema.xml.in.in
deleted file mode 100644
index c8b3742..0000000
--- a/schemas/org.mate.interface.gschema.xml.in.in
+++ /dev/null
@@ -1,169 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.interface" path="/org/mate/desktop/interface/">
-    <key name="accessibility" type="b">
-      <default>false</default>
-      <_summary>Enable Accessibility</_summary>
-      <_description>Whether Applications should have accessibility support.</_description>
-    </key>
-    <key name="enable-animations" type="b">
-      <default>true</default>
-      <_summary>Enable Animations</_summary>
-      <_description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</_description>
-    </key>
-    <key name="menus-have-tearoff" type="b">
-      <default>false</default>
-      <_summary>Menus Have Tearoff</_summary>
-      <_description>Whether menus should have a tearoff.</_description>
-    </key>
-    <key name="can-change-accels" type="b">
-      <default>false</default>
-      <_summary>Can Change Accels</_summary>
-      <_description>Whether the user can dynamically type a new accelerator when  positioned over an active menuitem.</_description>
-    </key>
-    <key name="toolbar-style" type="s">
-      <default>'both-horiz'</default>
-      <_summary>Toolbar Style</_summary>
-      <_description>Toolbar Style. Valid values are "both", "both-horiz", "icons", and "text".</_description>
-    </key>
-    <key name="menus-have-icons" type="b">
-      <default>true</default>
-      <_summary>Menus Have Icons</_summary>
-      <_description>Whether menus may display an icon next to a menu entry.</_description>
-    </key>
-    <key name="buttons-have-icons" type="b">
-      <default>true</default>
-      <_summary>Buttons Have Icons</_summary>
-      <_description>Whether buttons may display an icon in addition to the button text.</_description>
-    </key>
-    <key name="menubar-detachable" type="b">
-      <default>false</default>
-      <_summary>Menubar Detachable</_summary>
-      <_description>Whether the user can detach menubars and move them around.</_description>
-    </key>
-    <key name="toolbar-detachable" type="b">
-      <default>false</default>
-      <_summary>Toolbar Detachable</_summary>
-      <_description>Whether the user can detach toolbars and move them around.</_description>
-    </key>
-    <key name="toolbar-icons-size" type="s">
-      <default>'large-toolbar'</default>
-      <_summary>Toolbar Icon Size</_summary>
-      <_description>Size of icons in toolbars, either "small-toolbar" or "large-toolbar".</_description>
-    </key>
-    <key name="cursor-blink" type="b">
-      <default>true</default>
-      <_summary>Cursor Blink</_summary>
-      <_description>Whether the cursor should blink.</_description>
-    </key>
-    <key name="cursor-blink-time" type="i">
-      <default>1200</default>
-      <_summary>Cursor Blink Time</_summary>
-      <_description>Length of the cursor blink cycle, in milliseconds.</_description>
-    </key>
-    <key name="icon-theme" type="s">
-      <default>'menta'</default>
-      <_summary>Icon Theme</_summary>
-      <_description>Icon theme to use for the panel, caja etc.</_description>
-    </key>
-    <key name="gtk-theme" type="s">
-      <default>'Menta'</default>
-      <_summary>Gtk+ Theme</_summary>
-      <_description>Basename of the default theme used by gtk+.</_description>
-    </key>
-    <key name="gtk-key-theme" type="s">
-      <default>'Default'</default>
-      <_summary>Gtk+ Theme</_summary>
-      <_description>Basename of the default theme used by gtk+.</_description>
-    </key>
-    <key name="gtk-color-scheme" type="s">
-      <default>''</default>
-      <_summary>List of symbolic names and color equivalents</_summary>
-      <_description>A '\n' separated list of "name:color" as defined by the 'gtk-color-scheme' setting</_description>
-    </key>
-    <key name="font-name" type="s">
-      <default>'Sans 10'</default>
-      <_summary>Default font</_summary>
-      <_description>Name of the default font used by gtk+.</_description>
-    </key>
-    <key name="gtk-im-preedit-style" type="s">
-      <default>'callback'</default>
-      <_summary>GTK IM Preedit Style</_summary>
-      <_description>Name of the GTK+ input method Preedit Style used by gtk+.</_description>
-    </key>
-    <key name="gtk-im-status-style" type="s">
-      <default>'callback'</default>
-      <_summary>GTK IM Status Style</_summary>
-      <_description>Name of the GTK+ input method Status Style used by gtk+.</_description>
-    </key>
-    <key name="gtk-im-module" type="s">
-      <default>''</default>
-      <_summary>GTK IM Module</_summary>
-      <_description>Name of the input method module used by GTK+.</_description>
-    </key>
-    <key name="gtk-dialogs-use-header" type="b">
-      <default>false</default>
-      <_summary>Use GTK3 header bar</_summary>
-      <_description>Whether builtin GTK+ dialogs such as the file chooser, the color chooser or the font chooser will use a header bar at the top to show action widgets, or an action area at the bottom. This setting does not affect custom dialogs using GtkDialog directly, or message dialogs.</_description>
-    </key>
-    <key name="gtk-overlay-scrolling" type="b">
-      <default>false</default>
-      <_summary>Use GTK3 overlay scrolling</_summary>
-      <_description>Whether built-in GTK+ scrolled windows will use overlay scrolling. Overlay scrolling hides and reduces the size of the scrollbar until it gets focus.</_description>
-    </key>
-    <key name="gtk-enable-animations" type="b">
-      <default>true</default>
-      <_summary>Enable Gtk toolkit-wide animations</_summary>
-      <_description>Whether to enable toolkit-wide animations.</_description>
-    </key>
-    <key name="document-font-name" type="s">
-      <default>'Sans 10'</default>
-      <_summary>Document font</_summary>
-      <_description>Name of the default font used for reading documents.</_description>
-    </key>
-    <key name="monospace-font-name" type="s">
-      <default>'Monospace 10'</default>
-      <_summary>Monospace font</_summary>
-      <_description>Name of a monospaced (fixed-width) font for use in locations like terminals.</_description>
-    </key>
-    <key name="use-custom-font" type="b">
-      <default>false</default>
-      <_summary>Use Custom Font</_summary>
-      <_description>Whether to use a custom font in gtk+ applications.</_description>
-    </key>
-    <key name="status-bar-meter-on-right" type="b">
-      <default>false</default>
-      <_summary>Status Bar on Right</_summary>
-      <_description>Whether to display a status bar meter on the right.</_description>
-    </key>
-    <key name="file-chooser-backend" type="s">
-      <default>'gio'</default>
-      <_summary>Module for GtkFileChooser</_summary>
-      <_description>Module to use as the filesystem model for the GtkFileChooser widget.  Possible values are "gio" and "gtk+".</_description>
-    </key>
-    <key name="menubar-accel" type="s">
-      <default>'F10'</default>
-      <_summary>Menubar accelerator</_summary>
-      <_description>Keyboard shortcut to open the menu bars.</_description>
-    </key>
-    <key name="show-input-method-menu" type="b">
-      <default>true</default>
-      <_summary>Show the 'Input Methods' menu</_summary>
-      <_description>Whether the context menus of entries and text views  should offer to change the input method.</_description>
-    </key>
-    <key name="show-unicode-menu" type="b">
-      <default>true</default>
-      <_summary>Show the 'Unicode Control Character' menu</_summary>
-      <_description>Whether the context menus of entries and text views  should offer to insert control characters.</_description>
-    </key>
-    <key name="gtk-decoration-layout" type="s">
-      <default>'menu:minimize,maximize,close'</default>
-      <_summary>Titlebar layout of GTK3 client-side decorated windows</_summary>
-      <_description>This setting determines which buttons should be put in the titlebar of client-side decorated windows, and whether they should be placed at the left of right. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-decoration-layout.</_description>
-    </key>
-    <key name="automatic-mnemonics" type="b">
-      <default>true</default>
-      <_summary>Only show mnemonics on when the Alt key is pressed</_summary>
-      <_description>Whether mnemonics should be automatically shown and hidden when the user presses the Alt key.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.lockdown.gschema.xml.in b/schemas/org.mate.lockdown.gschema.xml.in
new file mode 100644
index 0000000..1517bd1
--- /dev/null
+++ b/schemas/org.mate.lockdown.gschema.xml.in
@@ -0,0 +1,49 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.lockdown" path="/org/mate/desktop/lockdown/">
+    <key name="disable-command-line" type="b">
+      <default>false</default>
+      <summary>Disable command line</summary>
+      <description>Prevent the user from accessing the terminal or specifying a command line to be executed. For example, this would disable access to the panel's "Run Application" dialog.</description>
+    </key>
+    <key name="disable-save-to-disk" type="b">
+      <default>false</default>
+      <summary>Disable saving files to disk</summary>
+      <description>Prevent the user from saving files to disk. For example, this would disable access to all applications' "Save as" dialogs.</description>
+    </key>
+    <key name="disable-printing" type="b">
+      <default>false</default>
+      <summary>Disable printing</summary>
+      <description>Prevent the user from printing. For example, this would disable access to all applications' "Print" dialogs.</description>
+    </key>
+    <key name="disable-print-setup" type="b">
+      <default>false</default>
+      <summary>Disable print setup</summary>
+      <description>Prevent the user from modifying print settings. For example, this would disable access to all applications' "Print Setup" dialogs.</description>
+    </key>
+    <key name="disable-user-switching" type="b">
+      <default>false</default>
+      <summary>Disable user switching</summary>
+      <description>Prevent the user from switching to another account while his session is active.</description>
+    </key>
+    <key name="disable-lock-screen" type="b">
+      <default>false</default>
+      <summary>Disable lock screen</summary>
+      <description>Prevent the user from locking the screen.</description>
+    </key>
+    <key name="disable-application-handlers" type="b">
+      <default>false</default>
+      <summary>Disable URL and MIME type handlers</summary>
+      <description>Prevent running any URL or MIME type handler applications.</description>
+    </key>
+    <key name="disable-theme-settings" type="b">
+      <default>false</default>
+      <summary>Disable theme settings</summary>
+      <description>Prevent the user from changing theme settings.</description>
+    </key>
+    <key name="disable-log-out" type="b">
+      <default>false</default>
+      <summary>Disable log out</summary>
+      <description>Prevent the user from logging out.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.lockdown.gschema.xml.in.in b/schemas/org.mate.lockdown.gschema.xml.in.in
deleted file mode 100644
index e1e5494..0000000
--- a/schemas/org.mate.lockdown.gschema.xml.in.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.lockdown" path="/org/mate/desktop/lockdown/">
-    <key name="disable-command-line" type="b">
-      <default>false</default>
-      <_summary>Disable command line</_summary>
-      <_description>Prevent the user from accessing the terminal or specifying a command line to be executed. For example, this would disable access to the panel's "Run Application" dialog.</_description>
-    </key>
-    <key name="disable-save-to-disk" type="b">
-      <default>false</default>
-      <_summary>Disable saving files to disk</_summary>
-      <_description>Prevent the user from saving files to disk. For example, this would disable access to all applications' "Save as" dialogs.</_description>
-    </key>
-    <key name="disable-printing" type="b">
-      <default>false</default>
-      <_summary>Disable printing</_summary>
-      <_description>Prevent the user from printing. For example, this would disable access to all applications' "Print" dialogs.</_description>
-    </key>
-    <key name="disable-print-setup" type="b">
-      <default>false</default>
-      <_summary>Disable print setup</_summary>
-      <_description>Prevent the user from modifying print settings. For example, this would disable access to all applications' "Print Setup" dialogs.</_description>
-    </key>
-    <key name="disable-user-switching" type="b">
-      <default>false</default>
-      <_summary>Disable user switching</_summary>
-      <_description>Prevent the user from switching to another account while his session is active.</_description>
-    </key>
-    <key name="disable-lock-screen" type="b">
-      <default>false</default>
-      <_summary>Disable lock screen</_summary>
-      <_description>Prevent the user from locking the screen.</_description>
-    </key>
-    <key name="disable-application-handlers" type="b">
-      <default>false</default>
-      <_summary>Disable URL and MIME type handlers</_summary>
-      <_description>Prevent running any URL or MIME type handler applications.</_description>
-    </key>
-    <key name="disable-theme-settings" type="b">
-      <default>false</default>
-      <_summary>Disable theme settings</_summary>
-      <_description>Prevent the user from changing theme settings.</_description>
-    </key>
-    <key name="disable-log-out" type="b">
-      <default>false</default>
-      <_summary>Disable log out</_summary>
-      <_description>Prevent the user from logging out.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.peripherals-keyboard.gschema.xml.in.in b/schemas/org.mate.peripherals-keyboard.gschema.xml.in
index ebe4d5e..7143f2d 100644
--- a/schemas/org.mate.peripherals-keyboard.gschema.xml.in.in
+++ b/schemas/org.mate.peripherals-keyboard.gschema.xml.in
@@ -22,7 +22,7 @@
     </key>
     <key name="bell-mode" type="s">
       <default>'on'</default>
-      <_description>possible values are "on", "off", and "custom".</_description>
+      <description>possible values are "on", "off", and "custom".</description>
     </key>
     <key name="bell-pitch" type="i">
       <default>400</default>
@@ -32,18 +32,18 @@
     </key>
     <key name="bell-custom-file" type="s">
       <default>''</default>
-      <_summary>Keyboard Bell Custom Filename</_summary>
-      <_description>File name of the bell sound to be played.</_description>
+      <summary>Keyboard Bell Custom Filename</summary>
+      <description>File name of the bell sound to be played.</description>
     </key>
     <key name="remember-numlock-state" type="b">
       <default>true</default>
-      <_summary>Remember NumLock state</_summary>
-      <_description>When set to true, MATE will remember the state of the NumLock LED between sessions.</_description>
+      <summary>Remember NumLock state</summary>
+      <description>When set to true, MATE will remember the state of the NumLock LED between sessions.</description>
     </key>
     <key name="numlock-state" enum="org.mate.peripherals-keyboard.NumLockState">
       <default>'unknown'</default>
-      <_summary>NumLock state</_summary>
-      <_description>The remembered state of the NumLock LED.</_description>
+      <summary>NumLock state</summary>
+      <description>The remembered state of the NumLock LED.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in b/schemas/org.mate.peripherals-mouse.gschema.xml.in
new file mode 100644
index 0000000..bb7eebe
--- /dev/null
+++ b/schemas/org.mate.peripherals-mouse.gschema.xml.in
@@ -0,0 +1,59 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.peripherals-mouse" path="/org/mate/desktop/peripherals/mouse/">
+    <key name="left-handed" type="b">
+      <default>false</default>
+      <summary>Mouse button orientation</summary>
+      <description>Swap left and right mouse buttons for left-handed mice.</description>
+    </key>
+    <key name="single-click" type="b">
+      <default>true</default>
+      <summary>Single Click</summary>
+      <description>Single click to open icons.</description>
+    </key>
+    <key name="motion-acceleration" type="d">
+      <default>-1</default>
+      <summary>Single Click</summary>
+      <description>Acceleration multiplier for mouse motion.  A value of -1 is the system default.</description>
+    </key>
+    <key name="motion-threshold" type="i">
+      <default>-1</default>
+      <summary>Motion Threshold</summary>
+      <description>Distance in pixels the pointer must move before accelerated mouse motion is activated.  A value of -1 is the system default.</description>
+    </key>
+    <key name="drag-threshold" type="i">
+      <default>8</default>
+      <summary>Drag Threshold</summary>
+      <description>Distance before a drag is started.</description>
+    </key>
+    <key name="double-click" type="i">
+      <default>400</default>
+      <summary>Double Click Time</summary>
+      <description>Length of a double click.</description>
+    </key>
+    <key name="middle-button-enabled" type="b">
+      <default>true</default>
+      <summary>Middle button emulation</summary>
+      <description>Enables middle mouse button emulation through simultaneous left and right button click.</description>
+    </key>
+    <key name="locate-pointer" type="b">
+      <default>false</default>
+      <summary>Locate Pointer</summary>
+      <description>Highlights the current location of the pointer when the Control key is pressed and released.</description>
+    </key>
+    <key name="cursor-font" type="s">
+      <default>''</default>
+      <summary>Cursor font</summary>
+      <description>Font name of the cursor. If unset, the default font is used. This value is only propagated to the X server start of each session, so changing it mid-session won't have an effect until the next time you log in.</description>
+    </key>
+    <key name="cursor-theme" type="s">
+      <default>''</default>
+      <summary>Cursor theme</summary>
+      <description>Cursor theme name. Used only by Xservers that support Xcursor, such as XFree86 4.3 and later.</description>
+    </key>
+    <key name="cursor-size" type="i">
+      <default>18</default>
+      <summary>Cursor size</summary>
+      <description>Size of the cursor referenced by cursor_theme.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in.in b/schemas/org.mate.peripherals-mouse.gschema.xml.in.in
deleted file mode 100644
index 3817d9d..0000000
--- a/schemas/org.mate.peripherals-mouse.gschema.xml.in.in
+++ /dev/null
@@ -1,59 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.peripherals-mouse" path="/org/mate/desktop/peripherals/mouse/">
-    <key name="left-handed" type="b">
-      <default>false</default>
-      <_summary>Mouse button orientation</_summary>
-      <_description>Swap left and right mouse buttons for left-handed mice.</_description>
-    </key>
-    <key name="single-click" type="b">
-      <default>true</default>
-      <_summary>Single Click</_summary>
-      <_description>Single click to open icons.</_description>
-    </key>
-    <key name="motion-acceleration" type="d">
-      <default>-1</default>
-      <_summary>Single Click</_summary>
-      <_description>Acceleration multiplier for mouse motion.  A value of -1 is the system default.</_description>
-    </key>
-    <key name="motion-threshold" type="i">
-      <default>-1</default>
-      <_summary>Motion Threshold</_summary>
-      <_description>Distance in pixels the pointer must move before accelerated mouse motion is activated.  A value of -1 is the system default.</_description>
-    </key>
-    <key name="drag-threshold" type="i">
-      <default>8</default>
-      <_summary>Drag Threshold</_summary>
-      <_description>Distance before a drag is started.</_description>
-    </key>
-    <key name="double-click" type="i">
-      <default>400</default>
-      <_summary>Double Click Time</_summary>
-      <_description>Length of a double click.</_description>
-    </key>
-    <key name="middle-button-enabled" type="b">
-      <default>true</default>
-      <_summary>Middle button emulation</_summary>
-      <_description>Enables middle mouse button emulation through simultaneous left and right button click.</_description>
-    </key>
-    <key name="locate-pointer" type="b">
-      <default>false</default>
-      <_summary>Locate Pointer</_summary>
-      <_description>Highlights the current location of the pointer when the Control key is pressed and released.</_description>
-    </key>
-    <key name="cursor-font" type="s">
-      <default>''</default>
-      <_summary>Cursor font</_summary>
-      <_description>Font name of the cursor. If unset, the default font is used. This value is only propagated to the X server start of each session, so changing it mid-session won't have an effect until the next time you log in.</_description>
-    </key>
-    <key name="cursor-theme" type="s">
-      <default>''</default>
-      <_summary>Cursor theme</_summary>
-      <_description>Cursor theme name. Used only by Xservers that support Xcursor, such as XFree86 4.3 and later.</_description>
-    </key>
-    <key name="cursor-size" type="i">
-      <default>18</default>
-      <_summary>Cursor size</_summary>
-      <_description>Size of the cursor referenced by cursor_theme.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.sound.gschema.xml.in b/schemas/org.mate.sound.gschema.xml.in
new file mode 100644
index 0000000..7117689
--- /dev/null
+++ b/schemas/org.mate.sound.gschema.xml.in
@@ -0,0 +1,34 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.sound" path="/org/mate/desktop/sound/">
+    <key name="default-mixer-device" type="s">
+      <default>''</default>
+      <summary>Default mixer device</summary>
+      <description>The default mixer device used by the multimedia key bindings.</description>
+    </key>
+    <key name="default-mixer-tracks" type="as">
+      <default>[]</default>
+      <summary>Default mixer tracks</summary>
+      <description>The default mixer tracks used by the multimedia key bindings.</description>
+    </key>
+    <key name="enable-esd" type="b">
+      <default>false</default>
+      <summary>Enable ESD</summary>
+      <description>Enable sound server startup.</description>
+    </key>
+    <key name="event-sounds" type="b">
+      <default>false</default>
+      <summary>Sounds for events</summary>
+      <description>Whether to play sounds on user events.</description>
+    </key>
+    <key name="theme-name" type="s">
+      <default>'freedesktop'</default>
+      <summary>Sound theme name</summary>
+      <description>The XDG sound theme to use for event sounds.</description>
+    </key>
+    <key name="input-feedback-sounds" type="b">
+      <default>false</default>
+      <summary>Input feedback sounds</summary>
+      <description>Whether to play sounds on input events.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.sound.gschema.xml.in.in b/schemas/org.mate.sound.gschema.xml.in.in
deleted file mode 100644
index ad412b8..0000000
--- a/schemas/org.mate.sound.gschema.xml.in.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.sound" path="/org/mate/desktop/sound/">
-    <key name="default-mixer-device" type="s">
-      <default>''</default>
-      <_summary>Default mixer device</_summary>
-      <_description>The default mixer device used by the multimedia key bindings.</_description>
-    </key>
-    <key name="default-mixer-tracks" type="as">
-      <default>[]</default>
-      <_summary>Default mixer tracks</_summary>
-      <_description>The default mixer tracks used by the multimedia key bindings.</_description>
-    </key>
-    <key name="enable-esd" type="b">
-      <default>false</default>
-      <_summary>Enable ESD</_summary>
-      <_description>Enable sound server startup.</_description>
-    </key>
-    <key name="event-sounds" type="b">
-      <default>false</default>
-      <_summary>Sounds for events</_summary>
-      <_description>Whether to play sounds on user events.</_description>
-    </key>
-    <key name="theme-name" type="s">
-      <default>'freedesktop'</default>
-      <_summary>Sound theme name</_summary>
-      <_description>The XDG sound theme to use for event sounds.</_description>
-    </key>
-    <key name="input-feedback-sounds" type="b">
-      <default>false</default>
-      <_summary>Input feedback sounds</_summary>
-      <_description>Whether to play sounds on input events.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.thumbnail-cache.gschema.xml.in.in b/schemas/org.mate.thumbnail-cache.gschema.xml.in
index 9c240ad..eebbe5d 100644
--- a/schemas/org.mate.thumbnail-cache.gschema.xml.in.in
+++ b/schemas/org.mate.thumbnail-cache.gschema.xml.in
@@ -2,11 +2,11 @@
   <schema id="org.mate.thumbnail-cache" path="/org/mate/desktop/thumbnail-cache/">
     <key name="maximum-age" type="i">
       <default>180</default>
-      <_description>Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning.</_description>
+      <description>Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning.</description>
     </key>
     <key name="maximum-size" type="i">
       <default>512</default>
-      <_description>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning.</_description>
+      <description>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.mate.thumbnailers.gschema.xml.in b/schemas/org.mate.thumbnailers.gschema.xml.in
new file mode 100644
index 0000000..3f0f099
--- /dev/null
+++ b/schemas/org.mate.thumbnailers.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.thumbnailers" path="/org/mate/desktop/thumbnailers/">
+    <key name="disable-all" type="b">
+      <default>false</default>
+      <summary>Disable all external thumbnailers</summary>
+      <description>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</description>
+    </key>
+    <key name="disable" type="as">
+      <default>[]</default>
+      <summary>List of mime-types for which external thumbnailer programs will be disabled</summary>
+      <description>Thumbnails will not be created for files whose mime-type is contained in the list.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.thumbnailers.gschema.xml.in.in b/schemas/org.mate.thumbnailers.gschema.xml.in.in
deleted file mode 100644
index 7d7eb56..0000000
--- a/schemas/org.mate.thumbnailers.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.thumbnailers" path="/org/mate/desktop/thumbnailers/">
-    <key name="disable-all" type="b">
-      <default>false</default>
-      <_summary>Disable all external thumbnailers</_summary>
-      <_description>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</_description>
-    </key>
-    <key name="disable" type="as">
-      <default>[]</default>
-      <_summary>List of mime-types for which external thumbnailer programs will be disabled</_summary>
-      <_description>Thumbnails will not be created for files whose mime-type is contained in the list.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/schemas/org.mate.typing-break.gschema.xml.in b/schemas/org.mate.typing-break.gschema.xml.in
new file mode 100644
index 0000000..5420e84
--- /dev/null
+++ b/schemas/org.mate.typing-break.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.typing-break" path="/org/mate/desktop/typing-break/">
+    <key name="type-time" type="i">
+      <default>60</default>
+      <summary>Type time</summary>
+      <description>Number of minutes of typing time before break mode starts.</description>
+    </key>
+    <key name="break-time" type="i">
+      <default>3</default>
+      <summary>Break time</summary>
+      <description>Number of minutes that the typing break should last.</description>
+    </key>
+    <key name="allow-postpone" type="b">
+      <default>false</default>
+      <summary>Allow postponing of breaks</summary>
+      <description>Whether or not the typing break screen can be postponed.</description>
+    </key>
+    <key name="enabled" type="b">
+      <default>false</default>
+      <summary>Whether or not keyboard locking is enabled</summary>
+      <description>Whether or not keyboard locking is enabled.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.mate.typing-break.gschema.xml.in.in b/schemas/org.mate.typing-break.gschema.xml.in.in
deleted file mode 100644
index 3da4086..0000000
--- a/schemas/org.mate.typing-break.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.typing-break" path="/org/mate/desktop/typing-break/">
-    <key name="type-time" type="i">
-      <default>60</default>
-      <_summary>Type time</_summary>
-      <_description>Number of minutes of typing time before break mode starts.</_description>
-    </key>
-    <key name="break-time" type="i">
-      <default>3</default>
-      <_summary>Break time</_summary>
-      <_description>Number of minutes that the typing break should last.</_description>
-    </key>
-    <key name="allow-postpone" type="b">
-      <default>false</default>
-      <_summary>Allow postponing of breaks</_summary>
-      <_description>Whether or not the typing break screen can be postponed.</_description>
-    </key>
-    <key name="enabled" type="b">
-      <default>false</default>
-      <_summary>Whether or not keyboard locking is enabled</_summary>
-      <_description>Whether or not keyboard locking is enabled.</_description>
-    </key>
-  </schema>
-</schemalist>