Updated general keymando macros