diff --git a/README.md b/README.md
index d491de3e..2e38289e 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ Plan / to do:
 * maybe: rename (package, app, icon), so it can be installed parallel to OpenBoard, and published on F-Droid
 * ~user-selectable dictionaries, https://github.com/openboard-team/openboard/pull/578~
   * ~make additional dictionaries available for download (from OpenBoard PRs)~
+  * more dictionaries
+  * proper icon for preference
 * ~multi-lingual typing, https://github.com/openboard-team/openboard/pull/586, https://github.com/openboard-team/openboard/pull/593~
   * maybe improve way of merging suggestions from both languages
   * test whether it works reasonably well in non-latin scripts
diff --git a/app/src/debug/res/values/donottranslate.xml b/app/src/debug/res/values/donottranslate.xml
new file mode 100644
index 00000000..a6bf5d2b
--- /dev/null
+++ b/app/src/debug/res/values/donottranslate.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hide_soft_input_permission">org.dslul.openboard.inputmethod.latin.debug.HIDE_SOFT_INPUT</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 654bb78f..f7c8563f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
                  .setPackage("org.dslul.openboard.inputmethod.latin"));
          }
          </pre> -->
-    <permission android:name="org.dslul.openboard.inputmethod.latin.HIDE_SOFT_INPUT"
+    <permission android:name="@string/hide_soft_input_permission"
                 android:protectionLevel="signature" />
 
     <application android:label="@string/english_ime_name"
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/ExpandableBinaryDictionary.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/ExpandableBinaryDictionary.java
index c8d236ad..42703e7a 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -530,7 +530,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
                 Thread.sleep(15000);
                 Log.w(TAG, "End stress in loading");
             } catch (InterruptedException e) {
-                Log.w("Interrupted while loading: " + mDictName, e);
+                Log.w(TAG, "Interrupted while loading: " + mDictName, e);
             }
         }
         final BinaryDictionary oldBinaryDictionary = mBinaryDictionary;
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/SubtypeLocaleUtils.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/SubtypeLocaleUtils.java
index 0d0a3014..4a5f1064 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/SubtypeLocaleUtils.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/SubtypeLocaleUtils.java
@@ -43,7 +43,9 @@ public final class SubtypeLocaleUtils {
     static final String TAG = SubtypeLocaleUtils.class.getSimpleName();
 
     // This reference class {@link R} must be located in the same package as LatinIME.java.
-    private static final String RESOURCE_PACKAGE_NAME = R.class.getPackage().getName();
+    // switched to context.getPackageName(), which works with changed debug package name
+    // any reason to prefer original version?
+//    private static final String RESOURCE_PACKAGE_NAME = R.class.getPackage().getName();
 
     // Special language code to represent "no language".
     public static final String NO_LANGUAGE = "zz";
@@ -96,6 +98,7 @@ public final class SubtypeLocaleUtils {
     }
 
     private static void initLocked(final Context context) {
+        final String RESOURCE_PACKAGE_NAME = context.getPackageName();
         final Resources res = context.getResources();
         sResources = res;
 
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index e8582291..26437859 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -140,4 +140,6 @@
         <item>tr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
         <item>qwerty</item>
     </string-array>
+    <!-- permission name as string to avoid issues with debug build -->
+    <string name="hide_soft_input_permission">org.dslul.openboard.inputmethod.latin.HIDE_SOFT_INPUT</string>
 </resources>
diff --git a/tools/make-emoji-keys/build.gradle b/tools/make-emoji-keys/build.gradle
index 5237401e..1392c43b 100644
--- a/tools/make-emoji-keys/build.gradle
+++ b/tools/make-emoji-keys/build.gradle
@@ -24,10 +24,6 @@ task makeEmoji(type: JavaExec, dependsOn: ['jar']) {
             File.separator + 'main' + File.separator + 'res'
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/tools/make-keyboard-text/build.gradle b/tools/make-keyboard-text/build.gradle
index 627b1743..34f970da 100644
--- a/tools/make-keyboard-text/build.gradle
+++ b/tools/make-keyboard-text/build.gradle
@@ -16,10 +16,6 @@ task makeText(type: JavaExec, dependsOn: ['jar']) {
             File.separator + 'main' + File.separator + 'java'
 }
 
-repositories {
-    mavenCentral()
-}
-
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8