Clean up, add more stuff from fontTools
Change shortcut key