This can be moved into the set area
Some comments about why these have to be in this order
Change to imap to be more consistent
Not setting this b/c ToggleColorColumn is available
Merge branch 'master' into root