diff --git a/linux/debian/com.keyman.config.appdata.xml b/linux/debian/com.keyman.config.appdata.xml
index f137be461d..9df49a37dc 100644
--- a/linux/debian/com.keyman.config.appdata.xml
+++ b/linux/debian/com.keyman.config.appdata.xml
@@ -14,8 +14,8 @@
     <p>
 Keyman makes it possible for you to type in over 2,000 languages on Windows, macOS, Linux,
 iPhone, iPad, Android tablets and phones, and even instantly in your web browser. With the
-world’s most powerful keyboarding engine, intuitive and rapid text input is now possible in
-your language, and for over 99% of the global population’s mother tongues!
+world's most powerful keyboarding engine, intuitive and rapid text input is now possible in
+your language, and for over 99% of the global population's mother tongues!
 </p>
     <p>
 Originally created in 1993 to type Lao on Windows, Keyman is now a free and
@@ -40,7 +40,7 @@ and mobile platforms.
   <screenshots>
     <screenshot type="default">
       <caption>The Keyman for Linux configuration window with a keyboard welcome window.</caption>
-      <image type="source" width="920" height="518">https://keyman.com/go/linux/11.0/linux-configuration.png</image>
+      <image type="source" width="920" height="518">https://keyman.com/go/linux/17.0/linux-configuration.png</image>
     </screenshot>
   </screenshots>
 
diff --git a/linux/debian/com.keyman.ibus_keyman.metainfo.xml b/linux/debian/com.keyman.ibus_keyman.metainfo.xml
index eb02001da0..1f021d2fce 100644
--- a/linux/debian/com.keyman.ibus_keyman.metainfo.xml
+++ b/linux/debian/com.keyman.ibus_keyman.metainfo.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="inputmethod">
-​  <id>com.keyman.ibus_keyman</id>
-​  <metadata_license>MIT</metadata_license>
+  <id>com.keyman.ibus_keyman</id>
+  <metadata_license>MIT</metadata_license>
   <project_license>GPL-2+</project_license>
   <project_group>Keyman</project_group>
   <developer_name>SIL International</developer_name>
   <icon type="remote" width="96" height="96">https://keyman.com/cdn/dev/img/keyman-logo.png</icon>
 
-​  <name>ibus-keyman</name>
-​  <summary>Keyman input method for IBus</summary>
-​  <description>
-​    <p>
-      This input method provides the Keyman IM engine for IBus. With this module, you can
-      use keyboard layouts designed for Keyman under the IBus platform.
-    </p>
+  <name>ibus-keyman</name>
+  <summary>Keyman input method for IBus</summary>
+  <description>
     <p>
-      Originally created in 1993 to type Lao on Windows, Keyman is now a free and
-      open source keyboarding platform which allows anyone to write a keyboard layout
-      for their language. Keyman is available for many platforms, including Windows,
-      macOS, iOS, Android, Linux and the web.
+     This input method provides the Keyman IM engine for IBus. With this module, you can
+     use keyboard layouts designed for Keyman under the IBus platform.
+   </p>
+   <p>
+     Originally created in 1993 to type Lao on Windows, Keyman is now a free and
+     open source keyboarding platform which allows anyone to write a keyboard layout
+     for their language. Keyman is available for many platforms, including Windows,
+     macOS, iOS, Android, Linux and the web.
+   </p>
+   <p>
+     Keyboard layouts are defined with a clear and easy to understand keyboard
+     grammar. Keyman's contextual input model means keyboard layouts can be
+     intelligent and make it simple to type even the most complex languages.
+     Keyboard layouts are distributed through an open catalog to all major desktop
+     and mobile platforms.
+   </p>
+   <p>
+      Input methods are typing systems allowing users to input complex languages.
     </p>
