diff -urN root_old/init root/init
--- root_old/init	2010-01-19 06:56:42.000000000 -0800
+++ root/init	2010-02-01 10:13:08.000000000 -0800
@@ -390,6 +390,11 @@
 elif /bin/grep -c 'physkeyboard=raph' /proc/cmdline >/dev/null ; then
 	echo "USING NEW RAPH LAYOUT"
         cp -f /init.etc/keymaps/raphfix_microp-keypad.kcm.bin /etc/keymaps/microp-keypad.kcm.bin
+elif /bin/grep -c 'physkeyboard=tilt2' /proc/cmdline >/dev/null ; then
+	echo "USING EXPERIMENTAL TILT2 LAYOUT"
+        cp -f /init.etc/keymaps/tilt2_microp-keypad.kl /etc/keymaps/microp-keypad.kl
+	cp -f /init.etc/keymaps/tilt2_microp-keypad.kcm.bin /etc/keymaps/microp-keypad.kcm.bin
+	cp -f /init.etc/keymaps/tilt2_navi_pad.kl /etc/keymaps/raph_navi_pad.kl
 else
         echo "USING OLD KEYMAP"
         cp -f /init.etc/keymaps/oldqwerty_microp-keypad.kcm.bin /etc/keymaps/microp-keypad.kcm.bin
diff -urN root_old/init.etc/keymaps/tilt2_microp-keypad.kl root/init.etc/keymaps/tilt2_microp-keypad.kl
--- root_old/init.etc/keymaps/tilt2_microp-keypad.kl	1969-12-31 16:00:00.000000000 -0800
+++ root/init.etc/keymaps/tilt2_microp-keypad.kl	2010-02-01 12:10:41.000000000 -0800
@@ -0,0 +1,82 @@
+# HTC for AT&T 'Tilt 2' (Rhodium variant) Android keyboard layout
+# Adam Williamson <adamwill AT shaw DOT ca>
+
+# v1.0 2010/02/01
+#	- initial release
+
+# As per convention established in fuze_microp-keypad.kl, following
+# keycodes are used for keys for which no 'obvious' code exists:
+
+#	Underscore uses keycode 'TAB'
+#	Exclamation uses keycode 'FOCUS'
+#	Quote uses keycode 'EQUALS'
+#	Colon uses keycode 'PLUS'
+#	Left parenthesis uses keycode 'LEFT_BRACKET'
+#	Right parenthesis uses keycode 'RIGHT_BRACKET'
+
+# Top row of keys, left to right
+key 2     AT
+key 3     TAB
+key 4     FOCUS
+key 5     LEFT_BRACKET
+key 6     RIGHT_BRACKET
+key 7     APOSTROPHE
+key 8     EQUALS
+key 9     SEMICOLON
+key 10    PLUS
+key 11    SLASH
+
+# Second row of keys, left to right
+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
+
+# Third row of keys, left to right
+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 14    DEL
+
+# Fourth row of keys, left to right, skipping up arrow (handled in row 5)
+key 42    ALT_LEFT        
+key 44    Z
+key 45    X
+key 46    C
+key 47    V
+key 48    B
+key 49    N
+key 50    M
+key 28    ENTER
+        
+# Fifth row of keys, left to right, plus up arrow from row 4
+key 464   SHIFT_LEFT
+key 215   ENTER
+key 127   HOME
+key 51    COMMA
+key 57    SPACE
+key 52    PERIOD
+# Currently, the 'left' and 'up' buttons return the same keycode,
+# but including what the other keycode should be here so it will work
+# when the kernel is fixed
+key 105   DPAD_UP		WAKE_DROPPED
+key 108   DPAD_LEFT		WAKE_DROPPED
+key 106   DPAD_DOWN		WAKE_DROPPED
+key 103   DPAD_RIGHT		WAKE_DROPPED
+
+# These 'hardware' buttons are actually handled by the microp-keypad driver
+key 139   MENU              WAKE_DROPPED
+key 158   BACK              WAKE_DROPPED
+key 231   CALL              WAKE_DROPPED
diff -urN root_old/init.etc/keymaps/tilt2_navi_pad.kl root/init.etc/keymaps/tilt2_navi_pad.kl
--- root_old/init.etc/keymaps/tilt2_navi_pad.kl	1969-12-31 16:00:00.000000000 -0800
+++ root/init.etc/keymaps/tilt2_navi_pad.kl	2010-02-01 12:10:42.000000000 -0800
@@ -0,0 +1,17 @@
+# HTC for AT&T 'Tilt 2' (Rhodium variant) Android 'navipad' layout
+# Adam Williamson <adamwill AT shaw DOT ca>
+
+# v1.0 2010/02/01
+#	- initial release
+
+# Very few buttons on the Tilt 2 are handled by the gpio driver.
+
+key 102   HOME              WAKE # Power button
+key 107   ENDCALL           WAKE_DROPPED
+key 114   VOLUME_DOWN
+key 115   VOLUME_UP
+# Not currently working, but keeping the Fuze eventcode as a
+# placeholder. With current htc-msm-android kernels it generates the
+# same eventcode as the key 'e', 18, on the microp-keypad node, so
+# acts exactly like the 'e' key
+key 169   CAMERA # Push to talk