CSS class name updates to avoid collision and changes to air theme