From fc0d1791988d0bbbd5e7d96dc390aca06f81f37a Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Fri, 20 Dec 2024 13:58:32 +0100
Subject: [PATCH] Refactor snippets

Fixes #1524

This commit...

1. replaces `biblatex_snippet_completions` module by default ST3+ snippets
   as there's no obvious reason for providing default snippets by a plugin.

2. organizes all existing *.sublime-snippets in snippets/ sub directory

3. converts various *.sublime-completions files to *.sublime-snippet format
   to recover ST3 behavior in ST4. That's required because ST4 drops completions
   of which trigger perfectly matches user input in order to ensure real
   snippets always take precedence.

   Snippets to cycle through various tags via tab key have been removed as they
   may cause confusion when triggered directly (fixes #1555).

   Snippets are generally named by their trigger. Those, which differ only by
   case are suffixed with `_upr` to support case-insensitive filesystems.

Notes:
1. line breaks in scope tag require ST3176+.
2. if no prefix is typed, completion panel shows entries only as of ST4.
---
 Beamer.sublime-completions                    |   2 +-
 Default (Linux).sublime-keymap                |  41 +++---
 Default (OSX).sublime-keymap                  |  41 +++---
 Default (Windows).sublime-keymap              |  41 +++---
 LaTeX math.sublime-completions                | 123 ------------------
 LaTeX.sublime-completions                     |  33 -----
 Math boldface.sublime-snippet                 |   5 -
 Text boldface.sublime-snippet                 |   5 -
 Text emphasize.sublime-snippet                |   5 -
 Text monospace.sublime-snippet                |   5 -
 Text slanted.sublime-snippet                  |   5 -
 Text underline.sublime-snippet                |   5 -
 latextools/biblatex_snippet_completions.py    |  75 -----------
 plugin.py                                     |   3 -
 .../Insert environment.sublime-snippet        |   0
 .../Wrap in command.sublime-snippet           |  10 +-
 .../Wrap in environment.sublime-snippet       |  16 +--
 .../article.sublime-snippet}                  |   2 +-
 .../artwork.sublime-snippet}                  |   2 +-
 .../audio.sublime-snippet}                    |   2 +-
 .../book.sublime-snippet}                     |   2 +-
 .../bookinbook.sublime-snippet}               |   2 +-
 .../booklet.sublime-snippet}                  |   2 +-
 .../collection.sublime-snippet}               |   2 +-
 .../conference.sublime-snippet}               |   2 +-
 .../electronic.sublime-snippet}               |   2 +-
 .../inbook.sublime-snippet}                   |   2 +-
 .../incollection.sublime-snippet}             |   2 +-
 .../inproceedings.sublime-snippet}            |   2 +-
 .../inreference.sublime-snippet}              |   2 +-
 .../manual.sublime-snippet}                   |   2 +-
 .../mastersthesis.sublime-snippet}            |   2 +-
 .../misc.sublime-snippet}                     |   2 +-
 .../movie.sublime-snippet}                    |   2 +-
 .../music.sublime-snippet}                    |   2 +-
 .../mvbook.sublime-snippet}                   |   2 +-
 .../mvcollection.sublime-snippet}             |   2 +-
 .../mvproceedings.sublime-snippet}            |   2 +-
 .../mvreference.sublime-snippet}              |   2 +-
 .../online.sublime-snippet}                   |   2 +-
 .../patent.sublime-snippet}                   |   2 +-
 .../periodical.sublime-snippet}               |   2 +-
 .../phdthesis.sublime-snippet}                |   2 +-
 .../proceedings.sublime-snippet}              |   2 +-
 .../reference.sublime-snippet}                |   2 +-
 .../report.sublime-snippet}                   |   2 +-
 .../set.sublime-snippet}                      |   2 +-
 .../suppbook.sublime-snippet}                 |   2 +-
 .../suppcollection.sublime-snippet}           |   2 +-
 .../suppperiodical.sublime-snippet}           |   2 +-
 .../techreport.sublime-snippet}               |   2 +-
 .../thesis.sublime-snippet}                   |   2 +-
 .../unpublished.sublime-snippet}              |   2 +-
 .../video.sublime-snippet}                    |   2 +-
 .../www.sublime-snippet}                      |   2 +-
 .../xdata.sublime-snippet}                    |   2 +-
 .../article.sublime-snippet}                  |   2 +-
 .../book.sublime-snippet}                     |   2 +-
 .../booklet.sublime-snippet}                  |   2 +-
 .../conference.sublime-snippet}               |   2 +-
 .../inbook.sublime-snippet}                   |   2 +-
 .../incollection.sublime-snippet}             |   2 +-
 .../inproceedings.sublime-snippet}            |   2 +-
 .../manual.sublime-snippet}                   |   2 +-
 .../mastersthesis.sublime-snippet}            |   2 +-
 .../misc.sublime-snippet}                     |   2 +-
 .../phdthesis.sublime-snippet}                |   2 +-
 .../proceedings.sublime-snippet}              |   2 +-
 .../techreport.sublime-snippet}               |   2 +-
 .../unpublished.sublime-snippet}              |   2 +-
 snippets/latex/baa.sublime-snippet            |   9 ++
 snippets/latex/baan.sublime-snippet           |   9 ++
 snippets/latex/bal.sublime-snippet            |   9 ++
 snippets/latex/baln.sublime-snippet           |   9 ++
 snippets/latex/ben.sublime-snippet            |   9 ++
 snippets/latex/beqn.sublime-snippet           |   9 ++
 snippets/latex/bf.sublime-snippet             |   6 +
 snippets/latex/bfl.sublime-snippet            |   9 ++
 snippets/latex/bfln.sublime-snippet           |   9 ++
 snippets/latex/bga.sublime-snippet            |   9 ++
 snippets/latex/bgan.sublime-snippet           |   9 ++
 snippets/latex/bit.sublime-snippet            |   9 ++
 snippets/latex/bml.sublime-snippet            |   9 ++
 snippets/latex/bmln.sublime-snippet           |   9 ++
 .../latex/box.sublime-snippet                 |   2 +-
 snippets/latex/bs.sublime-snippet             |   6 +
 .../latex/btable.sublime-snippet              |   2 +-
 snippets/latex/em.sublime-snippet             |   6 +
 .../latex/figure.sublime-snippet              |   2 +-
 .../latex/frame.sublime-snippet               |   2 +-
 snippets/latex/i.sublime-snippet              |   6 +
 snippets/latex/it.sublime-snippet             |   6 +
 snippets/latex/ms.sublime-snippet             |   6 +
 .../latex/rem.sublime-snippet                 |   2 +-
 snippets/latex/sf.sublime-snippet             |   6 +
 snippets/latex/sl.sublime-snippet             |   6 +
 snippets/latex/ss.sublime-snippet             |   6 +
 snippets/latex/tt.sublime-snippet             |   6 +
 snippets/latex/un.sublime-snippet             |   6 +
 snippets/latex/use.sublime-snippet            |   6 +
 snippets/math/0.sublime-snippet               |   6 +
 snippets/math/D_upr.sublime-snippet           |   6 +
 snippets/math/E_upr.sublime-snippet           |   6 +
 snippets/math/F_upr.sublime-snippet           |   6 +
 snippets/math/G_upr.sublime-snippet           |   6 +
 snippets/math/L_upr.sublime-snippet           |   6 +
 snippets/math/Lar_upr.sublime-snippet         |   6 +
 snippets/math/Lr_upr.sublime-snippet          |   6 +
 snippets/math/P_upr.sublime-snippet           |   6 +
 snippets/math/Q_upr.sublime-snippet           |   6 +
 snippets/math/Rar_upr.sublime-snippet         |   6 +
 snippets/math/S_upr.sublime-snippet           |   6 +
 snippets/math/V_upr.sublime-snippet           |   6 +
 snippets/math/W_upr.sublime-snippet           |   6 +
 snippets/math/X_upr.sublime-snippet           |   6 +
 snippets/math/Y_upr.sublime-snippet           |   6 +
 snippets/math/a.sublime-snippet               |   6 +
 snippets/math/b.sublime-snippet               |   6 +
 snippets/math/bb.sublime-snippet              |   6 +
 snippets/math/bca.sublime-snippet             |   6 +
 snippets/math/bcu.sublime-snippet             |   6 +
 snippets/math/bf.sublime-snippet              |   6 +
 snippets/math/c.sublime-snippet               |   6 +
 snippets/math/ca.sublime-snippet              |   6 +
 snippets/math/cal.sublime-snippet             |   6 +
 snippets/math/cd.sublime-snippet              |   6 +
 snippets/math/cu.sublime-snippet              |   6 +
 snippets/math/d.sublime-snippet               |   6 +
 snippets/math/do.sublime-snippet              |   6 +
 snippets/math/e.sublime-snippet               |   6 +
 snippets/math/f.sublime-snippet               |   6 +
 snippets/math/fr.sublime-snippet              |   6 +
 snippets/math/fra.sublime-snippet             |   6 +
 snippets/math/g.sublime-snippet               |   6 +
 snippets/math/h.sublime-snippet               |   6 +
 snippets/math/i.sublime-snippet               |   6 +
 snippets/math/in.sublime-snippet              |   6 +
 snippets/math/it.sublime-snippet              |   6 +
 snippets/math/k.sublime-snippet               |   6 +
 snippets/math/l.sublime-snippet               |   6 +
 snippets/math/la.sublime-snippet              |   6 +
 snippets/math/lar.sublime-snippet             |   6 +
 snippets/math/lb.sublime-snippet              |   6 +
 snippets/math/lbr.sublime-snippet             |   6 +
 snippets/math/ld.sublime-snippet              |   6 +
 snippets/math/lp.sublime-snippet              |   6 +
 snippets/math/lr.sublime-snippet              |   6 +
 snippets/math/m.sublime-snippet               |   6 +
 snippets/math/mathcal.sublime-snippet         |   6 +
 snippets/math/n.sublime-snippet               |   6 +
 snippets/math/p.sublime-snippet               |   6 +
 snippets/math/pr.sublime-snippet              |   6 +
 snippets/math/q.sublime-snippet               |   6 +
 snippets/math/qd.sublime-snippet              |   6 +
 snippets/math/qqd.sublime-snippet             |   6 +
 snippets/math/r.sublime-snippet               |   6 +
 snippets/math/ra.sublime-snippet              |   6 +
 snippets/math/rar.sublime-snippet             |   6 +
 snippets/math/rm.sublime-snippet              |   6 +
 snippets/math/s.sublime-snippet               |   6 +
 snippets/math/sf.sublime-snippet              |   6 +
 snippets/math/sm.sublime-snippet              |   6 +
 snippets/math/sp.sublime-snippet              |  12 ++
 snippets/math/stack.sublime-snippet           |   6 +
 snippets/math/su.sublime-snippet              |   6 +
 snippets/math/t.sublime-snippet               |   6 +
 snippets/math/tt.sublime-snippet              |   6 +
 snippets/math/u.sublime-snippet               |   6 +
 snippets/math/up.sublime-snippet              |   6 +
 snippets/math/v.sublime-snippet               |   6 +
 snippets/math/w.sublime-snippet               |   6 +
 snippets/math/x.sublime-snippet               |   6 +
 snippets/math/y.sublime-snippet               |   6 +
 snippets/math/z.sublime-snippet               |   6 +
 174 files changed, 783 insertions(+), 387 deletions(-)
 delete mode 100644 LaTeX math.sublime-completions
 delete mode 100644 LaTeX.sublime-completions
 delete mode 100644 Math boldface.sublime-snippet
 delete mode 100755 Text boldface.sublime-snippet
 delete mode 100755 Text emphasize.sublime-snippet
 delete mode 100644 Text monospace.sublime-snippet
 delete mode 100644 Text slanted.sublime-snippet
 delete mode 100755 Text underline.sublime-snippet
 delete mode 100644 latextools/biblatex_snippet_completions.py
 rename Insert environment.sublime-snippet => snippets/Insert environment.sublime-snippet (100%)
 rename Wrap in command.sublime-snippet => snippets/Wrap in command.sublime-snippet (97%)
 mode change 100755 => 100644
 rename Wrap in environment.sublime-snippet => snippets/Wrap in environment.sublime-snippet (95%)
 mode change 100755 => 100644
 rename snippets/{article.biblatex-snippet => biblatex/article.sublime-snippet} (83%)
 rename snippets/{artwork.biblatex-snippet => biblatex/artwork.sublime-snippet} (75%)
 rename snippets/{audio.biblatex-snippet => biblatex/audio.sublime-snippet} (75%)
 rename snippets/{book.biblatex-snippet => biblatex/book.sublime-snippet} (83%)
 rename snippets/{bookinbook.biblatex-snippet => biblatex/bookinbook.sublime-snippet} (85%)
 rename snippets/{booklet.biblatex-snippet => biblatex/booklet.sublime-snippet} (77%)
 rename snippets/{collection.biblatex-snippet => biblatex/collection.sublime-snippet} (83%)
 rename snippets/{conference.biblatex-snippet => biblatex/conference.sublime-snippet} (84%)
 rename snippets/{electronic.biblatex-snippet => biblatex/electronic.sublime-snippet} (75%)
 rename snippets/{inbook.biblatex-snippet => biblatex/inbook.sublime-snippet} (85%)
 rename snippets/{incollection.biblatex-snippet => biblatex/incollection.sublime-snippet} (85%)
 rename snippets/{inproceedings.biblatex-snippet => biblatex/inproceedings.sublime-snippet} (84%)
 rename snippets/{inreference.biblatex-snippet => biblatex/inreference.sublime-snippet} (85%)
 rename snippets/{manual.biblatex-snippet => biblatex/manual.sublime-snippet} (79%)
 rename snippets/{mastersthesis.biblatex-snippet => biblatex/mastersthesis.sublime-snippet} (79%)
 rename snippets/{misc.biblatex-snippet => biblatex/misc.sublime-snippet} (77%)
 rename snippets/{movie.biblatex-snippet => biblatex/movie.sublime-snippet} (75%)
 rename snippets/{music.biblatex-snippet => biblatex/music.sublime-snippet} (75%)
 rename snippets/{mvbook.biblatex-snippet => biblatex/mvbook.sublime-snippet} (84%)
 rename snippets/{mvcollection.biblatex-snippet => biblatex/mvcollection.sublime-snippet} (84%)
 rename snippets/{mvproceedings.biblatex-snippet => biblatex/mvproceedings.sublime-snippet} (82%)
 rename snippets/{mvreference.biblatex-snippet => biblatex/mvreference.sublime-snippet} (84%)
 rename snippets/{online.biblatex-snippet => biblatex/online.sublime-snippet} (74%)
 rename snippets/{patent.biblatex-snippet => biblatex/patent.sublime-snippet} (77%)
 rename snippets/{periodical.biblatex-snippet => biblatex/periodical.sublime-snippet} (79%)
 rename snippets/{phdthesis.biblatex-snippet => biblatex/phdthesis.sublime-snippet} (79%)
 rename snippets/{proceedings.biblatex-snippet => biblatex/proceedings.sublime-snippet} (82%)
 rename snippets/{reference.biblatex-snippet => biblatex/reference.sublime-snippet} (83%)
 rename snippets/{report.biblatex-snippet => biblatex/report.sublime-snippet} (79%)
 rename snippets/{set.biblatex-snippet => biblatex/set.sublime-snippet} (58%)
 rename snippets/{suppbook.biblatex-snippet => biblatex/suppbook.sublime-snippet} (85%)
 rename snippets/{suppcollection.biblatex-snippet => biblatex/suppcollection.sublime-snippet} (85%)
 rename snippets/{suppperiodical.biblatex-snippet => biblatex/suppperiodical.sublime-snippet} (83%)
 rename snippets/{techreport.biblatex-snippet => biblatex/techreport.sublime-snippet} (79%)
 rename snippets/{thesis.biblatex-snippet => biblatex/thesis.sublime-snippet} (79%)
 rename snippets/{unpublished.biblatex-snippet => biblatex/unpublished.sublime-snippet} (76%)
 rename snippets/{video.biblatex-snippet => biblatex/video.sublime-snippet} (75%)
 rename snippets/{www.biblatex-snippet => biblatex/www.sublime-snippet} (74%)
 rename snippets/{xdata.biblatex-snippet => biblatex/xdata.sublime-snippet} (56%)
 rename snippets/{article.bibtex-snippet => bibtex/article.sublime-snippet} (72%)
 rename snippets/{book.bibtex-snippet => bibtex/book.sublime-snippet} (73%)
 rename snippets/{booklet.bibtex-snippet => bibtex/booklet.sublime-snippet} (67%)
 rename snippets/{conference.bibtex-snippet => bibtex/conference.sublime-snippet} (76%)
 rename snippets/{inbook.bibtex-snippet => bibtex/inbook.sublime-snippet} (75%)
 rename snippets/{incollection.bibtex-snippet => bibtex/incollection.sublime-snippet} (77%)
 rename snippets/{inproceedings.bibtex-snippet => bibtex/inproceedings.sublime-snippet} (76%)
 rename snippets/{manual.bibtex-snippet => bibtex/manual.sublime-snippet} (68%)
 rename snippets/{mastersthesis.bibtex-snippet => bibtex/mastersthesis.sublime-snippet} (73%)
 rename snippets/{misc.bibtex-snippet => bibtex/misc.sublime-snippet} (64%)
 rename snippets/{phdthesis.bibtex-snippet => bibtex/phdthesis.sublime-snippet} (72%)
 rename snippets/{proceedings.bibtex-snippet => bibtex/proceedings.sublime-snippet} (72%)
 rename snippets/{techreport.bibtex-snippet => bibtex/techreport.sublime-snippet} (73%)
 rename snippets/{unpublished.bibtex-snippet => bibtex/unpublished.sublime-snippet} (69%)
 create mode 100644 snippets/latex/baa.sublime-snippet
 create mode 100644 snippets/latex/baan.sublime-snippet
 create mode 100644 snippets/latex/bal.sublime-snippet
 create mode 100644 snippets/latex/baln.sublime-snippet
 create mode 100644 snippets/latex/ben.sublime-snippet
 create mode 100644 snippets/latex/beqn.sublime-snippet
 create mode 100644 snippets/latex/bf.sublime-snippet
 create mode 100644 snippets/latex/bfl.sublime-snippet
 create mode 100644 snippets/latex/bfln.sublime-snippet
 create mode 100644 snippets/latex/bga.sublime-snippet
 create mode 100644 snippets/latex/bgan.sublime-snippet
 create mode 100644 snippets/latex/bit.sublime-snippet
 create mode 100644 snippets/latex/bml.sublime-snippet
 create mode 100644 snippets/latex/bmln.sublime-snippet
 rename Beamer boxes.sublime-snippet => snippets/latex/box.sublime-snippet (74%)
 create mode 100644 snippets/latex/bs.sublime-snippet
 rename table.sublime-snippet => snippets/latex/btable.sublime-snippet (84%)
 create mode 100644 snippets/latex/em.sublime-snippet
 rename figure.sublime-snippet => snippets/latex/figure.sublime-snippet (75%)
 rename Beamer frame.sublime-snippet => snippets/latex/frame.sublime-snippet (73%)
 create mode 100644 snippets/latex/i.sublime-snippet
 create mode 100644 snippets/latex/it.sublime-snippet
 create mode 100644 snippets/latex/ms.sublime-snippet
 rename Remark.sublime-snippet => snippets/latex/rem.sublime-snippet (69%)
 mode change 100755 => 100644
 create mode 100644 snippets/latex/sf.sublime-snippet
 create mode 100644 snippets/latex/sl.sublime-snippet
 create mode 100644 snippets/latex/ss.sublime-snippet
 create mode 100644 snippets/latex/tt.sublime-snippet
 create mode 100644 snippets/latex/un.sublime-snippet
 create mode 100644 snippets/latex/use.sublime-snippet
 create mode 100644 snippets/math/0.sublime-snippet
 create mode 100644 snippets/math/D_upr.sublime-snippet
 create mode 100644 snippets/math/E_upr.sublime-snippet
 create mode 100644 snippets/math/F_upr.sublime-snippet
 create mode 100644 snippets/math/G_upr.sublime-snippet
 create mode 100644 snippets/math/L_upr.sublime-snippet
 create mode 100644 snippets/math/Lar_upr.sublime-snippet
 create mode 100644 snippets/math/Lr_upr.sublime-snippet
 create mode 100644 snippets/math/P_upr.sublime-snippet
 create mode 100644 snippets/math/Q_upr.sublime-snippet
 create mode 100644 snippets/math/Rar_upr.sublime-snippet
 create mode 100644 snippets/math/S_upr.sublime-snippet
 create mode 100644 snippets/math/V_upr.sublime-snippet
 create mode 100644 snippets/math/W_upr.sublime-snippet
 create mode 100644 snippets/math/X_upr.sublime-snippet
 create mode 100644 snippets/math/Y_upr.sublime-snippet
 create mode 100644 snippets/math/a.sublime-snippet
 create mode 100644 snippets/math/b.sublime-snippet
 create mode 100644 snippets/math/bb.sublime-snippet
 create mode 100644 snippets/math/bca.sublime-snippet
 create mode 100644 snippets/math/bcu.sublime-snippet
 create mode 100644 snippets/math/bf.sublime-snippet
 create mode 100644 snippets/math/c.sublime-snippet
 create mode 100644 snippets/math/ca.sublime-snippet
 create mode 100644 snippets/math/cal.sublime-snippet
 create mode 100644 snippets/math/cd.sublime-snippet
 create mode 100644 snippets/math/cu.sublime-snippet
 create mode 100644 snippets/math/d.sublime-snippet
 create mode 100644 snippets/math/do.sublime-snippet
 create mode 100644 snippets/math/e.sublime-snippet
 create mode 100644 snippets/math/f.sublime-snippet
 create mode 100644 snippets/math/fr.sublime-snippet
 create mode 100644 snippets/math/fra.sublime-snippet
 create mode 100644 snippets/math/g.sublime-snippet
 create mode 100644 snippets/math/h.sublime-snippet
 create mode 100644 snippets/math/i.sublime-snippet
 create mode 100644 snippets/math/in.sublime-snippet
 create mode 100644 snippets/math/it.sublime-snippet
 create mode 100644 snippets/math/k.sublime-snippet
 create mode 100644 snippets/math/l.sublime-snippet
 create mode 100644 snippets/math/la.sublime-snippet
 create mode 100644 snippets/math/lar.sublime-snippet
 create mode 100644 snippets/math/lb.sublime-snippet
 create mode 100644 snippets/math/lbr.sublime-snippet
 create mode 100644 snippets/math/ld.sublime-snippet
 create mode 100644 snippets/math/lp.sublime-snippet
 create mode 100644 snippets/math/lr.sublime-snippet
 create mode 100644 snippets/math/m.sublime-snippet
 create mode 100644 snippets/math/mathcal.sublime-snippet
 create mode 100644 snippets/math/n.sublime-snippet
 create mode 100644 snippets/math/p.sublime-snippet
 create mode 100644 snippets/math/pr.sublime-snippet
 create mode 100644 snippets/math/q.sublime-snippet
 create mode 100644 snippets/math/qd.sublime-snippet
 create mode 100644 snippets/math/qqd.sublime-snippet
 create mode 100644 snippets/math/r.sublime-snippet
 create mode 100644 snippets/math/ra.sublime-snippet
 create mode 100644 snippets/math/rar.sublime-snippet
 create mode 100644 snippets/math/rm.sublime-snippet
 create mode 100644 snippets/math/s.sublime-snippet
 create mode 100644 snippets/math/sf.sublime-snippet
 create mode 100644 snippets/math/sm.sublime-snippet
 create mode 100644 snippets/math/sp.sublime-snippet
 create mode 100644 snippets/math/stack.sublime-snippet
 create mode 100644 snippets/math/su.sublime-snippet
 create mode 100644 snippets/math/t.sublime-snippet
 create mode 100644 snippets/math/tt.sublime-snippet
 create mode 100644 snippets/math/u.sublime-snippet
 create mode 100644 snippets/math/up.sublime-snippet
 create mode 100644 snippets/math/v.sublime-snippet
 create mode 100644 snippets/math/w.sublime-snippet
 create mode 100644 snippets/math/x.sublime-snippet
 create mode 100644 snippets/math/y.sublime-snippet
 create mode 100644 snippets/math/z.sublime-snippet