-    <p>
-      Keyboard layouts are defined with a clear and easy to understand keyboard
-      grammar. Keyman's contextual input model means keyboard layouts can be
-      intelligent and make it simple to type even the most complex languages.
-      Keyboard layouts are distributed through an open catalog to all major desktop
-      and mobile platforms.
-    </p>
-    <p>
-​      Input methods are typing systems allowing users to input complex languages.
-​    </p>
-​  </description>
+  </description>
   <url type="homepage">https://keyman.com/linux/</url>
   <url type="bugtracker">https://github.com/keymanapp/keyman/issues</url>
   <url type="help">https://help.keyman.com/</url>
   <url type="faq">https://community.software.sil.org/c/keyman</url>
   <url type="donation">https://donate.keyman.com/</url>
-​</component>
+</component>
diff --git a/linux/debian/keyman.install b/linux/debian/keyman.install
index 8096e324ae..a036eb8a73 100644
--- a/linux/debian/keyman.install
+++ b/linux/debian/keyman.install
@@ -1,4 +1,3 @@
-linux/keyman-config/com.keyman.gschema.xml  usr/share/glib-2.0/schemas/
 linux/keyman-config/icons/128/km-config.png  usr/share/icons/hicolor/128x128/apps/
 linux/keyman-config/icons/16/application-x-kmp.png  usr/share/icons/hicolor/16x16/mimetypes/
 linux/keyman-config/icons/24/application-x-kmp.png  usr/share/icons/hicolor/24x24/mimetypes/
