diff --git a/core/core-auto-insert.el b/core/core-auto-insert.el
index 5bf78c1dc..ebf86fade 100644
--- a/core/core-auto-insert.el
+++ b/core/core-auto-insert.el
@@ -20,8 +20,45 @@
   (add-template! "\\.\\(cc\\|cpp\\)$"              "@@.cpp"           'c++-mode)
   (add-template! "\\.c$"                           "@@.c"             'c-mode)
 
-  ;; Shell scripts
-  (add-template! "\\.z?sh$"                        "@@"               'sh-mode)
+  ;; Elisp
+  (add-template! "\\.emacs\\.d/.+\\.el$"           "@@initfile"       'emacs-lisp-mode)
+  (add-template! "\\.emacs\\.d/private/\\(snippets\\|templates\\)/.+$" "@@" 'snippet-mode)
+
+  ;; Go
+  (add-template! "/main\\.go$"                     "@@main.go"        'go-mode t)
+  (add-template! "\\.go$"                          "@@.go"            'go-mode)
+
+  ;; HTML
+  (add-template! "\\.html$"                        "@@.html"          'web-mode)
+
+  ;; Java
+  (add-template! "/src/.+/.+\\.java$"              "@@"               'java-mode)
+  (add-template! "/main\\.java$"                   "@@main"           'java-mode)
+  (add-template! "/build\\.gradle$"                "@@build.gradle"   'android-mode)
+
+  ;; Javascript
+  (add-template! "\\.lbaction/.+/Info.plist$"                       "@@Info.plst"  'lb6-mode)
+  (add-template! "\\.lbaction/.+/\\(default\\|suggestions\\)\\.js$" "@@default.js" 'lb6-mode)
+  (add-template! "/package\\.json$"                "@@package.json"   'json-mode)
+  (add-template! "\\.\\(json\\|jshintrc\\)$"       "@@"               'json-mode)
+
+  ;; Lua
+  (add-template! "/main\\.lua$"                    "@@main.lua"       'love-mode)
+  (add-template! "/conf\\.lua$"                    "@@conf.lua"       'love-mode)
+
+  ;; Markdown
+  (add-template! "\\.md$"                          "@@"               'markdown-mode)
+  (add-template! "/_posts/.+\\.md$"                "@@jekyll-post"    'markdown-mode)
+  (add-template! "/_layouts/.+\\.html$"            "@@jekyll-layout.html" 'web-mode)
+
+  ;; PHP
+  (add-template! "\\.class\\.php$"                 "@@.class.php"     'php-mode)
+  (add-template! "\\.php$"                         "@@"               'php-mode)
+
+  ;; Python
+  ;; (add-template! "tests?/test_.+\\.py$"         "@@"               'nose-mode)
+  ;; (add-template! "/setup\\.py$"                 "@@setup.py"       'python-mode)
+  (add-template! "\\.py$"                          "@@"               'python-mode)
 
   ;; Ruby
   (add-template! "/\\.rspec$"                      "@@.rspec"         'rspec-mode)
@@ -33,46 +70,18 @@
   (add-template! "/lib/.+\\.rb$"                   "@@module"         'enh-ruby-mode t)
   (add-template! "\\.rb$"                          "@@"               'enh-ruby-mode)
 
-  ;; Python
-  ;; (add-template! "tests?/test_.+\\.py$"         "@@"               'nose-mode)
-  ;; (add-template! "/setup\\.py$"                 "@@setup.py"       'python-mode)
-  (add-template! "\\.py$"                          "@@"               'python-mode)
-
-  ;; PHP
-  (add-template! "\\.class\\.php$"                 "@@.class.php"     'php-mode)
-  (add-template! "\\.php$"                         "@@"               'php-mode)
-
-  ;; Markdown
-  (add-template! "\\.md$"                          "@@"               'markdown-mode)
-  (add-template! "/_posts/.+\\.md$"                "@@jekyll-post"    'markdown-mode)
-  (add-template! "/_layouts/.+\\.html$"            "@@jekyll-layout.html" 'web-mode)
-
-  ;; Javascript
-  (add-template! "\\.lbaction/.+/Info.plist$"                       "@@Info.plst"  'lb6-mode)
-  (add-template! "\\.lbaction/.+/\\(default\\|suggestions\\)\\.js$" "@@default.js" 'lb6-mode)
-  (add-template! "/package\\.json$"                "@@package.json"   'json-mode)
-  (add-template! "\\.\\(json\\|jshintrc\\)$"       "@@"               'json-mode)
+  ;; Rust
+  (add-template! "/Cargo.toml$"                    "@@Cargo.toml"     'rust-mode)
+  (add-template! "/main\\.rs$"                     "@@main.rs"        'rust-mode)
 
   ;; SCSS
   (add-template! "/master\\.scss$"                 "@@master.scss"    'scss-mode)
   (add-template! "/normalize\\.scss$"              "@@normalize.scss" 'scss-mode)
   (add-template! "\\.scss$"                        "@@"               'scss-mode)
 
-  ;; HTML
-  (add-template! "\\.html$"                        "@@.html"          'web-mode)
-
-  ;; Lua
-  (add-template! "/main\\.lua$"                    "@@main.lua"       'love-mode)
-  (add-template! "/conf\\.lua$"                    "@@conf.lua"       'love-mode)
-
-  ;; Java
-  (add-template! "/src/.+/.+\\.java$"              "@@"               'java-mode)
-  (add-template! "/main\\.java$"                   "@@main"           'java-mode)
-  (add-template! "/build\\.gradle$"                "@@build.gradle"   'android-mode)
-
-  ;; Elisp
-  (add-template! "\\.emacs\\.d/.+\\.el$"           "@@initfile"       'emacs-lisp-mode)
-  (add-template! "\\.emacs\\.d/snippets/.+$"       "@@"               'snippet-mode))
+  ;; Shell scripts
+  (add-template! "\\.z?sh$"                        "@@"               'sh-mode)
+  )
 
 (provide 'core-auto-insert)
 ;;; core-auto-insert.el ends here
diff --git a/private/templates/go-mode/@@.go b/private/templates/go-mode/@@.go
new file mode 100644
index 000000000..c37b75869
--- /dev/null
+++ b/private/templates/go-mode/@@.go
@@ -0,0 +1,7 @@
+package ${1:main}
+
+import (
+   "fmt"
+)
+
+$0
\ No newline at end of file
diff --git a/private/templates/go-mode/@@main.go b/private/templates/go-mode/@@main.go
new file mode 100644
index 000000000..9aacb3440
--- /dev/null
+++ b/private/templates/go-mode/@@main.go
@@ -0,0 +1,9 @@
+package ${1:main}
+
+import (
+   "fmt"
+)
+
+func main() {
+     $0
+}
\ No newline at end of file