Remove source.css scopes, improve grammar scopes

Looked over the bundle for inclusion in the 2.0 installer and these are the last couple items I saw. Will get it added once this is pulled.