primepattern-5 Refactor styles
Merge branch 'primepattern-5'