BISERVER-9452 - Merge in latest Onyx theme changes from UX
Merge pull request #122 from rfellows/develop

BISERVER-9452 - Merge in latest Onyx theme changes from UX