Revert "We like consistence....change all CheckBoxes to Switches in Settings"

This reverts commit 86bd1bcf9cf0cb5736910b96030aff37f8b1842d.