diff --git a/leankeykeyboard/src/main/res/xml/qwerty_ko_kr.xml b/leankeykeyboard/src/main/res/xml/qwerty_ko_kr.xml
index 89b559a..b6b76f3 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_ko_kr.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_ko_kr.xml
@@ -16,64 +16,51 @@
         <Key android:codes="-5" android:keyEdgeFlags="right" android:keyLabel="@string/keyboardview_keycode_delete" android:keyIcon="@drawable/ic_ime_delete" />
     </Row>
     <Row>
-        <Key android:codes="113" android:popupKeyboard="@xml/shift_q" android:keyEdgeFlags="left" android:keyLabel="q" />
-        <Key android:codes="119" android:popupKeyboard="@xml/shift_w" android:keyLabel="ㅃ" />
-        <Key android:codes="101" android:keyLabel="ㅉ" />
-        <Key android:codes="114" android:popupKeyboard="@xml/shift_r" android:keyLabel="ㄸ" />
-        <Key android:codes="116" android:keyLabel="ㄲ" />
-        <Key android:codes="121" android:popupKeyboard="@xml/shift_y" android:keyLabel="ㅆ" />
-        <Key android:codes="117" android:keyLabel="" />
-        <Key android:codes="105" android:keyLabel="" />
-        <Key android:codes="111" android:keyLabel="" />
-        <Key android:codes="112" android:keyLabel="ㅒ" />
-        <Key android:codes="64"  android:keyEdgeFlags="right" android:keyLabel="ㅖ" />
+        <Key android:keyLabel="ㅃ" android:keyEdgeFlags="left" />
+        <Key android:keyLabel="ㅉ" />
+        <Key android:keyLabel="ㄸ" />
+        <Key android:keyLabel="ㄲ" />
+        <Key android:keyLabel="ㅆ" />
+        <Key android:keyLabel="ㅒ" />
+        <Key android:keyLabel="ㅖ" />
+        <Key android:keyLabel="ㅂ" />
+        <Key android:keyLabel="ㅈ" />
+        <Key android:keyLabel="ㄷ" />
+        <Key android:keyLabel="ㄱ" android:keyEdgeFlags="right" />
     </Row>
     <Row>
-        <Key android:codes="97"  android:keyEdgeFlags="left" android:keyLabel="ㅂ" />
-        <Key android:codes="115" android:keyLabel="ㅈ" />
-        <Key android:codes="100" android:popupKeyboard="@xml/accent_e" android:keyLabel="ㄷ" />
-        <Key android:codes="102" android:keyLabel="ㄱ" />
-        <Key android:codes="103" android:popupKeyboard="@xml/accent_t" android:keyLabel="ㅅ" />
-        <Key android:codes="104" android:popupKeyboard="@xml/accent_y"  android:keyLabel="ㅛ" />
-        <Key android:codes="106" android:popupKeyboard="@xml/accent_u"  android:keyLabel="ㅕ" />
-        <Key android:codes="107" android:popupKeyboard="@xml/accent_i" android:keyLabel="ㅑ" />
-        <Key android:codes="108" android:popupKeyboard="@xml/accent_o" android:keyLabel="ㅐ" />
-		<Key android:keyLabel="ㅔ" />
-        <Key android:keyLabel="" />
+        <Key android:keyLabel="ㅅ" android:keyEdgeFlags="left" />
+        <Key android:keyLabel="ㅛ" />
+        <Key android:keyLabel="ㅕ" />
+        <Key android:keyLabel="ㅑ" />
+        <Key android:keyLabel="ㅐ" />
+        <Key android:keyLabel="ㅔ" />
+        <Key android:keyLabel="ㅁ" />
+        <Key android:keyLabel="ㄴ" />
+        <Key android:keyLabel="ㅇ" />
+        <Key android:keyLabel="ㄹ" />
         <Key android:codes="47"  android:popupKeyboard="@xml/accent_slash" android:keyEdgeFlags="right" android:keyLabel="/" />
     </Row>
     <Row>
