I am looking to add the first soon. I don't want to add the second till the support for keyboard short cuts in WebExtensions are better, right now it is limited.