diff --git a/snippets/org-mode/code-block b/snippets/org-mode/code-block
index 979844e..3c3dba8 100644
--- a/snippets/org-mode/code-block
+++ b/snippets/org-mode/code-block
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: code-block
-# key: #s
+# key: <s
 # --
-#+begin_src $1
+#+BEGIN_SRC $1
 $0
-#+end_src
\ No newline at end of file
+#+END_SRC
diff --git a/snippets/org-mode/emacs-lisp-code b/snippets/org-mode/emacs-lisp-code
index 628ab8a..1c5c686 100644
--- a/snippets/org-mode/emacs-lisp-code
+++ b/snippets/org-mode/emacs-lisp-code
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: emacs-lisp-code
-# key: #sl
+# key: <sl
 # --
-#+begin_src emacs-lisp
+#+BEGIN_SRC emacs-lisp
 $0
-#+end_src
\ No newline at end of file
+#+END_SRC
diff --git a/snippets/org-mode/emacs-lisp-defun b/snippets/org-mode/emacs-lisp-defun
index 90070d5..4090bb8 100644
--- a/snippets/org-mode/emacs-lisp-defun
+++ b/snippets/org-mode/emacs-lisp-defun
@@ -1,8 +1,10 @@
 # -*- mode: snippet -*-
-# name: emacs-lisp-test
-# key: #elt
+# name: emacs-lisp-defun
+# key: <slf
 # --
 #+BEGIN_SRC emacs-lisp
-(ert-deftest $1-test ()
-  (should (= $0)))
+(defun ${1:fun} (${2:args})
+  "${3:docstring}"
+  ${4:(interactive${5: "${6:P}"})}
+  $0)  
 #+END_SRC
diff --git a/snippets/org-mode/emacs-lisp-defvar b/snippets/org-mode/emacs-lisp-defvar
index b965589..2d7e580 100644
--- a/snippets/org-mode/emacs-lisp-defvar
+++ b/snippets/org-mode/emacs-lisp-defvar
@@ -1,6 +1,6 @@
-# key: slv
 # name: emacs-lisp-defvar
+# key: <slv
 # --
-+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp
 (defvar ${1:symbol} ${2:initvalue} "${3:docstring}")
 #+END_SRC
\ No newline at end of file
diff --git a/snippets/org-mode/emacs-lisp-test b/snippets/org-mode/emacs-lisp-test
index 2c6486f..d4a69c3 100644
--- a/snippets/org-mode/emacs-lisp-test
+++ b/snippets/org-mode/emacs-lisp-test
@@ -1,7 +1,7 @@
-# key: #elt
 # name: emacs-lisp-test
+# key: <slt
 # --
-#+begin_src emacs-lisp :tangle no
-(ert-deftest $1-test ()
-  (should (= $0)))
-#+end_src
+#+BEGIN_SRC emacs-lisp :tangle no
+  (ert-deftest $1-test ()
+    (should (= $0)))
+#+END_SRC
diff --git a/snippets/org-mode/example-block b/snippets/org-mode/example-block
index 5d3efe9..f2b9b6b 100644
--- a/snippets/org-mode/example-block
+++ b/snippets/org-mode/example-block
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: example-block
-# key: #e
+# key: <e
 # --
 #+begin_example
 $0
diff --git a/snippets/org-mode/header b/snippets/org-mode/header
index 5c9ae24..97caf91 100644
--- a/snippets/org-mode/header
+++ b/snippets/org-mode/header
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: python-src-block
-# key: #sp
+# key: <sp
 # --
 #+BEGIN_SRC python
   $0
-#+END_SRC
\ No newline at end of file
+#+END_SRC
diff --git a/snippets/org-mode/http b/snippets/org-mode/http
index 6bc553e..9727517 100644
--- a/snippets/org-mode/http
+++ b/snippets/org-mode/http
@@ -1,9 +1,9 @@
-# key: <h
 # name: org-mode http client
+# key: <h
 # --
 #+begin_src http
   ${1:GET} https://grafana.dev.wdpharos.io/api/${2:dashboards/uid/klbJ6Rrnk}
   Authorization: Bearer \$\{auth-key\}
   Content-Type: application/json
   $0
-#+end_src
\ No newline at end of file
+#+end_src
diff --git a/snippets/org-mode/name b/snippets/org-mode/name
index 6c1f935..bd642eb 100644
--- a/snippets/org-mode/name
+++ b/snippets/org-mode/name
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: name
-# key: #n
+# key: <n
 # --
-#+NAME: $0
\ No newline at end of file
+#+NAME: $0
diff --git a/snippets/org-mode/quote-block b/snippets/org-mode/quote-block
index 3bfcf45..1f35fb1 100644
--- a/snippets/org-mode/quote-block
+++ b/snippets/org-mode/quote-block
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: quote-block
-# key: #q
+# key: <q
 # --
-#+begin_quote
+#+BEGIN_QUOTE
 $0
-#+end_quote
\ No newline at end of file
+#+END_QUOTE
diff --git a/snippets/org-mode/section-property b/snippets/org-mode/section-property
index 0e8da46..999ea46 100644
--- a/snippets/org-mode/section-property
+++ b/snippets/org-mode/section-property
@@ -2,6 +2,6 @@
 # name: section-property
 # key: prop
 # --
-:properties:
-:header-args:${1:emacs-lisp} :${2:results} ${3:silent}
-:end:
\ No newline at end of file
+:PROPERTIES:
+:HEADER-ARGS:${1:emacs-lisp} :${2:results} ${3:silent}
+:END:
diff --git a/snippets/org-mode/shell-script-code b/snippets/org-mode/shell-script-code
index 1454924..d5d5af0 100644
--- a/snippets/org-mode/shell-script-code
+++ b/snippets/org-mode/shell-script-code
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: shell-script-code
-# key: #ss
+# key: <ss
 # --
-#+begin_src sh
+#+BEGIN_SRC sh
 $0
-#+end_src
\ No newline at end of file
+#+END_SRC