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

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