Major changes in the menu (complete).
Merge branch 'master' of https://github.com/mfer/sHoRTcut