Fix issue with active state colour on switches not being set