Better Macro/Keybind support

* Properly adds context menus
* Removed Emoticons support
* Fixed some issues related to menus
Merge remote-tracking branch 'upstream/master' into pm_tweaks