Rearranging the keys on Apple keyboards to the Dvorak layout

I’ve been using the dvorak for just under 8 months now according to the date (17/6/2011) on the printout I have pinned on my wall of the US Dvorak keyboard layout from Wikipedia.
Its been ok-ish so far, I’m used to the layout now but still prone to making mistakes, my main gripe with it is the position of the W & V keys, one slip of the finger when pasting something & you lose what you’re doing because you’ve just closed the window instead, this has happened on several occasion, usually when working remotely via an SSH session. It’s ok apart from that, just need to focus on keeping my hands still on the correct keys & letting the fingers do the work rather than move my hands around the keyboard.
Scrolling through the Dvorak simplified keyboard article on wikipedia, I saw a pair photos in the Mac OS section of a cordless keyboard & iBook with rearranged keys in a Dvorak layout.
I had assumed it wasn’t do-able & not looked into it further but a quick search showed it was pretty easy as this video shows.
To remove the keys from your keyboard just pull the top of the key to unclip & slide down to release, within a couple a minutes my cordless keyboard looked like this

Putting the keys back was pretty straight forward & went seamlessly, sliding the keys up to place into position & pushing down to clip into place, within a couple of minutes my keyboard looked like this

As this was easy & quick to do, I assumed the keyboard on my Macbook Pro would also be the same, so began pulling the keys off, most of the keys on the centre 2 rows came off without any problems but then I reached the right hand side of the keyboard & found keys which took a bit more persuasion to unclip & it was downhill from there.

I managed to pull most of plastic clip out of the pin sockets which are used to levy them, this took a bit of fidding to get back in but I managed to do it without breaking anything which was good but as I was a little rough handed on couple of them, I managed to pull the rubber spring off the face plate 🙁

Fortunately, putting the keys back on again wasn’t too much hassle, the two keys which had their spring come off initially missed key strokes but seem ok now (the spring needs to reseat into a better position?)

I’d like to make this change on my ThinkPad keyboard too but the keys which fit around the TrackPoint have different shapes to the rest of the keys.