Special color to Style class; other minor changes from GF branch