diff --git a/TODO.md b/TODO.md
index b582873..0f6dc75 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,5 +3,3 @@
 1. Add support for `microtype`
 2. Add icons for the links
 3. Add ability to expand on the single jobs
-4. Add support for different languages
-5. Add single packages dependencies
diff --git a/content.yml b/content.yml
index ef6ea81..62503e4 100644
--- a/content.yml
+++ b/content.yml
@@ -50,4 +50,6 @@ education:
 mainfont: Hoefler Text # Any font installed on your system should work
 fontsize: 10pt # possible values: 10pt, 11pt, 12pt
 geometry: a4paper, textwidth=5.5in, textheight=8.5in, marginparsep=7pt, marginparwidth=.6in # See how the package geometry works at https://www.sharelatex.com/learn/Page_size_and_margins
+mainlang: English
+# otherlang: German
 ---
diff --git a/template.tex b/template.tex
index 03c5649..3e8ddf9 100644
--- a/template.tex
+++ b/template.tex
@@ -2,7 +2,6 @@
 %!TEX encoding = UTF-8 Unicode
 
 \documentclass[$fontsize$, a4paper]{article}
-\usepackage{fontspec} 
 
 % LAYOUT
 %--------------------------------
@@ -15,8 +14,17 @@
 % No page numbers
 \pagenumbering{gobble}
 
+% LANGUAGE
+%--------------------------------
+$if(lang)$
+\usepackage{polyglossia}
+\setmainlanguage{$mainlang$}
+\setotherlanguages{$for(otherlang)$$otherlang$$sep$,$endfor$}
+$endif$
+
 % TYPOGRAPHY
 %--------------------------------
+\usepackage{fontspec} 
 \usepackage{xunicode}
 \usepackage{xltxtra}