Updates + part 1 of hpi theme