diff --git a/snippets/emacs-lisp-mode/.read_me b/snippets/emacs-lisp-mode/.read_me
index 9e6e532..dda5eba 100644
--- a/snippets/emacs-lisp-mode/.read_me
+++ b/snippets/emacs-lisp-mode/.read_me
@@ -1,4 +1,7 @@
-TITLE: Emacs Idiom Template Set. Version 1. 2009-02-22
+TITLE: Emacs Idiom Template Set.
+
+Version 1.1. 2010-08-05
+Version 1. 2009-02-22
 
 DESCRIPTION: Some useful templates for emacs lisp. This template set is based on useful elisp idioms on common tasks.
 
diff --git a/snippets/emacs-lisp-mode/and.yasnippet b/snippets/emacs-lisp-mode/and.yasnippet
new file mode 100755
index 0000000..9c4b3b3
--- /dev/null
+++ b/snippets/emacs-lisp-mode/and.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: and
+# --
+(and $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/autoload.yasnippet b/snippets/emacs-lisp-mode/autoload.yasnippet
new file mode 100755
index 0000000..fe8a4e8
--- /dev/null
+++ b/snippets/emacs-lisp-mode/autoload.yasnippet
@@ -0,0 +1,5 @@
+#contributor: Xah Lee (XahLee.org)
+#name: autoload
+# --
+(autoload 'FUNCNAME$0 "FILENAME" & "DOCSTRING" INTERACTIVE TYPE)
+
diff --git a/snippets/emacs-lisp-mode/car.yasnippet b/snippets/emacs-lisp-mode/car.yasnippet
new file mode 100755
index 0000000..1ef1c4c
--- /dev/null
+++ b/snippets/emacs-lisp-mode/car.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: car
+# --
+(car $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/define-key.yasnippet b/snippets/emacs-lisp-mode/define-key.yasnippet
new file mode 100755
index 0000000..035efe6
--- /dev/null
+++ b/snippets/emacs-lisp-mode/define-key.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: define-key
+# --
+(define-key KEYMAPNAME$0 (kbd "M-b") 'FUNCNAME)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/defun b/snippets/emacs-lisp-mode/defun.yasnippet
old mode 100644
new mode 100755
similarity index 51%
rename from snippets/emacs-lisp-mode/defun
rename to snippets/emacs-lisp-mode/defun.yasnippet
index 0105d20..8845494
--- a/snippets/emacs-lisp-mode/defun
+++ b/snippets/emacs-lisp-mode/defun.yasnippet
@@ -1,11 +1,10 @@
-#name : function template
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: defun
 # --
 (defun $1 ()
-  "thisandthat."
+  "DOCSTRING"
   (interactive)
   (let (var1)
     (setq var1 some)
     $0
-  )
-)
\ No newline at end of file
+  ))
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/defvar.yasnippet b/snippets/emacs-lisp-mode/defvar.yasnippet
new file mode 100755
index 0000000..f027c06
--- /dev/null
+++ b/snippets/emacs-lisp-mode/defvar.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: defvar
+# --
+(defvar SYMBOL & INITVALUE "DOCSTRING")
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/grabthing b/snippets/emacs-lisp-mode/grabthing
deleted file mode 100644
index 772b8dc..0000000
--- a/snippets/emacs-lisp-mode/grabthing
+++ /dev/null
@@ -1,4 +0,0 @@
-#name : grab word under cursor
-#contributor : Xah Lee
-# --
-(setq $0 (thing-at-point 'symbol))
diff --git a/snippets/emacs-lisp-mode/if.yasnippet b/snippets/emacs-lisp-mode/if.yasnippet
new file mode 100755
index 0000000..c21133c
--- /dev/null
+++ b/snippets/emacs-lisp-mode/if.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: if
+# --
+(if $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/let.yasnippet b/snippets/emacs-lisp-mode/let.yasnippet
new file mode 100755
index 0000000..5d1a40e
--- /dev/null
+++ b/snippets/emacs-lisp-mode/let.yasnippet
@@ -0,0 +1,6 @@
+#contributor: Xah Lee (XahLee.org)
+#name: let
+# --
+(let ($1 )
+ $0
+)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/not.yasnippet b/snippets/emacs-lisp-mode/not.yasnippet
new file mode 100755
index 0000000..3bb627a
--- /dev/null
+++ b/snippets/emacs-lisp-mode/not.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: not
+# --
+(not $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/or.yasnippet b/snippets/emacs-lisp-mode/or.yasnippet
new file mode 100755
index 0000000..55ac47b
--- /dev/null
+++ b/snippets/emacs-lisp-mode/or.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: or
+# --
+(or $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/quote.yasnippet b/snippets/emacs-lisp-mode/quote.yasnippet
new file mode 100755
index 0000000..2ce1f98
--- /dev/null
+++ b/snippets/emacs-lisp-mode/quote.yasnippet
@@ -0,0 +1,5 @@
+#contributor: Xah Lee (XahLee.org)
+#name: '(...)
+#key: '
+# --
+'($0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/setq.yasnippet b/snippets/emacs-lisp-mode/setq.yasnippet
new file mode 100755
index 0000000..f161d8a
--- /dev/null
+++ b/snippets/emacs-lisp-mode/setq.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: setq
+# --
+(setq $0 )
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/dired.process_marked b/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
old mode 100644
new mode 100755
similarity index 84%
rename from snippets/emacs-lisp-mode/dired.process_marked
rename to snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
index 1b42597..30b20cb
--- a/snippets/emacs-lisp-mode/dired.process_marked
+++ b/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
@@ -1,5 +1,5 @@
-#name : process marked files in dired
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: process marked files in dired
 # --
 ;; idiom for processing a list of files in dired's marked files
  
diff --git a/snippets/emacs-lisp-mode/file.process b/snippets/emacs-lisp-mode/x-file.process.yasnippet
old mode 100644
new mode 100755
similarity index 87%
rename from snippets/emacs-lisp-mode/file.process
rename to snippets/emacs-lisp-mode/x-file.process.yasnippet
index abd1a33..7e09cb8
--- a/snippets/emacs-lisp-mode/file.process
+++ b/snippets/emacs-lisp-mode/x-file.process.yasnippet
@@ -1,5 +1,5 @@
-#name : a function that process a file
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: a function that process a file
 # --
 (defun doThisFile (fpath)
   "Process the file at path FPATH ..."
diff --git a/snippets/emacs-lisp-mode/file.read-lines b/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
old mode 100644
new mode 100755
similarity index 82%
rename from snippets/emacs-lisp-mode/file.read-lines
rename to snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
index b4a1942..015c0f2
--- a/snippets/emacs-lisp-mode/file.read-lines
+++ b/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
@@ -1,5 +1,5 @@
-#name : read lines of a file
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: read lines of a file
 # --
 (defun read-lines (filePath)
   "Return a list of lines in FILEPATH."
diff --git a/snippets/emacs-lisp-mode/find-replace b/snippets/emacs-lisp-mode/x-find-replace.yasnippet
old mode 100644
new mode 100755
similarity index 88%
rename from snippets/emacs-lisp-mode/find-replace
rename to snippets/emacs-lisp-mode/x-find-replace.yasnippet
index cefcf51..13c3b02
--- a/snippets/emacs-lisp-mode/find-replace
+++ b/snippets/emacs-lisp-mode/x-find-replace.yasnippet
@@ -1,5 +1,5 @@
-#name : find and replace on region
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: find and replace on region
 # --
 (defun replace-html-chars-region (start end)
   "Replace “<” to “&lt;” and other chars in HTML.
diff --git a/snippets/emacs-lisp-mode/grabstring b/snippets/emacs-lisp-mode/x-grabstring.yasnippet
old mode 100644
new mode 100755
similarity index 51%
rename from snippets/emacs-lisp-mode/grabstring
rename to snippets/emacs-lisp-mode/x-grabstring.yasnippet
index 55600b1..5e6aa58
--- a/snippets/emacs-lisp-mode/grabstring
+++ b/snippets/emacs-lisp-mode/x-grabstring.yasnippet
@@ -1,4 +1,4 @@
-#name : grab buffer substring
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: grab buffer substring
 # --
 (setq $0 (buffer-substring-no-properties myStartPos myEndPos))
diff --git a/snippets/emacs-lisp-mode/x-grabthing.yasnippet b/snippets/emacs-lisp-mode/x-grabthing.yasnippet
new file mode 100755
index 0000000..3f4f52c
--- /dev/null
+++ b/snippets/emacs-lisp-mode/x-grabthing.yasnippet
@@ -0,0 +1,4 @@
+#contributor: Xah Lee (XahLee.org)
+#name: grab word under cursor
+# --
+(setq $0 (thing-at-point 'symbol))
diff --git a/snippets/emacs-lisp-mode/traverse_dir b/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
old mode 100644
new mode 100755
similarity index 67%
rename from snippets/emacs-lisp-mode/traverse_dir
rename to snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
index 2859cbd..09da5f2
--- a/snippets/emacs-lisp-mode/traverse_dir
+++ b/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
@@ -1,5 +1,5 @@
-#name : traversing a directory
-#contributor : Xah Lee
+#name: traversing a directory
+#contributor: Xah Lee (XahLee.org)
 # --
 ;; apply a function to all files in a dir
 (require 'find-lisp)
diff --git a/snippets/emacs-lisp-mode/word-or-region b/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
old mode 100644
new mode 100755
similarity index 91%
rename from snippets/emacs-lisp-mode/word-or-region
rename to snippets/emacs-lisp-mode/x-word-or-region.yasnippet
index 66a59e4..0f3d1b8
--- a/snippets/emacs-lisp-mode/word-or-region
+++ b/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
@@ -1,5 +1,5 @@
-#name : Command that works on region or word
-#contributor : Xah Lee
+#contributor: Xah Lee (XahLee.org)
+#name: Command that works on region or word
 # --
 ;; example of a command that works on current word or text selection
 (defun down-case-word-or-region ()