Retools the new switches

Removes the span element, adds in radio and checkbox options, adds all
mixins and semantic code elements.