no apptemplate
keyboards, hotkeys, standard layout
Merge branch 'master' into gh-pages