FLUID-4962: Adds focus style to contrast theme choices, and themes the f...

...ocus for this and on/off switches