diff --git a/app/build.gradle b/app/build.gradle
index 4eb28048c..fd4394c37 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,6 +20,13 @@ android {
             renderscriptDebuggable false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled false
+            jniDebuggable false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            applicationIdSuffix ".debug"
+        }
+        archivesBaseName = "openboard_" + defaultConfig.versionName
     }
 
 
diff --git a/app/src/debug/res/values/dictionary-pack.xml b/app/src/debug/res/values/dictionary-pack.xml
new file mode 100644
index 000000000..790ab5aa1
--- /dev/null
+++ b/app/src/debug/res/values/dictionary-pack.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="dictionary_pack_client_id" translatable="false">org.dslul.openboard.inputmethod.latin.debug</string>
+<!--    <string name="dictionary_pack_settings_activity" translatable="false">org.dslul.openboard.inputmethod.dictionarypack.DictionarySettingsActivity</string> -->
+    <string name="authority" translatable="false">org.dslul.openboard.inputmethod.debug.dictionarypack.aosp</string>
+</resources>
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 000000000..0c0e89fda
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="english_ime_name" translatable="false">OpenBoard debug</string>
+    <string name="spell_checker_service_name">OpenBoard debug Spell Checker</string>
+    <string name="ime_settings">OpenBoard debug Settings</string>
+
+</resources>
diff --git a/app/src/main/res/layout/more_suggestions.xml b/app/src/main/res/layout/more_suggestions.xml
index 55d4eddc6..ff1fdc745 100644
--- a/app/src/main/res/layout/more_suggestions.xml
+++ b/app/src/main/res/layout/more_suggestions.xml
@@ -25,7 +25,7 @@
     android:orientation="vertical"
 >
     <org.dslul.openboard.inputmethod.latin.suggestions.MoreSuggestionsView
-        xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+        xmlns:latin="http://schemas.android.com/apk/res-auto"
         android:id="@+id/more_suggestions_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"