diff --git a/README.md b/README.md
index e6edba4..5c4ec25 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # Vue Snippets
 
-Vue.js 1.0+ ES6 snippets for Atom
+Vue.js 2.0+ *ES6* snippets for Atom
 
-Contributions are appreciated. Please fork this repository and open a PR to add snippets and fix bugs.
diff --git a/snippets/vue-component.cson b/snippets/vue-component.cson
index ae05d55..7399977 100644
--- a/snippets/vue-component.cson
+++ b/snippets/vue-component.cson
@@ -1,53 +1,81 @@
 '.text.html.vue':
-  'Vue Template Tag':
-    'prefix': 'vtemplate',
-    'body': """
-    <template${1: lang="$2"}>$0</template>
-    """
-  'Vue Script Tag':
-    'prefix': 'vscript',
-    'body': """
-    <script${1: lang="$2"}>
-    \texport default {
-    \t\t// Options / Data
-    \t\tdata () {
-    \t\t\treturn {}
-    \t\t},
-    \t\tprops: [],
-    \t\tcomputed: {},
-    \t\tmethods: {}// ,
-    \t\t// watch: {},
-    \t\t// Options / DOM
-    \t\t// el () {},
-    \t\t// replace: true,
-    \t\t// template: '',
-    \t\t// Options / Lifecycle Hooks
-    \t\t// init () {},
-    \t\t// crated () {},
-    \t\t// beforeCompile () {},
-    \t\t// compiled () {},
-    \t\t// ready () {},
-    \t\t// attached () {},
-    \t\t// detached () {},
-    \t\t// beforeDestroy () {},
-    \t\t// destroyed () {},
-    \t\t// Options / Assets
-    \t\t// directives: {},
-    \t\t// elementDirectives: {},
-    \t\t// filters: {},
-    \t\t// components: {},
-    \t\t// transitions: {},
-    \t\t// partials: {},
-    \t\t// Options / Misc
-    \t\t// parent: null,
-    \t\t// events: {},
-    \t\t// mixins: [],
-    \t\t// name: ''
-    \t}
-    </script>
-    """
-  'Vue Style Tag':
-    'prefix': 'vstyle',
-    'body': """
-    <style${1: lang="$2"}${3: scoped}>$0</style>
-    """
+	'Vue all':
+		'prefix': 'vall'
+		'body': """
+			<template${1: lang="$2"}>
+			$0
+			</template>
+
+			<script${3: lang="$4"}>
+			export default {
+				name: '',
+				props: [],
+				components: {},
+				data () {
+					return {}
+				},
+				computed: {},
+				methods: {}
+			}
+			</script>
+
+			<style${5: lang="$6"}${7: scoped}>
+
+			</style>
+		"""
+
+	'Vue Template Tag':
+		'prefix': 'vtem'
+		'body': """
+			<template${1: lang="$2"}>$0</template>
+		"""
+
+	'Vue Script Tag':
+		'prefix': 'vsc'
+		'body': """
+			<script${1: lang="$2"}>
+			export default {
+				// Options / Data
+				props: [],
+				data () {
+					return {}
+					},
+				methods: {},
+				computed: {},
+				// watch: {},
+				// Options / DOM
+				// el: '',
+				// template: '',
+				// render(h) {},
+				// renderError(h) {}, // dev mode only, with hot-reload
+				// Options / Lifecycle Hooks
+				// beforeCreated () {},
+				// created () {},
+				// beforeMount() {},
+				// mounted() {},
+				// beforeUpdate() {},
+				// updated() {},
+				// activated() {},
+				// deactivated() {},
+				// beforeDestroy () {},
+				// destroyed () {},
+				// Options / Assets
+				// directives: {},
+				// filters: {},
+				// components: {},
+				// Options / Misc
+				// name: '',
+				// functional: true,
+				// Options  / Composition
+				// parent: null,
+				// mixins: [],
+				// extends: {} // short-hand of Vue.extend
+			}
+			</script>
+		"""
+
+	'Vue Style Tag':
+		'prefix': 'vst'
+		'body': """
+			<style${1: lang="$2"}${3: scoped}>$0</style>
+		"""
diff --git a/snippets/vue-directives.cson b/snippets/vue-directives.cson
index dd63154..14e8bcf 100644
--- a/snippets/vue-directives.cson
+++ b/snippets/vue-directives.cson
@@ -1,31 +1,16 @@
 '.source.js':
-  'Vue Directive':
-    'prefix': 'vdirective',
-    'body': """
-    Vue.directive('$1', {
-    \tbind () {},
-    \tupdate (value) {},
-    \tunbind () {}${2:// },
-    \t${3:// }params: [$4],
-    \t${5:// }paramWatchers: {$6},
-    \t${7:// }deep: ${8:false},
-    \t${9:// }twoWay: ${10:false},
-    \t${11:// }acceptStatement: ${12:false},
-    \t${13:// }priority: ${14:1000}
-    })
-    """
-  'Vue Element Directive':
-    'prefix': 'veldirective',
-    'body': """
-    Vue.elementDirective('$1', {
-    \tbind () {},
-    \tupdate (value) {},
-    \tunbind () {}${2:// },
-    \t${3:// }params: [$4],
-    \t${5:// }paramWatchers: {$6},
-    \t${7:// }deep: ${8:false},
-    \t${9:// }twoWay: ${10:false},
-    \t${11:// }acceptStatement: ${12:false},
-    \t${13:// }priority: ${14:1000}
-    })
-    """
+	'Vue Directive':
+	'prefix': 'vdir',
+	'body': """
+		Vue.directive('$1', {
+			\tbind () {},
+			\tupdate (value) {},
+			\tunbind () {}${2:// },
+			\t${3:// }params: [$4],
+			\t${5:// }paramWatchers: {$6},
+			\t${7:// }deep: ${8:false},
+			\t${9:// }twoWay: ${10:false},
+			\t${11:// }acceptStatement: ${12:false},
+			\t${13:// }priority: ${14:1000}
+			})
+	"""
diff --git a/snippets/vue-partial.cson b/snippets/vue-partial.cson
deleted file mode 100644
index 0242eaf..0000000
--- a/snippets/vue-partial.cson
+++ /dev/null
@@ -1,6 +0,0 @@
-'.source.js':
-  'Vue Partial':
-    'prefix': 'vpartial',
-    'body': """
-    Vue.partial('$1', '$2')
-    """