diff --git a/Go/Snippets/Template/block-end.sublime-snippet b/Go/Snippets/Template/block-end.sublime-snippet
new file mode 100644
index 0000000000..bc5fe9eec2
--- /dev/null
+++ b/Go/Snippets/Template/block-end.sublime-snippet
@@ -0,0 +1,8 @@
+
+
+tblockend
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{block "name"}} ... {{end}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/block.sublime-snippet b/Go/Snippets/Template/block.sublime-snippet
new file mode 100644
index 0000000000..0b66eae942
--- /dev/null
+++ b/Go/Snippets/Template/block.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tblock
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{block "name"}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/break.sublime-snippet b/Go/Snippets/Template/break.sublime-snippet
new file mode 100644
index 0000000000..21ac3f2ada
--- /dev/null
+++ b/Go/Snippets/Template/break.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tbreak
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{break}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/continue.sublime-snippet b/Go/Snippets/Template/continue.sublime-snippet
new file mode 100644
index 0000000000..00462852a4
--- /dev/null
+++ b/Go/Snippets/Template/continue.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tcontinue
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{continue}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/define.sublime-snippet b/Go/Snippets/Template/define.sublime-snippet
new file mode 100644
index 0000000000..c60e4b67a4
--- /dev/null
+++ b/Go/Snippets/Template/define.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tdefine
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{define "name"}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/else if.sublime-snippet b/Go/Snippets/Template/else if.sublime-snippet
new file mode 100644
index 0000000000..e0993fee73
--- /dev/null
+++ b/Go/Snippets/Template/else if.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+telseif
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{else if ...}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/else.sublime-snippet b/Go/Snippets/Template/else.sublime-snippet
new file mode 100644
index 0000000000..b009690b4c
--- /dev/null
+++ b/Go/Snippets/Template/else.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+telse
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{else}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/end.sublime-snippet b/Go/Snippets/Template/end.sublime-snippet
new file mode 100644
index 0000000000..f1d8f4cb07
--- /dev/null
+++ b/Go/Snippets/Template/end.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tend
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{end}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/if-end.sublime-snippet b/Go/Snippets/Template/if-end.sublime-snippet
new file mode 100644
index 0000000000..fadf03e08c
--- /dev/null
+++ b/Go/Snippets/Template/if-end.sublime-snippet
@@ -0,0 +1,8 @@
+
+
+tifend
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{if ...}} ... {{end}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/if.sublime-snippet b/Go/Snippets/Template/if.sublime-snippet
new file mode 100644
index 0000000000..36bf010075
--- /dev/null
+++ b/Go/Snippets/Template/if.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tif
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{if ...}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/partial.sublime-snippet b/Go/Snippets/Template/partial.sublime-snippet
new file mode 100644
index 0000000000..c59164927b
--- /dev/null
+++ b/Go/Snippets/Template/partial.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tpartial
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{partial "name"}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/range-end.sublime-snippet b/Go/Snippets/Template/range-end.sublime-snippet
new file mode 100644
index 0000000000..b362851202
--- /dev/null
+++ b/Go/Snippets/Template/range-end.sublime-snippet
@@ -0,0 +1,8 @@
+
+
+trangeend
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{range ...}}...{{end}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/range.sublime-snippet b/Go/Snippets/Template/range.sublime-snippet
new file mode 100644
index 0000000000..79ef06b976
--- /dev/null
+++ b/Go/Snippets/Template/range.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+trange
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{range ...}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/template.sublime-snippet b/Go/Snippets/Template/template.sublime-snippet
new file mode 100644
index 0000000000..536d659c89
--- /dev/null
+++ b/Go/Snippets/Template/template.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+ttemplate
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{template "name" .}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/var.sublime-snippet b/Go/Snippets/Template/var.sublime-snippet
new file mode 100644
index 0000000000..f083a8069b
--- /dev/null
+++ b/Go/Snippets/Template/var.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+tvar
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{.Var}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/with-end.sublime-snippet b/Go/Snippets/Template/with-end.sublime-snippet
new file mode 100644
index 0000000000..69de8515b0
--- /dev/null
+++ b/Go/Snippets/Template/with-end.sublime-snippet
@@ -0,0 +1,8 @@
+
+
+twithend
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{with ...}}...{{end}}
+
\ No newline at end of file
diff --git a/Go/Snippets/Template/with.sublime-snippet b/Go/Snippets/Template/with.sublime-snippet
new file mode 100644
index 0000000000..5857184b14
--- /dev/null
+++ b/Go/Snippets/Template/with.sublime-snippet
@@ -0,0 +1,6 @@
+
+
+twith
+(text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+{{with ...}}
+
\ No newline at end of file
diff --git a/Go/Template.tmPreferences b/Go/Template.tmPreferences
new file mode 100644
index 0000000000..c79768c9b6
--- /dev/null
+++ b/Go/Template.tmPreferences
@@ -0,0 +1,33 @@
+
+
+
+
+ scope
+ (text.html.go | text.html.markdown.go | source.css.go | source.js.go | source.go string) - source.go.template
+ settings
+
+ shellVariables
+
+
+ name
+ TM_TEMPLATE_START
+ value
+
+
+
+ name
+ TM_TEMPLATE_END
+ value
+
+
+
+
+
+