634 files changed, 430 insertions, 319 deletions

diff --git a/src/main/AndroidManifest.xml b/AndroidManifest.xml
index 820ec9112..820ec9112 100644
--- a/src/main/AndroidManifest.xml
+++ b/AndroidManifest.xml
diff --git a/build.gradle b/build.gradle
index 7ee2dae4b..122e72220 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,26 @@
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
+        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.9.+'
+        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.9.+'
     }
 }
 
-apply plugin: 'android'
-
-repositories {
-    mavenCentral()
+allprojects {
+    repositories {
+        mavenCentral()
+    }
 }
 
+apply plugin: 'android-sdk-manager'
+apply plugin: 'android'
+apply plugin: 'android-test'
+
 version utils.Utils.buildVersionName(1, 2, false)
 group 'net.evendanan'
 
@@ -20,8 +28,15 @@ def localproperties.LocalPropertiesFile localExtraProperties = new localproperti
 def localproperties.LocalPropertiesFile localSigningProperties = new localproperties.LocalPropertiesFile(new File(projectDir, 'local.signing.properties'))
 
 android {
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE'
+    }
+
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         versionCode 123
@@ -36,6 +51,8 @@ android {
         println 'crash report email is: '+support_email_address
 
         buildConfigField "String", "CRASH_REPORT_EMAIL_ADDRESS", '"'+support_email_address+'"'
+
+        testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
     }
 
     compileOptions {
@@ -83,14 +100,61 @@ android {
             debuggable true
         }
     }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            res.srcDirs = ['res']
+        }
+        androidTest {
+            setRoot('src/test')
+        }
+    }
 }
 
 dependencies {
-    compile 'net.evendanan.anysoftkeyboard:api:1.2.2@aar'
-    compile 'net.evendanan:frankenrobot:1.1.3@aar'
-    compile 'com.android.support:support-v4:19.0.1'
-    compile 'com.android.support:appcompat-v7:19.0.1'
-    compile 'com.google.code.findbugs:jsr305:2.0.2'
     //https://groups.google.com/d/msg/adt-dev/nQobKd2Gl_8/Z5yWAvCh4h4J
     compile fileTree(dir: 'libs', include: 'native_libs.jar')
+    repositories {
+        mavenCentral()
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
+    }
+    compile 'net.evendanan.anysoftkeyboard:api:1.2.2@aar'
+    compile 'net.evendanan:frankenrobot:1.1.3@aar'
+    compile 'com.android.support:support-v4:19.+'
+    compile 'com.android.support:appcompat-v7:19.+'
+    compile 'com.android.support:support-annotations:+'
+    compile 'com.google.code.gson:gson:2.2.+'
+    androidTestCompile 'junit:junit:4.11'
+
+    androidTestCompile('org.robolectric:robolectric:2.3-SNAPSHOT') {
+        exclude module: 'classworlds'
+        exclude module: 'maven-artifact'
+        exclude module: 'maven-artifact-manager'
+        exclude module: 'maven-error-diagnostics'
+        exclude module: 'maven-model'
+        exclude module: 'maven-plugin-registry'
+        exclude module: 'maven-profile'
+        exclude module: 'maven-project'
+        exclude module: 'maven-settings'
+        exclude module: 'nekohtml'
+        exclude module: 'plexus-container-default'
+        exclude module: 'plexus-interpolation'
+        exclude module: 'plexus-utils'
+        exclude module: 'wagon-file'
+        exclude module: 'wagon-http-lightweight'
+        exclude module: 'wagon-http-shared'
+        exclude module: 'wagon-provider-api'
+    }
+    androidTestCompile 'org.mockito:mockito-core:1.9.5'
+    androidTestCompile 'com.squareup:fest-android:1.0.+'
+}
+
+apply plugin: 'idea'
+
+idea {
+    module {
+        testOutputDir = file('build/test-classes/debug')
+    }
 }
