However, I'm using a Filco tenkeyless under OS-X. I also use keyremap4macbook to remap f-keys to apple media keys, change alt and win key to command and option, etc. Since when I got RGBY modifiers from hashbaz's group buy I've been looking to a more symmetric layout. Takayama Fumihiko, creator of keyremap, was kind enough to write a small feature on my request.
First my layout was like this:

Now it's like this:

With diamond (yellow) serving as Command and Menu working as Function.
If anyone else is interested, the code is here https://github.com/tekezo/Files/blob/ma ... rivate.xml
You can easily add it to keyremap4macbook!