Cleanup + add dash keymaps