diff --git a/nxml-mode/code b/nxml-mode/code
deleted file mode 100644
index b7c43fd73..000000000
--- a/nxml-mode/code
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <code>...</code>
-# --
-<code>
-  $0
-</code>
\ No newline at end of file
diff --git a/nxml-mode/code.class b/nxml-mode/code.class
deleted file mode 100644
index b910eb754..000000000
--- a/nxml-mode/code.class
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <code class="...">...</code>
-# --
-<code class="$1">
-  $0
-</code>
\ No newline at end of file
diff --git a/nxml-mode/div b/nxml-mode/div
deleted file mode 100644
index 90fbc2e01..000000000
--- a/nxml-mode/div
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <div...>...</div>
-# --
-<div$1>$0</div>
\ No newline at end of file
diff --git a/nxml-mode/div.class b/nxml-mode/div.class
deleted file mode 100644
index 11c12d690..000000000
--- a/nxml-mode/div.class
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <div class="...">...</div>
-# --
-<div class="$1">
-  $0
-</div>
\ No newline at end of file
diff --git a/nxml-mode/div.id b/nxml-mode/div.id
deleted file mode 100644
index ccde64dab..000000000
--- a/nxml-mode/div.id
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <div id="...">...</div>
-# --
-<div id="$1">
-  $0
-</div>
\ No newline at end of file
diff --git a/nxml-mode/div.id-class b/nxml-mode/div.id-class
deleted file mode 100644
index bce892056..000000000
--- a/nxml-mode/div.id-class
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <div id="..." class="...">...</div>
-# --
-<div id="$1" class="$2">
-  $0
-</div>
\ No newline at end of file
diff --git a/nxml-mode/dl.id b/nxml-mode/dl.id
deleted file mode 100644
index 16aba534c..000000000
--- a/nxml-mode/dl.id
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Rodrigo Setti <rodrigosetti@gmail.com>
-#name : <dl> ... </dl>
-#group : list
-# --
-<dl id="$1">
-    $0
-</dl>
\ No newline at end of file
diff --git a/nxml-mode/doctype.xhtml1_strict b/nxml-mode/doctype_xhtml1_strict
similarity index 100%
rename from nxml-mode/doctype.xhtml1_strict
rename to nxml-mode/doctype_xhtml1_strict
diff --git a/nxml-mode/doctype.xhtml1_transitional b/nxml-mode/doctype_xhtml1_transitional
similarity index 100%
rename from nxml-mode/doctype.xhtml1_transitional
rename to nxml-mode/doctype_xhtml1_transitional
diff --git a/nxml-mode/h1 b/nxml-mode/h1
deleted file mode 100644
index bc72fd64b..000000000
--- a/nxml-mode/h1
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <h1>...</h1>
-#group : header
-# --
-<h1>$1</h1>
\ No newline at end of file
diff --git a/nxml-mode/h2 b/nxml-mode/h2
deleted file mode 100644
index b790e56e2..000000000
--- a/nxml-mode/h2
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <h2>...</h2>
-#group : header
-# --
-<h2>$1</h2>
\ No newline at end of file
diff --git a/nxml-mode/h3 b/nxml-mode/h3
deleted file mode 100644
index 7dfd9d746..000000000
--- a/nxml-mode/h3
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <h3>...</h3>
-#group : header
-# --
-<h3>$1</h3>
\ No newline at end of file
diff --git a/nxml-mode/h4 b/nxml-mode/h4
deleted file mode 100644
index b78299810..000000000
--- a/nxml-mode/h4
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <h4>...</h4>
-#group : header
-# --
-<h4>$1</h4>
\ No newline at end of file
diff --git a/nxml-mode/h5 b/nxml-mode/h5
deleted file mode 100644
index 13a51a170..000000000
--- a/nxml-mode/h5
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <h5>...</h5>
-#group : header
-# --
-<h5>$1</h5>
\ No newline at end of file
diff --git a/nxml-mode/h6 b/nxml-mode/h6
deleted file mode 100644
index b2f0c5544..000000000
--- a/nxml-mode/h6
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <h6>...</h6>
-#group : header
-# --
-<h6>$1</h6>
\ No newline at end of file
diff --git a/nxml-mode/head b/nxml-mode/head
deleted file mode 100644
index 91347b94f..000000000
--- a/nxml-mode/head
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <head>...</head>
-# --
-<head>
-  $0
-</head>
\ No newline at end of file
diff --git a/nxml-mode/hr b/nxml-mode/hr
deleted file mode 100644
index a17e1db80..000000000
--- a/nxml-mode/hr
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <hr />
-# --
-<hr />
diff --git a/nxml-mode/li.class b/nxml-mode/li.class
deleted file mode 100644
index 90f0c6529..000000000
--- a/nxml-mode/li.class
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <li class="...">...</li>
-#group : list
-# --
-<li class="$1">$2</li>
\ No newline at end of file
diff --git a/nxml-mode/ol b/nxml-mode/ol
deleted file mode 100644
index 16cfe8d38..000000000
--- a/nxml-mode/ol
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <ol>...</ol>
-# --
-<ol>
-  $0
-</ol>
\ No newline at end of file
diff --git a/nxml-mode/ol.class b/nxml-mode/ol.class
deleted file mode 100644
index b091f0804..000000000
--- a/nxml-mode/ol.class
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <ol class="...">...</ol>
-#group : list
-# --
-<ol class="$1">
-  $0
-</ol>
\ No newline at end of file
diff --git a/nxml-mode/ol.id b/nxml-mode/ol.id
deleted file mode 100644
index 13c7c060b..000000000
--- a/nxml-mode/ol.id
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <ol id="...">...</ol>
-#group : list
-# --
-<ol id="$1">
-  $0
-</ol>
\ No newline at end of file
diff --git a/nxml-mode/p b/nxml-mode/p
deleted file mode 100644
index 6845ba5a9..000000000
--- a/nxml-mode/p
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <p>...</p>
-# --
-<p>$1</p>
\ No newline at end of file
diff --git a/nxml-mode/pre b/nxml-mode/pre
deleted file mode 100644
index d70b72240..000000000
--- a/nxml-mode/pre
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <pre>...</pre>
-# --
-<pre>
-  $0
-</pre>
\ No newline at end of file
diff --git a/nxml-mode/span b/nxml-mode/span
deleted file mode 100644
index a0bba2a58..000000000
--- a/nxml-mode/span
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <span>...</span>
-# --
-<span>$1</span>
\ No newline at end of file
diff --git a/nxml-mode/span.class b/nxml-mode/span.class
deleted file mode 100644
index 2d5ee5523..000000000
--- a/nxml-mode/span.class
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <span class="...">...</span>
-# --
-<span class="$1">$2</span>
\ No newline at end of file
diff --git a/nxml-mode/span.id b/nxml-mode/span.id
deleted file mode 100644
index 30a81bc35..000000000
--- a/nxml-mode/span.id
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <span id="...">...</span>
-# --
-<span id="$1">$2</span>
\ No newline at end of file
diff --git a/nxml-mode/table b/nxml-mode/table
deleted file mode 100644
index 03fd119e8..000000000
--- a/nxml-mode/table
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <table>...</table>
-# --
-<table>
-  $0
-</table>
\ No newline at end of file
diff --git a/nxml-mode/tag.1l b/nxml-mode/tag
similarity index 92%
rename from nxml-mode/tag.1l
rename to nxml-mode/tag
index 8988635b0..7c6a7661e 100644
--- a/nxml-mode/tag.1l
+++ b/nxml-mode/tag
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <tag>...</tag>
+#key: t
 # --
 <${1:tag}>$2</$1>$0
