diff --git a/snippets/c++-mode/beginend b/snippets/c++-mode/beginend
index 68303e2..590c708 100644
--- a/snippets/c++-mode/beginend
+++ b/snippets/c++-mode/beginend
@@ -1,3 +1,4 @@
 #name : v.begin(), v.end()
+# key: beginend
 # --
 ${1:v}.begin(), $1.end
\ No newline at end of file
diff --git a/snippets/c++-mode/class b/snippets/c++-mode/class
index 820fc6c..5289d9c 100644
--- a/snippets/c++-mode/class
+++ b/snippets/c++-mode/class
@@ -1,4 +1,5 @@
 #name : class ... { ... }
+# key: class
 # --
 class ${1:Name}
 {
diff --git a/snippets/c++-mode/ns b/snippets/c++-mode/ns
index 0c2513f..0b736e7 100644
--- a/snippets/c++-mode/ns
+++ b/snippets/c++-mode/ns
@@ -1,3 +1,4 @@
 #name : namespace ...
+# key: ns
 # --
 namespace 
\ No newline at end of file
diff --git a/snippets/c++-mode/template b/snippets/c++-mode/template
index 7e50616..d2ad159 100644
--- a/snippets/c++-mode/template
+++ b/snippets/c++-mode/template
@@ -1,3 +1,4 @@
 #name : template <typename ...>
+# key: template
 # --
 template <typename ${T}>
\ No newline at end of file
diff --git a/snippets/c++-mode/using b/snippets/c++-mode/using
index 13d0f5d..27ec885 100644
--- a/snippets/c++-mode/using
+++ b/snippets/c++-mode/using
@@ -1,4 +1,5 @@
 #name : using namespace ... 
+# key: using
 # --
 using namespace ${std};
 $0
\ No newline at end of file
diff --git a/snippets/c-mode/fopen b/snippets/c-mode/fopen
index 5b49529..0e48c21 100644
--- a/snippets/c-mode/fopen
+++ b/snippets/c-mode/fopen
@@ -1,3 +1,4 @@
 #name : FILE *fp = fopen(..., ...);
+# key: fopen
 # --
 FILE *${fp} = fopen(${"file"}, "${r}");
\ No newline at end of file
diff --git a/snippets/c-mode/printf b/snippets/c-mode/printf
index 055461d..4006b7c 100644
--- a/snippets/c-mode/printf
+++ b/snippets/c-mode/printf
@@ -1,6 +1,7 @@
 # -*- mode: snippet -*-
 # name : printf 
 # contributor : joaotavora
+# key: printf
 # --
 printf ("${1:%s}\\n"${1:$(if (string-match "%" text) "," "\);")
 }$2${1:$(if (string-match "%" text) "\);" "")}
\ No newline at end of file
diff --git a/snippets/cc-mode/do b/snippets/cc-mode/do
index 5f7a313..70e208a 100644
--- a/snippets/cc-mode/do
+++ b/snippets/cc-mode/do
@@ -1,4 +1,5 @@
 #name : do { ... } while (...)
+# key: do
 # --
 do
 {
diff --git a/snippets/cc-mode/for b/snippets/cc-mode/for
index c4cade6..7343e58 100644
--- a/snippets/cc-mode/for
+++ b/snippets/cc-mode/for
@@ -1,4 +1,5 @@
 #name : for (...; ...; ...) { ... }
+# key: for
 # --
 for (${1:int i = 0}; ${2:i < N}; ${3:++i})
 {
diff --git a/snippets/cc-mode/if b/snippets/cc-mode/if
index c3fe10d..a52bee9 100644
--- a/snippets/cc-mode/if
+++ b/snippets/cc-mode/if
@@ -1,4 +1,5 @@
 #name : if (...) { ... }
+# key: cc-modeif
 # --
 if (${1:condition})
 {
diff --git a/snippets/cc-mode/inc b/snippets/cc-mode/inc
index c18a4d2..25bd8fe 100644
--- a/snippets/cc-mode/inc
+++ b/snippets/cc-mode/inc
@@ -1,3 +1,4 @@
 #name : #include "..."
+# key: inc
 # --
 #include "$1"
\ No newline at end of file
diff --git a/snippets/cc-mode/inc.1 b/snippets/cc-mode/inc.1
index f85c08a..e367d5b 100644
--- a/snippets/cc-mode/inc.1
+++ b/snippets/cc-mode/inc.1
@@ -1,3 +1,4 @@
 #name : #include <...>
+# key: inc
 # --
 #include <$1>
\ No newline at end of file
diff --git a/snippets/cc-mode/main b/snippets/cc-mode/main
index 292a99c..620de06 100644
--- a/snippets/cc-mode/main
+++ b/snippets/cc-mode/main
@@ -1,4 +1,5 @@
 #name: int main(argc, argv) { ... }
+# key: main
 # --
 int main(int argc, char *argv[])
 {
diff --git a/snippets/cc-mode/once b/snippets/cc-mode/once
index 1b63c39..d035329 100644
--- a/snippets/cc-mode/once
+++ b/snippets/cc-mode/once
@@ -1,4 +1,5 @@
 #name : #ifndef XXX; #define XXX; #endif
+# key: once
 # --
 #ifndef ${1:_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_H_}
 #define $1
diff --git a/snippets/cc-mode/struct b/snippets/cc-mode/struct
index f50dabf..aeacc33 100644
--- a/snippets/cc-mode/struct
+++ b/snippets/cc-mode/struct
@@ -1,4 +1,5 @@
 #name : struct ... { ... }
+# key: struct
 # --
 struct ${1:name}
 {
diff --git a/snippets/csharp-mode/attrib b/snippets/csharp-mode/attrib
index 4ff58d3..ccc9754 100644
--- a/snippets/csharp-mode/attrib
+++ b/snippets/csharp-mode/attrib
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : private attribute ....;
+# key: attrib
 # --
 /// <summary>
 /// $3
diff --git a/snippets/csharp-mode/attrib.1 b/snippets/csharp-mode/attrib.1
index 8153be9..ba06d76 100644
--- a/snippets/csharp-mode/attrib.1
+++ b/snippets/csharp-mode/attrib.1
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : private attribute ....; public property ... ... { ... }
+# key: attrib
 # --
 /// <summary>
 /// $3
diff --git a/snippets/csharp-mode/attrib.2 b/snippets/csharp-mode/attrib.2
index 08d58c8..2798ec9 100644
--- a/snippets/csharp-mode/attrib.2
+++ b/snippets/csharp-mode/attrib.2
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : private _attribute ....; public Property ... ... { ... }
+# key: attrib
 # --
 /// <summary>
 /// $3
diff --git a/snippets/csharp-mode/class b/snippets/csharp-mode/class
index acef6d1..bea8a1e 100644
--- a/snippets/csharp-mode/class
+++ b/snippets/csharp-mode/class
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : class ... { ... }
+# key: class
 # --
 ${5:public} class ${1:Name}
 {
diff --git a/snippets/csharp-mode/comment b/snippets/csharp-mode/comment
index c2a4b70..44f2fb3 100644
--- a/snippets/csharp-mode/comment
+++ b/snippets/csharp-mode/comment
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : /// <summary> ... </summary>
+# key: comment
 # --
 /// <summary>
 /// $1
diff --git a/snippets/csharp-mode/comment.1 b/snippets/csharp-mode/comment.1
index 08c802b..dda243e 100644
--- a/snippets/csharp-mode/comment.1
+++ b/snippets/csharp-mode/comment.1
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : /// <param name="..."> ... </param>
+# key: comment
 # --
 /// <param name="$1">$2</param>
\ No newline at end of file
diff --git a/snippets/csharp-mode/comment.2 b/snippets/csharp-mode/comment.2
index cb3aa80..34bc58c 100644
--- a/snippets/csharp-mode/comment.2
+++ b/snippets/csharp-mode/comment.2
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : /// <param name="..."> ... </param>
+# key: comment
 # --
 /// <returns>$1</returns>
\ No newline at end of file
diff --git a/snippets/csharp-mode/comment.3 b/snippets/csharp-mode/comment.3
index ec57a75..15f2e1a 100644
--- a/snippets/csharp-mode/comment.3
+++ b/snippets/csharp-mode/comment.3
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : /// <exception cref="..."> ... </exception>
+# key: comment
 # --
 /// <exception cref="$1">$2</exception>
\ No newline at end of file
diff --git a/snippets/csharp-mode/method b/snippets/csharp-mode/method
index b63b3c2..7036471 100644
--- a/snippets/csharp-mode/method
+++ b/snippets/csharp-mode/method
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : public void Method { ... }
+# key: method
 # --
 /// <summary>
 /// ${5:Description}
diff --git a/snippets/csharp-mode/namespace b/snippets/csharp-mode/namespace
index bc4dec9..4d8d154 100644
--- a/snippets/csharp-mode/namespace
+++ b/snippets/csharp-mode/namespace
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : namespace .. { ... }
+# key: namespace
 # --
 namespace $1
 {
diff --git a/snippets/csharp-mode/prop b/snippets/csharp-mode/prop
index 7260fac..7d75dee 100644
--- a/snippets/csharp-mode/prop
+++ b/snippets/csharp-mode/prop
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : property ... ... { ... }
+# key: prop
 # --
 /// <summary>
 /// $5
diff --git a/snippets/csharp-mode/region b/snippets/csharp-mode/region
index bcc3cec..498d153 100644
--- a/snippets/csharp-mode/region
+++ b/snippets/csharp-mode/region
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : #region ... #endregion
+# key: region
 # --
 #region $1
 $0
diff --git a/snippets/csharp-mode/using b/snippets/csharp-mode/using
index f10d1ba..4556b8c 100644
--- a/snippets/csharp-mode/using
+++ b/snippets/csharp-mode/using
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : using ...;
+# key: using
 # --
 using $1;
\ No newline at end of file
diff --git a/snippets/csharp-mode/using.1 b/snippets/csharp-mode/using.1
index bf87f85..fd80875 100644
--- a/snippets/csharp-mode/using.1
+++ b/snippets/csharp-mode/using.1
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : using System;
+# key: using
 # --
 using System;
\ No newline at end of file
diff --git a/snippets/csharp-mode/using.2 b/snippets/csharp-mode/using.2
index d0d39bf..ebcaadb 100644
--- a/snippets/csharp-mode/using.2
+++ b/snippets/csharp-mode/using.2
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : using System....;
+# key: using
 # --
 using System.$1;
\ No newline at end of file
diff --git a/snippets/css-mode/bg b/snippets/css-mode/bg
index d731807..eb734d4 100644
--- a/snippets/css-mode/bg
+++ b/snippets/css-mode/bg
@@ -1,3 +1,4 @@
 #name : background-color: ...
+# key: bg
 # --
 background-color: #${1:DDD};
\ No newline at end of file
diff --git a/snippets/css-mode/bg.1 b/snippets/css-mode/bg.1
index d31f540..9da6afc 100644
--- a/snippets/css-mode/bg.1
+++ b/snippets/css-mode/bg.1
@@ -1,3 +1,4 @@
 #name : background-image: ...
+# key: bg
 # --
 background-image: url($1);
\ No newline at end of file
diff --git a/snippets/css-mode/bor b/snippets/css-mode/bor
index eb3a2b4..028d6c7 100644
--- a/snippets/css-mode/bor
+++ b/snippets/css-mode/bor
@@ -1,3 +1,4 @@
 #name : border size style color
+# key: bor
 # --
 border: ${1:1px} ${2:solid} #${3:999};
\ No newline at end of file
diff --git a/snippets/css-mode/cl b/snippets/css-mode/cl
index 8d03a13..efc0047 100644
--- a/snippets/css-mode/cl
+++ b/snippets/css-mode/cl
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : clear: ...
+# key: cl
 # --
 clear: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/disp.block b/snippets/css-mode/disp.block
index 5e45393..de9db53 100644
--- a/snippets/css-mode/disp.block
+++ b/snippets/css-mode/disp.block
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : display: block
+# key: disp
 # --
 display: block;
\ No newline at end of file
diff --git a/snippets/css-mode/disp.inline b/snippets/css-mode/disp.inline
index 9cc60c9..a71184e 100644
--- a/snippets/css-mode/disp.inline
+++ b/snippets/css-mode/disp.inline
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : display: inline
+# key: disp
 # --
 display: inline;
\ No newline at end of file
diff --git a/snippets/css-mode/disp.none b/snippets/css-mode/disp.none
index c9ac636..f5c5be4 100644
--- a/snippets/css-mode/disp.none
+++ b/snippets/css-mode/disp.none
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : display: none
+# key: disp
 # --
 display: none;
\ No newline at end of file
diff --git a/snippets/css-mode/ff b/snippets/css-mode/ff
index 17d0b94..740d5fd 100644
--- a/snippets/css-mode/ff
+++ b/snippets/css-mode/ff
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : font-family: ...
+# key: ff
 # --
 font-family: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/fs b/snippets/css-mode/fs
index 90ff403..6401be7 100644
--- a/snippets/css-mode/fs
+++ b/snippets/css-mode/fs
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : font-size: ...
+# key: fs
 # --
 font-size: ${12px};
\ No newline at end of file
diff --git a/snippets/css-mode/mar.bottom b/snippets/css-mode/mar.bottom
index a5b6afd..834cf6a 100644
--- a/snippets/css-mode/mar.bottom
+++ b/snippets/css-mode/mar.bottom
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : margin-bottom: ...
+# key: mar
 # --
 margin-bottom: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/mar.left b/snippets/css-mode/mar.left
index 7285297..1d9fd6e 100644
--- a/snippets/css-mode/mar.left
+++ b/snippets/css-mode/mar.left
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : margin-left: ...
+# key: mar
 # --
 margin-left: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/mar.mar b/snippets/css-mode/mar.mar
index c649ca4..833431c 100644
--- a/snippets/css-mode/mar.mar
+++ b/snippets/css-mode/mar.mar
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : margin: ...
+# key: mar
 # --
 margin: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/mar.margin b/snippets/css-mode/mar.margin
index 49647e7..dfafbaf 100644
--- a/snippets/css-mode/mar.margin
+++ b/snippets/css-mode/mar.margin
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : margin top right bottom left
+# key: mar
 # --
 margin: ${top} ${right} ${bottom} ${left};
\ No newline at end of file
diff --git a/snippets/css-mode/mar.right b/snippets/css-mode/mar.right
index 41bac78..d940968 100644
--- a/snippets/css-mode/mar.right
+++ b/snippets/css-mode/mar.right
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : margin-right: ...
+# key: mar
 # --
 margin-right: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/mar.top b/snippets/css-mode/mar.top
index 0934d80..13fa0c1 100644
--- a/snippets/css-mode/mar.top
+++ b/snippets/css-mode/mar.top
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : margin-top: ...
+# key: mar
 # --
 margin-top: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/pad.bottom b/snippets/css-mode/pad.bottom
index b8915c8..5770e46 100644
--- a/snippets/css-mode/pad.bottom
+++ b/snippets/css-mode/pad.bottom
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : padding-bottom: ...
+# key: pad
 # --
 padding-bottom: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/pad.left b/snippets/css-mode/pad.left
index d4927f5..5fe2bc6 100644
--- a/snippets/css-mode/pad.left
+++ b/snippets/css-mode/pad.left
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : padding-left: ...
+# key: pad
 # --
 padding-left: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/pad.pad b/snippets/css-mode/pad.pad
index 6359283..4673447 100644
--- a/snippets/css-mode/pad.pad
+++ b/snippets/css-mode/pad.pad
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : padding: ...
+# key: pad
 # --
 padding: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/pad.padding b/snippets/css-mode/pad.padding
index 05fc4e6..ae038e4 100644
--- a/snippets/css-mode/pad.padding
+++ b/snippets/css-mode/pad.padding
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : padding: top right bottom left
+# key: pad
 # --
 padding: ${top} ${right} ${bottom} ${left};
\ No newline at end of file
diff --git a/snippets/css-mode/pad.right b/snippets/css-mode/pad.right
index bb8f3d3..7488aba 100644
--- a/snippets/css-mode/pad.right
+++ b/snippets/css-mode/pad.right
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : padding-right: ...
+# key: pad
 # --
 padding-right: $1;
\ No newline at end of file
diff --git a/snippets/css-mode/pad.top b/snippets/css-mode/pad.top
index 992d649..a30355d 100644
--- a/snippets/css-mode/pad.top
+++ b/snippets/css-mode/pad.top
@@ -1,4 +1,5 @@
 #contributor : rejeep <johan.rejeep@gmail.com>
 #name : padding-top: ...
+# key: pad
 # --
 padding-top: $1;
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet b/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
index 4e446f9..9af5a26 100755
--- a/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
+++ b/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: process marked files in dired
+# key: x-dired
 # --
 ;; idiom for processing a list of files in dired's marked files
  
diff --git a/snippets/emacs-lisp-mode/x-file.process.yasnippet b/snippets/emacs-lisp-mode/x-file.process.yasnippet
index 3e22986..3c82822 100755
--- a/snippets/emacs-lisp-mode/x-file.process.yasnippet
+++ b/snippets/emacs-lisp-mode/x-file.process.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: a function that process a file
+# key: x-file
 # --
 (defun doThisFile (fpath)
   "Process the file at path FPATH ..."
diff --git a/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet b/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
index 015c0f2..2b23983 100755
--- a/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
+++ b/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: read lines of a file
+# key: x-file
 # --
 (defun read-lines (filePath)
   "Return a list of lines in FILEPATH."
diff --git a/snippets/emacs-lisp-mode/x-find-replace.yasnippet b/snippets/emacs-lisp-mode/x-find-replace.yasnippet
index dad0430..d4c4d11 100755
--- a/snippets/emacs-lisp-mode/x-find-replace.yasnippet
+++ b/snippets/emacs-lisp-mode/x-find-replace.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: find and replace on region
+# key: x-find-replace
 # --
 (defun replace-html-chars-region (start end)
   "Replace “<” to “&lt;” and other chars in HTML.
diff --git a/snippets/emacs-lisp-mode/x-grabstring.yasnippet b/snippets/emacs-lisp-mode/x-grabstring.yasnippet
index 272bc51..d348e93 100755
--- a/snippets/emacs-lisp-mode/x-grabstring.yasnippet
+++ b/snippets/emacs-lisp-mode/x-grabstring.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: grab buffer substring
+# key: x-grabstring
 # --
 (setq $0 (buffer-substring-no-properties myStartPos myEndPos))
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/x-grabthing.yasnippet b/snippets/emacs-lisp-mode/x-grabthing.yasnippet
index ec6aed4..2c0079d 100755
--- a/snippets/emacs-lisp-mode/x-grabthing.yasnippet
+++ b/snippets/emacs-lisp-mode/x-grabthing.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: grab word under cursor
+# key: x-grabthing
 # --
 (setq $0 (thing-at-point 'symbol))
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet b/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
index 9547eea..cfa461a 100755
--- a/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
+++ b/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
@@ -1,5 +1,6 @@
 #name: traversing a directory
 #contributor: Xah Lee (XahLee.org)
+# key: x-traverse_dir
 # --
 ;; apply a function to all files in a dir
 (require 'find-lisp)
diff --git a/snippets/emacs-lisp-mode/x-word-or-region.yasnippet b/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
index 67c6761..c7b851b 100755
--- a/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
+++ b/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: Command that works on region or word
+# key: x-word-or-region
 # --
 ;; example of a command that works on current word or text selection
 (defun down-case-word-or-region ()
diff --git a/snippets/erlang-mode/after b/snippets/erlang-mode/after
index f20fe88..996c847 100644
--- a/snippets/erlang-mode/after
+++ b/snippets/erlang-mode/after
@@ -1,4 +1,5 @@
 #name : after ... ->
+# key: after
 # --
 after
     $1 -> $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/begin b/snippets/erlang-mode/begin
index 512374a..b74e6fa 100644
--- a/snippets/erlang-mode/begin
+++ b/snippets/erlang-mode/begin
@@ -1,4 +1,5 @@
 #name : begin ... end
+# key: begin
 # --
 begin
     $0
diff --git a/snippets/erlang-mode/beh b/snippets/erlang-mode/beh
index 43fd971..e68397a 100644
--- a/snippets/erlang-mode/beh
+++ b/snippets/erlang-mode/beh
@@ -1,4 +1,5 @@
 #name : -behaviour(...).
+# key: beh
 # --
 -behaviour(${1:gen_server}).
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/case b/snippets/erlang-mode/case
index 1a4ada5..9a2337c 100644
--- a/snippets/erlang-mode/case
+++ b/snippets/erlang-mode/case
@@ -1,4 +1,5 @@
 #name : case ... of ... end
+# key: case
 # --
 case $1 of
     $0
diff --git a/snippets/erlang-mode/compile b/snippets/erlang-mode/compile
index c369368..ce38c20 100644
--- a/snippets/erlang-mode/compile
+++ b/snippets/erlang-mode/compile
@@ -1,4 +1,5 @@
 #name : -compile(...).
+# key: compile
 # --
 -compile([${1:export_all}]).
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/def b/snippets/erlang-mode/def
index ccbe5fb..e6c6de0 100644
--- a/snippets/erlang-mode/def
+++ b/snippets/erlang-mode/def
@@ -1,4 +1,5 @@
 #name : -define(...,...).
+# key: def
 # --
 -define($1,$2).
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/exp b/snippets/erlang-mode/exp
index 9000140..db614f3 100644
--- a/snippets/erlang-mode/exp
+++ b/snippets/erlang-mode/exp
@@ -1,5 +1,6 @@
 #name : -export([]).
 #contributor : hitesh <hitesh.jasani@gmail.com>
+# key: exp
 # --
 -export([${1:start/0}]).
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/fun b/snippets/erlang-mode/fun
index 366f488..82e8e79 100644
--- a/snippets/erlang-mode/fun
+++ b/snippets/erlang-mode/fun
@@ -1,3 +1,4 @@
 #name : fun (...) -> ... end
+# key: fun
 # --
 fun ($1) -> $0 end
\ No newline at end of file
diff --git a/snippets/erlang-mode/if b/snippets/erlang-mode/if
index 4f2271a..788d1f3 100644
--- a/snippets/erlang-mode/if
+++ b/snippets/erlang-mode/if
@@ -1,4 +1,5 @@
 #name : if ... -> ... ; true -> ... end
+# key: erlang-modeif
 # --
 if
     $1 -> $2;
diff --git a/snippets/erlang-mode/ifdef b/snippets/erlang-mode/ifdef
index daf9479..8332efa 100644
--- a/snippets/erlang-mode/ifdef
+++ b/snippets/erlang-mode/ifdef
@@ -1,4 +1,5 @@
 #name : -ifdef(...). ... -endif.
+# key: erlang-modeifdef
 # --
 -ifdef($1).
 $0
diff --git a/snippets/erlang-mode/ifndef b/snippets/erlang-mode/ifndef
index bae9948..d46f056 100644
--- a/snippets/erlang-mode/ifndef
+++ b/snippets/erlang-mode/ifndef
@@ -1,4 +1,5 @@
 #name : -ifndef(...). ... -endif.
+# key: erlang-modeifndef
 # --
 -ifndef($1).
 $0
diff --git a/snippets/erlang-mode/imp b/snippets/erlang-mode/imp
index 233aa79..9444005 100644
--- a/snippets/erlang-mode/imp
+++ b/snippets/erlang-mode/imp
@@ -1,5 +1,6 @@
 #name : -import([]).
 #contributor : hitesh <hitesh.jasani@gmail.com>
+# key: imp
 # --
 -import(${1:lists}, [${2:map/2, sum/1}]).
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/inc b/snippets/erlang-mode/inc
index 1e7cee7..9a4d833 100644
--- a/snippets/erlang-mode/inc
+++ b/snippets/erlang-mode/inc
@@ -1,4 +1,5 @@
 #name : -include("...").
+# key: inc
 # --
 -include("$1").
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/inc.lib b/snippets/erlang-mode/inc.lib
index b98bc1a..1fed653 100644
--- a/snippets/erlang-mode/inc.lib
+++ b/snippets/erlang-mode/inc.lib
@@ -1,4 +1,5 @@
 #name : -include_lib("...").
+# key: inc
 # --
 -include_lib("$1").
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/loop b/snippets/erlang-mode/loop
index 151be85..c2f6b33 100644
--- a/snippets/erlang-mode/loop
+++ b/snippets/erlang-mode/loop
@@ -1,4 +1,5 @@
 #name : loop(...) -> receive _ -> loop(...) end.
+# key: loop
 # --
 ${1:loop}($2) ->
     receive
diff --git a/snippets/erlang-mode/mod b/snippets/erlang-mode/mod
index 58a8eff..a9df25e 100644
--- a/snippets/erlang-mode/mod
+++ b/snippets/erlang-mode/mod
@@ -1,5 +1,6 @@
 #name : -module().
 #contributor : hitesh <hitesh.jasani@gmail.com>
+# key: mod
 # --
 -module(${1:`(file-name-nondirectory
               (file-name-sans-extension (or (buffer-file-name) (buffer-name))))`}).
diff --git a/snippets/erlang-mode/rcv b/snippets/erlang-mode/rcv
index 37586ff..b584e33 100644
--- a/snippets/erlang-mode/rcv
+++ b/snippets/erlang-mode/rcv
@@ -1,4 +1,5 @@
 #name : receive ... -> ... end
+# key: rcv
 # --
 receive
     $1 -> $0
diff --git a/snippets/erlang-mode/rcv.after b/snippets/erlang-mode/rcv.after
index 96d0634..27d4739 100644
--- a/snippets/erlang-mode/rcv.after
+++ b/snippets/erlang-mode/rcv.after
@@ -1,4 +1,5 @@
 #name : receive after ... -> ... end
+# key: rcv
 # --
 receive
 after
diff --git a/snippets/erlang-mode/rec b/snippets/erlang-mode/rec
index 958fc20..5b18cfe 100644
--- a/snippets/erlang-mode/rec
+++ b/snippets/erlang-mode/rec
@@ -1,4 +1,5 @@
 #name : -record(...,{...}).
+# key: rec
 # --
 -record($1,{$2}).
 $0
\ No newline at end of file
diff --git a/snippets/erlang-mode/try b/snippets/erlang-mode/try
index f40ea42..9eea5aa 100644
--- a/snippets/erlang-mode/try
+++ b/snippets/erlang-mode/try
@@ -1,4 +1,5 @@
 #name : try ... of ... catch after end
+# key: try
 # --
 try $1 of
     $0
diff --git a/snippets/erlang-mode/undef b/snippets/erlang-mode/undef
index 8e37217..688c1f9 100644
--- a/snippets/erlang-mode/undef
+++ b/snippets/erlang-mode/undef
@@ -1,4 +1,5 @@
 #name : -undef(...).
+# key: undef
 # --
 -undef($1).
 $0
\ No newline at end of file
diff --git a/snippets/f90-mode/au b/snippets/f90-mode/au
index e9cdaf9..2646685 100644
--- a/snippets/f90-mode/au
+++ b/snippets/f90-mode/au
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : automatic
+# key: au
 # --
 automatic $0 
\ No newline at end of file
diff --git a/snippets/f90-mode/bd b/snippets/f90-mode/bd
index 811caf6..398a5cd 100644
--- a/snippets/f90-mode/bd
+++ b/snippets/f90-mode/bd
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : block data
+# key: bd
 # --
 block data $0
\ No newline at end of file
diff --git a/snippets/f90-mode/c b/snippets/f90-mode/c
index e2f85ba..8bb855b 100644
--- a/snippets/f90-mode/c
+++ b/snippets/f90-mode/c
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : continue
+# key: c
 # --
 continue $0
\ No newline at end of file
diff --git a/snippets/f90-mode/ch b/snippets/f90-mode/ch
index 212637e..e10214c 100644
--- a/snippets/f90-mode/ch
+++ b/snippets/f90-mode/ch
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : character
+# key: ch
 # --
 character $0
\ No newline at end of file
diff --git a/snippets/f90-mode/cx b/snippets/f90-mode/cx
index d7a9db1..ac294d8 100644
--- a/snippets/f90-mode/cx
+++ b/snippets/f90-mode/cx
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : complex
+# key: cx
 # --
 complex $0
\ No newline at end of file
diff --git a/snippets/f90-mode/dc b/snippets/f90-mode/dc
index 76d9827..318f464 100644
--- a/snippets/f90-mode/dc
+++ b/snippets/f90-mode/dc
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : double complex
+# key: dc
 # --
 double complex $0
\ No newline at end of file
diff --git a/snippets/f90-mode/do b/snippets/f90-mode/do
index 813ceeb..1ade918 100644
--- a/snippets/f90-mode/do
+++ b/snippets/f90-mode/do
@@ -1,5 +1,6 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : do while (...) end do
+# key: do
 # --
 do while (${1:condition})
    $0
diff --git a/snippets/f90-mode/dp b/snippets/f90-mode/dp
index 2159e36..1ff6db8 100644
--- a/snippets/f90-mode/dp
+++ b/snippets/f90-mode/dp
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : double precision
+# key: dp
 # --
 double precision $0
\ No newline at end of file
diff --git a/snippets/f90-mode/eq b/snippets/f90-mode/eq
index ad9f78d..9fe99c7 100644
--- a/snippets/f90-mode/eq
+++ b/snippets/f90-mode/eq
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : equivalence
+# key: eq
 # --
 equivalence $0
\ No newline at end of file
diff --git a/snippets/f90-mode/ib b/snippets/f90-mode/ib
index e3d5ea7..c3be9d1 100644
--- a/snippets/f90-mode/ib
+++ b/snippets/f90-mode/ib
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit byte
+# key: ib
 # --
 implicit byte $0
\ No newline at end of file
diff --git a/snippets/f90-mode/ic b/snippets/f90-mode/ic
index dd08d6d..e5f3a71 100644
--- a/snippets/f90-mode/ic
+++ b/snippets/f90-mode/ic
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit complex
+# key: ic
 # --
 implicit complex $0
\ No newline at end of file
diff --git a/snippets/f90-mode/ich b/snippets/f90-mode/ich
index eb156c6..5fbe0bd 100644
--- a/snippets/f90-mode/ich
+++ b/snippets/f90-mode/ich
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit character
+# key: ich
 # --
 implicit character $0
\ No newline at end of file
diff --git a/snippets/f90-mode/if b/snippets/f90-mode/if
index 8554a85..ef24343 100644
--- a/snippets/f90-mode/if
+++ b/snippets/f90-mode/if
@@ -1,5 +1,6 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : if then end if
+# key: f90-modeif
 # --
 if ( ${1:condition} ) then
    $0
diff --git a/snippets/f90-mode/ii b/snippets/f90-mode/ii
index 7d7d442..31d1129 100644
--- a/snippets/f90-mode/ii
+++ b/snippets/f90-mode/ii
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit integer 
+# key: ii
 # --
 implicit integer $0
\ No newline at end of file
diff --git a/snippets/f90-mode/il b/snippets/f90-mode/il
index 2596f3a..560112f 100644
--- a/snippets/f90-mode/il
+++ b/snippets/f90-mode/il
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit logical
+# key: il
 # --
 implicit logical $0
\ No newline at end of file
diff --git a/snippets/f90-mode/in b/snippets/f90-mode/in
index c7183c0..8321ebe 100644
--- a/snippets/f90-mode/in
+++ b/snippets/f90-mode/in
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit none
+# key: in
 # --
 implicit none
\ No newline at end of file
diff --git a/snippets/f90-mode/inc b/snippets/f90-mode/inc
index 408991a..70a6cde 100644
--- a/snippets/f90-mode/inc
+++ b/snippets/f90-mode/inc
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : include
+# key: inc
 # --
 include $0
\ No newline at end of file
diff --git a/snippets/f90-mode/intr b/snippets/f90-mode/intr
index 80d8322..4e04c0a 100644
--- a/snippets/f90-mode/intr
+++ b/snippets/f90-mode/intr
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : intrinsic
+# key: intr
 # --
 intrinsic $0
\ No newline at end of file
diff --git a/snippets/f90-mode/ir b/snippets/f90-mode/ir
index 26d43e1..71933c8 100644
--- a/snippets/f90-mode/ir
+++ b/snippets/f90-mode/ir
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : implicit real
+# key: ir
 # --
 implicit real $0
\ No newline at end of file
diff --git a/snippets/f90-mode/l b/snippets/f90-mode/l
index c048eea..e3cf4fe 100644
--- a/snippets/f90-mode/l
+++ b/snippets/f90-mode/l
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : logical
+# key: l
 # --
 logical $0
\ No newline at end of file
diff --git a/snippets/f90-mode/pa b/snippets/f90-mode/pa
index fcc133c..aeaa1d3 100644
--- a/snippets/f90-mode/pa
+++ b/snippets/f90-mode/pa
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : parameter
+# key: pa
 # --
 parameter $0
\ No newline at end of file
diff --git a/snippets/f90-mode/pr b/snippets/f90-mode/pr
index 1689d8c..a97ced2 100644
--- a/snippets/f90-mode/pr
+++ b/snippets/f90-mode/pr
@@ -1,5 +1,6 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : program ... end program ...
+# key: pr
 # --
 program ${1:name}
   $0
diff --git a/snippets/f90-mode/re b/snippets/f90-mode/re
index 6121c80..42712e0 100644
--- a/snippets/f90-mode/re
+++ b/snippets/f90-mode/re
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : read (*,*)
+# key: re
 # --
 read (${1:*},${2:*}) $0
\ No newline at end of file
diff --git a/snippets/f90-mode/st b/snippets/f90-mode/st
index e5fbb4c..71b9e5a 100644
--- a/snippets/f90-mode/st
+++ b/snippets/f90-mode/st
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : structure
+# key: st
 # --
 structure $0
\ No newline at end of file
diff --git a/snippets/f90-mode/su b/snippets/f90-mode/su
index d23ae55..1ffb749 100644
--- a/snippets/f90-mode/su
+++ b/snippets/f90-mode/su
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : subroutine
+# key: su
 # --
 subroutine $0
\ No newline at end of file
diff --git a/snippets/f90-mode/wr b/snippets/f90-mode/wr
index 1b5a7ef..de38c98 100644
--- a/snippets/f90-mode/wr
+++ b/snippets/f90-mode/wr
@@ -1,4 +1,5 @@
 #contributor: Li Zhu <http://www.zhuli.name>
 #name : write (*,*)
+# key: wr
 # --
 write (${1:*},${2:*}) $0
\ No newline at end of file
diff --git a/snippets/html-mode/b.yasnippet b/snippets/html-mode/b.yasnippet
index ea6f3bb..6ee7431 100755
--- a/snippets/html-mode/b.yasnippet
+++ b/snippets/html-mode/b.yasnippet
@@ -1,4 +1,5 @@
 #contributor : Xah Lee xahlee.org
 #name : <b>...</b>
+# key: b
 # --
 <b>$0</b>
\ No newline at end of file
diff --git a/snippets/html-mode/body b/snippets/html-mode/body
index 3655775..8333cca 100644
--- a/snippets/html-mode/body
+++ b/snippets/html-mode/body
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <body>...</body>
+# key: body
 # --
 <body$1>
   $0
diff --git a/snippets/html-mode/br b/snippets/html-mode/br
index 07c2d4a..68e9907 100644
--- a/snippets/html-mode/br
+++ b/snippets/html-mode/br
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <br />
+# key: br
 # --
 <br />
\ No newline at end of file
diff --git a/snippets/html-mode/code b/snippets/html-mode/code
index a5ad908..cc84329 100644
--- a/snippets/html-mode/code
+++ b/snippets/html-mode/code
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <code>...</code>
+# key: code
 # --
 <code>
   $0
diff --git a/snippets/html-mode/code.class b/snippets/html-mode/code.class
index b910eb7..5338b12 100644
--- a/snippets/html-mode/code.class
+++ b/snippets/html-mode/code.class
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <code class="...">...</code>
+# key: code
 # --
 <code class="$1">
   $0
diff --git a/snippets/html-mode/div b/snippets/html-mode/div
index 1c9c0c8..2c7dfc4 100644
--- a/snippets/html-mode/div
+++ b/snippets/html-mode/div
@@ -1,3 +1,4 @@
 #name : <div...>...</div>
+# key: div
 # --
 <div${1: id="${2:some_id}"}${3: class="${4:some_class}"}>$0</div> 
\ No newline at end of file
diff --git a/snippets/html-mode/div.class b/snippets/html-mode/div.class
index 11c12d6..54ad2e2 100644
--- a/snippets/html-mode/div.class
+++ b/snippets/html-mode/div.class
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <div class="...">...</div>
+# key: div
 # --
 <div class="$1">
   $0
diff --git a/snippets/html-mode/div.id b/snippets/html-mode/div.id
index cec25fb..92f8239 100644
--- a/snippets/html-mode/div.id
+++ b/snippets/html-mode/div.id
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <div id="...">...</div>
+# key: div
 # --
 <div id="$1">
   $0
diff --git a/snippets/html-mode/div.id-class b/snippets/html-mode/div.id-class
index d5b1402..3d40ad7 100644
--- a/snippets/html-mode/div.id-class
+++ b/snippets/html-mode/div.id-class
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <div id="..." class="...">...</div>
+# key: div
 # --
 <div id="$1" class="$2">
   $0
diff --git a/snippets/html-mode/dov b/snippets/html-mode/dov
index fcd0a78..af8ab50 100644
--- a/snippets/html-mode/dov
+++ b/snippets/html-mode/dov
@@ -1,4 +1,5 @@
 #name : <dov...>...</dov>
+# key: dov
 # --
 a mirror up here $3
 
diff --git a/snippets/html-mode/form b/snippets/html-mode/form
index 043a59a..0f1ce7c 100644
--- a/snippets/html-mode/form
+++ b/snippets/html-mode/form
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name :<form method="..." id="..." action="..."></form>
+# key: form
 # --
 <form method="$1" id="$2" action="$3">
   $0
diff --git a/snippets/html-mode/head b/snippets/html-mode/head
index 37ef1ad..0329c36 100644
--- a/snippets/html-mode/head
+++ b/snippets/html-mode/head
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <head>...</head>
+# key: head
 # --
 <head>
   $0
diff --git a/snippets/html-mode/header/h1 b/snippets/html-mode/header/h1
index 68ccf00..cbc3010 100644
--- a/snippets/html-mode/header/h1
+++ b/snippets/html-mode/header/h1
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h1>...</h1>
+# key: headerh1
 # --
 <h1>$1</h1>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h2 b/snippets/html-mode/header/h2
index abeb586..dc25597 100644
--- a/snippets/html-mode/header/h2
+++ b/snippets/html-mode/header/h2
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h2>...</h2>
+# key: headerh2
 # --
 <h2>$1</h2>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h3 b/snippets/html-mode/header/h3
index cc4b16e..a9e448d 100644
--- a/snippets/html-mode/header/h3
+++ b/snippets/html-mode/header/h3
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h3>...</h3>
+# key: headerh3
 # --
 <h3>$1</h3>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h4 b/snippets/html-mode/header/h4
index 53acb57..bffaa87 100644
--- a/snippets/html-mode/header/h4
+++ b/snippets/html-mode/header/h4
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h4>...</h4>
+# key: headerh4
 # --
 <h4>$1</h4>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h5 b/snippets/html-mode/header/h5
index e9bd313..140deb9 100644
--- a/snippets/html-mode/header/h5
+++ b/snippets/html-mode/header/h5
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h5>...</h5>
+# key: headerh5
 # --
 <h5>$1</h5>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h6 b/snippets/html-mode/header/h6
index 6c677af..f486317 100644
--- a/snippets/html-mode/header/h6
+++ b/snippets/html-mode/header/h6
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h6>...</h6>
+# key: headerh6
 # --
 <h6>$1</h6>
\ No newline at end of file
diff --git a/snippets/html-mode/hr b/snippets/html-mode/hr
index 74c62d3..c87ceb7 100644
--- a/snippets/html-mode/hr
+++ b/snippets/html-mode/hr
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <hr />
+# key: hr
 # --
 <hr />
\ No newline at end of file
diff --git a/snippets/html-mode/href b/snippets/html-mode/href
index 0425e6c..ac1285a 100644
--- a/snippets/html-mode/href
+++ b/snippets/html-mode/href
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <a href="...">...</a>
+# key: href
 # --
 <a href="$1">$2</a>
\ No newline at end of file
diff --git a/snippets/html-mode/html b/snippets/html-mode/html
index 8c37883..12beee3 100644
--- a/snippets/html-mode/html
+++ b/snippets/html-mode/html
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <html>...</html>
+# key: html
 # --
 <html>
   $0
diff --git a/snippets/html-mode/html.xmlns b/snippets/html-mode/html.xmlns
index fa26195..a93d24d 100644
--- a/snippets/html-mode/html.xmlns
+++ b/snippets/html-mode/html.xmlns
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <html xmlns="...">...</html>
+# key: html
 # --
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${1:en}" lang="${2:en}">
   $0
diff --git a/snippets/html-mode/i.yasnippet b/snippets/html-mode/i.yasnippet
index 84f05ac..6d85203 100755
--- a/snippets/html-mode/i.yasnippet
+++ b/snippets/html-mode/i.yasnippet
@@ -1,4 +1,5 @@
 #contributor : Xah Lee xahlee.org
 #name : <i>...</i>
+# key: i
 # --
 <i>$0</i>
\ No newline at end of file
diff --git a/snippets/html-mode/img b/snippets/html-mode/img
index 674b1dc..93e00d4 100644
--- a/snippets/html-mode/img
+++ b/snippets/html-mode/img
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <img src="..." class="..." alt="..." />
+# key: img
 # --
 <img src="$1" class="$2" alt="$3" />
\ No newline at end of file
diff --git a/snippets/html-mode/input b/snippets/html-mode/input
index 1ad74f8..83b8854 100644
--- a/snippets/html-mode/input
+++ b/snippets/html-mode/input
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <input ... />
+# key: input
 # --
 <input type="$1" name="$2" value="$3" />
\ No newline at end of file
diff --git a/snippets/html-mode/link.stylesheet b/snippets/html-mode/link.stylesheet
index 0953396..66e5833 100644
--- a/snippets/html-mode/link.stylesheet
+++ b/snippets/html-mode/link.stylesheet
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <link stylesheet="..." />
+# key: link
 # --
 <link rel="${1:stylesheet}" href="${2:url}" type="${3:text/css}" media="${4:screen}" />
\ No newline at end of file
diff --git a/snippets/html-mode/link.stylesheet-ie b/snippets/html-mode/link.stylesheet-ie
index 9cf9fec..c4cee76 100644
--- a/snippets/html-mode/link.stylesheet-ie
+++ b/snippets/html-mode/link.stylesheet-ie
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <!--[if IE]><link stylesheet="..." /><![endif]-->
+# key: link
 # --
 <!--[if IE]>
 <link rel="${1:stylesheet}" href="${2:url}" type="${3:text/css}" media="${4:screen}" />
diff --git a/snippets/html-mode/list/dd b/snippets/html-mode/list/dd
index 7e339c0..9c84939 100644
--- a/snippets/html-mode/list/dd
+++ b/snippets/html-mode/list/dd
@@ -1,4 +1,5 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dd> ... </dd>
+# key: listdd
 # --
 <dd>$1</dd>
\ No newline at end of file
diff --git a/snippets/html-mode/list/dl b/snippets/html-mode/list/dl
index db3e762..6980cf9 100644
--- a/snippets/html-mode/list/dl
+++ b/snippets/html-mode/list/dl
@@ -1,5 +1,6 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dl> ... </dl>
+# key: listdl
 # --
 <dl>
     $0
diff --git a/snippets/html-mode/list/dl.id b/snippets/html-mode/list/dl.id
index f635606..f19cbc2 100644
--- a/snippets/html-mode/list/dl.id
+++ b/snippets/html-mode/list/dl.id
@@ -1,5 +1,6 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dl> ... </dl>
+# key: listdl
 # --
 <dl id="$1">
     $0
diff --git a/snippets/html-mode/list/dt b/snippets/html-mode/list/dt
index bd950f7..796b289 100644
--- a/snippets/html-mode/list/dt
+++ b/snippets/html-mode/list/dt
@@ -1,4 +1,5 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dt> ... </dt>
+# key: listdt
 # --
 <dt>$1</dt>
\ No newline at end of file
diff --git a/snippets/html-mode/list/li b/snippets/html-mode/list/li
index a38961c..2d34695 100644
--- a/snippets/html-mode/list/li
+++ b/snippets/html-mode/list/li
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <li>...</li>
+# key: listli
 # --
 <li>$1</li>
\ No newline at end of file
diff --git a/snippets/html-mode/list/li.class b/snippets/html-mode/list/li.class
index 9f0443c..728c3da 100644
--- a/snippets/html-mode/list/li.class
+++ b/snippets/html-mode/list/li.class
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <li class="...">...</li>
+# key: listli
 # --
 <li class="$1">$2</li>
\ No newline at end of file
diff --git a/snippets/html-mode/list/ol b/snippets/html-mode/list/ol
index 6d8f2f2..51473d6 100644
--- a/snippets/html-mode/list/ol
+++ b/snippets/html-mode/list/ol
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ol>...</ol>
+# key: listol
 # --
 <ol>
   $0
diff --git a/snippets/html-mode/list/ol.class b/snippets/html-mode/list/ol.class
index 3b7b1e3..5d8bc50 100644
--- a/snippets/html-mode/list/ol.class
+++ b/snippets/html-mode/list/ol.class
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ol class="...">...</ol>
+# key: listol
 # --
 <ol class="$1">
   $0
diff --git a/snippets/html-mode/list/ol.id b/snippets/html-mode/list/ol.id
index f1db682..f2cb04f 100644
--- a/snippets/html-mode/list/ol.id
+++ b/snippets/html-mode/list/ol.id
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ol id="...">...</ol>
+# key: listol
 # --
 <ol id="$1">
   $0
diff --git a/snippets/html-mode/list/ul b/snippets/html-mode/list/ul
index cf4a393..9e58a38 100644
--- a/snippets/html-mode/list/ul
+++ b/snippets/html-mode/list/ul
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ul>...</ul>
+# key: listul
 # --
 <ul>
   $0
diff --git a/snippets/html-mode/list/ul.class b/snippets/html-mode/list/ul.class
index 6c59820..35560f6 100644
--- a/snippets/html-mode/list/ul.class
+++ b/snippets/html-mode/list/ul.class
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ul class="...">...</ul>
+# key: listul
 # --
 <ul class="$1">
   $0
diff --git a/snippets/html-mode/list/ul.id b/snippets/html-mode/list/ul.id
index 6a96009..0860f5f 100644
--- a/snippets/html-mode/list/ul.id
+++ b/snippets/html-mode/list/ul.id
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ul id="...">...</ul>
+# key: listul
 # --
 <ul id="$1">
   $0
diff --git a/snippets/html-mode/mailto b/snippets/html-mode/mailto
index b134f2c..17845a3 100644
--- a/snippets/html-mode/mailto
+++ b/snippets/html-mode/mailto
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <a href="mailto:...@...">...</a>
+# key: mailto
 # --
 <a href="mailto:$1@$2">$0</a>
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype b/snippets/html-mode/meta/doctype
index 5e678d5..544fb3b 100644
--- a/snippets/html-mode/meta/doctype
+++ b/snippets/html-mode/meta/doctype
@@ -1,3 +1,4 @@
 #name : Doctype HTML 4.01 Strict
+# key: metadoctype
 # --
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhml1 b/snippets/html-mode/meta/doctype.xhml1
index c5cfb6f..a941879 100644
--- a/snippets/html-mode/meta/doctype.xhml1
+++ b/snippets/html-mode/meta/doctype.xhml1
@@ -1,3 +1,4 @@
 #name : DocType XHTML 1.0 frameset
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhtml1_1 b/snippets/html-mode/meta/doctype.xhtml1_1
index 72076c0..c3c932d 100644
--- a/snippets/html-mode/meta/doctype.xhtml1_1
+++ b/snippets/html-mode/meta/doctype.xhtml1_1
@@ -1,3 +1,4 @@
 #name : DocType XHTML 1.1
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhtml1_strict b/snippets/html-mode/meta/doctype.xhtml1_strict
index 176616b..b34d05f 100644
--- a/snippets/html-mode/meta/doctype.xhtml1_strict
+++ b/snippets/html-mode/meta/doctype.xhtml1_strict
@@ -1,3 +1,4 @@
 #name : DocType XHTML 1.0 Strict
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhtml1_transitional b/snippets/html-mode/meta/doctype.xhtml1_transitional
index d6b6bae..416d507 100644
--- a/snippets/html-mode/meta/doctype.xhtml1_transitional
+++ b/snippets/html-mode/meta/doctype.xhtml1_transitional
@@ -1,3 +1,4 @@
 #name : DocType XHTML 1.0 Transitional
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/meta b/snippets/html-mode/meta/meta
index 8495052..919f2ee 100644
--- a/snippets/html-mode/meta/meta
+++ b/snippets/html-mode/meta/meta
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <meta name="..." content="..." />
+# key: metameta
 # --
 <meta name="${1:generator}" content="${2:content}" />
\ No newline at end of file
diff --git a/snippets/html-mode/meta/meta.http-equiv b/snippets/html-mode/meta/meta.http-equiv
index 55a438a..06c0395 100644
--- a/snippets/html-mode/meta/meta.http-equiv
+++ b/snippets/html-mode/meta/meta.http-equiv
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <meta http-equiv="..." content="..." />
+# key: metameta
 # --
 <meta http-equiv="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />
\ No newline at end of file
diff --git a/snippets/html-mode/p b/snippets/html-mode/p
index 579cc76..6d8cfc7 100644
--- a/snippets/html-mode/p
+++ b/snippets/html-mode/p
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <p>...</p>
+# key: p
 # --
 <p>$1</p>
\ No newline at end of file
diff --git a/snippets/html-mode/pre b/snippets/html-mode/pre
index 58e77cf..94d894c 100644
--- a/snippets/html-mode/pre
+++ b/snippets/html-mode/pre
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <pre>...</pre>
+# key: pre
 # --
 <pre>
   $0
diff --git a/snippets/html-mode/q.yasnippet b/snippets/html-mode/q.yasnippet
index ce34b74..a504d97 100755
--- a/snippets/html-mode/q.yasnippet
+++ b/snippets/html-mode/q.yasnippet
@@ -1,5 +1,6 @@
 #contributor : Xah Lee xahlee.org
 #name : <blockquote>...</blockquote>
+# key: q
 # --
 <blockquote>
 $0
diff --git a/snippets/html-mode/quote b/snippets/html-mode/quote
index 694185b..4811211 100644
--- a/snippets/html-mode/quote
+++ b/snippets/html-mode/quote
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <blockquote>...</blockquote>
+# key: quote
 # --
 <blockquote>
   $1
diff --git a/snippets/html-mode/script.javascript b/snippets/html-mode/script.javascript
index 807f0ea..69708b7 100644
--- a/snippets/html-mode/script.javascript
+++ b/snippets/html-mode/script.javascript
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name :<script type="text/javascript">...</script> 
+# key: script
 # --
 <script type="text/javascript">
   $0
diff --git a/snippets/html-mode/script.javascript-src b/snippets/html-mode/script.javascript-src
index 3e3cc3d..bd8a38f 100644
--- a/snippets/html-mode/script.javascript-src
+++ b/snippets/html-mode/script.javascript-src
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name :<script type="text/javascript" src="..."></script> 
+# key: script
 # --
 <script type="text/javascript" src="$1"></script>
\ No newline at end of file
diff --git a/snippets/html-mode/span b/snippets/html-mode/span
index 3dfdf2f..4de10b2 100644
--- a/snippets/html-mode/span
+++ b/snippets/html-mode/span
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <span>...</span>
+# key: span
 # --
 <span>$1</span>
\ No newline at end of file
diff --git a/snippets/html-mode/span.class b/snippets/html-mode/span.class
index 2d5ee55..f54808c 100644
--- a/snippets/html-mode/span.class
+++ b/snippets/html-mode/span.class
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <span class="...">...</span>
+# key: span
 # --
 <span class="$1">$2</span>
\ No newline at end of file
diff --git a/snippets/html-mode/span.id b/snippets/html-mode/span.id
index dbce842..dfc0f9d 100644
--- a/snippets/html-mode/span.id
+++ b/snippets/html-mode/span.id
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <span id="...">...</span>
+# key: span
 # --
 <span id="$1">$2</span>
\ No newline at end of file
diff --git a/snippets/html-mode/style b/snippets/html-mode/style
index 83285a2..5044bb2 100644
--- a/snippets/html-mode/style
+++ b/snippets/html-mode/style
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <style type="text/css" media="...">...</style>
+# key: style
 # --
 <style type="text/css" media="${1:screen}">
   $0
diff --git a/snippets/html-mode/table/table b/snippets/html-mode/table/table
index 3375409..c3011ae 100644
--- a/snippets/html-mode/table/table
+++ b/snippets/html-mode/table/table
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <table ...>...</table>
+# key: tabletable
 # --
 <table width="$1" cellspacing="$2" cellpadding="$3" border="$4">
   $0
diff --git a/snippets/html-mode/table/td b/snippets/html-mode/table/td
index d4dcf37..2edd0d2 100644
--- a/snippets/html-mode/table/td
+++ b/snippets/html-mode/table/td
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <td>...</td>
+# key: tabletd
 # --
 <td$1>$2</td>
\ No newline at end of file
diff --git a/snippets/html-mode/table/th b/snippets/html-mode/table/th
index 7b17a17..a5198b8 100644
--- a/snippets/html-mode/table/th
+++ b/snippets/html-mode/table/th
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <th>...</th>
+# key: tableth
 # --
 <th$1>$2</th>
\ No newline at end of file
diff --git a/snippets/html-mode/table/tr b/snippets/html-mode/table/tr
index 8402cda..9666d07 100644
--- a/snippets/html-mode/table/tr
+++ b/snippets/html-mode/table/tr
@@ -1,5 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <tr>...</tr>
+# key: tabletr
 # --
 <tr>
   $0
diff --git a/snippets/html-mode/textarea b/snippets/html-mode/textarea
index 9553d7a..df84d93 100644
--- a/snippets/html-mode/textarea
+++ b/snippets/html-mode/textarea
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <textarea ...></textarea>
+# key: textarea
 # --
 <textarea name="$1" id="$2" rows="$3" cols="$4" tabindex="$5"></textarea>
\ No newline at end of file
diff --git a/snippets/html-mode/title b/snippets/html-mode/title
index 01e368b..7f1694e 100644
--- a/snippets/html-mode/title
+++ b/snippets/html-mode/title
@@ -1,4 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <title>...</title>
+# key: title
 # --
 <title>$1</title>
\ No newline at end of file
diff --git a/snippets/latex-mode/begin b/snippets/latex-mode/begin
index 99a7074..c778c01 100644
--- a/snippets/latex-mode/begin
+++ b/snippets/latex-mode/begin
@@ -1,5 +1,6 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : \begin{environment} ... \end{environment}
+# key: begin
 # --
 
 \begin{${1:environment}}
diff --git a/snippets/markdown-mode/+ b/snippets/markdown-mode/+
index 34abe18..3d76c26 100644
--- a/snippets/markdown-mode/+
+++ b/snippets/markdown-mode/+
@@ -1,5 +1,6 @@
 #name : Unordered List
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: +
 # --
 + ${1:Text}
 +$0
\ No newline at end of file
diff --git a/snippets/markdown-mode/- b/snippets/markdown-mode/-
index e49af13..6526e95 100644
--- a/snippets/markdown-mode/-
+++ b/snippets/markdown-mode/-
@@ -1,5 +1,6 @@
 #name : Unordered List
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: -
 # --
 - ${1:Text}
 -$0
\ No newline at end of file
diff --git a/snippets/markdown-mode/_ b/snippets/markdown-mode/_
index 6c57d59..ba3c7eb 100644
--- a/snippets/markdown-mode/_
+++ b/snippets/markdown-mode/_
@@ -1,4 +1,5 @@
 #name : Emphasis
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: _
 # --
 _${1:Text}_ $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/__ b/snippets/markdown-mode/__
index bfe1d32..872def8 100644
--- a/snippets/markdown-mode/__
+++ b/snippets/markdown-mode/__
@@ -1,4 +1,5 @@
 #name : Strong
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: __
 # --
 **${1:Text}** $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/` b/snippets/markdown-mode/`
index 2b3661d..0e4cd94 100644
--- a/snippets/markdown-mode/`
+++ b/snippets/markdown-mode/`
@@ -1,4 +1,5 @@
 #name : Inline Code
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: `
 # --
 \`${1:Code}\` $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/h1.1 b/snippets/markdown-mode/h1.1
index a69868b..afba17e 100644
--- a/snippets/markdown-mode/h1.1
+++ b/snippets/markdown-mode/h1.1
@@ -1,5 +1,6 @@
 #name : Header 1 (#)
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h1
 # --
 # ${1:Header 1} #
 
diff --git a/snippets/markdown-mode/h1.2 b/snippets/markdown-mode/h1.2
index 531b94c..df4d5c1 100644
--- a/snippets/markdown-mode/h1.2
+++ b/snippets/markdown-mode/h1.2
@@ -1,5 +1,6 @@
 #name : Header 1 (=)
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h1
 # --
 ${1:Header 1}
 ${1:$(make-string (string-width text) ?\=)}
diff --git a/snippets/markdown-mode/h2.1 b/snippets/markdown-mode/h2.1
index 8822e0b..cee6cdd 100644
--- a/snippets/markdown-mode/h2.1
+++ b/snippets/markdown-mode/h2.1
@@ -1,5 +1,6 @@
 #name : Header 2 (##)
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h2
 # --
 ## ${1:Header 1} ##
 
diff --git a/snippets/markdown-mode/h2.2 b/snippets/markdown-mode/h2.2
index 9644490..8dbb456 100644
--- a/snippets/markdown-mode/h2.2
+++ b/snippets/markdown-mode/h2.2
@@ -1,5 +1,6 @@
 #name : Header 2 (-)
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h2
 # --
 ${1:Header 2}
 ${1:$(make-string (string-width text) ?\-)}
diff --git a/snippets/markdown-mode/h3 b/snippets/markdown-mode/h3
index 6e5c558..c704b97 100644
--- a/snippets/markdown-mode/h3
+++ b/snippets/markdown-mode/h3
@@ -1,5 +1,6 @@
 #name : Header 3
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h3
 # --
 ### ${1:Header 3} ###
 
diff --git a/snippets/markdown-mode/h4 b/snippets/markdown-mode/h4
index 0e87dda..17a800b 100644
--- a/snippets/markdown-mode/h4
+++ b/snippets/markdown-mode/h4
@@ -1,5 +1,6 @@
 #name : Header 4
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h4
 # --
 #### ${1:Header 4} ####
 
diff --git a/snippets/markdown-mode/h5 b/snippets/markdown-mode/h5
index 76fa82e..24da1c0 100644
--- a/snippets/markdown-mode/h5
+++ b/snippets/markdown-mode/h5
@@ -1,5 +1,6 @@
 #name : Header 5
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h5
 # --
 ##### ${1:Header 5} #####
 
diff --git a/snippets/markdown-mode/h6 b/snippets/markdown-mode/h6
index 4ad6f65..c4e45a5 100644
--- a/snippets/markdown-mode/h6
+++ b/snippets/markdown-mode/h6
@@ -1,5 +1,6 @@
 #name : Header 6
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: h6
 # --
 ###### ${1:Header 6} ######
 
diff --git a/snippets/markdown-mode/hr.1 b/snippets/markdown-mode/hr.1
index 8bffe6d..844bb45 100644
--- a/snippets/markdown-mode/hr.1
+++ b/snippets/markdown-mode/hr.1
@@ -1,5 +1,6 @@
 #name : Horizontal Rule (-)
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: hr
 # --
 
 ----------
diff --git a/snippets/markdown-mode/hr.2 b/snippets/markdown-mode/hr.2
index a3ababf..020c71f 100644
--- a/snippets/markdown-mode/hr.2
+++ b/snippets/markdown-mode/hr.2
@@ -1,5 +1,6 @@
 #name : Horizontal Rule (*)
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: hr
 # --
 
 *******
diff --git a/snippets/markdown-mode/img b/snippets/markdown-mode/img
index 83ec982..20215a6 100644
--- a/snippets/markdown-mode/img
+++ b/snippets/markdown-mode/img
@@ -1,4 +1,5 @@
 #name : Image
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: img
 # --
 ![${1:Alt Text}](${2:URL} $3) $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/link b/snippets/markdown-mode/link
index 248fbf8..c2dc08c 100644
--- a/snippets/markdown-mode/link
+++ b/snippets/markdown-mode/link
@@ -1,4 +1,5 @@
 #name : Link
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: link
 # --
 [${1:Link Text}](${2:URL} $3) $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/ol b/snippets/markdown-mode/ol
index f10f879..117ffbd 100644
--- a/snippets/markdown-mode/ol
+++ b/snippets/markdown-mode/ol
@@ -1,5 +1,6 @@
 #name : Ordered List
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: ol
 # --
 ${1:1}. ${2:Text}
 ${1:$(number-to-string (1+ (string-to-number text)))}. $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/rimg b/snippets/markdown-mode/rimg
index 09e7f00..8d02a80 100644
--- a/snippets/markdown-mode/rimg
+++ b/snippets/markdown-mode/rimg
@@ -1,4 +1,5 @@
 #name : Referenced Image
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: rimg
 # --
 ![${1:Alt Text}][$2] $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/rlb b/snippets/markdown-mode/rlb
index f29a6ab..9f5d6b8 100644
--- a/snippets/markdown-mode/rlb
+++ b/snippets/markdown-mode/rlb
@@ -1,5 +1,6 @@
 #name : Reference Label
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: rlb
 # --
 [${1:Reference}]: ${2:URL} $3
 $0
\ No newline at end of file
diff --git a/snippets/markdown-mode/rlink b/snippets/markdown-mode/rlink
index 3249f9f..6d18ec2 100644
--- a/snippets/markdown-mode/rlink
+++ b/snippets/markdown-mode/rlink
@@ -1,4 +1,5 @@
 #name : Reference Link
 #contributor: Peng Deng <dengpeng@gmail.com>
+# key: rlink
 # --
 [${1:Link Text}][$2] $0
\ No newline at end of file
diff --git a/snippets/nxml-mode/body b/snippets/nxml-mode/body
index 9a9addc..1ad1e9a 100644
--- a/snippets/nxml-mode/body
+++ b/snippets/nxml-mode/body
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <body>...</body>
+# key: body
 # --
 <body$1>
   $0
diff --git a/snippets/nxml-mode/br b/snippets/nxml-mode/br
index 3e235ed..b469259 100644
--- a/snippets/nxml-mode/br
+++ b/snippets/nxml-mode/br
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <br />
+# key: br
 # --
 <br />
\ No newline at end of file
diff --git a/snippets/nxml-mode/code b/snippets/nxml-mode/code
index 15da807..c77f4d4 100644
--- a/snippets/nxml-mode/code
+++ b/snippets/nxml-mode/code
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <code>...</code>
+# key: code
 # --
 <code>
   $0
diff --git a/snippets/nxml-mode/div b/snippets/nxml-mode/div
index 90fbc2e..1bd727e 100644
--- a/snippets/nxml-mode/div
+++ b/snippets/nxml-mode/div
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <div...>...</div>
+# key: div
 # --
 <div$1>$0</div>
\ No newline at end of file
diff --git a/snippets/nxml-mode/form b/snippets/nxml-mode/form
index a83c4f9..7c9ce07 100644
--- a/snippets/nxml-mode/form
+++ b/snippets/nxml-mode/form
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name :<form method="..." action="..."></form>
+# key: form
 # --
 <form method="$1" action="$2">
   $0
diff --git a/snippets/nxml-mode/head b/snippets/nxml-mode/head
index 2a4865b..fb8a1b6 100644
--- a/snippets/nxml-mode/head
+++ b/snippets/nxml-mode/head
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <head>...</head>
+# key: head
 # --
 <head>
   $0
diff --git a/snippets/nxml-mode/header/h1 b/snippets/nxml-mode/header/h1
index e896d9f..9809014 100644
--- a/snippets/nxml-mode/header/h1
+++ b/snippets/nxml-mode/header/h1
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h1>...</h1>
+# key: headerh1
 # --
 <h1>$1</h1>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h2 b/snippets/nxml-mode/header/h2
index e946982..c511a46 100644
--- a/snippets/nxml-mode/header/h2
+++ b/snippets/nxml-mode/header/h2
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h2>...</h2>
+# key: headerh2
 # --
 <h2>$1</h2>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h3 b/snippets/nxml-mode/header/h3
index 3d41c45..2feb6aa 100644
--- a/snippets/nxml-mode/header/h3
+++ b/snippets/nxml-mode/header/h3
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h3>...</h3>
+# key: headerh3
 # --
 <h3>$1</h3>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h4 b/snippets/nxml-mode/header/h4
index c88b0ba..8c5bb45 100644
--- a/snippets/nxml-mode/header/h4
+++ b/snippets/nxml-mode/header/h4
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h4>...</h4>
+# key: headerh4
 # --
 <h4>$1</h4>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h5 b/snippets/nxml-mode/header/h5
index 9b7b12b..682a432 100644
--- a/snippets/nxml-mode/header/h5
+++ b/snippets/nxml-mode/header/h5
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h5>...</h5>
+# key: headerh5
 # --
 <h5>$1</h5>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h6 b/snippets/nxml-mode/header/h6
index 3e8234c..ab2160a 100644
--- a/snippets/nxml-mode/header/h6
+++ b/snippets/nxml-mode/header/h6
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h6>...</h6>
+# key: headerh6
 # --
 <h6>$1</h6>
\ No newline at end of file
diff --git a/snippets/nxml-mode/hr b/snippets/nxml-mode/hr
index 1e90c8a..a871c57 100644
--- a/snippets/nxml-mode/hr
+++ b/snippets/nxml-mode/hr
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <hr />
+# key: hr
 # --
 <hr />
\ No newline at end of file
diff --git a/snippets/nxml-mode/href b/snippets/nxml-mode/href
index 3da0ece..14adc94 100644
--- a/snippets/nxml-mode/href
+++ b/snippets/nxml-mode/href
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <a href="...">...</a>
+# key: href
 # --
 <a href="$1">$2</a>
\ No newline at end of file
diff --git a/snippets/nxml-mode/html b/snippets/nxml-mode/html
index e8b06f6..cf67565 100644
--- a/snippets/nxml-mode/html
+++ b/snippets/nxml-mode/html
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <html xmlns="...">...</html>
+# key: html
 # --
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${1:en}" lang="${2:en}">
   $0
diff --git a/snippets/nxml-mode/img b/snippets/nxml-mode/img
index 442d679..0e6348a 100644
--- a/snippets/nxml-mode/img
+++ b/snippets/nxml-mode/img
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <img src="..." alt="..." />
+# key: img
 # --
 <img src="$1" alt="$2" />
\ No newline at end of file
diff --git a/snippets/nxml-mode/input b/snippets/nxml-mode/input
index 56cfc09..fb65f53 100644
--- a/snippets/nxml-mode/input
+++ b/snippets/nxml-mode/input
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <input ... />
+# key: input
 # --
 <input type="$1" name="$2" value="$3" />
\ No newline at end of file
diff --git a/snippets/nxml-mode/li b/snippets/nxml-mode/li
index 0c4c9e4..832a924 100644
--- a/snippets/nxml-mode/li
+++ b/snippets/nxml-mode/li
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <li>...</li>
+# key: li
 # --
 <li>$1</li>
\ No newline at end of file
diff --git a/snippets/nxml-mode/link b/snippets/nxml-mode/link
index d16475a..d9ddcfe 100644
--- a/snippets/nxml-mode/link
+++ b/snippets/nxml-mode/link
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <link stylesheet="..." />
+# key: link
 # --
 <link rel="${1:stylesheet}" href="${2:url}" type="${3:text/css}" media="${4:screen}" />
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/doctype b/snippets/nxml-mode/meta/doctype
index 8974132..a7fef1f 100644
--- a/snippets/nxml-mode/meta/doctype
+++ b/snippets/nxml-mode/meta/doctype
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : DocType XHTML 1.1
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/doctype.xhtml1_strict b/snippets/nxml-mode/meta/doctype.xhtml1_strict
index d2c66d8..c2a1d58 100644
--- a/snippets/nxml-mode/meta/doctype.xhtml1_strict
+++ b/snippets/nxml-mode/meta/doctype.xhtml1_strict
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : DocType XHTML 1.0 Strict
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/doctype.xhtml1_transitional b/snippets/nxml-mode/meta/doctype.xhtml1_transitional
index 3cef6e8..62440b1 100644
--- a/snippets/nxml-mode/meta/doctype.xhtml1_transitional
+++ b/snippets/nxml-mode/meta/doctype.xhtml1_transitional
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : DocType XHTML 1.0 Transitional
+# key: metadoctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/meta b/snippets/nxml-mode/meta/meta
index 8e5e6b3..dc28771 100644
--- a/snippets/nxml-mode/meta/meta
+++ b/snippets/nxml-mode/meta/meta
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <meta name="..." content="..." />
+# key: metameta
 # --
 <meta name="${1:generator}" content="${2:content}" />
\ No newline at end of file
diff --git a/snippets/nxml-mode/name b/snippets/nxml-mode/name
index a7683d5..4f56d05 100644
--- a/snippets/nxml-mode/name
+++ b/snippets/nxml-mode/name
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <a name="..."></a>
+# key: name
 # --
 <a name="$1"></a>
\ No newline at end of file
diff --git a/snippets/nxml-mode/ol b/snippets/nxml-mode/ol
index d7993be..2693360 100644
--- a/snippets/nxml-mode/ol
+++ b/snippets/nxml-mode/ol
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <ol>...</ol>
+# key: ol
 # --
 <ol>
   $0
diff --git a/snippets/nxml-mode/p b/snippets/nxml-mode/p
index c79b367..1371db7 100644
--- a/snippets/nxml-mode/p
+++ b/snippets/nxml-mode/p
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <p>...</p>
+# key: p
 # --
 <p>$1</p>
\ No newline at end of file
diff --git a/snippets/nxml-mode/pre b/snippets/nxml-mode/pre
index b92cabb..ab6fd98 100644
--- a/snippets/nxml-mode/pre
+++ b/snippets/nxml-mode/pre
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <pre>...</pre>
+# key: pre
 # --
 <pre>
   $0
diff --git a/snippets/nxml-mode/quote b/snippets/nxml-mode/quote
index 5e17c98..0c9d475 100644
--- a/snippets/nxml-mode/quote
+++ b/snippets/nxml-mode/quote
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <blockquote>...</blockquote>
+# key: quote
 # --
 <blockquote>
   $1
diff --git a/snippets/nxml-mode/span b/snippets/nxml-mode/span
index 69d5332..615b263 100644
--- a/snippets/nxml-mode/span
+++ b/snippets/nxml-mode/span
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <span>...</span>
+# key: span
 # --
 <span>$1</span>
\ No newline at end of file
diff --git a/snippets/nxml-mode/style b/snippets/nxml-mode/style
index 1f462cd..c12468a 100644
--- a/snippets/nxml-mode/style
+++ b/snippets/nxml-mode/style
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <style type="text/css" media="...">...</style>
+# key: style
 # --
 <style type="text/css" media="${1:screen}">
   $0
diff --git a/snippets/nxml-mode/table b/snippets/nxml-mode/table
index 3d28497..247e259 100644
--- a/snippets/nxml-mode/table
+++ b/snippets/nxml-mode/table
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <table>...</table>
+# key: table
 # --
 <table>
   $0
diff --git a/snippets/nxml-mode/tag.1l b/snippets/nxml-mode/tag.1l
index 8988635..58dda0e 100644
--- a/snippets/nxml-mode/tag.1l
+++ b/snippets/nxml-mode/tag.1l
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <tag>...</tag>
+# key: tag
 # --
 <${1:tag}>$2</$1>$0
\ No newline at end of file
diff --git a/snippets/nxml-mode/tag.2l b/snippets/nxml-mode/tag.2l
index 08b4a26..9599c84 100644
--- a/snippets/nxml-mode/tag.2l
+++ b/snippets/nxml-mode/tag.2l
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <tag> \n...\n</tag>
+# key: tag
 # --
 <${1:tag}>
   $2
diff --git a/snippets/nxml-mode/td b/snippets/nxml-mode/td
index 4543d5c..bab48d2 100644
--- a/snippets/nxml-mode/td
+++ b/snippets/nxml-mode/td
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <td>...</td>
+# key: td
 # --
 <td$1>$2</td>
\ No newline at end of file
diff --git a/snippets/nxml-mode/th b/snippets/nxml-mode/th
index 4b679ef..31dd302 100644
--- a/snippets/nxml-mode/th
+++ b/snippets/nxml-mode/th
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <th>...</th>
+# key: th
 # --
 <th$1>$2</th>
\ No newline at end of file
diff --git a/snippets/nxml-mode/title b/snippets/nxml-mode/title
index 581d8bb..5047485 100644
--- a/snippets/nxml-mode/title
+++ b/snippets/nxml-mode/title
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <title>...</title>
+# key: title
 # --
 <title>$1</title>
\ No newline at end of file
diff --git a/snippets/nxml-mode/tr b/snippets/nxml-mode/tr
index 6726429..16a3367 100644
--- a/snippets/nxml-mode/tr
+++ b/snippets/nxml-mode/tr
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <tr>...</tr>
+# key: tr
 # --
 <tr>
   $0
diff --git a/snippets/nxml-mode/ul b/snippets/nxml-mode/ul
index 0462dd1..b2691f0 100644
--- a/snippets/nxml-mode/ul
+++ b/snippets/nxml-mode/ul
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <ul>...</ul>
+# key: ul
 # --
 <ul>
   $0
diff --git a/snippets/objc-mode/prop b/snippets/objc-mode/prop
index 4d585db..0b3409d 100644
--- a/snippets/objc-mode/prop
+++ b/snippets/objc-mode/prop
@@ -1,4 +1,5 @@
 #name : foo { ... } ; setFoo { ... }
+# key: prop
 # --
 - (${1:id})${2:foo}
 {
diff --git a/snippets/perl-mode/eval b/snippets/perl-mode/eval
index c1f1e1b..15993a3 100644
--- a/snippets/perl-mode/eval
+++ b/snippets/perl-mode/eval
@@ -1,4 +1,5 @@
 #name : eval { ... } if ($@) { ... }
+# key: eval
 # --
 eval {
     ${1:# do something risky...}
diff --git a/snippets/perl-mode/for b/snippets/perl-mode/for
index ec5532f..166880b 100644
--- a/snippets/perl-mode/for
+++ b/snippets/perl-mode/for
@@ -1,4 +1,5 @@
 #name : for (...) { ... }
+# key: for
 # --
 for (my \$${1:var} = 0; \$$1 < ${2:expression}; \$$1++) {
     ${3:# body...}
diff --git a/snippets/perl-mode/fore b/snippets/perl-mode/fore
index c878a0e..918aa88 100644
--- a/snippets/perl-mode/fore
+++ b/snippets/perl-mode/fore
@@ -1,4 +1,5 @@
 #name : foreach ... { ... }
+# key: fore
 # --
 foreach my \$${1:x} (@${2:array}) {
     ${3:# body...}
diff --git a/snippets/perl-mode/if b/snippets/perl-mode/if
index 3191b97..7e288c9 100644
--- a/snippets/perl-mode/if
+++ b/snippets/perl-mode/if
@@ -1,4 +1,5 @@
 #name : if (...) { ... }
+# key: perl-modeif
 # --
 if ($1) {
     $0
diff --git a/snippets/perl-mode/ife b/snippets/perl-mode/ife
index 23f7cf6..2ce657c 100644
--- a/snippets/perl-mode/ife
+++ b/snippets/perl-mode/ife
@@ -1,4 +1,5 @@
 #name : if (...) { ... } else { ... }
+# key: perl-modeife
 # --
 if ($1) {
     $2
diff --git a/snippets/perl-mode/ifee b/snippets/perl-mode/ifee
index 7c187d1..d246f32 100644
--- a/snippets/perl-mode/ifee
+++ b/snippets/perl-mode/ifee
@@ -1,4 +1,5 @@
 #name : if, elsif, else ...
+# key: perl-modeifee
 # --
 if ($1) {
 	${2:# body...}
diff --git a/snippets/perl-mode/sub b/snippets/perl-mode/sub
index 5ab54d7..cf61f5a 100644
--- a/snippets/perl-mode/sub
+++ b/snippets/perl-mode/sub
@@ -1,4 +1,5 @@
 #name : sub ... { ... }
+# key: sub
 # --
 sub ${1:function_name} {
     $0
diff --git a/snippets/perl-mode/unless b/snippets/perl-mode/unless
index baeffa2..19c558b 100644
--- a/snippets/perl-mode/unless
+++ b/snippets/perl-mode/unless
@@ -1,4 +1,5 @@
 #name : unless (...) { ... }
+# key: unless
 # --
 unless ($1) {
     $0
diff --git a/snippets/perl-mode/while b/snippets/perl-mode/while
index 9c2c470..ceec4f5 100644
--- a/snippets/perl-mode/while
+++ b/snippets/perl-mode/while
@@ -1,4 +1,5 @@
 #name : while (...) { ... }
+# key: while
 # --
 while ($1) {
     $0
diff --git a/snippets/perl-mode/xfore b/snippets/perl-mode/xfore
index 58e455d..3695d9d 100644
--- a/snippets/perl-mode/xfore
+++ b/snippets/perl-mode/xfore
@@ -1,3 +1,4 @@
 #name : ... foreach ...
+# key: xfore
 # --
 ${1:expression} foreach @${2:array};
\ No newline at end of file
diff --git a/snippets/perl-mode/xif b/snippets/perl-mode/xif
index 1d4dba8..5f9f01f 100644
--- a/snippets/perl-mode/xif
+++ b/snippets/perl-mode/xif
@@ -1,3 +1,4 @@
 #name : ... if ...
+# key: perl-modexif
 # --
 ${1:expression} if ${2:condition}
\ No newline at end of file
diff --git a/snippets/perl-mode/xunless b/snippets/perl-mode/xunless
index f456db3..2d91ed9 100644
--- a/snippets/perl-mode/xunless
+++ b/snippets/perl-mode/xunless
@@ -1,3 +1,4 @@
 #name : ... unless ...
+# key: xunless
 # --
 ${1:expression} unless ${2:condition}
\ No newline at end of file
diff --git a/snippets/perl-mode/xwhile b/snippets/perl-mode/xwhile
index 2515586..e2711be 100644
--- a/snippets/perl-mode/xwhile
+++ b/snippets/perl-mode/xwhile
@@ -1,3 +1,4 @@
 #name : ... while ...
+# key: xwhile
 # --
 ${1:expression} while ${2:condition};
\ No newline at end of file
diff --git a/snippets/python-mode/__ b/snippets/python-mode/__
index a67dc49..d1b9aa6 100644
--- a/snippets/python-mode/__
+++ b/snippets/python-mode/__
@@ -1,3 +1,4 @@
 #name : __...__
+# key: __
 # --
 __${init}__
\ No newline at end of file
diff --git a/snippets/python-mode/class b/snippets/python-mode/class
index 78c0548..69a088e 100644
--- a/snippets/python-mode/class
+++ b/snippets/python-mode/class
@@ -3,6 +3,7 @@
 # contributor: Orestis Markou
 # contributor: Nishio Hirokazu
 # contributor: Yasser González Fernández <yglez@uh.cu>
+# key: class
 # --
 class ${1:ClassName}(${2:object}):
     """$3
diff --git a/snippets/python-mode/def b/snippets/python-mode/def
index 55f9650..ca0ba66 100644
--- a/snippets/python-mode/def
+++ b/snippets/python-mode/def
@@ -2,6 +2,7 @@
 # name: def
 # contributor: Orestis Markou
 # contributor: Yasser González Fernández <yglez@uh.cu>
+# key: def
 # --
 def ${1:name}($2):
     """$3
diff --git a/snippets/python-mode/defm b/snippets/python-mode/defm
index 9eed76c..a2fb5a0 100644
--- a/snippets/python-mode/defm
+++ b/snippets/python-mode/defm
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # name: defm
 # contributor: Yasser Gonz¨¢lez Fern¨¢ndez <yglez@uh.cu>
+# key: defm
 # --
 def ${1:name}(self, $2):
     """$3
diff --git a/snippets/python-mode/for b/snippets/python-mode/for
index 84f3ddd..c7d55b1 100644
--- a/snippets/python-mode/for
+++ b/snippets/python-mode/for
@@ -1,4 +1,5 @@
 #name : for ... in ... : ...
+# key: for
 # --
 for ${var} in ${collection}:
     $0
\ No newline at end of file
diff --git a/snippets/python-mode/ifmain b/snippets/python-mode/ifmain
index 6224923..e6f03e1 100644
--- a/snippets/python-mode/ifmain
+++ b/snippets/python-mode/ifmain
@@ -1,4 +1,5 @@
 #name : if __name__ == '__main__': ...
+# key: python-modeifmain
 # --
 if __name__ == '__main__':
     $0
\ No newline at end of file
diff --git a/snippets/python-mode/prop b/snippets/python-mode/prop
index 3c1f889..ec96633 100644
--- a/snippets/python-mode/prop
+++ b/snippets/python-mode/prop
@@ -1,5 +1,6 @@
 # contributor: Mads D. Kristensen <madsdk@gmail.com>
 # name: prop
+# key: prop
 # --
 def ${1:foo}():
    doc = """${2:Doc string}"""
diff --git a/snippets/python-mode/propg b/snippets/python-mode/propg
index a9ee1a1..38cecab 100644
--- a/snippets/python-mode/propg
+++ b/snippets/python-mode/propg
@@ -1,5 +1,6 @@
 #contributor : Julio Carlos Menendez <godinblack@gmail.com>
 #name : _get_foo ... foo=property(...)
+# key: propg
 # --
 def _get_${1:foo}(self):
     return self._$1
diff --git a/snippets/python-mode/propsg b/snippets/python-mode/propsg
index 87ab4e3..28b42b7 100644
--- a/snippets/python-mode/propsg
+++ b/snippets/python-mode/propsg
@@ -1,5 +1,6 @@
 #contributor : Julio Carlos Menendez <godinblack@gmail.com>
 #name : _get_foo ... _set_foo ... foo=property(...)
+# key: propsg
 # --
 def _set_${1:foo}(self, value):
     self._$1 = value
diff --git a/snippets/python-mode/while b/snippets/python-mode/while
index 704dd7c..5398c1b 100644
--- a/snippets/python-mode/while
+++ b/snippets/python-mode/while
@@ -1,4 +1,5 @@
 #name : while ... : ...
+# key: while
 # --
 while ${condition}:
     $0
\ No newline at end of file
diff --git a/snippets/rst-mode/chap b/snippets/rst-mode/chap
index 6474c00..66fdd01 100644
--- a/snippets/rst-mode/chap
+++ b/snippets/rst-mode/chap
@@ -1,4 +1,5 @@
 #name : Chapter title
+# key: chap
 # --
 ${1:Chapter}
 ${1:$(make-string (string-width text) ?\=)}
diff --git a/snippets/rst-mode/sec b/snippets/rst-mode/sec
index 76087ed..b97d748 100644
--- a/snippets/rst-mode/sec
+++ b/snippets/rst-mode/sec
@@ -1,4 +1,5 @@
 #name : Section title
+# key: sec
 # --
 ${1:Section}
 ${1:$(make-string (string-width text) ?\-)}
diff --git a/snippets/rst-mode/tit b/snippets/rst-mode/tit
index cac2e77..838d332 100644
--- a/snippets/rst-mode/tit
+++ b/snippets/rst-mode/tit
@@ -1,4 +1,5 @@
 #name : Document title
+# key: tit
 # --
 ${1:$(make-string (string-width text) ?\=)}
 ${1:Title}
diff --git a/snippets/ruby-mode/collections/all b/snippets/ruby-mode/collections/all
index 8bafece..3b3b601 100644
--- a/snippets/ruby-mode/collections/all
+++ b/snippets/ruby-mode/collections/all
@@ -1,3 +1,4 @@
 #name : all? { |...| ... }
+# key: collectionsall
 # --
 all? { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/any b/snippets/ruby-mode/collections/any
index 084a2c7..79c3c48 100644
--- a/snippets/ruby-mode/collections/any
+++ b/snippets/ruby-mode/collections/any
@@ -1,3 +1,4 @@
 #name : any? { |...| ... }
+# key: collectionsany
 # --
 any? { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/classify b/snippets/ruby-mode/collections/classify
index 0fffa2d..6d99ca3 100644
--- a/snippets/ruby-mode/collections/classify
+++ b/snippets/ruby-mode/collections/classify
@@ -1,3 +1,4 @@
 #name : classify { |...| ... }
+# key: ruby-modecollectionsclassify
 # --
 classify { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/collect b/snippets/ruby-mode/collections/collect
index 32ec608..a92f326 100644
--- a/snippets/ruby-mode/collections/collect
+++ b/snippets/ruby-mode/collections/collect
@@ -1,3 +1,4 @@
 #name : collect { |...| ... }
+# key: collectionscollect
 # --
 collect { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/deli b/snippets/ruby-mode/collections/deli
index a91fc7b..99f2af5 100644
--- a/snippets/ruby-mode/collections/deli
+++ b/snippets/ruby-mode/collections/deli
@@ -1,3 +1,4 @@
 #name : delete_if { |...| ... }
+# key: collectionsdeli
 # --
 delete_if { |${e} $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/det b/snippets/ruby-mode/collections/det
index 734d45c..f65cdfb 100644
--- a/snippets/ruby-mode/collections/det
+++ b/snippets/ruby-mode/collections/det
@@ -1,3 +1,4 @@
 #name : detect { |...| ... }
+# key: collectionsdet
 # --
 detect { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/ea b/snippets/ruby-mode/collections/ea
index c779dd6..fdf7b2a 100644
--- a/snippets/ruby-mode/collections/ea
+++ b/snippets/ruby-mode/collections/ea
@@ -1,3 +1,4 @@
 #name : each { |...| ... }
+# key: collectionsea
 # --
 each { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eac b/snippets/ruby-mode/collections/eac
index 2547b2d..35d443a 100644
--- a/snippets/ruby-mode/collections/eac
+++ b/snippets/ruby-mode/collections/eac
@@ -1,3 +1,4 @@
 #name : each_cons(...) { |...| ... }
+# key: collectionseac
 # --
 each_cons(${1:2}) { |${group}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eai b/snippets/ruby-mode/collections/eai
index 4136dc0..433a397 100644
--- a/snippets/ruby-mode/collections/eai
+++ b/snippets/ruby-mode/collections/eai
@@ -1,3 +1,4 @@
 #name : each_index { |i| ... }
+# key: collectionseai
 # --
 each_index { |${i}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eav b/snippets/ruby-mode/collections/eav
index 4ff171a..4d66ce4 100644
--- a/snippets/ruby-mode/collections/eav
+++ b/snippets/ruby-mode/collections/eav
@@ -1,3 +1,4 @@
 #name : each_value { |val| ... }
+# key: collectionseav
 # --
 each_value { |${val}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eawi b/snippets/ruby-mode/collections/eawi
index 3d03998..38dd622 100644
--- a/snippets/ruby-mode/collections/eawi
+++ b/snippets/ruby-mode/collections/eawi
@@ -1,3 +1,4 @@
 #name : each_with_index { |e, i| ... }
+# key: collectionseawi
 # --
 each_with_index { |${e}, ${i}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/inject b/snippets/ruby-mode/collections/inject
index f6adb5c..881ea92 100644
--- a/snippets/ruby-mode/collections/inject
+++ b/snippets/ruby-mode/collections/inject
@@ -1,3 +1,4 @@
 #name : inject(...) { |...| ... }
+# key: collectionsinject
 # --
 inject(${1:0}) { |${2:injection}, ${3:element}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/reject b/snippets/ruby-mode/collections/reject
index 9625fe9..bc5008c 100644
--- a/snippets/ruby-mode/collections/reject
+++ b/snippets/ruby-mode/collections/reject
@@ -1,3 +1,4 @@
 #name : reject { |...| ... }
+# key: collectionsreject
 # --
 reject { |${1:element}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/select b/snippets/ruby-mode/collections/select
index b18a17d..6b4b6a2 100644
--- a/snippets/ruby-mode/collections/select
+++ b/snippets/ruby-mode/collections/select
@@ -1,3 +1,4 @@
 #name : select { |...| ... }
+# key: collectionsselect
 # --
 select { |${1:element}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/zip b/snippets/ruby-mode/collections/zip
index 1da1086..9db20ed 100644
--- a/snippets/ruby-mode/collections/zip
+++ b/snippets/ruby-mode/collections/zip
@@ -1,3 +1,4 @@
 #name : zip(...) { |...| ... }
+# key: collectionszip
 # --
 zip(${enums}) { |${row}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/control structure/forin b/snippets/ruby-mode/control structure/forin
index 3d7e4d2..7eadd8a 100644
--- a/snippets/ruby-mode/control structure/forin	
+++ b/snippets/ruby-mode/control structure/forin	
@@ -1,4 +1,5 @@
 #name : for ... in ...; ... end
+# key: forin
 # --
 for ${1:element} in ${2:collection}
   $0
diff --git a/snippets/ruby-mode/control structure/if b/snippets/ruby-mode/control structure/if
index 51bf24c..9b79d6f 100644
--- a/snippets/ruby-mode/control structure/if	
+++ b/snippets/ruby-mode/control structure/if	
@@ -1,4 +1,5 @@
 #name : if ... end
+# key: if
 # --
 if ${1:condition}
   $0
diff --git a/snippets/ruby-mode/control structure/ife b/snippets/ruby-mode/control structure/ife
index 08fbb81..cb10588 100644
--- a/snippets/ruby-mode/control structure/ife	
+++ b/snippets/ruby-mode/control structure/ife	
@@ -1,4 +1,5 @@
 #name : if ... else ... end
+# key: ife
 # --
 if ${1:condition}
   $2
diff --git a/snippets/ruby-mode/control structure/tim b/snippets/ruby-mode/control structure/tim
index 3a132b3..6054fa7 100644
--- a/snippets/ruby-mode/control structure/tim	
+++ b/snippets/ruby-mode/control structure/tim	
@@ -1,3 +1,4 @@
 #name : times { |n| ... }
+# key: tim
 # --
 times { |${n}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/control structure/until b/snippets/ruby-mode/control structure/until
index 95f2dcb..1bdde06 100644
--- a/snippets/ruby-mode/control structure/until	
+++ b/snippets/ruby-mode/control structure/until	
@@ -1,4 +1,5 @@
 #name : until ... end
+# key: until
 # --
 until ${condition}
   $0
diff --git a/snippets/ruby-mode/control structure/upt b/snippets/ruby-mode/control structure/upt
index b71539a..42601e9 100644
--- a/snippets/ruby-mode/control structure/upt	
+++ b/snippets/ruby-mode/control structure/upt	
@@ -1,4 +1,5 @@
 #name : upto(...) { |n| ... }
+# key: upt
 # --
 upto(${n}) { |${i}|
   $0
diff --git a/snippets/ruby-mode/control structure/when b/snippets/ruby-mode/control structure/when
index 98e87b1..0607d7d 100644
--- a/snippets/ruby-mode/control structure/when	
+++ b/snippets/ruby-mode/control structure/when	
@@ -1,4 +1,5 @@
 #name : when ... end
+# key: when
 # --
 when ${condition}
   $0
diff --git a/snippets/ruby-mode/control structure/while b/snippets/ruby-mode/control structure/while
index 7e6dd55..8a6f3c1 100644
--- a/snippets/ruby-mode/control structure/while	
+++ b/snippets/ruby-mode/control structure/while	
@@ -1,4 +1,5 @@
 #name : while ... end
+# key: while
 # --
 while ${condition}
   $0
diff --git a/snippets/ruby-mode/definitions/Comp b/snippets/ruby-mode/definitions/Comp
index 9602d59..385017e 100644
--- a/snippets/ruby-mode/definitions/Comp
+++ b/snippets/ruby-mode/definitions/Comp
@@ -1,4 +1,5 @@
 #name : include Comparable; def <=> ... end
+# key: definitionsComp
 # --
 include Comparable
 
diff --git a/snippets/ruby-mode/definitions/am b/snippets/ruby-mode/definitions/am
index 20594fd..856daac 100644
--- a/snippets/ruby-mode/definitions/am
+++ b/snippets/ruby-mode/definitions/am
@@ -1,3 +1,4 @@
 #name : alias_method new, old
+# key: definitionsam
 # --
 alias_method :${new_name}, :${old_name}
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/cla b/snippets/ruby-mode/definitions/cla
index c8f3524..238786f 100644
--- a/snippets/ruby-mode/definitions/cla
+++ b/snippets/ruby-mode/definitions/cla
@@ -1,4 +1,5 @@
 #name : class << self ... end
+# key: definitionscla
 # --
 class << ${self}
   $0
diff --git a/snippets/ruby-mode/definitions/cls b/snippets/ruby-mode/definitions/cls
index b3a4983..682fc4f 100644
--- a/snippets/ruby-mode/definitions/cls
+++ b/snippets/ruby-mode/definitions/cls
@@ -1,5 +1,6 @@
 #name : class ... end
 #contributor : hitesh <hitesh.jasani@gmail.com>
+# key: definitionscls
 # --
 class ${1:`(let ((fn (capitalize (file-name-nondirectory
                                  (file-name-sans-extension
diff --git a/snippets/ruby-mode/definitions/mm b/snippets/ruby-mode/definitions/mm
index 5f1ebfc..69812d1 100644
--- a/snippets/ruby-mode/definitions/mm
+++ b/snippets/ruby-mode/definitions/mm
@@ -1,4 +1,5 @@
 #name : def method_missing ... end
+# key: definitionsmm
 # --
 def method_missing(method, *args)
   $0
diff --git a/snippets/ruby-mode/definitions/r b/snippets/ruby-mode/definitions/r
index b8d68d3..00e9832 100644
--- a/snippets/ruby-mode/definitions/r
+++ b/snippets/ruby-mode/definitions/r
@@ -1,3 +1,4 @@
 #name : attr_reader ...
+# key: definitionsr
 # --
 attr_reader :
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/rw b/snippets/ruby-mode/definitions/rw
index aadf605..fecf2ba 100644
--- a/snippets/ruby-mode/definitions/rw
+++ b/snippets/ruby-mode/definitions/rw
@@ -1,3 +1,4 @@
 #name : attr_accessor ...
+# key: definitionsrw
 # --
 attr_accessor :
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/w b/snippets/ruby-mode/definitions/w
index d680f25..76d38d2 100644
--- a/snippets/ruby-mode/definitions/w
+++ b/snippets/ruby-mode/definitions/w
@@ -1,3 +1,4 @@
 #name : attr_writer ...
+# key: definitionsw
 # --
 attr_writer :
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/# b/snippets/ruby-mode/general/#
index 7d21bb4..c69c607 100644
--- a/snippets/ruby-mode/general/#
+++ b/snippets/ruby-mode/general/#
@@ -1,3 +1,4 @@
 #name : # =>
+# key: general#
 # --
 # => 
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/=b b/snippets/ruby-mode/general/=b
index 90b6e0a..7a49261 100644
--- a/snippets/ruby-mode/general/=b
+++ b/snippets/ruby-mode/general/=b
@@ -1,4 +1,5 @@
 #name : =begin rdoc ... =end
+# key: general=b
 # --
 =begin rdoc
   $0
diff --git a/snippets/ruby-mode/general/app b/snippets/ruby-mode/general/app
index 7bda767..fe974a4 100644
--- a/snippets/ruby-mode/general/app
+++ b/snippets/ruby-mode/general/app
@@ -1,4 +1,5 @@
 #name : if __FILE__ == $PROGRAM_NAME ... end
+# key: generalapp
 # --
 if __FILE__ == $PROGRAM_NAME
   $0
diff --git a/snippets/ruby-mode/general/bm b/snippets/ruby-mode/general/bm
index 934ff85..98d98f2 100644
--- a/snippets/ruby-mode/general/bm
+++ b/snippets/ruby-mode/general/bm
@@ -1,4 +1,5 @@
 #name : Benchmark.bmbm(...) do ... end
+# key: generalbm
 # --
 Benchmark.bmbm(${1:10}) do |x|
   $0
diff --git a/snippets/ruby-mode/general/case b/snippets/ruby-mode/general/case
index acc03ba..2bbc781 100644
--- a/snippets/ruby-mode/general/case
+++ b/snippets/ruby-mode/general/case
@@ -1,4 +1,5 @@
 #name : case ... end
+# key: generalcase
 # --
 case ${1:object}
 when ${2:condition}
diff --git a/snippets/ruby-mode/general/dee b/snippets/ruby-mode/general/dee
index ecec2f7..c488421 100644
--- a/snippets/ruby-mode/general/dee
+++ b/snippets/ruby-mode/general/dee
@@ -1,3 +1,4 @@
 #name : deep_copy(...)
+# key: generaldee
 # --
 Marshal.load(Marshal.dump($0))
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/rb b/snippets/ruby-mode/general/rb
index c1cbfc3..7c776f6 100644
--- a/snippets/ruby-mode/general/rb
+++ b/snippets/ruby-mode/general/rb
@@ -1,3 +1,4 @@
 #name : /usr/bin/ruby -wKU
+# key: generalrb
 # --
 #!/usr/bin/ruby -wKU
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/req b/snippets/ruby-mode/general/req
index 2fbc3d4..c9231ed 100644
--- a/snippets/ruby-mode/general/req
+++ b/snippets/ruby-mode/general/req
@@ -1,3 +1,4 @@
 #name : require "..."
+# key: generalreq
 # --
 require "$0"
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/rreq b/snippets/ruby-mode/general/rreq
index 84ac9df..762c3b8 100644
--- a/snippets/ruby-mode/general/rreq
+++ b/snippets/ruby-mode/general/rreq
@@ -1,3 +1,4 @@
 #name : require File.join(File.dirname(__FILE__), ...)
+# key: generalrreq
 # --
 require File.join(File.dirname(__FILE__), $0)
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/y b/snippets/ruby-mode/general/y
index cdec730..4742581 100644
--- a/snippets/ruby-mode/general/y
+++ b/snippets/ruby-mode/general/y
@@ -1,3 +1,4 @@
 #name : :yields: arguments (rdoc)
+# key: generaly
 # --
 :yields: $0
\ No newline at end of file
diff --git a/snippets/scala-mode/act b/snippets/scala-mode/act
index fce52fc..ac873c9 100644
--- a/snippets/scala-mode/act
+++ b/snippets/scala-mode/act
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def act = { ..}
+# key: act
 # --
 def act = {
   loop {
diff --git a/snippets/scala-mode/act.arg b/snippets/scala-mode/act.arg
index fc6df9e..22d5a68 100644
--- a/snippets/scala-mode/act.arg
+++ b/snippets/scala-mode/act.arg
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def act(arg: T) = { ..}
+# key: act
 # --
 def act(${1:arg}: ${2:type}) = {
   loop {
diff --git a/snippets/scala-mode/actor b/snippets/scala-mode/actor
index d38a183..9fe6b92 100644
--- a/snippets/scala-mode/actor
+++ b/snippets/scala-mode/actor
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val a = actor { ..}
+# key: actor
 # --
 val a = actor {
   loop {
diff --git a/snippets/scala-mode/ano b/snippets/scala-mode/ano
index b949801..78724a1 100644
--- a/snippets/scala-mode/ano
+++ b/snippets/scala-mode/ano
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : (args) => ...
+# key: ano
 # --
 ($1) => ${2:body} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/app b/snippets/scala-mode/app
index b89bab9..808245e 100644
--- a/snippets/scala-mode/app
+++ b/snippets/scala-mode/app
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : object name extends Application
+# key: app
 # --
 object ${1:name} extends Application {
   $0
diff --git a/snippets/scala-mode/arr.new b/snippets/scala-mode/arr.new
index e3297ca..384ed87 100644
--- a/snippets/scala-mode/arr.new
+++ b/snippets/scala-mode/arr.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : Array[T](..)
+# key: arr
 # --
 Array[${1:value}](${2:args}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/arr.val-new b/snippets/scala-mode/arr.val-new
index 4de4720..518cfa9 100644
--- a/snippets/scala-mode/arr.val-new
+++ b/snippets/scala-mode/arr.val-new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val a = Array[T](..)
+# key: arr
 # --
 val ${1:arr} = Array[${2:value}](${3:args}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/asof b/snippets/scala-mode/asof
index 3b2b209..b70298c 100644
--- a/snippets/scala-mode/asof
+++ b/snippets/scala-mode/asof
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : asInstanceOf[T] 
+# key: asof
 # --
 asInstanceOf[${1:type}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/ass b/snippets/scala-mode/ass
index 653dcef..a9fe464 100644
--- a/snippets/scala-mode/ass
+++ b/snippets/scala-mode/ass
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : assert(x === y)
+# key: ass
 # --
 assert(${1:x} === ${2:y}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/ass.true b/snippets/scala-mode/ass.true
index 923c518..9b48a91 100644
--- a/snippets/scala-mode/ass.true
+++ b/snippets/scala-mode/ass.true
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : assert(true)
+# key: ass
 # --
 assert(true) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/at.author b/snippets/scala-mode/at.author
index 82fe4cc..2ccba33 100644
--- a/snippets/scala-mode/at.author
+++ b/snippets/scala-mode/at.author
@@ -1,4 +1,5 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : @author name
+# key: at
 # --
 @author ${1:name} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/at.param b/snippets/scala-mode/at.param
index 72b6e79..fe856dd 100644
--- a/snippets/scala-mode/at.param
+++ b/snippets/scala-mode/at.param
@@ -1,4 +1,5 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : @param name description
+# key: at
 # --
 @param ${1:name} ${2:description} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/at.return b/snippets/scala-mode/at.return
index 9c3f41c..4fc1ae5 100644
--- a/snippets/scala-mode/at.return
+++ b/snippets/scala-mode/at.return
@@ -1,4 +1,5 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : @return description
+# key: at
 # --
 @return ${1:description} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/at.version b/snippets/scala-mode/at.version
index 1158ce2..72e380f 100644
--- a/snippets/scala-mode/at.version
+++ b/snippets/scala-mode/at.version
@@ -1,4 +1,5 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : @version number
+# key: at
 # --
 @version ${1:0.1} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/bang b/snippets/scala-mode/bang
index a547da8..940002c 100644
--- a/snippets/scala-mode/bang
+++ b/snippets/scala-mode/bang
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : actor ! message
+# key: bang
 # --
 ${1:actor} ! ${2:message} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/case b/snippets/scala-mode/case
index 13d6aec..54f020e 100644
--- a/snippets/scala-mode/case
+++ b/snippets/scala-mode/case
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : case pattern => 
+# key: case
 # --
 case ${1:pattern} => $0
\ No newline at end of file
diff --git a/snippets/scala-mode/case.match-all b/snippets/scala-mode/case.match-all
index 028bf5f..cb580b1 100644
--- a/snippets/scala-mode/case.match-all
+++ b/snippets/scala-mode/case.match-all
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : case _ => 
+# key: case
 # --
 case _ => $0
\ No newline at end of file
diff --git a/snippets/scala-mode/cast b/snippets/scala-mode/cast
index 3b2b209..25f588d 100644
--- a/snippets/scala-mode/cast
+++ b/snippets/scala-mode/cast
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : asInstanceOf[T] 
+# key: cast
 # --
 asInstanceOf[${1:type}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/cc b/snippets/scala-mode/cc
index 7ed1142..7214cd1 100644
--- a/snippets/scala-mode/cc
+++ b/snippets/scala-mode/cc
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : case class T(arg: A)
+# key: cc
 # --
 case class ${1:name}(${2:arg}: ${3:type}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/cl b/snippets/scala-mode/cl
index 1fd712c..5e18cf6 100644
--- a/snippets/scala-mode/cl
+++ b/snippets/scala-mode/cl
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : class T { .. }
+# key: cl
 # --
 class ${1:name} {
   $0
diff --git a/snippets/scala-mode/cl.abs b/snippets/scala-mode/cl.abs
index 402dec7..4b5bc27 100644
--- a/snippets/scala-mode/cl.abs
+++ b/snippets/scala-mode/cl.abs
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : abstract class T { .. }
+# key: cl
 # --
 abstract class ${1:name} {
   $0
diff --git a/snippets/scala-mode/cl.abs-arg b/snippets/scala-mode/cl.abs-arg
index fe29524..0020171 100644
--- a/snippets/scala-mode/cl.abs-arg
+++ b/snippets/scala-mode/cl.abs-arg
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : abstract class T(args) { .. }
+# key: cl
 # --
 abstract class ${1:name}(${2:args}) {
   $0
diff --git a/snippets/scala-mode/cl.arg b/snippets/scala-mode/cl.arg
index f82460f..8ede545 100644
--- a/snippets/scala-mode/cl.arg
+++ b/snippets/scala-mode/cl.arg
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : class T(args) { .. }
+# key: cl
 # --
 class ${1:name}(${2:args}) {
   $0
diff --git a/snippets/scala-mode/clof b/snippets/scala-mode/clof
index 955726c..badf0b9 100644
--- a/snippets/scala-mode/clof
+++ b/snippets/scala-mode/clof
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : classOf[T] 
+# key: clof
 # --
 classOf[${1:type}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/co b/snippets/scala-mode/co
index 75b1f3b..508bcf9 100644
--- a/snippets/scala-mode/co
+++ b/snippets/scala-mode/co
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : case object T
+# key: co
 # --
 case object ${1:name} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/cons b/snippets/scala-mode/cons
index a48e4ff..c5e2227 100644
--- a/snippets/scala-mode/cons
+++ b/snippets/scala-mode/cons
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : element1 :: element2
+# key: cons
 # --
 ${1:element1} :: ${2:element2} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/cons.nil b/snippets/scala-mode/cons.nil
index 7747ea7..2ca9f0b 100644
--- a/snippets/scala-mode/cons.nil
+++ b/snippets/scala-mode/cons.nil
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : element1 :: Nil
+# key: cons
 # --
 ${1:element1} :: Nil $0
\ No newline at end of file
diff --git a/snippets/scala-mode/def.arg b/snippets/scala-mode/def.arg
index 7765bbf..bce433a 100644
--- a/snippets/scala-mode/def.arg
+++ b/snippets/scala-mode/def.arg
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f(arg: T) = ...
+# key: def
 # --
 def ${1:name}(${2:args}) = $0
\ No newline at end of file
diff --git a/snippets/scala-mode/def.arg-body b/snippets/scala-mode/def.arg-body
index e6e278e..a88893a 100644
--- a/snippets/scala-mode/def.arg-body
+++ b/snippets/scala-mode/def.arg-body
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f(arg: T) = {...}
+# key: def
 # --
 def ${1:name}(${2:args}) = {
   $0
diff --git a/snippets/scala-mode/def.arg-ret b/snippets/scala-mode/def.arg-ret
index dddb9ce..70aa3bd 100644
--- a/snippets/scala-mode/def.arg-ret
+++ b/snippets/scala-mode/def.arg-ret
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f(arg: T): R = ...
+# key: def
 # --
 def ${1:name}(${2:args}): ${3:Unit} = $0
\ No newline at end of file
diff --git a/snippets/scala-mode/def.arg-ret-body b/snippets/scala-mode/def.arg-ret-body
index 862f7fd..b00ecb8 100644
--- a/snippets/scala-mode/def.arg-ret-body
+++ b/snippets/scala-mode/def.arg-ret-body
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f(arg: T): R = {...}
+# key: def
 # --
 def ${1:name}(${2:args}): ${3:Unit} = {
   $0
diff --git a/snippets/scala-mode/def.body b/snippets/scala-mode/def.body
index 858908c..71ef301 100644
--- a/snippets/scala-mode/def.body
+++ b/snippets/scala-mode/def.body
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f = {...}
+# key: def
 # --
 def ${1:name} = {
   $0
diff --git a/snippets/scala-mode/def.ret b/snippets/scala-mode/def.ret
index e5483fb..a9d123a 100644
--- a/snippets/scala-mode/def.ret
+++ b/snippets/scala-mode/def.ret
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f: R = ...
+# key: def
 # --
 def ${1:name}: ${2:Unit} = $0
\ No newline at end of file
diff --git a/snippets/scala-mode/def.ret-body b/snippets/scala-mode/def.ret-body
index f342e04..1f67369 100644
--- a/snippets/scala-mode/def.ret-body
+++ b/snippets/scala-mode/def.ret-body
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f: R = {...}
+# key: def
 # --
 def ${1:name}: ${3:Unit} = {
   $0
diff --git a/snippets/scala-mode/def.simple b/snippets/scala-mode/def.simple
index 4814c73..a942825 100644
--- a/snippets/scala-mode/def.simple
+++ b/snippets/scala-mode/def.simple
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : def f = ...
+# key: def
 # --
 def ${1:name} = $0
\ No newline at end of file
diff --git a/snippets/scala-mode/doc.class b/snippets/scala-mode/doc.class
index 60442f1..4cc7e2a 100644
--- a/snippets/scala-mode/doc.class
+++ b/snippets/scala-mode/doc.class
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : /** cls/trt/obj name */
+# key: doc
 # --
 /** 
  * `(scala-mode-find-clstrtobj-name-doc)`
diff --git a/snippets/scala-mode/doc.def b/snippets/scala-mode/doc.def
index 8a3d614..f48f73b 100644
--- a/snippets/scala-mode/doc.def
+++ b/snippets/scala-mode/doc.def
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : /** method name */
+# key: doc
 # --
 /** 
  * `(scala-mode-def-and-args-doc)`
diff --git a/snippets/scala-mode/doc.file b/snippets/scala-mode/doc.file
index 7da4289..268f9bb 100644
--- a/snippets/scala-mode/doc.file
+++ b/snippets/scala-mode/doc.file
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : /** file name */
+# key: doc
 # --
 /**
  * `(scala-mode-file-doc)`
diff --git a/snippets/scala-mode/doc.file-scala b/snippets/scala-mode/doc.file-scala
index 6719348..1aa79b5 100644
--- a/snippets/scala-mode/doc.file-scala
+++ b/snippets/scala-mode/doc.file-scala
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : /** scala file */
+# key: doc
 # --
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala $3                               **
diff --git a/snippets/scala-mode/doc.file-scala-api b/snippets/scala-mode/doc.file-scala-api
index 4a762f5..c2c4319 100644
--- a/snippets/scala-mode/doc.file-scala-api
+++ b/snippets/scala-mode/doc.file-scala-api
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : /** scala api file */
+# key: doc
 # --
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
diff --git a/snippets/scala-mode/doc.scaladoc b/snippets/scala-mode/doc.scaladoc
index 038428c..ddf047b 100644
--- a/snippets/scala-mode/doc.scaladoc
+++ b/snippets/scala-mode/doc.scaladoc
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : /** ... */
+# key: doc
 # --
 /**
  * ${1:description}
diff --git a/snippets/scala-mode/expect b/snippets/scala-mode/expect
index 94c742c..424e0c0 100644
--- a/snippets/scala-mode/expect
+++ b/snippets/scala-mode/expect
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : expect(value) { ..}
+# key: expect
 # --
 expect(${1:reply}) {
   $0
diff --git a/snippets/scala-mode/ext b/snippets/scala-mode/ext
index e256317..ff3ed7c 100644
--- a/snippets/scala-mode/ext
+++ b/snippets/scala-mode/ext
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : extends T
+# key: ext
 # --
 extends $0
\ No newline at end of file
diff --git a/snippets/scala-mode/for.extract b/snippets/scala-mode/for.extract
index 60f1155..00d8623 100644
--- a/snippets/scala-mode/for.extract
+++ b/snippets/scala-mode/for.extract
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : x <- xs
+# key: for
 # --
 ${1:x} <- ${2:xs}
\ No newline at end of file
diff --git a/snippets/scala-mode/for.loop b/snippets/scala-mode/for.loop
index 050d5e8..80841b8 100644
--- a/snippets/scala-mode/for.loop
+++ b/snippets/scala-mode/for.loop
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : for (x <- xs) { ... }
+# key: for
 # --
 for (${1:x} <- ${2:xs}) {
   $0
diff --git a/snippets/scala-mode/for.multi b/snippets/scala-mode/for.multi
index c512067..f35e964 100644
--- a/snippets/scala-mode/for.multi
+++ b/snippets/scala-mode/for.multi
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : for {x <- xs \ y <- ys} { yield }
+# key: for
 # --
 for {
   ${1:x} <- ${2:xs}
diff --git a/snippets/scala-mode/foreach b/snippets/scala-mode/foreach
index cafdd00..7101c98 100644
--- a/snippets/scala-mode/foreach
+++ b/snippets/scala-mode/foreach
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : foreach(x => ..)
+# key: foreach
 # --
 foreach(${1:x} => ${2:body}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/hmap.new b/snippets/scala-mode/hmap.new
index dd564a0..899c7f3 100644
--- a/snippets/scala-mode/hmap.new
+++ b/snippets/scala-mode/hmap.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : new HashMap[K, V]
+# key: hmap
 # --
 new HashMap[${1:key}, ${2:value}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/hmap.val-new b/snippets/scala-mode/hmap.val-new
index 2f4a3c2..67135fb 100644
--- a/snippets/scala-mode/hmap.val-new
+++ b/snippets/scala-mode/hmap.val-new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val m = new HashMap[K, V]
+# key: hmap
 # --
 val ${1:m} = new HashMap[${2:key}, ${3:value}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/hset.new b/snippets/scala-mode/hset.new
index e4879fc..c255a56 100644
--- a/snippets/scala-mode/hset.new
+++ b/snippets/scala-mode/hset.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : new HashSet[K]
+# key: hset
 # --
 new HashSet[${1:key}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/hset.val-new b/snippets/scala-mode/hset.val-new
index ba792a2..aee9800 100644
--- a/snippets/scala-mode/hset.val-new
+++ b/snippets/scala-mode/hset.val-new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val m = new HashSet[K]
+# key: hset
 # --
 val ${1:m} = new HashSet[${2:key}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/if b/snippets/scala-mode/if
index 24891c0..68cdfbb 100644
--- a/snippets/scala-mode/if
+++ b/snippets/scala-mode/if
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : if (cond) { .. }
+# key: scala-modeif
 # --
 if (${1:condition}) {
   $0
diff --git a/snippets/scala-mode/imp b/snippets/scala-mode/imp
index cf5efa1..f8e6a21 100644
--- a/snippets/scala-mode/imp
+++ b/snippets/scala-mode/imp
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : import ..
+# key: imp
 # --
 import $0
\ No newline at end of file
diff --git a/snippets/scala-mode/intercept b/snippets/scala-mode/intercept
index 4725eaa..805994b 100644
--- a/snippets/scala-mode/intercept
+++ b/snippets/scala-mode/intercept
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : intercept(classOf[T]) { ..}
+# key: intercept
 # --
 intercept(classOf[${1:Exception]}) {
   $0
diff --git a/snippets/scala-mode/isof b/snippets/scala-mode/isof
index a3538c8..971aa27 100644
--- a/snippets/scala-mode/isof
+++ b/snippets/scala-mode/isof
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : isInstanceOf[T] 
+# key: isof
 # --
 isInstanceOf[${1:type}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/ls.new b/snippets/scala-mode/ls.new
index 7a28e61..35eda0b 100644
--- a/snippets/scala-mode/ls.new
+++ b/snippets/scala-mode/ls.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : List(..)
+# key: ls
 # --
 List(${1:args}, ${2:args}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/ls.val-new b/snippets/scala-mode/ls.val-new
index 37138f0..5d662be 100644
--- a/snippets/scala-mode/ls.val-new
+++ b/snippets/scala-mode/ls.val-new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val l = List(..)
+# key: ls
 # --
 val ${1:l} = List(${2:args}, ${3:args}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/main b/snippets/scala-mode/main
index ad314b3..4196062 100644
--- a/snippets/scala-mode/main
+++ b/snippets/scala-mode/main
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name: def main(args: Array[String]) = { ... }
+# key: main
 # --
 def main(args: Array[String]) = {
   $0
diff --git a/snippets/scala-mode/map b/snippets/scala-mode/map
index 17322a5..4c523cb 100644
--- a/snippets/scala-mode/map
+++ b/snippets/scala-mode/map
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : map(x => ..)
+# key: map
 # --
 map(${1:x} => ${2:body}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/map.new b/snippets/scala-mode/map.new
index 21c95fb..cc6cf47 100644
--- a/snippets/scala-mode/map.new
+++ b/snippets/scala-mode/map.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : Map(key -> value)
+# key: map
 # --
 Map(${1:key} -> ${2:value}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/match b/snippets/scala-mode/match
index e85fac1..e29dba2 100644
--- a/snippets/scala-mode/match
+++ b/snippets/scala-mode/match
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : cc match { .. }
+# key: match
 # --
 ${1:cc} match {
   case ${2:pattern} => $0
diff --git a/snippets/scala-mode/match.can b/snippets/scala-mode/match.can
index 77d475b..192cfdd 100644
--- a/snippets/scala-mode/match.can
+++ b/snippets/scala-mode/match.can
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : can match { case Full(res) => .. }
+# key: match
 # --
 ${1:option} match {
   case Full(res) => $0
diff --git a/snippets/scala-mode/match.option b/snippets/scala-mode/match.option
index 5b098f1..7785b4b 100644
--- a/snippets/scala-mode/match.option
+++ b/snippets/scala-mode/match.option
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : option match { case None => .. }
+# key: match
 # --
 ${1:option} match {
   case None => $0
diff --git a/snippets/scala-mode/mix b/snippets/scala-mode/mix
index 5261e32..dbb41a7 100644
--- a/snippets/scala-mode/mix
+++ b/snippets/scala-mode/mix
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : trait T { .. }
+# key: mix
 # --
 trait ${1:name} {
   $0
diff --git a/snippets/scala-mode/ob b/snippets/scala-mode/ob
index efbc82e..71d7c7d 100644
--- a/snippets/scala-mode/ob
+++ b/snippets/scala-mode/ob
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : object name extends T
+# key: ob
 # --
 object ${1:name} extends ${2:type} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pac b/snippets/scala-mode/pac
index ed32216..612e40a 100644
--- a/snippets/scala-mode/pac
+++ b/snippets/scala-mode/pac
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : package ..
+# key: pac
 # --
 package $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pr.newline b/snippets/scala-mode/pr.newline
index 77088cb..f55bef3 100644
--- a/snippets/scala-mode/pr.newline
+++ b/snippets/scala-mode/pr.newline
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : println(..)
+# key: pr
 # --
 println(${1:obj}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pr.simple b/snippets/scala-mode/pr.simple
index 3a73f9d..bd04853 100644
--- a/snippets/scala-mode/pr.simple
+++ b/snippets/scala-mode/pr.simple
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : print(..)
+# key: pr
 # --
 print(${1:obj}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pr.string b/snippets/scala-mode/pr.string
index 9c06ef7..917e086 100644
--- a/snippets/scala-mode/pr.string
+++ b/snippets/scala-mode/pr.string
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : println("..")
+# key: pr
 # --
 println("${1:msg}") $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pr.trace b/snippets/scala-mode/pr.trace
index 9a0579c..556642e 100644
--- a/snippets/scala-mode/pr.trace
+++ b/snippets/scala-mode/pr.trace
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : println("obj: " + obj)
+# key: pr
 # --
 println("${1:obj}: " + ${1:obj}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pri b/snippets/scala-mode/pri
index 643ef2c..12dbd45 100644
--- a/snippets/scala-mode/pri
+++ b/snippets/scala-mode/pri
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : private
+# key: pri
 # --
 private $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pri.param b/snippets/scala-mode/pri.param
index e53638a..6433ded 100644
--- a/snippets/scala-mode/pri.param
+++ b/snippets/scala-mode/pri.param
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : private[this]
+# key: pri
 # --
 private[${1:this}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pro b/snippets/scala-mode/pro
index e4b7b59..e7de473 100644
--- a/snippets/scala-mode/pro
+++ b/snippets/scala-mode/pro
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : protected
+# key: pro
 # --
 protected $0
\ No newline at end of file
diff --git a/snippets/scala-mode/pro.param b/snippets/scala-mode/pro.param
index 712b050..f624756 100644
--- a/snippets/scala-mode/pro.param
+++ b/snippets/scala-mode/pro.param
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : protected[this]
+# key: pro
 # --
 protected[${1:this}] $0
\ No newline at end of file
diff --git a/snippets/scala-mode/suite b/snippets/scala-mode/suite
index a65cea7..70bf437 100644
--- a/snippets/scala-mode/suite
+++ b/snippets/scala-mode/suite
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : class T extends Suite { .. }
+# key: suite
 # --
 import org.scalatest._
 
diff --git a/snippets/scala-mode/test b/snippets/scala-mode/test
index c4d13f6..ea0b3d8 100644
--- a/snippets/scala-mode/test
+++ b/snippets/scala-mode/test
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : @Test def testX = ...
+# key: test
 # --
 //@Test
 def test${1:name} = {
diff --git a/snippets/scala-mode/throw b/snippets/scala-mode/throw
index f9a4932..7fadaff 100644
--- a/snippets/scala-mode/throw
+++ b/snippets/scala-mode/throw
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : throw new Exception
+# key: throw
 # --
 throw new ${1:Exception}(${2:msg}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/tr b/snippets/scala-mode/tr
index 68d8162..bcde20c 100644
--- a/snippets/scala-mode/tr
+++ b/snippets/scala-mode/tr
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : trait T { .. }
+# key: tr
 # --
 trait ${1:name} {
   $0
diff --git a/snippets/scala-mode/tr.ext b/snippets/scala-mode/tr.ext
index 2b82154..dc43746 100644
--- a/snippets/scala-mode/tr.ext
+++ b/snippets/scala-mode/tr.ext
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : trait T extends C { .. }
+# key: tr
 # --
 trait ${1:name} extends ${2:class} {
   $0
diff --git a/snippets/scala-mode/tr.ext-with b/snippets/scala-mode/tr.ext-with
index 8edb409..1c8bdb6 100644
--- a/snippets/scala-mode/tr.ext-with
+++ b/snippets/scala-mode/tr.ext-with
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : trait T1 extends C with T2 { .. }
+# key: tr
 # --
 trait ${1:name} extends ${2:class} with ${3:trait} {
   $0
diff --git a/snippets/scala-mode/tr.with b/snippets/scala-mode/tr.with
index 19801eb..7d49a51 100644
--- a/snippets/scala-mode/tr.with
+++ b/snippets/scala-mode/tr.with
@@ -1,5 +1,6 @@
 #Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
 #name : trait T1 with T2 { .. }
+# key: tr
 # --
 trait ${1:name} with ${2:trait} {
   $0
diff --git a/snippets/scala-mode/try b/snippets/scala-mode/try
index 0c33f10..e1947c5 100644
--- a/snippets/scala-mode/try
+++ b/snippets/scala-mode/try
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : try { .. } catch { case e => ..}
+# key: try
 # --
 try {
   $0
diff --git a/snippets/scala-mode/try.catch-finally b/snippets/scala-mode/try.catch-finally
index f146a20..3faa555 100644
--- a/snippets/scala-mode/try.catch-finally
+++ b/snippets/scala-mode/try.catch-finally
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : try { .. } catch { case e => ..} finally { ..}
+# key: try
 # --
 try {
   $0
diff --git a/snippets/scala-mode/try.finally b/snippets/scala-mode/try.finally
index 63625f2..b523dda 100644
--- a/snippets/scala-mode/try.finally
+++ b/snippets/scala-mode/try.finally
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : try { .. } finally { .. }
+# key: try
 # --
 try {
 
diff --git a/snippets/scala-mode/tup.arrow b/snippets/scala-mode/tup.arrow
index 4e7ad69..4accae8 100644
--- a/snippets/scala-mode/tup.arrow
+++ b/snippets/scala-mode/tup.arrow
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : element1 -> element2
+# key: tup
 # --
 ${1:element1} -> ${2:element2} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/tup.paren b/snippets/scala-mode/tup.paren
index 4bff202..6f7ed2a 100644
--- a/snippets/scala-mode/tup.paren
+++ b/snippets/scala-mode/tup.paren
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : (element1, element2)
+# key: tup
 # --
 (${1:element1}, ${2:element2}) $0
\ No newline at end of file
diff --git a/snippets/scala-mode/val b/snippets/scala-mode/val
index 3067cd4..a62d9a5 100644
--- a/snippets/scala-mode/val
+++ b/snippets/scala-mode/val
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val name = ..
+# key: val
 # --
 val ${1:name} = ${2:obj} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/val.new b/snippets/scala-mode/val.new
index 35a0c6a..0687876 100644
--- a/snippets/scala-mode/val.new
+++ b/snippets/scala-mode/val.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val name = new ..
+# key: val
 # --
 val ${1:name} = new ${2:obj} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/val.ret b/snippets/scala-mode/val.ret
index a17ec10..cc85b72 100644
--- a/snippets/scala-mode/val.ret
+++ b/snippets/scala-mode/val.ret
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : val name: T = ..
+# key: val
 # --
 val ${1:name}: ${2:T} = ${3:obj} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/var b/snippets/scala-mode/var
index 27fd7d9..1a45ef9 100644
--- a/snippets/scala-mode/var
+++ b/snippets/scala-mode/var
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : var name = ..
+# key: var
 # --
 var ${1:name} = ${2:obj} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/var.new b/snippets/scala-mode/var.new
index 272efc7..d47e5ba 100644
--- a/snippets/scala-mode/var.new
+++ b/snippets/scala-mode/var.new
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : var name = new ..
+# key: var
 # --
 var ${1:name} = new ${2:obj} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/var.ret b/snippets/scala-mode/var.ret
index f4552ed..fd7323f 100644
--- a/snippets/scala-mode/var.ret
+++ b/snippets/scala-mode/var.ret
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : var name: T = ..
+# key: var
 # --
 var ${1:name}: ${2:T} = ${3:obj} $0
\ No newline at end of file
diff --git a/snippets/scala-mode/whi b/snippets/scala-mode/whi
index 082c139..160e3ef 100644
--- a/snippets/scala-mode/whi
+++ b/snippets/scala-mode/whi
@@ -1,5 +1,6 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : while(cond) { .. }
+# key: whi
 # --
 while (${1:condition}) {
   $0
diff --git a/snippets/scala-mode/with b/snippets/scala-mode/with
index 6bd94e4..7d3cd11 100644
--- a/snippets/scala-mode/with
+++ b/snippets/scala-mode/with
@@ -1,4 +1,5 @@
 #Author : Jonas Bonèr <jonas@jonasboner.com>
 #name : with T
+# key: with
 # --
 with $0
\ No newline at end of file
diff --git a/snippets/snippet-mode/field b/snippets/snippet-mode/field
index bdaf0d4..12ff0e0 100644
--- a/snippets/snippet-mode/field
+++ b/snippets/snippet-mode/field
@@ -1,5 +1,6 @@
 # name : ${ ...  } field
 # contributor : joaotavora
 # key : $f
+# key: field
 # --
 \${${1:${2:n}:}$3${4:\$(${5:lisp-fn})}\}$0
\ No newline at end of file
diff --git a/snippets/snippet-mode/mirror b/snippets/snippet-mode/mirror
index 1c32eeb..2a45042 100644
--- a/snippets/snippet-mode/mirror
+++ b/snippets/snippet-mode/mirror
@@ -1,5 +1,6 @@
 # name : ${n:$(...)} mirror
 # key : $m
 # contributor : joaotavora
+# key: mirror
 # --
 \${${2:n}:${4:\$(${5:reflection-fn})}\}$0
\ No newline at end of file
diff --git a/snippets/snippet-mode/vars b/snippets/snippet-mode/vars
index 0e8a0a5..ec4e4b6 100644
--- a/snippets/snippet-mode/vars
+++ b/snippets/snippet-mode/vars
@@ -1,11 +1,13 @@
 # -*- mode: snippet -*-
 # name : Snippet header
 # contributor : joaotavora
+# key: vars
 # --
 # name : $1${2:
 # key : ${3:trigger-key}}${4:
 # keybinding : ${5:keybinding}}${6:
 # expand-env : (${7:})}
 # contributor : $6
+# key: vars
 # --
 $0
\ No newline at end of file
diff --git a/snippets/sql-mode/column b/snippets/sql-mode/column
index 145360a..991fdd0 100644
--- a/snippets/sql-mode/column
+++ b/snippets/sql-mode/column
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : , ColumnName ColumnType NOT NULL...
+# key: column
 # --
 	,	${1:Name}		${2:Type}			${3:NOT NULL}
\ No newline at end of file
diff --git a/snippets/sql-mode/constraint b/snippets/sql-mode/constraint
index 8377070..e624637 100644
--- a/snippets/sql-mode/constraint
+++ b/snippets/sql-mode/constraint
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : CONSTRAINT [..] PRIMARY KEY ...
+# key: constraint
 # --
 CONSTRAINT [${1:PK_Name}] PRIMARY KEY ${2:CLUSTERED} ([${3:ColumnName}]) 
\ No newline at end of file
diff --git a/snippets/sql-mode/constraint.1 b/snippets/sql-mode/constraint.1
index 03d1e05..8efcb40 100644
--- a/snippets/sql-mode/constraint.1
+++ b/snippets/sql-mode/constraint.1
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : CONSTRAINT [..] FOREIGN KEY ...
+# key: constraint
 # --
 CONSTRAINT [${1:FK_Name}] FOREIGN KEY ${2:CLUSTERED} ([${3:ColumnName}]) 
\ No newline at end of file
diff --git a/snippets/sql-mode/create b/snippets/sql-mode/create
index 0e24c8d..3d5aa02 100644
--- a/snippets/sql-mode/create
+++ b/snippets/sql-mode/create
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : create table ...
+# key: create
 # --
 CREATE TABLE [${1:dbo}].[${2:TableName}] 
 (
diff --git a/snippets/sql-mode/create.1 b/snippets/sql-mode/create.1
index c8a06cc..febb221 100644
--- a/snippets/sql-mode/create.1
+++ b/snippets/sql-mode/create.1
@@ -1,5 +1,6 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : create procedure ...
+# key: create
 # --
 CREATE PROCEDURE [${1:dbo}].[${2:Name}] 
 (
diff --git a/snippets/sql-mode/references b/snippets/sql-mode/references
index b07fa7c..c85e2d1 100644
--- a/snippets/sql-mode/references
+++ b/snippets/sql-mode/references
@@ -1,4 +1,5 @@
 #contributor : Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
 #name : REFERENCES ...
+# key: references
 # --
 REFERENCES ${1:TableName}([${2:ColumnName}])
\ No newline at end of file
diff --git a/snippets/text-mode/email b/snippets/text-mode/email
index 1ac7f94..6833c50 100644
--- a/snippets/text-mode/email
+++ b/snippets/text-mode/email
@@ -1,3 +1,4 @@
 #name : (user's email)
+# key: email
 # --
 `(replace-regexp-in-string "@" "@NOSPAM." user-mail-address)`
\ No newline at end of file
diff --git a/snippets/text-mode/time b/snippets/text-mode/time
index d744f1a..133fe75 100644
--- a/snippets/text-mode/time
+++ b/snippets/text-mode/time
@@ -1,3 +1,4 @@
 #name : (current time)
+# key: time
 # --
 `(current-time-string)`
\ No newline at end of file