New switch styles
Fixes to new switch style
Merge pull request #38 from nt1m/master

New switch style