Change keyboard modifier names
Move config to header, remove unused