Add native OS media shortcuts :) also some code refactoring