diff --git a/snippets/emacs-lisp-mode/add-hook.yasnippet b/snippets/emacs-lisp-mode/add-hook.yasnippet
index b280727..77605af 100755
--- a/snippets/emacs-lisp-mode/add-hook.yasnippet
+++ b/snippets/emacs-lisp-mode/add-hook.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: add-hook
+#key: add-hook
+#key: ah
 # --
 (add-hook HOOK$0 FUNCTION)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/and.yasnippet b/snippets/emacs-lisp-mode/and.yasnippet
index 9c4b3b3..94d968a 100755
--- a/snippets/emacs-lisp-mode/and.yasnippet
+++ b/snippets/emacs-lisp-mode/and.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: and
+#key: and
 # --
 (and $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/append.yasnippet b/snippets/emacs-lisp-mode/append.yasnippet
index cf314b5..0b8639d 100755
--- a/snippets/emacs-lisp-mode/append.yasnippet
+++ b/snippets/emacs-lisp-mode/append.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: append
+#key: append
 # --
 (append $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/apply.yasnippet b/snippets/emacs-lisp-mode/apply.yasnippet
index 9f23657..1963f29 100755
--- a/snippets/emacs-lisp-mode/apply.yasnippet
+++ b/snippets/emacs-lisp-mode/apply.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: apply
+#key: apply
 # --
 (apply $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/aref.yasnippet b/snippets/emacs-lisp-mode/aref.yasnippet
index 582f212..867ef0a 100755
--- a/snippets/emacs-lisp-mode/aref.yasnippet
+++ b/snippets/emacs-lisp-mode/aref.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: aref
+#key: aref
 # --
 (aref ARRAY$0 INDEX)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/assq.yasnippet b/snippets/emacs-lisp-mode/assq.yasnippet
index 5418a5e..d7c5257 100755
--- a/snippets/emacs-lisp-mode/assq.yasnippet
+++ b/snippets/emacs-lisp-mode/assq.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: assq
+#key: assq
 # --
 (assq KEY$0 LIST)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/autoload.yasnippet b/snippets/emacs-lisp-mode/autoload.yasnippet
index 8713592..91e7d73 100755
--- a/snippets/emacs-lisp-mode/autoload.yasnippet
+++ b/snippets/emacs-lisp-mode/autoload.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: autoload
+#key: autoload
 # --
 (autoload 'FUNCNAME$0 "FILENAME" &optional "DOCSTRING" INTERACTIVE TYPE)
 
diff --git a/snippets/emacs-lisp-mode/backward-char.yasnippet b/snippets/emacs-lisp-mode/backward-char.yasnippet
index 17e2827..296cf97 100755
--- a/snippets/emacs-lisp-mode/backward-char.yasnippet
+++ b/snippets/emacs-lisp-mode/backward-char.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: backward-char
+#key: backward-char
+#key: bc
 # --
 (backward-char $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/beginning-of-line.yasnippet b/snippets/emacs-lisp-mode/beginning-of-line.yasnippet
index 80acfd6..7dfd32c 100755
--- a/snippets/emacs-lisp-mode/beginning-of-line.yasnippet
+++ b/snippets/emacs-lisp-mode/beginning-of-line.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: beginning-of-line
+#key: beginning-of-line
+#key: bol
 # --
 (beginning-of-line)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/bol.yasnippet b/snippets/emacs-lisp-mode/bol.yasnippet
deleted file mode 100755
index 80acfd6..0000000
--- a/snippets/emacs-lisp-mode/bol.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: beginning-of-line
-# --
-(beginning-of-line)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/bs.yasnippet b/snippets/emacs-lisp-mode/bs.yasnippet
deleted file mode 100755
index 0c5bc49..0000000
--- a/snippets/emacs-lisp-mode/bs.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: bs
-# --
-(bs START$0 END)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/bsnp.yasnippet b/snippets/emacs-lisp-mode/bsnp.yasnippet
deleted file mode 100755
index 4d44c3b..0000000
--- a/snippets/emacs-lisp-mode/bsnp.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: buffer-substring-no-properties
-# --
-(buffer-substring-no-properties START$0 END)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/buffer-file-name.yasnippet b/snippets/emacs-lisp-mode/buffer-file-name.yasnippet
index 663482f..d983182 100755
--- a/snippets/emacs-lisp-mode/buffer-file-name.yasnippet
+++ b/snippets/emacs-lisp-mode/buffer-file-name.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: buffer-file-name
+#key: buffer-file-name
+#key: bfn
 # --
 (buffer-file-name)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet b/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
index 0ef064c..56708c0 100755
--- a/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
+++ b/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: buffer-substring-no-properties
+#key: buffer-substring-no-properties
+#key: bsnp
 # --
 (buffer-substring-no-properties START$0 END)
diff --git a/snippets/emacs-lisp-mode/buffer-substring.yasnippet b/snippets/emacs-lisp-mode/buffer-substring.yasnippet
index 3217ab1..8f1b19e 100755
--- a/snippets/emacs-lisp-mode/buffer-substring.yasnippet
+++ b/snippets/emacs-lisp-mode/buffer-substring.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: buffer-substring
+#key: buffer-substring
+#key: bs
 # --
 (buffer-substring START$0 END)
diff --git a/snippets/emacs-lisp-mode/car.yasnippet b/snippets/emacs-lisp-mode/car.yasnippet
index 1ef1c4c..09ff8e4 100755
--- a/snippets/emacs-lisp-mode/car.yasnippet
+++ b/snippets/emacs-lisp-mode/car.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: car
+#key: car
 # --
 (car $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/cdr.yasnippet b/snippets/emacs-lisp-mode/cdr.yasnippet
index 6733410..404d1d2 100755
--- a/snippets/emacs-lisp-mode/cdr.yasnippet
+++ b/snippets/emacs-lisp-mode/cdr.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: cdr
+#key: cdr
 # --
 (cdr $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/concat.yasnippet b/snippets/emacs-lisp-mode/concat.yasnippet
index 5be485d..b94cfeb 100755
--- a/snippets/emacs-lisp-mode/concat.yasnippet
+++ b/snippets/emacs-lisp-mode/concat.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: concat
+#key: concat
 # --
 (concat $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/cond.yasnippet b/snippets/emacs-lisp-mode/cond.yasnippet
index 36340f1..3927414 100755
--- a/snippets/emacs-lisp-mode/cond.yasnippet
+++ b/snippets/emacs-lisp-mode/cond.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: cond
+#key: cond
 # --
 (cond
 (CONDITION$0 BODY)
diff --git a/snippets/emacs-lisp-mode/condition-case.yasnippet b/snippets/emacs-lisp-mode/condition-case.yasnippet
index 750fd3e..da794dd 100755
--- a/snippets/emacs-lisp-mode/condition-case.yasnippet
+++ b/snippets/emacs-lisp-mode/condition-case.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: condition-case
+#key: condition-case
+#key: cc
 # --
 (condition-case $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/cons.yasnippet b/snippets/emacs-lisp-mode/cons.yasnippet
index 2a9e0e5..f186919 100755
--- a/snippets/emacs-lisp-mode/cons.yasnippet
+++ b/snippets/emacs-lisp-mode/cons.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: cons
+#key: cons
 # --
 (cons $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/consp.yasnippet b/snippets/emacs-lisp-mode/consp.yasnippet
index 00f2d84..2b2ce5c 100755
--- a/snippets/emacs-lisp-mode/consp.yasnippet
+++ b/snippets/emacs-lisp-mode/consp.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: consp
+#key: consp
 # --
 (consp $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/current-buffer.yasnippet b/snippets/emacs-lisp-mode/current-buffer.yasnippet
index 66d5a9d..b25a48a 100755
--- a/snippets/emacs-lisp-mode/current-buffer.yasnippet
+++ b/snippets/emacs-lisp-mode/current-buffer.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: current-buffer
+#key: current-buffer
+#key: cb
 # --
 (current-buffer)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/custom-autoload.yasnippet b/snippets/emacs-lisp-mode/custom-autoload.yasnippet
index 9a71d25..b5dbb71 100755
--- a/snippets/emacs-lisp-mode/custom-autoload.yasnippet
+++ b/snippets/emacs-lisp-mode/custom-autoload.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: custom-autoload
+#key: custom-autoload
+#key: ca
 # --
 (custom-autoload$0 SYMBOL LOAD &optional NOSET)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/defalias.yasnippet b/snippets/emacs-lisp-mode/defalias.yasnippet
index e47da33..7c3998a 100755
--- a/snippets/emacs-lisp-mode/defalias.yasnippet
+++ b/snippets/emacs-lisp-mode/defalias.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: defalias
+#key: defalias
 # --
 (defalias 'SYMBOL$0 'DEFINITION &optional DOCSTRING)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/defcustom.yasnippet b/snippets/emacs-lisp-mode/defcustom.yasnippet
index 3ec54d6..25ecbaa 100755
--- a/snippets/emacs-lisp-mode/defcustom.yasnippet
+++ b/snippets/emacs-lisp-mode/defcustom.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: defcustom
+#key: defcustom
 # --
 (defcustom $0 VALUE "DOC" &optional ARGS)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/define-key.yasnippet b/snippets/emacs-lisp-mode/define-key.yasnippet
index 035efe6..e483a51 100755
--- a/snippets/emacs-lisp-mode/define-key.yasnippet
+++ b/snippets/emacs-lisp-mode/define-key.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: define-key
+#key: define-key
+#key: dk
 # --
 (define-key KEYMAPNAME$0 (kbd "M-b") 'FUNCNAME)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/defsubst.yasnippet b/snippets/emacs-lisp-mode/defsubst.yasnippet
index 7529bf1..5ce9033 100755
--- a/snippets/emacs-lisp-mode/defsubst.yasnippet
+++ b/snippets/emacs-lisp-mode/defsubst.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: defsubst
+#key: defsubst
 # --
 (defsubst $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/defun.yasnippet b/snippets/emacs-lisp-mode/defun.yasnippet
index 8845494..26451cb 100755
--- a/snippets/emacs-lisp-mode/defun.yasnippet
+++ b/snippets/emacs-lisp-mode/defun.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: defun
+#key: defun
 # --
 (defun $1 ()
   "DOCSTRING"
diff --git a/snippets/emacs-lisp-mode/defvar.yasnippet b/snippets/emacs-lisp-mode/defvar.yasnippet
index cc623d8..676e92e 100755
--- a/snippets/emacs-lisp-mode/defvar.yasnippet
+++ b/snippets/emacs-lisp-mode/defvar.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: defvar
+#key: defvar
 # --
 (defvar SYMBOL &optional INITVALUE "DOCSTRING")
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/delete-region.yasnippet b/snippets/emacs-lisp-mode/delete-region.yasnippet
index d61001a..7c753d2 100755
--- a/snippets/emacs-lisp-mode/delete-region.yasnippet
+++ b/snippets/emacs-lisp-mode/delete-region.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: delete-region
+#key: delete-region
+#key: dr
 # --
 (delete-region $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/dolist.yasnippet b/snippets/emacs-lisp-mode/dolist.yasnippet
index 38a5d3f..ea66015 100755
--- a/snippets/emacs-lisp-mode/dolist.yasnippet
+++ b/snippets/emacs-lisp-mode/dolist.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: dolist
+#key: dolist
 # --
 (dolist $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/end-of-line.yasnippet b/snippets/emacs-lisp-mode/end-of-line.yasnippet
index 10ed98f..f8a2d9f 100755
--- a/snippets/emacs-lisp-mode/end-of-line.yasnippet
+++ b/snippets/emacs-lisp-mode/end-of-line.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: end-of-line
+#key: end-of-line
+#key: eol
 # --
 (end-of-line)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/eol.yasnippet b/snippets/emacs-lisp-mode/eol.yasnippet
deleted file mode 100755
index 10ed98f..0000000
--- a/snippets/emacs-lisp-mode/eol.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: end-of-line
-# --
-(end-of-line)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/eq.yasnippet b/snippets/emacs-lisp-mode/eq.yasnippet
index 564fcdd..3d29f52 100755
--- a/snippets/emacs-lisp-mode/eq.yasnippet
+++ b/snippets/emacs-lisp-mode/eq.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: eq
+#key: eq
 # --
 (eq $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/equal.yasnippet b/snippets/emacs-lisp-mode/equal.yasnippet
index c85cea7..7b0dd58 100755
--- a/snippets/emacs-lisp-mode/equal.yasnippet
+++ b/snippets/emacs-lisp-mode/equal.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: equal
+#key: equal
 # --
 (equal $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/error.yasnippet b/snippets/emacs-lisp-mode/error.yasnippet
index 95914b7..48bf689 100755
--- a/snippets/emacs-lisp-mode/error.yasnippet
+++ b/snippets/emacs-lisp-mode/error.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: error
+#key: error
 # --
 (error "$0" &optional ARGS)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/expand-file-name.yasnippet b/snippets/emacs-lisp-mode/expand-file-name.yasnippet
index 8f5dad3..8e6c596 100755
--- a/snippets/emacs-lisp-mode/expand-file-name.yasnippet
+++ b/snippets/emacs-lisp-mode/expand-file-name.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: expand-file-name
+#key: expand-file-name
+#key: efn
 # --
 (expand-file-name $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/f.yasnippet b/snippets/emacs-lisp-mode/f.yasnippet
index e841614..34e3a80 100755
--- a/snippets/emacs-lisp-mode/f.yasnippet
+++ b/snippets/emacs-lisp-mode/f.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: format
+#key: format
 # --
 (format "$0" &optional OBJECTS)
diff --git a/snippets/emacs-lisp-mode/fboundp.yasnippet b/snippets/emacs-lisp-mode/fboundp.yasnippet
index cd9f79a..0212c2d 100755
--- a/snippets/emacs-lisp-mode/fboundp.yasnippet
+++ b/snippets/emacs-lisp-mode/fboundp.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: fboundp
+#key: fboundp
 # --
 (fboundp '$0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet b/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet
index d4a77e6..7310bec 100755
--- a/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet
+++ b/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: file-name-nondirectory
+#key: file-name-nondirectory
+#key: fnn
 # --
 (file-name-nondirectory $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/file-relative-name.yasnippet b/snippets/emacs-lisp-mode/file-relative-name.yasnippet
index 16e1847..39b6807 100755
--- a/snippets/emacs-lisp-mode/file-relative-name.yasnippet
+++ b/snippets/emacs-lisp-mode/file-relative-name.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: file-relative-name
+#key: file-relative-name
+#key: frn
 # --
 (file-relative-name $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/find-file.yasnippet b/snippets/emacs-lisp-mode/find-file.yasnippet
index 70cb87b..8038e83 100755
--- a/snippets/emacs-lisp-mode/find-file.yasnippet
+++ b/snippets/emacs-lisp-mode/find-file.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: find-file
+#key: find-file
+#key: ff
 # --
 (find-file $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/format.yasnippet b/snippets/emacs-lisp-mode/format.yasnippet
index e841614..34e3a80 100755
--- a/snippets/emacs-lisp-mode/format.yasnippet
+++ b/snippets/emacs-lisp-mode/format.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: format
+#key: format
 # --
 (format "$0" &optional OBJECTS)
diff --git a/snippets/emacs-lisp-mode/forward-char.yasnippet b/snippets/emacs-lisp-mode/forward-char.yasnippet
index e2840ef..1298e98 100755
--- a/snippets/emacs-lisp-mode/forward-char.yasnippet
+++ b/snippets/emacs-lisp-mode/forward-char.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: forward-char
+#key: forward-char
+#key: fc
 # --
 (forward-char $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/forward-line.yasnippet b/snippets/emacs-lisp-mode/forward-line.yasnippet
index ce2143b..37d94d7 100755
--- a/snippets/emacs-lisp-mode/forward-line.yasnippet
+++ b/snippets/emacs-lisp-mode/forward-line.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: forward-line
+#key: forward-line
+#key: fl
 # --
 (forward-line $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/funcall.yasnippet b/snippets/emacs-lisp-mode/funcall.yasnippet
index 5d2a307..fb486bc 100755
--- a/snippets/emacs-lisp-mode/funcall.yasnippet
+++ b/snippets/emacs-lisp-mode/funcall.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: funcall
+#key: funcall
 # --
 (funcall $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/function.yasnippet b/snippets/emacs-lisp-mode/function.yasnippet
index 2b39cc5..cbebaf0 100755
--- a/snippets/emacs-lisp-mode/function.yasnippet
+++ b/snippets/emacs-lisp-mode/function.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: function
+#key: function
 # --
 (function $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/get.yasnippet b/snippets/emacs-lisp-mode/get.yasnippet
index fe55b2e..9b29658 100755
--- a/snippets/emacs-lisp-mode/get.yasnippet
+++ b/snippets/emacs-lisp-mode/get.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: get
+#key: get
 # --
 (get SYMBOL$0 PROPNAME)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/global-set-key.yasnippet b/snippets/emacs-lisp-mode/global-set-key.yasnippet
index 8f974e8..8629f27 100755
--- a/snippets/emacs-lisp-mode/global-set-key.yasnippet
+++ b/snippets/emacs-lisp-mode/global-set-key.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: global-set-key
+#key: global-set-key
+#key: gsk
 # --
 (global-set-key (kbd "C-$0") 'COMMAND)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/goto-char.yasnippet b/snippets/emacs-lisp-mode/goto-char.yasnippet
index 4cbddd4..7cb8d2b 100755
--- a/snippets/emacs-lisp-mode/goto-char.yasnippet
+++ b/snippets/emacs-lisp-mode/goto-char.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: goto-char
+#key: goto-char
+#key: gc
 # --
 (goto-char $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/if.yasnippet b/snippets/emacs-lisp-mode/if.yasnippet
index c21133c..c797755 100755
--- a/snippets/emacs-lisp-mode/if.yasnippet
+++ b/snippets/emacs-lisp-mode/if.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: if
+#key: if
 # --
 (if $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/insert.yasnippet b/snippets/emacs-lisp-mode/insert.yasnippet
index 37e9264..2dbd0bd 100755
--- a/snippets/emacs-lisp-mode/insert.yasnippet
+++ b/snippets/emacs-lisp-mode/insert.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: insert
+#key: insert
+#key: ins
 # --
 (insert $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/interactive.yasnippet b/snippets/emacs-lisp-mode/interactive.yasnippet
index ad88e40..f973892 100755
--- a/snippets/emacs-lisp-mode/interactive.yasnippet
+++ b/snippets/emacs-lisp-mode/interactive.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: interactive
+#key: interactive
 # --
 (interactive)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/kb.yasnippet b/snippets/emacs-lisp-mode/kb.yasnippet
deleted file mode 100755
index 58bf267..0000000
--- a/snippets/emacs-lisp-mode/kb.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: kill-buffer
-# --
-(kill-buffer $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/kbd.yasnippet b/snippets/emacs-lisp-mode/kbd.yasnippet
index 8842c42..be91b08 100755
--- a/snippets/emacs-lisp-mode/kbd.yasnippet
+++ b/snippets/emacs-lisp-mode/kbd.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: kbd
+#key: kbd
 # --
 (kbd "$0")
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/kill-buffer.yasnippet b/snippets/emacs-lisp-mode/kill-buffer.yasnippet
index 58bf267..491a73b 100755
--- a/snippets/emacs-lisp-mode/kill-buffer.yasnippet
+++ b/snippets/emacs-lisp-mode/kill-buffer.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: kill-buffer
+#key: kill-buffer
+#key: kb
 # --
 (kill-buffer $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/lambda.yasnippet b/snippets/emacs-lisp-mode/lambda.yasnippet
index dc192a2..ae4062f 100755
--- a/snippets/emacs-lisp-mode/lambda.yasnippet
+++ b/snippets/emacs-lisp-mode/lambda.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: lambda
+#key: lambda
 # --
 (lambda ($0) "DOCSTRING" (interactive) BODY)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/length.yasnippet b/snippets/emacs-lisp-mode/length.yasnippet
index efba78a..46a379b 100755
--- a/snippets/emacs-lisp-mode/length.yasnippet
+++ b/snippets/emacs-lisp-mode/length.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: length
+#key: length
 # --
 (length $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/let.yasnippet b/snippets/emacs-lisp-mode/let.yasnippet
index 5d1a40e..90110be 100755
--- a/snippets/emacs-lisp-mode/let.yasnippet
+++ b/snippets/emacs-lisp-mode/let.yasnippet
@@ -1,5 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: let
+#key: let
 # --
 (let ($1 )
  $0
diff --git a/snippets/emacs-lisp-mode/line-beginning-position.yasnippet b/snippets/emacs-lisp-mode/line-beginning-position.yasnippet
index ff465a3..647158b 100755
--- a/snippets/emacs-lisp-mode/line-beginning-position.yasnippet
+++ b/snippets/emacs-lisp-mode/line-beginning-position.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: line-beginning-position
+#key: line-beginning-position
+#key: lbp
 # --
 (line-beginning-position)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/line-end-position.yasnippet b/snippets/emacs-lisp-mode/line-end-position.yasnippet
index c40c0e6..f3a4f4c 100755
--- a/snippets/emacs-lisp-mode/line-end-position.yasnippet
+++ b/snippets/emacs-lisp-mode/line-end-position.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: line-end-position
+#key: line-end-position
+#key: lep
 # --
 (line-end-position)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/list.yasnippet b/snippets/emacs-lisp-mode/list.yasnippet
index 4ec1c63..11be961 100755
--- a/snippets/emacs-lisp-mode/list.yasnippet
+++ b/snippets/emacs-lisp-mode/list.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: list
+#key: list
 # --
 (list $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/looking-at.yasnippet b/snippets/emacs-lisp-mode/looking-at.yasnippet
index 6bc322c..83741dd 100755
--- a/snippets/emacs-lisp-mode/looking-at.yasnippet
+++ b/snippets/emacs-lisp-mode/looking-at.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: looking-at
+#key: looking-at
+#key: la
 # --
 (looking-at $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/m.yasnippet b/snippets/emacs-lisp-mode/m.yasnippet
deleted file mode 100755
index f7a88de..0000000
--- a/snippets/emacs-lisp-mode/m.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: message
-# --
-(message "FORMATSTRING$0" &optional ARGS)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/make-local-variable.yasnippet b/snippets/emacs-lisp-mode/make-local-variable.yasnippet
index 07b4968..06e0ff4 100755
--- a/snippets/emacs-lisp-mode/make-local-variable.yasnippet
+++ b/snippets/emacs-lisp-mode/make-local-variable.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: make-local-variable
+#key: make-local-variable
+#key: mlv
 # --
 (make-local-variable $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/mapc.yasnippet b/snippets/emacs-lisp-mode/mapc.yasnippet
index a398776..f244f64 100755
--- a/snippets/emacs-lisp-mode/mapc.yasnippet
+++ b/snippets/emacs-lisp-mode/mapc.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: mapc
+#key: mapc
 # --
 (mapc '$0 SEQUENCE)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/mapcar.yasnippet b/snippets/emacs-lisp-mode/mapcar.yasnippet
index 2799cea..25bbd5d 100755
--- a/snippets/emacs-lisp-mode/mapcar.yasnippet
+++ b/snippets/emacs-lisp-mode/mapcar.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: mapcar
+#key: mapcar
 # --
 (mapcar $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/match-beginning.yasnippet b/snippets/emacs-lisp-mode/match-beginning.yasnippet
index 146d188..b3ecc75 100755
--- a/snippets/emacs-lisp-mode/match-beginning.yasnippet
+++ b/snippets/emacs-lisp-mode/match-beginning.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: match-beginning
+#key: match-beginning
+#key: mb
 # --
 (match-beginning N$0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/match-end.yasnippet b/snippets/emacs-lisp-mode/match-end.yasnippet
index 8841909..d263499 100755
--- a/snippets/emacs-lisp-mode/match-end.yasnippet
+++ b/snippets/emacs-lisp-mode/match-end.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: match-end
+#key: match-end
+#key: me
 # --
 (match-end N$0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/match-string.yasnippet b/snippets/emacs-lisp-mode/match-string.yasnippet
index ba16c62..5c74e9d 100755
--- a/snippets/emacs-lisp-mode/match-string.yasnippet
+++ b/snippets/emacs-lisp-mode/match-string.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: match-string
+#key: match-string
+#key: ms
 # --
 (match-string $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/memq.yasnippet b/snippets/emacs-lisp-mode/memq.yasnippet
index c8c359e..f0f7cba 100755
--- a/snippets/emacs-lisp-mode/memq.yasnippet
+++ b/snippets/emacs-lisp-mode/memq.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: memq
+#key: memq
 # --
 (memq ELT$0 LIST)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/message.yasnippet b/snippets/emacs-lisp-mode/message.yasnippet
index f7a88de..a478288 100755
--- a/snippets/emacs-lisp-mode/message.yasnippet
+++ b/snippets/emacs-lisp-mode/message.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: message
+#key: message
+#key: msg
 # --
 (message "FORMATSTRING$0" &optional ARGS)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/not.yasnippet b/snippets/emacs-lisp-mode/not.yasnippet
index 3bb627a..624bea5 100755
--- a/snippets/emacs-lisp-mode/not.yasnippet
+++ b/snippets/emacs-lisp-mode/not.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: not
+#key: not
 # --
 (not $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/nth.yasnippet b/snippets/emacs-lisp-mode/nth.yasnippet
index eb9057f..b3880a2 100755
--- a/snippets/emacs-lisp-mode/nth.yasnippet
+++ b/snippets/emacs-lisp-mode/nth.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: nth
+#key: nth
 # --
 (nth N$0 LIST)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/nts.yasnippet b/snippets/emacs-lisp-mode/nts.yasnippet
deleted file mode 100755
index d4eebfd..0000000
--- a/snippets/emacs-lisp-mode/nts.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: number-to-string
-# --
-(number-to-string $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/null.yasnippet b/snippets/emacs-lisp-mode/null.yasnippet
index 2d03019..9d451ec 100755
--- a/snippets/emacs-lisp-mode/null.yasnippet
+++ b/snippets/emacs-lisp-mode/null.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: null
+#key: null
 # --
 (null $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/number-to-string.yasnippet b/snippets/emacs-lisp-mode/number-to-string.yasnippet
index d4eebfd..42eccb7 100755
--- a/snippets/emacs-lisp-mode/number-to-string.yasnippet
+++ b/snippets/emacs-lisp-mode/number-to-string.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: number-to-string
+#key: number-to-string
+#key: nts
 # --
 (number-to-string $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/or.yasnippet b/snippets/emacs-lisp-mode/or.yasnippet
index 55ac47b..74e817a 100755
--- a/snippets/emacs-lisp-mode/or.yasnippet
+++ b/snippets/emacs-lisp-mode/or.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: or
+#key: or
 # --
 (or $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/p.yasnippet b/snippets/emacs-lisp-mode/p.yasnippet
deleted file mode 100755
index ef0f7aa..0000000
--- a/snippets/emacs-lisp-mode/p.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: point
-# --
-(point)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/point-max.yasnippet b/snippets/emacs-lisp-mode/point-max.yasnippet
index ef9fa26..6544869 100755
--- a/snippets/emacs-lisp-mode/point-max.yasnippet
+++ b/snippets/emacs-lisp-mode/point-max.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: point-max
+#key: point-max
 # --
 (point-max)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/point-min.yasnippet b/snippets/emacs-lisp-mode/point-min.yasnippet
index 9789afc..029d736 100755
--- a/snippets/emacs-lisp-mode/point-min.yasnippet
+++ b/snippets/emacs-lisp-mode/point-min.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: point-min
+#key: point-min
+#key: pm
 # --
 (point-min)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/point.yasnippet b/snippets/emacs-lisp-mode/point.yasnippet
index ef0f7aa..6aa6b74 100755
--- a/snippets/emacs-lisp-mode/point.yasnippet
+++ b/snippets/emacs-lisp-mode/point.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: point
+#key: point
+#key: p
 # --
 (point)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/princ.yasnippet b/snippets/emacs-lisp-mode/princ.yasnippet
index 2397e31..88ad7d7 100755
--- a/snippets/emacs-lisp-mode/princ.yasnippet
+++ b/snippets/emacs-lisp-mode/princ.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: princ
+#key: princ
 # --
 (princ $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/print.yasnippet b/snippets/emacs-lisp-mode/print.yasnippet
index 9d7ce8c..7d0f421 100755
--- a/snippets/emacs-lisp-mode/print.yasnippet
+++ b/snippets/emacs-lisp-mode/print.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: print
+#key: print
 # --
 (print $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/progn.yasnippet b/snippets/emacs-lisp-mode/progn.yasnippet
index 17ce1f4..d07c5c3 100755
--- a/snippets/emacs-lisp-mode/progn.yasnippet
+++ b/snippets/emacs-lisp-mode/progn.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: progn
+#key: progn
 # --
 (progn $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/push.yasnippet b/snippets/emacs-lisp-mode/push.yasnippet
index a348f39..f019b80 100755
--- a/snippets/emacs-lisp-mode/push.yasnippet
+++ b/snippets/emacs-lisp-mode/push.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: push
+#key: push
 # --
 (push $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/put.yasnippet b/snippets/emacs-lisp-mode/put.yasnippet
index c5b953e..7a91f20 100755
--- a/snippets/emacs-lisp-mode/put.yasnippet
+++ b/snippets/emacs-lisp-mode/put.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: put
+#key: put
 # --
 (put $0 PROPNAME VALUE)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/re-search-backward.yasnippet b/snippets/emacs-lisp-mode/re-search-backward.yasnippet
index 7e2c910..a04d99f 100755
--- a/snippets/emacs-lisp-mode/re-search-backward.yasnippet
+++ b/snippets/emacs-lisp-mode/re-search-backward.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: re-search-backward
+#key: re-search-backward
+#key: rsb
 # --
 (re-search-backward REGEXP$0 &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/re-search-forward.yasnippet b/snippets/emacs-lisp-mode/re-search-forward.yasnippet
index 2516b41..31a24a3 100755
--- a/snippets/emacs-lisp-mode/re-search-forward.yasnippet
+++ b/snippets/emacs-lisp-mode/re-search-forward.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: re-search-forward
+#key: re-search-forward
+#key: rsf
 # --
 (re-search-forward REGEXP$0 &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/region-beginning.yasnippet b/snippets/emacs-lisp-mode/region-beginning.yasnippet
index 0d09087..55496e2 100755
--- a/snippets/emacs-lisp-mode/region-beginning.yasnippet
+++ b/snippets/emacs-lisp-mode/region-beginning.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: region-beginning
+#key: region-beginning
+#key: rb
 # --
 (region-beginning)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/region-end.yasnippet b/snippets/emacs-lisp-mode/region-end.yasnippet
index e3e61c0..fddcd9f 100755
--- a/snippets/emacs-lisp-mode/region-end.yasnippet
+++ b/snippets/emacs-lisp-mode/region-end.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: region-end
+#key: region-end
+#key: re
 # --
 (region-end)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/repeat.yasnippet b/snippets/emacs-lisp-mode/repeat.yasnippet
index f056ca5..45422eb 100755
--- a/snippets/emacs-lisp-mode/repeat.yasnippet
+++ b/snippets/emacs-lisp-mode/repeat.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: repeat
+#key: repeat
 # --
 (repeat $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet b/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
index e663569..a396e88 100755
--- a/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
+++ b/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: replace-regexp-in-string
+#key: replace-regexp-in-string
+#key: rris
 # --
 (replace-regexp-in-string REGEXP$0 REP STRING &optional FIXEDCASE LITERAL SUBEXP START)
diff --git a/snippets/emacs-lisp-mode/replace-regexp.yasnippet b/snippets/emacs-lisp-mode/replace-regexp.yasnippet
index fb738c9..7535bc1 100755
--- a/snippets/emacs-lisp-mode/replace-regexp.yasnippet
+++ b/snippets/emacs-lisp-mode/replace-regexp.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: replace-regexp
+#key: replace-regexp
+#key: rr
 # --
 (replace-regexp REGEXP$0 TO-STRING &optional DELIMITED START END)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/require.yasnippet b/snippets/emacs-lisp-mode/require.yasnippet
index cab6fc4..9c91035 100755
--- a/snippets/emacs-lisp-mode/require.yasnippet
+++ b/snippets/emacs-lisp-mode/require.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: require
+#key: require
 # --
 (require $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/rris.yasnippet b/snippets/emacs-lisp-mode/rris.yasnippet
deleted file mode 100755
index af0d6d1..0000000
--- a/snippets/emacs-lisp-mode/rris.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: rris
-# --
-(replace-regexp-in-string "REGEXP"$0 "REP" "STRING" &optional FIXEDCASE LITERAL SUBEXP START)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/s.yasnippet b/snippets/emacs-lisp-mode/s.yasnippet
deleted file mode 100755
index dbfe724..0000000
--- a/snippets/emacs-lisp-mode/s.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: setq
-# --
-(setq $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/save-excursion.yasnippet b/snippets/emacs-lisp-mode/save-excursion.yasnippet
index 14e4748..5f587ce 100755
--- a/snippets/emacs-lisp-mode/save-excursion.yasnippet
+++ b/snippets/emacs-lisp-mode/save-excursion.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: save-excursion
+#key: save-excursion
+#key: se
 # --
 (save-excursion $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/search-backward.yasnippet b/snippets/emacs-lisp-mode/search-backward.yasnippet
index fad1189..4b07486 100755
--- a/snippets/emacs-lisp-mode/search-backward.yasnippet
+++ b/snippets/emacs-lisp-mode/search-backward.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: search-backward
+#key: search-backward
+#key: sb
 # --
 (search-backward "$0" &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/search-forward.yasnippet b/snippets/emacs-lisp-mode/search-forward.yasnippet
index 7d033c7..03e56c8 100755
--- a/snippets/emacs-lisp-mode/search-forward.yasnippet
+++ b/snippets/emacs-lisp-mode/search-forward.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: search-forward
+#key: search-forward
+#key: sf
 # --
 (search-forward "$0" &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/set-buffer.yasnippet b/snippets/emacs-lisp-mode/set-buffer.yasnippet
index 5345b77..0eff93d 100755
--- a/snippets/emacs-lisp-mode/set-buffer.yasnippet
+++ b/snippets/emacs-lisp-mode/set-buffer.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: set-buffer
+#key: set-buffer
+#key: sb
 # --
 (set-buffer $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/set-mark.yasnippet b/snippets/emacs-lisp-mode/set-mark.yasnippet
index badbc21..9a482a1 100755
--- a/snippets/emacs-lisp-mode/set-mark.yasnippet
+++ b/snippets/emacs-lisp-mode/set-mark.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: set-mark
+#key: set-mark
+#key: sm
 # --
 (set-mark $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/set.yasnippet b/snippets/emacs-lisp-mode/set.yasnippet
index 414e6d4..cf9c101 100755
--- a/snippets/emacs-lisp-mode/set.yasnippet
+++ b/snippets/emacs-lisp-mode/set.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: set
+#key: set
 # --
 (set $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/setq.yasnippet b/snippets/emacs-lisp-mode/setq.yasnippet
index f161d8a..4bdb4fc 100755
--- a/snippets/emacs-lisp-mode/setq.yasnippet
+++ b/snippets/emacs-lisp-mode/setq.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: setq
+#key: setq
+#key: s
 # --
 (setq $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet b/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet
index a706485..0fc4cf4 100755
--- a/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet
+++ b/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: skip-chars-backward
+#key: skip-chars-backward
+#key: scb
 # --
 (skip-chars-backward "$0" &optional LIM)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet b/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet
index 93a528b..110cbd5 100755
--- a/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet
+++ b/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: skip-chars-forward
+#key: skip-chars-forward
+#key: scf
 # --
 (skip-chars-forward "$0" &optional LIM)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/stn.yasnippet b/snippets/emacs-lisp-mode/stn.yasnippet
deleted file mode 100755
index 1e0624b..0000000
--- a/snippets/emacs-lisp-mode/stn.yasnippet
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Xah Lee (XahLee.org)
-#name: string-to-number
-# --
-(string-to-number "$0")
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/string-match.yasnippet b/snippets/emacs-lisp-mode/string-match.yasnippet
index 0bfdcd6..1ef9876 100755
--- a/snippets/emacs-lisp-mode/string-match.yasnippet
+++ b/snippets/emacs-lisp-mode/string-match.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: string-match
+#key: string-match
+#key: sm
 # --
 (string-match "REGEXP$0" "STRING" &optional START)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/string-to-number.yasnippet b/snippets/emacs-lisp-mode/string-to-number.yasnippet
index 1e0624b..449d621 100755
--- a/snippets/emacs-lisp-mode/string-to-number.yasnippet
+++ b/snippets/emacs-lisp-mode/string-to-number.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: string-to-number
+#key: string-to-number
+#key: stn
 # --
 (string-to-number "$0")
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/string.yasnippet b/snippets/emacs-lisp-mode/string.yasnippet
index b6aef56..f3a4dda 100755
--- a/snippets/emacs-lisp-mode/string.yasnippet
+++ b/snippets/emacs-lisp-mode/string.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: string
+#key: string
 # --
 (string $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/string=.yasnippet b/snippets/emacs-lisp-mode/string=.yasnippet
index 7143bf9..d0d43aa 100755
--- a/snippets/emacs-lisp-mode/string=.yasnippet
+++ b/snippets/emacs-lisp-mode/string=.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: string=
+#key: string=
 # --
 (string= $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/stringp.yasnippet b/snippets/emacs-lisp-mode/stringp.yasnippet
index 7e9b6ed..c20be65 100755
--- a/snippets/emacs-lisp-mode/stringp.yasnippet
+++ b/snippets/emacs-lisp-mode/stringp.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: stringp
+#key: stringp
 # --
 (stringp $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/substring.yasnippet b/snippets/emacs-lisp-mode/substring.yasnippet
index 51746fa..b35cf6b 100755
--- a/snippets/emacs-lisp-mode/substring.yasnippet
+++ b/snippets/emacs-lisp-mode/substring.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: substring
+#key: substring
 # --
 (substring STRING$0 FROM &optional TO)
diff --git a/snippets/emacs-lisp-mode/unless.yasnippet b/snippets/emacs-lisp-mode/unless.yasnippet
index 5a71370..15c1518 100755
--- a/snippets/emacs-lisp-mode/unless.yasnippet
+++ b/snippets/emacs-lisp-mode/unless.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: unless
+#key: unless
 # --
 (unless $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/when.yasnippet b/snippets/emacs-lisp-mode/when.yasnippet
index eb3b9cf..c5f4478 100755
--- a/snippets/emacs-lisp-mode/when.yasnippet
+++ b/snippets/emacs-lisp-mode/when.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: when
+#key: when
 # --
 (when $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/while.yasnippet b/snippets/emacs-lisp-mode/while.yasnippet
index 4ed5f79..4584be3 100755
--- a/snippets/emacs-lisp-mode/while.yasnippet
+++ b/snippets/emacs-lisp-mode/while.yasnippet
@@ -1,4 +1,5 @@
 #contributor: Xah Lee (XahLee.org)
 #name: while
+#key: while
 # --
 (while $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/widget-get.yasnippet b/snippets/emacs-lisp-mode/widget-get.yasnippet
index 2dbaafb..24caf7b 100755
--- a/snippets/emacs-lisp-mode/widget-get.yasnippet
+++ b/snippets/emacs-lisp-mode/widget-get.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: widget-get
+#key: widget-get
+#key: wg
 # --
 (widget-get $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/with-current-buffer.yasnippet b/snippets/emacs-lisp-mode/with-current-buffer.yasnippet
index 4c34068..9041303 100755
--- a/snippets/emacs-lisp-mode/with-current-buffer.yasnippet
+++ b/snippets/emacs-lisp-mode/with-current-buffer.yasnippet
@@ -1,4 +1,6 @@
 #contributor: Xah Lee (XahLee.org)
 #name: with-current-buffer
+#key: with-current-buffer
+#key: wcb
 # --
 (with-current-buffer $0 )
\ No newline at end of file