remove special characters from style names, update macros to v3.3

Per discussion with Westchester