diff --git a/Beamer.sublime-completions b/Beamer.sublime-completions
index aafa44fe2..87c006a3f 100644
--- a/Beamer.sublime-completions
+++ b/Beamer.sublime-completions
@@ -6,4 +6,4 @@
 		{ "trigger": "visible", "contents": "\\visible<${1:+-}>{$2}"},
 		{ "trigger": "only",    "contents": "\\only<${1:+-}>{$2}"}
 	]
-}
\ No newline at end of file
+}
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
index 578799f8a..5b11b951d 100755
--- a/Default (Linux).sublime-keymap	
+++ b/Default (Linux).sublime-keymap	
@@ -297,21 +297,21 @@ LaTeX Package keymap for Linux
 	// Wrap selected text in command or environment
 	{
 		"keys": ["ctrl+l","ctrl+c"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Wrap in command.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Wrap in command.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+n"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Wrap in environment.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Wrap in environment.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+n"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Insert environment.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Insert environment.sublime-snippet" },
 		"context": [
 			{ "key": "selection_empty", "match_all": true },
 			{ "key": "selector", "operand": "text.tex.latex" }
@@ -336,43 +336,50 @@ LaTeX Package keymap for Linux
 
 	// Wrap selected text in emph, bold or underline
 	{
-		"keys": ["ctrl+l","ctrl+e"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text emphasize.sublime-snippet" },
+		"keys": ["ctrl+l","ctrl+b"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/bf.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+b"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text boldface.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/math/bf.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
 		]
 	},
 	{
-		"keys": ["ctrl+l","ctrl+b"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Math boldface.sublime-snippet" },
+		"keys": ["ctrl+l","ctrl+e"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/em.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
+			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+s"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text slanted.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/sl.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
-		"keys": ["ctrl+l","ctrl+u"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text underline.sublime-snippet" },
+		"keys": ["ctrl+l","ctrl+t"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/tt.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+t"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text monospace.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/math/tt.sublime-snippet" },
+		"context": [
+			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
+		]
+	},
+	{
+		"keys": ["ctrl+l","ctrl+u"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/un.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
index 50699c779..bcfcb2676 100755
--- a/Default (OSX).sublime-keymap	
+++ b/Default (OSX).sublime-keymap	
@@ -297,21 +297,21 @@ LaTeX Package keymap for OS X
 	// Wrap selected text in command or environment
 	{
 		"keys": ["super+l","super+c"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Wrap in command.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Wrap in command.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["super+l","super+n"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Wrap in environment.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Wrap in environment.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["super+l","super+n"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Insert environment.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Insert environment.sublime-snippet" },
 		"context": [
 			{ "key": "selection_empty", "match_all": true },
 			{ "key": "selector", "operand": "text.tex.latex" }
@@ -336,43 +336,50 @@ LaTeX Package keymap for OS X
 
 	// Wrap selected text in emph, bold or underline
 	{
-		"keys": ["super+l","super+e"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text emphasize.sublime-snippet" },
+		"keys": ["super+l","super+b"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/bf.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
 		"keys": ["super+l","super+b"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text boldface.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/math/bf.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
 		]
 	},
 	{
-		"keys": ["super+l","super+b"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Math boldface.sublime-snippet" },
+		"keys": ["super+l","super+e"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/em.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
+			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["super+l","super+s"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text slanted.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/sl.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
-		"keys": ["super+l","super+u"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text underline.sublime-snippet" },
+		"keys": ["super+l","super+t"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/tt.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
 		"keys": ["super+l","super+t"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text monospace.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/math/tt.sublime-snippet" },
+		"context": [
+			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
+		]
+	},
+	{
+		"keys": ["super+l","super+u"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/un.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
index 578799f8a..5b11b951d 100755
--- a/Default (Windows).sublime-keymap	
+++ b/Default (Windows).sublime-keymap	
@@ -297,21 +297,21 @@ LaTeX Package keymap for Linux
 	// Wrap selected text in command or environment
 	{
 		"keys": ["ctrl+l","ctrl+c"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Wrap in command.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Wrap in command.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+n"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Wrap in environment.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Wrap in environment.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+n"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Insert environment.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/Insert environment.sublime-snippet" },
 		"context": [
 			{ "key": "selection_empty", "match_all": true },
 			{ "key": "selector", "operand": "text.tex.latex" }
@@ -336,43 +336,50 @@ LaTeX Package keymap for Linux
 
 	// Wrap selected text in emph, bold or underline
 	{
-		"keys": ["ctrl+l","ctrl+e"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text emphasize.sublime-snippet" },
+		"keys": ["ctrl+l","ctrl+b"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/bf.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+b"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text boldface.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/math/bf.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
 		]
 	},
 	{
-		"keys": ["ctrl+l","ctrl+b"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Math boldface.sublime-snippet" },
+		"keys": ["ctrl+l","ctrl+e"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/em.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
+			{ "key": "selector", "operand": "text.tex.latex" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+s"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text slanted.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/sl.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
-		"keys": ["ctrl+l","ctrl+u"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text underline.sublime-snippet" },
+		"keys": ["ctrl+l","ctrl+t"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/tt.sublime-snippet" },
 		"context": [
-			{ "key": "selector", "operand": "text.tex.latex" }
+			{ "key": "selector", "operand": "text.tex.latex - text.tex.latex meta.environment.math" }
 		]
 	},
 	{
 		"keys": ["ctrl+l","ctrl+t"],
-		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/Text monospace.sublime-snippet" },
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/math/tt.sublime-snippet" },
+		"context": [
+			{ "key": "selector", "operand": "text.tex.latex meta.environment.math" }
+		]
+	},
+	{
+		"keys": ["ctrl+l","ctrl+u"],
+		"command": "insert_snippet", "args": { "name":"Packages/LaTeXTools/snippets/latex/un.sublime-snippet" },
 		"context": [
 			{ "key": "selector", "operand": "text.tex.latex" }
 		]
diff --git a/LaTeX math.sublime-completions b/LaTeX math.sublime-completions
deleted file mode 100644
index 8cc5164a4..000000000
--- a/LaTeX math.sublime-completions	
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-	"scope": "text.tex.latex meta.environment.math",
-	"completions": [
-		{ "trigger": "a", "contents": "\\alpha" },
-		{ "trigger": "b", "contents": "\\beta" },
-		{ "trigger": "g", "contents": "\\gamma" },
-		{ "trigger": "d", "contents": "\\delta" },
-		{ "trigger": "\\delta", "contents": "\\partial" },
-		//{ "trigger": "partial", "contents": "delta" },  # can't have trigger as it conflicts with p -> \pi
-		{ "trigger": "e", "contents": "\\epsilon" },
-		{ "trigger": "\\epsilon", "contents": "\\epsilon" },
-		/* toggle the two! */
-		{ "trigger": "\\varepsilon", "contents": "\\varepsilon" },
-		{ "trigger": "z", "contents": "\\zeta"},
-		{ "trigger": "h", "contents": "\\eta" },
-		{ "trigger": "q", "contents": "\\theta" },
-		{ "trigger": "\\theta", "contents": "\\vartheta" },
-		{ "trigger": "\\vartheta", "contents": "\\theta" },
-		{ "trigger": "i", "contents": "\\iota" },
-		{ "trigger": "k", "contents": "\\kappa" },
-		{ "trigger": "l", "contents": "\\lambda" },
-		{ "trigger": "m", "contents": "\\mu" },
-		{ "trigger": "n", "contents": "\\nu" },
-		{ "trigger": "x", "contents": "\\xi" },
-		{ "trigger": "p", "contents": "\\pi" },
-		{ "trigger": "r", "contents": "\\rho" },
-		{ "trigger": "s", "contents": "\\sigma" },
-		{ "trigger": "t", "contents": "\\tau" },
-		{ "trigger": "u", "contents": "\\upsilon" },
-		{ "trigger": "f", "contents": "\\phi" },
-		{ "trigger": "\\phi", "contents": "\\varphi" },
-		{ "trigger": "\\varphi", "contents": "\\phi" },
-		{ "trigger": "c", "contents": "\\chi" },
-		{ "trigger": "y", "contents": "\\psi" },
-		{ "trigger": "w", "contents": "\\omega" },
-		{ "trigger": "v", "contents": "\\digamma"},
-		{ "trigger": "G", "contents": "\\Gamma" },
-		{ "trigger": "D", "contents": "\\Delta" },
-		{ "trigger": "Q", "contents": "\\Theta" },
-		{ "trigger": "L", "contents": "\\Lambda" },
-		{ "trigger": "X", "contents": "\\Xi" },
-		{ "trigger": "P", "contents": "\\Pi" },
-		{ "trigger": "S", "contents": "\\Sigma" },
-		{ "trigger": "F", "contents": "\\Phi" },
-		{ "trigger": "Y", "contents": "\\Psi" },
-		{ "trigger": "W", "contents": "\\Omega" },
-
-		{ "trigger": "0", "contents": "\\emptyset" },
-		{ "trigger": "V", "contents": "\\forall" },
-		{ "trigger": "E", "contents": "\\exists" },
-		{ "trigger": "sm", "contents": "\\setminus" },
-		{ "trigger": "ld", "contents": "\\ldots" },
-		{ "trigger": "cd", "contents": "\\cdot" },
-		{ "trigger": "cdot", "contents": "cdots" },
-		{ "trigger": "cdots", "contents": "cdot"},
-
-		{ "trigger": "la", "contents": "\\langle"},
-		{ "trigger": "ra", "contents": "\\rangle"},
-		{ "trigger": "cu", "contents": "\\cup"},
-		{ "trigger": "ca", "contents": "\\cap"},
-		{ "trigger": "bcu", "contents": "\\bigcup"},
-		{ "trigger": "bca", "contents": "\\bigcap"},
-
-		{ "trigger": "in", "contents": "\\int"},
-		{ "trigger": "int", "contents": "infty"},
-		{ "trigger": "infty", "contents": "int"},
-
-		{ "trigger": "su", "contents": "\\sum"},
-		{ "trigger": "sum", "contents": "sup"},
-		{ "trigger": "sup", "contents": "succ"},
-		{ "trigger": "succ", "contents": "succeq"},
-		{ "trigger": "succeq", "contents": "succcurlyeq"},
-		{ "trigger": "succcurlyeq", "contents": "sum"},
-
-		{ "trigger": "qd", "contents": "\\quad"},
-		{ "trigger": "qqd", "contents": "\\qquad"},
-
-		{ "trigger": "pr", "contents": "\\prod"},
-		{ "trigger": "prod", "contents": "prec"},
-		{ "trigger": "prec", "contents": "preceq"},
-		{ "trigger": "preceq", "contents": "preccurlyeq"},
-		{ "trigger": "preccurlyeq", "contents": "prod"},
-
-		{ "trigger": "lar", "contents": "\\leftarrow"},
-		{ "trigger": "leftarrow", "contents": "leftarrow"},
-		{ "trigger": "longleftarrow", "contents": "longleftarrow"},
-		{ "trigger": "Lar", "contents": "\\Leftarrow"},
-		{ "trigger": "Leftarrow", "contents": "Leftarrow"},
-		{ "trigger": "Longleftarrow", "contents": "Longleftarrow"},
-		{ "trigger": "rar", "contents": "\\rightarrow"},
-		{ "trigger": "rightarrow", "contents": "rightarrow"},
-		{ "trigger": "longrightarrow", "contents": "longrightarrow"},
-		{ "trigger": "Rar", "contents": "\\Rightarrow"},
-		{ "trigger": "Rightarrow", "contents": "Rightarrow"},
-		{ "trigger": "Longrightarrow", "contents": "Longrightarrow"},
-		{ "trigger": "lr", "contents": "\\leftrightarrow"},
-		{ "trigger": "Lr", "contents": "\\Leftrightarrow"},
-		{ "trigger": "iff", "contents": "\\Leftrightarrow"},
-		{ "trigger": "leftrightarrow", "contents": "leftrightarrow"},
-		{ "trigger": "Leftrightarrow", "contents": "Leftrightarrow"},
-		{ "trigger": "longleftrightarrow", "contents": "longleftrightarrow"},
-		{ "trigger": "Longleftrightarrow", "contents": "Longleftrightarrow"},
-		{ "trigger": "up", "contents": "\\uparrow"},
-		{ "trigger": "do", "contents": "\\downarrow"},
-
-		{ "trigger": "it", "contents": "\\mathit{$1}$0"},
-		{ "trigger": "bf", "contents": "\\mathbf{$1}$0"},
-		{ "trigger": "bb", "contents": "\\mathbb{$1}$0"},
-		{ "trigger": "rm", "contents": "\\mathrm{$1}$0"},
-		{ "trigger": "sf", "contents": "\\mathsf{$1}$0"},
-		{ "trigger": "cal", "contents": "\\mathcal"},
-		{ "trigger": "mathcal", "contents": "mathcal{$1}$0"},
-
-		{ "trigger": "lp", "contents": "\\left( $1 \\right) $0"},
-		{ "trigger": "lb", "contents": "\\left[ $1 \\right] $0"},
-		{ "trigger": "lbr", "contents": "\\left\\\\{ $0 \\right\\\\}"},
-		{ "trigger": "fr", "contents": "\\frac"},
-		{ "trigger": "fra", "contents": "\\frac{$1}{$2}$0"},
-		{ "trigger": "stack", "contents": "\\stackrel{$1}{$2}$0"},
-
-		{ "trigger": "sp", "contents": "\\begin{split}\n$0\n\\end{split}\n"}
-	]
-}
diff --git a/LaTeX.sublime-completions b/LaTeX.sublime-completions
deleted file mode 100644
index 69f0ce02f..000000000
--- a/LaTeX.sublime-completions
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"scope": "text.tex.latex - text.tex.latex meta.environment.math",
-	"completions": [
-		{ "trigger": "it", "contents": "\\textit{$1}$0"},
-		{ "trigger": "bf", "contents": "\\textbf{$1}$0"},
-		{ "trigger": "em", "contents": "\\emph{$1}$0"},
-		{ "trigger": "tt", "contents": "\\texttt{$1}$0"},
-		{ "trigger": "un", "contents": "\\underline{$1}$0"},
-
-		{ "trigger": "bs", "contents": "\\bigskip"},
-		{ "trigger": "ms", "contents": "\\medskip"},
-		{ "trigger": "ss", "contents": "\\smallskip"},
-
-		{ "trigger": "use", "contents": "\\usepackage"},
-
-		{ "trigger": "beq", "contents": "\\[\n$0\n\\]"},
-		{ "trigger": "beqn", "contents": "\\begin{equation}\n$0\n\\end{equation}\n"},
-		{ "trigger": "bga", "contents": "\\begin{gather*}\n$0\n\\end{gather*}\n"},
-		{ "trigger": "bgan", "contents": "\\begin{gather}\n$0\n\\end{gather}\n"},
-		{ "trigger": "bal", "contents": "\\begin{align*}\n$0\n\\end{align*}\n"},
-		{ "trigger": "baln", "contents": "\\begin{align}\n$0\n\\end{align}\n"},
-		{ "trigger": "baa", "contents": "\\begin{alignat*}\n$0\n\\end{alignat*}\n"},
-		{ "trigger": "baan", "contents": "\\begin{alignat}\n$0\n\\end{alignat}\n"},
-		{ "trigger": "bfl", "contents": "\\begin{flalign*}\n$0\n\\end{flalign*}\n"},
-		{ "trigger": "bfln", "contents": "\\begin{flalign}\n$0\n\\end{flalign}\n"},
-		{ "trigger": "bml", "contents": "\\begin{multline*}\n$0\n\\end{multline*}\n"},
-		{ "trigger": "bmln", "contents": "\\begin{multline}\n$0\n\\end{multline}\n"},
-
-		{ "trigger": "bit", "contents": "\\begin{itemize}\n\t\\item $0\n\\end{itemize}\n"},
-		{ "trigger": "ben", "contents": "\\begin{enumerate}\n\t\\item $0\n\\end{enumerate}\n"},
-		{ "trigger": "i", "contents": "\\item "}
-	]
-}
\ No newline at end of file
diff --git a/Math boldface.sublime-snippet b/Math boldface.sublime-snippet
deleted file mode 100644
index 783c8a669..000000000
--- a/Math boldface.sublime-snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-<snippet>
-	<content><![CDATA[\\mathbf{${1:$SELECTION}}]]></content>
-	<scope>text.tex.latex meta.environment.math</scope>
-	<description>Boldface text</description>
-</snippet>
diff --git a/Text boldface.sublime-snippet b/Text boldface.sublime-snippet
deleted file mode 100755
index 4f7547dd9..000000000
--- a/Text boldface.sublime-snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-<snippet>
-	<content><![CDATA[\\textbf{${1:$SELECTION}}]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Boldface text</description>
-</snippet>
diff --git a/Text emphasize.sublime-snippet b/Text emphasize.sublime-snippet
deleted file mode 100755
index 1ae7a5da7..000000000
--- a/Text emphasize.sublime-snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-<snippet>
-	<content><![CDATA[\\emph{${1:$SELECTION}}]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Emphasize text</description>
-</snippet>
diff --git a/Text monospace.sublime-snippet b/Text monospace.sublime-snippet
deleted file mode 100644
index 714498cc8..000000000
--- a/Text monospace.sublime-snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-<snippet>
-	<content><![CDATA[\\texttt{${1:$SELECTION}}]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Monospace text</description>
-</snippet>
diff --git a/Text slanted.sublime-snippet b/Text slanted.sublime-snippet
deleted file mode 100644
index e116acb09..000000000
--- a/Text slanted.sublime-snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-<snippet>
-	<content><![CDATA[\\textsl{${1:$SELECTION}}]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Boldface text</description>
-</snippet>
diff --git a/Text underline.sublime-snippet b/Text underline.sublime-snippet
deleted file mode 100755
index b193a0f6d..000000000
--- a/Text underline.sublime-snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-<snippet>
-	<content><![CDATA[\\underline{${1:$SELECTION}}]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Underline text</description>
-</snippet>
diff --git a/latextools/biblatex_snippet_completions.py b/latextools/biblatex_snippet_completions.py
deleted file mode 100644
index 0d750226b..000000000
--- a/latextools/biblatex_snippet_completions.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# coding=utf-8
-
-# This is here precisely so snippet completion doesn't interfere
-# with other autocompletions.
-import os
-import traceback
-from xml.etree import ElementTree
-
-import sublime
-import sublime_plugin
-
-from .utils.logging import logger
-
-__all__ = ["SnippetCompletions"]
-
-__dir = os.path.dirname(__file__)
-if __dir == ".":
-    __dir = os.path.join(sublime.packages_path(), "LaTeXTools")
-
-
-def _get_completions(ext):
-    completions = []
-
-    for root, dirs, files in os.walk(os.path.join(__dir, "snippets")):
-        files = [f for f in files if f.endswith(ext)]
-
-        for f in files:
-            doc = ElementTree.parse(os.path.join(root, f))
-            try:
-                # completions must be tuples on ST2
-                completions.append(
-                    (
-                        "{0}\t{1}".format(
-                            doc.find("tabTrigger").text.strip(),
-                            doc.find("description").text.strip(),
-                        ),
-                        doc.find("content").text.strip(),
-                    )
-                )
-            except Exception:
-                logger.error(
-                    "Error occurred when trying to load snippet from {0}",
-                    os.path.join(root, f),
-                )
-                traceback.print_exc()
-
-    return completions
-
-
-def get_biblatex_completions():
-    return _get_completions(".biblatex-snippet")
-
-
-def get_bibtex_completions():
-    return _get_completions(".bibtex-snippet")
-
-
-class SnippetCompletions(sublime_plugin.EventListener):
-    def on_query_completions(self, view, prefix, locations):
-        pt = locations[0]
-        # do not return completions if the cursor is inside an entry
-        if not view.match_selector(
-            pt,
-            "(text.bibtex, text.biblatex)"
-            # ST3
-            " - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex"
-            # ST4
-            " - meta.entry.arguments.bibtex",
-        ):
-            return []
-
-        if view.match_selector(pt, "text.biblatex"):
-            return (get_biblatex_completions(), sublime.INHIBIT_WORD_COMPLETIONS)
-        else:
-            return (get_bibtex_completions(), sublime.INHIBIT_WORD_COMPLETIONS)
diff --git a/plugin.py b/plugin.py
index 367dfc908..17204a401 100644
--- a/plugin.py
+++ b/plugin.py
@@ -29,9 +29,6 @@
     from .latextools.biblatex_name_completions import (
         BiblatexNameCompletions
     )
-    from .latextools.biblatex_snippet_completions import (
-        SnippetCompletions
-    )
     from .latextools.biblatex_syntax_listener import (
         BibLaTeXSyntaxListener
     )
diff --git a/Insert environment.sublime-snippet b/snippets/Insert environment.sublime-snippet
similarity index 100%
rename from Insert environment.sublime-snippet
rename to snippets/Insert environment.sublime-snippet
diff --git a/Wrap in command.sublime-snippet b/snippets/Wrap in command.sublime-snippet
old mode 100755
new mode 100644
similarity index 97%
rename from Wrap in command.sublime-snippet
rename to snippets/Wrap in command.sublime-snippet
index 82108c975..2527973aa
--- a/Wrap in command.sublime-snippet	
+++ b/snippets/Wrap in command.sublime-snippet	
@@ -1,5 +1,5 @@
-<snippet>
-	<content><![CDATA[\\${1:cmd}{${2:$SELECTION}}]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Wrap selection in LaTeX command</description>
-</snippet>
+<snippet>
+	<content><![CDATA[\\${1:cmd}{${2:$SELECTION}}]]></content>
+	<scope>text.tex.latex</scope>
+	<description>Wrap selection in LaTeX command</description>
+</snippet>
diff --git a/Wrap in environment.sublime-snippet b/snippets/Wrap in environment.sublime-snippet
old mode 100755
new mode 100644
similarity index 95%
rename from Wrap in environment.sublime-snippet
rename to snippets/Wrap in environment.sublime-snippet
index 4308fa724..ce8f1cec2
--- a/Wrap in environment.sublime-snippet	
+++ b/snippets/Wrap in environment.sublime-snippet	
@@ -1,8 +1,8 @@
-<snippet>
-	<content><![CDATA[
-\\begin{${1:env}}
-$SELECTION\\end{$1}
-]]></content>
-	<scope>text.tex.latex</scope>
-	<description>Turn selection into LaTeX environment</description>
-</snippet>
+<snippet>
+	<content><![CDATA[
+\\begin{${1:env}}
+$SELECTION\\end{$1}
+]]></content>
+	<scope>text.tex.latex</scope>
+	<description>Turn selection into LaTeX environment</description>
+</snippet>
diff --git a/snippets/article.biblatex-snippet b/snippets/biblatex/article.sublime-snippet
similarity index 83%
rename from snippets/article.biblatex-snippet
rename to snippets/biblatex/article.sublime-snippet
index 3739cdcb3..8f86383b8 100644
--- a/snippets/article.biblatex-snippet
+++ b/snippets/biblatex/article.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>article</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Article</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/artwork.biblatex-snippet b/snippets/biblatex/artwork.sublime-snippet
similarity index 75%
rename from snippets/artwork.biblatex-snippet
rename to snippets/biblatex/artwork.sublime-snippet
index e336a66e9..6389626f9 100644
--- a/snippets/artwork.biblatex-snippet
+++ b/snippets/biblatex/artwork.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>artwork</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Artwork</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/audio.biblatex-snippet b/snippets/biblatex/audio.sublime-snippet
similarity index 75%
rename from snippets/audio.biblatex-snippet
rename to snippets/biblatex/audio.sublime-snippet
index 7166405e3..dba53a281 100644
--- a/snippets/audio.biblatex-snippet
+++ b/snippets/biblatex/audio.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>audio</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Audio</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/book.biblatex-snippet b/snippets/biblatex/book.sublime-snippet
similarity index 83%
rename from snippets/book.biblatex-snippet
rename to snippets/biblatex/book.sublime-snippet
index 489436fdf..b65040054 100644
--- a/snippets/book.biblatex-snippet
+++ b/snippets/biblatex/book.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>book</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Book</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/bookinbook.biblatex-snippet b/snippets/biblatex/bookinbook.sublime-snippet
similarity index 85%
rename from snippets/bookinbook.biblatex-snippet
rename to snippets/biblatex/bookinbook.sublime-snippet
index bf073e26e..5618e158c 100644
--- a/snippets/bookinbook.biblatex-snippet
+++ b/snippets/biblatex/bookinbook.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>bookinbook</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Bookinbook</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/booklet.biblatex-snippet b/snippets/biblatex/booklet.sublime-snippet
similarity index 77%
rename from snippets/booklet.biblatex-snippet
rename to snippets/biblatex/booklet.sublime-snippet
index a4238ed9d..8f963396a 100644
--- a/snippets/booklet.biblatex-snippet
+++ b/snippets/biblatex/booklet.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>booklet</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Booklet</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/collection.biblatex-snippet b/snippets/biblatex/collection.sublime-snippet
similarity index 83%
rename from snippets/collection.biblatex-snippet
rename to snippets/biblatex/collection.sublime-snippet
index 1295c59b6..b06a9eea8 100644
--- a/snippets/collection.biblatex-snippet
+++ b/snippets/biblatex/collection.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>collection</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Collection</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/conference.biblatex-snippet b/snippets/biblatex/conference.sublime-snippet
similarity index 84%
rename from snippets/conference.biblatex-snippet
rename to snippets/biblatex/conference.sublime-snippet
index 9fddcdcd8..9f43545e3 100644
--- a/snippets/conference.biblatex-snippet
+++ b/snippets/biblatex/conference.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>conference</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Conference</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/electronic.biblatex-snippet b/snippets/biblatex/electronic.sublime-snippet
similarity index 75%
rename from snippets/electronic.biblatex-snippet
rename to snippets/biblatex/electronic.sublime-snippet
index 615a75840..619110ca5 100644
--- a/snippets/electronic.biblatex-snippet
+++ b/snippets/biblatex/electronic.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>electronic</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Electronic</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/inbook.biblatex-snippet b/snippets/biblatex/inbook.sublime-snippet
similarity index 85%
rename from snippets/inbook.biblatex-snippet
rename to snippets/biblatex/inbook.sublime-snippet
index 95a6e9372..b84b903cb 100644
--- a/snippets/inbook.biblatex-snippet
+++ b/snippets/biblatex/inbook.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>inbook</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Inbook</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/incollection.biblatex-snippet b/snippets/biblatex/incollection.sublime-snippet
similarity index 85%
rename from snippets/incollection.biblatex-snippet
rename to snippets/biblatex/incollection.sublime-snippet
index 76e9cc2fc..0bc112c03 100644
--- a/snippets/incollection.biblatex-snippet
+++ b/snippets/biblatex/incollection.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>incollection</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Incollection</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/inproceedings.biblatex-snippet b/snippets/biblatex/inproceedings.sublime-snippet
similarity index 84%
rename from snippets/inproceedings.biblatex-snippet
rename to snippets/biblatex/inproceedings.sublime-snippet
index a443879e0..73a284004 100644
--- a/snippets/inproceedings.biblatex-snippet
+++ b/snippets/biblatex/inproceedings.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>inproceedings</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Inproceedings</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/inreference.biblatex-snippet b/snippets/biblatex/inreference.sublime-snippet
similarity index 85%
rename from snippets/inreference.biblatex-snippet
rename to snippets/biblatex/inreference.sublime-snippet
index a379052bb..c6fcc424a 100644
--- a/snippets/inreference.biblatex-snippet
+++ b/snippets/biblatex/inreference.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>inreference</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Inreference</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/manual.biblatex-snippet b/snippets/biblatex/manual.sublime-snippet
similarity index 79%
rename from snippets/manual.biblatex-snippet
rename to snippets/biblatex/manual.sublime-snippet
index 1b9933df6..7aa183a1b 100644
--- a/snippets/manual.biblatex-snippet
+++ b/snippets/biblatex/manual.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>manual</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Manual</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/mastersthesis.biblatex-snippet b/snippets/biblatex/mastersthesis.sublime-snippet
similarity index 79%
rename from snippets/mastersthesis.biblatex-snippet
rename to snippets/biblatex/mastersthesis.sublime-snippet
index 2c82fcb3b..b0e983b54 100644
--- a/snippets/mastersthesis.biblatex-snippet
+++ b/snippets/biblatex/mastersthesis.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>mastersthesis</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Master's Thesis</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/misc.biblatex-snippet b/snippets/biblatex/misc.sublime-snippet
similarity index 77%
rename from snippets/misc.biblatex-snippet
rename to snippets/biblatex/misc.sublime-snippet
index 778c872b6..3455bf40a 100644
--- a/snippets/misc.biblatex-snippet
+++ b/snippets/biblatex/misc.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>misc</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Misc</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/movie.biblatex-snippet b/snippets/biblatex/movie.sublime-snippet
similarity index 75%
rename from snippets/movie.biblatex-snippet
rename to snippets/biblatex/movie.sublime-snippet
index e02582c47..79b20fbfd 100644
--- a/snippets/movie.biblatex-snippet
+++ b/snippets/biblatex/movie.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>movie</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Movie</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/music.biblatex-snippet b/snippets/biblatex/music.sublime-snippet
similarity index 75%
rename from snippets/music.biblatex-snippet
rename to snippets/biblatex/music.sublime-snippet
index b70b3f733..4f09d3f91 100644
--- a/snippets/music.biblatex-snippet
+++ b/snippets/biblatex/music.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>music</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Music</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/mvbook.biblatex-snippet b/snippets/biblatex/mvbook.sublime-snippet
similarity index 84%
rename from snippets/mvbook.biblatex-snippet
rename to snippets/biblatex/mvbook.sublime-snippet
index 08718cbe7..c9e8cd18d 100644
--- a/snippets/mvbook.biblatex-snippet
+++ b/snippets/biblatex/mvbook.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>mvbook</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Multi-Volume Book</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/mvcollection.biblatex-snippet b/snippets/biblatex/mvcollection.sublime-snippet
similarity index 84%
rename from snippets/mvcollection.biblatex-snippet
rename to snippets/biblatex/mvcollection.sublime-snippet
index 8792b56c2..36ce6de71 100644
--- a/snippets/mvcollection.biblatex-snippet
+++ b/snippets/biblatex/mvcollection.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>mvcollection</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Multi-Volume Collection</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/mvproceedings.biblatex-snippet b/snippets/biblatex/mvproceedings.sublime-snippet
similarity index 82%
rename from snippets/mvproceedings.biblatex-snippet
rename to snippets/biblatex/mvproceedings.sublime-snippet
index fa271b4bb..d3881e8df 100644
--- a/snippets/mvproceedings.biblatex-snippet
+++ b/snippets/biblatex/mvproceedings.sublime-snippet
@@ -7,6 +7,6 @@
 }
 ]]></content>
 	<tabTrigger>mvproceedings</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Multi-Volume Proceedings</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/mvreference.biblatex-snippet b/snippets/biblatex/mvreference.sublime-snippet
similarity index 84%
rename from snippets/mvreference.biblatex-snippet
rename to snippets/biblatex/mvreference.sublime-snippet
index 52d83ba5d..c6d151b36 100644
--- a/snippets/mvreference.biblatex-snippet
+++ b/snippets/biblatex/mvreference.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>mvreference</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Multi-Volume Reference</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/online.biblatex-snippet b/snippets/biblatex/online.sublime-snippet
similarity index 74%
rename from snippets/online.biblatex-snippet
rename to snippets/biblatex/online.sublime-snippet
index 02237e25c..0294a9b19 100644
--- a/snippets/online.biblatex-snippet
+++ b/snippets/biblatex/online.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>online</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Online</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/patent.biblatex-snippet b/snippets/biblatex/patent.sublime-snippet
similarity index 77%
rename from snippets/patent.biblatex-snippet
rename to snippets/biblatex/patent.sublime-snippet
index 846ec278d..dbc2a3342 100644
--- a/snippets/patent.biblatex-snippet
+++ b/snippets/biblatex/patent.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>patent</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Patent</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/periodical.biblatex-snippet b/snippets/biblatex/periodical.sublime-snippet
similarity index 79%
rename from snippets/periodical.biblatex-snippet
rename to snippets/biblatex/periodical.sublime-snippet
index 4c910a5d5..2bfdf1210 100644
--- a/snippets/periodical.biblatex-snippet
+++ b/snippets/biblatex/periodical.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>periodical</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Periodical</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/phdthesis.biblatex-snippet b/snippets/biblatex/phdthesis.sublime-snippet
similarity index 79%
rename from snippets/phdthesis.biblatex-snippet
rename to snippets/biblatex/phdthesis.sublime-snippet
index e2e6d526e..6612c4e10 100644
--- a/snippets/phdthesis.biblatex-snippet
+++ b/snippets/biblatex/phdthesis.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>phdthesis</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX PhD Thesis</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/proceedings.biblatex-snippet b/snippets/biblatex/proceedings.sublime-snippet
similarity index 82%
rename from snippets/proceedings.biblatex-snippet
rename to snippets/biblatex/proceedings.sublime-snippet
index a2f1b13e6..1646faf5e 100644
--- a/snippets/proceedings.biblatex-snippet
+++ b/snippets/biblatex/proceedings.sublime-snippet
@@ -7,6 +7,6 @@
 }
 ]]></content>
 	<tabTrigger>proceedings</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Proceedings</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/reference.biblatex-snippet b/snippets/biblatex/reference.sublime-snippet
similarity index 83%
rename from snippets/reference.biblatex-snippet
rename to snippets/biblatex/reference.sublime-snippet
index 2a789c19b..6fc60d3a4 100644
--- a/snippets/reference.biblatex-snippet
+++ b/snippets/biblatex/reference.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>reference</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Reference</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/report.biblatex-snippet b/snippets/biblatex/report.sublime-snippet
similarity index 79%
rename from snippets/report.biblatex-snippet
rename to snippets/biblatex/report.sublime-snippet
index deeefef23..7cef0e8c9 100644
--- a/snippets/report.biblatex-snippet
+++ b/snippets/biblatex/report.sublime-snippet
@@ -11,5 +11,5 @@
 ]]></content>
 	<tabTrigger>report</tabTrigger>
 	<description>BibLaTeX Report</description>
-	<scope>text.biblatex</scope>
+		<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 </snippet>
diff --git a/snippets/set.biblatex-snippet b/snippets/biblatex/set.sublime-snippet
similarity index 58%
rename from snippets/set.biblatex-snippet
rename to snippets/biblatex/set.sublime-snippet
index d20d3f4fd..8ee73b7d3 100644
--- a/snippets/set.biblatex-snippet
+++ b/snippets/biblatex/set.sublime-snippet
@@ -5,6 +5,6 @@
 }
 ]]></content>
 	<tabTrigger>set</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Set</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/suppbook.biblatex-snippet b/snippets/biblatex/suppbook.sublime-snippet
similarity index 85%
rename from snippets/suppbook.biblatex-snippet
rename to snippets/biblatex/suppbook.sublime-snippet
index 7091e60d0..fa3005018 100644
--- a/snippets/suppbook.biblatex-snippet
+++ b/snippets/biblatex/suppbook.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>suppbook</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Suppbook</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/suppcollection.biblatex-snippet b/snippets/biblatex/suppcollection.sublime-snippet
similarity index 85%
rename from snippets/suppcollection.biblatex-snippet
rename to snippets/biblatex/suppcollection.sublime-snippet
index 4c71f5e2e..0f432eeda 100644
--- a/snippets/suppcollection.biblatex-snippet
+++ b/snippets/biblatex/suppcollection.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>suppcollection</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Suppcollection</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/suppperiodical.biblatex-snippet b/snippets/biblatex/suppperiodical.sublime-snippet
similarity index 83%
rename from snippets/suppperiodical.biblatex-snippet
rename to snippets/biblatex/suppperiodical.sublime-snippet
index 733b57de8..af91f4aca 100644
--- a/snippets/suppperiodical.biblatex-snippet
+++ b/snippets/biblatex/suppperiodical.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>suppperiodical</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Suppperiodical</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/techreport.biblatex-snippet b/snippets/biblatex/techreport.sublime-snippet
similarity index 79%
rename from snippets/techreport.biblatex-snippet
rename to snippets/biblatex/techreport.sublime-snippet
index 67207dcfb..8ee628968 100644
--- a/snippets/techreport.biblatex-snippet
+++ b/snippets/biblatex/techreport.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>techreport</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Techreport</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/thesis.biblatex-snippet b/snippets/biblatex/thesis.sublime-snippet
similarity index 79%
rename from snippets/thesis.biblatex-snippet
rename to snippets/biblatex/thesis.sublime-snippet
index 3a6c17f7a..4d3f0d330 100644
--- a/snippets/thesis.biblatex-snippet
+++ b/snippets/biblatex/thesis.sublime-snippet
@@ -10,6 +10,6 @@
 }
 ]]></content>
 	<tabTrigger>thesis</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Thesis</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/unpublished.biblatex-snippet b/snippets/biblatex/unpublished.sublime-snippet
similarity index 76%
rename from snippets/unpublished.biblatex-snippet
rename to snippets/biblatex/unpublished.sublime-snippet
index 04122ff17..62fbeedeb 100644
--- a/snippets/unpublished.biblatex-snippet
+++ b/snippets/biblatex/unpublished.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>unpublished</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Unpublished</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/video.biblatex-snippet b/snippets/biblatex/video.sublime-snippet
similarity index 75%
rename from snippets/video.biblatex-snippet
rename to snippets/biblatex/video.sublime-snippet
index ad78a8479..7a97da30b 100644
--- a/snippets/video.biblatex-snippet
+++ b/snippets/biblatex/video.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>video</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Video</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/www.biblatex-snippet b/snippets/biblatex/www.sublime-snippet
similarity index 74%
rename from snippets/www.biblatex-snippet
rename to snippets/biblatex/www.sublime-snippet
index b0c7d531f..8f585092b 100644
--- a/snippets/www.biblatex-snippet
+++ b/snippets/biblatex/www.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>www</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX WWW</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/xdata.biblatex-snippet b/snippets/biblatex/xdata.sublime-snippet
similarity index 56%
rename from snippets/xdata.biblatex-snippet
rename to snippets/biblatex/xdata.sublime-snippet
index eed8361f1..c86f6cc4a 100644
--- a/snippets/xdata.biblatex-snippet
+++ b/snippets/biblatex/xdata.sublime-snippet
@@ -5,6 +5,6 @@
 }
 ]]></content>
 	<tabTrigger>xdata</tabTrigger>
+	<scope>text.biblatex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibLaTeX Xdata</description>
-	<scope>text.biblatex</scope>
 </snippet>
diff --git a/snippets/article.bibtex-snippet b/snippets/bibtex/article.sublime-snippet
similarity index 72%
rename from snippets/article.bibtex-snippet
rename to snippets/bibtex/article.sublime-snippet
index e703ff46c..992477848 100644
--- a/snippets/article.bibtex-snippet
+++ b/snippets/bibtex/article.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>article</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Article</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/book.bibtex-snippet b/snippets/bibtex/book.sublime-snippet
similarity index 73%
rename from snippets/book.bibtex-snippet
rename to snippets/bibtex/book.sublime-snippet
index 975e08f3c..36450d282 100644
--- a/snippets/book.bibtex-snippet
+++ b/snippets/bibtex/book.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>book</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Book</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/booklet.bibtex-snippet b/snippets/bibtex/booklet.sublime-snippet
similarity index 67%
rename from snippets/booklet.bibtex-snippet
rename to snippets/bibtex/booklet.sublime-snippet
index 83148f94b..6cb571c0d 100644
--- a/snippets/booklet.bibtex-snippet
+++ b/snippets/bibtex/booklet.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>booklet</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Booklet</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/conference.bibtex-snippet b/snippets/bibtex/conference.sublime-snippet
similarity index 76%
rename from snippets/conference.bibtex-snippet
rename to snippets/bibtex/conference.sublime-snippet
index cfef494d5..761c392b5 100644
--- a/snippets/conference.bibtex-snippet
+++ b/snippets/bibtex/conference.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>conference</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Conference</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/inbook.bibtex-snippet b/snippets/bibtex/inbook.sublime-snippet
similarity index 75%
rename from snippets/inbook.bibtex-snippet
rename to snippets/bibtex/inbook.sublime-snippet
index 6a3c705b4..eabe2a92e 100644
--- a/snippets/inbook.bibtex-snippet
+++ b/snippets/bibtex/inbook.sublime-snippet
@@ -10,6 +10,6 @@
 }
 ]]></content>
 	<tabTrigger>inbook</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Inbook</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/incollection.bibtex-snippet b/snippets/bibtex/incollection.sublime-snippet
similarity index 77%
rename from snippets/incollection.bibtex-snippet
rename to snippets/bibtex/incollection.sublime-snippet
index fa8a69fa5..a28e06278 100644
--- a/snippets/incollection.bibtex-snippet
+++ b/snippets/bibtex/incollection.sublime-snippet
@@ -10,6 +10,6 @@
 }
 ]]></content>
 	<tabTrigger>incollection</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Incollection</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/inproceedings.bibtex-snippet b/snippets/bibtex/inproceedings.sublime-snippet
similarity index 76%
rename from snippets/inproceedings.bibtex-snippet
rename to snippets/bibtex/inproceedings.sublime-snippet
index 6e5aa5ee2..3ebd24371 100644
--- a/snippets/inproceedings.bibtex-snippet
+++ b/snippets/bibtex/inproceedings.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>inproceedings</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Inproceedings</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/manual.bibtex-snippet b/snippets/bibtex/manual.sublime-snippet
similarity index 68%
rename from snippets/manual.bibtex-snippet
rename to snippets/bibtex/manual.sublime-snippet
index 0a9617b99..c660227f3 100644
--- a/snippets/manual.bibtex-snippet
+++ b/snippets/bibtex/manual.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>manual</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Manual</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/mastersthesis.bibtex-snippet b/snippets/bibtex/mastersthesis.sublime-snippet
similarity index 73%
rename from snippets/mastersthesis.bibtex-snippet
rename to snippets/bibtex/mastersthesis.sublime-snippet
index 4a0bba583..14aca1efb 100644
--- a/snippets/mastersthesis.bibtex-snippet
+++ b/snippets/bibtex/mastersthesis.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>mastersthesis</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Master Thesis</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/misc.bibtex-snippet b/snippets/bibtex/misc.sublime-snippet
similarity index 64%
rename from snippets/misc.bibtex-snippet
rename to snippets/bibtex/misc.sublime-snippet
index 43f408a02..05d24ceac 100644
--- a/snippets/misc.bibtex-snippet
+++ b/snippets/bibtex/misc.sublime-snippet
@@ -6,6 +6,6 @@
 }
 ]]></content>
 	<tabTrigger>misc</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Misc</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/phdthesis.bibtex-snippet b/snippets/bibtex/phdthesis.sublime-snippet
similarity index 72%
rename from snippets/phdthesis.bibtex-snippet
rename to snippets/bibtex/phdthesis.sublime-snippet
index dc35c02cc..677911a94 100644
--- a/snippets/phdthesis.bibtex-snippet
+++ b/snippets/bibtex/phdthesis.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>phdthesis</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX PhD Thesis</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/proceedings.bibtex-snippet b/snippets/bibtex/proceedings.sublime-snippet
similarity index 72%
rename from snippets/proceedings.bibtex-snippet
rename to snippets/bibtex/proceedings.sublime-snippet
index 352505e04..fdfaf0c61 100644
--- a/snippets/proceedings.bibtex-snippet
+++ b/snippets/bibtex/proceedings.sublime-snippet
@@ -7,6 +7,6 @@
 }
 ]]></content>
 	<tabTrigger>proceedings</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Proceedings</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/techreport.bibtex-snippet b/snippets/bibtex/techreport.sublime-snippet
similarity index 73%
rename from snippets/techreport.bibtex-snippet
rename to snippets/bibtex/techreport.sublime-snippet
index 778635ca0..bf4ed9837 100644
--- a/snippets/techreport.bibtex-snippet
+++ b/snippets/bibtex/techreport.sublime-snippet
@@ -9,6 +9,6 @@
 }
 ]]></content>
 	<tabTrigger>techreport</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Techreport</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/unpublished.bibtex-snippet b/snippets/bibtex/unpublished.sublime-snippet
similarity index 69%
rename from snippets/unpublished.bibtex-snippet
rename to snippets/bibtex/unpublished.sublime-snippet
index fc420f2b6..9bcb685ae 100644
--- a/snippets/unpublished.bibtex-snippet
+++ b/snippets/bibtex/unpublished.sublime-snippet
@@ -8,6 +8,6 @@
 }
 ]]></content>
 	<tabTrigger>unpublished</tabTrigger>
+	<scope>text.bibtex - meta.entry.braces.bibtex - meta.entry.parenthesis.bibtex - meta.entry.arguments.bibtex</scope>
 	<description>BibTeX Unpublished</description>
-	<scope>text.bibtex</scope>
 </snippet>
diff --git a/snippets/latex/baa.sublime-snippet b/snippets/latex/baa.sublime-snippet
new file mode 100644
index 000000000..d210a61b2
--- /dev/null
+++ b/snippets/latex/baa.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{alignat*}
+$0
+\end{alignat*}
+]]></content>
+	<tabTrigger>baa</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{alignat*}</description>
+</snippet>
diff --git a/snippets/latex/baan.sublime-snippet b/snippets/latex/baan.sublime-snippet
new file mode 100644
index 000000000..10e9c8b30
--- /dev/null
+++ b/snippets/latex/baan.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{alignat}
+$0
+\end{alignat}
+]]></content>
+	<tabTrigger>baan</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{alignat}</description>
+</snippet>
diff --git a/snippets/latex/bal.sublime-snippet b/snippets/latex/bal.sublime-snippet
new file mode 100644
index 000000000..5bebeb051
--- /dev/null
+++ b/snippets/latex/bal.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{align*}
+$0
+\end{align*}
+]]></content>
+	<tabTrigger>bal</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{align*}</description>
+</snippet>
diff --git a/snippets/latex/baln.sublime-snippet b/snippets/latex/baln.sublime-snippet
new file mode 100644
index 000000000..d5fc03edb
--- /dev/null
+++ b/snippets/latex/baln.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{align}
+$0
+\end{align}
+]]></content>
+	<tabTrigger>baln</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{align}</description>
+</snippet>
diff --git a/snippets/latex/ben.sublime-snippet b/snippets/latex/ben.sublime-snippet
new file mode 100644
index 000000000..c03609cef
--- /dev/null
+++ b/snippets/latex/ben.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{enumerate}
+	\item $0
+\end{enumerate}
+]]></content>
+	<tabTrigger>ben</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{enumerate}</description>
+</snippet>
diff --git a/snippets/latex/beqn.sublime-snippet b/snippets/latex/beqn.sublime-snippet
new file mode 100644
index 000000000..8f1b7f4b4
--- /dev/null
+++ b/snippets/latex/beqn.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{equation}
+$0
+\end{equation}
+]]></content>
+	<tabTrigger>beqn</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{equation}</description>
+</snippet>
diff --git a/snippets/latex/bf.sublime-snippet b/snippets/latex/bf.sublime-snippet
new file mode 100644
index 000000000..b7dba5433
--- /dev/null
+++ b/snippets/latex/bf.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\textbf{${1:$SELECTION}}]]></content>
+	<tabTrigger>bf</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\textbf{}</description>
+</snippet>
diff --git a/snippets/latex/bfl.sublime-snippet b/snippets/latex/bfl.sublime-snippet
new file mode 100644
index 000000000..c011a21d8
--- /dev/null
+++ b/snippets/latex/bfl.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{flalign*}
+$0
+\end{flalign*}
+]]></content>
+	<tabTrigger>bfl</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{flalign*}</description>
+</snippet>
diff --git a/snippets/latex/bfln.sublime-snippet b/snippets/latex/bfln.sublime-snippet
new file mode 100644
index 000000000..f0de61e54
--- /dev/null
+++ b/snippets/latex/bfln.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{flalign}
+$0
+\end{flalign}
+]]></content>
+	<tabTrigger>bfln</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{flalign}</description>
+</snippet>
diff --git a/snippets/latex/bga.sublime-snippet b/snippets/latex/bga.sublime-snippet
new file mode 100644
index 000000000..6b20c990c
--- /dev/null
+++ b/snippets/latex/bga.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{gather*}
+$0
+\end{gather*}
+]]></content>
+	<tabTrigger>bga</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{gather*}</description>
+</snippet>
diff --git a/snippets/latex/bgan.sublime-snippet b/snippets/latex/bgan.sublime-snippet
new file mode 100644
index 000000000..abaed2586
--- /dev/null
+++ b/snippets/latex/bgan.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{gather}
+$0
+\end{gather}
+]]></content>
+	<tabTrigger>bgan</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{gather}</description>
+</snippet>
diff --git a/snippets/latex/bit.sublime-snippet b/snippets/latex/bit.sublime-snippet
new file mode 100644
index 000000000..df03cc59e
--- /dev/null
+++ b/snippets/latex/bit.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{itemize}
+	\item $0
+\end{itemize}
+]]></content>
+	<tabTrigger>bit</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{itemize}</description>
+</snippet>
diff --git a/snippets/latex/bml.sublime-snippet b/snippets/latex/bml.sublime-snippet
new file mode 100644
index 000000000..92aa7140e
--- /dev/null
+++ b/snippets/latex/bml.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{multline*}
+$0
+\end{multline*}
+]]></content>
+	<tabTrigger>bml</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{multline*}</description>
+</snippet>
diff --git a/snippets/latex/bmln.sublime-snippet b/snippets/latex/bmln.sublime-snippet
new file mode 100644
index 000000000..cf9e22b44
--- /dev/null
+++ b/snippets/latex/bmln.sublime-snippet
@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[\begin{multline}
+$0
+\end{multline}
+]]></content>
+	<tabTrigger>bmln</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\begin{multline}</description>
+</snippet>
diff --git a/Beamer boxes.sublime-snippet b/snippets/latex/box.sublime-snippet
similarity index 74%
rename from Beamer boxes.sublime-snippet
rename to snippets/latex/box.sublime-snippet
index e90d97354..d119ceb2b 100644
--- a/Beamer boxes.sublime-snippet	
+++ b/snippets/latex/box.sublime-snippet
@@ -3,6 +3,6 @@
 $0
 \\end{beamerboxesrounded}]]></content>
 	<tabTrigger>box</tabTrigger>
