Update repos for new theme engine, and track our repos

Change-Id: Ia61523404d383295b4de89991758df062f59f093