[BUG #7273] Clean up classic theme