Color/Warning fix
Merge pull request #1659 from Dotnetifier/toggleswitching

More ToggleSwitch fixes