Merge "add classes to help RRO theme test"