Add snippets and shuffle bindings a bit