refactor(pm) Extend how to and add theme