Removing color namespacing and granularized grunt