Remapping Mac Modifier Keys

I'm sure most Mac users encounter situations when they're forced to use a Windows keyboard. In my case, I attach a Mini and ocassionally my MacBook to a KVM switch shared by Vista, Ubuntu, and a Windows keyboard.

Up until now, I've just dealt with the fact that Windows keyboards switch the Option and Command key locations. I've trained my brain to use the Windows key rather than the key immediately adjacent to the space bar when I need Command. Previous versions of Mac OS had a feature that remapped the modifier keys, but this was a global setting that remapped all keyboards whether they be Windows or not.

I was pleasantly surprised when I discovered this dialog under Leopard's keyboard system preferences.

That new drop down list at the top lets me create mappings for all keyboards or specific keyboards, identiifed by their USB device name. Very nice, Apple!