BISERVER-9452 - UX theme changes