From 30736af3acfed07d4e4a6305d43b87f03b70f9c6 Mon Sep 17 00:00:00 2001
From: RHJihan <31377578+RHJihan@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:46:49 +0600
Subject: [PATCH] Replaced previous Bengali (Bangladesh) keyboard with a
 popular layout

---
 .../main/res/xml-sw600dp/key_space_3kw.xml    |   4 +-
 .../main/res/xml-sw600dp/key_space_7kw.xml    |   4 +-
 ...ali_akkhor.xml => rows_bengali_unijoy.xml} |  33 +---
 ...gali_akkhor.xml => kbd_bengali_unijoy.xml} |   2 +-
 app/src/main/res/xml/key_space_5kw.xml        |   4 +-
 ...=> keyboard_layout_set_bengali_unijoy.xml} |  10 +-
 app/src/main/res/xml/method.xml               |   4 +-
 .../main/res/xml/rowkeys_bengali_akkhor1.xml  | 183 ------------------
 .../main/res/xml/rowkeys_bengali_akkhor2.xml  | 152 ---------------
 .../main/res/xml/rowkeys_bengali_akkhor3.xml  | 128 ------------
 .../main/res/xml/rowkeys_bengali_unijoy1.xml  | 138 +++++++++++++
 .../main/res/xml/rowkeys_bengali_unijoy2.xml  | 130 +++++++++++++
 .../main/res/xml/rowkeys_bengali_unijoy3.xml  |  84 ++++++++
 app/src/main/res/xml/rows_bengali_akkhor.xml  |  57 ------
 app/src/main/res/xml/rows_bengali_unijoy.xml  |  42 ++++
 15 files changed, 418 insertions(+), 557 deletions(-)
 rename app/src/main/res/xml-sw600dp/{rows_bengali_akkhor.xml => rows_bengali_unijoy.xml} (52%)
 rename app/src/main/res/xml/{kbd_bengali_akkhor.xml => kbd_bengali_unijoy.xml} (92%)
 rename app/src/main/res/xml/{keyboard_layout_set_bengali_akkhor.xml => keyboard_layout_set_bengali_unijoy.xml} (87%)
 delete mode 100644 app/src/main/res/xml/rowkeys_bengali_akkhor1.xml
 delete mode 100644 app/src/main/res/xml/rowkeys_bengali_akkhor2.xml
 delete mode 100644 app/src/main/res/xml/rowkeys_bengali_akkhor3.xml
 create mode 100644 app/src/main/res/xml/rowkeys_bengali_unijoy1.xml
 create mode 100644 app/src/main/res/xml/rowkeys_bengali_unijoy2.xml
 create mode 100644 app/src/main/res/xml/rowkeys_bengali_unijoy3.xml
 delete mode 100644 app/src/main/res/xml/rows_bengali_akkhor.xml
 create mode 100644 app/src/main/res/xml/rows_bengali_unijoy.xml

diff --git a/app/src/main/res/xml-sw600dp/key_space_3kw.xml b/app/src/main/res/xml-sw600dp/key_space_3kw.xml
index 0cfce9301..a42f9ee30 100644
--- a/app/src/main/res/xml-sw600dp/key_space_3kw.xml
+++ b/app/src/main/res/xml-sw600dp/key_space_3kw.xml
@@ -23,7 +23,7 @@
 >
     <switch>
         <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
+            latin:keyboardLayoutSet="bengali_unijoy|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
             latin:languageSwitchKeyEnabled="true"
         >
             <Key
@@ -35,7 +35,7 @@
                 latin:keyStyle="zwnjKeyStyle" />
         </case>
         <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
+            latin:keyboardLayoutSet="bengali_unijoy|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
             latin:languageSwitchKeyEnabled="false"
         >
             <Key
diff --git a/app/src/main/res/xml-sw600dp/key_space_7kw.xml b/app/src/main/res/xml-sw600dp/key_space_7kw.xml
index 4be7713da..cca5fdef2 100644
--- a/app/src/main/res/xml-sw600dp/key_space_7kw.xml
+++ b/app/src/main/res/xml-sw600dp/key_space_7kw.xml
@@ -23,7 +23,7 @@
 >
     <switch>
         <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
+            latin:keyboardLayoutSet="bengali_unijoy|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
             latin:languageSwitchKeyEnabled="true"
         >
             <Key
@@ -35,7 +35,7 @@
                 latin:keyStyle="zwnjKeyStyle" />
         </case>
         <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
+            latin:keyboardLayoutSet="bengali_unijoy|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
             latin:languageSwitchKeyEnabled="false"
         >
             <Key
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
similarity index 52%
rename from app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
rename to app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
index d51cbb296..12f48adbb 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
@@ -18,32 +18,19 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
+    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="9.0%p">
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1" />
+        <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" />
     </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.182%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
+    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="9.0%p">
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2" />
+        <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" />
     </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.182%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor3" />
+    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="9.0%p">
+        <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.0%p" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3" />
         <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
     <include latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/kbd_bengali_akkhor.xml b/app/src/main/res/xml/kbd_bengali_unijoy.xml
similarity index 92%
rename from app/src/main/res/xml/kbd_bengali_akkhor.xml
rename to app/src/main/res/xml/kbd_bengali_unijoy.xml
index b57926036..a4e6e170c 100644
--- a/app/src/main/res/xml/kbd_bengali_akkhor.xml
+++ b/app/src/main/res/xml/kbd_bengali_unijoy.xml
@@ -19,5 +19,5 @@
 -->
 
 <Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rows_bengali_akkhor" />
+    <include latin:keyboardLayout="@xml/rows_bengali_unijoy" />
 </Keyboard>
diff --git a/app/src/main/res/xml/key_space_5kw.xml b/app/src/main/res/xml/key_space_5kw.xml
index 478f8adeb..7d774b735 100644
--- a/app/src/main/res/xml/key_space_5kw.xml
+++ b/app/src/main/res/xml/key_space_5kw.xml
@@ -23,7 +23,7 @@
 >
     <switch>
         <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
+            latin:keyboardLayoutSet="bengali_unijoy|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
             latin:languageSwitchKeyEnabled="true"
         >
             <Key
@@ -35,7 +35,7 @@
                 latin:keyStyle="zwnjKeyStyle" />
         </case>
         <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