@@ -10,5 +9,6 @@ linux/keyman-config/icons/48/km-config.png  usr/share/icons/hicolor/48x48/apps/
 linux/keyman-config/icons/64/application-x-kmp.png  usr/share/icons/hicolor/64x64/mimetypes/
 linux/keyman-config/icons/64/km-config.png  usr/share/icons/hicolor/64x64/apps/
 linux/keyman-config/keyman_config/icons/*  usr/share/keyman/icons/
-linux/keyman-config/km-config.desktop  usr/share/applications
+linux/keyman-config/resources/com.keyman.gschema.xml  usr/share/glib-2.0/schemas/
+linux/keyman-config/resources/km-config.desktop  usr/share/applications
 debian/com.keyman.config.appdata.xml  usr/share/metainfo
diff --git a/linux/debian/rules b/linux/debian/rules
index db1f925017..ec9178298c 100755
--- a/linux/debian/rules
+++ b/linux/debian/rules
@@ -37,6 +37,7 @@ override_dh_auto_configure:
 	linux/keyman-config/build.sh configure
 
 override_dh_auto_build:
+	cp linux/keyman-config/resources/keyman.sharedmimeinfo debian/
 	core/build.sh --no-tests build:arch
 	linux/ibus-keyman/build.sh build
 	linux/keyman-system-service/build.sh build
diff --git a/linux/ibus-keyman/src/test/run-tests.sh b/linux/ibus-keyman/src/test/run-tests.sh
index 932f64b886..44a397582b 100755
--- a/linux/ibus-keyman/src/test/run-tests.sh
+++ b/linux/ibus-keyman/src/test/run-tests.sh
@@ -53,7 +53,7 @@ SCHEMA_DIR=$TEMP_DATA_DIR/glib-2.0/schemas
 export XDG_DATA_DIRS=$TEMP_DATA_DIR:$XDG_DATA_DIRS
 
 mkdir -p "$SCHEMA_DIR"
-cp "$SRCDIR/../keyman-config/com.keyman.gschema.xml" "$SCHEMA_DIR/"
+cp "$SRCDIR/../keyman-config/resources/com.keyman.gschema.xml" "$SCHEMA_DIR/"
 glib-compile-schemas "$SCHEMA_DIR"
 
 export GSETTINGS_BACKEND=memory
diff --git a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
index 930eb4fe2c..2a3735d708 100755
--- a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
+++ b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
@@ -183,7 +183,7 @@ function setup() {
   echo "export GSETTINGS_SCHEMA_DIR=\"$SCHEMA_DIR\"" >> "$ENV_FILE"
 
   mkdir -p "$SCHEMA_DIR"
-  cp "${TOP_SRCDIR}"/../keyman-config/com.keyman.gschema.xml "$SCHEMA_DIR"/
+  cp "${TOP_SRCDIR}"/../keyman-config/resources/com.keyman.gschema.xml "$SCHEMA_DIR"/
   glib-compile-schemas "$SCHEMA_DIR"
 
   export LD_LIBRARY_PATH=${COMMON_ARCH_DIR}/src:${LD_LIBRARY_PATH-}
diff --git a/linux/keyman-config/MANIFEST.in b/linux/keyman-config/MANIFEST.in
index e27020f36c..20705c6fc3 100644
--- a/linux/keyman-config/MANIFEST.in
+++ b/linux/keyman-config/MANIFEST.in
@@ -2,4 +2,4 @@ recursive-include keyman_config/icons *
 recursive-include icons *
 include README.md
 include *.bash-completion
-include *.gschema.xml
+include resources/*.gschema.xml
diff --git a/linux/keyman-config/build.sh b/linux/keyman-config/build.sh
index 1cb603f091..eaf77c05db 100755
--- a/linux/keyman-config/build.sh
+++ b/linux/keyman-config/build.sh
@@ -36,7 +36,7 @@ build_man_pages() {
   export XDG_DATA_DIRS=$TEMP_DATA_DIR:${XDG_DATA_DIRS-}
   export GSETTINGS_SCHEMA_DIR="${SCHEMA_DIR}"
   mkdir -p "$SCHEMA_DIR"
-  cp ./com.keyman.gschema.xml "$SCHEMA_DIR"/
+  cp resources/com.keyman.gschema.xml "$SCHEMA_DIR"/
   glib-compile-schemas "$SCHEMA_DIR"
   ./build-help.sh --man --no-reconf
   export XDG_DATA_DIRS=${XDG_DATA_DIRS#*:}
diff --git a/linux/keyman-config/createkeymandirs.sh b/linux/keyman-config/createkeymandirs.sh
deleted file mode 100755
index d9befe7f5d..0000000000
--- a/linux/keyman-config/createkeymandirs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-sudo mkdir -p /usr/local/share/keyman
-sudo mkdir -p /usr/local/share/fonts/keyman
-sudo mkdir -p /usr/local/share/doc/keyman
-sudo chmod 00777 /usr/local/share/keyman
-sudo chmod 00777 /usr/local/share/fonts/keyman
-sudo chmod 00777 /usr/local/share/doc/keyman
diff --git a/linux/keyman-config/com.keyman.gschema.xml b/linux/keyman-config/resources/com.keyman.gschema.xml
similarity index 100%
rename from linux/keyman-config/com.keyman.gschema.xml
rename to linux/keyman-config/resources/com.keyman.gschema.xml
diff --git a/linux/debian/keyman.sharedmimeinfo b/linux/keyman-config/resources/keyman.sharedmimeinfo
similarity index 100%
rename from linux/debian/keyman.sharedmimeinfo
rename to linux/keyman-config/resources/keyman.sharedmimeinfo
diff --git a/linux/keyman-config/km-config.desktop b/linux/keyman-config/resources/km-config.desktop
similarity index 100%
rename from linux/keyman-config/km-config.desktop
rename to linux/keyman-config/resources/km-config.desktop
diff --git a/linux/scripts/install.sh b/linux/scripts/install.sh
index 55074f4848..7e497232fc 100755
--- a/linux/scripts/install.sh
+++ b/linux/scripts/install.sh
@@ -53,7 +53,7 @@ if [[ "${SUDOINSTALL}" == "yes" ]]; then
 		exit 1
 	fi
 	echo "doing sudo glib-compile-schemas for keyman-config"
-	cp com.keyman.gschema.xml /usr/share/glib-2.0/schemas/
+	cp resources/com.keyman.gschema.xml /usr/share/glib-2.0/schemas/
 	glib-compile-schemas /usr/share/glib-2.0/schemas/
 	echo "doing sudo install of keyman-config"
 	./build.sh install