Updated with new hpstr theme