+            latin:keyboardLayoutSet="bengali_unijoy|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
             latin:languageSwitchKeyEnabled="false"
         >
             <Key
diff --git a/app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml b/app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml
similarity index 87%
rename from app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml
rename to app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml
index 15a6c93d8..3245bbd0b 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml
@@ -21,24 +21,24 @@
 <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Feature latin:supportedScript="bengali" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
+        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
         latin:elementName="alphabet"
         latin:enableProximityCharsCorrection="true" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
+        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
         latin:elementName="alphabetAutomaticShifted"
         latin:enableProximityCharsCorrection="true" />
     <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
          because the letters on these layouts aren't the ones in different case of the above
          unshifted layouts.-->
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
+        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
         latin:elementName="alphabetManualShifted" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
+        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
         latin:elementName="alphabetShiftLocked" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
+        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
         latin:elementName="alphabetShiftLockShifted" />
     <Element
         latin:elementKeyboard="@xml/kbd_symbols"
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index bacf800e2..a3202f16e 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -30,7 +30,7 @@
     bg: Bulgarian/bulgarian
     bg: Bulgarian/bulgarian_bds
     bg: Bulgarian/bulgarian_bekl
-    bn_BD: Bengali (Bangladesh)/bengali_akkhor
+    bn_BD: Bengali (Bangladesh)/bengali_unijoy
     bn_IN: Bengali (India)/bengali
     ca: Catalan/spanish
     cs: Czech/qwertz
@@ -216,7 +216,7 @@
             android:subtypeId="0xa2144b0c"
             android:imeSubtypeLocale="bn_BD"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,EmojiCapable"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_unijoy,EmojiCapable"
             android:isAsciiCapable="false"
     />
     <subtype android:icon="@drawable/ic_ime_switcher_dark"
