Update for new clean theme