revamp command structure, include current hotkeys, reskin to the core