Convert tabs to spaces and add another pack definition for nnhp