Replace some classes with Rangic.Utilities