diff --git a/src/main/res/anim/candidates_bottom_to_up_enter.xml b/res/anim/candidates_bottom_to_up_enter.xml
index e0d257491..e0d257491 100644
--- a/src/main/res/anim/candidates_bottom_to_up_enter.xml
+++ b/res/anim/candidates_bottom_to_up_enter.xml
diff --git a/src/main/res/anim/candidates_up_to_bottom_exit.xml b/res/anim/candidates_up_to_bottom_exit.xml
index bf59c2001..bf59c2001 100644
--- a/src/main/res/anim/candidates_up_to_bottom_exit.xml
+++ b/res/anim/candidates_up_to_bottom_exit.xml
diff --git a/src/main/res/anim/close_candidates_hint_in.xml b/res/anim/close_candidates_hint_in.xml
index e1512dfdd..e1512dfdd 100644
--- a/src/main/res/anim/close_candidates_hint_in.xml
+++ b/res/anim/close_candidates_hint_in.xml
diff --git a/src/main/res/anim/close_candidates_hint_out.xml b/res/anim/close_candidates_hint_out.xml
index 32f9b8ec5..32f9b8ec5 100644
--- a/src/main/res/anim/close_candidates_hint_out.xml
+++ b/res/anim/close_candidates_hint_out.xml
diff --git a/src/main/res/anim/extension_keyboard_fadein.xml b/res/anim/extension_keyboard_fadein.xml
index 2ca1928ac..2ca1928ac 100644
--- a/src/main/res/anim/extension_keyboard_fadein.xml
+++ b/res/anim/extension_keyboard_fadein.xml
diff --git a/src/main/res/anim/extension_keyboard_fadeout.xml b/res/anim/extension_keyboard_fadeout.xml
index c7614fa05..c7614fa05 100644
--- a/src/main/res/anim/extension_keyboard_fadeout.xml
+++ b/res/anim/extension_keyboard_fadeout.xml
diff --git a/src/main/res/anim/input_method_fancy_enter.xml b/res/anim/input_method_fancy_enter.xml
index cf8c6d1f9..cf8c6d1f9 100644
--- a/src/main/res/anim/input_method_fancy_enter.xml
+++ b/res/anim/input_method_fancy_enter.xml
diff --git a/src/main/res/anim/input_method_fancy_exit.xml b/res/anim/input_method_fancy_exit.xml
index 3c2d36095..3c2d36095 100644
--- a/src/main/res/anim/input_method_fancy_exit.xml
+++ b/res/anim/input_method_fancy_exit.xml
diff --git a/src/main/res/anim/key_preview_fadein.xml b/res/anim/key_preview_fadein.xml
index f09c2c33f..f09c2c33f 100644
--- a/src/main/res/anim/key_preview_fadein.xml
+++ b/res/anim/key_preview_fadein.xml
diff --git a/src/main/res/anim/key_preview_fadeout.xml b/res/anim/key_preview_fadeout.xml
index a93cd40b7..a93cd40b7 100644
--- a/src/main/res/anim/key_preview_fadeout.xml
+++ b/res/anim/key_preview_fadeout.xml
diff --git a/src/main/res/anim/layout_switch_fadein.xml b/res/anim/layout_switch_fadein.xml
index b62619318..b62619318 100644
--- a/src/main/res/anim/layout_switch_fadein.xml
+++ b/res/anim/layout_switch_fadein.xml
diff --git a/src/main/res/anim/layout_switch_fadeout.xml b/res/anim/layout_switch_fadeout.xml
index 1cb6e8e84..1cb6e8e84 100644
--- a/src/main/res/anim/layout_switch_fadeout.xml
+++ b/res/anim/layout_switch_fadeout.xml
diff --git a/src/main/res/anim/layout_switch_slide_in_left.xml b/res/anim/layout_switch_slide_in_left.xml
index 1ff33d386..1ff33d386 100644
--- a/src/main/res/anim/layout_switch_slide_in_left.xml
+++ b/res/anim/layout_switch_slide_in_left.xml
diff --git a/src/main/res/anim/layout_switch_slide_in_right.xml b/res/anim/layout_switch_slide_in_right.xml
index e24286fc5..e24286fc5 100644
--- a/src/main/res/anim/layout_switch_slide_in_right.xml
+++ b/res/anim/layout_switch_slide_in_right.xml
diff --git a/src/main/res/anim/layout_switch_slide_out_left.xml b/res/anim/layout_switch_slide_out_left.xml
index d6da0ac28..d6da0ac28 100644
--- a/src/main/res/anim/layout_switch_slide_out_left.xml
+++ b/res/anim/layout_switch_slide_out_left.xml
diff --git a/src/main/res/anim/layout_switch_slide_out_right.xml b/res/anim/layout_switch_slide_out_right.xml
index 212221263..212221263 100644
--- a/src/main/res/anim/layout_switch_slide_out_right.xml
+++ b/res/anim/layout_switch_slide_out_right.xml
diff --git a/src/main/res/anim/mini_keyboard_fadein.xml b/res/anim/mini_keyboard_fadein.xml
index 42fc5b21d..42fc5b21d 100644
--- a/src/main/res/anim/mini_keyboard_fadein.xml
+++ b/res/anim/mini_keyboard_fadein.xml
diff --git a/src/main/res/anim/mini_keyboard_fadeout.xml b/res/anim/mini_keyboard_fadeout.xml
index d162484de..d162484de 100644
--- a/src/main/res/anim/mini_keyboard_fadeout.xml
+++ b/res/anim/mini_keyboard_fadeout.xml
diff --git a/src/main/res/anim/mini_keyboard_flip_in.xml b/res/anim/mini_keyboard_flip_in.xml
index 3dfcd3ee5..3dfcd3ee5 100644
--- a/src/main/res/anim/mini_keyboard_flip_in.xml
+++ b/res/anim/mini_keyboard_flip_in.xml
diff --git a/src/main/res/anim/slide_in_left.xml b/res/anim/slide_in_left.xml
index 306cf2d4f..306cf2d4f 100644
--- a/src/main/res/anim/slide_in_left.xml
+++ b/res/anim/slide_in_left.xml
diff --git a/src/main/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml
index 970a81575..970a81575 100644
--- a/src/main/res/anim/slide_in_right.xml
+++ b/res/anim/slide_in_right.xml
diff --git a/src/main/res/anim/slide_out_left.xml b/res/anim/slide_out_left.xml
index 43e2d7833..43e2d7833 100644
--- a/src/main/res/anim/slide_out_left.xml
+++ b/res/anim/slide_out_left.xml
diff --git a/src/main/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml
index a0a2b4837..a0a2b4837 100644
--- a/src/main/res/anim/slide_out_right.xml
+++ b/res/anim/slide_out_right.xml
diff --git a/src/main/res/anim/tips_flip_in.xml b/res/anim/tips_flip_in.xml
index cdf834f28..cdf834f28 100644
--- a/src/main/res/anim/tips_flip_in.xml
+++ b/res/anim/tips_flip_in.xml
diff --git a/src/main/res/anim/tips_flip_out.xml b/res/anim/tips_flip_out.xml
index 9d9b95182..9d9b95182 100644
--- a/src/main/res/anim/tips_flip_out.xml
+++ b/res/anim/tips_flip_out.xml
diff --git a/src/main/res/anim/ui_context_deeper_add_in.xml b/res/anim/ui_context_deeper_add_in.xml
index b8417773f..b8417773f 100644
--- a/src/main/res/anim/ui_context_deeper_add_in.xml
+++ b/res/anim/ui_context_deeper_add_in.xml
diff --git a/src/main/res/anim/ui_context_deeper_add_out.xml b/res/anim/ui_context_deeper_add_out.xml
index ad52f4aa0..ad52f4aa0 100644
--- a/src/main/res/anim/ui_context_deeper_add_out.xml
+++ b/res/anim/ui_context_deeper_add_out.xml
diff --git a/src/main/res/anim/ui_context_deeper_pop_in.xml b/res/anim/ui_context_deeper_pop_in.xml
index 7605161a0..7605161a0 100644
--- a/src/main/res/anim/ui_context_deeper_pop_in.xml
+++ b/res/anim/ui_context_deeper_pop_in.xml
diff --git a/src/main/res/anim/ui_context_deeper_pop_out.xml b/res/anim/ui_context_deeper_pop_out.xml
index d825f0db5..d825f0db5 100644
--- a/src/main/res/anim/ui_context_deeper_pop_out.xml
+++ b/res/anim/ui_context_deeper_pop_out.xml
diff --git a/src/main/res/anim/ui_context_dialog_add_in.xml b/res/anim/ui_context_dialog_add_in.xml
index e7b40c8b9..e7b40c8b9 100644
--- a/src/main/res/anim/ui_context_dialog_add_in.xml
+++ b/res/anim/ui_context_dialog_add_in.xml
diff --git a/src/main/res/anim/ui_context_dialog_add_out.xml b/res/anim/ui_context_dialog_add_out.xml
index e5d24a65e..e5d24a65e 100644
--- a/src/main/res/anim/ui_context_dialog_add_out.xml
+++ b/res/anim/ui_context_dialog_add_out.xml
diff --git a/src/main/res/anim/ui_context_dialog_pop_in.xml b/res/anim/ui_context_dialog_pop_in.xml
index db31d2fd3..db31d2fd3 100644
--- a/src/main/res/anim/ui_context_dialog_pop_in.xml
+++ b/res/anim/ui_context_dialog_pop_in.xml
diff --git a/src/main/res/anim/ui_context_dialog_pop_out.xml b/res/anim/ui_context_dialog_pop_out.xml
index aa70f42d7..aa70f42d7 100644
--- a/src/main/res/anim/ui_context_dialog_pop_out.xml
+++ b/res/anim/ui_context_dialog_pop_out.xml
diff --git a/src/main/res/anim/ui_context_expand_add_in.xml b/res/anim/ui_context_expand_add_in.xml
index 9d3c4040b..9d3c4040b 100644
--- a/src/main/res/anim/ui_context_expand_add_in.xml
+++ b/res/anim/ui_context_expand_add_in.xml
diff --git a/src/main/res/anim/ui_context_expand_add_in_default.xml b/res/anim/ui_context_expand_add_in_default.xml
index d1b366b82..d1b366b82 100644
--- a/src/main/res/anim/ui_context_expand_add_in_default.xml
+++ b/res/anim/ui_context_expand_add_in_default.xml
diff --git a/src/main/res/anim/ui_context_expand_add_out.xml b/res/anim/ui_context_expand_add_out.xml
index 8d5cb1110..8d5cb1110 100644
--- a/src/main/res/anim/ui_context_expand_add_out.xml
+++ b/res/anim/ui_context_expand_add_out.xml
diff --git a/src/main/res/anim/ui_context_expand_pop_in.xml b/res/anim/ui_context_expand_pop_in.xml
index b19e10cbe..b19e10cbe 100644
--- a/src/main/res/anim/ui_context_expand_pop_in.xml
+++ b/res/anim/ui_context_expand_pop_in.xml
diff --git a/src/main/res/anim/ui_context_expand_pop_out.xml b/res/anim/ui_context_expand_pop_out.xml
index 1ed07e575..1ed07e575 100644
--- a/src/main/res/anim/ui_context_expand_pop_out.xml
+++ b/res/anim/ui_context_expand_pop_out.xml
diff --git a/src/main/res/anim/ui_context_expand_pop_out_default.xml b/res/anim/ui_context_expand_pop_out_default.xml
index 3d44f0ad6..3d44f0ad6 100644
--- a/src/main/res/anim/ui_context_expand_pop_out_default.xml
+++ b/res/anim/ui_context_expand_pop_out_default.xml
diff --git a/src/main/res/anim/ui_context_root_add_in.xml b/res/anim/ui_context_root_add_in.xml
index 4c50abbe5..4c50abbe5 100644
--- a/src/main/res/anim/ui_context_root_add_in.xml
+++ b/res/anim/ui_context_root_add_in.xml
diff --git a/src/main/res/anim/ui_context_root_add_out.xml b/res/anim/ui_context_root_add_out.xml
index 467cba8b9..467cba8b9 100644
--- a/src/main/res/anim/ui_context_root_add_out.xml
+++ b/res/anim/ui_context_root_add_out.xml
diff --git a/src/main/res/anim/ui_context_root_pop_in.xml b/res/anim/ui_context_root_pop_in.xml
index 8359c80fe..8359c80fe 100644
--- a/src/main/res/anim/ui_context_root_pop_in.xml
+++ b/res/anim/ui_context_root_pop_in.xml
diff --git a/src/main/res/anim/ui_context_root_pop_out.xml b/res/anim/ui_context_root_pop_out.xml
index eb65a8b99..eb65a8b99 100644
--- a/src/main/res/anim/ui_context_root_pop_out.xml
+++ b/res/anim/ui_context_root_pop_out.xml
diff --git a/src/main/res/color/blacktheme_key_hint_color.xml b/res/color/blacktheme_key_hint_color.xml
index e786eea3c..e786eea3c 100644
--- a/src/main/res/color/blacktheme_key_hint_color.xml
+++ b/res/color/blacktheme_key_hint_color.xml
diff --git a/src/main/res/color/blacktheme_key_keytext_color.xml b/res/color/blacktheme_key_keytext_color.xml
index bcd822d53..bcd822d53 100644
--- a/src/main/res/color/blacktheme_key_keytext_color.xml
+++ b/res/color/blacktheme_key_keytext_color.xml
diff --git a/src/main/res/color/blacktheme_popup_keytext_color.xml b/res/color/blacktheme_popup_keytext_color.xml
index 88abc32e3..88abc32e3 100644
--- a/src/main/res/color/blacktheme_popup_keytext_color.xml
+++ b/res/color/blacktheme_popup_keytext_color.xml
diff --git a/src/main/res/color/light_btn_key_text_color.xml b/res/color/light_btn_key_text_color.xml
index 6d906ecb3..6d906ecb3 100644
--- a/src/main/res/color/light_btn_key_text_color.xml
+++ b/res/color/light_btn_key_text_color.xml
diff --git a/src/main/res/drawable-hdpi-v11/ic_stat_en.png b/res/drawable-hdpi-v11/ic_stat_en.png
index 58c075f20..58c075f20 100644
--- a/src/main/res/drawable-hdpi-v11/ic_stat_en.png
+++ b/res/drawable-hdpi-v11/ic_stat_en.png
diff --git a/src/main/res/drawable-hdpi-v9/ic_stat_en.png b/res/drawable-hdpi-v9/ic_stat_en.png
index 9451c3d34..9451c3d34 100644
--- a/src/main/res/drawable-hdpi-v9/ic_stat_en.png
+++ b/res/drawable-hdpi-v9/ic_stat_en.png
diff --git a/src/main/res/drawable-hdpi/ask_wallpaper.9.png b/res/drawable-hdpi/ask_wallpaper.9.png
index b26f1f5ae..b26f1f5ae 100644
--- a/src/main/res/drawable-hdpi/ask_wallpaper.9.png
+++ b/res/drawable-hdpi/ask_wallpaper.9.png
diff --git a/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png b/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
index a37d1eee5..a37d1eee5 100644
--- a/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
+++ b/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
diff --git a/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png b/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
index 17888a9e7..17888a9e7 100644
--- a/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
+++ b/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
diff --git a/src/main/res/drawable-hdpi/close_popup_window.png b/res/drawable-hdpi/close_popup_window.png
index 5aa351d3b..5aa351d3b 100644
--- a/src/main/res/drawable-hdpi/close_popup_window.png
+++ b/res/drawable-hdpi/close_popup_window.png
diff --git a/src/main/res/drawable-hdpi/close_suggestions_strip_icon.png b/res/drawable-hdpi/close_suggestions_strip_icon.png
index 44378d6d8..44378d6d8 100644
--- a/src/main/res/drawable-hdpi/close_suggestions_strip_icon.png
+++ b/res/drawable-hdpi/close_suggestions_strip_icon.png
diff --git a/src/main/res/drawable-hdpi/dark_suggestions_divider.png b/res/drawable-hdpi/dark_suggestions_divider.png
index 08eb2ff9f..08eb2ff9f 100644
--- a/src/main/res/drawable-hdpi/dark_suggestions_divider.png
+++ b/res/drawable-hdpi/dark_suggestions_divider.png
diff --git a/src/main/res/drawable-hdpi/donate_paypal.png b/res/drawable-hdpi/donate_paypal.png
index f0ba62753..f0ba62753 100644
--- a/src/main/res/drawable-hdpi/donate_paypal.png
+++ b/res/drawable-hdpi/donate_paypal.png
diff --git a/src/main/res/drawable-hdpi/drawer_shadow.9.png b/res/drawable-hdpi/drawer_shadow.9.png
index e54a3a49a..e54a3a49a 100644
--- a/src/main/res/drawable-hdpi/drawer_shadow.9.png
+++ b/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/src/main/res/drawable-hdpi/ic_accept.png b/res/drawable-hdpi/ic_accept.png
index 520ad50a2..520ad50a2 100755
--- a/src/main/res/drawable-hdpi/ic_accept.png
+++ b/res/drawable-hdpi/ic_accept.png
diff --git a/src/main/res/drawable-hdpi/ic_action_content_discard.png b/res/drawable-hdpi/ic_action_content_discard.png
index 5c955358a..5c955358a 100755
--- a/src/main/res/drawable-hdpi/ic_action_content_discard.png
+++ b/res/drawable-hdpi/ic_action_content_discard.png
diff --git a/src/main/res/drawable-hdpi/ic_action_content_new.png b/res/drawable-hdpi/ic_action_content_new.png
index 4018f02c4..4018f02c4 100755
--- a/src/main/res/drawable-hdpi/ic_action_content_new.png
+++ b/res/drawable-hdpi/ic_action_content_new.png
diff --git a/src/main/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
index 457e30269..457e30269 100755
--- a/src/main/res/drawable-hdpi/ic_action_search.png
+++ b/res/drawable-hdpi/ic_action_search.png
diff --git a/src/main/res/drawable-hdpi/ic_compact_left_keyboard.png b/res/drawable-hdpi/ic_compact_left_keyboard.png
index b531c950d..b531c950d 100644
--- a/src/main/res/drawable-hdpi/ic_compact_left_keyboard.png
+++ b/res/drawable-hdpi/ic_compact_left_keyboard.png
diff --git a/src/main/res/drawable-hdpi/ic_compact_right_keyboard.png b/res/drawable-hdpi/ic_compact_right_keyboard.png
index 1db8596f6..1db8596f6 100644
--- a/src/main/res/drawable-hdpi/ic_compact_right_keyboard.png
+++ b/res/drawable-hdpi/ic_compact_right_keyboard.png
diff --git a/src/main/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png
index ddd6221e9..ddd6221e9 100644
--- a/src/main/res/drawable-hdpi/ic_drawer.png
+++ b/res/drawable-hdpi/ic_drawer.png
diff --git a/src/main/res/drawable-hdpi/ic_keyboard_globe_light.png b/res/drawable-hdpi/ic_keyboard_globe_light.png
index b9f81c4b6..b9f81c4b6 100755
--- a/src/main/res/drawable-hdpi/ic_keyboard_globe_light.png
+++ b/res/drawable-hdpi/ic_keyboard_globe_light.png
diff --git a/src/main/res/drawable-hdpi/ic_language_category.png b/res/drawable-hdpi/ic_language_category.png
index 79fd9ca6c..79fd9ca6c 100755
--- a/src/main/res/drawable-hdpi/ic_language_category.png
+++ b/res/drawable-hdpi/ic_language_category.png
diff --git a/src/main/res/drawable-hdpi/ic_large_new.png b/res/drawable-hdpi/ic_large_new.png
index 95cd5d2a9..95cd5d2a9 100755
--- a/src/main/res/drawable-hdpi/ic_large_new.png
+++ b/res/drawable-hdpi/ic_large_new.png
diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index b6dab01bb..b6dab01bb 100644
--- a/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
diff --git a/src/main/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
index 61b2d5cdc..61b2d5cdc 100644
--- a/src/main/res/drawable-hdpi/ic_launcher_settings.png
+++ b/res/drawable-hdpi/ic_launcher_settings.png
diff --git a/src/main/res/drawable-hdpi/ic_left_arrow.png b/res/drawable-hdpi/ic_left_arrow.png
index e913f1223..e913f1223 100755
--- a/src/main/res/drawable-hdpi/ic_left_arrow.png
+++ b/res/drawable-hdpi/ic_left_arrow.png
diff --git a/src/main/res/drawable-hdpi/ic_more_overlay.png b/res/drawable-hdpi/ic_more_overlay.png
index 755798314..755798314 100755
--- a/src/main/res/drawable-hdpi/ic_more_overlay.png
+++ b/res/drawable-hdpi/ic_more_overlay.png
diff --git a/src/main/res/drawable-hdpi/ic_normal_keyboard.png b/res/drawable-hdpi/ic_normal_keyboard.png
index 0fc98994c..0fc98994c 100755
--- a/src/main/res/drawable-hdpi/ic_normal_keyboard.png
+++ b/res/drawable-hdpi/ic_normal_keyboard.png
diff --git a/src/main/res/drawable-hdpi/ic_not_configured_black.png b/res/drawable-hdpi/ic_not_configured_black.png
index a81d89815..a81d89815 100755
--- a/src/main/res/drawable-hdpi/ic_not_configured_black.png
+++ b/res/drawable-hdpi/ic_not_configured_black.png
diff --git a/src/main/res/drawable-hdpi/ic_not_configured_red.png b/res/drawable-hdpi/ic_not_configured_red.png
index 729144330..729144330 100755
--- a/src/main/res/drawable-hdpi/ic_not_configured_red.png
+++ b/res/drawable-hdpi/ic_not_configured_red.png
diff --git a/src/main/res/drawable-hdpi/ic_settings_language.png b/res/drawable-hdpi/ic_settings_language.png
index d63dff83c..d63dff83c 100644
--- a/src/main/res/drawable-hdpi/ic_settings_language.png
+++ b/res/drawable-hdpi/ic_settings_language.png
diff --git a/src/main/res/drawable-hdpi/ic_split_keyboard.png b/res/drawable-hdpi/ic_split_keyboard.png
index 84fb2ed1f..84fb2ed1f 100644
--- a/src/main/res/drawable-hdpi/ic_split_keyboard.png
+++ b/res/drawable-hdpi/ic_split_keyboard.png
diff --git a/src/main/res/drawable-hdpi/ic_stat_en.png b/res/drawable-hdpi/ic_stat_en.png
index 2369b8875..2369b8875 100644
--- a/src/main/res/drawable-hdpi/ic_stat_en.png
+++ b/res/drawable-hdpi/ic_stat_en.png
diff --git a/src/main/res/drawable-hdpi/ic_user_interface_category.png b/res/drawable-hdpi/ic_user_interface_category.png
index 277c8ceb2..277c8ceb2 100755
--- a/src/main/res/drawable-hdpi/ic_user_interface_category.png
+++ b/res/drawable-hdpi/ic_user_interface_category.png
diff --git a/src/main/res/drawable-hdpi/keyboard_background.9.png b/res/drawable-hdpi/keyboard_background.9.png
index 9b8560067..9b8560067 100644
--- a/src/main/res/drawable-hdpi/keyboard_background.9.png
+++ b/res/drawable-hdpi/keyboard_background.9.png
diff --git a/src/main/res/drawable-hdpi/keyboard_dark_background.9.png b/res/drawable-hdpi/keyboard_dark_background.9.png
index a10ddbe63..a10ddbe63 100644
--- a/src/main/res/drawable-hdpi/keyboard_dark_background.9.png
+++ b/res/drawable-hdpi/keyboard_dark_background.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_btn_action.9.png b/res/drawable-hdpi/lean_dark_btn_action.9.png
index 5040b8d29..5040b8d29 100644
--- a/src/main/res/drawable-hdpi/lean_dark_btn_action.9.png
+++ b/res/drawable-hdpi/lean_dark_btn_action.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_btn_action_pressed.9.png b/res/drawable-hdpi/lean_dark_btn_action_pressed.9.png
index e63ae8fbb..e63ae8fbb 100644
--- a/src/main/res/drawable-hdpi/lean_dark_btn_action_pressed.9.png
+++ b/res/drawable-hdpi/lean_dark_btn_action_pressed.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_btn_function.9.png b/res/drawable-hdpi/lean_dark_btn_function.9.png
index 5040b8d29..5040b8d29 100644
--- a/src/main/res/drawable-hdpi/lean_dark_btn_function.9.png
+++ b/res/drawable-hdpi/lean_dark_btn_function.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_btn_normal.9.png b/res/drawable-hdpi/lean_dark_btn_normal.9.png
index 3c80ac8f2..3c80ac8f2 100644
--- a/src/main/res/drawable-hdpi/lean_dark_btn_normal.9.png
+++ b/res/drawable-hdpi/lean_dark_btn_normal.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_function_btn_pressed.9.png b/res/drawable-hdpi/lean_dark_function_btn_pressed.9.png
index 2d02b7498..2d02b7498 100644
--- a/src/main/res/drawable-hdpi/lean_dark_function_btn_pressed.9.png
+++ b/res/drawable-hdpi/lean_dark_function_btn_pressed.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_normal_btn_pressed.9.png b/res/drawable-hdpi/lean_dark_normal_btn_pressed.9.png
index 64786198b..64786198b 100644
--- a/src/main/res/drawable-hdpi/lean_dark_normal_btn_pressed.9.png
+++ b/res/drawable-hdpi/lean_dark_normal_btn_pressed.9.png
diff --git a/src/main/res/drawable-hdpi/lean_dark_popup_keyboard_background.9.png b/res/drawable-hdpi/lean_dark_popup_keyboard_background.9.png
index 88a8d276d..88a8d276d 100644
--- a/src/main/res/drawable-hdpi/lean_dark_popup_keyboard_background.9.png
+++ b/res/drawable-hdpi/lean_dark_popup_keyboard_background.9.png
diff --git a/src/main/res/drawable-hdpi/list_selector_background_pressed.9.png b/res/drawable-hdpi/list_selector_background_pressed.9.png
index 43e11f4c5..43e11f4c5 100644
--- a/src/main/res/drawable-hdpi/list_selector_background_pressed.9.png
+++ b/res/drawable-hdpi/list_selector_background_pressed.9.png
diff --git a/src/main/res/drawable-hdpi/notification_error_icon.png b/res/drawable-hdpi/notification_error_icon.png
index c0dd380e9..c0dd380e9 100644
--- a/src/main/res/drawable-hdpi/notification_error_icon.png
+++ b/res/drawable-hdpi/notification_error_icon.png
diff --git a/src/main/res/drawable-hdpi/notification_icon_beta_version.png b/res/drawable-hdpi/notification_icon_beta_version.png
index 4cbe9548c..4cbe9548c 100644
--- a/src/main/res/drawable-hdpi/notification_icon_beta_version.png
+++ b/res/drawable-hdpi/notification_icon_beta_version.png
diff --git a/src/main/res/drawable-hdpi/notification_icon_changelog.png b/res/drawable-hdpi/notification_icon_changelog.png
index 772c6d56d..772c6d56d 100644
--- a/src/main/res/drawable-hdpi/notification_icon_changelog.png
+++ b/res/drawable-hdpi/notification_icon_changelog.png
diff --git a/src/main/res/drawable-hdpi/notification_icon_how_to.png b/res/drawable-hdpi/notification_icon_how_to.png
index 1d05fac76..1d05fac76 100644
--- a/src/main/res/drawable-hdpi/notification_icon_how_to.png
+++ b/res/drawable-hdpi/notification_icon_how_to.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_and_cancel.png b/res/drawable-hdpi/sym_keyboard_and_cancel.png
index c62759aea..c62759aea 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_and_cancel.png
+++ b/res/drawable-hdpi/sym_keyboard_and_cancel.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_cancel.png b/res/drawable-hdpi/sym_keyboard_cancel.png
index b6cb7be92..b6cb7be92 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_cancel.png
+++ b/res/drawable-hdpi/sym_keyboard_cancel.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_ctrl.png b/res/drawable-hdpi/sym_keyboard_ctrl.png
index d6be7edfb..d6be7edfb 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_ctrl.png
+++ b/res/drawable-hdpi/sym_keyboard_ctrl.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_ctrl_on.png b/res/drawable-hdpi/sym_keyboard_ctrl_on.png
index 53980e82d..53980e82d 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_ctrl_on.png
+++ b/res/drawable-hdpi/sym_keyboard_ctrl_on.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_delete.png b/res/drawable-hdpi/sym_keyboard_delete.png
index 61b7a2dd8..61b7a2dd8 100755
--- a/src/main/res/drawable-hdpi/sym_keyboard_delete.png
+++ b/res/drawable-hdpi/sym_keyboard_delete.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_done.png b/res/drawable-hdpi/sym_keyboard_done.png
index 993cb4a77..993cb4a77 100755
--- a/src/main/res/drawable-hdpi/sym_keyboard_done.png
+++ b/res/drawable-hdpi/sym_keyboard_done.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/res/drawable-hdpi/sym_keyboard_feedback_mic.png
index e5d52c55c..e5d52c55c 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_feedback_mic.png
+++ b/res/drawable-hdpi/sym_keyboard_feedback_mic.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/res/drawable-hdpi/sym_keyboard_feedback_settings.png
index 48215357a..48215357a 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_feedback_settings.png
+++ b/res/drawable-hdpi/sym_keyboard_feedback_settings.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_mic.png b/res/drawable-hdpi/sym_keyboard_mic.png
index 9c73f33a8..9c73f33a8 100755
--- a/src/main/res/drawable-hdpi/sym_keyboard_mic.png
+++ b/res/drawable-hdpi/sym_keyboard_mic.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num0.png b/res/drawable-hdpi/sym_keyboard_num0.png
index cc4a1b936..cc4a1b936 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num0.png
+++ b/res/drawable-hdpi/sym_keyboard_num0.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num1.png b/res/drawable-hdpi/sym_keyboard_num1.png
index 8ac13fd84..8ac13fd84 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num1.png
+++ b/res/drawable-hdpi/sym_keyboard_num1.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num2.png b/res/drawable-hdpi/sym_keyboard_num2.png
index 8111c45e7..8111c45e7 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num2.png
+++ b/res/drawable-hdpi/sym_keyboard_num2.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num3.png b/res/drawable-hdpi/sym_keyboard_num3.png
index 71906ba89..71906ba89 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num3.png
+++ b/res/drawable-hdpi/sym_keyboard_num3.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num4.png b/res/drawable-hdpi/sym_keyboard_num4.png
index c605ab7b7..c605ab7b7 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num4.png
+++ b/res/drawable-hdpi/sym_keyboard_num4.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num5.png b/res/drawable-hdpi/sym_keyboard_num5.png
index 4de4796fa..4de4796fa 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num5.png
+++ b/res/drawable-hdpi/sym_keyboard_num5.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num6.png b/res/drawable-hdpi/sym_keyboard_num6.png
index d3a6c5e40..d3a6c5e40 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num6.png
+++ b/res/drawable-hdpi/sym_keyboard_num6.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num7.png b/res/drawable-hdpi/sym_keyboard_num7.png
index 2da28636d..2da28636d 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num7.png
+++ b/res/drawable-hdpi/sym_keyboard_num7.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num8.png b/res/drawable-hdpi/sym_keyboard_num8.png
index bec435417..bec435417 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num8.png
+++ b/res/drawable-hdpi/sym_keyboard_num8.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_num9.png b/res/drawable-hdpi/sym_keyboard_num9.png
index d8de243d5..d8de243d5 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_num9.png
+++ b/res/drawable-hdpi/sym_keyboard_num9.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_numalt.png b/res/drawable-hdpi/sym_keyboard_numalt.png
index 7ebba30c7..7ebba30c7 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_numalt.png
+++ b/res/drawable-hdpi/sym_keyboard_numalt.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_numpound.png b/res/drawable-hdpi/sym_keyboard_numpound.png
index d9e512ac3..d9e512ac3 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_numpound.png
+++ b/res/drawable-hdpi/sym_keyboard_numpound.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_numstar.png b/res/drawable-hdpi/sym_keyboard_numstar.png
index 2bf8a0e83..2bf8a0e83 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_numstar.png
+++ b/res/drawable-hdpi/sym_keyboard_numstar.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_return.png b/res/drawable-hdpi/sym_keyboard_return.png
index 60d893cf3..60d893cf3 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_return.png
+++ b/res/drawable-hdpi/sym_keyboard_return.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_search.png b/res/drawable-hdpi/sym_keyboard_search.png
index 0ab7af637..0ab7af637 100755
--- a/src/main/res/drawable-hdpi/sym_keyboard_search.png
+++ b/res/drawable-hdpi/sym_keyboard_search.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_settings.png b/res/drawable-hdpi/sym_keyboard_settings.png
index cb615394e..cb615394e 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_settings.png
+++ b/res/drawable-hdpi/sym_keyboard_settings.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_shift.png b/res/drawable-hdpi/sym_keyboard_shift.png
index 5c59d82b4..5c59d82b4 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_shift.png
+++ b/res/drawable-hdpi/sym_keyboard_shift.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_shift_locked.png b/res/drawable-hdpi/sym_keyboard_shift_locked.png
index 300689bde..300689bde 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_shift_locked.png
+++ b/res/drawable-hdpi/sym_keyboard_shift_locked.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_shift_on.png b/res/drawable-hdpi/sym_keyboard_shift_on.png
index 421e95f48..421e95f48 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_shift_on.png
+++ b/res/drawable-hdpi/sym_keyboard_shift_on.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_smiley.png b/res/drawable-hdpi/sym_keyboard_smiley.png
index cfacbc2e7..cfacbc2e7 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_smiley.png
+++ b/res/drawable-hdpi/sym_keyboard_smiley.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_space.9.png b/res/drawable-hdpi/sym_keyboard_space.9.png
index f5facbe9e..f5facbe9e 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_space.9.png
+++ b/res/drawable-hdpi/sym_keyboard_space.9.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_space_back.png b/res/drawable-hdpi/sym_keyboard_space_back.png
index 7f3bdd3b2..7f3bdd3b2 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_space_back.png
+++ b/res/drawable-hdpi/sym_keyboard_space_back.png
diff --git a/src/main/res/drawable-hdpi/sym_keyboard_tab.png b/res/drawable-hdpi/sym_keyboard_tab.png
index fbec85e3e..fbec85e3e 100644
--- a/src/main/res/drawable-hdpi/sym_keyboard_tab.png
+++ b/res/drawable-hdpi/sym_keyboard_tab.png
diff --git a/src/main/res/drawable-ldpi-v11/ic_stat_en.png b/res/drawable-ldpi-v11/ic_stat_en.png
index cc6ea7b33..cc6ea7b33 100644
--- a/src/main/res/drawable-ldpi-v11/ic_stat_en.png
+++ b/res/drawable-ldpi-v11/ic_stat_en.png
diff --git a/src/main/res/drawable-ldpi-v9/ic_stat_en.png b/res/drawable-ldpi-v9/ic_stat_en.png
index f116f51a6..f116f51a6 100644
--- a/src/main/res/drawable-ldpi-v9/ic_stat_en.png
+++ b/res/drawable-ldpi-v9/ic_stat_en.png
diff --git a/src/main/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
index df69a8d25..df69a8d25 100644
--- a/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/res/drawable-ldpi/ic_launcher.png
diff --git a/src/main/res/drawable-ldpi/ic_launcher_settings.png b/res/drawable-ldpi/ic_launcher_settings.png
index d97e23aef..d97e23aef 100644
--- a/src/main/res/drawable-ldpi/ic_launcher_settings.png
+++ b/res/drawable-ldpi/ic_launcher_settings.png
diff --git a/src/main/res/drawable-ldpi/ic_stat_en.png b/res/drawable-ldpi/ic_stat_en.png
index 64af0e0cd..64af0e0cd 100644
--- a/src/main/res/drawable-ldpi/ic_stat_en.png
+++ b/res/drawable-ldpi/ic_stat_en.png
diff --git a/src/main/res/drawable-mdpi-v11/ic_stat_en.png b/res/drawable-mdpi-v11/ic_stat_en.png
index 85bc474fb..85bc474fb 100644
--- a/src/main/res/drawable-mdpi-v11/ic_stat_en.png
+++ b/res/drawable-mdpi-v11/ic_stat_en.png
diff --git a/src/main/res/drawable-mdpi-v9/ic_stat_en.png b/res/drawable-mdpi-v9/ic_stat_en.png
index 0398b3382..0398b3382 100644
--- a/src/main/res/drawable-mdpi-v9/ic_stat_en.png
+++ b/res/drawable-mdpi-v9/ic_stat_en.png
diff --git a/src/main/res/drawable-mdpi/drawer_shadow.9.png b/res/drawable-mdpi/drawer_shadow.9.png
index 2343e5c9b..2343e5c9b 100644
--- a/src/main/res/drawable-mdpi/drawer_shadow.9.png
+++ b/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/src/main/res/drawable-mdpi/ic_accept.png b/res/drawable-mdpi/ic_accept.png
index 7463a519b..7463a519b 100755
--- a/src/main/res/drawable-mdpi/ic_accept.png
+++ b/res/drawable-mdpi/ic_accept.png
diff --git a/src/main/res/drawable-mdpi/ic_action_content_discard.png b/res/drawable-mdpi/ic_action_content_discard.png
index 07d087f3c..07d087f3c 100755
--- a/src/main/res/drawable-mdpi/ic_action_content_discard.png
+++ b/res/drawable-mdpi/ic_action_content_discard.png
diff --git a/src/main/res/drawable-mdpi/ic_action_content_new.png b/res/drawable-mdpi/ic_action_content_new.png
index 3b93ba05a..3b93ba05a 100755
--- a/src/main/res/drawable-mdpi/ic_action_content_new.png
+++ b/res/drawable-mdpi/ic_action_content_new.png
diff --git a/src/main/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
index 6d366de2f..6d366de2f 100755
--- a/src/main/res/drawable-mdpi/ic_action_search.png
+++ b/res/drawable-mdpi/ic_action_search.png
diff --git a/src/main/res/drawable-mdpi/ic_compact_left_keyboard.png b/res/drawable-mdpi/ic_compact_left_keyboard.png
index 7e823e372..7e823e372 100644
--- a/src/main/res/drawable-mdpi/ic_compact_left_keyboard.png
+++ b/res/drawable-mdpi/ic_compact_left_keyboard.png
diff --git a/src/main/res/drawable-mdpi/ic_compact_right_keyboard.png b/res/drawable-mdpi/ic_compact_right_keyboard.png
index c42880d82..c42880d82 100644
--- a/src/main/res/drawable-mdpi/ic_compact_right_keyboard.png
+++ b/res/drawable-mdpi/ic_compact_right_keyboard.png
diff --git a/src/main/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png
index f0e8bce08..f0e8bce08 100644
--- a/src/main/res/drawable-mdpi/ic_drawer.png
+++ b/res/drawable-mdpi/ic_drawer.png
diff --git a/src/main/res/drawable-mdpi/ic_keyboard_globe_light.png b/res/drawable-mdpi/ic_keyboard_globe_light.png
index db7336694..db7336694 100755
--- a/src/main/res/drawable-mdpi/ic_keyboard_globe_light.png
+++ b/res/drawable-mdpi/ic_keyboard_globe_light.png
diff --git a/src/main/res/drawable-mdpi/ic_language_category.png b/res/drawable-mdpi/ic_language_category.png
index eb4bf9ef4..eb4bf9ef4 100755
--- a/src/main/res/drawable-mdpi/ic_language_category.png
+++ b/res/drawable-mdpi/ic_language_category.png
diff --git a/src/main/res/drawable-mdpi/ic_large_new.png b/res/drawable-mdpi/ic_large_new.png
index 5a6a0359e..5a6a0359e 100755
--- a/src/main/res/drawable-mdpi/ic_large_new.png
+++ b/res/drawable-mdpi/ic_large_new.png
diff --git a/src/main/res/drawable-mdpi/ic_left_arrow.png b/res/drawable-mdpi/ic_left_arrow.png
index dfaedbc86..dfaedbc86 100755
--- a/src/main/res/drawable-mdpi/ic_left_arrow.png
+++ b/res/drawable-mdpi/ic_left_arrow.png
diff --git a/src/main/res/drawable-mdpi/ic_more_overlay.png b/res/drawable-mdpi/ic_more_overlay.png
index ebb1e3bcf..ebb1e3bcf 100755
--- a/src/main/res/drawable-mdpi/ic_more_overlay.png
+++ b/res/drawable-mdpi/ic_more_overlay.png
diff --git a/src/main/res/drawable-mdpi/ic_normal_keyboard.png b/res/drawable-mdpi/ic_normal_keyboard.png
index 9aee0fc7a..9aee0fc7a 100755
--- a/src/main/res/drawable-mdpi/ic_normal_keyboard.png
+++ b/res/drawable-mdpi/ic_normal_keyboard.png
diff --git a/src/main/res/drawable-mdpi/ic_not_configured_black.png b/res/drawable-mdpi/ic_not_configured_black.png
index 8dc4ccc67..8dc4ccc67 100755
--- a/src/main/res/drawable-mdpi/ic_not_configured_black.png
+++ b/res/drawable-mdpi/ic_not_configured_black.png
diff --git a/src/main/res/drawable-mdpi/ic_not_configured_red.png b/res/drawable-mdpi/ic_not_configured_red.png
index 9479a5a5d..9479a5a5d 100755
--- a/src/main/res/drawable-mdpi/ic_not_configured_red.png
+++ b/res/drawable-mdpi/ic_not_configured_red.png
diff --git a/src/main/res/drawable-mdpi/ic_settings_language.png b/res/drawable-mdpi/ic_settings_language.png
index 5de4a765f..5de4a765f 100644
--- a/src/main/res/drawable-mdpi/ic_settings_language.png
+++ b/res/drawable-mdpi/ic_settings_language.png
diff --git a/src/main/res/drawable-mdpi/ic_split_keyboard.png b/res/drawable-mdpi/ic_split_keyboard.png
index 7b6c1bb79..7b6c1bb79 100644
--- a/src/main/res/drawable-mdpi/ic_split_keyboard.png
+++ b/res/drawable-mdpi/ic_split_keyboard.png
diff --git a/src/main/res/drawable-mdpi/ic_stat_en.png b/res/drawable-mdpi/ic_stat_en.png
index 1682f1668..1682f1668 100644
--- a/src/main/res/drawable-mdpi/ic_stat_en.png
+++ b/res/drawable-mdpi/ic_stat_en.png
diff --git a/src/main/res/drawable-mdpi/ic_user_interface_category.png b/res/drawable-mdpi/ic_user_interface_category.png
index 378916247..378916247 100755
--- a/src/main/res/drawable-mdpi/ic_user_interface_category.png
+++ b/res/drawable-mdpi/ic_user_interface_category.png
diff --git a/src/main/res/drawable-mdpi/sym_keyboard_delete.png b/res/drawable-mdpi/sym_keyboard_delete.png
index 0b1d5503c..0b1d5503c 100755
--- a/src/main/res/drawable-mdpi/sym_keyboard_delete.png
+++ b/res/drawable-mdpi/sym_keyboard_delete.png
diff --git a/src/main/res/drawable-mdpi/sym_keyboard_done.png b/res/drawable-mdpi/sym_keyboard_done.png
index 6f21b1e0b..6f21b1e0b 100755
--- a/src/main/res/drawable-mdpi/sym_keyboard_done.png
+++ b/res/drawable-mdpi/sym_keyboard_done.png
diff --git a/src/main/res/drawable-mdpi/sym_keyboard_mic.png b/res/drawable-mdpi/sym_keyboard_mic.png
index e3e4d1792..e3e4d1792 100755
--- a/src/main/res/drawable-mdpi/sym_keyboard_mic.png
+++ b/res/drawable-mdpi/sym_keyboard_mic.png
diff --git a/src/main/res/drawable-mdpi/sym_keyboard_return.png b/res/drawable-mdpi/sym_keyboard_return.png
index e10103caf..e10103caf 100644
--- a/src/main/res/drawable-mdpi/sym_keyboard_return.png
+++ b/res/drawable-mdpi/sym_keyboard_return.png
diff --git a/src/main/res/drawable-mdpi/sym_keyboard_search.png b/res/drawable-mdpi/sym_keyboard_search.png
index 7514d7fdb..7514d7fdb 100755
--- a/src/main/res/drawable-mdpi/sym_keyboard_search.png
+++ b/res/drawable-mdpi/sym_keyboard_search.png
diff --git a/src/main/res/drawable-mdpi/sym_keyboard_smiley.png b/res/drawable-mdpi/sym_keyboard_smiley.png
index 067ad5496..067ad5496 100644
--- a/src/main/res/drawable-mdpi/sym_keyboard_smiley.png
+++ b/res/drawable-mdpi/sym_keyboard_smiley.png
diff --git a/src/main/res/drawable-nodpi/light_background_base_tile.png b/res/drawable-nodpi/light_background_base_tile.png
index 55fb9c2bf..55fb9c2bf 100644
--- a/src/main/res/drawable-nodpi/light_background_base_tile.png
+++ b/res/drawable-nodpi/light_background_base_tile.png
diff --git a/src/main/res/drawable-xhdpi-v11/ic_stat_en.png b/res/drawable-xhdpi-v11/ic_stat_en.png
index d0634d971..d0634d971 100644
--- a/src/main/res/drawable-xhdpi-v11/ic_stat_en.png
+++ b/res/drawable-xhdpi-v11/ic_stat_en.png
diff --git a/src/main/res/drawable-xhdpi-v9/ic_stat_en.png b/res/drawable-xhdpi-v9/ic_stat_en.png
index 4f15f8f10..4f15f8f10 100644
--- a/src/main/res/drawable-xhdpi-v9/ic_stat_en.png
+++ b/res/drawable-xhdpi-v9/ic_stat_en.png
diff --git a/src/main/res/drawable-xhdpi/ask_wallpaper.9.png b/res/drawable-xhdpi/ask_wallpaper.9.png
index b26f1f5ae..b26f1f5ae 100644
--- a/src/main/res/drawable-xhdpi/ask_wallpaper.9.png
+++ b/res/drawable-xhdpi/ask_wallpaper.9.png
diff --git a/src/main/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png b/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png
index 7807f4713..7807f4713 100644
--- a/src/main/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png
+++ b/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png
diff --git a/src/main/res/drawable-xhdpi/close_popup_window.png b/res/drawable-xhdpi/close_popup_window.png
index 9bfe00d32..9bfe00d32 100644
--- a/src/main/res/drawable-xhdpi/close_popup_window.png
+++ b/res/drawable-xhdpi/close_popup_window.png
diff --git a/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/res/drawable-xhdpi/drawer_shadow.9.png
index 749823db8..749823db8 100644
--- a/src/main/res/drawable-xhdpi/drawer_shadow.9.png
+++ b/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/src/main/res/drawable-xhdpi/ic_accept.png b/res/drawable-xhdpi/ic_accept.png
index a212f462b..a212f462b 100755
--- a/src/main/res/drawable-xhdpi/ic_accept.png
+++ b/res/drawable-xhdpi/ic_accept.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_content_discard.png b/res/drawable-xhdpi/ic_action_content_discard.png
index 5814f8e50..5814f8e50 100755
--- a/src/main/res/drawable-xhdpi/ic_action_content_discard.png
+++ b/res/drawable-xhdpi/ic_action_content_discard.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_content_new.png b/res/drawable-xhdpi/ic_action_content_new.png
index 6ff7a2352..6ff7a2352 100755
--- a/src/main/res/drawable-xhdpi/ic_action_content_new.png
+++ b/res/drawable-xhdpi/ic_action_content_new.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
index aa47388f2..aa47388f2 100755
--- a/src/main/res/drawable-xhdpi/ic_action_search.png
+++ b/res/drawable-xhdpi/ic_action_search.png
diff --git a/src/main/res/drawable-xhdpi/ic_compact_left_keyboard.png b/res/drawable-xhdpi/ic_compact_left_keyboard.png
index f3a93008d..f3a93008d 100644
--- a/src/main/res/drawable-xhdpi/ic_compact_left_keyboard.png
+++ b/res/drawable-xhdpi/ic_compact_left_keyboard.png
diff --git a/src/main/res/drawable-xhdpi/ic_compact_right_keyboard.png b/res/drawable-xhdpi/ic_compact_right_keyboard.png
index bc6d70683..bc6d70683 100644
--- a/src/main/res/drawable-xhdpi/ic_compact_right_keyboard.png
+++ b/res/drawable-xhdpi/ic_compact_right_keyboard.png
diff --git a/src/main/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png
index 1e598e4af..1e598e4af 100644
--- a/src/main/res/drawable-xhdpi/ic_drawer.png
+++ b/res/drawable-xhdpi/ic_drawer.png
diff --git a/src/main/res/drawable-xhdpi/ic_keyboard_globe_light.png b/res/drawable-xhdpi/ic_keyboard_globe_light.png
index 306d118f4..306d118f4 100755
--- a/src/main/res/drawable-xhdpi/ic_keyboard_globe_light.png
+++ b/res/drawable-xhdpi/ic_keyboard_globe_light.png
diff --git a/src/main/res/drawable-xhdpi/ic_language_category.png b/res/drawable-xhdpi/ic_language_category.png
index 4c302c309..4c302c309 100755
--- a/src/main/res/drawable-xhdpi/ic_language_category.png
+++ b/res/drawable-xhdpi/ic_language_category.png
diff --git a/src/main/res/drawable-xhdpi/ic_large_new.png b/res/drawable-xhdpi/ic_large_new.png
index d0931a457..d0931a457 100755
--- a/src/main/res/drawable-xhdpi/ic_large_new.png
+++ b/res/drawable-xhdpi/ic_large_new.png
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index cb8cb72e9..cb8cb72e9 100644
--- a/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xhdpi/ic_launcher_settings.png b/res/drawable-xhdpi/ic_launcher_settings.png
index c1ae176a0..c1ae176a0 100644
--- a/src/main/res/drawable-xhdpi/ic_launcher_settings.png
+++ b/res/drawable-xhdpi/ic_launcher_settings.png
diff --git a/src/main/res/drawable-xhdpi/ic_left_arrow.png b/res/drawable-xhdpi/ic_left_arrow.png
index ff248a15a..ff248a15a 100755
--- a/src/main/res/drawable-xhdpi/ic_left_arrow.png
+++ b/res/drawable-xhdpi/ic_left_arrow.png
diff --git a/src/main/res/drawable-xhdpi/ic_more_overlay.png b/res/drawable-xhdpi/ic_more_overlay.png
index 55795d3d9..55795d3d9 100755
--- a/src/main/res/drawable-xhdpi/ic_more_overlay.png
+++ b/res/drawable-xhdpi/ic_more_overlay.png
diff --git a/src/main/res/drawable-xhdpi/ic_normal_keyboard.png b/res/drawable-xhdpi/ic_normal_keyboard.png
index 201a0a8b0..201a0a8b0 100755
--- a/src/main/res/drawable-xhdpi/ic_normal_keyboard.png
+++ b/res/drawable-xhdpi/ic_normal_keyboard.png
diff --git a/src/main/res/drawable-xhdpi/ic_not_configured_black.png b/res/drawable-xhdpi/ic_not_configured_black.png
index 0dac0b218..0dac0b218 100755
--- a/src/main/res/drawable-xhdpi/ic_not_configured_black.png
+++ b/res/drawable-xhdpi/ic_not_configured_black.png
diff --git a/src/main/res/drawable-xhdpi/ic_not_configured_red.png b/res/drawable-xhdpi/ic_not_configured_red.png
index 72280a974..72280a974 100755
--- a/src/main/res/drawable-xhdpi/ic_not_configured_red.png
+++ b/res/drawable-xhdpi/ic_not_configured_red.png
diff --git a/src/main/res/drawable-xhdpi/ic_settings_language.png b/res/drawable-xhdpi/ic_settings_language.png
index d064cb8d9..d064cb8d9 100644
--- a/src/main/res/drawable-xhdpi/ic_settings_language.png
+++ b/res/drawable-xhdpi/ic_settings_language.png
diff --git a/src/main/res/drawable-xhdpi/ic_split_keyboard.png b/res/drawable-xhdpi/ic_split_keyboard.png
index 93737d111..93737d111 100644
--- a/src/main/res/drawable-xhdpi/ic_split_keyboard.png
+++ b/res/drawable-xhdpi/ic_split_keyboard.png
diff --git a/src/main/res/drawable-xhdpi/ic_stat_en.png b/res/drawable-xhdpi/ic_stat_en.png
index f7db38357..f7db38357 100644
--- a/src/main/res/drawable-xhdpi/ic_stat_en.png
+++ b/res/drawable-xhdpi/ic_stat_en.png
diff --git a/src/main/res/drawable-xhdpi/ic_user_interface_category.png b/res/drawable-xhdpi/ic_user_interface_category.png
index 86e3220a8..86e3220a8 100755
--- a/src/main/res/drawable-xhdpi/ic_user_interface_category.png
+++ b/res/drawable-xhdpi/ic_user_interface_category.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_btn_action.9.png b/res/drawable-xhdpi/lean_dark_btn_action.9.png
index 5040b8d29..5040b8d29 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_btn_action.9.png
+++ b/res/drawable-xhdpi/lean_dark_btn_action.9.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_btn_action_pressed.9.png b/res/drawable-xhdpi/lean_dark_btn_action_pressed.9.png
index e63ae8fbb..e63ae8fbb 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_btn_action_pressed.9.png
+++ b/res/drawable-xhdpi/lean_dark_btn_action_pressed.9.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_btn_function.9.png b/res/drawable-xhdpi/lean_dark_btn_function.9.png
index 5040b8d29..5040b8d29 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_btn_function.9.png
+++ b/res/drawable-xhdpi/lean_dark_btn_function.9.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_btn_normal.9.png b/res/drawable-xhdpi/lean_dark_btn_normal.9.png
index 3c80ac8f2..3c80ac8f2 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_btn_normal.9.png
+++ b/res/drawable-xhdpi/lean_dark_btn_normal.9.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_function_btn_pressed.9.png b/res/drawable-xhdpi/lean_dark_function_btn_pressed.9.png
index 2d02b7498..2d02b7498 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_function_btn_pressed.9.png
+++ b/res/drawable-xhdpi/lean_dark_function_btn_pressed.9.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_normal_btn_pressed.9.png b/res/drawable-xhdpi/lean_dark_normal_btn_pressed.9.png
index 64786198b..64786198b 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_normal_btn_pressed.9.png
+++ b/res/drawable-xhdpi/lean_dark_normal_btn_pressed.9.png
diff --git a/src/main/res/drawable-xhdpi/lean_dark_popup_keyboard_background.9.png b/res/drawable-xhdpi/lean_dark_popup_keyboard_background.9.png
index 88a8d276d..88a8d276d 100644
--- a/src/main/res/drawable-xhdpi/lean_dark_popup_keyboard_background.9.png
+++ b/res/drawable-xhdpi/lean_dark_popup_keyboard_background.9.png
diff --git a/src/main/res/drawable-xhdpi/sym_keyboard_delete.png b/res/drawable-xhdpi/sym_keyboard_delete.png
index 29b086af4..29b086af4 100755
--- a/src/main/res/drawable-xhdpi/sym_keyboard_delete.png
+++ b/res/drawable-xhdpi/sym_keyboard_delete.png
diff --git a/src/main/res/drawable-xhdpi/sym_keyboard_done.png b/res/drawable-xhdpi/sym_keyboard_done.png
index b82bfbd86..b82bfbd86 100755
--- a/src/main/res/drawable-xhdpi/sym_keyboard_done.png
+++ b/res/drawable-xhdpi/sym_keyboard_done.png
diff --git a/src/main/res/drawable-xhdpi/sym_keyboard_mic.png b/res/drawable-xhdpi/sym_keyboard_mic.png
index 3a3f23e23..3a3f23e23 100755
--- a/src/main/res/drawable-xhdpi/sym_keyboard_mic.png
+++ b/res/drawable-xhdpi/sym_keyboard_mic.png
diff --git a/src/main/res/drawable-xhdpi/sym_keyboard_return.png b/res/drawable-xhdpi/sym_keyboard_return.png
index 7b7ad1747..7b7ad1747 100644
--- a/src/main/res/drawable-xhdpi/sym_keyboard_return.png
+++ b/res/drawable-xhdpi/sym_keyboard_return.png
diff --git a/src/main/res/drawable-xhdpi/sym_keyboard_search.png b/res/drawable-xhdpi/sym_keyboard_search.png
index 7e838b5c3..7e838b5c3 100755
--- a/src/main/res/drawable-xhdpi/sym_keyboard_search.png
+++ b/res/drawable-xhdpi/sym_keyboard_search.png
diff --git a/src/main/res/drawable-xhdpi/sym_keyboard_smiley.png b/res/drawable-xhdpi/sym_keyboard_smiley.png
index e6baa2e59..e6baa2e59 100644
--- a/src/main/res/drawable-xhdpi/sym_keyboard_smiley.png
+++ b/res/drawable-xhdpi/sym_keyboard_smiley.png
diff --git a/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/res/drawable-xxhdpi/drawer_shadow.9.png
index 75272e87d..75272e87d 100644
--- a/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
+++ b/res/drawable-xxhdpi/drawer_shadow.9.png
diff --git a/src/main/res/drawable-xxhdpi/gplus.png b/res/drawable-xxhdpi/gplus.png
index 72e1a6406..72e1a6406 100644
--- a/src/main/res/drawable-xxhdpi/gplus.png
+++ b/res/drawable-xxhdpi/gplus.png
diff --git a/src/main/res/drawable-xxhdpi/ic_accept.png b/res/drawable-xxhdpi/ic_accept.png
index c001acfaf..c001acfaf 100755
--- a/src/main/res/drawable-xxhdpi/ic_accept.png
+++ b/res/drawable-xxhdpi/ic_accept.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_content_discard.png b/res/drawable-xxhdpi/ic_action_content_discard.png
index 93a3290e9..93a3290e9 100755
--- a/src/main/res/drawable-xxhdpi/ic_action_content_discard.png
+++ b/res/drawable-xxhdpi/ic_action_content_discard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_content_new.png b/res/drawable-xxhdpi/ic_action_content_new.png
index d0c7eb08e..d0c7eb08e 100755
--- a/src/main/res/drawable-xxhdpi/ic_action_content_new.png
+++ b/res/drawable-xxhdpi/ic_action_content_new.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
index 7423d07e2..7423d07e2 100755
--- a/src/main/res/drawable-xxhdpi/ic_action_search.png
+++ b/res/drawable-xxhdpi/ic_action_search.png
diff --git a/src/main/res/drawable-xxhdpi/ic_compact_left_keyboard.png b/res/drawable-xxhdpi/ic_compact_left_keyboard.png
index 73bb539fe..73bb539fe 100644
--- a/src/main/res/drawable-xxhdpi/ic_compact_left_keyboard.png
+++ b/res/drawable-xxhdpi/ic_compact_left_keyboard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_compact_right_keyboard.png b/res/drawable-xxhdpi/ic_compact_right_keyboard.png
index b0be6aad6..b0be6aad6 100644
--- a/src/main/res/drawable-xxhdpi/ic_compact_right_keyboard.png
+++ b/res/drawable-xxhdpi/ic_compact_right_keyboard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_drawer.png b/res/drawable-xxhdpi/ic_drawer.png
index 386d2be84..386d2be84 100644
--- a/src/main/res/drawable-xxhdpi/ic_drawer.png
+++ b/res/drawable-xxhdpi/ic_drawer.png
diff --git a/src/main/res/drawable-xxhdpi/ic_keyboard_globe_light.png b/res/drawable-xxhdpi/ic_keyboard_globe_light.png
index 477a29b77..477a29b77 100755
--- a/src/main/res/drawable-xxhdpi/ic_keyboard_globe_light.png
+++ b/res/drawable-xxhdpi/ic_keyboard_globe_light.png
diff --git a/src/main/res/drawable-xxhdpi/ic_language_category.png b/res/drawable-xxhdpi/ic_language_category.png
index c93379a8e..c93379a8e 100755
--- a/src/main/res/drawable-xxhdpi/ic_language_category.png
+++ b/res/drawable-xxhdpi/ic_language_category.png
diff --git a/src/main/res/drawable-xxhdpi/ic_large_new.png b/res/drawable-xxhdpi/ic_large_new.png
index de439d6c4..de439d6c4 100755
--- a/src/main/res/drawable-xxhdpi/ic_large_new.png
+++ b/res/drawable-xxhdpi/ic_large_new.png
diff --git a/src/main/res/drawable-xxhdpi/ic_left_arrow.png b/res/drawable-xxhdpi/ic_left_arrow.png
index 97960f8ec..97960f8ec 100755
--- a/src/main/res/drawable-xxhdpi/ic_left_arrow.png
+++ b/res/drawable-xxhdpi/ic_left_arrow.png
diff --git a/src/main/res/drawable-xxhdpi/ic_more_overlay.png b/res/drawable-xxhdpi/ic_more_overlay.png
index efd797a98..efd797a98 100755
--- a/src/main/res/drawable-xxhdpi/ic_more_overlay.png
+++ b/res/drawable-xxhdpi/ic_more_overlay.png
diff --git a/src/main/res/drawable-xxhdpi/ic_normal_keyboard.png b/res/drawable-xxhdpi/ic_normal_keyboard.png
index 2a162f865..2a162f865 100755
--- a/src/main/res/drawable-xxhdpi/ic_normal_keyboard.png
+++ b/res/drawable-xxhdpi/ic_normal_keyboard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_not_configured_black.png b/res/drawable-xxhdpi/ic_not_configured_black.png
index c67785d4c..c67785d4c 100755
--- a/src/main/res/drawable-xxhdpi/ic_not_configured_black.png
+++ b/res/drawable-xxhdpi/ic_not_configured_black.png
diff --git a/src/main/res/drawable-xxhdpi/ic_not_configured_red.png b/res/drawable-xxhdpi/ic_not_configured_red.png
index fd24e7ba5..fd24e7ba5 100755
--- a/src/main/res/drawable-xxhdpi/ic_not_configured_red.png
+++ b/res/drawable-xxhdpi/ic_not_configured_red.png
diff --git a/src/main/res/drawable-xxhdpi/ic_split_keyboard.png b/res/drawable-xxhdpi/ic_split_keyboard.png
index 1f27d2e5d..1f27d2e5d 100644
--- a/src/main/res/drawable-xxhdpi/ic_split_keyboard.png
+++ b/res/drawable-xxhdpi/ic_split_keyboard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_user_interface_category.png b/res/drawable-xxhdpi/ic_user_interface_category.png
index 9022bd97b..9022bd97b 100755
--- a/src/main/res/drawable-xxhdpi/ic_user_interface_category.png
+++ b/res/drawable-xxhdpi/ic_user_interface_category.png
diff --git a/src/main/res/drawable-xxhdpi/sym_keyboard_delete.png b/res/drawable-xxhdpi/sym_keyboard_delete.png
index 6ad92181f..6ad92181f 100755
--- a/src/main/res/drawable-xxhdpi/sym_keyboard_delete.png
+++ b/res/drawable-xxhdpi/sym_keyboard_delete.png
diff --git a/src/main/res/drawable-xxhdpi/sym_keyboard_done.png b/res/drawable-xxhdpi/sym_keyboard_done.png
index e22706066..e22706066 100755
--- a/src/main/res/drawable-xxhdpi/sym_keyboard_done.png
+++ b/res/drawable-xxhdpi/sym_keyboard_done.png
diff --git a/src/main/res/drawable-xxhdpi/sym_keyboard_mic.png b/res/drawable-xxhdpi/sym_keyboard_mic.png
index 6e308c664..6e308c664 100755
--- a/src/main/res/drawable-xxhdpi/sym_keyboard_mic.png
+++ b/res/drawable-xxhdpi/sym_keyboard_mic.png
diff --git a/src/main/res/drawable-xxhdpi/sym_keyboard_return.png b/res/drawable-xxhdpi/sym_keyboard_return.png
index 46ee50eba..46ee50eba 100644
--- a/src/main/res/drawable-xxhdpi/sym_keyboard_return.png
+++ b/res/drawable-xxhdpi/sym_keyboard_return.png
diff --git a/src/main/res/drawable-xxhdpi/sym_keyboard_search.png b/res/drawable-xxhdpi/sym_keyboard_search.png
index 3c1515119..3c1515119 100755
--- a/src/main/res/drawable-xxhdpi/sym_keyboard_search.png
+++ b/res/drawable-xxhdpi/sym_keyboard_search.png
diff --git a/src/main/res/drawable-xxhdpi/sym_keyboard_smiley.png b/res/drawable-xxhdpi/sym_keyboard_smiley.png
index 5973ac355..5973ac355 100644
--- a/src/main/res/drawable-xxhdpi/sym_keyboard_smiley.png
+++ b/res/drawable-xxhdpi/sym_keyboard_smiley.png
diff --git a/src/main/res/drawable/ask_wallpaper.9.png b/res/drawable/ask_wallpaper.9.png
index b26f1f5ae..b26f1f5ae 100644
--- a/src/main/res/drawable/ask_wallpaper.9.png
+++ b/res/drawable/ask_wallpaper.9.png
diff --git a/src/main/res/drawable/blacktheme_background.xml b/res/drawable/blacktheme_background.xml
index d445e9d01..d445e9d01 100644
--- a/src/main/res/drawable/blacktheme_background.xml
+++ b/res/drawable/blacktheme_background.xml
diff --git a/src/main/res/drawable/blacktheme_key.xml b/res/drawable/blacktheme_key.xml
index 254e14ec5..254e14ec5 100644
--- a/src/main/res/drawable/blacktheme_key.xml
+++ b/res/drawable/blacktheme_key.xml
diff --git a/src/main/res/drawable/blacktheme_key_action.xml b/res/drawable/blacktheme_key_action.xml
index e3da914dd..e3da914dd 100644
--- a/src/main/res/drawable/blacktheme_key_action.xml
+++ b/res/drawable/blacktheme_key_action.xml
diff --git a/src/main/res/drawable/blacktheme_key_action_pressed.xml b/res/drawable/blacktheme_key_action_pressed.xml
index 41505e800..41505e800 100644
--- a/src/main/res/drawable/blacktheme_key_action_pressed.xml
+++ b/res/drawable/blacktheme_key_action_pressed.xml
diff --git a/src/main/res/drawable/blacktheme_key_function.xml b/res/drawable/blacktheme_key_function.xml
index 62685c67d..62685c67d 100644
--- a/src/main/res/drawable/blacktheme_key_function.xml
+++ b/res/drawable/blacktheme_key_function.xml
diff --git a/src/main/res/drawable/blacktheme_key_function_checked.xml b/res/drawable/blacktheme_key_function_checked.xml
index aa2766b64..aa2766b64 100644
--- a/src/main/res/drawable/blacktheme_key_function_checked.xml
+++ b/res/drawable/blacktheme_key_function_checked.xml
diff --git a/src/main/res/drawable/blacktheme_key_function_pressed.xml b/res/drawable/blacktheme_key_function_pressed.xml
index 529865a78..529865a78 100644
--- a/src/main/res/drawable/blacktheme_key_function_pressed.xml
+++ b/res/drawable/blacktheme_key_function_pressed.xml
diff --git a/src/main/res/drawable/blacktheme_key_normal.xml b/res/drawable/blacktheme_key_normal.xml
index 20aa25771..20aa25771 100644
--- a/src/main/res/drawable/blacktheme_key_normal.xml
+++ b/res/drawable/blacktheme_key_normal.xml
diff --git a/src/main/res/drawable/blacktheme_key_normal_pressed.xml b/res/drawable/blacktheme_key_normal_pressed.xml
index f814c14bc..f814c14bc 100644
--- a/src/main/res/drawable/blacktheme_key_normal_pressed.xml
+++ b/res/drawable/blacktheme_key_normal_pressed.xml
diff --git a/src/main/res/drawable/blacktheme_popup_background.xml b/res/drawable/blacktheme_popup_background.xml
index 4002fb783..4002fb783 100644
--- a/src/main/res/drawable/blacktheme_popup_background.xml
+++ b/res/drawable/blacktheme_popup_background.xml
diff --git a/src/main/res/drawable/blacktheme_popupkey.xml b/res/drawable/blacktheme_popupkey.xml
index ee110ef08..ee110ef08 100644
--- a/src/main/res/drawable/blacktheme_popupkey.xml
+++ b/res/drawable/blacktheme_popupkey.xml
diff --git a/src/main/res/drawable/blacktheme_preview_background.xml b/res/drawable/blacktheme_preview_background.xml
index 4002fb783..4002fb783 100644
--- a/src/main/res/drawable/blacktheme_preview_background.xml
+++ b/res/drawable/blacktheme_preview_background.xml
diff --git a/src/main/res/drawable/blacktheme_screenshot.png b/res/drawable/blacktheme_screenshot.png
index be1eacda1..be1eacda1 100644
--- a/src/main/res/drawable/blacktheme_screenshot.png
+++ b/res/drawable/blacktheme_screenshot.png
diff --git a/src/main/res/drawable/blacktheme_suggestion_background.xml b/res/drawable/blacktheme_suggestion_background.xml
index a5c9c0aeb..a5c9c0aeb 100644
--- a/src/main/res/drawable/blacktheme_suggestion_background.xml
+++ b/res/drawable/blacktheme_suggestion_background.xml
diff --git a/src/main/res/drawable/card_background.xml b/res/drawable/card_background.xml
index 02d5cbca1..02d5cbca1 100644
--- a/src/main/res/drawable/card_background.xml
+++ b/res/drawable/card_background.xml
diff --git a/src/main/res/drawable/card_background_normal.xml b/res/drawable/card_background_normal.xml
index 62ef6e95f..62ef6e95f 100644
--- a/src/main/res/drawable/card_background_normal.xml
+++ b/res/drawable/card_background_normal.xml
diff --git a/src/main/res/drawable/card_background_pressed.xml b/res/drawable/card_background_pressed.xml
index 45d60480c..45d60480c 100644
--- a/src/main/res/drawable/card_background_pressed.xml
+++ b/res/drawable/card_background_pressed.xml
diff --git a/src/main/res/drawable/close_candidates_hint_background.xml b/res/drawable/close_candidates_hint_background.xml
index e30312abc..e30312abc 100644
--- a/src/main/res/drawable/close_candidates_hint_background.xml
+++ b/res/drawable/close_candidates_hint_background.xml
diff --git a/src/main/res/drawable/close_popup_window.png b/res/drawable/close_popup_window.png
index ecb59f8ae..ecb59f8ae 100644
--- a/src/main/res/drawable/close_popup_window.png
+++ b/res/drawable/close_popup_window.png
diff --git a/src/main/res/drawable/close_suggestions_strip_icon.png b/res/drawable/close_suggestions_strip_icon.png
index 17da23bdc..17da23bdc 100644
--- a/src/main/res/drawable/close_suggestions_strip_icon.png
+++ b/res/drawable/close_suggestions_strip_icon.png
diff --git a/src/main/res/drawable/dark_background.xml b/res/drawable/dark_background.xml
index 22926e56a..22926e56a 100644
--- a/src/main/res/drawable/dark_background.xml
+++ b/res/drawable/dark_background.xml
diff --git a/src/main/res/drawable/dark_background_popup.xml b/res/drawable/dark_background_popup.xml
index f002cda21..f002cda21 100644
--- a/src/main/res/drawable/dark_background_popup.xml
+++ b/res/drawable/dark_background_popup.xml
diff --git a/src/main/res/drawable/dark_btn_key.xml b/res/drawable/dark_btn_key.xml
index 90923f6a8..90923f6a8 100644
--- a/src/main/res/drawable/dark_btn_key.xml
+++ b/res/drawable/dark_btn_key.xml
diff --git a/src/main/res/drawable/dark_btn_key_action.xml b/res/drawable/dark_btn_key_action.xml
index e6871bb0e..e6871bb0e 100644
--- a/src/main/res/drawable/dark_btn_key_action.xml
+++ b/res/drawable/dark_btn_key_action.xml
diff --git a/src/main/res/drawable/dark_btn_key_action_pressed.xml b/res/drawable/dark_btn_key_action_pressed.xml
index 113f2b2af..113f2b2af 100644
--- a/src/main/res/drawable/dark_btn_key_action_pressed.xml
+++ b/res/drawable/dark_btn_key_action_pressed.xml
diff --git a/src/main/res/drawable/dark_btn_key_function.xml b/res/drawable/dark_btn_key_function.xml
index d8f299978..d8f299978 100644
--- a/src/main/res/drawable/dark_btn_key_function.xml
+++ b/res/drawable/dark_btn_key_function.xml
diff --git a/src/main/res/drawable/dark_btn_key_function_pressed.xml b/res/drawable/dark_btn_key_function_pressed.xml
index 8d6f3c4af..8d6f3c4af 100644
--- a/src/main/res/drawable/dark_btn_key_function_pressed.xml
+++ b/res/drawable/dark_btn_key_function_pressed.xml
diff --git a/src/main/res/drawable/dark_btn_key_normal.xml b/res/drawable/dark_btn_key_normal.xml
index f33889f7c..f33889f7c 100644
--- a/src/main/res/drawable/dark_btn_key_normal.xml
+++ b/res/drawable/dark_btn_key_normal.xml
diff --git a/src/main/res/drawable/dark_btn_key_normal_pressed.xml b/res/drawable/dark_btn_key_normal_pressed.xml
index 41480d3dd..41480d3dd 100644
--- a/src/main/res/drawable/dark_btn_key_normal_pressed.xml
+++ b/res/drawable/dark_btn_key_normal_pressed.xml
diff --git a/src/main/res/drawable/dark_btn_key_preview_background.xml b/res/drawable/dark_btn_key_preview_background.xml
index 87d10e7f5..87d10e7f5 100644
--- a/src/main/res/drawable/dark_btn_key_preview_background.xml
+++ b/res/drawable/dark_btn_key_preview_background.xml
diff --git a/src/main/res/drawable/dark_key_action_set.xml b/res/drawable/dark_key_action_set.xml
index 33ef00086..33ef00086 100644
--- a/src/main/res/drawable/dark_key_action_set.xml
+++ b/res/drawable/dark_key_action_set.xml
diff --git a/src/main/res/drawable/dark_key_cancel_set.xml b/res/drawable/dark_key_cancel_set.xml
index 6761cbe88..6761cbe88 100644
--- a/src/main/res/drawable/dark_key_cancel_set.xml
+++ b/res/drawable/dark_key_cancel_set.xml
diff --git a/src/main/res/drawable/dark_key_control_set.xml b/res/drawable/dark_key_control_set.xml
index bfdd20fff..bfdd20fff 100644
--- a/src/main/res/drawable/dark_key_control_set.xml
+++ b/res/drawable/dark_key_control_set.xml
diff --git a/src/main/res/drawable/dark_key_delete_set.xml b/res/drawable/dark_key_delete_set.xml
index 4fb438332..4fb438332 100644
--- a/src/main/res/drawable/dark_key_delete_set.xml
+++ b/res/drawable/dark_key_delete_set.xml
diff --git a/src/main/res/drawable/dark_key_globe_set.xml b/res/drawable/dark_key_globe_set.xml
index f38af005e..f38af005e 100644
--- a/src/main/res/drawable/dark_key_globe_set.xml
+++ b/res/drawable/dark_key_globe_set.xml
diff --git a/src/main/res/drawable/dark_key_mic_set.xml b/res/drawable/dark_key_mic_set.xml
index 16207149b..16207149b 100644
--- a/src/main/res/drawable/dark_key_mic_set.xml
+++ b/res/drawable/dark_key_mic_set.xml
diff --git a/src/main/res/drawable/dark_key_settings_set.xml b/res/drawable/dark_key_settings_set.xml
index 9f7b960c7..9f7b960c7 100644
--- a/src/main/res/drawable/dark_key_settings_set.xml
+++ b/res/drawable/dark_key_settings_set.xml
diff --git a/src/main/res/drawable/dark_key_shift_set.xml b/res/drawable/dark_key_shift_set.xml
index 434b9460e..434b9460e 100644
--- a/src/main/res/drawable/dark_key_shift_set.xml
+++ b/res/drawable/dark_key_shift_set.xml
diff --git a/src/main/res/drawable/dark_key_space_set.xml b/res/drawable/dark_key_space_set.xml
index 8f0bdea42..8f0bdea42 100644
--- a/src/main/res/drawable/dark_key_space_set.xml
+++ b/res/drawable/dark_key_space_set.xml
diff --git a/src/main/res/drawable/dark_key_tab_set.xml b/res/drawable/dark_key_tab_set.xml
index a7b888dc0..a7b888dc0 100644
--- a/src/main/res/drawable/dark_key_tab_set.xml
+++ b/res/drawable/dark_key_tab_set.xml
diff --git a/src/main/res/drawable/dark_suggestions_divider.png b/res/drawable/dark_suggestions_divider.png
index 8a2246f7e..8a2246f7e 100644
--- a/src/main/res/drawable/dark_suggestions_divider.png
+++ b/res/drawable/dark_suggestions_divider.png
diff --git a/src/main/res/drawable/dark_theme_screenshot.png b/res/drawable/dark_theme_screenshot.png
index bfcfb6a97..bfcfb6a97 100644
--- a/src/main/res/drawable/dark_theme_screenshot.png
+++ b/res/drawable/dark_theme_screenshot.png
diff --git a/src/main/res/drawable/drop_shadow_for_bottom.xml b/res/drawable/drop_shadow_for_bottom.xml
index 38a00ff88..38a00ff88 100644
--- a/src/main/res/drawable/drop_shadow_for_bottom.xml
+++ b/res/drawable/drop_shadow_for_bottom.xml
diff --git a/src/main/res/drawable/drop_shadow_for_top.xml b/res/drawable/drop_shadow_for_top.xml
index 2c078232f..2c078232f 100644
--- a/src/main/res/drawable/drop_shadow_for_top.xml
+++ b/res/drawable/drop_shadow_for_top.xml
diff --git a/src/main/res/drawable/drop_shadow_for_top_and_bottom.xml b/res/drawable/drop_shadow_for_top_and_bottom.xml
index b1eef1e56..b1eef1e56 100644
--- a/src/main/res/drawable/drop_shadow_for_top_and_bottom.xml
+++ b/res/drawable/drop_shadow_for_top_and_bottom.xml
diff --git a/src/main/res/drawable/english_16keys_screenshot.png b/res/drawable/english_16keys_screenshot.png
index 61204e372..61204e372 100644
--- a/src/main/res/drawable/english_16keys_screenshot.png
+++ b/res/drawable/english_16keys_screenshot.png
diff --git a/src/instrumentTest/res/drawable/english_qwerty_screenshot.png b/res/drawable/english_qwerty_screenshot.png
index d34675dac..d34675dac 100644
--- a/src/instrumentTest/res/drawable/english_qwerty_screenshot.png
+++ b/res/drawable/english_qwerty_screenshot.png
diff --git a/src/instrumentTest/res/drawable/english_qwerty_with_symbols_screenshot.png b/res/drawable/english_qwerty_with_symbols_screenshot.png
index b2ec028fd..b2ec028fd 100644
--- a/src/instrumentTest/res/drawable/english_qwerty_with_symbols_screenshot.png
+++ b/res/drawable/english_qwerty_with_symbols_screenshot.png
diff --git a/src/main/res/drawable/highlight_pressed.png b/res/drawable/highlight_pressed.png
index ba11731fb..ba11731fb 100644
--- a/src/main/res/drawable/highlight_pressed.png
+++ b/res/drawable/highlight_pressed.png
diff --git a/src/main/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png
index c093f1984..c093f1984 100644
--- a/src/main/res/drawable/ic_launcher.png
+++ b/res/drawable/ic_launcher.png
diff --git a/src/main/res/drawable/ic_launcher_settings.png b/res/drawable/ic_launcher_settings.png
index eda6137ee..eda6137ee 100644
--- a/src/main/res/drawable/ic_launcher_settings.png
+++ b/res/drawable/ic_launcher_settings.png
diff --git a/src/main/res/drawable/ic_not_configured_animation.xml b/res/drawable/ic_not_configured_animation.xml
index c9eedbf55..c9eedbf55 100644
--- a/src/main/res/drawable/ic_not_configured_animation.xml
+++ b/res/drawable/ic_not_configured_animation.xml
diff --git a/src/main/res/drawable/ic_stat_en.png b/res/drawable/ic_stat_en.png
index 1682f1668..1682f1668 100644
--- a/src/main/res/drawable/ic_stat_en.png
+++ b/res/drawable/ic_stat_en.png
diff --git a/src/main/res/drawable/indicator_empty.xml b/res/drawable/indicator_empty.xml
index 8ef33dbcb..8ef33dbcb 100644
--- a/src/main/res/drawable/indicator_empty.xml
+++ b/res/drawable/indicator_empty.xml
diff --git a/src/main/res/drawable/indicator_full.xml b/res/drawable/indicator_full.xml
index df7a89d5f..df7a89d5f 100644
--- a/src/main/res/drawable/indicator_full.xml
+++ b/res/drawable/indicator_full.xml
diff --git a/src/main/res/drawable/keyboard_suggest_strip.9.png b/res/drawable/keyboard_suggest_strip.9.png
index 7c20c0463..7c20c0463 100644
--- a/src/main/res/drawable/keyboard_suggest_strip.9.png
+++ b/res/drawable/keyboard_suggest_strip.9.png
diff --git a/src/main/res/drawable/lean_dark_btn.xml b/res/drawable/lean_dark_btn.xml
index 17781a942..17781a942 100644
--- a/src/main/res/drawable/lean_dark_btn.xml
+++ b/res/drawable/lean_dark_btn.xml
diff --git a/src/main/res/drawable/lean_dark_btn_action.9.png b/res/drawable/lean_dark_btn_action.9.png
index 5040b8d29..5040b8d29 100644
--- a/src/main/res/drawable/lean_dark_btn_action.9.png
+++ b/res/drawable/lean_dark_btn_action.9.png
diff --git a/src/main/res/drawable/lean_dark_btn_action_pressed.9.png b/res/drawable/lean_dark_btn_action_pressed.9.png
index e63ae8fbb..e63ae8fbb 100644
--- a/src/main/res/drawable/lean_dark_btn_action_pressed.9.png
+++ b/res/drawable/lean_dark_btn_action_pressed.9.png
diff --git a/src/main/res/drawable/lean_dark_btn_function.9.png b/res/drawable/lean_dark_btn_function.9.png
index 5040b8d29..5040b8d29 100644
--- a/src/main/res/drawable/lean_dark_btn_function.9.png
+++ b/res/drawable/lean_dark_btn_function.9.png
diff --git a/src/main/res/drawable/lean_dark_btn_normal.9.png b/res/drawable/lean_dark_btn_normal.9.png
index 3c80ac8f2..3c80ac8f2 100644
--- a/src/main/res/drawable/lean_dark_btn_normal.9.png
+++ b/res/drawable/lean_dark_btn_normal.9.png
diff --git a/src/main/res/drawable/lean_dark_btn_popup.xml b/res/drawable/lean_dark_btn_popup.xml
index c9e4c337e..c9e4c337e 100644
--- a/src/main/res/drawable/lean_dark_btn_popup.xml
+++ b/res/drawable/lean_dark_btn_popup.xml
diff --git a/src/main/res/drawable/lean_dark_candidates_background.xml b/res/drawable/lean_dark_candidates_background.xml
index fe9f39505..fe9f39505 100644
--- a/src/main/res/drawable/lean_dark_candidates_background.xml
+++ b/res/drawable/lean_dark_candidates_background.xml
diff --git a/src/main/res/drawable/lean_dark_function_btn_pressed.9.png b/res/drawable/lean_dark_function_btn_pressed.9.png
index 2d02b7498..2d02b7498 100644
--- a/src/main/res/drawable/lean_dark_function_btn_pressed.9.png
+++ b/res/drawable/lean_dark_function_btn_pressed.9.png
diff --git a/src/main/res/drawable/lean_dark_keyboard_background.xml b/res/drawable/lean_dark_keyboard_background.xml
index 034b4095a..034b4095a 100644
--- a/src/main/res/drawable/lean_dark_keyboard_background.xml
+++ b/res/drawable/lean_dark_keyboard_background.xml
diff --git a/src/main/res/drawable/lean_dark_normal_btn_pressed.9.png b/res/drawable/lean_dark_normal_btn_pressed.9.png
index 64786198b..64786198b 100644
--- a/src/main/res/drawable/lean_dark_normal_btn_pressed.9.png
+++ b/res/drawable/lean_dark_normal_btn_pressed.9.png
diff --git a/src/main/res/drawable/lean_dark_popup_btn_normal.xml b/res/drawable/lean_dark_popup_btn_normal.xml
index 56f2cec1f..56f2cec1f 100644
--- a/src/main/res/drawable/lean_dark_popup_btn_normal.xml
+++ b/res/drawable/lean_dark_popup_btn_normal.xml
diff --git a/src/main/res/drawable/lean_dark_popup_btn_selected.xml b/res/drawable/lean_dark_popup_btn_selected.xml
index 4476e0bd4..4476e0bd4 100644
--- a/src/main/res/drawable/lean_dark_popup_btn_selected.xml
+++ b/res/drawable/lean_dark_popup_btn_selected.xml
diff --git a/src/main/res/drawable/lean_dark_popup_keyboard_background.9.png b/res/drawable/lean_dark_popup_keyboard_background.9.png
index 88a8d276d..88a8d276d 100644
--- a/src/main/res/drawable/lean_dark_popup_keyboard_background.9.png
+++ b/res/drawable/lean_dark_popup_keyboard_background.9.png
diff --git a/src/main/res/drawable/lean_dark_theme_screenshot.png b/res/drawable/lean_dark_theme_screenshot.png
index d2d2720c8..d2d2720c8 100755
--- a/src/main/res/drawable/lean_dark_theme_screenshot.png
+++ b/res/drawable/lean_dark_theme_screenshot.png
diff --git a/src/main/res/drawable/light_background_base_tile.png b/res/drawable/light_background_base_tile.png
index 55fb9c2bf..55fb9c2bf 100644
--- a/src/main/res/drawable/light_background_base_tile.png
+++ b/res/drawable/light_background_base_tile.png
diff --git a/src/main/res/drawable/light_background_popup.xml b/res/drawable/light_background_popup.xml
index 2b9f11d25..2b9f11d25 100644
--- a/src/main/res/drawable/light_background_popup.xml
+++ b/res/drawable/light_background_popup.xml
diff --git a/src/main/res/drawable/light_background_suggestions.xml b/res/drawable/light_background_suggestions.xml
index 3fc31e13b..3fc31e13b 100644
--- a/src/main/res/drawable/light_background_suggestions.xml
+++ b/res/drawable/light_background_suggestions.xml
diff --git a/src/main/res/drawable/light_background_tiled.xml b/res/drawable/light_background_tiled.xml
index 73ffa3c23..73ffa3c23 100644
--- a/src/main/res/drawable/light_background_tiled.xml
+++ b/res/drawable/light_background_tiled.xml
diff --git a/src/main/res/drawable/light_btn_key.xml b/res/drawable/light_btn_key.xml
index ddfb9ad07..ddfb9ad07 100644
--- a/src/main/res/drawable/light_btn_key.xml
+++ b/res/drawable/light_btn_key.xml
diff --git a/src/main/res/drawable/light_btn_key_action.xml b/res/drawable/light_btn_key_action.xml
index 319a039ae..319a039ae 100644
--- a/src/main/res/drawable/light_btn_key_action.xml
+++ b/res/drawable/light_btn_key_action.xml
diff --git a/src/main/res/drawable/light_btn_key_action_pressed.xml b/res/drawable/light_btn_key_action_pressed.xml
index c8ac5884b..c8ac5884b 100644
--- a/src/main/res/drawable/light_btn_key_action_pressed.xml
+++ b/res/drawable/light_btn_key_action_pressed.xml
diff --git a/src/main/res/drawable/light_btn_key_function.xml b/res/drawable/light_btn_key_function.xml
index 45a2ca060..45a2ca060 100644
--- a/src/main/res/drawable/light_btn_key_function.xml
+++ b/res/drawable/light_btn_key_function.xml
diff --git a/src/main/res/drawable/light_btn_key_function_pressed.xml b/res/drawable/light_btn_key_function_pressed.xml
index 47e27977e..47e27977e 100644
--- a/src/main/res/drawable/light_btn_key_function_pressed.xml
+++ b/res/drawable/light_btn_key_function_pressed.xml
diff --git a/src/main/res/drawable/light_btn_key_normal.xml b/res/drawable/light_btn_key_normal.xml
index 306873995..306873995 100644
--- a/src/main/res/drawable/light_btn_key_normal.xml
+++ b/res/drawable/light_btn_key_normal.xml
diff --git a/src/main/res/drawable/light_btn_key_normal_pressed.xml b/res/drawable/light_btn_key_normal_pressed.xml
index 07041878a..07041878a 100644
--- a/src/main/res/drawable/light_btn_key_normal_pressed.xml
+++ b/res/drawable/light_btn_key_normal_pressed.xml
diff --git a/src/main/res/drawable/light_btn_key_preview_background.xml b/res/drawable/light_btn_key_preview_background.xml
index 38f85845c..38f85845c 100644
--- a/src/main/res/drawable/light_btn_key_preview_background.xml
+++ b/res/drawable/light_btn_key_preview_background.xml
diff --git a/src/main/res/drawable/light_theme_screenshot.png b/res/drawable/light_theme_screenshot.png
index 9cd6f01ea..9cd6f01ea 100644
--- a/src/main/res/drawable/light_theme_screenshot.png
+++ b/res/drawable/light_theme_screenshot.png
diff --git a/src/main/res/drawable/list_selector_background_pressed.9.png b/res/drawable/list_selector_background_pressed.9.png
index 7160a1203..7160a1203 100644
--- a/src/main/res/drawable/list_selector_background_pressed.9.png
+++ b/res/drawable/list_selector_background_pressed.9.png
diff --git a/src/main/res/drawable/menu_background.xml b/res/drawable/menu_background.xml
index e2a1a6db8..e2a1a6db8 100644
--- a/src/main/res/drawable/menu_background.xml
+++ b/res/drawable/menu_background.xml
diff --git a/src/main/res/drawable/menu_item_extra_background.xml b/res/drawable/menu_item_extra_background.xml
index 18d312abc..18d312abc 100644
--- a/src/main/res/drawable/menu_item_extra_background.xml
+++ b/res/drawable/menu_item_extra_background.xml
diff --git a/src/main/res/drawable/notification_error_icon.png b/res/drawable/notification_error_icon.png
index 4f9606d43..4f9606d43 100644
--- a/src/main/res/drawable/notification_error_icon.png
+++ b/res/drawable/notification_error_icon.png
diff --git a/src/main/res/drawable/notification_icon_beta_version.png b/res/drawable/notification_icon_beta_version.png
index 75267c96a..75267c96a 100644
--- a/src/main/res/drawable/notification_icon_beta_version.png
+++ b/res/drawable/notification_icon_beta_version.png
diff --git a/src/main/res/drawable/notification_icon_changelog.png b/res/drawable/notification_icon_changelog.png
index 25866579e..25866579e 100644
--- a/src/main/res/drawable/notification_icon_changelog.png
+++ b/res/drawable/notification_icon_changelog.png
diff --git a/src/main/res/drawable/notification_icon_how_to.png b/res/drawable/notification_icon_how_to.png
index 7717d0a21..7717d0a21 100644
--- a/src/main/res/drawable/notification_icon_how_to.png
+++ b/res/drawable/notification_icon_how_to.png
diff --git a/src/main/res/drawable/progress_dialog_background.xml b/res/drawable/progress_dialog_background.xml
index 0b97bb7b5..0b97bb7b5 100644
--- a/src/main/res/drawable/progress_dialog_background.xml
+++ b/res/drawable/progress_dialog_background.xml
diff --git a/src/main/res/drawable/restart_suggestions_notification_background.xml b/res/drawable/restart_suggestions_notification_background.xml
index 70b6729fc..70b6729fc 100644
--- a/src/main/res/drawable/restart_suggestions_notification_background.xml
+++ b/res/drawable/restart_suggestions_notification_background.xml
diff --git a/src/main/res/drawable/selected_tab.xml b/res/drawable/selected_tab.xml
index 9de654de1..9de654de1 100644
--- a/src/main/res/drawable/selected_tab.xml
+++ b/res/drawable/selected_tab.xml
diff --git a/src/main/res/drawable/sym_keyboard_cancel.png b/res/drawable/sym_keyboard_cancel.png
index 00aacf69c..00aacf69c 100644
--- a/src/main/res/drawable/sym_keyboard_cancel.png
+++ b/res/drawable/sym_keyboard_cancel.png
diff --git a/src/main/res/drawable/sym_keyboard_ctrl.png b/res/drawable/sym_keyboard_ctrl.png
index adf71a1b7..adf71a1b7 100644
--- a/src/main/res/drawable/sym_keyboard_ctrl.png
+++ b/res/drawable/sym_keyboard_ctrl.png
diff --git a/src/main/res/drawable/sym_keyboard_ctrl_on.png b/res/drawable/sym_keyboard_ctrl_on.png
index d0b79f203..d0b79f203 100644
--- a/src/main/res/drawable/sym_keyboard_ctrl_on.png
+++ b/res/drawable/sym_keyboard_ctrl_on.png
diff --git a/src/main/res/drawable/sym_keyboard_feedback_mic.png b/res/drawable/sym_keyboard_feedback_mic.png
index 40c1b391e..40c1b391e 100644
--- a/src/main/res/drawable/sym_keyboard_feedback_mic.png
+++ b/res/drawable/sym_keyboard_feedback_mic.png
diff --git a/src/main/res/drawable/sym_keyboard_feedback_settings.png b/res/drawable/sym_keyboard_feedback_settings.png
index ee9c7c8b7..ee9c7c8b7 100644
--- a/src/main/res/drawable/sym_keyboard_feedback_settings.png
+++ b/res/drawable/sym_keyboard_feedback_settings.png
diff --git a/src/main/res/drawable/sym_keyboard_key_domain.png b/res/drawable/sym_keyboard_key_domain.png
index cb7befe2e..cb7befe2e 100644
--- a/src/main/res/drawable/sym_keyboard_key_domain.png
+++ b/res/drawable/sym_keyboard_key_domain.png
diff --git a/src/main/res/drawable/sym_keyboard_notification_icon.png b/res/drawable/sym_keyboard_notification_icon.png
index 93bb7b250..93bb7b250 100755
--- a/src/main/res/drawable/sym_keyboard_notification_icon.png
+++ b/res/drawable/sym_keyboard_notification_icon.png
diff --git a/src/main/res/drawable/sym_keyboard_num0.png b/res/drawable/sym_keyboard_num0.png
index 1fa9e05c5..1fa9e05c5 100644
--- a/src/main/res/drawable/sym_keyboard_num0.png
+++ b/res/drawable/sym_keyboard_num0.png
diff --git a/src/main/res/drawable/sym_keyboard_num0_space.png b/res/drawable/sym_keyboard_num0_space.png
index 99cade89a..99cade89a 100644
--- a/src/main/res/drawable/sym_keyboard_num0_space.png
+++ b/res/drawable/sym_keyboard_num0_space.png
diff --git a/src/main/res/drawable/sym_keyboard_num1.png b/res/drawable/sym_keyboard_num1.png
index f14705870..f14705870 100644
--- a/src/main/res/drawable/sym_keyboard_num1.png
+++ b/res/drawable/sym_keyboard_num1.png
diff --git a/src/main/res/drawable/sym_keyboard_num1_l.png b/res/drawable/sym_keyboard_num1_l.png
index 59ba1cdf9..59ba1cdf9 100644
--- a/src/main/res/drawable/sym_keyboard_num1_l.png
+++ b/res/drawable/sym_keyboard_num1_l.png
diff --git a/src/main/res/drawable/sym_keyboard_num2.png b/res/drawable/sym_keyboard_num2.png
index d04a5ab33..d04a5ab33 100644
--- a/src/main/res/drawable/sym_keyboard_num2.png
+++ b/res/drawable/sym_keyboard_num2.png
diff --git a/src/main/res/drawable/sym_keyboard_num3.png b/res/drawable/sym_keyboard_num3.png
index 398ebe206..398ebe206 100644
--- a/src/main/res/drawable/sym_keyboard_num3.png
+++ b/res/drawable/sym_keyboard_num3.png
diff --git a/src/main/res/drawable/sym_keyboard_num4.png b/res/drawable/sym_keyboard_num4.png
index 2dc8048c9..2dc8048c9 100644
--- a/src/main/res/drawable/sym_keyboard_num4.png
+++ b/res/drawable/sym_keyboard_num4.png
diff --git a/src/main/res/drawable/sym_keyboard_num5.png b/res/drawable/sym_keyboard_num5.png
index 08f24873f..08f24873f 100644
--- a/src/main/res/drawable/sym_keyboard_num5.png
+++ b/res/drawable/sym_keyboard_num5.png
diff --git a/src/main/res/drawable/sym_keyboard_num6.png b/res/drawable/sym_keyboard_num6.png
index 5403565e1..5403565e1 100644
--- a/src/main/res/drawable/sym_keyboard_num6.png
+++ b/res/drawable/sym_keyboard_num6.png
diff --git a/src/main/res/drawable/sym_keyboard_num7.png b/res/drawable/sym_keyboard_num7.png
index 399a9a143..399a9a143 100644
--- a/src/main/res/drawable/sym_keyboard_num7.png
+++ b/res/drawable/sym_keyboard_num7.png
diff --git a/src/main/res/drawable/sym_keyboard_num8.png b/res/drawable/sym_keyboard_num8.png
index 8b2c04747..8b2c04747 100644
--- a/src/main/res/drawable/sym_keyboard_num8.png
+++ b/res/drawable/sym_keyboard_num8.png
diff --git a/src/main/res/drawable/sym_keyboard_num9.png b/res/drawable/sym_keyboard_num9.png
index c2541b155..c2541b155 100644
--- a/src/main/res/drawable/sym_keyboard_num9.png
+++ b/res/drawable/sym_keyboard_num9.png
diff --git a/src/main/res/drawable/sym_keyboard_numalt.png b/res/drawable/sym_keyboard_numalt.png
index 24fb4dc15..24fb4dc15 100644
--- a/src/main/res/drawable/sym_keyboard_numalt.png
+++ b/res/drawable/sym_keyboard_numalt.png
diff --git a/src/main/res/drawable/sym_keyboard_settings.png b/res/drawable/sym_keyboard_settings.png
index 865d9f500..865d9f500 100644
--- a/src/main/res/drawable/sym_keyboard_settings.png
+++ b/res/drawable/sym_keyboard_settings.png
diff --git a/src/main/res/drawable/sym_keyboard_shift.png b/res/drawable/sym_keyboard_shift.png
index 4fb23b365..4fb23b365 100644
--- a/src/main/res/drawable/sym_keyboard_shift.png
+++ b/res/drawable/sym_keyboard_shift.png
diff --git a/src/main/res/drawable/sym_keyboard_shift_locked.png b/res/drawable/sym_keyboard_shift_locked.png
index 1312484cb..1312484cb 100644
--- a/src/main/res/drawable/sym_keyboard_shift_locked.png
+++ b/res/drawable/sym_keyboard_shift_locked.png
diff --git a/src/main/res/drawable/sym_keyboard_shift_on.png b/res/drawable/sym_keyboard_shift_on.png
index ec3e0e745..ec3e0e745 100644
--- a/src/main/res/drawable/sym_keyboard_shift_on.png
+++ b/res/drawable/sym_keyboard_shift_on.png
diff --git a/src/main/res/drawable/sym_keyboard_shift_with_globe.png b/res/drawable/sym_keyboard_shift_with_globe.png
index 3ad69b5d4..3ad69b5d4 100644
--- a/src/main/res/drawable/sym_keyboard_shift_with_globe.png
+++ b/res/drawable/sym_keyboard_shift_with_globe.png
diff --git a/src/main/res/drawable/sym_keyboard_shift_with_globes_on.png b/res/drawable/sym_keyboard_shift_with_globes_on.png
index 59c76dcc4..59c76dcc4 100644
--- a/src/main/res/drawable/sym_keyboard_shift_with_globes_on.png
+++ b/res/drawable/sym_keyboard_shift_with_globes_on.png
diff --git a/src/main/res/drawable/sym_keyboard_space.9.png b/res/drawable/sym_keyboard_space.9.png
index 015af8021..015af8021 100644
--- a/src/main/res/drawable/sym_keyboard_space.9.png
+++ b/res/drawable/sym_keyboard_space.9.png
diff --git a/src/main/res/drawable/sym_keyboard_space_back.png b/res/drawable/sym_keyboard_space_back.png
index 6f8fc5b45..6f8fc5b45 100644
--- a/src/main/res/drawable/sym_keyboard_space_back.png
+++ b/res/drawable/sym_keyboard_space_back.png
diff --git a/src/main/res/drawable/sym_keyboard_tab.png b/res/drawable/sym_keyboard_tab.png
index 278a346b5..278a346b5 100644
--- a/src/main/res/drawable/sym_keyboard_tab.png
+++ b/res/drawable/sym_keyboard_tab.png
diff --git a/src/main/res/drawable/tip_1_ask_settings.png b/res/drawable/tip_1_ask_settings.png
index efe87ecac..efe87ecac 100644
--- a/src/main/res/drawable/tip_1_ask_settings.png
+++ b/res/drawable/tip_1_ask_settings.png
diff --git a/src/main/res/drawable/tip_2_gestures.png b/res/drawable/tip_2_gestures.png
index a79c6a60e..a79c6a60e 100644
--- a/src/main/res/drawable/tip_2_gestures.png
+++ b/res/drawable/tip_2_gestures.png
diff --git a/src/main/res/drawable/tip_4_rows.png b/res/drawable/tip_4_rows.png
index 6cf0c4e7b..6cf0c4e7b 100644
--- a/src/main/res/drawable/tip_4_rows.png
+++ b/res/drawable/tip_4_rows.png
diff --git a/src/main/res/drawable/tip_6_rows.png b/res/drawable/tip_6_rows.png
index 398f5a3e8..398f5a3e8 100644
--- a/src/main/res/drawable/tip_6_rows.png
+++ b/res/drawable/tip_6_rows.png
diff --git a/src/main/res/drawable/tip_8_suggestions.png b/res/drawable/tip_8_suggestions.png
index 3b7739a45..3b7739a45 100644
--- a/src/main/res/drawable/tip_8_suggestions.png
+++ b/res/drawable/tip_8_suggestions.png
diff --git a/src/main/res/drawable/tip_9_screenshot.png b/res/drawable/tip_9_screenshot.png
index f98eedcfb..f98eedcfb 100644
--- a/src/main/res/drawable/tip_9_screenshot.png
+++ b/res/drawable/tip_9_screenshot.png
diff --git a/src/main/res/drawable/tips_bottom_background.xml b/res/drawable/tips_bottom_background.xml
index 0bbd1b48e..0bbd1b48e 100644
--- a/src/main/res/drawable/tips_bottom_background.xml
+++ b/res/drawable/tips_bottom_background.xml
diff --git a/src/main/res/drawable/tips_notification_background.xml b/res/drawable/tips_notification_background.xml
index 70b6729fc..70b6729fc 100644
--- a/src/main/res/drawable/tips_notification_background.xml
+++ b/res/drawable/tips_notification_background.xml
diff --git a/src/main/res/drawable/transparent_click_feedback_background.xml b/res/drawable/transparent_click_feedback_background.xml
index 2caaf2d7d..2caaf2d7d 100644
--- a/src/main/res/drawable/transparent_click_feedback_background.xml
+++ b/res/drawable/transparent_click_feedback_background.xml
diff --git a/src/main/res/drawable/tutorial_popup_window_background.xml b/res/drawable/tutorial_popup_window_background.xml
index 4e1a52201..4e1a52201 100644
--- a/src/main/res/drawable/tutorial_popup_window_background.xml
+++ b/res/drawable/tutorial_popup_window_background.xml
diff --git a/src/main/res/drawable/twitter.png b/res/drawable/twitter.png
index 93619b4ee..93619b4ee 100644
--- a/src/main/res/drawable/twitter.png
+++ b/res/drawable/twitter.png
diff --git a/src/main/res/drawable/window_popup_background.xml b/res/drawable/window_popup_background.xml
index 2bc038e44..2bc038e44 100644
--- a/src/main/res/drawable/window_popup_background.xml
+++ b/res/drawable/window_popup_background.xml
diff --git a/src/main/res/drawable/window_popup_background_inner.xml b/res/drawable/window_popup_background_inner.xml
index b54e00023..b54e00023 100644
--- a/src/main/res/drawable/window_popup_background_inner.xml
+++ b/res/drawable/window_popup_background_inner.xml
diff --git a/src/main/res/drawable/words_editor_buttons_border.xml b/res/drawable/words_editor_buttons_border.xml
index 5eef489f6..5eef489f6 100644
--- a/src/main/res/drawable/words_editor_buttons_border.xml
+++ b/res/drawable/words_editor_buttons_border.xml
diff --git a/src/main/res/layout-v14/toggle_view.xml b/res/layout-v14/toggle_view.xml
index fae1b6fe9..fae1b6fe9 100644
--- a/src/main/res/layout-v14/toggle_view.xml
+++ b/res/layout-v14/toggle_view.xml
diff --git a/src/main/res/layout-w480dp/user_dictionary_editor_abslistview.xml b/res/layout-w480dp/user_dictionary_editor_abslistview.xml
index 74adbfe79..74adbfe79 100644
--- a/src/main/res/layout-w480dp/user_dictionary_editor_abslistview.xml
+++ b/res/layout-w480dp/user_dictionary_editor_abslistview.xml
diff --git a/src/main/res/layout-w480dp/user_dictionary_word_row.xml b/res/layout-w480dp/user_dictionary_word_row.xml
index ee74b5330..ee74b5330 100644
--- a/src/main/res/layout-w480dp/user_dictionary_word_row.xml
+++ b/res/layout-w480dp/user_dictionary_word_row.xml
diff --git a/src/main/res/layout-w480dp/user_dictionary_word_row_add.xml b/res/layout-w480dp/user_dictionary_word_row_add.xml
index 4ae841e1d..4ae841e1d 100644
--- a/src/main/res/layout-w480dp/user_dictionary_word_row_add.xml
+++ b/res/layout-w480dp/user_dictionary_word_row_add.xml
diff --git a/src/main/res/layout-w480dp/user_dictionary_word_row_edit.xml b/res/layout-w480dp/user_dictionary_word_row_edit.xml
index 0594bf0a6..0594bf0a6 100644
--- a/src/main/res/layout-w480dp/user_dictionary_word_row_edit.xml
+++ b/res/layout-w480dp/user_dictionary_word_row_edit.xml
diff --git a/src/main/res/layout-w600dp/keyboard_setup_wizard_layout.xml b/res/layout-w600dp/keyboard_setup_wizard_layout.xml
index c11405075..c11405075 100644
--- a/src/main/res/layout-w600dp/keyboard_setup_wizard_layout.xml
+++ b/res/layout-w600dp/keyboard_setup_wizard_layout.xml
diff --git a/src/main/res/layout-w600dp/main_fragment.xml b/res/layout-w600dp/main_fragment.xml
index 0199d9b86..0199d9b86 100644
--- a/src/main/res/layout-w600dp/main_fragment.xml
+++ b/res/layout-w600dp/main_fragment.xml
diff --git a/src/main/res/layout-w600dp/user_dictionary_editor_abslistview.xml b/res/layout-w600dp/user_dictionary_editor_abslistview.xml
index 32ebc67bb..32ebc67bb 100644
--- a/src/main/res/layout-w600dp/user_dictionary_editor_abslistview.xml
+++ b/res/layout-w600dp/user_dictionary_editor_abslistview.xml
diff --git a/src/main/res/layout-w800dp/user_dictionary_editor_abslistview.xml b/res/layout-w800dp/user_dictionary_editor_abslistview.xml
index 003ed946a..003ed946a 100644
--- a/src/main/res/layout-w800dp/user_dictionary_editor_abslistview.xml
+++ b/res/layout-w800dp/user_dictionary_editor_abslistview.xml
diff --git a/src/main/res/layout/abbreviation_dictionary_word_row_edit.xml b/res/layout/abbreviation_dictionary_word_row_edit.xml
index 866bc7a2b..866bc7a2b 100644
--- a/src/main/res/layout/abbreviation_dictionary_word_row_edit.xml
+++ b/res/layout/abbreviation_dictionary_word_row_edit.xml
diff --git a/src/main/res/layout/about_anysoftkeyboard.xml b/res/layout/about_anysoftkeyboard.xml
index dfb4811cb..dfb4811cb 100644
--- a/src/main/res/layout/about_anysoftkeyboard.xml
+++ b/res/layout/about_anysoftkeyboard.xml
diff --git a/src/main/res/layout/about_app_pref.xml b/res/layout/about_app_pref.xml
index 1cac57b18..1cac57b18 100644
--- a/src/main/res/layout/about_app_pref.xml
+++ b/res/layout/about_app_pref.xml
diff --git a/src/main/res/layout/additional_software_licenses.xml b/res/layout/additional_software_licenses.xml
index dd3bad0b6..dd3bad0b6 100644
--- a/src/main/res/layout/additional_software_licenses.xml
+++ b/res/layout/additional_software_licenses.xml
diff --git a/src/main/res/layout/addon_checkbox_pref.xml b/res/layout/addon_checkbox_pref.xml
index d289ca5b1..d289ca5b1 100644
--- a/src/main/res/layout/addon_checkbox_pref.xml
+++ b/res/layout/addon_checkbox_pref.xml
diff --git a/src/main/res/layout/addon_list_item_pref.xml b/res/layout/addon_list_item_pref.xml
index 401261786..401261786 100644
--- a/src/main/res/layout/addon_list_item_pref.xml
+++ b/res/layout/addon_list_item_pref.xml
diff --git a/src/main/res/layout/addon_screenshot.xml b/res/layout/addon_screenshot.xml
index a0f07ab40..a0f07ab40 100644
--- a/src/main/res/layout/addon_screenshot.xml
+++ b/res/layout/addon_screenshot.xml
diff --git a/src/main/res/layout/addon_store_search_pref.xml b/res/layout/addon_store_search_pref.xml
index 83f96aa52..83f96aa52 100644
--- a/src/main/res/layout/addon_store_search_pref.xml
+++ b/res/layout/addon_store_search_pref.xml
diff --git a/src/main/res/layout/candidates.xml b/res/layout/candidates.xml
index fb5725a6d..fb5725a6d 100644
--- a/src/main/res/layout/candidates.xml
+++ b/res/layout/candidates.xml
diff --git a/src/main/res/layout/card_with_more_container.xml b/res/layout/card_with_more_container.xml
index a2cd3562b..a2cd3562b 100644
--- a/src/main/res/layout/card_with_more_container.xml
+++ b/res/layout/card_with_more_container.xml
diff --git a/src/main/res/layout/changelog.xml b/res/layout/changelog.xml
index f0ffd9c11..f0ffd9c11 100644
--- a/src/main/res/layout/changelog.xml
+++ b/res/layout/changelog.xml
diff --git a/src/main/res/layout/changelog_layout_102.xml b/res/layout/changelog_layout_102.xml
index 5b639b113..5b639b113 100644
--- a/src/main/res/layout/changelog_layout_102.xml
+++ b/res/layout/changelog_layout_102.xml
diff --git a/src/main/res/layout/changelog_layout_104.xml b/res/layout/changelog_layout_104.xml
index 2f32e6154..2f32e6154 100644
--- a/src/main/res/layout/changelog_layout_104.xml
+++ b/res/layout/changelog_layout_104.xml
diff --git a/src/main/res/layout/changelog_layout_105.xml b/res/layout/changelog_layout_105.xml
index 37897bccb..37897bccb 100644
--- a/src/main/res/layout/changelog_layout_105.xml
+++ b/res/layout/changelog_layout_105.xml
diff --git a/src/main/res/layout/changelog_layout_106.xml b/res/layout/changelog_layout_106.xml
index 4561a2d28..4561a2d28 100644
--- a/src/main/res/layout/changelog_layout_106.xml
+++ b/res/layout/changelog_layout_106.xml
diff --git a/src/main/res/layout/changelog_layout_108.xml b/res/layout/changelog_layout_108.xml
index 470c65e04..470c65e04 100644
--- a/src/main/res/layout/changelog_layout_108.xml
+++ b/res/layout/changelog_layout_108.xml
diff --git a/src/main/res/layout/changelog_layout_111.xml b/res/layout/changelog_layout_111.xml
index 672b41455..672b41455 100644
--- a/src/main/res/layout/changelog_layout_111.xml
+++ b/res/layout/changelog_layout_111.xml
diff --git a/src/main/res/layout/changelog_layout_114.xml b/res/layout/changelog_layout_114.xml
index 9fc7778ef..9fc7778ef 100644
--- a/src/main/res/layout/changelog_layout_114.xml
+++ b/res/layout/changelog_layout_114.xml
diff --git a/src/main/res/layout/changelog_layout_115.xml b/res/layout/changelog_layout_115.xml
index 30c024e08..30c024e08 100644
--- a/src/main/res/layout/changelog_layout_115.xml
+++ b/res/layout/changelog_layout_115.xml
diff --git a/src/main/res/layout/changelog_layout_117.xml b/res/layout/changelog_layout_117.xml
index fe10dafe7..fe10dafe7 100644
--- a/src/main/res/layout/changelog_layout_117.xml
+++ b/res/layout/changelog_layout_117.xml
diff --git a/src/main/res/layout/changelog_layout_119.xml b/res/layout/changelog_layout_119.xml
index 94576c6df..94576c6df 100644
--- a/src/main/res/layout/changelog_layout_119.xml
+++ b/res/layout/changelog_layout_119.xml
diff --git a/src/main/res/layout/changelog_layout_120.xml b/res/layout/changelog_layout_120.xml
index bc8bdfc01..bc8bdfc01 100644
--- a/src/main/res/layout/changelog_layout_120.xml
+++ b/res/layout/changelog_layout_120.xml
diff --git a/src/main/res/layout/changelog_layout_121.xml b/res/layout/changelog_layout_121.xml
index 8ab6ddb1c..8ab6ddb1c 100644
--- a/src/main/res/layout/changelog_layout_121.xml
+++ b/res/layout/changelog_layout_121.xml
diff --git a/src/main/res/layout/changelog_layout_122.xml b/res/layout/changelog_layout_122.xml
index a8d3605e4..a8d3605e4 100644
--- a/src/main/res/layout/changelog_layout_122.xml
+++ b/res/layout/changelog_layout_122.xml
diff --git a/src/main/res/layout/changelog_layout_123.xml b/res/layout/changelog_layout_123.xml
index 4242cd835..4242cd835 100644
--- a/src/main/res/layout/changelog_layout_123.xml
+++ b/res/layout/changelog_layout_123.xml
diff --git a/src/main/res/layout/changelogentry_header.xml b/res/layout/changelogentry_header.xml
index a4b38eaae..a4b38eaae 100644
--- a/src/main/res/layout/changelogentry_header.xml
+++ b/res/layout/changelogentry_header.xml
diff --git a/src/main/res/layout/developer_tools.xml b/res/layout/developer_tools.xml
index e3d2a1e2e..e3d2a1e2e 100644
--- a/src/main/res/layout/developer_tools.xml
+++ b/res/layout/developer_tools.xml
diff --git a/src/main/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index e468c061f..e468c061f 100644
--- a/src/main/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
diff --git a/src/main/res/layout/key_preview.xml b/res/layout/key_preview.xml
index 62c570b9c..62c570b9c 100644
--- a/src/main/res/layout/key_preview.xml
+++ b/res/layout/key_preview.xml
diff --git a/src/main/res/layout/keyboard_setup_wizard_layout.xml b/res/layout/keyboard_setup_wizard_layout.xml
index 06c04f481..06c04f481 100644
--- a/src/main/res/layout/keyboard_setup_wizard_layout.xml
+++ b/res/layout/keyboard_setup_wizard_layout.xml
diff --git a/src/main/res/layout/keyboard_setup_wizard_page_additional_settings_layout.xml b/res/layout/keyboard_setup_wizard_page_additional_settings_layout.xml
index eb9729bfb..eb9729bfb 100644
--- a/src/main/res/layout/keyboard_setup_wizard_page_additional_settings_layout.xml
+++ b/res/layout/keyboard_setup_wizard_page_additional_settings_layout.xml
diff --git a/src/main/res/layout/keyboard_setup_wizard_page_enable_layout.xml b/res/layout/keyboard_setup_wizard_page_enable_layout.xml
index b4f00137c..b4f00137c 100644
--- a/src/main/res/layout/keyboard_setup_wizard_page_enable_layout.xml
+++ b/res/layout/keyboard_setup_wizard_page_enable_layout.xml
diff --git a/src/main/res/layout/keyboard_setup_wizard_page_switch_to_layout.xml b/res/layout/keyboard_setup_wizard_page_switch_to_layout.xml
index 1bdf5b781..1bdf5b781 100644
--- a/src/main/res/layout/keyboard_setup_wizard_page_switch_to_layout.xml
+++ b/res/layout/keyboard_setup_wizard_page_switch_to_layout.xml
diff --git a/src/main/res/layout/keyboard_setup_wizard_previous_step_not_complete_layout.xml b/res/layout/keyboard_setup_wizard_previous_step_not_complete_layout.xml
index 951371432..951371432 100644
--- a/src/main/res/layout/keyboard_setup_wizard_previous_step_not_complete_layout.xml
+++ b/res/layout/keyboard_setup_wizard_previous_step_not_complete_layout.xml
diff --git a/src/main/res/layout/main_fragment.xml b/res/layout/main_fragment.xml
index fd3499311..fd3499311 100644
--- a/src/main/res/layout/main_fragment.xml
+++ b/res/layout/main_fragment.xml
diff --git a/src/main/res/layout/main_fragment_3_credits.xml b/res/layout/main_fragment_3_credits.xml
index 16a407741..16a407741 100644
--- a/src/main/res/layout/main_fragment_3_credits.xml
+++ b/res/layout/main_fragment_3_credits.xml
diff --git a/src/main/res/layout/main_fragment_not_configured_info_layout.xml b/res/layout/main_fragment_not_configured_info_layout.xml
index c22e3b3ac..c22e3b3ac 100644
--- a/src/main/res/layout/main_fragment_not_configured_info_layout.xml
+++ b/res/layout/main_fragment_not_configured_info_layout.xml
diff --git a/src/main/res/layout/main_fragment_top_info_layout.xml b/res/layout/main_fragment_top_info_layout.xml
index 6cf415824..6cf415824 100644
--- a/src/main/res/layout/main_fragment_top_info_layout.xml
+++ b/res/layout/main_fragment_top_info_layout.xml
diff --git a/src/main/res/layout/main_keyboard_layout.xml b/res/layout/main_keyboard_layout.xml
index 58bb019bf..58bb019bf 100644
--- a/src/main/res/layout/main_keyboard_layout.xml
+++ b/res/layout/main_keyboard_layout.xml
diff --git a/src/main/res/layout/main_ui.xml b/res/layout/main_ui.xml
index 9ef55cb69..9ef55cb69 100644
--- a/src/main/res/layout/main_ui.xml
+++ b/res/layout/main_ui.xml
diff --git a/src/main/res/layout/popup_keyboard_layout.xml b/res/layout/popup_keyboard_layout.xml
index b5b136782..b5b136782 100644
--- a/src/main/res/layout/popup_keyboard_layout.xml
+++ b/res/layout/popup_keyboard_layout.xml
diff --git a/src/main/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 25ca60dc3..25ca60dc3 100644
--- a/src/main/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
diff --git a/src/main/res/layout/progress_window.xml b/res/layout/progress_window.xml
index 69bcc74b6..69bcc74b6 100644
--- a/src/main/res/layout/progress_window.xml
+++ b/res/layout/progress_window.xml
diff --git a/src/main/res/layout/quick_text_key_menu_item.xml b/res/layout/quick_text_key_menu_item.xml
index 06e04c693..06e04c693 100644
--- a/src/main/res/layout/quick_text_key_menu_item.xml
+++ b/res/layout/quick_text_key_menu_item.xml
diff --git a/src/main/res/layout/quick_text_key_menu_item_with_icon.xml b/res/layout/quick_text_key_menu_item_with_icon.xml
index 8a75832e8..8a75832e8 100644
--- a/src/main/res/layout/quick_text_key_menu_item_with_icon.xml
+++ b/res/layout/quick_text_key_menu_item_with_icon.xml
diff --git a/src/main/res/layout/quick_text_key_menu_item_without_icon.xml b/res/layout/quick_text_key_menu_item_without_icon.xml
index ca2db0dee..ca2db0dee 100644
--- a/src/main/res/layout/quick_text_key_menu_item_without_icon.xml
+++ b/res/layout/quick_text_key_menu_item_without_icon.xml
diff --git a/src/main/res/layout/send_crash_log_ui.xml b/res/layout/send_crash_log_ui.xml
index 12ce64376..12ce64376 100644
--- a/src/main/res/layout/send_crash_log_ui.xml
+++ b/res/layout/send_crash_log_ui.xml
diff --git a/src/main/res/layout/side_menu_layout.xml b/res/layout/side_menu_layout.xml
index 2a5a079cc..2a5a079cc 100644
--- a/src/main/res/layout/side_menu_layout.xml
+++ b/res/layout/side_menu_layout.xml
diff --git a/src/main/res/layout/slide_pref.xml b/res/layout/slide_pref.xml
index 2e2512d22..2e2512d22 100644
--- a/src/main/res/layout/slide_pref.xml
+++ b/res/layout/slide_pref.xml
diff --git a/src/main/res/layout/switch_preference_layout.xml b/res/layout/switch_preference_layout.xml
index d86c86e6a..d86c86e6a 100644
--- a/src/main/res/layout/switch_preference_layout.xml
+++ b/res/layout/switch_preference_layout.xml
diff --git a/src/main/res/layout/testers_version.xml b/res/layout/testers_version.xml
index af9f48001..af9f48001 100644
--- a/src/main/res/layout/testers_version.xml
+++ b/res/layout/testers_version.xml
diff --git a/src/main/res/layout/tip_layout_1.xml b/res/layout/tip_layout_1.xml
index a0e1b5d0b..a0e1b5d0b 100644
--- a/src/main/res/layout/tip_layout_1.xml
+++ b/res/layout/tip_layout_1.xml
diff --git a/src/main/res/layout/tip_layout_2.xml b/res/layout/tip_layout_2.xml
index 526cb0ffb..526cb0ffb 100644
--- a/src/main/res/layout/tip_layout_2.xml
+++ b/res/layout/tip_layout_2.xml
diff --git a/src/main/res/layout/tip_layout_3.xml b/res/layout/tip_layout_3.xml
index eeba677f3..eeba677f3 100644
--- a/src/main/res/layout/tip_layout_3.xml
+++ b/res/layout/tip_layout_3.xml
diff --git a/src/main/res/layout/tip_layout_4.xml b/res/layout/tip_layout_4.xml
index 85b22b7da..85b22b7da 100644
--- a/src/main/res/layout/tip_layout_4.xml
+++ b/res/layout/tip_layout_4.xml
diff --git a/src/main/res/layout/tip_layout_5.xml b/res/layout/tip_layout_5.xml
index 30b28124d..30b28124d 100644
--- a/src/main/res/layout/tip_layout_5.xml
+++ b/res/layout/tip_layout_5.xml
diff --git a/src/main/res/layout/tip_layout_6.xml b/res/layout/tip_layout_6.xml
index 01da30835..01da30835 100644
--- a/src/main/res/layout/tip_layout_6.xml
+++ b/res/layout/tip_layout_6.xml
diff --git a/src/main/res/layout/tip_layout_7.xml b/res/layout/tip_layout_7.xml
index a5b9940bc..a5b9940bc 100644
--- a/src/main/res/layout/tip_layout_7.xml
+++ b/res/layout/tip_layout_7.xml
diff --git a/src/main/res/layout/tip_layout_8.xml b/res/layout/tip_layout_8.xml
index 9c0ee46c0..9c0ee46c0 100644
--- a/src/main/res/layout/tip_layout_8.xml
+++ b/res/layout/tip_layout_8.xml
diff --git a/src/main/res/layout/tip_layout_9.xml b/res/layout/tip_layout_9.xml
index b8aa3afdb..b8aa3afdb 100644
--- a/src/main/res/layout/tip_layout_9.xml
+++ b/res/layout/tip_layout_9.xml
diff --git a/src/main/res/layout/tip_scroll_container.xml b/res/layout/tip_scroll_container.xml
index af582f94d..af582f94d 100644
--- a/src/main/res/layout/tip_scroll_container.xml
+++ b/res/layout/tip_scroll_container.xml
diff --git a/src/main/res/layout/tips_layout.xml b/res/layout/tips_layout.xml
index b4236441a..b4236441a 100644
--- a/src/main/res/layout/tips_layout.xml
+++ b/res/layout/tips_layout.xml
diff --git a/src/main/res/layout/toggle_view.xml b/res/layout/toggle_view.xml
index 7d408285c..7d408285c 100644
--- a/src/main/res/layout/toggle_view.xml
+++ b/res/layout/toggle_view.xml
diff --git a/src/main/res/layout/transparent_divider.xml b/res/layout/transparent_divider.xml
index 31049aa7e..31049aa7e 100644
--- a/src/main/res/layout/transparent_divider.xml
+++ b/res/layout/transparent_divider.xml
diff --git a/src/main/res/layout/tutorial_menu_closing.xml b/res/layout/tutorial_menu_closing.xml
index 16a84838e..16a84838e 100644
--- a/src/main/res/layout/tutorial_menu_closing.xml
+++ b/res/layout/tutorial_menu_closing.xml
diff --git a/src/main/res/layout/tutorial_menu_opening.xml b/res/layout/tutorial_menu_opening.xml
index d353ebca1..d353ebca1 100644
--- a/src/main/res/layout/tutorial_menu_opening.xml
+++ b/res/layout/tutorial_menu_opening.xml
diff --git a/src/main/res/layout/user_dictionary_editor.xml b/res/layout/user_dictionary_editor.xml
index e1e94b5dd..e1e94b5dd 100644
--- a/src/main/res/layout/user_dictionary_editor.xml
+++ b/res/layout/user_dictionary_editor.xml
diff --git a/src/main/res/layout/user_dictionary_editor_abslistview.xml b/res/layout/user_dictionary_editor_abslistview.xml
index 7c28ed09a..7c28ed09a 100644
--- a/src/main/res/layout/user_dictionary_editor_abslistview.xml
+++ b/res/layout/user_dictionary_editor_abslistview.xml
diff --git a/src/main/res/layout/user_dictionary_word_row.xml b/res/layout/user_dictionary_word_row.xml
index eb01fbf54..eb01fbf54 100644
--- a/src/main/res/layout/user_dictionary_word_row.xml
+++ b/res/layout/user_dictionary_word_row.xml
diff --git a/src/main/res/layout/user_dictionary_word_row_add.xml b/res/layout/user_dictionary_word_row_add.xml
index 8728e439d..8728e439d 100644
--- a/src/main/res/layout/user_dictionary_word_row_add.xml
+++ b/res/layout/user_dictionary_word_row_add.xml
diff --git a/src/main/res/layout/user_dictionary_word_row_edit.xml b/res/layout/user_dictionary_word_row_edit.xml
index 91c7eb626..91c7eb626 100644
--- a/src/main/res/layout/user_dictionary_word_row_edit.xml
+++ b/res/layout/user_dictionary_word_row_edit.xml
diff --git a/src/main/res/layout/voice_input_not_installed.xml b/res/layout/voice_input_not_installed.xml
index 0c235e9f7..0c235e9f7 100644
--- a/src/main/res/layout/voice_input_not_installed.xml
+++ b/res/layout/voice_input_not_installed.xml
diff --git a/src/main/res/layout/welcome_howto.xml b/res/layout/welcome_howto.xml
index 0b117db06..0b117db06 100644
--- a/src/main/res/layout/welcome_howto.xml
+++ b/res/layout/welcome_howto.xml
diff --git a/src/main/res/layout/words_editor_actionbar_view.xml b/res/layout/words_editor_actionbar_view.xml
index a46765f46..a46765f46 100644
--- a/src/main/res/layout/words_editor_actionbar_view.xml
+++ b/res/layout/words_editor_actionbar_view.xml
diff --git a/src/main/res/menu/words_editor_menu_actions.xml b/res/menu/words_editor_menu_actions.xml
index 2c7d4849d..2c7d4849d 100644
--- a/src/main/res/menu/words_editor_menu_actions.xml
+++ b/res/menu/words_editor_menu_actions.xml
diff --git a/src/main/res/raw/words_1.dict b/res/raw/words_1.dict
index 60a1186c1..60a1186c1 100644
--- a/src/main/res/raw/words_1.dict
+++ b/res/raw/words_1.dict
diff --git a/src/main/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 14bb45bd5..14bb45bd5 100755
--- a/src/main/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
diff --git a/src/main/res/values-be/strings.xml b/res/values-be/strings.xml
index 20cf2e342..20cf2e342 100644
--- a/src/main/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
diff --git a/src/main/res/values-bg/strings.xml b/res/values-bg/strings.xml
index caa221c5b..caa221c5b 100755
--- a/src/main/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
diff --git a/src/main/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 62fe93173..62fe93173 100755
--- a/src/main/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
diff --git a/src/main/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 76aabf5c0..76aabf5c0 100755
--- a/src/main/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
diff --git a/src/main/res/values-da/strings.xml b/res/values-da/strings.xml
index e79ebcaee..e79ebcaee 100755
--- a/src/main/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
diff --git a/src/main/res/values-de/currency_data.xml b/res/values-de/currency_data.xml
index da00224e5..da00224e5 100644
--- a/src/main/res/values-de/currency_data.xml
+++ b/res/values-de/currency_data.xml
diff --git a/src/main/res/values-de/strings.xml b/res/values-de/strings.xml
index 75c6e0bcf..75c6e0bcf 100755
--- a/src/main/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
diff --git a/src/main/res/values-el/currency_data.xml b/res/values-el/currency_data.xml
index da00224e5..da00224e5 100644
--- a/src/main/res/values-el/currency_data.xml
+++ b/res/values-el/currency_data.xml
diff --git a/src/main/res/values-el/strings.xml b/res/values-el/strings.xml
index 563b5e08c..563b5e08c 100755
--- a/src/main/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
diff --git a/src/main/res/values-eo/strings.xml b/res/values-eo/strings.xml
index f2da07465..f2da07465 100644
--- a/src/main/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
diff --git a/src/main/res/values-es/strings.xml b/res/values-es/strings.xml
index 532dc31ac..532dc31ac 100755
--- a/src/main/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
diff --git a/src/main/res/values-fi/currency_data.xml b/res/values-fi/currency_data.xml
index da00224e5..da00224e5 100644
--- a/src/main/res/values-fi/currency_data.xml
+++ b/res/values-fi/currency_data.xml
diff --git a/src/main/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bb46d16f9..bb46d16f9 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
diff --git a/src/main/res/values-fr/currency_data.xml b/res/values-fr/currency_data.xml
index da00224e5..da00224e5 100644
--- a/src/main/res/values-fr/currency_data.xml
+++ b/res/values-fr/currency_data.xml
diff --git a/src/main/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5b4557ca8..5b4557ca8 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
diff --git a/src/main/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 23e0ee18e..23e0ee18e 100755
--- a/src/main/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
diff --git a/src/main/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 110750bae..110750bae 100644
--- a/src/main/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
diff --git a/src/main/res/values-in/currency_data.xml b/res/values-in/currency_data.xml
index e29c7d727..e29c7d727 100644
--- a/src/main/res/values-in/currency_data.xml
+++ b/res/values-in/currency_data.xml
diff --git a/src/main/res/values-it/strings.xml b/res/values-it/strings.xml
index d51028293..d51028293 100755
--- a/src/main/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
diff --git a/src/main/res/values-iw/currency_data.xml b/res/values-iw/currency_data.xml
index d554fb2bd..d554fb2bd 100644
--- a/src/main/res/values-iw/currency_data.xml
+++ b/res/values-iw/currency_data.xml
diff --git a/src/main/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3185f9a61..3185f9a61 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
diff --git a/src/main/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b39128a08..b39128a08 100644
--- a/src/main/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
diff --git a/src/main/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 9daedd8a4..9daedd8a4 100755
--- a/src/main/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
diff --git a/src/main/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 6e8a43943..6e8a43943 100644
--- a/src/main/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
diff --git a/src/main/res/values-land/settings_defaults.xml b/res/values-land/settings_defaults.xml
index 5e6b15b51..5e6b15b51 100644
--- a/src/main/res/values-land/settings_defaults.xml
+++ b/res/values-land/settings_defaults.xml
diff --git a/src/main/res/values-large-land/dimens.xml b/res/values-large-land/dimens.xml
index 282211c64..282211c64 100644
--- a/src/main/res/values-large-land/dimens.xml
+++ b/res/values-large-land/dimens.xml
diff --git a/src/main/res/values-large-land/settings_defaults.xml b/res/values-large-land/settings_defaults.xml
index 5e6b15b51..5e6b15b51 100644
--- a/src/main/res/values-large-land/settings_defaults.xml
+++ b/res/values-large-land/settings_defaults.xml
diff --git a/src/main/res/values-large/dimens.xml b/res/values-large/dimens.xml
index f41b02a6f..f41b02a6f 100644
--- a/src/main/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
diff --git a/src/main/res/values-large/settings_defaults.xml b/res/values-large/settings_defaults.xml
index 84f4128ac..84f4128ac 100644
--- a/src/main/res/values-large/settings_defaults.xml
+++ b/res/values-large/settings_defaults.xml
diff --git a/src/main/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cb691bfc5..cb691bfc5 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
diff --git a/src/main/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 9fb554bf8..9fb554bf8 100755
--- a/src/main/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
diff --git a/src/main/res/values-my/strings.xml b/res/values-my/strings.xml
index fd2987d05..fd2987d05 100755
--- a/src/main/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
diff --git a/src/main/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c2ac5a967..c2ac5a967 100755
--- a/src/main/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
diff --git a/src/main/res/values-no/strings.xml b/res/values-no/strings.xml
index 7414c385c..7414c385c 100755
--- a/src/main/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
diff --git a/src/main/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bf40a418a..bf40a418a 100755
--- a/src/main/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
diff --git a/src/main/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index caa80d0c7..caa80d0c7 100755
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
diff --git a/src/main/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 73e3a006d..73e3a006d 100755
--- a/src/main/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
diff --git a/src/main/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4c56cba0e..4c56cba0e 100755
--- a/src/main/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
diff --git a/src/main/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e95ac0702..e95ac0702 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
diff --git a/src/main/res/values-se/strings.xml b/res/values-se/strings.xml
index 11a75e358..11a75e358 100644
--- a/src/main/res/values-se/strings.xml
+++ b/res/values-se/strings.xml
diff --git a/src/main/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d689fe7fe..d689fe7fe 100755
--- a/src/main/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
diff --git a/src/main/res/values-sl/strings.xml b/res/values-sl/strings.xml
index af95a9637..af95a9637 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
diff --git a/src/main/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 9afd04bb9..9afd04bb9 100644
--- a/src/main/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
diff --git a/src/main/res/values-sw600dp/strings_dont_translate.xml b/res/values-sw600dp/strings_dont_translate.xml
index ece24bbe4..ece24bbe4 100644
--- a/src/main/res/values-sw600dp/strings_dont_translate.xml
+++ b/res/values-sw600dp/strings_dont_translate.xml
diff --git a/src/main/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3397a482d..3397a482d 100644
--- a/src/main/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
diff --git a/src/main/res/values-th/strings.xml b/res/values-th/strings.xml
index 4d9f3c8ff..4d9f3c8ff 100644
--- a/src/main/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
diff --git a/src/main/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f4f784f9f..f4f784f9f 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
diff --git a/src/main/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3eb384546..3eb384546 100755
--- a/src/main/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
diff --git a/src/main/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 95dd1cec6..95dd1cec6 100755
--- a/src/main/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
diff --git a/src/main/res/values-v11/frankenrobot.xml b/res/values-v11/frankenrobot.xml
index c831eb5e8..c831eb5e8 100644
--- a/src/main/res/values-v11/frankenrobot.xml
+++ b/res/values-v11/frankenrobot.xml
diff --git a/src/main/res/values-v11/settings_defaults_dont_translate.xml b/res/values-v11/settings_defaults_dont_translate.xml
index 5eeaa1050..5eeaa1050 100644
--- a/src/main/res/values-v11/settings_defaults_dont_translate.xml
+++ b/res/values-v11/settings_defaults_dont_translate.xml
diff --git a/src/main/res/values-v16/frankenrobot.xml b/res/values-v16/frankenrobot.xml
index bb97a5124..bb97a5124 100644
--- a/src/main/res/values-v16/frankenrobot.xml
+++ b/res/values-v16/frankenrobot.xml
diff --git a/src/main/res/values-v19/frankenrobot.xml b/res/values-v19/frankenrobot.xml
index 5665eb8e5..5665eb8e5 100644
--- a/src/main/res/values-v19/frankenrobot.xml
+++ b/res/values-v19/frankenrobot.xml
diff --git a/src/main/res/values-v7/frankenrobot.xml b/res/values-v7/frankenrobot.xml
index 179c80dc7..179c80dc7 100644
--- a/src/main/res/values-v7/frankenrobot.xml
+++ b/res/values-v7/frankenrobot.xml
diff --git a/src/main/res/values-v8/frankenrobot.xml b/res/values-v8/frankenrobot.xml
index 69f316aed..69f316aed 100644
--- a/src/main/res/values-v8/frankenrobot.xml
+++ b/res/values-v8/frankenrobot.xml
diff --git a/src/main/res/values-v8/settings_defaults_dont_translate.xml b/res/values-v8/settings_defaults_dont_translate.xml
index c39a452e5..c39a452e5 100644
--- a/src/main/res/values-v8/settings_defaults_dont_translate.xml
+++ b/res/values-v8/settings_defaults_dont_translate.xml
diff --git a/src/main/res/values-xlarge-land/dimens.xml b/res/values-xlarge-land/dimens.xml
index f61a01e51..f61a01e51 100644
--- a/src/main/res/values-xlarge-land/dimens.xml
+++ b/res/values-xlarge-land/dimens.xml
diff --git a/src/main/res/values-xlarge-land/settings_defaults.xml b/res/values-xlarge-land/settings_defaults.xml
index 44e290bad..44e290bad 100644
--- a/src/main/res/values-xlarge-land/settings_defaults.xml
+++ b/res/values-xlarge-land/settings_defaults.xml
diff --git a/src/main/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index f12cafacd..f12cafacd 100644
--- a/src/main/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
diff --git a/src/main/res/values-xlarge/settings_defaults.xml b/res/values-xlarge/settings_defaults.xml
index 583b7a03a..583b7a03a 100644
--- a/src/main/res/values-xlarge/settings_defaults.xml
+++ b/res/values-xlarge/settings_defaults.xml
diff --git a/src/main/res/values/animation_duration.xml b/res/values/animation_duration.xml
index ce0128902..ce0128902 100644
--- a/src/main/res/values/animation_duration.xml
+++ b/res/values/animation_duration.xml
diff --git a/src/main/res/values/arrays.xml b/res/values/arrays.xml
index 697cecc12..697cecc12 100644
--- a/src/main/res/values/arrays.xml
+++ b/res/values/arrays.xml
diff --git a/src/main/res/values/attrs.xml b/res/values/attrs.xml
index 99cedba1d..99cedba1d 100644
--- a/src/main/res/values/attrs.xml
+++ b/res/values/attrs.xml
diff --git a/src/main/res/values/colors.xml b/res/values/colors.xml
index ac7f2ac83..ac7f2ac83 100644
--- a/src/main/res/values/colors.xml
+++ b/res/values/colors.xml
diff --git a/src/main/res/values/currency_data.xml b/res/values/currency_data.xml
index 0abea1e73..0abea1e73 100644
--- a/src/main/res/values/currency_data.xml
+++ b/res/values/currency_data.xml
diff --git a/src/main/res/values/dimens.xml b/res/values/dimens.xml
index 259c201eb..259c201eb 100644
--- a/src/main/res/values/dimens.xml
+++ b/res/values/dimens.xml
diff --git a/src/main/res/values/frankenrobot.xml b/res/values/frankenrobot.xml
index 633a7c14d..633a7c14d 100644
--- a/src/main/res/values/frankenrobot.xml
+++ b/res/values/frankenrobot.xml
diff --git a/src/main/res/values/ids.xml b/res/values/ids.xml
index 5a2f6612f..5a2f6612f 100644
--- a/src/main/res/values/ids.xml
+++ b/res/values/ids.xml
diff --git a/src/main/res/values/legal_strings_dont_translate.xml b/res/values/legal_strings_dont_translate.xml
index 7683f1bb8..7683f1bb8 100644
--- a/src/main/res/values/legal_strings_dont_translate.xml
+++ b/res/values/legal_strings_dont_translate.xml
diff --git a/src/main/res/values/settings_defaults_dont_translate.xml b/res/values/settings_defaults_dont_translate.xml
index 8b73b85a8..8b73b85a8 100644
--- a/src/main/res/values/settings_defaults_dont_translate.xml
+++ b/res/values/settings_defaults_dont_translate.xml
diff --git a/src/main/res/values/settings_keys_dont_translate.xml b/res/values/settings_keys_dont_translate.xml
index bcaf44529..bcaf44529 100644
--- a/src/main/res/values/settings_keys_dont_translate.xml
+++ b/res/values/settings_keys_dont_translate.xml
diff --git a/src/main/res/values/strings.xml b/res/values/strings.xml
index 95625d8b2..95625d8b2 100644
--- a/src/main/res/values/strings.xml
+++ b/res/values/strings.xml
diff --git a/src/main/res/values/strings_dont_translate.xml b/res/values/strings_dont_translate.xml
index 6d7db8fb1..6d7db8fb1 100644
--- a/src/main/res/values/strings_dont_translate.xml
+++ b/res/values/strings_dont_translate.xml
diff --git a/src/main/res/values/styles.xml b/res/values/styles.xml
index 06348960e..06348960e 100644
--- a/src/main/res/values/styles.xml
+++ b/res/values/styles.xml
diff --git a/src/main/res/values/words_dict_array.xml b/res/values/words_dict_array.xml
index 8a92b6a6a..8a92b6a6a 100644
--- a/src/main/res/values/words_dict_array.xml
+++ b/res/values/words_dict_array.xml
diff --git a/src/main/res/xml-ar/ext_kbd_bottom_row_regular.xml b/res/xml-ar/ext_kbd_bottom_row_regular.xml
index 54dc6e927..54dc6e927 100644
--- a/src/main/res/xml-ar/ext_kbd_bottom_row_regular.xml
+++ b/res/xml-ar/ext_kbd_bottom_row_regular.xml
diff --git a/src/main/res/xml-bg/popup_domains.xml b/res/xml-bg/popup_domains.xml
index b77c441bc..b77c441bc 100644
--- a/src/main/res/xml-bg/popup_domains.xml
+++ b/res/xml-bg/popup_domains.xml
diff --git a/src/main/res/xml-ca/popup_domains.xml b/res/xml-ca/popup_domains.xml
index 961f96cbc..961f96cbc 100644
--- a/src/main/res/xml-ca/popup_domains.xml
+++ b/res/xml-ca/popup_domains.xml
diff --git a/src/main/res/xml-cs/popup_domains.xml b/res/xml-cs/popup_domains.xml
index d2b9efe71..d2b9efe71 100644
--- a/src/main/res/xml-cs/popup_domains.xml
+++ b/res/xml-cs/popup_domains.xml
diff --git a/src/main/res/xml-de/simple_numbers.xml b/res/xml-de/simple_numbers.xml
index 75fb01178..75fb01178 100644
--- a/src/main/res/xml-de/simple_numbers.xml
+++ b/res/xml-de/simple_numbers.xml
diff --git a/src/main/res/xml-fi/popup_domains.xml b/res/xml-fi/popup_domains.xml
index 8a236249c..8a236249c 100644
--- a/src/main/res/xml-fi/popup_domains.xml
+++ b/res/xml-fi/popup_domains.xml
diff --git a/src/main/res/xml-iw/popup_domains.xml b/res/xml-iw/popup_domains.xml
index 490b2edd4..490b2edd4 100644
--- a/src/main/res/xml-iw/popup_domains.xml
+++ b/res/xml-iw/popup_domains.xml
diff --git a/src/main/res/xml-land/ext_kbd_bottom_row_regular.xml b/res/xml-land/ext_kbd_bottom_row_regular.xml
index 9c39cde6f..9c39cde6f 100644
--- a/src/main/res/xml-land/ext_kbd_bottom_row_regular.xml
+++ b/res/xml-land/ext_kbd_bottom_row_regular.xml
diff --git a/src/main/res/xml-pt/popup_domains.xml b/res/xml-pt/popup_domains.xml
index ba7958e8f..ba7958e8f 100644
--- a/src/main/res/xml-pt/popup_domains.xml
+++ b/res/xml-pt/popup_domains.xml
diff --git a/src/main/res/xml-ru/popup_domains.xml b/res/xml-ru/popup_domains.xml
index 162c95439..162c95439 100644
--- a/src/main/res/xml-ru/popup_domains.xml
+++ b/res/xml-ru/popup_domains.xml
diff --git a/src/main/res/xml-se/popup_domains.xml b/res/xml-se/popup_domains.xml
index bf91250a9..bf91250a9 100644
--- a/src/main/res/xml-se/popup_domains.xml
+++ b/res/xml-se/popup_domains.xml
diff --git a/src/main/res/xml-sw600dp/simple_alt_numbers.xml b/res/xml-sw600dp/simple_alt_numbers.xml
index 1d8505d60..1d8505d60 100644
--- a/src/main/res/xml-sw600dp/simple_alt_numbers.xml
+++ b/res/xml-sw600dp/simple_alt_numbers.xml
diff --git a/src/main/res/xml-sw600dp/simple_datetime.xml b/res/xml-sw600dp/simple_datetime.xml
index ac8e9ac63..ac8e9ac63 100644
--- a/src/main/res/xml-sw600dp/simple_datetime.xml
+++ b/res/xml-sw600dp/simple_datetime.xml
diff --git a/src/main/res/xml-sw600dp/simple_numbers.xml b/res/xml-sw600dp/simple_numbers.xml
index 0f291ab3e..0f291ab3e 100644
--- a/src/main/res/xml-sw600dp/simple_numbers.xml
+++ b/res/xml-sw600dp/simple_numbers.xml
diff --git a/src/main/res/xml-sw600dp/simple_phone.xml b/res/xml-sw600dp/simple_phone.xml
index bb69890c5..bb69890c5 100644
--- a/src/main/res/xml-sw600dp/simple_phone.xml
+++ b/res/xml-sw600dp/simple_phone.xml
diff --git a/src/main/res/xml/dictionaries.xml b/res/xml/dictionaries.xml
index ddd970541..ddd970541 100644
--- a/src/main/res/xml/dictionaries.xml
+++ b/res/xml/dictionaries.xml
diff --git a/src/main/res/xml/en_autotext.xml b/res/xml/en_autotext.xml
index 4c02a00a8..4c02a00a8 100644
--- a/src/main/res/xml/en_autotext.xml
+++ b/res/xml/en_autotext.xml
diff --git a/src/main/res/xml/eng_16keys.xml b/res/xml/eng_16keys.xml
index bb0e2863d..bb0e2863d 100644
--- a/src/main/res/xml/eng_16keys.xml
+++ b/res/xml/eng_16keys.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_alt.xml b/res/xml/ext_kbd_bottom_row_alt.xml
index 6acf500c2..6acf500c2 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_alt.xml
+++ b/res/xml/ext_kbd_bottom_row_alt.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_alt_with_mic.xml b/res/xml/ext_kbd_bottom_row_alt_with_mic.xml
index 6796b03fc..6796b03fc 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_alt_with_mic.xml
+++ b/res/xml/ext_kbd_bottom_row_alt_with_mic.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_iphone.xml b/res/xml/ext_kbd_bottom_row_iphone.xml
index ef5bdccee..ef5bdccee 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_iphone.xml
+++ b/res/xml/ext_kbd_bottom_row_iphone.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_iphone_with_mic.xml b/res/xml/ext_kbd_bottom_row_iphone_with_mic.xml
index 4b1b5ad42..4b1b5ad42 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_iphone_with_mic.xml
+++ b/res/xml/ext_kbd_bottom_row_iphone_with_mic.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_ng.xml b/res/xml/ext_kbd_bottom_row_ng.xml
index 4e7ecd571..4e7ecd571 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_ng.xml
+++ b/res/xml/ext_kbd_bottom_row_ng.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_regular.xml b/res/xml/ext_kbd_bottom_row_regular.xml
index a92aa9e25..a92aa9e25 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_regular.xml
+++ b/res/xml/ext_kbd_bottom_row_regular.xml
diff --git a/src/main/res/xml/ext_kbd_bottom_row_regular_with_voice.xml b/res/xml/ext_kbd_bottom_row_regular_with_voice.xml
index 6ae555d0b..6ae555d0b 100644
--- a/src/main/res/xml/ext_kbd_bottom_row_regular_with_voice.xml
+++ b/res/xml/ext_kbd_bottom_row_regular_with_voice.xml
diff --git a/src/main/res/xml/ext_kbd_ext_keyboard_numbers_symbols.xml b/res/xml/ext_kbd_ext_keyboard_numbers_symbols.xml
index 874639726..874639726 100644
--- a/src/main/res/xml/ext_kbd_ext_keyboard_numbers_symbols.xml
+++ b/res/xml/ext_kbd_ext_keyboard_numbers_symbols.xml
diff --git a/src/main/res/xml/ext_kbd_top_row_nav.xml b/res/xml/ext_kbd_top_row_nav.xml
index 05649349c..05649349c 100644
--- a/src/main/res/xml/ext_kbd_top_row_nav.xml
+++ b/res/xml/ext_kbd_top_row_nav.xml
diff --git a/src/main/res/xml/ext_kbd_top_row_normal.xml b/res/xml/ext_kbd_top_row_normal.xml
index d06463df8..d06463df8 100644
--- a/src/main/res/xml/ext_kbd_top_row_normal.xml
+++ b/res/xml/ext_kbd_top_row_normal.xml
diff --git a/src/main/res/xml/ext_kbd_top_row_numbers.xml b/res/xml/ext_kbd_top_row_numbers.xml
index 91f000f20..91f000f20 100644
--- a/src/main/res/xml/ext_kbd_top_row_numbers.xml
+++ b/res/xml/ext_kbd_top_row_numbers.xml
diff --git a/src/main/res/xml/ext_kbd_top_row_numbers_alt.xml b/res/xml/ext_kbd_top_row_numbers_alt.xml
index 8db12541f..8db12541f 100644
--- a/src/main/res/xml/ext_kbd_top_row_numbers_alt.xml
+++ b/res/xml/ext_kbd_top_row_numbers_alt.xml
diff --git a/src/main/res/xml/ext_kbd_top_row_small.xml b/res/xml/ext_kbd_top_row_small.xml
index ce6c0e3bc..ce6c0e3bc 100644
--- a/src/main/res/xml/ext_kbd_top_row_small.xml
+++ b/res/xml/ext_kbd_top_row_small.xml
diff --git a/src/main/res/xml/ext_kbd_utility_utility.xml b/res/xml/ext_kbd_utility_utility.xml
index d7281cb36..d7281cb36 100644
--- a/src/main/res/xml/ext_kbd_utility_utility.xml
+++ b/res/xml/ext_kbd_utility_utility.xml
diff --git a/src/main/res/xml/extension_keyboards.xml b/res/xml/extension_keyboards.xml
index fad23189b..fad23189b 100644
--- a/src/main/res/xml/extension_keyboards.xml
+++ b/res/xml/extension_keyboards.xml
diff --git a/src/main/res/xml/keyboard_themes.xml b/res/xml/keyboard_themes.xml
index d2fc52dd0..d2fc52dd0 100644
--- a/src/main/res/xml/keyboard_themes.xml
+++ b/res/xml/keyboard_themes.xml
diff --git a/src/main/res/xml/keyboards.xml b/res/xml/keyboards.xml
index 9cf8b4396..9cf8b4396 100644
--- a/src/main/res/xml/keyboards.xml
+++ b/res/xml/keyboards.xml
diff --git a/src/main/res/xml/method.xml b/res/xml/method.xml
index 6d41ceba6..6d41ceba6 100644
--- a/src/main/res/xml/method.xml
+++ b/res/xml/method.xml
diff --git a/src/instrumentTest/res/xml/physical.xml b/res/xml/physical.xml
index 9e446b637..9e446b637 100644
--- a/src/instrumentTest/res/xml/physical.xml
+++ b/res/xml/physical.xml
diff --git a/src/main/res/xml/popup_16keys_abc.xml b/res/xml/popup_16keys_abc.xml
index 3c94e96aa..3c94e96aa 100644
--- a/src/main/res/xml/popup_16keys_abc.xml
+++ b/res/xml/popup_16keys_abc.xml
diff --git a/src/main/res/xml/popup_16keys_def.xml b/res/xml/popup_16keys_def.xml
index 16b426964..16b426964 100644
--- a/src/main/res/xml/popup_16keys_def.xml
+++ b/res/xml/popup_16keys_def.xml
diff --git a/src/main/res/xml/popup_16keys_ghi.xml b/res/xml/popup_16keys_ghi.xml
index 1a5250a0f..1a5250a0f 100644
--- a/src/main/res/xml/popup_16keys_ghi.xml
+++ b/res/xml/popup_16keys_ghi.xml
diff --git a/src/main/res/xml/popup_16keys_jkl.xml b/res/xml/popup_16keys_jkl.xml
index 3e6770541..3e6770541 100644
--- a/src/main/res/xml/popup_16keys_jkl.xml
+++ b/res/xml/popup_16keys_jkl.xml
diff --git a/src/main/res/xml/popup_16keys_mno.xml b/res/xml/popup_16keys_mno.xml
index 29626230e..29626230e 100644
--- a/src/main/res/xml/popup_16keys_mno.xml
+++ b/res/xml/popup_16keys_mno.xml
diff --git a/src/main/res/xml/popup_16keys_pqrs.xml b/res/xml/popup_16keys_pqrs.xml
index 508a8101f..508a8101f 100644
--- a/src/main/res/xml/popup_16keys_pqrs.xml
+++ b/res/xml/popup_16keys_pqrs.xml
diff --git a/src/main/res/xml/popup_16keys_tuv.xml b/res/xml/popup_16keys_tuv.xml
index 95cbecfd9..95cbecfd9 100644
--- a/src/main/res/xml/popup_16keys_tuv.xml
+++ b/res/xml/popup_16keys_tuv.xml
diff --git a/src/main/res/xml/popup_16keys_wxyz.xml b/res/xml/popup_16keys_wxyz.xml
index 8eedb8137..8eedb8137 100644
--- a/src/main/res/xml/popup_16keys_wxyz.xml
+++ b/res/xml/popup_16keys_wxyz.xml
diff --git a/src/main/res/xml/popup_default_quick_text.xml b/res/xml/popup_default_quick_text.xml
index f2394705a..f2394705a 100644
--- a/src/main/res/xml/popup_default_quick_text.xml
+++ b/res/xml/popup_default_quick_text.xml
diff --git a/src/main/res/xml/popup_domains.xml b/res/xml/popup_domains.xml
index 14e3139f3..14e3139f3 100644
--- a/src/main/res/xml/popup_domains.xml
+++ b/res/xml/popup_domains.xml
diff --git a/src/main/res/xml/popup_one_row.xml b/res/xml/popup_one_row.xml
index 1e141fcd1..1e141fcd1 100644
--- a/src/main/res/xml/popup_one_row.xml
+++ b/res/xml/popup_one_row.xml
diff --git a/src/main/res/xml/popup_punctuation.xml b/res/xml/popup_punctuation.xml
index d2da61358..d2da61358 100644
--- a/src/main/res/xml/popup_punctuation.xml
+++ b/res/xml/popup_punctuation.xml
diff --git a/src/main/res/xml/popup_smileys.xml b/res/xml/popup_smileys.xml
index a1710d7bc..a1710d7bc 100644
--- a/src/main/res/xml/popup_smileys.xml
+++ b/res/xml/popup_smileys.xml
diff --git a/src/main/res/xml/popup_three_rows.xml b/res/xml/popup_three_rows.xml
index 9b3a629d9..9b3a629d9 100644
--- a/src/main/res/xml/popup_three_rows.xml
+++ b/res/xml/popup_three_rows.xml
diff --git a/src/main/res/xml/popup_two_rows.xml b/res/xml/popup_two_rows.xml
index 46598e207..46598e207 100644
--- a/src/main/res/xml/popup_two_rows.xml
+++ b/res/xml/popup_two_rows.xml
diff --git a/src/main/res/xml/prefs.xml b/res/xml/prefs.xml
index ebb701dee..ebb701dee 100644
--- a/src/main/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
diff --git a/src/main/res/xml/prefs_addon_keyboard_theme_selector.xml b/res/xml/prefs_addon_keyboard_theme_selector.xml
index f12f75d5a..f12f75d5a 100644
--- a/src/main/res/xml/prefs_addon_keyboard_theme_selector.xml
+++ b/res/xml/prefs_addon_keyboard_theme_selector.xml
diff --git a/src/main/res/xml/prefs_addtional_language_prefs.xml b/res/xml/prefs_addtional_language_prefs.xml
index 302d33e38..302d33e38 100644
--- a/src/main/res/xml/prefs_addtional_language_prefs.xml
+++ b/res/xml/prefs_addtional_language_prefs.xml
diff --git a/src/main/res/xml/prefs_addtional_ui_addons_prefs.xml b/res/xml/prefs_addtional_ui_addons_prefs.xml
index 76ad0b395..76ad0b395 100644
--- a/src/main/res/xml/prefs_addtional_ui_addons_prefs.xml
+++ b/res/xml/prefs_addtional_ui_addons_prefs.xml
diff --git a/src/main/res/xml/prefs_bottom_row_addons.xml b/res/xml/prefs_bottom_row_addons.xml
index 8cbfa4864..8cbfa4864 100644
--- a/src/main/res/xml/prefs_bottom_row_addons.xml
+++ b/res/xml/prefs_bottom_row_addons.xml
diff --git a/src/main/res/xml/prefs_dictionaries.xml b/res/xml/prefs_dictionaries.xml
index 87742d7b5..87742d7b5 100644
--- a/src/main/res/xml/prefs_dictionaries.xml
+++ b/res/xml/prefs_dictionaries.xml
diff --git a/src/main/res/xml/prefs_effects_prefs.xml b/res/xml/prefs_effects_prefs.xml
index 6fbf772de..6fbf772de 100644
--- a/src/main/res/xml/prefs_effects_prefs.xml
+++ b/res/xml/prefs_effects_prefs.xml
diff --git a/src/main/res/xml/prefs_gestures_prefs.xml b/res/xml/prefs_gestures_prefs.xml
index b135918b7..b135918b7 100644
--- a/src/main/res/xml/prefs_gestures_prefs.xml
+++ b/res/xml/prefs_gestures_prefs.xml
diff --git a/src/main/res/xml/prefs_keyboard_theme_tweaks.xml b/res/xml/prefs_keyboard_theme_tweaks.xml
index 11061ed99..11061ed99 100644
--- a/src/main/res/xml/prefs_keyboard_theme_tweaks.xml
+++ b/res/xml/prefs_keyboard_theme_tweaks.xml
diff --git a/src/main/res/xml/prefs_keyboards.xml b/res/xml/prefs_keyboards.xml
index 01de0d400..01de0d400 100644
--- a/src/main/res/xml/prefs_keyboards.xml
+++ b/res/xml/prefs_keyboards.xml
diff --git a/src/main/res/xml/prefs_language_tweaks.xml b/res/xml/prefs_language_tweaks.xml
index 6f29cde6d..6f29cde6d 100644
--- a/src/main/res/xml/prefs_language_tweaks.xml
+++ b/res/xml/prefs_language_tweaks.xml
diff --git a/src/main/res/xml/prefs_top_row_addons.xml b/res/xml/prefs_top_row_addons.xml
index 079106e12..079106e12 100644
--- a/src/main/res/xml/prefs_top_row_addons.xml
+++ b/res/xml/prefs_top_row_addons.xml
diff --git a/src/main/res/xml/prefs_ui_tweaks.xml b/res/xml/prefs_ui_tweaks.xml
index 1aafb7f01..1aafb7f01 100644
--- a/src/main/res/xml/prefs_ui_tweaks.xml
+++ b/res/xml/prefs_ui_tweaks.xml
diff --git a/src/main/res/xml/quick_text_keys.xml b/res/xml/quick_text_keys.xml
index 85e4122d1..85e4122d1 100644
--- a/src/main/res/xml/quick_text_keys.xml
+++ b/res/xml/quick_text_keys.xml
diff --git a/src/main/res/xml/qwerty.xml b/res/xml/qwerty.xml
index c9f78bc91..c9f78bc91 100644
--- a/src/main/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
diff --git a/src/main/res/xml/qwerty_compact.xml b/res/xml/qwerty_compact.xml
index 6d92d6f9a..6d92d6f9a 100644
--- a/src/main/res/xml/qwerty_compact.xml
+++ b/res/xml/qwerty_compact.xml
diff --git a/src/main/res/xml/qwerty_with_symbols.xml b/res/xml/qwerty_with_symbols.xml
index af3b0bda0..af3b0bda0 100644
--- a/src/main/res/xml/qwerty_with_symbols.xml
+++ b/res/xml/qwerty_with_symbols.xml
diff --git a/src/main/res/xml/simple_alt_numbers.xml b/res/xml/simple_alt_numbers.xml
index a4df480cb..a4df480cb 100644
--- a/src/main/res/xml/simple_alt_numbers.xml
+++ b/res/xml/simple_alt_numbers.xml
diff --git a/src/main/res/xml/simple_datetime.xml b/res/xml/simple_datetime.xml
index ac8e9ac63..ac8e9ac63 100644
--- a/src/main/res/xml/simple_datetime.xml
+++ b/res/xml/simple_datetime.xml
diff --git a/src/main/res/xml/simple_numbers.xml b/res/xml/simple_numbers.xml
index d7e519a7e..d7e519a7e 100644
--- a/src/main/res/xml/simple_numbers.xml
+++ b/res/xml/simple_numbers.xml
diff --git a/src/main/res/xml/simple_phone.xml b/res/xml/simple_phone.xml
index 890f1e00f..890f1e00f 100644
--- a/src/main/res/xml/simple_phone.xml
+++ b/res/xml/simple_phone.xml
diff --git a/src/main/res/xml/spell_checker_settings.xml b/res/xml/spell_checker_settings.xml
index 1d97c4943..1d97c4943 100644
--- a/src/main/res/xml/spell_checker_settings.xml
+++ b/res/xml/spell_checker_settings.xml
diff --git a/src/main/res/xml/spellchecker.xml b/res/xml/spellchecker.xml
index b8e0241a8..b8e0241a8 100644
--- a/src/main/res/xml/spellchecker.xml
+++ b/res/xml/spellchecker.xml
diff --git a/src/main/res/xml/symbols.xml b/res/xml/symbols.xml
index 3e6b5c3ed..3e6b5c3ed 100644
--- a/src/main/res/xml/symbols.xml
+++ b/res/xml/symbols.xml
diff --git a/src/main/res/xml/symbols_16keys.xml b/res/xml/symbols_16keys.xml
index 00c9baf6f..00c9baf6f 100644
--- a/src/main/res/xml/symbols_16keys.xml
+++ b/res/xml/symbols_16keys.xml
diff --git a/src/main/res/xml/symbols_alt.xml b/res/xml/symbols_alt.xml
index a9a9af892..a9a9af892 100644
--- a/src/main/res/xml/symbols_alt.xml
+++ b/res/xml/symbols_alt.xml
diff --git a/src/main/res/xml/symbols_alt_16keys.xml b/res/xml/symbols_alt_16keys.xml
index b023a1e1f..b023a1e1f 100644
--- a/src/main/res/xml/symbols_alt_16keys.xml
+++ b/res/xml/symbols_alt_16keys.xml
diff --git a/src/instrumentTest/java/com/anysoftkeyboard/dictionaries/BTreeDictionaryTest.java b/src/instrumentTest/java/com/anysoftkeyboard/dictionaries/BTreeDictionaryTest.java
deleted file mode 100644
index 57266079e..000000000
--- a/src/instrumentTest/java/com/anysoftkeyboard/dictionaries/BTreeDictionaryTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2013 Menny Even-Danan
- *
- * 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.
- */
-
-package com.anysoftkeyboard.dictionaries;
-
-
-import android.test.ActivityInstrumentationTestCase2;
-import com.anysoftkeyboard.ui.settings.MainSettingsActivity;
-import junit.framework.Assert;
-
-
-public class BTreeDictionaryTest extends ActivityInstrumentationTestCase2<MainSettingsActivity>/*need a valid Application object, so I use ActivityInstrumentationTestCase2*/ {
-
-    public BTreeDictionaryTest() {
-        super(MainSettingsActivity.class);
-    }
-
-
-    public void testLoadDictionary() throws Exception {
-        TestableBTreeDictionary dictionary = new TestableBTreeDictionary("TEST", getActivity().getApplicationContext());
-        //no words now
-        Assert.assertFalse(dictionary.isValidWord((String)TestableBTreeDictionary.STORAGE[0][1]));
-
-        //ok, now yes words
-        dictionary.loadDictionary();
-        for(int row=0; row<TestableBTreeDictionary.STORAGE.length; row++) {
-            final String word = (String)TestableBTreeDictionary.STORAGE[row][1];
-            final int freq = ((Integer)TestableBTreeDictionary.STORAGE[row][2]).intValue();
-            Assert.assertTrue("Word at row "+row+" ("+word+") should be valid.", dictionary.isValidWord(word));
-            Assert.assertEquals(dictionary.getWordFrequency(word), freq);
-        }
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-    }
-
-    public void testAddWord() throws Exception {
-        TestableBTreeDictionary dictionary = new TestableBTreeDictionary("TEST", getActivity().getApplicationContext());
-        dictionary.loadDictionary();
-
-        Assert.assertTrue(dictionary.addWord("new", 23));
-        Assert.assertEquals("new", dictionary.wordRequestedToAddedToStorage);
-        Assert.assertEquals(23, dictionary.wordFrequencyRequestedToAddedToStorage);
-        Assert.assertTrue(dictionary.isValidWord("new"));
-        Assert.assertEquals(dictionary.getWordFrequency("new"), 23);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        Assert.assertTrue(dictionary.addWord("new", 34));
-        Assert.assertEquals("new", dictionary.wordRequestedToAddedToStorage);
-        Assert.assertEquals(34, dictionary.wordFrequencyRequestedToAddedToStorage);
-        Assert.assertTrue(dictionary.isValidWord("new"));
-        Assert.assertEquals(dictionary.getWordFrequency("new"), 34);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        Assert.assertTrue(dictionary.addWord("newa", 45));
-        Assert.assertTrue(dictionary.isValidWord("newa"));
-        Assert.assertEquals(dictionary.getWordFrequency("new"), 34);
-        Assert.assertEquals(dictionary.getWordFrequency("newa"), 45);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        Assert.assertTrue(dictionary.addWord("nea", 47));
-        Assert.assertEquals("nea", dictionary.wordRequestedToAddedToStorage);
-        Assert.assertEquals(47, dictionary.wordFrequencyRequestedToAddedToStorage);
-        Assert.assertTrue(dictionary.isValidWord("nea"));
-        Assert.assertEquals(dictionary.getWordFrequency("new"), 34);
-        Assert.assertEquals(dictionary.getWordFrequency("newa"), 45);
-        Assert.assertEquals(dictionary.getWordFrequency("nea"), 47);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        Assert.assertTrue(dictionary.addWord("neabb", 50));
-        Assert.assertEquals("neabb", dictionary.wordRequestedToAddedToStorage);
-        Assert.assertEquals(50, dictionary.wordFrequencyRequestedToAddedToStorage);
-        Assert.assertTrue(dictionary.isValidWord("neabb"));
-        Assert.assertFalse(dictionary.isValidWord("neab"));
-        Assert.assertEquals(dictionary.getWordFrequency("new"), 34);
-        Assert.assertEquals(dictionary.getWordFrequency("newa"), 45);
-        Assert.assertEquals(dictionary.getWordFrequency("nea"), 47);
-        Assert.assertEquals(dictionary.getWordFrequency("neabb"), 50);
-        Assert.assertEquals(dictionary.getWordFrequency("neab"), 0);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-    }
-
-    public void testOnStorageChanged() throws Exception {
-
-    }
-
-    public void testDeleteWord() throws Exception {
-        TestableBTreeDictionary dictionary = new TestableBTreeDictionary("TEST", getActivity().getApplicationContext());
-        dictionary.loadDictionary();
-        //from read storage
-        String word = (String)TestableBTreeDictionary.STORAGE[0][1];
-        int wordFreq = ((Integer)TestableBTreeDictionary.STORAGE[0][2]).intValue();
-        Assert.assertTrue(dictionary.isValidWord(word));
-        dictionary.deleteWord(word);
-        Assert.assertFalse(dictionary.isValidWord(word));
-        Assert.assertEquals(dictionary.wordRequestedToBeDeletedFromStorage, word);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        //re-adding
-        Assert.assertTrue(dictionary.addWord(word, wordFreq+1));
-        Assert.assertTrue(dictionary.isValidWord(word));
-        Assert.assertEquals(wordFreq+1, dictionary.getWordFrequency(word));
-        dictionary.wordRequestedToBeDeletedFromStorage = null;
-        dictionary.deleteWord(word);
-        Assert.assertFalse(dictionary.isValidWord(word));
-        Assert.assertEquals(dictionary.wordRequestedToBeDeletedFromStorage, word);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        //a new one
-        word = "new";
-        Assert.assertTrue(dictionary.addWord(word, wordFreq));
-        Assert.assertTrue(dictionary.isValidWord(word));
-        Assert.assertEquals(wordFreq, dictionary.getWordFrequency(word));
-        dictionary.wordRequestedToBeDeletedFromStorage = null;
-        dictionary.deleteWord(word);
-        Assert.assertFalse(dictionary.isValidWord(word));
-        Assert.assertEquals(dictionary.wordRequestedToBeDeletedFromStorage, word);
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        //none existing
-        Assert.assertFalse(dictionary.isValidWord("fail"));
-        dictionary.deleteWord("fail");
-        Assert.assertFalse(dictionary.isValidWord("fail"));
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        //deleting part of the root
-        dictionary.addWord("root", 1);
-        dictionary.addWord("rooting", 2);
-        dictionary.addWord("rootina", 2);
-        Assert.assertFalse(dictionary.isValidWord("roo"));
-        Assert.assertFalse(dictionary.isValidWord("rooti"));
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        dictionary.deleteWord("root");
-        Assert.assertFalse(dictionary.isValidWord("roo"));
-        Assert.assertFalse(dictionary.isValidWord("root"));
-        Assert.assertFalse(dictionary.isValidWord("rooti"));
-        Assert.assertTrue(dictionary.isValidWord("rooting"));
-        Assert.assertTrue(dictionary.isValidWord("rootina"));
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        dictionary.deleteWord("rooting");
-        Assert.assertFalse(dictionary.isValidWord("root"));
-        Assert.assertFalse(dictionary.isValidWord("rooti"));
-        Assert.assertFalse(dictionary.isValidWord("rooting"));
-        Assert.assertTrue(dictionary.isValidWord("rootina"));
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        dictionary.addWord("root", 1);
-        Assert.assertTrue(dictionary.isValidWord("root"));
-        Assert.assertFalse(dictionary.isValidWord("rooting"));
-        Assert.assertFalse(dictionary.isValidWord("rooti"));
-        Assert.assertTrue(dictionary.isValidWord("rootina"));
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-
-        dictionary.deleteWord("rootina");
-        Assert.assertTrue(dictionary.isValidWord("root"));
-        Assert.assertFalse(dictionary.isValidWord("rooting"));
-        Assert.assertFalse(dictionary.isValidWord("rooti"));
-        Assert.assertFalse(dictionary.isValidWord("rootina"));
-        //checking validity of the internal structure
-        assetNodeArrayIsValid(dictionary.getRoot());
-    }
-
-    private void assetNodeArrayIsValid(BTreeDictionary.NodeArray root) {
-        assertTrue(root.length >=0);
-        assertTrue(root.length <= root.data.length);
-        for (int i=0;i<root.length;i++) {
-            assertNotNull(root.data[i]);
-            if (root.data[i].children != null)//it may be null.
-                assetNodeArrayIsValid(root.data[i].children);
-        }
-    }
-
-    public void testClose() throws Exception {
-        TestableBTreeDictionary dictionary = new TestableBTreeDictionary("TEST", getActivity().getApplicationContext());
-        dictionary.loadDictionary();
-
-        Assert.assertTrue(dictionary.isValidWord((String)TestableBTreeDictionary.STORAGE[0][1]));
-        dictionary.close();
-        Assert.assertTrue(dictionary.storageIsClosed);
-        Assert.assertFalse(dictionary.isValidWord((String)TestableBTreeDictionary.STORAGE[0][1]));
-        Assert.assertEquals(dictionary.getWordFrequency((String)TestableBTreeDictionary.STORAGE[0][1]), 0);
-        Assert.assertFalse(dictionary.addWord("fail", 1));
-    }
-}
diff --git a/src/main/java/com/anysoftkeyboard/addons/AddOn.java b/src/main/java/com/anysoftkeyboard/addons/AddOn.java
index a127ccb91..843f34605 100644
--- a/src/main/java/com/anysoftkeyboard/addons/AddOn.java
+++ b/src/main/java/com/anysoftkeyboard/addons/AddOn.java
@@ -17,8 +17,7 @@
 package com.anysoftkeyboard.addons;
 
 import android.content.Context;
