diff --git a/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_0.xml b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_0.xml
new file mode 100644
index 000000000..05c6f06f9
--- /dev/null
+++ b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_0.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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">
+            <Key
+                latin:keySpec="&#x11a9;" />
+            <Key
+                latin:keySpec="&#x11b0;" />
+            <Key
+                latin:keySpec="&#x11bd;" />
+            <Key
+                latin:keySpec="&#x11b5;" />
+            <Key
+                latin:keySpec="&#x11b4;" />
+            <Key
+                latin:keySpec="&#x003d;" />
+            <Key
+                latin:keySpec="&#x201c;" />
+            <Key
+                latin:keySpec="&#x201d;" />
+            <Key
+                latin:keySpec="&#x0027;" />
+            <Key
+                latin:keySpec="&#x007e;" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="&#x11c2;"
+                latin:keyHintLabel="&#x11a9;"
+                latin:additionalMoreKeys="&#x11a9;" />
+            <Key
+                latin:keySpec="&#x11bb;"
+                latin:keyHintLabel="&#x11b0;"
+                latin:additionalMoreKeys="&#x11b0;" />
+            <Key
+                latin:keySpec="&#x11b8;"
+                latin:keyHintLabel="&#x11bd;"
+                latin:additionalMoreKeys="&#x11bd;" />
+            <Key
+                latin:keySpec="&#x116d;"
+                latin:keyHintLabel="&#x11b5;"
+                latin:additionalMoreKeys="&#x11b5;" />
+            <Key
+                latin:keySpec="&#x1172;"
+                latin:keyHintLabel="&#x11b4;"
+                latin:additionalMoreKeys="&#x11b4;" />
+            <Key
+                latin:keySpec="&#x1163;"
+                latin:keyHintLabel="&#x003d;"
+                latin:additionalMoreKeys="&#x003d;" />
+            <Key
+                latin:keySpec="&#x1168;"
+                latin:keyHintLabel="&#x201c;"
+                latin:additionalMoreKeys="&#x201c;" />
+            <Key
+                latin:keySpec="&#x1174;"
+                latin:keyHintLabel="&#x201d;"
+                latin:additionalMoreKeys="&#x201d;" />
+            <Key
+                latin:keySpec="&#x116e;"
+                latin:keyHintLabel="&#x0027;"
+                latin:additionalMoreKeys="&#x0027;" />
+            <Key
+                latin:keySpec="&#x110f;"
+                latin:keyHintLabel="&#x007e;"
+                latin:additionalMoreKeys="&#x007e;" />
+        </default>
+    </switch>
+
+</merge>
diff --git a/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_1.xml b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_1.xml
new file mode 100644
index 000000000..af6e16cb7
--- /dev/null
+++ b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_1.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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">
+            <Key
+                latin:keySpec="&#x11c1;" />
+            <Key
+                latin:keySpec="&#x11c0;" />
+            <Key
+                latin:keySpec="&#x11ac;" />
+            <Key
+                latin:keySpec="&#x11b6;" />
+            <Key
+                latin:keySpec="&#x11b3;" />
+            <Key
+                latin:keySpec="&#x0035;" />
+            <Key
+                latin:keySpec="&#x0036;" />
+            <Key
+                latin:keySpec="&#x0037;" />
+            <Key
+                latin:keySpec="&#x0038;" />
+            <Key
+                latin:keySpec="&#x0039;" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="&#x11ba;"
+                latin:keyHintLabel="&#x11c1;"
+                latin:additionalMoreKeys="&#x11c1;" />
+            <Key
+                latin:keySpec="&#x11af;"
+                latin:keyHintLabel="&#x11c0;"
+                latin:additionalMoreKeys="&#x11c0;" />
+            <Key
+                latin:keySpec="&#x1167;"
+                latin:keyHintLabel="&#x11ac;"
+                latin:additionalMoreKeys="&#x11ac;" />
+            <Key
+                latin:keySpec="&#x1162;"
+                latin:keyHintLabel="&#x11b6;"
+                latin:additionalMoreKeys="&#x11b6;" />
+            <Key
+                latin:keySpec="&#x1165;"
+                latin:keyHintLabel="&#x11b3;"
+                latin:additionalMoreKeys="&#x11b3;" />
+            <Key
+                latin:keySpec="&#x1105;"
+                latin:keyHintLabel="&#x0035;"
+                latin:additionalMoreKeys="&#x0035;" />
+            <Key
+                latin:keySpec="&#x1103;"
+                latin:keyHintLabel="&#x0036;"
+                latin:additionalMoreKeys="&#x0036;" />
+            <Key
+                latin:keySpec="&#x1106;"
+                latin:keyHintLabel="&#x0037;"
+                latin:additionalMoreKeys="&#x0037;" />
+            <Key
+                latin:keySpec="&#x110e;"
+                latin:keyHintLabel="&#x0038;"
+                latin:additionalMoreKeys="&#x0038;" />
+            <Key
+                latin:keySpec="&#x1111;"
+                latin:keyHintLabel="&#x0039;"
+                latin:additionalMoreKeys="&#x0039;" />
+        </default>
+    </switch>
+
+</merge>
diff --git a/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_2.xml b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_2.xml
new file mode 100644
index 000000000..67cd2c6a0
--- /dev/null
+++ b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_2.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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">
+            <Key
+                latin:keySpec="&#x11ae;" />
+            <Key
+                latin:keySpec="&#x11ad;" />
+            <Key
+                latin:keySpec="&#x11b2;" />
+            <Key
+                latin:keySpec="&#x11b1;" />
+            <Key
+                latin:keySpec="&#x1164;" />
+            <Key
+                latin:keySpec="&#x0030;" />
+            <Key
+                latin:keySpec="&#x0031;" />
+            <Key
+                latin:keySpec="&#x0032;" />
+            <Key
+                latin:keySpec="&#x0033;" />
+            <Key
+                latin:keySpec="&#x0034;" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="&#x11bc;"
+                latin:keyHintLabel="&#x11ae;"
+                latin:additionalMoreKeys="&#x11ae;" />
+            <Key
+                latin:keySpec="&#x11ab;"
+                latin:keyHintLabel="&#x11ad;"
+                latin:additionalMoreKeys="&#x11ad;" />
+            <Key
+                latin:keySpec="&#x1175;"
+                latin:keyHintLabel="&#x11b2;"
+                latin:additionalMoreKeys="&#x11b2;" />
+            <Key
+                latin:keySpec="&#x1161;"
+                latin:keyHintLabel="&#x11b1;"
+                latin:additionalMoreKeys="&#x11b1;" />
+            <Key
+                latin:keySpec="&#x1173;"
+                latin:keyHintLabel="&#x1164;"
+                latin:additionalMoreKeys="&#x1164;" />
+            <Key
+                latin:keySpec="&#x1102;"
+                latin:keyHintLabel="&#x0030;"
+                latin:additionalMoreKeys="&#x0030;" />
+            <Key
+                latin:keySpec="&#x110b;"
+                latin:keyHintLabel="&#x0031;"
+                latin:additionalMoreKeys="&#x0031;" />
+            <Key
+                latin:keySpec="&#x1100;"
+                latin:keyHintLabel="&#x0032;"
+                latin:additionalMoreKeys="&#x0032;" />
+            <Key
+                latin:keySpec="&#x110c;"
+                latin:keyHintLabel="&#x0033;"
+                latin:additionalMoreKeys="&#x0033;" />
+            <Key
+                latin:keySpec="&#x1107;"
+                latin:keyHintLabel="&#x0034;"
+                latin:additionalMoreKeys="&#x0034;" />
+        </default>
+    </switch>
+
+</merge>
diff --git a/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_3.xml b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_3.xml
new file mode 100644
index 000000000..b7124b0b1
--- /dev/null
+++ b/app/src/main/res/xml-v16/rowkeys_korean_sebeolsik_final_3.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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">
+            <Key
+                latin:keySpec="&#x11be;" />
+            <Key
+                latin:keySpec="&#x11b9;" />
+            <Key
+                latin:keySpec="&#x11bf;" />
+            <Key
+                latin:keySpec="&#x11aa;" />
+            <Key
+                latin:keySpec="&#x003f;" />
+            <Key
+                latin:keySpec="&#x002d;" />
+            <Key
+                latin:keySpec="&#x0022;" />
+            <Key
+                latin:keySpec="&#x00b7;" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="&#x11b7;"
+                latin:keyHintLabel="&#x11be;"
+                latin:additionalMoreKeys="&#x11be;" />
+            <Key
+                latin:keySpec="&#x11a8;"
+                latin:keyHintLabel="&#x11b9;"
+                latin:additionalMoreKeys="&#x11b9;" />
+            <Key
+                latin:keySpec="&#x1166;"
+                latin:keyHintLabel="&#x11bf;"
+                latin:additionalMoreKeys="&#x11bf;" />
+            <Key
+                latin:keySpec="&#x1169;"
+                latin:keyHintLabel="&#x11aa;"
+                latin:additionalMoreKeys="&#x11aa;" />
+            <Key
+                latin:keySpec="&#x116e;"
+                latin:keyHintLabel="&#x003f;"
+                latin:additionalMoreKeys="&#x003f;" />
+            <Key
+                latin:keySpec="&#x1109;"
+                latin:keyHintLabel="&#x002d;"
+                latin:additionalMoreKeys="&#x002d;" />
+            <Key
+                latin:keySpec="&#x1112;"
+                latin:keyHintLabel="&#x0022;"
+                latin:additionalMoreKeys="&#x0022;" />
+            <Key
+                latin:keySpec="&#x1110;"
+                latin:keyHintLabel="&#x00b7;"
+                latin:additionalMoreKeys="&#x00b7;" />
+        </default>
+    </switch>
+
+</merge>
diff --git a/app/src/main/res/xml/kbd_korean_sebeolsik_final.xml b/app/src/main/res/xml/kbd_korean_sebeolsik_final.xml
new file mode 100644
index 000000000..070fbb8b7
--- /dev/null
+++ b/app/src/main/res/xml/kbd_korean_sebeolsik_final.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+
+<Keyboard
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/rows_korean_sebeolsik_final" />
+</Keyboard>
diff --git a/app/src/main/res/xml/keyboard_layout_set_korean_sebeolsik_final.xml b/app/src/main/res/xml/keyboard_layout_set_korean_sebeolsik_final.xml
index c6c0df589..0e9c1da46 100644
--- a/app/src/main/res/xml/keyboard_layout_set_korean_sebeolsik_final.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_korean_sebeolsik_final.xml
@@ -24,7 +24,7 @@
         latin:supportedScript="hangul" />
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_korean_sebeolsik_390"
+        latin:elementKeyboard="@xml/kbd_korean_sebeolsik_final"
         latin:enableProximityCharsCorrection="true" />
     <Element
         latin:elementName="symbols"
diff --git a/app/src/main/res/xml/rows_korean_sebeolsik_final.xml b/app/src/main/res/xml/rows_korean_sebeolsik_final.xml
new file mode 100644
index 000000000..0e4dec6c6
--- /dev/null
+++ b/app/src/main/res/xml/rows_korean_sebeolsik_final.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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.
+** 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" />
+    <Row
+        latin:keyWidth="10%p"
+        latin:rowHeight="20%p"
+        >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="10%p"
+            latin:visualInsetsRight="1%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p" />
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>