diff --git a/.gitignore b/.gitignore
index 24a6859e..0fb51e22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,6 @@ sympy-plots-for-*.tex/
 
 # xindy
 *.xdy
+
+# MacOS
+.DS_Store
diff --git a/MacFonts/deedy-resume.cls b/MacFonts/deedy-resume.cls
index 88f5fe5c..3c493de9 100644
--- a/MacFonts/deedy-resume.cls
+++ b/MacFonts/deedy-resume.cls
@@ -16,7 +16,7 @@
 \usepackage[absolute]{textpos}
 \usepackage[UKenglish]{babel}
 \usepackage[UKenglish]{isodate}
-\usepackage{fontspec,xltxtra,xunicode}
+\usepackage{fontspec}
 
 % Cite publications
 \usepackage{cite}
@@ -29,9 +29,9 @@
 \definecolor{subheadings}{HTML}{333333}
 
 % Set main fonts
-\defaultfontfeatures{Mapping=tex-text}
+\defaultfontfeatures{WordSpace={1.1}}
 \setmainfont[Color=primary]{Helvetica Light}
-\setsansfont[Scale=MatchLowercase,Mapping=tex-text]{Helvetica Neue UltraLight}
+\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Helvetica Neue UltraLight}
 
 % Date command
 \setlength{\TPHorizModule}{1mm}
diff --git a/MacFonts/deedy_resume.pdf b/MacFonts/deedy_resume.pdf
index 3b2405ca..24b53ee4 100644
Binary files a/MacFonts/deedy_resume.pdf and b/MacFonts/deedy_resume.pdf differ
diff --git a/MacFonts/sample-image.png b/MacFonts/sample-image.png
index 0d01685e..b1bf318e 100644
Binary files a/MacFonts/sample-image.png and b/MacFonts/sample-image.png differ
diff --git a/OpenFonts/deedy-resume-openfont.cls b/OpenFonts/deedy-resume-openfont.cls
index 2e99ef85..ec883a86 100644
--- a/OpenFonts/deedy-resume-openfont.cls
+++ b/OpenFonts/deedy-resume-openfont.cls
@@ -25,8 +25,9 @@
 
 % Set main fonts
 \usepackage{fontspec}
+\defaultfontfeatures{WordSpace={1.1}}
 \setmainfont[Color=primary, Path = fonts/lato/,BoldItalicFont=Lato-RegIta,BoldFont=Lato-Reg,ItalicFont=Lato-LigIta]{Lato-Lig}
-\setsansfont[Scale=MatchLowercase,Mapping=tex-text, Path = fonts/raleway/]{Raleway-ExtraLight}
+\setsansfont[Scale=MatchLowercase,Ligatures=TeX, Path = fonts/raleway/]{Raleway-ExtraLight}
 
 % Date command
 \usepackage[absolute]{textpos}
diff --git a/OpenFonts/deedy_resume-openfont.pdf b/OpenFonts/deedy_resume-openfont.pdf
index 7a5c7525..17ab4e42 100644
Binary files a/OpenFonts/deedy_resume-openfont.pdf and b/OpenFonts/deedy_resume-openfont.pdf differ
diff --git a/OpenFonts/sample-image.png b/OpenFonts/sample-image.png
index 477a5491..762003f4 100644
Binary files a/OpenFonts/sample-image.png and b/OpenFonts/sample-image.png differ
diff --git a/README.md b/README.md
index 6b8d3bed..138a0353 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Deedy-Resume
 =========================
 
-A **one-page**, **two asymmetric column** resume template in **XeTeX** that caters particularly to an **undergraduate Computer Science** student.
+A **one-page**, **two asymmetric column** resume template in **LuaLaTeX** that caters particularly to an **undergraduate Computer Science** student.
 As of **v1.2**, there is an option to choose from two templates:
 
 1. **MacFonts** - uses fonts native to OSX - *Helvetica*, *Helvetica Neue* (and it's Light and Ultralight versions) and the CJK fonts *Heiti SC*, and *Heiti TC*. The EULA of these fonts prevents distribution on Open Source.
@@ -25,7 +25,7 @@ This template attempts to **look clean**, highlight **details**, be a **single p
 
 ## Dependencies
 
-1. Compiles only with **XeTeX** and required **BibTex** for compiling publications and the .bib filetype.
+1. Compiles with **LuaLaTeX** and required **BibTex** for compiling publications and the .bib filetype. Can also be compiled with **XeTeX**, but **LuaLaTeX** is recommended.
 2. Uses fonts that are usually only available to **Mac** users such as Helvetica Neue Light.
 
 ## Availability