further overhaul of color & style handling, whitespace