Add spelllang toggle
Add make mapping