Finish switch to so simple theme