\ No newline at end of file
diff --git a/nxml-mode/li b/nxml-mode/tag_closing
similarity index 61%
rename from nxml-mode/li
rename to nxml-mode/tag_closing
index c952682f0..dcf552311 100644
--- a/nxml-mode/li
+++ b/nxml-mode/tag_closing
@@ -1,4 +1,5 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <li>...</li>
-# --
-<li>$1</li>
\ No newline at end of file
+#contributor : Anders Bach Nielsen <abachn@abachn.net>
+#name : <tag.../>
+#key: t
+# --
+<$1 $2 />$0
\ No newline at end of file
diff --git a/nxml-mode/tag.2l b/nxml-mode/tag_newline
similarity index 92%
rename from nxml-mode/tag.2l
rename to nxml-mode/tag_newline
index 08b4a26a2..a1e1260a0 100644
--- a/nxml-mode/tag.2l
+++ b/nxml-mode/tag_newline
@@ -1,5 +1,6 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <tag> \n...\n</tag>
+#key: tn
 # --
 <${1:tag}>
   $2
diff --git a/nxml-mode/td b/nxml-mode/td
deleted file mode 100644
index f4615a7e9..000000000
--- a/nxml-mode/td
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <td>...</td>
-# --
-<td$1>$2</td>
\ No newline at end of file
diff --git a/nxml-mode/th b/nxml-mode/th
deleted file mode 100644
index d988b20ff..000000000
--- a/nxml-mode/th
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <th>...</th>
-# --
-<th$1>$2</th>
\ No newline at end of file
diff --git a/nxml-mode/title b/nxml-mode/title
deleted file mode 100644
index 7cd238aff..000000000
--- a/nxml-mode/title
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <title>...</title>
-# --
-<title>$1</title>
\ No newline at end of file
diff --git a/nxml-mode/tr b/nxml-mode/tr
deleted file mode 100644
index c72daf217..000000000
--- a/nxml-mode/tr
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <tr>...</tr>
-# --
-<tr>
-  $0
-</tr>
\ No newline at end of file
diff --git a/nxml-mode/ul b/nxml-mode/ul
deleted file mode 100644
index dac5a66a5..000000000
--- a/nxml-mode/ul
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Anders Bach Nielsen <abachn@abachn.net>
-#name : <ul>...</ul>
-# --
-<ul>
-  $0
-</ul>
\ No newline at end of file
diff --git a/nxml-mode/ul.class b/nxml-mode/ul.class
deleted file mode 100644
index c1e3e91fa..000000000
--- a/nxml-mode/ul.class
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <ul class="...">...</ul>
-#group : list
-# --
-<ul class="$1">
-  $0
-</ul>
\ No newline at end of file
diff --git a/nxml-mode/ul.id b/nxml-mode/ul.id
deleted file mode 100644
index ababf376e..000000000
--- a/nxml-mode/ul.id
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <ul id="...">...</ul>
-#group : list
-# --
-<ul id="$1">
-  $0
-</ul>
\ No newline at end of file