Fix snippets and make sure custom snippets are managed outside bundle