diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
index 2661a05764827f3b0b8504ccc7c7fb6b177edc14..6f63e9a4683e8bbbef4b70a64923a065afdc8278 100644
--- a/configs/audio/audio_policy_configuration.xml
+++ b/configs/audio/audio_policy_configuration.xml
@@ -52,7 +52,6 @@
                 <item>FM Tuner In</item>
                 <item>Voice Call In</item>
                 <item>Echo Ref In</item>
-                <item>Telephony Tx</item>
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
@@ -164,12 +163,6 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
-                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
                 <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
@@ -253,8 +246,6 @@
                        sources="primary output"/>
                 <route type="mix" sink="FM Tuner Out"
                        sources="primary output"/>
-                <route type="mix" sink="Telephony Tx"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In,incall_music_uplink"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Device In,USB Headset In"/>
                 <route type="mix" sink="voice tx"
diff --git a/configs/keylayouts/mtk-kpd.kl b/configs/keylayouts/mtk-kpd.kl
index 1ec5bf894fff3a34c3e69b65808c4315c4e6dd1c..04780287419a9dab5953f9a0f9e4bb571f15004a 100644
--- a/configs/keylayouts/mtk-kpd.kl
+++ b/configs/keylayouts/mtk-kpd.kl
@@ -1,8 +1,117 @@
-##
-## Mediatek Default Keylayout
-##
-
-key 114   VOLUME_DOWN
+key 399   GRAVE
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+key 158   BACK
+key 230   SOFT_RIGHT
+key 60    SOFT_RIGHT
+key 107   ENDCALL
+key 62    ENDCALL
+key 229   MENU
+key 139   MENU
+key 59    MENU
+key 127   SYM
+key 217   SEARCH
+key 228   POUND
+key 227   STAR
+key 231   CALL
+key 61    CALL
+key 232   DPAD_CENTER
+key 108   DPAD_DOWN
+key 103   DPAD_UP
+key 102   HOME
+key 105   DPAD_LEFT
+key 106   DPAD_RIGHT
 key 115   VOLUME_UP
+key 114   VOLUME_DOWN
+key 113   MUTE
 key 116   POWER
-key 456   WAKEUP
+key 212   CAMERA
+key 211   FOCUS
+
+key 16    Q
+key 17    W
+key 18    E
+key 19    R
+key 20    T
+key 21    Y
+key 22    U
+key 23    I
+key 24    O
+key 25    P
+key 26    LEFT_BRACKET
+key 27    RIGHT_BRACKET
+key 43    BACKSLASH
+
+key 30    A
+key 31    S
+key 32    D
+key 33    F
+key 34    G
+key 35    H
+key 36    J
+key 37    K
+key 38    L
+key 39    SEMICOLON
+key 40    APOSTROPHE
+key 14    DEL
+
+key 44    Z
+key 45    X
+key 46    C
+key 47    V
+key 48    B
+key 49    N
+key 50    M
+key 51    COMMA
+key 52    PERIOD
+key 53    SLASH
+key 28    ENTER
+
+key 56    ALT_LEFT
+key 100   ALT_RIGHT
+key 42    SHIFT_LEFT
+key 54    SHIFT_RIGHT
+key 15    TAB
+key 57    SPACE
+key 150   EXPLORER
+key 155   ENVELOPE
+
+key 12    MINUS
+key 13    EQUALS
+key 215   AT
+
+key 164   MEDIA_PLAY_PAUSE
+key 128   MEDIA_STOP
+key 163   MEDIA_NEXT
+key 165   MEDIA_PREVIOUS
+key 168   MEDIA_REWIND
+key 159   MEDIA_FAST_FORWARD
+# add Armin FingerPrint long touch
+key 188    F18
+key 189    F19
+key 252    AIASSIST
+
+key 452   TPGESTURE_UP
+key 453   TPGESTURE_DOWN
+key 454   TPGESTURE_LEFT
+key 455   TPGESTURE_RIGHT
+key 456   TPGESTURE_DOUBLE
+key 457   TPGESTURE_C
+key 458   TPGESTURE_E
+key 459   TPGESTURE_M
+key 460   TPGESTURE_O
+key 461   TPGESTURE_S
+key 462   TPGESTURE_V
+key 485   TPGESTURE_W
+key 486   TPGESTURE_Z
+key 487   TPGESTURE_ARROWUP
+key 488   TPGESTURE_ARROWRIGHT
+