Fixed Class Color and Class Sorting