OK, so I bought a D2 that had "slight" water damage, when I got it, looked more like it had been sitting at the bottom of the pond. Long story short, the previous owner fried the main board, but everything else on the phone works just fine, so I dropped in my D1 guts and fired her up. So I may have the first ever original droid with updated keyboard and new, sleeker stylings . Well, my problem is that Moto decided to move around the front buttons, and the layout of the keyboard.... So my menu softkey for instance is really back, and the physical keyboard, while all the letter keys are correct, has some quirks too. I mounted /system and pulled the qwerty.kl and sholes-keypad.kl to fix my problem, but some things just are not so clear, so if someone could post their qwerty.kl and sholes-keypad.kl (or equivalent) for me to look at, I would be much appreciative.