-
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 public interface AddOn {
     public static final int INVALID_RES_ID = 0;
diff --git a/src/main/java/com/anysoftkeyboard/addons/AddOnImpl.java b/src/main/java/com/anysoftkeyboard/addons/AddOnImpl.java
index 81d7d788d..59502306b 100644
--- a/src/main/java/com/anysoftkeyboard/addons/AddOnImpl.java
+++ b/src/main/java/com/anysoftkeyboard/addons/AddOnImpl.java
@@ -19,13 +19,12 @@ package com.anysoftkeyboard.addons;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.support.annotation.Nullable;
 
 import com.anysoftkeyboard.utils.Log;
 
 import java.lang.ref.WeakReference;
 
-import javax.annotation.Nullable;
-
 public abstract class AddOnImpl implements AddOn {
 
 	private static final String TAG = "ASK_AddOnImpl";
diff --git a/src/main/java/com/anysoftkeyboard/addons/IconHolder.java b/src/main/java/com/anysoftkeyboard/addons/IconHolder.java
index 429149789..1f0d75ba5 100644
--- a/src/main/java/com/anysoftkeyboard/addons/IconHolder.java
+++ b/src/main/java/com/anysoftkeyboard/addons/IconHolder.java
@@ -17,9 +17,9 @@
 package com.anysoftkeyboard.addons;
 
 import android.graphics.drawable.Drawable;
-
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 public interface IconHolder {
-    @Nullable Drawable getIcon();
+    @Nullable
+    Drawable getIcon();
 }
diff --git a/src/main/java/com/anysoftkeyboard/addons/ScreenshotHolder.java b/src/main/java/com/anysoftkeyboard/addons/ScreenshotHolder.java
index c3dc1b4f8..90ef2e5ab 100644
--- a/src/main/java/com/anysoftkeyboard/addons/ScreenshotHolder.java
+++ b/src/main/java/com/anysoftkeyboard/addons/ScreenshotHolder.java
@@ -17,11 +17,11 @@
 package com.anysoftkeyboard.addons;
 
 import android.graphics.drawable.Drawable;
-
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 public interface ScreenshotHolder {
-    @Nullable Drawable getScreenshot();
+    @Nullable
+    Drawable getScreenshot();
 
     boolean hasScreenshot();
 }
diff --git a/src/main/java/com/anysoftkeyboard/devicespecific/AskV8GestureDetector.java b/src/main/java/com/anysoftkeyboard/devicespecific/AskV8GestureDetector.java
index 56f4d6f9b..992b88ddf 100644
--- a/src/main/java/com/anysoftkeyboard/devicespecific/AskV8GestureDetector.java
+++ b/src/main/java/com/anysoftkeyboard/devicespecific/AskV8GestureDetector.java
@@ -18,6 +18,7 @@ package com.anysoftkeyboard.devicespecific;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.v4.view.MotionEventCompat;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
@@ -25,8 +26,6 @@ import android.view.ScaleGestureDetector;
 
 import com.anysoftkeyboard.utils.Log;
 
-import javax.annotation.Nonnull;
-
 @TargetApi(8)
 public class AskV8GestureDetector extends GestureDetector {
     private static final String TAG = "AskV8GestureDetector";
@@ -60,7 +59,7 @@ public class AskV8GestureDetector extends GestureDetector {
     }
 
     @Override
-    public boolean onTouchEvent(@Nonnull MotionEvent ev) {
+    public boolean onTouchEvent(@NonNull MotionEvent ev) {
 	    int singleFingerEventPointerId = mSingleFingerEventPointerId;
 
         //I want to keep track on the first finger (https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues/300)
diff --git a/src/main/java/com/anysoftkeyboard/dictionaries/sqlite/AbbreviationsDictionary.java b/src/main/java/com/anysoftkeyboard/dictionaries/sqlite/AbbreviationsDictionary.java
index 4640edda6..36f46c004 100644
--- a/src/main/java/com/anysoftkeyboard/dictionaries/sqlite/AbbreviationsDictionary.java
+++ b/src/main/java/com/anysoftkeyboard/dictionaries/sqlite/AbbreviationsDictionary.java
@@ -17,6 +17,7 @@
 package com.anysoftkeyboard.dictionaries.sqlite;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.anysoftkeyboard.WordComposer;
@@ -28,8 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 public class AbbreviationsDictionary extends SQLiteUserDictionaryBase {
 
 	private static final int ABBR_MAX_WORD_LENGTH = 2048;
@@ -85,11 +84,11 @@ public class AbbreviationsDictionary extends SQLiteUserDictionaryBase {
 	    }
     }
 
-    public static String getAbbreviation(@Nonnull String word, int frequency) {
+    public static String getAbbreviation(@NonNull String word, int frequency) {
         return word.substring(0, frequency);
     }
 
-    public static String getExplodedSentence(@Nonnull String word, int frequency) {
+    public static String getExplodedSentence(@NonNull String word, int frequency) {
         return word.substring(frequency);
     }
 }
diff --git a/src/main/java/com/anysoftkeyboard/keyboards/KeyboardAddOnAndBuilder.java b/src/main/java/com/anysoftkeyboard/keyboards/KeyboardAddOnAndBuilder.java
index eb647500f..7cca6ac4a 100644
--- a/src/main/java/com/anysoftkeyboard/keyboards/KeyboardAddOnAndBuilder.java
+++ b/src/main/java/com/anysoftkeyboard/keyboards/KeyboardAddOnAndBuilder.java
@@ -19,14 +19,14 @@ package com.anysoftkeyboard.keyboards;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+
 import com.anysoftkeyboard.addons.AddOn;
 import com.anysoftkeyboard.addons.AddOnImpl;
 import com.anysoftkeyboard.addons.IconHolder;
 import com.anysoftkeyboard.addons.ScreenshotHolder;
 import com.anysoftkeyboard.utils.Log;
 
-import javax.annotation.Nullable;
-
 public class KeyboardAddOnAndBuilder extends AddOnImpl implements IconHolder, ScreenshotHolder {
 
     public static final String KEYBOARD_PREF_PREFIX = "keyboard_";
diff --git a/src/main/java/com/anysoftkeyboard/keyboards/KeyboardSupport.java b/src/main/java/com/anysoftkeyboard/keyboards/KeyboardSupport.java
index d3b38a3a0..ce4eb36a8 100644
--- a/src/main/java/com/anysoftkeyboard/keyboards/KeyboardSupport.java
+++ b/src/main/java/com/anysoftkeyboard/keyboards/KeyboardSupport.java
@@ -5,6 +5,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
 import android.util.SparseIntArray;
 import android.util.TypedValue;
 
@@ -15,8 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import javax.annotation.Nonnull;
-
 public class KeyboardSupport {
     private static final String TAG = "KeyboardSupport";
 
@@ -77,7 +76,7 @@ public class KeyboardSupport {
      * @param attributeIdMap a mapping between the remote-id -> local-id
      * @return Always returns the remote version of localStyleableArray
      */
-    public static int[] createBackwardCompatibleStyleable(@Nonnull int[] localStyleableArray, @Nonnull Context localContext, @Nonnull Context remoteContext, @Nonnull SparseIntArray attributeIdMap) {
+    public static int[] createBackwardCompatibleStyleable(@NonNull int[] localStyleableArray, @NonNull Context localContext, @NonNull Context remoteContext, @NonNull SparseIntArray attributeIdMap) {
         final String remotePackageName = remoteContext.getPackageName();
         if (localContext.getPackageName().equals(remotePackageName)) {
             Log.d(TAG, "This is a local context ("+remotePackageName+"), optimization will be done.");
diff --git a/src/main/java/com/anysoftkeyboard/theme/KeyboardTheme.java b/src/main/java/com/anysoftkeyboard/theme/KeyboardTheme.java
index ea513a7f5..4717ad1f8 100644
--- a/src/main/java/com/anysoftkeyboard/theme/KeyboardTheme.java
+++ b/src/main/java/com/anysoftkeyboard/theme/KeyboardTheme.java
@@ -19,12 +19,12 @@ package com.anysoftkeyboard.theme;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+
 import com.anysoftkeyboard.addons.AddOnImpl;
 import com.anysoftkeyboard.addons.ScreenshotHolder;
 import com.anysoftkeyboard.utils.Log;
 
-import javax.annotation.Nullable;
-
 public class KeyboardTheme extends AddOnImpl implements ScreenshotHolder {
 
     private static final String TAG = "ASK KBD-THEME";
diff --git a/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java b/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java
index 2a9ae276f..e87698585 100644
--- a/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java
@@ -21,6 +21,7 @@ import android.app.AlertDialog;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,8 +39,6 @@ import net.evendanan.pushingpixels.PassengerFragmentSupport;
 
 import java.io.File;
 
-import javax.annotation.Nonnull;
-
 public class DeveloperToolsFragment extends Fragment implements AsyncTaskWithProgressWindow.AsyncTaskOwner, View.OnClickListener {
 
     private abstract static class DeveloperAsyncTask<Params, Progress, Result>
@@ -52,11 +51,11 @@ public class DeveloperToolsFragment extends Fragment implements AsyncTaskWithPro
 
     }
 
-    @Nonnull
+    @NonNull
     private Button mFlipper;
-    @Nonnull
+    @NonNull
     private View mProgressIndicator;
-    @Nonnull
+    @NonNull
     private View mShareButton;
 
     @Override
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/setup/SetUpKeyboardWizardFragment.java b/src/main/java/com/anysoftkeyboard/ui/settings/setup/SetUpKeyboardWizardFragment.java
index 33c761980..2439c6843 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/setup/SetUpKeyboardWizardFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/setup/SetUpKeyboardWizardFragment.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
@@ -19,8 +20,6 @@ import com.menny.android.anysoftkeyboard.R;
 
 import net.evendanan.pushingpixels.PassengerFragment;
 
-import javax.annotation.Nullable;
-
 /**
  * This fragment will guide the user through the process of enabling, switch to and configuring AnySoftKeyboard.
  * This will be done with three pages, each for a different task:
@@ -61,7 +60,8 @@ public class SetUpKeyboardWizardFragment extends PassengerFragment {
     };
 
     //this is null on tablet!
-    private @Nullable ViewPager mWizardPager;
+    private @Nullable
+    ViewPager mWizardPager;
     private Context mAppContext;
 
     private final ContentObserver mSecureSettingsChanged = new ContentObserver(null) {
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/widget/AddOnListPreference.java b/src/main/java/com/anysoftkeyboard/ui/settings/widget/AddOnListPreference.java
index e47a74add..1a47bfdf4 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/widget/AddOnListPreference.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/widget/AddOnListPreference.java
@@ -24,6 +24,8 @@ import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.AbsSavedState;
@@ -51,9 +53,6 @@ import net.evendanan.pushingpixels.ListPreference;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /*using this import requires using the Android Library from https://github.com/menny/PushingPixels*/
 
 public class AddOnListPreference extends ListPreference {
@@ -66,8 +65,10 @@ public class AddOnListPreference extends ListPreference {
         preference.setSelectedAddOn(selectedAddOn);
     }
 
-    private @Nullable AddOn[] mAddOns;
-    private @Nullable AddOn mSelectedAddOn;
+    @Nullable
+    private AddOn[] mAddOns;
+    @Nullable
+    private AddOn mSelectedAddOn;
 
     public AddOnListPreference(Context context) {
         super(context);
@@ -90,7 +91,7 @@ public class AddOnListPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
     }
 
-    public void setAddOnsList(@Nonnull AddOn[] addOns) {
+    public void setAddOnsList(@NonNull AddOn[] addOns) {
         mAddOns = addOns;
 
         String[] ids = new String[mAddOns.length];
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/AbbreviationDictionaryEditorFragment.java b/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/AbbreviationDictionaryEditorFragment.java
index 85fba3a72..e0fdd75b3 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/AbbreviationDictionaryEditorFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/AbbreviationDictionaryEditorFragment.java
@@ -1,6 +1,7 @@
 package com.anysoftkeyboard.ui.settings.wordseditor;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,8 +18,6 @@ import net.evendanan.pushingpixels.PassengerFragmentSupport;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 public class AbbreviationDictionaryEditorFragment extends UserDictionaryEditorFragment {
 
     @Override
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/UserWordsListAdapter.java b/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/UserWordsListAdapter.java
index f7eb0acda..c09f77e5c 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/UserWordsListAdapter.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/wordseditor/UserWordsListAdapter.java
@@ -1,6 +1,8 @@
 package com.anysoftkeyboard.ui.settings.wordseditor;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -18,20 +20,17 @@ import com.menny.android.anysoftkeyboard.R;
 
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
  * List adapter to be used with the words editor fragment.
  */
 class UserWordsListAdapter extends ArrayAdapter<UserWordsListAdapter.Word> implements View.OnClickListener {
 
     public static class Word {
-        @Nonnull
+        @NonNull
         public final String word;
         public final int frequency;
 
-        public Word(@Nonnull String word, int frequency) {
+        public Word(@NonNull String word, int frequency) {
             this.word = word;
             this.frequency = frequency;
         }
@@ -221,7 +220,7 @@ class UserWordsListAdapter extends ArrayAdapter<UserWordsListAdapter.Word> imple
 
     @Override
     public final void onClick(View v) {
-        @Nullable final Word word = (Word) ((View) v.getParent()).getTag();
+        final Word word = (Word) ((View) v.getParent()).getTag();
         switch (v.getId()) {
             case R.id.delete_user_word:
                 onWordDeleted(word);
diff --git a/src/main/java/com/anysoftkeyboard/ui/tutorials/TipLayoutsSupport.java b/src/main/java/com/anysoftkeyboard/ui/tutorials/TipLayoutsSupport.java
index aa81355a3..b25ec2993 100644
--- a/src/main/java/com/anysoftkeyboard/ui/tutorials/TipLayoutsSupport.java
+++ b/src/main/java/com/anysoftkeyboard/ui/tutorials/TipLayoutsSupport.java
@@ -3,6 +3,7 @@ package com.anysoftkeyboard.ui.tutorials;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
@@ -15,11 +16,6 @@ import com.menny.android.anysoftkeyboard.R;
 
 import java.util.List;
 
-import javax.annotation.Nonnull;
-
-/**
- * Created by menny on 10/24/13.
- */
 public class TipLayoutsSupport {
     private static final String TAG = "TipLayoutsSupport";
 
@@ -53,7 +49,7 @@ public class TipLayoutsSupport {
         }
     }
 
-    public static void addTipToCandidate(final Context appContext, @Nonnull final TextView tipsNotification, @Nonnull final String TIPS_NOTIFICATION_KEY, final View.OnClickListener onClickListener) {
+    public static void addTipToCandidate(final Context appContext, @NonNull final TextView tipsNotification, @NonNull final String TIPS_NOTIFICATION_KEY, final View.OnClickListener onClickListener) {
         if (AnyApplication.getConfig().hasNotificationClicked(TIPS_NOTIFICATION_KEY)) {
             tipsNotification.setVisibility(View.GONE);
             ViewGroup p = tipsNotification.getParent() instanceof ViewGroup? (ViewGroup)tipsNotification.getParent() : null;
diff --git a/src/main/java/com/anysoftkeyboard/utils/Log.java b/src/main/java/com/anysoftkeyboard/utils/Log.java
index ee493d211..2c9a04e5e 100644
--- a/src/main/java/com/anysoftkeyboard/utils/Log.java
+++ b/src/main/java/com/anysoftkeyboard/utils/Log.java
@@ -18,6 +18,7 @@ package com.anysoftkeyboard.utils;
 
 import android.annotation.TargetApi;
 import android.os.Build;
+import android.support.annotation.NonNull;
 
 import com.anysoftkeyboard.ui.dev.DeveloperUtils;
 import com.menny.android.anysoftkeyboard.BuildConfig;
@@ -25,8 +26,6 @@ import com.menny.android.anysoftkeyboard.FeaturesSet;
 
 import java.util.ArrayList;
 
-import javax.annotation.Nonnull;
-
 public class Log {
     private static final boolean DEBUG = FeaturesSet.DEBUG_LOG;
 
@@ -50,7 +49,7 @@ public class Log {
         }
     }
 
-    @Nonnull
+    @NonNull
     public synchronized static ArrayList<String> getAllLogLinesList() {
         ArrayList<String> lines = new ArrayList<String>(msLogs.length);
         if (msLogs.length > 0) {
@@ -68,7 +67,7 @@ public class Log {
         return lines;
     }
 
-    @Nonnull
+    @NonNull
     public synchronized static String getAllLogLines() {
         if (DEBUG) {
             ArrayList<String> lines = getAllLogLinesList();
diff --git a/src/main/java/net/evendanan/pushingpixels/EdgeEffectHacker.java b/src/main/java/net/evendanan/pushingpixels/EdgeEffectHacker.java
index 8d0ced404..62f31076d 100644
--- a/src/main/java/net/evendanan/pushingpixels/EdgeEffectHacker.java
+++ b/src/main/java/net/evendanan/pushingpixels/EdgeEffectHacker.java
@@ -3,8 +3,7 @@ package net.evendanan.pushingpixels;
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-
-import javax.annotation.Nonnull;
+import android.support.annotation.NonNull;
 
 public class EdgeEffectHacker {
 
@@ -14,7 +13,7 @@ public class EdgeEffectHacker {
 	 * @param context The application's Context
 	 * @param brandColor The color you wish to apply.
 	 */
-	public static void brandGlowEffect(@Nonnull Context context, int brandColor) {
+	public static void brandGlowEffect(@NonNull Context context, int brandColor) {
 		//glow
 		int glowDrawableId = context.getResources().getIdentifier("overscroll_glow", "drawable", "android");
 		if (glowDrawableId != 0) {
diff --git a/src/main/java/net/evendanan/pushingpixels/FragmentChauffeurActivity.java b/src/main/java/net/evendanan/pushingpixels/FragmentChauffeurActivity.java
index 590161673..175f61495 100644
--- a/src/main/java/net/evendanan/pushingpixels/FragmentChauffeurActivity.java
+++ b/src/main/java/net/evendanan/pushingpixels/FragmentChauffeurActivity.java
@@ -18,6 +18,8 @@ package net.evendanan.pushingpixels;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -27,9 +29,6 @@ import android.view.View;
 import com.anysoftkeyboard.utils.Log;
 import com.menny.android.anysoftkeyboard.R;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public abstract class FragmentChauffeurActivity extends ActionBarActivity {
 
     public static enum FragmentUiContext {
@@ -46,7 +45,7 @@ public abstract class FragmentChauffeurActivity extends ActionBarActivity {
     private static final String KEY_FRAGMENT_CLASS_TO_ADD = "KEY_FRAGMENT_CLASS_TO_ADD";
     private static final String KEY_FRAGMENT_ARGS_TO_ADD = "KEY_FRAGMENT_ARGS_TO_ADD";
 
-    public static void addIntentArgsForAddingFragmentToUi(@Nonnull Intent intent, @Nonnull Class<? extends Fragment> fragmentClass, @Nullable Bundle fragmentArgs) {
+    public static void addIntentArgsForAddingFragmentToUi(@NonNull Intent intent, @NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle fragmentArgs) {
         intent.putExtra(KEY_FRAGMENT_CLASS_TO_ADD, fragmentClass);
         if (fragmentArgs != null)
             intent.putExtra(KEY_FRAGMENT_ARGS_TO_ADD, fragmentArgs);
@@ -104,7 +103,7 @@ public abstract class FragmentChauffeurActivity extends ActionBarActivity {
         transaction.commit();
     }
 
-    public void addFragmentToUi(@Nonnull Fragment fragment, FragmentUiContext experience) {
+    public void addFragmentToUi(@NonNull Fragment fragment, FragmentUiContext experience) {
         addFragmentToUi(fragment, experience, null);
     }
 
@@ -115,7 +114,7 @@ public abstract class FragmentChauffeurActivity extends ActionBarActivity {
      * @param experience
      * @param originateView a hint view which will be used to fine-tune the ExpandedItem animation
      */
-    public void addFragmentToUi(@Nonnull Fragment fragment, FragmentUiContext experience, @Nullable View originateView) {
+    public void addFragmentToUi(@NonNull Fragment fragment, FragmentUiContext experience, @Nullable View originateView) {
 	    if (!mIsActivityShown) return;
 
         if (experience == FragmentUiContext.RootFragment) {
diff --git a/src/main/java/net/evendanan/pushingpixels/PassengerFragmentSupport.java b/src/main/java/net/evendanan/pushingpixels/PassengerFragmentSupport.java
index b7c3bdcb7..dbfa5ca5d 100644
--- a/src/main/java/net/evendanan/pushingpixels/PassengerFragmentSupport.java
+++ b/src/main/java/net/evendanan/pushingpixels/PassengerFragmentSupport.java
@@ -18,6 +18,8 @@ package net.evendanan.pushingpixels;
 
 import android.graphics.PointF;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.view.animation.Animation;
@@ -29,9 +31,6 @@ import com.anysoftkeyboard.utils.Log;
 import com.anysoftkeyboard.utils.PointFCompat;
 import com.menny.android.anysoftkeyboard.R;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public abstract class PassengerFragmentSupport {
 
     private static final String TAG = "PassengerFragment";
@@ -39,7 +38,7 @@ public abstract class PassengerFragmentSupport {
     private static final String EXTRA_ORIGINATE_VIEW_CENTER = "EXTRA_ORIGINATE_VIEW_CENTER";
     private static final String EXTRA_ORIGINATE_VIEW_SCALE = "EXTRA_ORIGINATE_VIEW_SCALE";
 
-    public static void setItemExpandExtraData(@Nonnull Fragment passengerFragment, float originateViewCenterX, float originateViewCenterY,
+    public static void setItemExpandExtraData(@NonNull Fragment passengerFragment, float originateViewCenterX, float originateViewCenterY,
                                        float originateViewWidthScale, float originateViewHeightScale) {
         Bundle bundle = passengerFragment.getArguments();
         if (bundle == null) bundle = new Bundle();
@@ -53,7 +52,8 @@ public abstract class PassengerFragmentSupport {
         passengerFragment.setArguments(bundle);
     }
 
-    public static @Nullable Animation onCreateAnimation(@Nonnull Fragment passengerFragment, int transit, boolean enter, int nextAnim) {
+    @Nullable
+    public static Animation onCreateAnimation(@NonNull Fragment passengerFragment, int transit, boolean enter, int nextAnim) {
         Log.d(TAG, "onCreateAnimation: transit: " + transit + ", enter: " + enter + ", nextAnim: " + nextAnim);
         final boolean validTransitionToModify =
                 nextAnim == R.anim.ui_context_expand_add_in || nextAnim == R.anim.ui_context_expand_pop_out;
diff --git a/src/test/java/com/anysoftkeyboard/RobolectricAPI18TestRunner.java b/src/test/java/com/anysoftkeyboard/RobolectricAPI18TestRunner.java
new file mode 100644
index 000000000..3350fb443
--- /dev/null
+++ b/src/test/java/com/anysoftkeyboard/RobolectricAPI18TestRunner.java
@@ -0,0 +1,43 @@
+package com.anysoftkeyboard;
+
+import org.junit.runners.model.InitializationError;
+import org.robolectric.AndroidManifest;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.res.Fs;
+import org.robolectric.res.FsFile;
+
+public class RobolectricAPI18TestRunner extends RobolectricTestRunner {
+
+	/**
+	 * Creates a runner to run {@code testClass}. Looks in your working directory for your AndroidManifest.xml file
+	 * and res directory by default. Use the {@link org.robolectric.annotation.Config} annotation to configure.
+	 *
+	 * @param testClass the test class to be run
+	 * @throws org.junit.runners.model.InitializationError if junit says so
+	 */
+	public RobolectricAPI18TestRunner(Class<?> testClass) throws InitializationError {
+		super(testClass);
+	}
+
+	@Override
+	protected AndroidManifest getAppManifest(Config config) {
+		String manifestProperty = System.getProperty("android.manifest");
+		String resProperty      = System.getProperty("android.resources");
+		String assetsProperty   = System.getProperty("android.assets");
+
+		FsFile manifestFile = Fs.fileFromPath(manifestProperty);
+		FsFile resDir       = Fs.fileFromPath(resProperty);
+		FsFile assetsDir    = Fs.fileFromPath(assetsProperty);
+
+		return new AndroidManifest(manifestFile, resDir, assetsDir) {
+			@Override
+			public int getTargetSdkVersion() {
+				// Robolectric currently doesn't support API level > 18, so in this case, pretend
+				// that we're on API level 18, cross our fingers, and hope that we don't have a
+				// test that depend on API level 19...
+				return 18;
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/anysoftkeyboard/dictionaries/BTreeDictionaryTest.java b/src/test/java/com/anysoftkeyboard/dictionaries/BTreeDictionaryTest.java
new file mode 100644
index 000000000..1af1a21f1
--- /dev/null
+++ b/src/test/java/com/anysoftkeyboard/dictionaries/BTreeDictionaryTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2013 Menny Even-Danan
+ *
+ * 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.
+ */
+
+package com.anysoftkeyboard.dictionaries;
+
+import com.anysoftkeyboard.RobolectricAPI18TestRunner;
+import com.anysoftkeyboard.ui.settings.MainSettingsActivity;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricAPI18TestRunner.class)
+public class BTreeDictionaryTest {
+
+	TestableBTreeDictionary mDictionaryUnderTest;
+
+	@Before
+	public void setup() throws Exception {
+		MainSettingsActivity activity = Robolectric.buildActivity(MainSettingsActivity.class).create().resume().get();
+		mDictionaryUnderTest = new TestableBTreeDictionary("TEST", activity);
+	}
+	@Test
+    public void testLoadDictionary() throws Exception {
+        //no words now
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord((String) TestableBTreeDictionary.STORAGE[0][1]));
+
+        //ok, now yes words
+        mDictionaryUnderTest.loadDictionary();
+        for(int row=0; row<TestableBTreeDictionary.STORAGE.length; row++) {
+            final String word = (String)TestableBTreeDictionary.STORAGE[row][1];
+            final int freq = ((Integer)TestableBTreeDictionary.STORAGE[row][2]).intValue();
+            assertTrue("Word at row " + row + " (" + word + ") should be valid.", mDictionaryUnderTest.isValidWord(word));
+            Assert.assertEquals(mDictionaryUnderTest.getWordFrequency(word), freq);
+        }
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+    }
+
+	@Test
+	public void testAddWord() throws Exception {
+        mDictionaryUnderTest.loadDictionary();
+
+        assertTrue(mDictionaryUnderTest.addWord("new", 23));
+        Assert.assertEquals("new", mDictionaryUnderTest.wordRequestedToAddedToStorage);
+        Assert.assertEquals(23, mDictionaryUnderTest.wordFrequencyRequestedToAddedToStorage);
+        assertTrue(mDictionaryUnderTest.isValidWord("new"));
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("new"), 23);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        assertTrue(mDictionaryUnderTest.addWord("new", 34));
+        Assert.assertEquals("new", mDictionaryUnderTest.wordRequestedToAddedToStorage);
+        Assert.assertEquals(34, mDictionaryUnderTest.wordFrequencyRequestedToAddedToStorage);
+        assertTrue(mDictionaryUnderTest.isValidWord("new"));
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("new"), 34);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        assertTrue(mDictionaryUnderTest.addWord("newa", 45));
+        assertTrue(mDictionaryUnderTest.isValidWord("newa"));
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("new"), 34);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("newa"), 45);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        assertTrue(mDictionaryUnderTest.addWord("nea", 47));
+        Assert.assertEquals("nea", mDictionaryUnderTest.wordRequestedToAddedToStorage);
+        Assert.assertEquals(47, mDictionaryUnderTest.wordFrequencyRequestedToAddedToStorage);
+        assertTrue(mDictionaryUnderTest.isValidWord("nea"));
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("new"), 34);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("newa"), 45);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("nea"), 47);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        assertTrue(mDictionaryUnderTest.addWord("neabb", 50));
+        Assert.assertEquals("neabb", mDictionaryUnderTest.wordRequestedToAddedToStorage);
+        Assert.assertEquals(50, mDictionaryUnderTest.wordFrequencyRequestedToAddedToStorage);
+        assertTrue(mDictionaryUnderTest.isValidWord("neabb"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("neab"));
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("new"), 34);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("newa"), 45);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("nea"), 47);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("neabb"), 50);
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency("neab"), 0);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+    }
+
+	@Test
+	public void testOnStorageChanged() throws Exception {
+
+    }
+
+	@Test
+	public void testDeleteWord() throws Exception {
+        mDictionaryUnderTest.loadDictionary();
+        //from read storage
+        String word = (String)TestableBTreeDictionary.STORAGE[0][1];
+        int wordFreq = ((Integer)TestableBTreeDictionary.STORAGE[0][2]).intValue();
+        assertTrue(mDictionaryUnderTest.isValidWord(word));
+        mDictionaryUnderTest.deleteWord(word);
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord(word));
+        Assert.assertEquals(mDictionaryUnderTest.wordRequestedToBeDeletedFromStorage, word);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        //re-adding
+        assertTrue(mDictionaryUnderTest.addWord(word, wordFreq + 1));
+        assertTrue(mDictionaryUnderTest.isValidWord(word));
+        Assert.assertEquals(wordFreq+1, mDictionaryUnderTest.getWordFrequency(word));
+        mDictionaryUnderTest.wordRequestedToBeDeletedFromStorage = null;
+        mDictionaryUnderTest.deleteWord(word);
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord(word));
+        Assert.assertEquals(mDictionaryUnderTest.wordRequestedToBeDeletedFromStorage, word);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        //a new one
+        word = "new";
+        assertTrue(mDictionaryUnderTest.addWord(word, wordFreq));
+        assertTrue(mDictionaryUnderTest.isValidWord(word));
+        Assert.assertEquals(wordFreq, mDictionaryUnderTest.getWordFrequency(word));
+        mDictionaryUnderTest.wordRequestedToBeDeletedFromStorage = null;
+        mDictionaryUnderTest.deleteWord(word);
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord(word));
+        Assert.assertEquals(mDictionaryUnderTest.wordRequestedToBeDeletedFromStorage, word);
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        //none existing
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("fail"));
+        mDictionaryUnderTest.deleteWord("fail");
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("fail"));
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        //deleting part of the root
+        mDictionaryUnderTest.addWord("root", 1);
+        mDictionaryUnderTest.addWord("rooting", 2);
+        mDictionaryUnderTest.addWord("rootina", 2);
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("roo"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooti"));
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        mDictionaryUnderTest.deleteWord("root");
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("roo"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("root"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooti"));
+        assertTrue(mDictionaryUnderTest.isValidWord("rooting"));
+        assertTrue(mDictionaryUnderTest.isValidWord("rootina"));
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        mDictionaryUnderTest.deleteWord("rooting");
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("root"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooti"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooting"));
+        assertTrue(mDictionaryUnderTest.isValidWord("rootina"));
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        mDictionaryUnderTest.addWord("root", 1);
+        assertTrue(mDictionaryUnderTest.isValidWord("root"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooting"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooti"));
+        assertTrue(mDictionaryUnderTest.isValidWord("rootina"));
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+
+        mDictionaryUnderTest.deleteWord("rootina");
+        assertTrue(mDictionaryUnderTest.isValidWord("root"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooting"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rooti"));
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord("rootina"));
+        //checking validity of the internal structure
+        assetNodeArrayIsValid(mDictionaryUnderTest.getRoot());
+    }
+
+    private void assetNodeArrayIsValid(BTreeDictionary.NodeArray root) {
+        assertTrue(root.length >=0);
+        assertTrue(root.length <= root.data.length);
+        for (int i=0;i<root.length;i++) {
+            assertNotNull(root.data[i]);
+            if (root.data[i].children != null)//it may be null.
+                assetNodeArrayIsValid(root.data[i].children);
+        }
+    }
+
+	@Test
+	public void testClose() throws Exception {
+        mDictionaryUnderTest.loadDictionary();
+
+        assertTrue(mDictionaryUnderTest.isValidWord((String) TestableBTreeDictionary.STORAGE[0][1]));
+        mDictionaryUnderTest.close();
+        assertTrue(mDictionaryUnderTest.storageIsClosed);
+        Assert.assertFalse(mDictionaryUnderTest.isValidWord((String)TestableBTreeDictionary.STORAGE[0][1]));
+        Assert.assertEquals(mDictionaryUnderTest.getWordFrequency((String)TestableBTreeDictionary.STORAGE[0][1]), 0);
+        Assert.assertFalse(mDictionaryUnderTest.addWord("fail", 1));
+    }
+}
diff --git a/src/instrumentTest/java/com/anysoftkeyboard/dictionaries/TestableBTreeDictionary.java b/src/test/java/com/anysoftkeyboard/dictionaries/TestableBTreeDictionary.java
index b4cc2c69f..b4cc2c69f 100644
--- a/src/instrumentTest/java/com/anysoftkeyboard/dictionaries/TestableBTreeDictionary.java
+++ b/src/test/java/com/anysoftkeyboard/dictionaries/TestableBTreeDictionary.java
diff --git a/src/instrumentTest/java/com/anysoftkeyboard/keyboards/KeyboardAddOnTest.java b/src/test/java/com/anysoftkeyboard/keyboards/KeyboardAddOnTest.java
index 8875780a0..eaae6e931 100644
--- a/src/instrumentTest/java/com/anysoftkeyboard/keyboards/KeyboardAddOnTest.java
+++ b/src/test/java/com/anysoftkeyboard/keyboards/KeyboardAddOnTest.java
@@ -1,35 +1,31 @@
 package com.anysoftkeyboard.keyboards;
 
-import android.content.Context;
-import android.test.AndroidTestCase;
 import android.text.TextUtils;
-import android.util.Log;
+
+import com.anysoftkeyboard.RobolectricAPI18TestRunner;
 import com.menny.android.anysoftkeyboard.R;
 
-import java.lang.reflect.Method;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+
 import java.util.ArrayList;
 
-public class KeyboardAddOnTest extends AndroidTestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricAPI18TestRunner.class)
+public class KeyboardAddOnTest {
 
     public static final String ASK_ENGLISH_1 = "c7535083-4fe6-49dc-81aa-c5438a1a343a";
     public static final String TESTER_KEYBOARD_1 = "aef7f690-f485-11e2-b778-0800200c9a60";
     public static final String TESTER_KEYBOARD_2 = "aef7f690-f485-11e2-b778-0800200c9a61";
     public static final String TESTER_KEYBOARD_3 = "aef7f690-f485-11e2-b778-0800200c9a62";
-    private Context mTesterContext;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        try {
-            Method m = AndroidTestCase.class.getMethod("getTestContext", new Class[] {});
-            mTesterContext = (Context) m.invoke(this, (Object[]) null);
-        } catch (Exception x) {
-            throw x;
-        }
-    }
 
-    public void testKeyboardAddOneApiAttributeValues() throws Exception {
+	@Test
+	public void testKeyboardAddOneApiAttributeValues() throws Exception {
         //since I suppose to be backward compatible, these attributes values MUST NOT change!
         assertEquals(R.styleable.KeyboardLayout_android_horizontalGap, 2);
         assertEquals(R.styleable.KeyboardLayout_android_verticalGap, 3);
@@ -58,14 +54,15 @@ public class KeyboardAddOnTest extends AndroidTestCase {
         assertEquals(R.styleable.KeyboardLayout_Row_android_rowEdgeFlags, 0);
     }
 
-    public void testGetKeyboardDefaultEnabled() throws Exception {
-        ArrayList<KeyboardAddOnAndBuilder> enabledKeyboards =  KeyboardFactory.getEnabledKeyboards(getContext());
+	@Test
+	public void testGetKeyboardDefaultEnabled() throws Exception {
+        ArrayList<KeyboardAddOnAndBuilder> enabledKeyboards =  KeyboardFactory.getEnabledKeyboards(Robolectric.application);
         //checking that ASK English is enabled
         boolean askEnglishEnabled = false;
         for(KeyboardAddOnAndBuilder addOnAndBuilder : enabledKeyboards) {
             if (addOnAndBuilder.getId().contains(ASK_ENGLISH_1)) {
                 assertTrue(addOnAndBuilder.getKeyboardDefaultEnabled());
-                assertEquals(addOnAndBuilder.getPackageName(), getContext().getPackageName());
+                assertEquals(addOnAndBuilder.getPackageName(), Robolectric.application.getPackageName());
                 askEnglishEnabled = true;
             }
         }
@@ -76,7 +73,7 @@ public class KeyboardAddOnTest extends AndroidTestCase {
         for(KeyboardAddOnAndBuilder addOnAndBuilder : enabledKeyboards) {
             if (addOnAndBuilder.getId().contains(TESTER_KEYBOARD_1)) {
                 assertTrue(addOnAndBuilder.getKeyboardDefaultEnabled());
-                assertEquals(addOnAndBuilder.getPackageName(), mTesterContext.getPackageName());
+                assertEquals(addOnAndBuilder.getPackageName(), Robolectric.application.getPackageName());
                 testerEnglishEnabled = true;
             }
         }
@@ -93,7 +90,7 @@ public class KeyboardAddOnTest extends AndroidTestCase {
     }
 
     private KeyboardAddOnAndBuilder getKeyboardFromFactory(String id) {
-        ArrayList<KeyboardAddOnAndBuilder> keyboards =  KeyboardFactory.getAllAvailableKeyboards(getContext());
+        ArrayList<KeyboardAddOnAndBuilder> keyboards =  KeyboardFactory.getAllAvailableKeyboards(Robolectric.application);
 
         for(KeyboardAddOnAndBuilder addOnAndBuilder : keyboards) {
             if (addOnAndBuilder.getId().equals(KeyboardAddOnAndBuilder.KEYBOARD_PREF_PREFIX + id)) {
@@ -104,7 +101,8 @@ public class KeyboardAddOnTest extends AndroidTestCase {
         return null;
     }
 
-    public void testGetKeyboardLocale() throws Exception {
+	@Test
+	public void testGetKeyboardLocale() throws Exception {
         KeyboardAddOnAndBuilder askEnglish = getKeyboardFromFactory(ASK_ENGLISH_1);
         assertNotNull(askEnglish);
         assertEquals(askEnglish.getKeyboardLocale(), "en");
diff --git a/src/instrumentTest/java/com/anysoftkeyboard/ui/settings/setup/SetupSupportTest.java b/src/test/java/com/anysoftkeyboard/ui/settings/setup/SetupSupportTest.java
index eade49850..860b2446d 100644
--- a/src/instrumentTest/java/com/anysoftkeyboard/ui/settings/setup/SetupSupportTest.java
+++ b/src/test/java/com/anysoftkeyboard/ui/settings/setup/SetupSupportTest.java
@@ -1,9 +1,19 @@
 package com.anysoftkeyboard.ui.settings.setup;
 
 import android.content.ComponentName;
-import android.test.AndroidTestCase;
 
-public class SetupSupportTest extends AndroidTestCase {
+import com.anysoftkeyboard.RobolectricAPI18TestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricAPI18TestRunner.class)
+public class SetupSupportTest {
+
+	@Test
     public void testIsThisKeyboardSetAsDefaultIME() throws Exception {
         final String MY_IME_PACKAGE = "net.evendanan.ime";
         assertFalse(SetupSupport.isThisKeyboardSetAsDefaultIME(new ComponentName("net.some.one.else", "net.some.one.else.IME").flattenToString(), MY_IME_PACKAGE));
diff --git a/src/main/res/drawable/english_qwerty_screenshot.png b/src/test/res/drawable/english_qwerty_screenshot.png
index d34675dac..d34675dac 100644
--- a/src/main/res/drawable/english_qwerty_screenshot.png
+++ b/src/test/res/drawable/english_qwerty_screenshot.png
diff --git a/src/main/res/drawable/english_qwerty_with_symbols_screenshot.png b/src/test/res/drawable/english_qwerty_with_symbols_screenshot.png
index b2ec028fd..b2ec028fd 100644
--- a/src/main/res/drawable/english_qwerty_with_symbols_screenshot.png
+++ b/src/test/res/drawable/english_qwerty_with_symbols_screenshot.png
diff --git a/src/instrumentTest/res/drawable/ic_stat_en.png b/src/test/res/drawable/ic_stat_en.png
index a2b609fe9..a2b609fe9 100644
--- a/src/instrumentTest/res/drawable/ic_stat_en.png
+++ b/src/test/res/drawable/ic_stat_en.png
diff --git a/src/instrumentTest/res/values/strings.xml b/src/test/res/values/strings.xml
index 6b8fdf018..6b8fdf018 100644
--- a/src/instrumentTest/res/values/strings.xml
+++ b/src/test/res/values/strings.xml
diff --git a/src/instrumentTest/res/xml/keyboards.xml b/src/test/res/xml/keyboards.xml
index b85b40731..b85b40731 100644
--- a/src/instrumentTest/res/xml/keyboards.xml
+++ b/src/test/res/xml/keyboards.xml
diff --git a/src/main/res/xml/physical.xml b/src/test/res/xml/physical.xml
index 9e446b637..9e446b637 100644
--- a/src/main/res/xml/physical.xml
+++ b/src/test/res/xml/physical.xml
diff --git a/src/instrumentTest/res/xml/qwerty.xml b/src/test/res/xml/qwerty.xml
index 9df21124b..9df21124b 100644
--- a/src/instrumentTest/res/xml/qwerty.xml
+++ b/src/test/res/xml/qwerty.xml