Add abstraction to toggle buttons
Proxy shortcut modifiers to toggles
Use new short form toggles
Add new files to toc