diff --git a/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml b/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml
deleted file mode 100644
index 30b09da71..000000000
--- a/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+09A2: "ঢ" BENGALI LETTER DDHA -->
-            <Key latin:keySpec="&#x09A2;" />
-            <!-- U+09A0: "ঠ" BENGALI LETTER TTHA -->
-            <Key latin:keySpec="&#x09A0;" />
-            <!-- U+09C8: "ৈ" BENGALI VOWEL SIGN AI
-                 U+0990: "ঐ" BENGALI LETTER AI -->
-            <Key
-                latin:keySpec="&#x09C8;"
-                latin:moreKeys="&#x0990;" />
-            <!-- U+09DC: "ড়" BENGALI LETTER RRA
-                 U+09BC: "়" BENGALI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x09DC;"
-                latin:moreKeys="&#x09BC;" />
-            <!-- U+099F: "ট" BENGALI LETTER TTA
-                 U+09F3: "৳" BENGALI RUPEE SIGN
-                 U+099F/U+09CD/U+099F: "ট্ট" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+099F/U+09CD/U+09AC: "ট্ব" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+099F/U+09CD/U+09AE: "ট্ম" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER MA -->
-            <Key
-                latin:keySpec="&#x099F;"
-                latin:moreKeys="&#x09F3;,&#x099F;&#x09CD;&#x099F;,&#x099F;&#x09CD;&#x09AC;,&#x099F;&#x09CD;&#x09AE;" />
-            <!-- U+099E: "ঞ" BENGALI LETTER NYA
-                 U+099E/U+09CD/U+099A: "ঞ্চ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER CA
-                 U+099E/U+09CD/U+099B: "ঞ্ছ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA
-                 U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA -->
-            <Key
-                latin:keySpec="&#x099E;"
-                latin:moreKeys="&#x099E;&#x09CD;&#x099A;,&#x099E;&#x09CD;&#x099B;,&#x099E;&#x09CD;&#x099C;" />
-            <!-- U+09C2: "ূ" BENGALI VOWEL SIGN UU
-                 U+098A: "ঊ" BENGALI LETTER UU -->
-            <Key
-                latin:keySpec="&#x09C2;"
-                latin:moreKeys="&#x098A;" />
-            <!-- U+09C0: "ী" BENGALI VOWEL SIGN II
-                 U+0988: "ঈ" BENGALI LETTER II -->
-            <Key
-                latin:keySpec="&#x09C0;"
-                latin:moreKeys="&#x0988;" />
-            <!-- U+09CC: "ৌ" BENGALI VOWEL SIGN AU
-                 U+099A: "ঔ" BENGALI LETTER CA
-                 U+09D7: "ৗ" BENGALI AU LENGTH MARK -->
-            <Key
-                latin:keySpec="&#x09CC;"
-                latin:moreKeys="&#x099A;,&#x09D7;" />
-            <!-- U+09AB: "ফ" BENGALI LETTER PHA
-                 U+09AB/U+09CD/U+099F: "ফ্ট" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09AB/U+09CD/U+09AF: "ফ্য" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09AB/U+09CD/U+09B0: "ফ্র" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AB/U+09CD/U+09B2: "ফ্ল" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09AB;"
-                latin:moreKeys="&#x09AB;&#x09CD;&#x099F;,&#x09AB;&#x09CD;&#x09AF;,&#x09AB;&#x09CD;&#x09B0;,&#x09AB;&#x09CD;&#x09B2;" />
-            <!-- U+098B: "ঋ" BENGALI LETTER VOCALIC R
-                 U+098C: "ঌ" BENGALI LETTER VOCALIC L
-                 U+09E1: "ৡ" BENGALI LETTER VOCALIC LL
-                 U+09F4: "৴" BENGALI CURRENCY NUMERATOR ONE
-                 U+09F5: "৵" BENGALI CURRENCY NUMERATOR TWO
-                 U+09F6: "৶" BENGALI CURRENCY NUMERATOR THREE
-                 U+09E2: " ৢ" BENGALI VOWEL SIGN VOCALIC L
-                 U+09E3: " ৣ" BENGALI VOWEL SIGN VOCALIC LL -->
-            <Key
-                latin:keySpec="&#x098B;"
-                latin:moreKeys="&#x098C;,&#x09E1;,&#x09F4;,&#x09F5;,&#x09F6;,&#x09E2;,&#x09E3;" />
-        </case>
-        <default>
-            <!-- U+09A7: "ধ" BENGALI LETTER DHA
-                 U+09E7: "১" BENGALI DIGIT ONE
-                 U+09A7/U+09CD/U+09AC: "ধ্ব্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A7/U+09CD/U+09AF: "ধ্য্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09A7/U+09CD/U+09B0: "ধ্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x09A7;"
-                latin:keyHintLabel="&#x09E7;"
-                latin:additionalMoreKeys="&#x09E7;"
-                latin:moreKeys="&#x09A7;&#x09CD;&#x09AC;,&#x09A7;&#x09CD;&#x09AF;,&#x09A7;&#x09CD;&#x09B0;" />
-            <!-- U+09A5: "থ" BENGALI LETTER THA
-                 U+09E8: "২" BENGALI DIGIT TWO
-                 U+09A5/U+09CD/U+09AF: "থ্য" BENGALI LETTER THA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09A5/U+09CD/U+09B0: "থ্র" BENGALI LETTER THA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x09A5;"
-                latin:keyHintLabel="&#x09E8;"
-                latin:additionalMoreKeys="&#x09E8;"
-                latin:moreKeys="&#x09A5;&#x09CD;&#x09AF;,&#x09A5;&#x09CD;&#x09B0;" />
-            <!-- U+09C7: "ে" BENGALI VOWEL SIGN E
-                 U+09E9: "৩" BENGALI DIGIT THREE
-                 U+098F: "এ" BENGALI LETTER E -->
-            <Key
-                latin:keySpec="&#x09C7;"
-                latin:keyHintLabel="&#x09E9;"
-                latin:additionalMoreKeys="&#x09E9;"
-                latin:moreKeys="&#x098F;" />
-            <!-- U+09B0: "র" BENGALI LETTER RA
-                 U+09EA: "৪" BENGALI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x09B0;"
-                latin:keyHintLabel="&#x09EA;"
-                latin:additionalMoreKeys="&#x09EA;" />
-            <!-- U+09A4: "ত" BENGALI LETTER TA
-                 U+09EB: "৫" BENGALI DIGIT FIVE
-                 U+09CE: "ৎ" BENGALI LETTER KHANDA TA
-                 U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09A4/U+09CD/U+09A8: "ত্ন" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09A4/U+09CD/U+09AC: "ত্ব" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A4/U+09CD/U+09AE: "ত্ম" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER MA -->
-            <Key
-                latin:keySpec="&#x09A4;"
-                latin:keyHintLabel="&#x09EB;"
-                latin:additionalMoreKeys="&#x09EB;"
-                latin:moreKeys="&#x09CE;,&#x09A4;&#x09CD;&#x09A4;,&#x09A4;&#x09CD;&#x09A8;,&#x09A4;&#x09CD;&#x09AC;,&#x09A4;&#x09CD;&#x09AE;" />
-            <!-- U+09DF: "য়" BENGALI LETTER YYA
-                 U+09EC: "৬" BENGALI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x09DF;"
-                latin:keyHintLabel="&#x09EC;"
-                latin:additionalMoreKeys="&#x09EC;" />
-            <!-- U+09C1: "ু" BENGALI VOWEL SIGN U
-                 U+09ED: "৭" BENGALI DIGIT SEVEN
-                 U+0989: "উ" BENGALI LETTER U -->
-            <Key
-                latin:keySpec="&#x09C1;"
-                latin:keyHintLabel="&#x09ED;"
-                latin:additionalMoreKeys="&#x09ED;"
-                latin:moreKeys="&#x0989;" />
-            <!-- U+09BF: "ি" BENGALI VOWEL SIGN I
-                 U+09EE: "৮" BENGALI DIGIT EIGHT
-                 U+0987: "ই BENGALI LETTER I -->
-            <Key
-                latin:keySpec="&#x09BF;"
-                latin:keyHintLabel="&#x09EE;"
-                latin:additionalMoreKeys="&#x09EE;"
-                latin:moreKeys="&#x0987;" />
-            <!-- U+09CB: "ো" BENGALI VOWEL SIGN O
-                 U+09EF: "৯" BENGALI DIGIT NINE
-                 U+0993: "ও" BENGALI LETTER O -->
-            <Key
-                latin:keySpec="&#x09CB;"
-                latin:keyHintLabel="&#x09EF;"
-                latin:additionalMoreKeys="&#x09EF;"
-                latin:moreKeys="&#x0993;" />
-            <!-- U+09AA: "প" BENGALI LETTER PA
-                 U+09E6: "০" BENGALI DIGIT ZERO
-                 U+09AA/U+09CD/U+09A4: "প্ত" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09AA/U+09CD/U+09A8: "প্ন" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09AA/U+09CD/U+09AA: "প্প" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09AA/U+09CD/U+09AF: "প্য" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09AA/U+09CD/U+09B0: "প্র" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AA/U+09CD/U+09B2: "প্ল" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER LA
-                 U+09AA/U+09CD/U+09B8: "প্স" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER SA -->
-            <Key
-                latin:keySpec="&#x09AA;"
-                latin:keyHintLabel="&#x09E6;"
-                latin:additionalMoreKeys="&#x09E6;"
-                latin:moreKeys="&#x09AA;&#x09CD;&#x09A4;,&#x09AA;&#x09CD;&#x09A8;,&#x09AA;&#x09CD;&#x09AA;,&#x09AA;&#x09CD;&#x09AF;,&#x09AA;&#x09CD;&#x09B0;,&#x09AA;&#x09CD;&#x09B2;,&#x09AA;&#x09CD;&#x09B8;" />
-            <!-- U+0986: "আ" BENGALI LETTER AA -->
-            <Key latin:keySpec="&#x0986;" />
-        </default>
-    </switch>
-</merge>
diff --git a/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml b/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml
deleted file mode 100644
index 743dec0d4..000000000
--- a/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0985: "অ" BENGALI LETTER A -->
-            <Key latin:keySpec="&#x0985;" />
-            <!-- U+09B6: "শ" BENGALI LETTER SHA
-                 U+09B6/U+09CD/U+099A: "শ্চ" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER CA
-                 U+09B6/U+09CD/U+099B: "শ্ছ" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA
-                 U+09B6/U+09CD/U+09A4: "শ্ত" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09B6/U+09CD/U+09A8: "শ্ন" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09B6/U+09CD/U+09AC: "শ্ব" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B6/U+09CD/U+09AE: "শ্ম" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09B6/U+09CD/U+09B0: "শ্র" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09B6/U+09CD/U+09B2: "শ্ল" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09B6;"
-                latin:moreKeys="&#x09B6;&#x09CD;&#x099A;,&#x09B6;&#x09CD;&#x099B;,&#x09B6;&#x09CD;&#x09A4;,&#x09B6;&#x09CD;&#x09A8;,&#x09B6;&#x09CD;&#x09AC;,&#x09B6;&#x09CD;&#x09AE;,&#x09B6;&#x09CD;&#x09B0;,&#x09B6;&#x09CD;&#x09B2;" />
-            <!-- U+09A1: "ড" BENGALI LETTER DDA
-                 U+09A1/U+09CD/U+09A1: "ড্ড" BENGALI LETTER DDA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA-->
-            <Key
-                latin:keySpec="&#x09A1;"
-                latin:moreKeys="&#x09A1;&#x09CD;&#x09A1;" />
-            <!-- U+09DD: "ঢ়" BENGALI LETTER RHA -->
-            <Key latin:keySpec="&#x09DD;" />
-            <!-- U+0998: "ঘ" BENGALI LETTER GHA -->
-            <Key latin:keySpec="&#x0998;" />
-            <!-- U+09B9: "হ" BENGALI LETTER HA
-                 U+09BD: "ঽ" BENGALI SIGN AVAGRAHA
-                 U+09B9/U+09CD/U+09A3: "হ্ণ" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA
-                 U+09B9/U+09CD/U+09A8: "হ্ন" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09B9/U+09CD/U+09AC: "হ্ব" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B9/U+09CD/U+09AE: "হ্ম" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09B9/U+09CD/U+09B0: "হ্র" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09B9/U+09CD/U+09B2: "হ্ল" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09B9;"
-                latin:moreKeys="&#x09BD;,&#x09B9;&#x09CD;&#x09A3;,&#x09B9;&#x09CD;&#x09A8;,&#x09B9;&#x09CD;&#x09AC;,&#x09B9;&#x09CD;&#x09AE;,&#x09B9;&#x09CD;&#x09B0;,&#x09B9;&#x09CD;&#x09B2;" />
-            <!-- U+099D: "ঝ" BENGALI LETTER JHA -->
-            <Key latin:keySpec="&#x099D;" />
-            <!-- U+0996: "খ" BENGALI LETTER KHA -->
-            <Key latin:keySpec="&#x0996;" />
-            <!-- U+09CE: "ৎ" BENGALI LETTER KHANDA TA -->
-            <Key latin:keySpec="&#x09CE;" />
-            <!-- U+0988: "ঈ" BENGALI LETTER II -->
-            <Key latin:keySpec="&#x0988;" />
-            <!-- U+098A: "ঊ" BENGALI LETTER UU -->
-            <Key latin:keySpec="&#x098A;" />
-        </case>
-        <default>
-            <!-- U+09BE: "া BENGALI VOWEL SIGN AA
-                 U+0986: "আ" BENGALI LETTER AA -->
-            <Key
-                latin:keySpec="&#x09BE;"
-                latin:moreKeys="&#x0986;" />
-            <!-- U+09B8: "স" BENGALI LETTER SA
-                 U+09B8/U+09CD/U+09AC: "স্ব" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B8/U+09CD/U+09A4: "স্ত" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09B8/U+09CD/U+099F: "স্ট" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09B8/U+09CD/U+0995: "স্ক" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+09B8/U+09CD/U+09AA: "স্প" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER PA -->
-            <Key
-                latin:keySpec="&#x09B8;"
-                latin:moreKeys="&#x09B8;&#x09CD;&#x09AC;,&#x09B8;&#x09CD;&#x09A4;,&#x09B8;&#x09CD;&#x099F;,&#x09B8;&#x09CD;&#x0995;,&#x09B8;&#x09CD;&#x09AA;" />
-            <!-- U+09A6: "দ" BENGALI LETTER DA
-                 U+09A6/U+09CD/U+09A6: "দ্দ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09A6/U+09CD/U+09A7: "দ্ধ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09A6/U+09CD/U+09AC: "দ্ব" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A6/U+09CD/U+09AD: "দ্ভ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER BHA
-                 U+09A6/U+09CD/U+09AE: "দ্ম" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09A6/U+09CD/U+09AF: "দ্য" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09A6/U+09CD/U+09B0: "দ্র" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x09A6;"
-                latin:moreKeys="&#x09A6;&#x09CD;&#x09A6;,&#x09A6;&#x09CD;&#x09A7;,&#x09A6;&#x09CD;&#x09AC;,&#x09A6;&#x09CD;&#x09AD;,&#x09A6;&#x09CD;&#x09AE;,&#x09A6;&#x09CD;&#x09AF;,&#x09A6;&#x09CD;&#x09B0;" />
-            <!-- U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R
-                 U+098B: "ঋ" BENGALI LETTER VOCALIC R -->
-            <Key
-                latin:keySpec="&#x09C3;"
-                latin:moreKeys="&#x098B;" />
-            <!-- U+0997: "গ" BENGALI LETTER GA
-                 U+0997/U+09CD/U+09A7: "গ্ধ" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+0997/U+09CD/U+09B0: "গ্র" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+0997/U+09CD/U+09B2: "গ্ল" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER LA
-                 U+0997/U+09CD/U+09A8: "গ্ন" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER NA -->
-            <Key
-                latin:keySpec="&#x0997;"
-                latin:moreKeys="&#x0997;&#x09CD;&#x09A7;,&#x0997;&#x09CD;&#x09B0;,&#x0997;&#x09CD;&#x09B2;,&#x0997;&#x09CD;&#x09A8;" />
-            <!-- U+09CD: "্" BENGALI SIGN VIRAMA -->
-            <Key latin:keySpec="&#x09CD;" />
-            <!-- U+099C: "জ" BENGALI LETTER JA
-                 U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA
-                 U+099C/U+09CD/U+099C: "জ্জ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER JA
-                 U+099C/U+09CD/U+09AF: "জ্ব" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+099C/U+09CD/U+09AC: "জ্য" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+099C/U+09CD/U+09B0: "জ্র" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x099C;"
-                latin:moreKeys="&#x099C;&#x09CD;&#x099E;,&#x099C;&#x09CD;&#x099C;,&#x099C;&#x09CD;&#x09AF;,&#x099C;&#x09CD;&#x09AC;,&#x099C;&#x09CD;&#x09B0;" />
-            <!-- U+0995: "ক" BENGALI LETTER KA
-                 U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA
-                 U+0995/U+09CD/U+0995: "ক্ক" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+0995/U+09CD/U+099F: "ক্ট" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+0995/U+09CD/U+09A4: "ক্ত" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+0995/U+09CD/U+09B0: "ক্র" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+0995/U+09CD/U+09B8: "ক্স" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SA
-                 U+0995/U+09CD/U+09B2: "ক্ল" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x0995;"
-                latin:moreKeys="&#x0995;&#x09CD;&#x09B7;,&#x0995;&#x09CD;&#x0995;,&#x0995;&#x09CD;&#x099F;,&#x0995;&#x09CD;&#x09A4;,&#x0995;&#x09CD;&#x09B0;,&#x0995;&#x09CD;&#x09B8;,&#x0995;&#x09CD;&#x09B2;" />
-            <!-- U+09B2: "ল" BENGALI LETTER LA
-                 U+09B2/U+09CD/U+0995: "ল্ক" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+09B2/U+09CD/U+0997: "ল্গ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER GA
-                 U+09B2/U+09CD/U+099F: "ল্ট" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09B2/U+09CD/U+09A1: "ল্ড" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA
-                 U+09B2/U+09CD/U+09A4: "ল্ত" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09B2/U+09CD/U+09A6: "ল্দ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09B2/U+09CD/U+09A7: "ল্ধ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09B2/U+09CD/U+09AA: "ল্প" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09B2/U+09CD/U+09AB: "ল্ফ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER PHA
-                 U+09B2/U+09CD/U+09AC: "ল্ব" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B2/U+09CD/U+09AE: "ল্ম" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09B2/U+09CD/U+09B2: "ল্ল" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09B2;"
-                latin:moreKeys="&#x09B2;&#x09CD;&#x0995;,&#x09B2;&#x09CD;&#x0997;,&#x09B2;&#x09CD;&#x099F;,&#x09B2;&#x09CD;&#x09A1;,&#x09B2;&#x09CD;&#x09A4;,&#x09B2;&#x09CD;&#x09A6;,&#x09B2;&#x09CD;&#x09A7;,&#x09B2;&#x09CD;&#x09AA;,&#x09B2;&#x09CD;&#x09AB;,&#x09B2;&#x09CD;&#x09AC;,&#x09B2;&#x09CD;&#x09AE;,&#x09B2;&#x09CD;&#x09B2;" />
-            <!-- U+0987: "ই" BENGALI LETTER I -->
-            <Key latin:keySpec="&#x0987;" />
-            <!-- U+0989: "উ" BENGALI LETTER U -->
-            <Key latin:keySpec="&#x0989;" />
-        </default>
-    </switch>
-</merge>
diff --git a/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml b/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml
deleted file mode 100644
index d5bb4d1db..000000000
--- a/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0964: "।" DEVANAGARI DANDA
-                 U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-            <Key
-                 latin:keySpec="&#x0964;"
-                 latin:moreKeys="&#x0965;" />
-            <!-- U+0999: "ঙ BENGALI LETTER NGA
-                 U+0999/U+09CD/U+0995: "ঙ্ক"
-                 U+0999/U+09CD/U+0996: "ঙ্খ"
-                 U+0999/U+09CD/U+0997: "ঙ্গ" -->
-            <Key latin:keySpec="&#x0999;"
-                 latin:moreKeys="&#x0999;&#x09CD;&#x0995;,&#x0999;&#x09CD;&#x0996;,&#x0999;&#x09CD;&#x0997;" />
-            <!-- U+099B: "ছ" BENGALI LETTER CHA -->
-            <Key latin:keySpec="&#x099B;" />
-            <!-- U+0983: "ঃ" BENGALI SIGN VISARGA -->
-            <Key latin:keySpec="&#x0983;" />
-            <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU -->
-            <Key latin:keySpec="&#x0981;" />
-            <!-- U+09A3: "ণ" BENGALI LETTER NNA
-                 U+09A3/U+09CD/U+099F: "ণ্ট" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09A3/U+09CD/U+09A1: "ণ্ড" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA
-                 U+09A3/U+09CD/U+09A3: "ণ্ণ" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA -->
-            <Key latin:keySpec="&#x09A3;"
-                 latin:moreKeys="&#x09A3;&#x09CD;&#x099F;,&#x09A3;&#x09CD;&#x09A1;,&#x09A3;&#x09CD;&#x09A3;" />
-            <!-- U+0982: "ং" BENGALI SIGN ANUSVARA -->
-            <Key latin:keySpec="&#x0982;" />
-            <!-- U+0990: "ঐ" BENGALI LETTER AI -->
-            <Key latin:keySpec="&#x0990;" />
-            <!-- U+0994: "ঔ" BENGALI LETTER AU -->
-            <Key latin:keySpec="&#x0994;" />
-        </case>
-        <default>
-            <!-- U+09AF: "য" BENGALI LETTER YA
-                 U+09CD/U+09AF: "্য" BENGALI SIGN VIRAMA/BENGALI LETTER YA -->
-            <Key
-                 latin:keySpec="&#x09AF;"
-                 latin:moreKeys="&#x09CD;&#x09AF;" />
-            <!-- U+09B7: "ষ" BENGALI LETTER SSA
-                 U+09B7/U+09CD/U+0995: "ষ্ক" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+09B7/U+09CD/U+099F: "ষ্ট" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09B7/U+09CD/U+09A0: "ষ্ঠ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER TTHA
-                 U+09B7/U+09CD/U+09A3: "ষ্ণ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA
-                 U+09B7/U+09CD/U+09AA: "ষ্প" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09B7/U+09CD/U+09AB: "ষ্ফ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER PHA
-                 U+09B7/U+09CD/U+09AE: "ষ্ম" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER MA -->
-            <Key
-                 latin:keySpec="&#x09B7;"
-                 latin:moreKeys="&#x09B7;&#x09CD;&#x0995;,&#x09B7;&#x09CD;&#x099F;,&#x09B7;&#x09CD;&#x09A0;,&#x09B7;&#x09CD;&#x09A3;,&#x09B7;&#x09CD;&#x09AA;,&#x09B7;&#x09CD;&#x09AB;,&#x09B7;&#x09CD;&#x09AE;" />
-            <!-- U+099A: "চ" BENGALI LETTER CA
-                 U+099A/U+09CD/U+099A: "চ্চ" BENGALI LETTER CA/BENGALI SIGN VIRAMA/BENGALI LETTER CA
-                 U+099A/U+09CD/U+099B: "চ্ছ" BENGALI LETTER CA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA -->
-            <Key
-                 latin:keySpec="&#x099A;"
-                 latin:moreKeys="&#x099A;&#x09CD;&#x099A;,&#x099A;&#x09CD;&#x099B;" />
-            <!-- U+09AD: "ভ" BENGALI LETTER BHA
-                 U+09AD/U+09CD/U+09AF: "ভ্" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09AD/U+09CD/U+09B0: "ভ্র" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AD/U+09CD/U+09B2: "ভ্ল" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                 latin:keySpec="&#x09AD;"
-                 latin:moreKeys="&#x09AD;&#x09CD;&#x09AF;,&#x09AD;&#x09CD;&#x09B0;,&#x09AD;&#x09CD;&#x09B2;" />
-            <!-- U+09AC: "ব" BENGALI LETTER BA
-                 U+09CD/U+09AC: "্ব" BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09AC/U+09CD/U+09B0: "ব্র" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AC/U+09CD/U+099C: "ব্জ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER JA
-                 U+09AC/U+09CD/U+09A6: "ব্দ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09AC/U+09CD/U+09A7: "ব্ধ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09AC/U+09CD/U+09AC: "ব্ব" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09AC/U+09CD/U+09B2: "ব্ল" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER LA
-                 U+09F1: "ৱ" BENGALI LETTER RA WITH MIDDLE DIAGONAL
-                 U+09F0: "ৰ" BENGALI LETTER RA WITH LOWER DIAGONAL -->
-            <Key
-                 latin:keySpec="&#x09AC;"
-                 latin:moreKeys="&#x09CD;&#x09AC;,&#x09AC;&#x09CD;&#x09B0;,&#x09AC;&#x09CD;&#x099C;,&#x09AC;&#x09CD;&#x09A6;,&#x09AC;&#x09CD;&#x09A7;,&#x09AC;&#x09CD;&#x09AC;,&#x09AC;&#x09CD;&#x09B2;,&#x09F1;,&#x09F0;" />
-            <!-- U+09A8: "ন" BENGALI LETTER NA
-                 U+09A8/U+09CD/U+09A4: "ন্ত" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09A8/U+09CD/U+09A5: "ন্থ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER THA
-                 U+09A8/U+09CD/U+099F: "ন্ট" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09A8/U+09CD/U+09A6: "ন্দ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09A8/U+09CD/U+09A7: "ন্ধ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09A8/U+09CD/U+09A1: "ন্ড" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA
-                 U+09A8/U+09CD/U+09A8: "ন্ন" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09A8/U+09CD/U+09AC: "ন্ব" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A8/U+09CD/U+09AE: "ন্ম" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09A8/U+09CD/U+09B8: "ন্স" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER SA -->
-            <Key
-                 latin:keySpec="&#x09A8;"
-                 latin:moreKeys="&#x09A8;&#x09CD;&#x09A4;,&#x09A8;&#x09CD;&#x09A5;,&#x09A8;&#x09CD;&#x099F;,&#x09A8;&#x09CD;&#x09A6;,&#x09A8;&#x09CD;&#x09A7;,&#x09A8;&#x09CD;&#x09A1;,&#x09A8;&#x09CD;&#x09A8;,&#x09A8;&#x09CD;&#x09AC;,&#x09A8;&#x09CD;&#x09AE;,&#x09A8;&#x09CD;&#x09B8;" />
-            <!-- U+09AE: "ম" BENGALI LETTER MA
-                 U+09AE/U+09CD/U+09A8: "ম্ন" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09AE/U+09CD/U+09AA: "ম্প" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09AE/U+09CD/U+09AC: "ম্ব" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09AE/U+09CD/U+09AD: "ম্ভ" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER BHA
-                 U+09AE/U+09CD/U+09AE: "ম্ম" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09AE/U+09CD/U+09B0: "ম্র" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AE/U+09CD/U+09B2: "ম্ল" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                 latin:keySpec="&#x09AE;"
-                 latin:moreKeys=",&#x09AE;&#x09CD;&#x09A8;,&#x09AE;&#x09CD;&#x09AA;,&#x09AE;&#x09CD;&#x09AC;,&#x09AE;&#x09CD;&#x09AD;,&#x09AE;&#x09CD;&#x09AE;,&#x09AE;&#x09CD;&#x09B0;,&#x09AE;&#x09CD;&#x09B2;" />
-            <!-- U+098F: "এ" BENGALI LETTER E -->
-            <Key latin:keySpec="&#x098F;" />
-            <!-- U+0993: "ও" BENGALI LETTER O -->
-            <Key latin:keySpec="&#x0993;" />
-        </default>
-    </switch>
-</merge>
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml
new file mode 100644
index 000000000..dbe3430a3
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** bn-unijoy Bengali input method simulating Unijoy keyboard.
+** Copyright (C) 2005, 2008
+**   National Institute of Advanced Industrial Science and Technology (AIST)
+**   Registration Number H15PRO112
+
+** This file is part of the m17n database; a sub-part of the m17n
+** library.
+
+** The m17n library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public License
+** as published by the Free Software Foundation; either version 2.1 of
+** the License, or (at your option) any later version.
+
+** The m17n library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+
+** You should have received a copy of the GNU Lesser General Public
+** License along with the m17n library; if not, write to the Free
+** Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA.
+*/
+-->
+
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <switch>
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+            <!-- bengali sign anusvara -->
+            <Key latin:keySpec="&#2434;" />
+            <!-- bengali letter yya -->
+            <Key latin:keySpec="&#2527;" />
+            <!-- bengali letter ddha -->
+            <Key latin:keySpec="&#2466;" />
+            <!-- 	bengali letter pha -->
+            <Key latin:keySpec="&#2475;" />
+            <!-- 	bengali letter ttha -->
+            <Key latin:keySpec="&#2464;" />
+            <!-- 	bengali letter cha -->
+            <Key latin:keySpec="&#2459;" />
+            <!-- bengali letter jha -->
+            <Key latin:keySpec="&#2461;" />
+            <!-- bengali letter nya -->
+            <Key latin:keySpec="&#2462;" />
+            <!-- bengali letter gha -->
+            <Key latin:keySpec="&#2456;" />
+            <!-- bengali letter rha -->
+            <Key latin:keySpec="&#2525;" />
+        </case>
+        <default>
+            <!-- bengali letter nga
+                 bengali sign anusvara
+                 bengali digit one -->
+            <Key
+                latin:keySpec="&#2457;"
+                latin:keyHintLabel="&#2434;"
+                latin:additionalMoreKeys="&#2434;"
+                latin:moreKeys="&#2535;" />
+            <!-- bengali letter ya
+                 bengali letter yya
+                 bengali digit two -->
+            <Key
+                latin:keySpec="&#2479;"
+                latin:keyHintLabel="&#2527;"
+                latin:additionalMoreKeys="&#2527;"
+                latin:moreKeys="&#2536;" />
+            <!-- bengali letter dda
+                 bengali letter ddha
+                 bengali digit three -->
+            <Key
+                latin:keySpec="&#2465;"
+                latin:keyHintLabel="&#2466;"
+                latin:additionalMoreKeys="&#2466;"
+                latin:moreKeys="&#2537;" />
+            <!-- bengali letter pa
+                 bengali letter pha
+                 bengali digit four -->
+            <Key
+                latin:keySpec="&#2474;"
+                latin:keyHintLabel="&#2475;"
+                latin:additionalMoreKeys="&#2475;"
+                latin:moreKeys="&#2538;" />
+            <!-- bengali letter tta
+                 bengali letter ttha
+                 bengali digit five -->
+            <Key
+                latin:keySpec="&#2463;"
+                latin:keyHintLabel="&#2464;"
+                latin:additionalMoreKeys="&#2464;"
+                latin:moreKeys="&#2539;" />
+            <!-- bengali letter ca
+                 bengali letter cha
+                 bengali digit six -->
+            <Key
+                latin:keySpec="&#2458;"
+                latin:keyHintLabel="&#2459;"
+                latin:additionalMoreKeys="&#2459;"
+                latin:moreKeys="&#2540;" />
+            <!-- bengali letter ja
+                 bengali letter jha
+                 bengali digit seven -->
+            <Key
+                latin:keySpec="&#2460;"
+                latin:keyHintLabel="&#2461;"
+                latin:additionalMoreKeys="&#2461;"
+                latin:moreKeys="&#2541;" />
+            <!-- bengali letter ha
+                 bengali letter nya
+                 bengali digit eight -->
+            <Key
+                latin:keySpec="&#2489;"
+                latin:keyHintLabel="&#2462;"
+                latin:additionalMoreKeys="&#2462;"
+                latin:moreKeys="&#2542;" />
+            <!-- bengali letter ga
+                 bengali letter gha
+                 bengali digit nine -->
+            <Key
+                latin:keySpec="&#2455;"
+                latin:keyHintLabel="&#2456;"
+                latin:additionalMoreKeys="&#2456;"
+                latin:moreKeys="&#2543;" />
+            <!-- bengali letter rra
+                 bengali letter rha
+                 bengali digit zero -->
+            <Key
+                latin:keySpec="&#2524;"
+                latin:keyHintLabel="&#2525;"
+                latin:additionalMoreKeys="&#2525;"
+                latin:moreKeys="&#2534;" />
+        </default>
+    </switch>
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy2.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy2.xml
new file mode 100644
index 000000000..a4c7b87d5
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy2.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** bn-unijoy Bengali input method simulating Unijoy keyboard.
+** Copyright (C) 2005, 2008
+**   National Institute of Advanced Industrial Science and Technology (AIST)
+**   Registration Number H15PRO112
+
+** This file is part of the m17n database; a sub-part of the m17n
+** library.
+
+** The m17n library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public License
+** as published by the Free Software Foundation; either version 2.1 of
+** the License, or (at your option) any later version.
+
+** The m17n library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+
+** You should have received a copy of the GNU Lesser General Public
+** License along with the m17n library; if not, write to the Free
+** Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <switch>
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+            <!-- bengali ligature reph -->
+            <Key
+                latin:keySpec="&#11789;|&#2480;&#x09CD;"
+                latin:keyHintLabel="&#x22EF;"
+                latin:additionalMoreKeys="&#2528;"
+                latin:moreKeys="&#2444;,&#2529;,&#2500;,&#2530;,&#2531;" />
+            <!-- bengali vowel sign uu
+                 bengali letter uu -->
+            <Key
+                latin:keySpec="&#2498;"
+                latin:keyHintLabel="&#2442;"
+                latin:moreKeys="&#2442;" />
+            <!-- bengali vowel sign ii
+                 bengali letter ii -->
+            <Key
+                latin:keySpec="&#2496;"
+                latin:keyHintLabel="&#2440;"
+                latin:moreKeys="&#2440;" />
+            <!-- bengali vowel sign a -->
+            <Key latin:keySpec="&#2437;" />
+            <!-- bengali sign candrabindu -->
+            <Key
+                latin:keySpec="&#2433;"
+                latin:keyHintLabel="&#x22EF;"
+                latin:additionalMoreKeys="&#2554;"
+                latin:moreKeys="&#2519;,&#2492;,&#2544;,&#2545;,&#2493;" />
+            <!-- 	bengali letter bha -->
+            <Key latin:keySpec="&#2477;" />
+            <!-- bengali letter kha -->
+            <Key latin:keySpec="&#2454;" />
+            <!-- bengali letter tha -->
+            <Key latin:keySpec="&#2469;" />
+            <!-- bengali letter dha -->
+            <Key latin:keySpec="&#2471;" />
+        </case>
+        <default>
+            <!-- bengali vowel sign vocalic r
+                 bengali letter vocalic r -->
+            <Key
+                latin:keySpec="&#2499;"
+                latin:keyHintLabel="&#2443;"
+                latin:moreKeys="&#2443;" />
+            <!-- bengali vowel sign u
+                 bengali letter u -->
+            <Key
+                latin:keySpec="&#2497;"
+                latin:keyHintLabel="&#2441;"
+                latin:moreKeys="&#2441;" />
+            <!-- bengali vowel sign i
+                 bengali letter i -->
+            <Key
+                latin:keySpec="&#2495;"
+                latin:keyHintLabel="&#2439;"
+                latin:moreKeys="&#2439;" />
+            <!-- bengali vowel sign aa
+                 bengali letter aa -->
+            <Key
+                latin:keySpec="&#2494;"
+                latin:keyHintLabel="&#2438;"
+                latin:additionalMoreKeys="&#2438;"
+                latin:moreKeys="&#2437;" />
+            <!-- bengali sign virama
+                 bengali sign candrabindu -->
+            <Key
+                latin:keySpec="&#x09CD;"
+                latin:keyHintLabel="&#2433;"
+                latin:additionalMoreKeys="&#2433;"
+                latin:moreKeys="&#2435;" />
+            <!-- bengali letter ba
+                 bengali letter bha -->
+            <Key
+                latin:keySpec="&#2476;"
+                latin:keyHintLabel="&#2477;"
+                latin:moreKeys="&#2477;" />
+            <!-- bengali letter ka
+                 bengali letter kha -->
+            <Key
+                latin:keySpec="&#2453;"
+                latin:keyHintLabel="&#2454;"
+                latin:moreKeys="&#2454;" />
+            <!-- bengali letter ta
+                 bengali letter tha
+                 bengali letter khanda ta -->
+            <Key
+                latin:keySpec="&#2468;"
+                latin:keyHintLabel="&#2469;"
+                latin:additionalMoreKeys="&#2469;"
+                latin:moreKeys="&#2510;" />
+            <!-- bengali letter da
+                 bengali letter dha -->
+            <Key
+                latin:keySpec="&#2470;"
+                latin:keyHintLabel="&#2471;"
+                latin:moreKeys="&#2471;" />
+        </default>
+    </switch>
+</merge>
+
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy3.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy3.xml
new file mode 100644
index 000000000..6dfcc51b4
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy3.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** bn-unijoy Bengali input method simulating Unijoy keyboard.
+** Copyright (C) 2005, 2008
+**   National Institute of Advanced Industrial Science and Technology (AIST)
+**   Registration Number H15PRO112
+
+** This file is part of the m17n database; a sub-part of the m17n
+** library.
+
+** The m17n library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public License
+** as published by the Free Software Foundation; either version 2.1 of
+** the License, or (at your option) any later version.
+
+** The m17n library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+
+** You should have received a copy of the GNU Lesser General Public
+** License along with the m17n library; if not, write to the Free
+** Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <switch>
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+            <!-- bengali ligature ya-phala -->
+            <Key latin:keySpec="&#2509;&#2479;" />
+            <!-- bengali vowel sign au -->
+            <Key latin:keySpec="&#2508;"
+                 latin:keyHintLabel="&#2452;"
+                 latin:moreKeys="&#2452;" />
+            <!-- bengali vowel sign ai -->
+            <Key latin:keySpec="&#2504;"
+                 latin:keyHintLabel="&#2448;"
+                 latin:moreKeys="&#2448;" />
+            <!-- bengali letter la -->
+            <Key latin:keySpec="&#2482;" />
+            <!-- bengali letter nna -->
+            <Key latin:keySpec="&#2467;" />
+            <!-- bengali letter ssa -->
+            <Key latin:keySpec="&#2487;" />
+            <!-- bengali letter sha -->
+            <Key latin:keySpec="&#2486;" />
+        </case>
+        <default>
+            <!-- bengali ligature ra-phala -->
+            <Key latin:keySpec="&#2509;&#2480;"
+                 latin:keyHintLabel="&#2509;&#2479;"
+                 latin:moreKeys="&#2509;&#2479;" />
+            <!-- bengali vowel sign o -->
+            <Key latin:keySpec="&#2507;"
+                 latin:keyHintLabel="&#2451;"
+                 latin:moreKeys="&#2451;" />
+            <!-- bengali vowel sign e -->
+            <Key latin:keySpec="&#2503;"
+                 latin:keyHintLabel="&#2447;"
+                 latin:moreKeys="&#2447;" />
+            <!-- bengali letter ra -->
+            <Key latin:keySpec="&#2480;"
+                 latin:keyHintLabel="&#2482;"
+                 latin:additionalMoreKeys="&#2482;"
+                 latin:moreKeys="&#2480;&#8205;&#2509;&#2479;" />
+            <!-- bengali letter na -->
+            <Key latin:keySpec="&#2472;"
+                 latin:keyHintLabel="&#2467;"
+                 latin:moreKeys="&#2467;" />
+            <!-- bengali letter sa -->
+            <Key latin:keySpec="&#2488;"
+                 latin:keyHintLabel="&#2487;"
+                 latin:moreKeys="&#2487;" />
+            <!-- bengali letter ma -->
+            <Key latin:keySpec="&#2478;"
+                latin:keyHintLabel="&#2486;"
+                latin:moreKeys="&#2486;" />
+        </default>
+    </switch>
+</merge>
diff --git a/app/src/main/res/xml/rows_bengali_akkhor.xml b/app/src/main/res/xml/rows_bengali_akkhor.xml
deleted file mode 100644
index 7b624aa73..000000000
--- a/app/src/main/res/xml/rows_bengali_akkhor.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <switch>
-        <case
-            latin:numberRowEnabled="true"
-            >
-            <Row
-                latin:keyWidth="10%p"
-                >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
-            </Row>
-        </case>
-    </switch>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor1" />
-    </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor2" />
-    </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.711%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/app/src/main/res/xml/rows_bengali_unijoy.xml b/app/src/main/res/xml/rows_bengali_unijoy.xml
new file mode 100644
index 000000000..5a9a0c400
--- /dev/null
+++ b/app/src/main/res/xml/rows_bengali_unijoy.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case latin:numberRowEnabled="true">
+            <Row latin:keyWidth="10%p">
+                <include latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
+    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="10%p">
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1" />
+    </Row>
+    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="10%p">
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2" />
+    </Row>
+    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="10%p">
+        <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="15%p" latin:visualInsetsRight="1%p" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3" />
+        <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" latin:visualInsetsLeft="1%p" />
+    </Row>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>