-	<scope>text.tex.latex</scope>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
 	<description>Beamer boxes</description>
 </snippet>
diff --git a/snippets/latex/bs.sublime-snippet b/snippets/latex/bs.sublime-snippet
new file mode 100644
index 000000000..87221f76a
--- /dev/null
+++ b/snippets/latex/bs.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\bigskip]]></content>
+	<tabTrigger>bs</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\bigskip</description>
+</snippet>
diff --git a/table.sublime-snippet b/snippets/latex/btable.sublime-snippet
similarity index 84%
rename from table.sublime-snippet
rename to snippets/latex/btable.sublime-snippet
index 34101935c..8c04a25fa 100644
--- a/table.sublime-snippet
+++ b/snippets/latex/btable.sublime-snippet
@@ -19,5 +19,5 @@
 \end{table}
 ]]></content>
 	<tabTrigger>btable</tabTrigger>
-	<scope>text.tex.latex</scope>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
 </snippet>
diff --git a/snippets/latex/em.sublime-snippet b/snippets/latex/em.sublime-snippet
new file mode 100644
index 000000000..4f8f9d145
--- /dev/null
+++ b/snippets/latex/em.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\emph{${1:$SELECTION}}]]></content>
+	<tabTrigger>em</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\emph{}</description>
+</snippet>
diff --git a/figure.sublime-snippet b/snippets/latex/figure.sublime-snippet
similarity index 75%
rename from figure.sublime-snippet
rename to snippets/latex/figure.sublime-snippet
index 39dab6597..6c0fb4168 100644
--- a/figure.sublime-snippet
+++ b/snippets/latex/figure.sublime-snippet
@@ -7,5 +7,5 @@
 \end{figure}
 ]]></content>
 	<tabTrigger>bfigure</tabTrigger>
