Started using macros to define keys with modifiers.  Added more macros.