Port remaining themes