Sorry, wasn't coming here for quite a while.
Well, I've switched to mac almost a year ago so I update only mac-version of layout here
jbbrower all your ideas are nice, but I did everything by hand. As I play only one character it is not an issue for me.
Anyway you can make layouts for every spec and every character you have and switch them when needed with toggle function.