diff --git a/project/res/xml/amiga.xml b/project/res/xml/amiga.xml
index f6f1fd2d4..6835af9d3 100644
--- a/project/res/xml/amiga.xml
+++ b/project/res/xml/amiga.xml
@@ -1,90 +1,49 @@
-<?xml version="1.0"?>
-<!-- When creating new keyboard layout, add it to TextInputKeyboardList array in project/java/MainActivity.java -->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-	android:keyWidth="10%p"
-	android:horizontalGap="0px"
-	android:verticalGap="0px"
-	android:keyHeight="10%p">
-	<Row>
-		<Key android:codes="111" android:keyLabel="ESC" android:keyEdgeFlags="left"/>
-		<Key android:codes="131" android:keyLabel="F1" />
-		<Key android:codes="132" android:keyLabel="F2" />
-		<Key android:codes="133" android:keyLabel="F3" />
-		<Key android:codes="134" android:keyLabel="F4" />
-		<Key android:codes="135" android:keyLabel="F5" />
-		<Key android:codes="136" android:keyLabel="F6" />
-		<Key android:codes="137" android:keyLabel="F7" />
-		<Key android:codes="138" android:keyLabel="F8" />
-		<Key android:codes="139" android:keyLabel="F9" />
-		<Key android:codes="140" android:keyLabel="F10" />
-		<Key android:codes="124" android:keyLabel="HELP" android:keyEdgeFlags="right"/>
-	</Row>
-
-	<Row>
-		<Key android:codes="75" android:keyLabel="`" android:keyEdgeFlags="left"/>
-		<Key android:codes="8" android:keyLabel="1"/>
-		<Key android:codes="9" android:keyLabel="2"/>
-		<Key android:codes="10" android:keyLabel="3"/>
-		<Key android:codes="11" android:keyLabel="4"/>
-		<Key android:codes="12" android:keyLabel="5"/>
-		<Key android:codes="13" android:keyLabel="6"/>
-		<Key android:codes="14" android:keyLabel="7"/>
-		<Key android:codes="15" android:keyLabel="8"/>
-		<Key android:codes="16" android:keyLabel="9"/>
-		<Key android:codes="7" android:keyLabel="0"/>
-		<Key android:codes="67" android:keyLabel="DEL" android:keyEdgeFlags="right"/>
-	</Row>
-	<Row>
-		<Key android:codes="61" android:keyLabel="TAB" android:keyEdgeFlags="left"/>
-		<Key android:codes="45" android:keyLabel="q"/>
-		<Key android:codes="51" android:keyLabel="w"/>
-		<Key android:codes="33" android:keyLabel="e"/>
-		<Key android:codes="46" android:keyLabel="r"/>
-		<Key android:codes="48" android:keyLabel="t"/>
-		<Key android:codes="53" android:keyLabel="y"/>
-		<Key android:codes="49" android:keyLabel="u"/>
-		<Key android:codes="37" android:keyLabel="i"/>
-		<Key android:codes="43" android:keyLabel="o"/>
-		<Key android:codes="44" android:keyLabel="p"/>
-		<Key android:codes="66" android:keyLabel="RET" android:keyEdgeFlags="right"/>
-	</Row>
-	<Row>
-		<Key android:codes="113" android:keyLabel="CTRL" android:keyEdgeFlags="left"/>
-		<Key android:codes="115" android:keyLabel="CL"/>
-		<Key android:codes="29" android:keyLabel="a"/>
-		<Key android:codes="47" android:keyLabel="s"/>
-		<Key android:codes="32" android:keyLabel="d"/>
-		<Key android:codes="34" android:keyLabel="f"/>
-		<Key android:codes="35" android:keyLabel="g"/>
-		<Key android:codes="36" android:keyLabel="h"/>
-		<Key android:codes="38" android:keyLabel="j"/>
-		<Key android:codes="39" android:keyLabel="k"/>
-		<Key android:codes="40" android:keyLabel="l"/>
-		<Key android:codes="74" android:keyLabel=";" android:keyEdgeFlags="right"/>
-	</Row>
-	<Row>
-		<Key android:codes="59" android:keyLabel="SHFT" android:keyEdgeFlags="left"/>
-		<Key android:codes="54" android:keyLabel="z"/>
-		<Key android:codes="52" android:keyLabel="x"/>
-		<Key android:codes="31" android:keyLabel="c"/>
-		<Key android:codes="50" android:keyLabel="v"/>
-		<Key android:codes="30" android:keyLabel="b"/>
-		<Key android:codes="42" android:keyLabel="n"/>
-		<Key android:codes="41" android:keyLabel="m"/>
-		<Key android:codes="55" android:keyLabel=","/>
-		<Key android:codes="56" android:keyLabel="."/>
-		<Key android:codes="76" android:keyLabel="/"/>
-		<Key android:codes="60" android:keyLabel="SHFT" android:keyEdgeFlags="right"/>
-	</Row>
-	<Row android:rowEdgeFlags="bottom">
-		<Key android:codes="57" android:keyLabel="ALT" android:keyEdgeFlags="left"/>
-		<Key android:codes="68" android:keyLabel="'" />
-		<Key android:codes="73" android:keyLabel="\\"/>
-		<Key android:codes="69" android:keyLabel="-"/>
-		<Key android:codes="62" android:keyLabel="SPACE" android:keyWidth="30%p" />
-		<Key android:codes="70" android:keyLabel="="/>
-		<Key android:codes="71" android:keyLabel="["/>
-		<Key android:codes="72" android:keyLabel="]"/>
-		<Key android:codes="58" android:keyLabel="ALT" android:keyEdgeFlags="right"/>
-	</Row>
-</Keyboard>
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard android:keyWidth="10.000002%p" android:keyHeight="10.000002%p" android:horizontalGap="0.0px" android:verticalGap="0.0px"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <Row>
+        <Key android:codes="45" android:keyEdgeFlags="left" android:keyLabel="q" />
+        <Key android:codes="51" android:keyLabel="w" />
+        <Key android:codes="33" android:keyLabel="e" />
+        <Key android:codes="46" android:keyLabel="r" />
+        <Key android:codes="48" android:keyLabel="t" />
+        <Key android:codes="53" android:keyLabel="y" />
+        <Key android:codes="49" android:keyLabel="u" />
+        <Key android:codes="37" android:keyLabel="i" />
+        <Key android:codes="43" android:keyLabel="o" />
+        <Key android:codes="44" android:keyEdgeFlags="right" android:keyLabel="p" />
+    </Row>
+    <Row>
+        <Key android:codes="29" android:keyEdgeFlags="left" android:keyLabel="a" />
+        <Key android:codes="47" android:keyLabel="s" />
+        <Key android:codes="32" android:keyLabel="d" />
+        <Key android:codes="34" android:keyLabel="f" />
+        <Key android:codes="35" android:keyLabel="g" />
+        <Key android:codes="36" android:keyLabel="h" />
+        <Key android:codes="38" android:keyLabel="j" />
+        <Key android:codes="39" android:keyLabel="k" />
+        <Key android:codes="40" android:keyLabel="l" />
+        <Key android:codes="74" android:keyEdgeFlags="right" android:keyLabel=";" />
+    </Row>
+    <Row>
+        <Key android:codes="-1" android:keyEdgeFlags="left" android:keyLabel="⇪" />
+        <Key android:codes="54" android:keyLabel="z" />
+        <Key android:codes="52" android:keyLabel="x" />
+        <Key android:codes="31" android:keyLabel="c" />
+        <Key android:codes="50" android:keyLabel="v" />
+        <Key android:codes="30" android:keyLabel="b" />
+        <Key android:codes="42" android:keyLabel="n" />
+        <Key android:codes="41" android:keyLabel="m" />
+        <Key android:keyWidth="20.000004%p" android:codes="67" android:keyEdgeFlags="right" android:keyLabel="≪ ×" />
+    </Row>
+    <Row android:rowEdgeFlags="bottom">
+        <Key android:codes="-6" android:keyEdgeFlags="left" android:keyLabel="123…" />
+        <Key android:codes="71" android:keyLabel="[" />
+        <Key android:codes="72" android:keyLabel="]" />
+        <Key android:codes="76" android:keyLabel="/" />
+        <Key android:keyWidth="20.000004%p" android:codes="62" android:keyLabel="Space" />
+        <Key android:codes="55" android:keyLabel="," />
+        <Key android:codes="56" android:keyLabel="." />
+        <Key android:keyWidth="20.000004%p" android:codes="66" android:keyEdgeFlags="right" android:keyLabel="Enter" />
+    </Row>
+</Keyboard>
\ No newline at end of file