-        <Key android:codes="" android:popupKeyboard="@xml/accent_a" android:keyEdgeFlags="left" android:keyLabel="ㅁ" />
-        <Key android:codes="" android:popupKeyboard="@xml/accent_s" android:keyLabel="ㄴ" />
-        <Key android:codes="" android:popupKeyboard="@xml/accent_d" android:keyLabel="ㅇ" />
-        <Key android:codes="" android:keyLabel="ㄹ" />
-        <Key android:codes="" android:popupKeyboard="@xml/accent_g" android:keyLabel="ㅎ" />
-        <Key android:codes="" android:keyLabel="ㅗ" />
-        <Key android:codes="" android:keyLabel="ㅓ" />
-		<Key android:codes="" android:popupKeyboard="@xml/accent_k" android:keyLabel="ㅏ" />
-		<Key android:codes="" android:popupKeyboard="@xml/accent_l" android:keyLabel="ㅣ" />
-        <Key android:codes="-10" android:keyEdgeFlags="right" android:keyLabel="@string/keyboardview_keycode_clipboard" android:keyIcon="@drawable/ic_ime_clipboard" />
+        <Key android:keyLabel="ㅎ" android:keyEdgeFlags="left" />
+        <Key android:keyLabel="ㅋ" />
+        <Key android:keyLabel="ㅌ" />
+        <Key android:keyLabel="ㅊ" />
+        <Key android:keyLabel="ㅗ" />
+        <Key android:keyLabel="ㅓ" />
+        <Key android:keyLabel="ㅏ" />
+		<Key android:keyLabel="ㅣ" />
+		<Key android:keyLabel="ㅠ" />
+        <Key android:keyLabel="ㅜ" />
+        <Key android:codes="-10" android:keyLabel="@string/keyboardview_keycode_clipboard" android:keyIcon="@drawable/ic_ime_clipboard" android:keyEdgeFlags="right"  />
     </Row>
-    <Row>
-        <Key android:codes="" android:popupKeyboard="@xml/accent_z" android:keyEdgeFlags="left" android:keyLabel="ㅋ" />
-        <Key android:codes="" android:keyLabel="ㅌ" />
-        <Key android:codes="" android:popupKeyboard="@xml/accent_c" android:keyLabel="ㅊ" />
-        <Key android:codes="" android:keyLabel="ㅍ" />
-        <Key android:codes="" android:keyLabel="ㅠ" />
-        <Key android:codes="" android:popupKeyboard="@xml/accent_n" android:keyLabel="ㅜ" />
-        <Key android:codes="" android:keyLabel="ㅡ" />
-        <Key android:codes="" android:keyLabel="," />
-		<Key android:codes="" android:keyLabel="." />
-		<Key android:codes="" />
-        <Key android:codes="-10" android:keyEdgeFlags="right" android:keyLabel="@string/keyboardview_keycode_clipboard" android:keyIcon="@drawable/ic_ime_clipboard" />
-    </Row>	
     <Row android:rowEdgeFlags="bottom">
-        <Key android:codes="-2" android:keyEdgeFlags="left" android:keyLabel="@string/keyboardview_keycode_mode_change" android:keyIcon="@drawable/ic_ime_symbols" />
+        <Key android:codes="-2" android:keyLabel="@string/keyboardview_keycode_mode_change" android:keyIcon="@drawable/ic_ime_symbols" android:keyEdgeFlags="left"  />
         <Key android:codes="-1" android:keyLabel="@string/keyboardview_keycode_shift" android:keyIcon="@drawable/ic_ime_shift_off" />
         <Key android:codes="-9" android:keyLabel="@string/keyboardview_keycode_lang" android:keyIcon="@drawable/ic_ime_world" />
         <Key android:codes="32" android:keyLabel="@string/keyboardview_keycode_space" android:keyIcon="@drawable/ic_ime_space" android:keyWidth="@dimen/space_key_width" />
         <Key android:codes="-7" android:keyLabel="@string/keyboardview_keycode_voice" android:keyIcon="@drawable/ic_ime_voice" android:popupKeyboard="@xml/accent_voice" />
         <Key android:codes="-3" android:keyLabel="@string/keyboardview_keycode_left" android:keyIcon="@drawable/ic_ime_left_arrow" />
-        <Key android:codes="-4" android:keyEdgeFlags="right" android:keyLabel="@string/keyboardview_keycode_right" android:keyIcon="@drawable/ic_ime_right_arrow" />
+        <Key android:codes="-4" android:keyLabel="@string/keyboardview_keycode_right" android:keyIcon="@drawable/ic_ime_right_arrow" android:keyEdgeFlags="right" />
     </Row>
 </Keyboard>