Merge pull request #1268 from lakkatv/xmb

(XMB) Make some actions working
(XMB) Bugfix