diff --git a/nvim/my_snippets/snippets/tex.json b/nvim/my_snippets/snippets/tex.json
index fef4fb1..922f93e 100755
--- a/nvim/my_snippets/snippets/tex.json
+++ b/nvim/my_snippets/snippets/tex.json
@@ -1,56 +1,15 @@
 {
-	"Formula (old)": {
-		"prefix": "formulaBare",
-		"body": [
-			"\\begin{tcolorbox}[colback=red!5!white,colframe=red!75!black,title=Formula: $1]",
-			"\t$2",
-			"\\end{tcolorbox}"
-		],
-		"description": "Red tcolorbox to provide a formula (without the default setup)"
-	},
-	"Prepare Latex doc (old)": {
-		"prefix": "LaTeX-Prepare-Old",
-		"body": [
-			"\\documentclass{article}\n",
-			"% Imports %",
-			"\\usepackage{amsmath}",
-			"\\usepackage{graphicx}",
-			"\\usepackage{subcaption}",
-			"\\usepackage[export]{adjustbox}",
-			"\\usepackage{tcolorbox}",
-			"\\usepackage{xcolor}",
-			"\\usepackage{cancel}",
-			"\\usepackage{dsfont}",
-			"\\usepackage{amssymb}",
-			"\\usepackage[a4paper]{geometry}",
-			"\\usepackage{parskip}\n",
-			"% Setup %",
-			"\\title{\\Huge \\textbf{$1}}",
-			"\\author{Janis Hutz}\n",
-			"% Configuring %",
-			"\\addtolength{\\oddsidemargin}{-0.75in}",
-			"\\addtolength{\\textwidth}{1.5in}",
-			"\\addtolength{\\evensidemargin}{-0.75in}",
-			"\\addtolength{\\topmargin}{-1in}",
-			"\\addtolength{\\textheight}{2in}\n",
-			"% Main doc %",
-			"\\begin{document}",
-			"\\maketitle",
-			"$2",
-			"\\end{document}"
-		],
-		"description": "Prepare a LaTeX Document with all relevant imports"
-	},
-	"prepare LaTeX Document (New)": {
+	"prepare LaTeX Document": {
 		"prefix": "latex-prepare",
 		"body": [
 			"\\documentclass{article}\n",
-			"\\input{~/projects/generalSchool/helpers.tex}\n",
+			"\\newcommand{\\dir}{~/projects/latex} % IMPORTANT: No trailing slashes!",
+			"\\input{\\dir/include.tex}",
+			"\\load{recommended}\n",
 			"\\setup{$1}\n",
 			"\\begin{document}",
-			"\\maketitle",
-			"\\pagestyle{fancy}",
-			"\\thispagestyle{fancy}\n\n",
+			"\\startDocument",
+			"\\usetcolorboxes",
 			"$2\n\n",
 			"\\end{document}"
 		],
@@ -59,17 +18,13 @@
 	"Fancy table": {
 		"prefix": "table",
 		"body": [
-			"\\begin{tabular}[h!]{|$1|}",
-			"\t\\hline",
-			"\t\\rowcolor{$2}\\multicolumn{$3}{|c|}{$4}\\",
-			"\t\\hline",
-			"\t$5\\\\\\",
-			"\t\\hline",
-			"\\end{tabular}"
+			"\\begin{tables}{$1}{$2}\n",
+			"\t$3\\\\",
+			"\\end{tables}"
 		],
-		"description": "Inserts a tcolorbox to provide a formula (red)"
+		"description": "Insert a table (without environment)"
 	},
-	"Formula (new)": {
+	"Formula": {
 		"prefix": "formula",
 		"body": [
 			"\\begin{formula}[]{$1}",
@@ -78,7 +33,7 @@
 		],
 		"description": "Inserts a tcolorbox to provide a formula (red)"
 	},
-	"Definition (new)": {
+	"Definition": {
 		"prefix": "definition",
 		"body": [
 			"\\begin{definition}[]{$1}",
@@ -87,7 +42,7 @@
 		],
 		"description": "Inserts a tcolorbox to provide a definition (blue)"
 	},
-	"Recall (new)": {
+	"Recall": {
 		"prefix": "recall",
 		"body": [
 			"\\begin{recall}[]{$1}",
@@ -96,7 +51,7 @@
 		],
 		"description": "Inserts a tcolorbox to provide a recall / revision of previous knowledge (yellow)"
 	},
-	"Important Remarks (new)": {
+	"Important Remarks": {
 		"prefix": "remarks",
 		"body": [
 			"\\begin{remarks}[]{$1}",
@@ -105,25 +60,25 @@
 		],
 		"description": "Inserts a tcolorbox to provide remarks (green)"
 	},
-	"Guides (new)": {
+	"Guides": {
 		"prefix": "guides",
 		"body": [
 			"\\begin{guides}[]{$1}{${2:Usage}}",
 			"\t$2",
 			"\\end{guides}"
 		],
-		"description": "Inserts a tcolorbox to provide guides / instructions on how to use (purple)"
+		"description": "Inserts a tcolorbox to provide guides / instructions on how to use (red)"
 	},
-	"Properties (new)": {
+	"Properties": {
 		"prefix": "properties",
 		"body": [
 			"\\begin{properties}[]{$1}",
 			"\t$2",
 			"\\end{properties}"
 		],
-		"description": "Inserts a tcolorbox to inform about properties / restrictions / limitations"
+		"description": "Inserts a tcolorbox to inform about properties"
 	},
-	"Restrictions (new)": {
+	"Restrictions": {
 		"prefix": "restrictions",
 		"body": [
 			"\\begin{restrictions}[]{$1}",
@@ -132,7 +87,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about restrictions"
 	},
-	"Limitations (new)": {
+	"Limitations": {
 		"prefix": "limitations",
 		"body": [
 			"\\begin{limitations}[]{$1}",
@@ -141,7 +96,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about limitations"
 	},
-	"Theorem (new)": {
+	"Theorem": {
 		"prefix": "theorem",
 		"body": [
 			"\\begin{theorem}[]{$1}",
@@ -150,7 +105,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about theorems"
 	},
-	"Lemma (new)": {
+	"Lemma": {
 		"prefix": "lemma",
 		"body": [
 			"\\begin{lemma}[]{$1}",
@@ -159,7 +114,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about lemmas"
 	},
-	"Corollary (new)": {
+	"Corollary": {
 		"prefix": "corollary",
 		"body": [
 			"\\begin{corollary}[]{$1}",
@@ -168,7 +123,25 @@
 		],
 		"description": "Inserts a tcolorbox to inform about corollaries"
 	},
-	"Terms (new)": {
+	"Proposition": {
+		"prefix": "proposition",
+		"body": [
+			"\\begin{proposition}[]{$1}",
+			"\t$2",
+			"\\end{proposition}"
+		],
+		"description": "Inserts a tcolorbox to inform about propositions"
+	},
+	"Fact": {
+		"prefix": "fact",
+		"body": [
+			"\\begin{fact}[]{$1}",
+			"\t$2",
+			"\\end{fact}"
+		],
+		"description": "Inserts a tcolorbox to inform about facts"
+	},
+	"Terms": {
 		"prefix": "terms",
 		"body": [
 			"\\begin{terms}[]{$1}",
@@ -177,7 +150,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about terms"
 	},
-	"Proof (new)": {
+	"Proof": {
 		"prefix": "proof",
 		"body": [
 			"\\begin{proof}[]{$1}",
@@ -186,7 +159,7 @@
 		],
 		"description": "Inserts a tcolorbox to show a proof"
 	},
-	"Axiom (new)": {
+	"Axiom": {
 		"prefix": "axiom",
 		"body": [
 			"\\begin{axiom}[]{$1}",
@@ -195,7 +168,7 @@
 		],
 		"description": "Inserts a tcolorbox to show an axiom"
 	},
-	"Notation (new)": {
+	"Notation": {
 		"prefix": "notation",
 		"body": [
 			"\\begin{notation}[]{$1}",
@@ -204,7 +177,7 @@
 		],
 		"description": "Inserts a tcolorbox to show notation"
 	},
-	"Example (new)": {
+	"Example": {
 		"prefix": "example",
 		"body": [
 			"\\begin{example}[]{$1}",
@@ -213,16 +186,16 @@
 		],
 		"description": "Inserts a tcolorbox to show example"
 	},
-	"Usage (languages, new)": {
+	"Usage": {
 		"prefix": "usage",
 		"body": [
 			"\\begin{usage}[]{$1}",
 			"\t$2",
 			"\\end{usage}"
 		],
-		"description": "Inserts a tcolorbox to inform about usage in a language context"
+		"description": "Inserts a tcolorbox to inform about usage"
 	},
-	"Conjugation (languages, new)": {
+	"Conjugation": {
 		"prefix": "conjugation",
 		"body": [
 			"\\begin{conjugation}[]{$1}",
@@ -231,7 +204,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about conjugation"
 	},
-	"Forms (languages, new)": {
+	"Forms": {
 		"prefix": "forms",
 		"body": [
 			"\\begin{forms}[]{$1}",
@@ -240,7 +213,7 @@
 		],
 		"description": "Inserts a tcolorbox to inform about forms of e.g. grammatical structures"
 	},
-	"General-Tcolorbox (new)": {
+	"General-Tcolorbox": {
 		"prefix": "general-tcb",
 		"body": [
 			"\\begin{general}[]{${1:title}}{${2:second title}}{${3|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}",
@@ -261,6 +234,108 @@
 			"\\inlineex"
 		]
 	},
+	"Example (short)": {
+		"prefix": "example-short",
+		"body": [
+			"\\shortex"
+		]
+	},
+	"Definition (inline)": {
+		"prefix": "definition-inline",
+		"body": [
+			"\\inlinedef"
+		]
+	},
+	"Definition (short)": {
+		"prefix": "definition-short",
+		"body": [
+			"\\shortdef"
+		]
+	},
+	"Theorem (inline)": {
+		"prefix": "theorem-inline",
+		"body": [
+			"\\inlinetheorem"
+		]
+	},
+	"Theorem (short)": {
+		"prefix": "theorem-short",
+		"body": [
+			"\\shorttheorem"
+		]
+	},
+	"Lemma (inline)": {
+		"prefix": "lemma-inline",
+		"body": [
+			"\\inlinelemma"
+		]
+	},
+	"Lemma (short)": {
+		"prefix": "lemma-short",
+		"body": [
+			"\\shortlemma"
+		]
+	},
+	"Corollary (inline)": {
+		"prefix": "corollary-inline",
+		"body": [
+			"\\inlinecorollary"
+		]
+	},
+	"Corollary (short)": {
+		"prefix": "corollary-short",
+		"body": [
+			"\\shortcorollary"
+		]
+	},
+	"Proposition (inline)": {
+		"prefix": "proposition-inline",
+		"body": [
+			"\\inlineproposition"
+		]
+	},
+	"Proposition (short)": {
+		"prefix": "proposition-short",
+		"body": [
+			"\\shortproposition"
+		]
+	},
+	"Fact (inline)": {
+		"prefix": "fact-inline",
+		"body": [
+			"\\inlinefact"
+		]
+	},
+	"Fact (short)": {
+		"prefix": "fact-short",
+		"body": [
+			"\\shortfact"
+		]
+	},
+	"Axiom (inline)": {
+		"prefix": "axiom-inline",
+		"body": [
+			"\\inlineaxiom"
+		]
+	},
+	"Axiom (short)": {
+		"prefix": "axiom-short",
+		"body": [
+			"\\shortaxiom"
+		]
+	},
+	"Proof (inline)": {
+		"prefix": "proof-inline",
+		"body": [
+			"\\inlineproof"
+		]
+	},
+	"Proof (short)": {
+		"prefix": "proof-short",
+		"body": [
+			"\\shortproof"
+		]
+	},
 	"bold": {
 		"prefix": "#bold",
 		"body": [
@@ -309,27 +384,28 @@
 			"\\color{${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}"
 		]
 	},
-	"German doc": {
-		"prefix": "latex-german",
+	"Set Language": {
+		"prefix": "setLang",
 		"body": [
-			"\\usepackage[ngerman]{babel}",
-			"\\setcounter{lang}{2} % Move below \\begin{document}"
+			"\\setLang{$1}"
 		]
 	},
 	"Letter": {
 		"prefix": "latex-letter",
 		"body": [
 			"\\documentclass[12pt,a4paper]{scrlttr2}\n",
-			"\\input{~/projects/generalSchool/letter-helpers.tex}\n",
+			"\\newcommand{\\dir}{~/projects/latex} % IMPORTANT: No trailing slashes!",
+			"\\input{\\dir/include.tex}",
+			"\\load{recommended}\n",
 			"% Subject",
 			"\\setkomavar{subject}{$1}",
 			"\\begin{document}\\raggedright",
 			"\t\\begin{letter}{Company \\\\\\ Name \\\\\\ Address \\\\\\ CH-Place}",
 			"\t\t\\opening{Intro}\n",
 			"\t\t$2\n",
-			"\t\t\\closing{Mit freundlichen Grüssen}",
+			"\t\t\\closing{Kind regards}",
 			"\t\\end{letter}",
 			"\\end{document}"
 		]
 	}
-}
\ No newline at end of file
+}