FLUID-4970: Added modernizr, reworked on/off control