diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
index c885a4999..671132260 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -799,9 +799,9 @@ public final class KeyboardTextsTable {
         null, null, null, null,
         /* ~ morekeys_u */
         // Label for "switch to alphabetic" key.
-        // U+0995: "क" BENGALI LETTER KA
-        // U+0996: "ख" BENGALI LETTER KHA
-        // U+0997: "ग" BENGALI LETTER GA
+        // U+0995: "ক" BENGALI LETTER KA
+        // U+0996: "খ" BENGALI LETTER KHA
+        // U+0997: "গ" BENGALI LETTER GA
         /* keylabel_to_alpha */ "\u0995\u0996\u0997",
         /* morekeys_i ~ */
         null, null, null, null, null, null,
diff --git a/app/src/main/res/xml-sw600dp-land/rows_bengali_unijoy.xml b/app/src/main/res/xml-sw600dp-land/rows_bengali_unijoy.xml
new file mode 100644
index 000000000..f525e3df0
--- /dev/null
+++ b/app/src/main/res/xml-sw600dp-land/rows_bengali_unijoy.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
+    <!-- First row -->
+    <Row>
+        <switch>
+            <!-- Split keyboard layout for the first row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1_left5"
+                    latin:keyWidth="7.0%p" />
+                <Spacer
+                    latin:keyWidth="20.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1_right5"
+                    latin:keyWidth="7.0%p" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="10.0%p" />
+            </case>
+            <!-- Regular layout for the first row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
+    </Row>
+    <!-- Second row -->
+    <Row>
+        <switch>
+            <!-- Split keyboard layout for the second row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2_left5"
+                    latin:keyXPos="4.0%p"
+                    latin:keyWidth="7.0%p" />
+                <Spacer
+                    latin:keyWidth="23.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2_right4"
+                    latin:keyWidth="7.0%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="10.0%p" />
+            </case>
+            <!-- Regular layout for the second row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2"
+                    latin:keyXPos="4.5%p"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
+    </Row>
+    <!-- Third row -->
+    <Row>
+        <switch>
+            <!-- Split keyboard layout for the third row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3_left4"
+                    latin:keyWidth="7.0%p" />
+                <Spacer
+                    latin:keyWidth="17.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3_right3"
+                    latin:keyWidth="7.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"
+                    latin:keyWidth="7.0%p" />
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+            </case>
+            <!-- Regular layout for the third row -->
+            <default>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3"
+                    latin:keyWidth="9.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
+    </Row>
+    <!-- Fourth row -->
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
index 762b449dc..79826c7a3 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2014, The Android Open Source Project
+** Copyright 2011, 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.
@@ -18,39 +18,121 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common"/>
-    <include latin:keyboardLayout="@xml/row_optional_number_row" />
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="9.0%p">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1"/>
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"/>
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+    >
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <!-- TODO: Consolidate the layout specification between protrait and landscape.
+         Ideally just the keyWidth should be different and the spacer should adjust to fill
+         the available space. -->
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
+    <!-- First row -->
+    <Row>
+        <switch>
+            <!-- Split keyboard layout for the first row -->
+            <case
+                latin:isSplitLayout="true"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1_left5"
+                    latin:keyWidth="8.0%p" />
+                <Spacer
+                    latin:keyWidth="10.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1_right5"
+                    latin:keyWidth="8.0%p" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="10.0%p" />
+            </case>
+            <!-- Regular layout for the first row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
     </Row>
-    <Row latin:keyLabelFlags="fontNormal">
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2"
-            latin:keyXPos="4.5%p"
-            latin:keyWidth="9.0%p"/>
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight"/>
+    <!-- Second row -->
+    <Row>
+        <switch>
+            <!-- Split keyboard layout for the second row -->
+            <case
+                latin:isSplitLayout="true"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2_left5"
+                    latin:keyXPos="4.0%p"
+                    latin:keyWidth="8.0%p" />
+                <Spacer
+                    latin:keyWidth="14.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2_right4"
+                    latin:keyWidth="8.0%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="10.0%p" />
+            </case>
+            <!-- Regular layout for the second row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2"
+                    latin:keyXPos="4.5%p"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
     </Row>
-    <Row latin:keyLabelFlags="fontNormal">
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p"/>
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3"
-            latin:keyWidth="9.0%p"/>
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question"
-            latin:keyWidth="9.0%p"/>
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight"/>
+    <!-- Third row -->
+    <Row>
+        <switch>
+            <!-- Split keyboard layout for the third row -->
+            <case
+                latin:isSplitLayout="true"
+                >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3_left4"
+                    latin:keyWidth="8.0%p" />
+                <Spacer
+                    latin:keyWidth="8.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3_right3"
+                    latin:keyWidth="8.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"
+                    latin:keyWidth="8.0%p" />
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+            </case>
+            <!-- Regular layout for the third row -->
+            <default>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3"
+                    latin:keyWidth="9.0%p" />
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"
+                    latin:keyWidth="9.0%p" />
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
     </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4"/>
+    <!-- Fourth row -->
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml b/app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml
index 3245bbd0b..e03b4037c 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bengali_unijoy.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2014, The Android Open Source Project
+** Copyright 2012, 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.
@@ -18,41 +18,28 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <Feature latin:supportedScript="bengali" />
+<KeyboardLayoutSet
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Feature
+        latin:supportedScript="bengali" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
         latin:elementName="alphabet"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
         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.-->
+        latin:enableProximityCharsCorrection="true"
+        latin:supportsSplitLayout="true" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
-        latin:elementName="alphabetManualShifted" />
+        latin:elementName="symbols"
+        latin:elementKeyboard="@xml/kbd_symbols" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
-        latin:elementName="alphabetShiftLocked" />
+        latin:elementName="symbolsShifted"
+        latin:elementKeyboard="@xml/kbd_symbols_shift" />
     <Element
-        latin:elementKeyboard="@xml/kbd_bengali_unijoy"
-        latin:elementName="alphabetShiftLockShifted" />
+        latin:elementName="phone"
+        latin:elementKeyboard="@xml/kbd_phone" />
     <Element
-        latin:elementKeyboard="@xml/kbd_symbols"
-        latin:elementName="symbols" />
+        latin:elementName="phoneSymbols"
+        latin:elementKeyboard="@xml/kbd_phone_symbols" />
     <Element
-        latin:elementKeyboard="@xml/kbd_symbols_shift"
-        latin:elementName="symbolsShifted" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone"
-        latin:elementName="phone" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone_symbols"
-        latin:elementName="phoneSymbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_number"
-        latin:elementName="number" />
+        latin:elementName="number"
+        latin:elementKeyboard="@xml/kbd_number" />
 </KeyboardLayoutSet>
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml
index dbe3430a3..c1a0bb433 100644
--- a/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy1.xml
@@ -2,137 +2,29 @@
 <!--
 /*
 **
-** 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.
+** Copyright 2012, 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">
-            <!-- 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
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+    >
+    <!-- nga, ya, dda, pa, tta -->
+    <include
+        latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1_left5" />
+    <!-- cha, jha, nya, gha, rha -->
+    <include
+        latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1_right5" />
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy1_left5.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy1_left5.xml
new file mode 100644
index 000000000..6f2d3e685
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy1_left5.xml
@@ -0,0 +1,88 @@
+<?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;" />
+        </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;" />
+        </default>
+    </switch>
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy1_right5.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy1_right5.xml
new file mode 100644
index 000000000..1cef90b35
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy1_right5.xml
@@ -0,0 +1,88 @@
+<?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 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 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
index a4c7b87d5..5651038be 100644
--- a/app/src/main/res/xml/rowkeys_bengali_unijoy2.xml
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy2.xml
@@ -2,129 +2,29 @@
 <!--
 /*
 **
-** 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.
+** Copyright 2012, 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">
-            <!-- 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
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+    >
+    <!-- r, u, i, aa, virama -->
+    <include
+        latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2_left5" />
+    <!-- ba, ka, ta, da -->
+    <include
+        latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2_right4" />
 </merge>
-
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy2_left5.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy2_left5.xml
new file mode 100644
index 000000000..f213f3762
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy2_left5.xml
@@ -0,0 +1,96 @@
+<?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;" />
+        </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;" />
+        </default>
+    </switch>
+</merge>
+
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy2_right4.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy2_right4.xml
new file mode 100644
index 000000000..9c3ca092a
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy2_right4.xml
@@ -0,0 +1,72 @@
+<?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 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 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
index 6dfcc51b4..cc31d52b0 100644
--- a/app/src/main/res/xml/rowkeys_bengali_unijoy3.xml
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy3.xml
@@ -2,83 +2,29 @@
 <!--
 /*
 **
-** 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.
+** Copyright 2012, 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">
-            <!-- 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
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+    >
+    <!-- ra-phala, o, e, ra -->
+    <include
+        latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3_left4" />
+    <!-- na, sa, ma -->
+    <include
+        latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3_right3" />
 </merge>
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy3_left4.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy3_left4.xml
new file mode 100644
index 000000000..3584eada9
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy3_left4.xml
@@ -0,0 +1,66 @@
+<?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;" />
+        </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;" />
+        </default>
+    </switch>
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_bengali_unijoy3_right3.xml b/app/src/main/res/xml/rowkeys_bengali_unijoy3_right3.xml
new file mode 100644
index 000000000..a06f12aff
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_bengali_unijoy3_right3.xml
@@ -0,0 +1,55 @@
+<?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 letter nna -->
+            <Key latin:keySpec="&#2467;" />
+            <!-- bengali letter ssa -->
+            <Key latin:keySpec="&#2487;" />
+            <!-- bengali letter sha -->
+            <Key latin:keySpec="&#2486;" />
+        </case>
+        <default>
+            <!-- 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_unijoy.xml b/app/src/main/res/xml/rows_bengali_unijoy.xml
index 92175b29a..7b7036941 100644
--- a/app/src/main/res/xml/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml/rows_bengali_unijoy.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2014, The Android Open Source Project
+** Copyright 2010, 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.
@@ -18,33 +18,40 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common"/>
-    <include latin:keyboardLayout="@xml/row_optional_number_row" />
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+    >
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="10%p">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1"/>
+        latin:keyWidth="10%p"
+        >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1" />
     </Row>
     <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="10%p">
+        latin:keyWidth="10%p"
+        >
         <include
             latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2"
-            latin:keyXPos="5%p"/>
+            latin:keyXPos="5%p" />
     </Row>
     <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="10%p">
+        latin:keyWidth="10%p"
+        >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p"/>
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3"/>
+            latin:visualInsetsRight="1%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p"/>
+            latin:visualInsetsLeft="1%p" />
     </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4"/>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>