-	<scope>text.tex.latex</scope>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
 </snippet>
diff --git a/Beamer frame.sublime-snippet b/snippets/latex/frame.sublime-snippet
similarity index 73%
rename from Beamer frame.sublime-snippet
rename to snippets/latex/frame.sublime-snippet
index 47d1a322d..392d68924 100644
--- a/Beamer frame.sublime-snippet	
+++ b/snippets/latex/frame.sublime-snippet
@@ -5,6 +5,6 @@ $0
 
 \\end{frame}]]></content>
 	<tabTrigger>frame</tabTrigger>
-	<scope>text.tex.latex</scope>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
 	<description>Beamer frame</description>
 </snippet>
diff --git a/snippets/latex/i.sublime-snippet b/snippets/latex/i.sublime-snippet
new file mode 100644
index 000000000..52a309f63
--- /dev/null
+++ b/snippets/latex/i.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\item ]]></content>
+	<tabTrigger>i</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\item </description>
+</snippet>
diff --git a/snippets/latex/it.sublime-snippet b/snippets/latex/it.sublime-snippet
new file mode 100644
index 000000000..7ba2132f0
--- /dev/null
+++ b/snippets/latex/it.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\textit{${1:$SELECTION}}]]></content>
+	<tabTrigger>it</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\textit{}</description>
+</snippet>
diff --git a/snippets/latex/ms.sublime-snippet b/snippets/latex/ms.sublime-snippet
new file mode 100644
index 000000000..66e95b7bb
--- /dev/null
+++ b/snippets/latex/ms.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\medskip]]></content>
+	<tabTrigger>ms</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\medskip</description>
+</snippet>
diff --git a/Remark.sublime-snippet b/snippets/latex/rem.sublime-snippet
old mode 100755
new mode 100644
similarity index 69%
rename from Remark.sublime-snippet
rename to snippets/latex/rem.sublime-snippet
index d44b32f68..700cc8fe8
--- a/Remark.sublime-snippet
+++ b/snippets/latex/rem.sublime-snippet
@@ -2,6 +2,6 @@
 	<content><![CDATA[\\begin{remark}\label{rem:$0}
 \\end{remark}]]></content>
 	<tabTrigger>rem</tabTrigger>
