Merge pull request #1405 from ey6es/master

Fix for menu shortcuts; just include widget library rather than using aw...