Add CM/PA repos and some other shit