-	<scope>text.tex.latex</scope>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
 	<description>Remark</description>
 </snippet>
diff --git a/snippets/latex/sf.sublime-snippet b/snippets/latex/sf.sublime-snippet
new file mode 100644
index 000000000..ff2efb8fe
--- /dev/null
+++ b/snippets/latex/sf.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\textsf{${1:$SELECTION}}]]></content>
+	<tabTrigger>sf</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\textsf{}</description>
+</snippet>
diff --git a/snippets/latex/sl.sublime-snippet b/snippets/latex/sl.sublime-snippet
new file mode 100644
index 000000000..8b7fb9274
--- /dev/null
+++ b/snippets/latex/sl.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\textsl{${1:$SELECTION}}]]></content>
+	<tabTrigger>sl</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\textsl{}</description>
+</snippet>
diff --git a/snippets/latex/ss.sublime-snippet b/snippets/latex/ss.sublime-snippet
new file mode 100644
index 000000000..3ecd4c2d1
--- /dev/null
+++ b/snippets/latex/ss.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\smallskip]]></content>
+	<tabTrigger>ss</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\smallskip</description>
+</snippet>
diff --git a/snippets/latex/tt.sublime-snippet b/snippets/latex/tt.sublime-snippet
new file mode 100644
index 000000000..974d7fe68
--- /dev/null
+++ b/snippets/latex/tt.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\texttt{${1:$SELECTION}}]]></content>
+	<tabTrigger>tt</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\texttt{}</description>
+</snippet>
diff --git a/snippets/latex/un.sublime-snippet b/snippets/latex/un.sublime-snippet
new file mode 100644
index 000000000..92f3dabb6
--- /dev/null
+++ b/snippets/latex/un.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\underline{${1:$SELECTION}}]]></content>
+	<tabTrigger>un</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\underline{}</description>
+</snippet>
diff --git a/snippets/latex/use.sublime-snippet b/snippets/latex/use.sublime-snippet
new file mode 100644
index 000000000..2c35f7134
--- /dev/null
+++ b/snippets/latex/use.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\usepackage]]></content>
+	<tabTrigger>use</tabTrigger>
+	<scope>text.tex.latex - text.tex.latex meta.environment.math</scope>
+	<description>\usepackage</description>
+</snippet>
diff --git a/snippets/math/0.sublime-snippet b/snippets/math/0.sublime-snippet
new file mode 100644
index 000000000..732f2b764
--- /dev/null
+++ b/snippets/math/0.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\emptyset]]></content>
+	<tabTrigger>0</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\emptyset</description>
+</snippet>
diff --git a/snippets/math/D_upr.sublime-snippet b/snippets/math/D_upr.sublime-snippet
new file mode 100644
index 000000000..566ff9ceb
--- /dev/null
+++ b/snippets/math/D_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Delta]]></content>
+	<tabTrigger>D</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Delta</description>
+</snippet>
diff --git a/snippets/math/E_upr.sublime-snippet b/snippets/math/E_upr.sublime-snippet
new file mode 100644
index 000000000..28583752f
--- /dev/null
+++ b/snippets/math/E_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\exists]]></content>
+	<tabTrigger>E</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\exists</description>
+</snippet>
diff --git a/snippets/math/F_upr.sublime-snippet b/snippets/math/F_upr.sublime-snippet
new file mode 100644
index 000000000..99dcb1c55
--- /dev/null
+++ b/snippets/math/F_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Phi]]></content>
+	<tabTrigger>F</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Phi</description>
+</snippet>
diff --git a/snippets/math/G_upr.sublime-snippet b/snippets/math/G_upr.sublime-snippet
new file mode 100644
index 000000000..f2ccec5a8
--- /dev/null
+++ b/snippets/math/G_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Gamma]]></content>
+	<tabTrigger>G</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Gamma</description>
+</snippet>
diff --git a/snippets/math/L_upr.sublime-snippet b/snippets/math/L_upr.sublime-snippet
new file mode 100644
index 000000000..4cf1e424c
--- /dev/null
+++ b/snippets/math/L_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Lambda]]></content>
+	<tabTrigger>L</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Lambda</description>
+</snippet>
diff --git a/snippets/math/Lar_upr.sublime-snippet b/snippets/math/Lar_upr.sublime-snippet
new file mode 100644
index 000000000..53aa157ec
--- /dev/null
+++ b/snippets/math/Lar_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Leftarrow]]></content>
+	<tabTrigger>Lar</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Leftarrow</description>
+</snippet>
diff --git a/snippets/math/Lr_upr.sublime-snippet b/snippets/math/Lr_upr.sublime-snippet
new file mode 100644
index 000000000..d6c065a1a
--- /dev/null
+++ b/snippets/math/Lr_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Leftrightarrow]]></content>
+	<tabTrigger>Lr</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Leftrightarrow</description>
+</snippet>
diff --git a/snippets/math/P_upr.sublime-snippet b/snippets/math/P_upr.sublime-snippet
new file mode 100644
index 000000000..c9f097ce2
--- /dev/null
+++ b/snippets/math/P_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Pi]]></content>
+	<tabTrigger>P</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Pi</description>
+</snippet>
diff --git a/snippets/math/Q_upr.sublime-snippet b/snippets/math/Q_upr.sublime-snippet
new file mode 100644
index 000000000..00935b5ec
--- /dev/null
+++ b/snippets/math/Q_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Theta]]></content>
+	<tabTrigger>Q</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Theta</description>
+</snippet>
diff --git a/snippets/math/Rar_upr.sublime-snippet b/snippets/math/Rar_upr.sublime-snippet
new file mode 100644
index 000000000..06bd3934d
--- /dev/null
+++ b/snippets/math/Rar_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Rightarrow]]></content>
+	<tabTrigger>Rar</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Rightarrow</description>
+</snippet>
diff --git a/snippets/math/S_upr.sublime-snippet b/snippets/math/S_upr.sublime-snippet
new file mode 100644
index 000000000..cb67c14d6
--- /dev/null
+++ b/snippets/math/S_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Sigma]]></content>
+	<tabTrigger>S</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Sigma</description>
+</snippet>
diff --git a/snippets/math/V_upr.sublime-snippet b/snippets/math/V_upr.sublime-snippet
new file mode 100644
index 000000000..79ce7d913
--- /dev/null
+++ b/snippets/math/V_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\forall]]></content>
+	<tabTrigger>V</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\forall</description>
+</snippet>
diff --git a/snippets/math/W_upr.sublime-snippet b/snippets/math/W_upr.sublime-snippet
new file mode 100644
index 000000000..74668bcf8
--- /dev/null
+++ b/snippets/math/W_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Omega]]></content>
+	<tabTrigger>W</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Omega</description>
+</snippet>
diff --git a/snippets/math/X_upr.sublime-snippet b/snippets/math/X_upr.sublime-snippet
new file mode 100644
index 000000000..28c811912
--- /dev/null
+++ b/snippets/math/X_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Xi]]></content>
+	<tabTrigger>X</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Xi</description>
+</snippet>
diff --git a/snippets/math/Y_upr.sublime-snippet b/snippets/math/Y_upr.sublime-snippet
new file mode 100644
index 000000000..9271ba28d
--- /dev/null
+++ b/snippets/math/Y_upr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\Psi]]></content>
+	<tabTrigger>Y</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\Psi</description>
+</snippet>
diff --git a/snippets/math/a.sublime-snippet b/snippets/math/a.sublime-snippet
new file mode 100644
index 000000000..e3fec8a4a
--- /dev/null
+++ b/snippets/math/a.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\alpha]]></content>
+	<tabTrigger>a</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\alpha</description>
+</snippet>
diff --git a/snippets/math/b.sublime-snippet b/snippets/math/b.sublime-snippet
new file mode 100644
index 000000000..ae84e8477
--- /dev/null
+++ b/snippets/math/b.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\beta]]></content>
+	<tabTrigger>b</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\beta</description>
+</snippet>
diff --git a/snippets/math/bb.sublime-snippet b/snippets/math/bb.sublime-snippet
new file mode 100644
index 000000000..3813583f6
--- /dev/null
+++ b/snippets/math/bb.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathbb{${1:$SELECTION}}]]></content>
+	<tabTrigger>bb</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathbb{}</description>
+</snippet>
diff --git a/snippets/math/bca.sublime-snippet b/snippets/math/bca.sublime-snippet
new file mode 100644
index 000000000..557e182f4
--- /dev/null
+++ b/snippets/math/bca.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\bigcap]]></content>
+	<tabTrigger>bca</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\bigcap</description>
+</snippet>
diff --git a/snippets/math/bcu.sublime-snippet b/snippets/math/bcu.sublime-snippet
new file mode 100644
index 000000000..fd6eb4fff
--- /dev/null
+++ b/snippets/math/bcu.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\bigcup]]></content>
+	<tabTrigger>bcu</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\bigcup</description>
+</snippet>
diff --git a/snippets/math/bf.sublime-snippet b/snippets/math/bf.sublime-snippet
new file mode 100644
index 000000000..77978840a
--- /dev/null
+++ b/snippets/math/bf.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathbf{${1:$SELECTION}}]]></content>
+	<tabTrigger>bf</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathbf{}</description>
+</snippet>
diff --git a/snippets/math/c.sublime-snippet b/snippets/math/c.sublime-snippet
new file mode 100644
index 000000000..0ec9af566
--- /dev/null
+++ b/snippets/math/c.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\chi]]></content>
+	<tabTrigger>c</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\chi</description>
+</snippet>
diff --git a/snippets/math/ca.sublime-snippet b/snippets/math/ca.sublime-snippet
new file mode 100644
index 000000000..8a4d7e6a5
--- /dev/null
+++ b/snippets/math/ca.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\cap]]></content>
+	<tabTrigger>ca</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\cap</description>
+</snippet>
diff --git a/snippets/math/cal.sublime-snippet b/snippets/math/cal.sublime-snippet
new file mode 100644
index 000000000..a9f597fac
--- /dev/null
+++ b/snippets/math/cal.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathcal]]></content>
+	<tabTrigger>cal</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathcal</description>
+</snippet>
diff --git a/snippets/math/cd.sublime-snippet b/snippets/math/cd.sublime-snippet
new file mode 100644
index 000000000..19e9470da
--- /dev/null
+++ b/snippets/math/cd.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\cdot]]></content>
+	<tabTrigger>cd</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\cdot</description>
+</snippet>
diff --git a/snippets/math/cu.sublime-snippet b/snippets/math/cu.sublime-snippet
new file mode 100644
index 000000000..849a040c2
--- /dev/null
+++ b/snippets/math/cu.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\cup]]></content>
+	<tabTrigger>cu</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\cup</description>
+</snippet>
diff --git a/snippets/math/d.sublime-snippet b/snippets/math/d.sublime-snippet
new file mode 100644
index 000000000..ac3aa553c
--- /dev/null
+++ b/snippets/math/d.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\delta]]></content>
+	<tabTrigger>d</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\delta</description>
+</snippet>
diff --git a/snippets/math/do.sublime-snippet b/snippets/math/do.sublime-snippet
new file mode 100644
index 000000000..d5eec767b
--- /dev/null
+++ b/snippets/math/do.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\downarrow]]></content>
+	<tabTrigger>do</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\downarrow</description>
+</snippet>
diff --git a/snippets/math/e.sublime-snippet b/snippets/math/e.sublime-snippet
new file mode 100644
index 000000000..e6f718759
--- /dev/null
+++ b/snippets/math/e.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\epsilon]]></content>
+	<tabTrigger>e</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\epsilon</description>
+</snippet>
diff --git a/snippets/math/f.sublime-snippet b/snippets/math/f.sublime-snippet
new file mode 100644
index 000000000..b725262fd
--- /dev/null
+++ b/snippets/math/f.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\phi]]></content>
+	<tabTrigger>f</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\phi</description>
+</snippet>
diff --git a/snippets/math/fr.sublime-snippet b/snippets/math/fr.sublime-snippet
new file mode 100644
index 000000000..1709c349b
--- /dev/null
+++ b/snippets/math/fr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\frac]]></content>
+	<tabTrigger>fr</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\frac</description>
+</snippet>
diff --git a/snippets/math/fra.sublime-snippet b/snippets/math/fra.sublime-snippet
new file mode 100644
index 000000000..4ce4499bd
--- /dev/null
+++ b/snippets/math/fra.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\frac{$1}{$2}]]></content>
+	<tabTrigger>fra</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\frac{}{}</description>
+</snippet>
diff --git a/snippets/math/g.sublime-snippet b/snippets/math/g.sublime-snippet
new file mode 100644
index 000000000..5655c4487
--- /dev/null
+++ b/snippets/math/g.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\gamma]]></content>
+	<tabTrigger>g</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\gamma</description>
+</snippet>
diff --git a/snippets/math/h.sublime-snippet b/snippets/math/h.sublime-snippet
new file mode 100644
index 000000000..ed8790829
--- /dev/null
+++ b/snippets/math/h.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\eta]]></content>
+	<tabTrigger>h</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\eta</description>
+</snippet>
diff --git a/snippets/math/i.sublime-snippet b/snippets/math/i.sublime-snippet
new file mode 100644
index 000000000..c9d78d01c
--- /dev/null
+++ b/snippets/math/i.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\iota]]></content>
+	<tabTrigger>i</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\iota</description>
+</snippet>
diff --git a/snippets/math/in.sublime-snippet b/snippets/math/in.sublime-snippet
new file mode 100644
index 000000000..6f7363261
--- /dev/null
+++ b/snippets/math/in.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\int]]></content>
+	<tabTrigger>in</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\int</description>
+</snippet>
diff --git a/snippets/math/it.sublime-snippet b/snippets/math/it.sublime-snippet
new file mode 100644
index 000000000..3ca2e0731
--- /dev/null
+++ b/snippets/math/it.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathit{${1:$SELECTION}}]]></content>
+	<tabTrigger>it</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathit{}</description>
+</snippet>
diff --git a/snippets/math/k.sublime-snippet b/snippets/math/k.sublime-snippet
new file mode 100644
index 000000000..441082615
--- /dev/null
+++ b/snippets/math/k.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\kappa]]></content>
+	<tabTrigger>k</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\kappa</description>
+</snippet>
diff --git a/snippets/math/l.sublime-snippet b/snippets/math/l.sublime-snippet
new file mode 100644
index 000000000..facce716f
--- /dev/null
+++ b/snippets/math/l.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\lambda]]></content>
+	<tabTrigger>l</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\lambda</description>
+</snippet>
diff --git a/snippets/math/la.sublime-snippet b/snippets/math/la.sublime-snippet
new file mode 100644
index 000000000..d4c8e285a
--- /dev/null
+++ b/snippets/math/la.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\langle]]></content>
+	<tabTrigger>la</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\langle</description>
+</snippet>
diff --git a/snippets/math/lar.sublime-snippet b/snippets/math/lar.sublime-snippet
new file mode 100644
index 000000000..6261d5531
--- /dev/null
+++ b/snippets/math/lar.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\leftarrow]]></content>
+	<tabTrigger>lar</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\leftarrow</description>
+</snippet>
diff --git a/snippets/math/lb.sublime-snippet b/snippets/math/lb.sublime-snippet
new file mode 100644
index 000000000..110406170
--- /dev/null
+++ b/snippets/math/lb.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\left[ $1 \right] $0]]></content>
+	<tabTrigger>lb</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\left[  \right] </description>
+</snippet>
diff --git a/snippets/math/lbr.sublime-snippet b/snippets/math/lbr.sublime-snippet
new file mode 100644
index 000000000..b5cc2b944
--- /dev/null
+++ b/snippets/math/lbr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\left\\{ $0 \right\\}]]></content>
+	<tabTrigger>lbr</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\left\\{  \right\\}</description>
+</snippet>
diff --git a/snippets/math/ld.sublime-snippet b/snippets/math/ld.sublime-snippet
new file mode 100644
index 000000000..d0894d604
--- /dev/null
+++ b/snippets/math/ld.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\ldots]]></content>
+	<tabTrigger>ld</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\ldots</description>
+</snippet>
diff --git a/snippets/math/lp.sublime-snippet b/snippets/math/lp.sublime-snippet
new file mode 100644
index 000000000..b5a3a6694
--- /dev/null
+++ b/snippets/math/lp.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\left( $1 \right) $0]]></content>
+	<tabTrigger>lp</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\left(  \right) </description>
+</snippet>
diff --git a/snippets/math/lr.sublime-snippet b/snippets/math/lr.sublime-snippet
new file mode 100644
index 000000000..564611e2a
--- /dev/null
+++ b/snippets/math/lr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\leftrightarrow]]></content>
+	<tabTrigger>lr</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\leftrightarrow</description>
+</snippet>
diff --git a/snippets/math/m.sublime-snippet b/snippets/math/m.sublime-snippet
new file mode 100644
index 000000000..ca361e66c
--- /dev/null
+++ b/snippets/math/m.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mu]]></content>
+	<tabTrigger>m</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mu</description>
+</snippet>
diff --git a/snippets/math/mathcal.sublime-snippet b/snippets/math/mathcal.sublime-snippet
new file mode 100644
index 000000000..3b447e83c
--- /dev/null
+++ b/snippets/math/mathcal.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[mathcal{${1:$SELECTION}}]]></content>
+	<tabTrigger>mathcal</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>mathcal{}</description>
+</snippet>
diff --git a/snippets/math/n.sublime-snippet b/snippets/math/n.sublime-snippet
new file mode 100644
index 000000000..79a4c1bc3
--- /dev/null
+++ b/snippets/math/n.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\nu]]></content>
+	<tabTrigger>n</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\nu</description>
+</snippet>
diff --git a/snippets/math/p.sublime-snippet b/snippets/math/p.sublime-snippet
new file mode 100644
index 000000000..d7077526c
--- /dev/null
+++ b/snippets/math/p.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\pi]]></content>
+	<tabTrigger>p</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\pi</description>
+</snippet>
diff --git a/snippets/math/pr.sublime-snippet b/snippets/math/pr.sublime-snippet
new file mode 100644
index 000000000..a178f885c
--- /dev/null
+++ b/snippets/math/pr.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\prod]]></content>
+	<tabTrigger>pr</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\prod</description>
+</snippet>
diff --git a/snippets/math/q.sublime-snippet b/snippets/math/q.sublime-snippet
new file mode 100644
index 000000000..d48a33fde
--- /dev/null
+++ b/snippets/math/q.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\theta]]></content>
+	<tabTrigger>q</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\theta</description>
+</snippet>
diff --git a/snippets/math/qd.sublime-snippet b/snippets/math/qd.sublime-snippet
new file mode 100644
index 000000000..df33238c5
--- /dev/null
+++ b/snippets/math/qd.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\quad]]></content>
+	<tabTrigger>qd</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\quad</description>
+</snippet>
diff --git a/snippets/math/qqd.sublime-snippet b/snippets/math/qqd.sublime-snippet
new file mode 100644
index 000000000..cf2c44072
--- /dev/null
+++ b/snippets/math/qqd.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\qquad]]></content>
+	<tabTrigger>qqd</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\qquad</description>
+</snippet>
diff --git a/snippets/math/r.sublime-snippet b/snippets/math/r.sublime-snippet
new file mode 100644
index 000000000..2a0682075
--- /dev/null
+++ b/snippets/math/r.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\rho]]></content>
+	<tabTrigger>r</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\rho</description>
+</snippet>
diff --git a/snippets/math/ra.sublime-snippet b/snippets/math/ra.sublime-snippet
new file mode 100644
index 000000000..d0234c275
--- /dev/null
+++ b/snippets/math/ra.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\rangle]]></content>
+	<tabTrigger>ra</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\rangle</description>
+</snippet>
diff --git a/snippets/math/rar.sublime-snippet b/snippets/math/rar.sublime-snippet
new file mode 100644
index 000000000..d7fb7458d
--- /dev/null
+++ b/snippets/math/rar.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\rightarrow]]></content>
+	<tabTrigger>rar</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\rightarrow</description>
+</snippet>
diff --git a/snippets/math/rm.sublime-snippet b/snippets/math/rm.sublime-snippet
new file mode 100644
index 000000000..307fa58d6
--- /dev/null
+++ b/snippets/math/rm.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathrm{${1:$SELECTION}}]]></content>
+	<tabTrigger>rm</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathrm{}</description>
+</snippet>
diff --git a/snippets/math/s.sublime-snippet b/snippets/math/s.sublime-snippet
new file mode 100644
index 000000000..454db7628
--- /dev/null
+++ b/snippets/math/s.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\sigma]]></content>
+	<tabTrigger>s</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\sigma</description>
+</snippet>
diff --git a/snippets/math/sf.sublime-snippet b/snippets/math/sf.sublime-snippet
new file mode 100644
index 000000000..ee1ad04eb
--- /dev/null
+++ b/snippets/math/sf.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathsf{${1:$SELECTION}}]]></content>
+	<tabTrigger>sf</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathsf{}</description>
+</snippet>
diff --git a/snippets/math/sm.sublime-snippet b/snippets/math/sm.sublime-snippet
new file mode 100644
index 000000000..d60a6f95d
--- /dev/null
+++ b/snippets/math/sm.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\setminus]]></content>
+	<tabTrigger>sm</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\setminus</description>
+</snippet>
diff --git a/snippets/math/sp.sublime-snippet b/snippets/math/sp.sublime-snippet
new file mode 100644
index 000000000..18de15339
--- /dev/null
+++ b/snippets/math/sp.sublime-snippet
@@ -0,0 +1,12 @@
+<snippet>
+	<content><![CDATA[\begin{split}
+$0
+\end{split}
+]]></content>
+	<tabTrigger>sp</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\begin{split}
+
+\end{split}
+</description>
+</snippet>
diff --git a/snippets/math/stack.sublime-snippet b/snippets/math/stack.sublime-snippet
new file mode 100644
index 000000000..4b539edaf
--- /dev/null
+++ b/snippets/math/stack.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\stackrel{$1}{$2}]]></content>
+	<tabTrigger>stack</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\stackrel{}{}</description>
+</snippet>
diff --git a/snippets/math/su.sublime-snippet b/snippets/math/su.sublime-snippet
new file mode 100644
index 000000000..76cb587df
--- /dev/null
+++ b/snippets/math/su.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\sum]]></content>
+	<tabTrigger>su</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\sum</description>
+</snippet>
diff --git a/snippets/math/t.sublime-snippet b/snippets/math/t.sublime-snippet
new file mode 100644
index 000000000..e5306107d
--- /dev/null
+++ b/snippets/math/t.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\tau]]></content>
+	<tabTrigger>t</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\tau</description>
+</snippet>
diff --git a/snippets/math/tt.sublime-snippet b/snippets/math/tt.sublime-snippet
new file mode 100644
index 000000000..77c15d522
--- /dev/null
+++ b/snippets/math/tt.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\mathtt{${1:$SELECTION}}]]></content>
+	<tabTrigger>tt</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\mathtt{}</description>
+</snippet>
diff --git a/snippets/math/u.sublime-snippet b/snippets/math/u.sublime-snippet
new file mode 100644
index 000000000..1cec7bf2e
--- /dev/null
+++ b/snippets/math/u.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\upsilon]]></content>
+	<tabTrigger>u</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\upsilon</description>
+</snippet>
diff --git a/snippets/math/up.sublime-snippet b/snippets/math/up.sublime-snippet
new file mode 100644
index 000000000..a54fe0dad
--- /dev/null
+++ b/snippets/math/up.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\uparrow]]></content>
+	<tabTrigger>up</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\uparrow</description>
+</snippet>
diff --git a/snippets/math/v.sublime-snippet b/snippets/math/v.sublime-snippet
new file mode 100644
index 000000000..c678e6a64
--- /dev/null
+++ b/snippets/math/v.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\digamma]]></content>
+	<tabTrigger>v</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\digamma</description>
+</snippet>
diff --git a/snippets/math/w.sublime-snippet b/snippets/math/w.sublime-snippet
new file mode 100644
index 000000000..76009f062
--- /dev/null
+++ b/snippets/math/w.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\omega]]></content>
+	<tabTrigger>w</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\omega</description>
+</snippet>
diff --git a/snippets/math/x.sublime-snippet b/snippets/math/x.sublime-snippet
new file mode 100644
index 000000000..8ea8a5194
--- /dev/null
+++ b/snippets/math/x.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\xi]]></content>
+	<tabTrigger>x</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\xi</description>
+</snippet>
diff --git a/snippets/math/y.sublime-snippet b/snippets/math/y.sublime-snippet
new file mode 100644
index 000000000..f5010bd9e
--- /dev/null
+++ b/snippets/math/y.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\psi]]></content>
+	<tabTrigger>y</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\psi</description>
+</snippet>
diff --git a/snippets/math/z.sublime-snippet b/snippets/math/z.sublime-snippet
new file mode 100644
index 000000000..479083b93
--- /dev/null
+++ b/snippets/math/z.sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[\zeta]]></content>
+	<tabTrigger>z</tabTrigger>
+	<scope>text.tex.latex meta.environment.math</scope>
+	<description>\zeta</description>
+</snippet>