diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_0 only.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_0 only.yasnippet
index 8064cb3..8bd737b 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_0 only.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_0 only.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer 5.0 only
+## condition: "text.html"
 # --
 <!--[if IE 5.0]>${1:${TM_SELECTED_TEXT:   IE Conditional Comment: Internet Explorer 5.0 only }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_5 only.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_5 only.yasnippet
index 8603cae..a5afa6e 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_5 only.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_5 only.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer 5.5 only
+## condition: "text.html"
 # --
 <!--[if IE 5.5000]>${1:${TM_SELECTED_TEXT:   IE Conditional Comment: Internet Explorer 5.5 only }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_x.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_x.yasnippet
index 0b38eac..17e31d6 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_x.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 5_x.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer 5.x
+## condition: "text.html"
 # --
 <!--[if lt IE 6]>${1:${TM_SELECTED_TEXT:  IE Conditional Comment: Internet Explorer 5.x      }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 and below.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 and below.yasnippet
index 655bc71..23dd74e 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 and below.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 and below.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer 6 and below
+## condition: "text.html"
 # --
 <!--[if lte IE 6]>${1:${TM_SELECTED_TEXT: IE Conditional Comment: Internet Explorer 6 and below }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 only.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 only.yasnippet
index d527e52..b35dff4 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 only.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 6 only.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer 6 only
+## condition: "text.html"
 # --
 <!--[if IE 6]>${1:${TM_SELECTED_TEXT:     IE Conditional Comment: Internet Explorer 6 only   }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 7+.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 7+.yasnippet
index fa28ca4..2e82875 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 7+.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer 7+.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer 7 and above
+## condition: "text.html"
 # --
 <!--[if gte IE 7]>${1:${TM_SELECTED_TEXT: IE Conditional Comment: Internet Explorer 7 and above }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer.yasnippet
index 6ef4da3..dcb89cd 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: Internet Explorer.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: Internet Explorer
+## condition: "text.html"
 # --
 <!--[if IE]>${1:${TM_SELECTED_TEXT:       IE Conditional Comment: Internet Explorer          }}<![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: NOT Internet Explorer.yasnippet b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: NOT Internet Explorer.yasnippet
index b3a1d12..fc12208 100644
--- a/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: NOT Internet Explorer.yasnippet	
+++ b/extras/imported/html-mode/Conditional Comments/IE Conditional Comment: NOT Internet Explorer.yasnippet	
@@ -2,5 +2,6 @@
 # key: !
 # contributor: Translated from TextMate Snippet
 # name: IE Conditional Comment: NOT Internet Explorer
+## condition: "text.html"
 # --
 <!--[if !IE]><!-->${1:${TM_SELECTED_TEXT:  IE Conditional Comment: NOT Internet Explorer      }}<!-- <![endif]-->$0
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Arrow (arrow).yasnippet b/extras/imported/html-mode/Entities/Arrow (arrow).yasnippet
index c17107d..81134f1 100644
--- a/extras/imported/html-mode/Entities/Arrow (arrow).yasnippet	
+++ b/extras/imported/html-mode/Entities/Arrow (arrow).yasnippet	
@@ -2,5 +2,6 @@
 # key: arrow
 # contributor: Translated from TextMate Snippet
 # name: →
+## condition: "text.html"
 # --
 &#x2192;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Backspace (backspace).yasnippet b/extras/imported/html-mode/Entities/Backspace (backspace).yasnippet
index 9cd9da8..0a9838c 100644
--- a/extras/imported/html-mode/Entities/Backspace (backspace).yasnippet	
+++ b/extras/imported/html-mode/Entities/Backspace (backspace).yasnippet	
@@ -2,5 +2,6 @@
 # key: backspace
 # contributor: Translated from TextMate Snippet
 # name: ⌫
+## condition: "text.html"
 # --
 &#x232B;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Backtab (backtab).yasnippet b/extras/imported/html-mode/Entities/Backtab (backtab).yasnippet
index abb36dd..5924578 100644
--- a/extras/imported/html-mode/Entities/Backtab (backtab).yasnippet	
+++ b/extras/imported/html-mode/Entities/Backtab (backtab).yasnippet	
@@ -2,5 +2,6 @@
 # key: backtab
 # contributor: Translated from TextMate Snippet
 # name: ⇤
+## condition: "text.html"
 # --
 &#x21E4;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Command (command).yasnippet b/extras/imported/html-mode/Entities/Command (command).yasnippet
index 7eea1de..3b63c10 100644
--- a/extras/imported/html-mode/Entities/Command (command).yasnippet	
+++ b/extras/imported/html-mode/Entities/Command (command).yasnippet	
@@ -2,5 +2,6 @@
 # key: command
 # contributor: Translated from TextMate Snippet
 # name: ⌘
+## condition: "text.html"
 # --
 &#x2318;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Control (control).yasnippet b/extras/imported/html-mode/Entities/Control (control).yasnippet
index f93699d..18694c2 100644
--- a/extras/imported/html-mode/Entities/Control (control).yasnippet	
+++ b/extras/imported/html-mode/Entities/Control (control).yasnippet	
@@ -2,5 +2,6 @@
 # key: control
 # contributor: Translated from TextMate Snippet
 # name: ⌃
+## condition: "text.html"
 # --
 &#x2303;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Delete (delete).yasnippet b/extras/imported/html-mode/Entities/Delete (delete).yasnippet
index 3f593cb..af7f1fa 100644
--- a/extras/imported/html-mode/Entities/Delete (delete).yasnippet	
+++ b/extras/imported/html-mode/Entities/Delete (delete).yasnippet	
@@ -2,5 +2,6 @@
 # key: delete
 # contributor: Translated from TextMate Snippet
 # name: ⌦
+## condition: "text.html"
 # --
 &#x2326;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Down (down).yasnippet b/extras/imported/html-mode/Entities/Down (down).yasnippet
index a41c942..c076e92 100644
--- a/extras/imported/html-mode/Entities/Down (down).yasnippet	
+++ b/extras/imported/html-mode/Entities/Down (down).yasnippet	
@@ -2,5 +2,6 @@
 # key: down
 # contributor: Translated from TextMate Snippet
 # name: ↓
+## condition: "text.html"
 # --
 &#x2193;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Enter (enter).yasnippet b/extras/imported/html-mode/Entities/Enter (enter).yasnippet
index 42f7dc8..66c87bf 100644
--- a/extras/imported/html-mode/Entities/Enter (enter).yasnippet	
+++ b/extras/imported/html-mode/Entities/Enter (enter).yasnippet	
@@ -2,5 +2,6 @@
 # key: enter
 # contributor: Translated from TextMate Snippet
 # name: ⌅
+## condition: "text.html"
 # --
 &#x2305;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Escape (escape).yasnippet b/extras/imported/html-mode/Entities/Escape (escape).yasnippet
index a0dc7ad..34bb6fd 100644
--- a/extras/imported/html-mode/Entities/Escape (escape).yasnippet	
+++ b/extras/imported/html-mode/Entities/Escape (escape).yasnippet	
@@ -2,5 +2,6 @@
 # key: escape
 # contributor: Translated from TextMate Snippet
 # name: ⎋
+## condition: "text.html"
 # --
 &#x238B;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Left (left).yasnippet b/extras/imported/html-mode/Entities/Left (left).yasnippet
index 952b26b..51b4b22 100644
--- a/extras/imported/html-mode/Entities/Left (left).yasnippet	
+++ b/extras/imported/html-mode/Entities/Left (left).yasnippet	
@@ -2,5 +2,6 @@
 # key: left
 # contributor: Translated from TextMate Snippet
 # name: ←
+## condition: "text.html"
 # --
 &#x2190;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Option (option).yasnippet b/extras/imported/html-mode/Entities/Option (option).yasnippet
index ac932c9..df15448 100644
--- a/extras/imported/html-mode/Entities/Option (option).yasnippet	
+++ b/extras/imported/html-mode/Entities/Option (option).yasnippet	
@@ -2,5 +2,6 @@
 # key: option
 # contributor: Translated from TextMate Snippet
 # name: ⌥
+## condition: "text.html"
 # --
 &#x2325;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Return (return).yasnippet b/extras/imported/html-mode/Entities/Return (return).yasnippet
index 6720b2c..99eb9c7 100644
--- a/extras/imported/html-mode/Entities/Return (return).yasnippet	
+++ b/extras/imported/html-mode/Entities/Return (return).yasnippet	
@@ -2,5 +2,6 @@
 # key: return
 # contributor: Translated from TextMate Snippet
 # name: ↩
+## condition: "text.html"
 # --
 &#x21A9;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Right (right).yasnippet b/extras/imported/html-mode/Entities/Right (right).yasnippet
index 390dd03..c849ea5 100644
--- a/extras/imported/html-mode/Entities/Right (right).yasnippet	
+++ b/extras/imported/html-mode/Entities/Right (right).yasnippet	
@@ -2,5 +2,6 @@
 # key: right
 # contributor: Translated from TextMate Snippet
 # name: →
+## condition: "text.html"
 # --
 &#x2192;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Shift (shift).yasnippet b/extras/imported/html-mode/Entities/Shift (shift).yasnippet
index 4a6a679..0dab354 100644
--- a/extras/imported/html-mode/Entities/Shift (shift).yasnippet	
+++ b/extras/imported/html-mode/Entities/Shift (shift).yasnippet	
@@ -2,5 +2,6 @@
 # key: shift
 # contributor: Translated from TextMate Snippet
 # name: ⇧
+## condition: "text.html"
 # --
 &#x21E7;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Tab (tab).yasnippet b/extras/imported/html-mode/Entities/Tab (tab).yasnippet
index 5372cfa..5c952b2 100644
--- a/extras/imported/html-mode/Entities/Tab (tab).yasnippet	
+++ b/extras/imported/html-mode/Entities/Tab (tab).yasnippet	
@@ -2,5 +2,6 @@
 # key: tab
 # contributor: Translated from TextMate Snippet
 # name: ⇥
+## condition: "text.html"
 # --
 &#x21E5;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/Up (up).yasnippet b/extras/imported/html-mode/Entities/Up (up).yasnippet
index eddc205..32a0055 100644
--- a/extras/imported/html-mode/Entities/Up (up).yasnippet	
+++ b/extras/imported/html-mode/Entities/Up (up).yasnippet	
@@ -2,5 +2,6 @@
 # key: up
 # contributor: Translated from TextMate Snippet
 # name: ↑
+## condition: "text.html"
 # --
 &#x2191;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Entities/XHTML &nbsp; NonBreakingSpace.yasnippet b/extras/imported/html-mode/Entities/XHTML &nbsp; NonBreakingSpace.yasnippet
index 3f98dfc..d331dff 100644
--- a/extras/imported/html-mode/Entities/XHTML &nbsp; NonBreakingSpace.yasnippet	
+++ b/extras/imported/html-mode/Entities/XHTML &nbsp; NonBreakingSpace.yasnippet	
@@ -1,6 +1,7 @@
 # -*- mode: snippet -*-
 # contributor: Translated from TextMate Snippet
 # name: Non-Breaking Space
-# binding: "~ "
+## binding: "~ "
+## condition: "text.html"
 # --
 &nbsp;
\ No newline at end of file
diff --git a/extras/imported/html-mode/Format/Emphasize.yasnippet b/extras/imported/html-mode/Format/Emphasize.yasnippet
index 83f2955..a32a4b7 100644
--- a/extras/imported/html-mode/Format/Emphasize.yasnippet
+++ b/extras/imported/html-mode/Format/Emphasize.yasnippet
@@ -1,6 +1,7 @@
 # -*- mode: snippet -*-
 # contributor: Translated from TextMate Snippet
 # name: Emphasize
-# binding: "@i"
+# binding: "A-i"
+## condition: "text.html"
 # --
-${0:${TM_SELECTED_TEXT/\A<em>(.*)<\/em>\z|.*/(?1:$1:<em>$0<\/em>)/m}}
\ No newline at end of file
+(yas/html-wrap-selection-if-not-wrapped-already "em")
diff --git a/extras/imported/html-mode/Format/Strong.yasnippet b/extras/imported/html-mode/Format/Strong.yasnippet
index ae3c561..1811554 100644
--- a/extras/imported/html-mode/Format/Strong.yasnippet
+++ b/extras/imported/html-mode/Format/Strong.yasnippet
@@ -1,6 +1,8 @@
 # -*- mode: snippet -*-
+# type: command
 # contributor: Translated from TextMate Snippet
 # name: Strong
-# binding: "@b"
+# binding: "A-b"
+## condition: "text.html"
 # --
-${0:${TM_SELECTED_TEXT/\A<strong>(.*)<\/strong>\z|.*/(?1:$1:<strong>$0<\/strong>)/m}}
\ No newline at end of file
+(yas/html-wrap-selection-if-not-wrapped-already "strong")
diff --git a/extras/imported/html-mode/Insert DocType/DocType HTML 4.0 Strict.yasnippet b/extras/imported/html-mode/Insert DocType/DocType HTML 4.0 Strict.yasnippet
index 96ea8d0..3627764 100644
--- a/extras/imported/html-mode/Insert DocType/DocType HTML 4.0 Strict.yasnippet	
+++ b/extras/imported/html-mode/Insert DocType/DocType HTML 4.0 Strict.yasnippet	
@@ -2,6 +2,7 @@
 # key: doctype
 # contributor: Translated from TextMate Snippet
 # name: HTML — 4.01 Strict
+## condition: "text.html"
 # --
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 	"http://www.w3.org/TR/html4/strict.dtd">
diff --git a/extras/imported/html-mode/Insert DocType/DocType XHTL 1.0 Frameset.yasnippet b/extras/imported/html-mode/Insert DocType/DocType XHTL 1.0 Frameset.yasnippet
index 6e60da5..587b5eb 100644
--- a/extras/imported/html-mode/Insert DocType/DocType XHTL 1.0 Frameset.yasnippet	
+++ b/extras/imported/html-mode/Insert DocType/DocType XHTL 1.0 Frameset.yasnippet	
@@ -2,6 +2,7 @@
 # key: doctype
 # contributor: Translated from TextMate Snippet
 # name: XHTML — 1.0 Frameset
+## condition: "text.html"
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
diff --git a/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Strict.yasnippet b/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Strict.yasnippet
index 4f13fe1..d31abf7 100644
--- a/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Strict.yasnippet	
+++ b/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Strict.yasnippet	
@@ -2,6 +2,7 @@
 # key: doctype
 # contributor: Translated from TextMate Snippet
 # name: XHTML — 1.0 Strict
+## condition: "text.html"
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Transitional.yasnippet b/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Transitional.yasnippet
index e1c658a..8be5ccc 100644
--- a/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Transitional.yasnippet	
+++ b/extras/imported/html-mode/Insert DocType/DocType XHTML 1.0 Transitional.yasnippet	
@@ -2,6 +2,7 @@
 # key: doctype
 # contributor: Translated from TextMate Snippet
 # name: XHTML — 1.0 Transitional
+## condition: "text.html"
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/extras/imported/html-mode/Insert DocType/DocType XHTML 1.1.yasnippet b/extras/imported/html-mode/Insert DocType/DocType XHTML 1.1.yasnippet
index 3fb49ba..379e3c0 100644
--- a/extras/imported/html-mode/Insert DocType/DocType XHTML 1.1.yasnippet	
+++ b/extras/imported/html-mode/Insert DocType/DocType XHTML 1.1.yasnippet	
@@ -2,6 +2,7 @@
 # key: doctype
 # contributor: Translated from TextMate Snippet
 # name: XHTML — 1.1
+## condition: "text.html"
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
diff --git a/extras/imported/html-mode/Insert DocType/HTML — 4.0 Transitional (doctype).yasnippet b/extras/imported/html-mode/Insert DocType/HTML — 4.0 Transitional (doctype).yasnippet
index 6e16083..d8e7f41 100644
--- a/extras/imported/html-mode/Insert DocType/HTML — 4.0 Transitional (doctype).yasnippet	
+++ b/extras/imported/html-mode/Insert DocType/HTML — 4.0 Transitional (doctype).yasnippet	
@@ -2,6 +2,7 @@
 # key: doctype
 # contributor: Translated from TextMate Snippet
 # name: HTML — 4.01 Transitional
+## condition: "text.html"
 # --
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 	"http://www.w3.org/TR/html4/loose.dtd">
diff --git a/extras/imported/html-mode/Insert Tag Pair.yasnippet b/extras/imported/html-mode/Insert Tag Pair.yasnippet
new file mode 100644
index 0000000..c6c43fa
--- /dev/null
+++ b/extras/imported/html-mode/Insert Tag Pair.yasnippet	
@@ -0,0 +1,48 @@
+# -*- mode: snippet -*-
+# type: command
+# contributor: joaotavora, adapted from TextMate HTML bundle, work in progress
+# name: Insert Open/Close Tag (With Current Word)
+# binding: "^<"
+## condition: "text.html,"
+# --
+(let* ((tag yas/selected-text) 
+       (single-no-arg "\\(br\\|hr\\)")
+       (single        "\\(img\\|meta\\|link\\|input\\|base\\|area\\|col\\|frame\\|param\\)"))
+  (cond ((string-match single-no-arg yas/selected-text))))
+# This script will expand the current word into: &lt;word&gt;&lt;/word&gt;
+# It will recognize HTML 4.0 tags that need no close tag.
+#
+# With no current word, it will insert: &lt;p&gt;&lt;/p&gt; and allows you
+# to overwrite the tag name and add potential arguments.
+#
+# The result is inserted as a snippet, so it's
+# possible to tab through the place holders.
+
+# single tags
+single_no_arg = /^(?:br|hr)$/i
+single        = /^(?:img|meta|link|input|base|area|col|frame|param)$/i
+
+# we are not in HTML mode, so let's scrap the above hardcoded tag lists
+unless ENV.has_key? 'TM_HTML_EMPTY_TAGS' then
+  single_no_arg = /(?=not)possible/
+  single        = /(?=not)possible/
+end
+
+# handle the case where caret is in the middle of a word, assume only the left part is the tag
+index = ENV['TM_LINE_INDEX'].to_i - ENV['TM_INPUT_START_LINE_INDEX'].to_i
+tag, suffix = STDIN.read, ''
+if index &lt; tag.length &amp;&amp; !ENV['TM_SELECTED_TEXT']
+  tag, suffix = tag[0...index], tag[index..-1]
+end
+
+xhtml = ENV['TM_XHTML'].to_s
+
+print case tag
+  when single_no_arg then "&lt;#{tag}#{xhtml}&gt;"
+  when single then        "&lt;#{tag} $1#{xhtml}&gt;"
+  when '' then            "&lt;${1:#{ENV['TM_DEFAULT_TAG'] || 'p'}}&gt;$2&lt;/${1/\\s.*//}&gt;"
+  else                    "&lt;#{tag}&gt;$1&lt;/#{tag.strip[/^\S+/]}&gt;"
+end
+
+print suffix
+
diff --git a/extras/imported/html-mode/Insert Tag/Embed QT movie (movie).yasnippet b/extras/imported/html-mode/Insert Tag/Embed QT movie (movie).yasnippet
index 766b1cc..b717869 100644
--- a/extras/imported/html-mode/Insert Tag/Embed QT movie (movie).yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Embed QT movie (movie).yasnippet	
@@ -2,6 +2,7 @@
 # key: movie
 # contributor: Translated from TextMate Snippet
 # name: Embed QT Movie
+## condition: "text.html"
 # --
 <object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab">
 	<param name="src" value="$1"${TM_XHTML}>
diff --git a/extras/imported/html-mode/Insert Tag/Fieldset.yasnippet b/extras/imported/html-mode/Insert Tag/Fieldset.yasnippet
index 0b8ad5b..fb35442 100644
--- a/extras/imported/html-mode/Insert Tag/Fieldset.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Fieldset.yasnippet	
@@ -2,6 +2,7 @@
 # key: fieldset
 # contributor: Translated from TextMate Snippet
 # name: Fieldset
+## condition: "text.html"
 # --
 <fieldset id="${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}" ${2:class="${3:}"}>
 	<legend>${1:`yas/selected-text`}</legend>
diff --git a/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet b/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet
index fecfb2d..4bd61d7 100644
--- a/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet	
@@ -2,5 +2,6 @@
 # key: input
 # contributor: Translated from TextMate Snippet
 # name: Input with Label
+## condition: "text.html"
 # --
 <label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}${TM_XHTML}>
diff --git a/extras/imported/html-mode/Insert Tag/Option.yasnippet b/extras/imported/html-mode/Insert Tag/Option.yasnippet
index aa56d7c..464ed53 100644
--- a/extras/imported/html-mode/Insert Tag/Option.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Option.yasnippet	
@@ -2,5 +2,6 @@
 # key: opt
 # contributor: Translated from TextMate Snippet
 # name: Option
+## condition: "text.html"
 # --
 <option${1: value="${2:option}"}>${3:$2}</option>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/Select Box.yasnippet b/extras/imported/html-mode/Insert Tag/Select Box.yasnippet
index 8a8a204..a68ace7 100644
--- a/extras/imported/html-mode/Insert Tag/Select Box.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Select Box.yasnippet	
@@ -2,6 +2,7 @@
 # key: select
 # contributor: Translated from TextMate Snippet
 # name: Select Box
+## condition: "text.html"
 # --
 <select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
 	<option${9: value="${10:option1}"}>${11:$10}</option>
diff --git a/extras/imported/html-mode/Insert Tag/XHTML   <input>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML   <input>.yasnippet
index ea2b828..8d62d72 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML   <input>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML   <input>.yasnippet	
@@ -2,5 +2,6 @@
 # key: input
 # contributor: Translated from TextMate Snippet
 # name: Input
+## condition: "text.html"
 # --
 <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}${TM_XHTML}>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML   <textarea>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML   <textarea>.yasnippet
index 1477374..2fe47fa 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML   <textarea>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML   <textarea>.yasnippet	
@@ -2,5 +2,6 @@
 # key: textarea
 # contributor: Translated from TextMate Snippet
 # name: Text Area
+## condition: "text.html"
 # --
 <textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <a mailto: >.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <a mailto: >.yasnippet
index f665d30..e3e934f 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <a mailto: >.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <a mailto: >.yasnippet	
@@ -2,5 +2,6 @@
 # key: mailto
 # contributor: Translated from TextMate Snippet
 # name: Mail Anchor
+## condition: "text.html"
 # --
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <base>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <base>.yasnippet
index 3d2d621..8bc9928 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <base>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <base>.yasnippet	
@@ -2,5 +2,6 @@
 # key: base
 # contributor: Translated from TextMate Snippet
 # name: Base
+## condition: "text.html"
 # --
 <base href="$1"${2: target="$3"}${TM_XHTML}>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <body>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <body>.yasnippet
index 46140d0..e538349 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <body>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <body>.yasnippet	
@@ -2,6 +2,7 @@
 # key: body
 # contributor: Translated from TextMate Snippet
 # name: Body
+## condition: "text.html"
 # --
 <body id="${1:${TM_FILENAME/(.*)\..*/\L$1/}}"${2: onload="$3"}>
 	$0
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <br :>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <br :>.yasnippet
index ecfcf3b..017b084 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <br :>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <br :>.yasnippet	
@@ -1,6 +1,7 @@
 # -*- mode: snippet -*-
 # contributor: Translated from TextMate Snippet
 # name: Br
-# binding: "^
"
+## binding: "^
"
+## condition: "text.html"
 # --
 <br${TM_XHTML}>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <div>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <div>.yasnippet
index b17f1e9..2feb9dd 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <div>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <div>.yasnippet	
@@ -2,6 +2,7 @@
 # key: div
 # contributor: Translated from TextMate Snippet
 # name: Div
+## condition: "text.html"
 # --
 <div${1: id="${2:name}"}>
 	`yas/selected-text`$0
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <form>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <form>.yasnippet
index a0ea4f9..6e21f87 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <form>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <form>.yasnippet	
@@ -2,6 +2,7 @@
 # key: form
 # contributor: Translated from TextMate Snippet
 # name: Form
+## condition: "text.html"
 # --
 <form action="${1:${TM_FILENAME/(.*?)\..*/$1_submit/}}" method="${2:get}" accept-charset="utf-8">
 	$0
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <h1>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <h1>.yasnippet
index 9dc778a..9b144da 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <h1>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <h1>.yasnippet	
@@ -2,5 +2,6 @@
 # key: h1
 # contributor: Translated from TextMate Snippet
 # name: Heading
+## condition: "text.html"
 # --
 <h1 id="${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}">${1:`yas/selected-text`}</h1>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <head>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <head>.yasnippet
index 8b632e1..19c1173 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <head>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <head>.yasnippet	
@@ -2,6 +2,7 @@
 # key: head
 # contributor: Translated from TextMate Snippet
 # name: Head
+## condition: "text.html - text.html source"
 # --
 <head>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8"${TM_XHTML}>
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <link>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <link>.yasnippet
index 0777fd0..d2b7b94 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <link>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <link>.yasnippet	
@@ -2,5 +2,6 @@
 # key: link
 # contributor: Translated from TextMate Snippet
 # name: Link
+## condition: "text.html"
 # --
 <link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" title="${4:no title}" charset="${5:utf-8}"${TM_XHTML}>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <meta>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <meta>.yasnippet
index d1cfc97..829355a 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <meta>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <meta>.yasnippet	
@@ -2,5 +2,6 @@
 # key: meta
 # contributor: Translated from TextMate Snippet
 # name: Meta
+## condition: "text.html"
 # --
 <meta name="${1:name}" content="${2:content}"${TM_XHTML}>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <script src...>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <script src...>.yasnippet
index 9723b20..048c817 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <script src...>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <script src...>.yasnippet	
@@ -2,5 +2,6 @@
 # key: scriptsrc
 # contributor: Translated from TextMate Snippet
 # name: Script With External Source
+## condition: "text.html"
 # --
 <script src="$1" type="text/javascript" charset="${3:utf-8}"></script>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <script>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <script>.yasnippet
index cbcffa2..671f9dd 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <script>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <script>.yasnippet	
@@ -2,6 +2,7 @@
 # key: script
 # contributor: Translated from TextMate Snippet
 # name: Script
+## condition: "text.html"
 # --
 <script type="text/javascript" charset="utf-8">
 	$0
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <style>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <style>.yasnippet
index a29ce61..bb4abc7 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <style>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <style>.yasnippet	
@@ -2,6 +2,7 @@
 # key: style
 # contributor: Translated from TextMate Snippet
 # name: Style
+## condition: "text.html"
 # --
 <style type="text/css" media="screen">
 	$0
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <table>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <table>.yasnippet
index 13d9405..d96790f 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <table>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <table>.yasnippet	
@@ -2,6 +2,7 @@
 # key: table
 # contributor: Translated from TextMate Snippet
 # name: Table
+## condition: "text.html"
 # --
 <table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}>
 	<tr><th>${5:Header}</th></tr>
diff --git a/extras/imported/html-mode/Insert Tag/XHTML <title>.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML <title>.yasnippet
index c326549..9b1c5f1 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML <title>.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML <title>.yasnippet	
@@ -2,5 +2,6 @@
 # key: title
 # contributor: Translated from TextMate Snippet
 # name: Title
+## condition: "text.html - text.blog"
 # --
 <title>${1:${TM_FILENAME/((.+)\..*)?/(?2:$2:Page Title)/}}</title>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Smart return:indent for tag pairs.yasnippet b/extras/imported/html-mode/Smart return:indent for tag pairs.yasnippet
index 05a764c..b68a0c3 100644
--- a/extras/imported/html-mode/Smart return:indent for tag pairs.yasnippet	
+++ b/extras/imported/html-mode/Smart return:indent for tag pairs.yasnippet	
@@ -1,7 +1,8 @@
 # -*- mode: snippet -*-
 # contributor: Translated from TextMate Snippet
 # name: Special: Return Inside Empty Open/Close Tags
-# binding: "
"
+## binding: "
"
+## condition: "meta.scope.between-tag-pair"
 # --
 
 	$0
diff --git a/extras/imported/html-mode/Wrap Selection In Tag.yasnippet b/extras/imported/html-mode/Wrap Selection In Tag.yasnippet
index 83a8257..9d3ab77 100644
--- a/extras/imported/html-mode/Wrap Selection In Tag.yasnippet	
+++ b/extras/imported/html-mode/Wrap Selection In Tag.yasnippet	
@@ -1,6 +1,7 @@
 # -*- mode: snippet -*-
 # contributor: Translated from TextMate Snippet
 # name: Wrap Selection in Open/Close Tag
-# binding: "^W"
+## binding: "^W"
+## condition: "text.html,"
 # --
 <${1:p}>`yas/selected-text`</${1/\s.*//}>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Wrap in <?= … ?>.yasnippet b/extras/imported/html-mode/Wrap in <?= … ?>.yasnippet
index 768a6c0..e021ca6 100644
--- a/extras/imported/html-mode/Wrap in <?= … ?>.yasnippet	
+++ b/extras/imported/html-mode/Wrap in <?= … ?>.yasnippet	
@@ -1,5 +1,6 @@
 # -*- mode: snippet -*-
 # contributor: Translated from TextMate Snippet
 # name: Wrap in <?= … ?>
+## condition: "text.html string"
 # --
 <?= `yas/selected-text` ?>
\ No newline at end of file