Revert "Revert "+GUImenu; hacky a carky; Core update""

This reverts commit 94fe7642bd1f2e0b848e4dc0b64388a197396776, reversing
changes made to 7ec12538012a4749e46af6ddcf858b4afb9e81c9.
Revert "+GUImenu; hacky a carky; Core update"

This reverts commit 7ec12538012a4749e46af6ddcf858b4afb9e81c9.