Merge pull request #681 from rfellows/dev

BISERVER-9452 - Merge in latest Onyx theme changes from UX
Temporary overkill to see if we can get a good CI build of repository
BISERVER-9452 - Merge in latest Onyx theme changes from UX