Fix #758 - Add some more specific targets for css classes