RA-425 - Removing unused css classes and using a variable for a color