diff --git a/CV-Amin-Kasrou-Aouam-en.pdf b/CV-Amin-Kasrou-Aouam-en.pdf
index 1d3cab3..ce5956f 100644
Binary files a/CV-Amin-Kasrou-Aouam-en.pdf and b/CV-Amin-Kasrou-Aouam-en.pdf differ
diff --git a/CV-Amin-Kasrou-Aouam-en.tex b/CV-Amin-Kasrou-Aouam-en.tex
index bc6f882..ae7cb43 100644
--- a/CV-Amin-Kasrou-Aouam-en.tex
+++ b/CV-Amin-Kasrou-Aouam-en.tex
@@ -274,21 +274,21 @@
   \setlength{\parskip}{1mm}
   \begin{tabular}{@{}p{\hwide}p{\rightwide}}
           \parbox[t][][t]{\hwide}{%
-        \lightfont{2013 \textendash{} 2015} \\
+        \lightfont{2017 \textendash{} present} \\
         \smallskip
-        \emphasized{MD} \\
+        \emphasized{Bachelor} \\
         \smallskip
-        \emphasized{Medicine} \\
+        \emphasized{Computer Engineering} \\
       } & %
       \parbox[t][][t]{\rightwide}{%
-        \lightfont{\textbf{Université Paris-Sud} \\
-          \emph{Châtenay-Malabry}} \\ %
+        \lightfont{\textbf{Universidad de Granada} \\
+          \emph{Ceuta}} \\ %
         \bigskip %
       } \\
           \parbox[t][][t]{\hwide}{%
         \lightfont{2015 \textendash{} 2017} \\
         \smallskip
-        \emphasized{MD} \\
+        \emphasized{Bachelor} \\
         \smallskip
         \emphasized{Medicine} \\
       } & %
@@ -298,15 +298,15 @@
         \bigskip %
       } \\
           \parbox[t][][t]{\hwide}{%
-        \lightfont{2017 \textendash{} present} \\
+        \lightfont{2013 \textendash{} 2015} \\
         \smallskip
-        \emphasized{BE} \\
+        \emphasized{Bachelor} \\
         \smallskip
-        \emphasized{Computer Engineering} \\
+        \emphasized{Medicine} \\
       } & %
       \parbox[t][][t]{\rightwide}{%
-        \lightfont{\textbf{Universidad de Granada} \\
-          \emph{Ceuta}} \\ %
+        \lightfont{\textbf{Université Paris-Sud} \\
+          \emph{Châtenay-Malabry}} \\ %
         \bigskip %
       } \\
       \end{tabular}
diff --git a/CV-Amin-Kasrou-Aouam-en.yml b/CV-Amin-Kasrou-Aouam-en.yml
index 328935f..52f8212 100644
--- a/CV-Amin-Kasrou-Aouam-en.yml
+++ b/CV-Amin-Kasrou-Aouam-en.yml
@@ -13,28 +13,28 @@ about:         |
 
 education:
 - years:
-    start: 2013
-    end: 2015
-  degree:      MD
-  focus:       Medicine
-  campus: Châtenay-Malabry
-  institution:  "Université Paris-Sud"
+    start: 2017
+    end: present
+  degree:      Bachelor
+  focus:       Computer Engineering
+  institution:  "Universidad de Granada"
+  campus: Ceuta
 
 - years:
     start: 2015
     end: 2017
-  degree:      MD
+  degree:      Bachelor
   focus:       Medicine
   campus: Sevilla
   institution:  "Universidad de Sevilla"
 
 - years:
-    start: 2017
-    end: present
-  degree:      BE
-  focus:       Computer Engineering
-  institution:  "Universidad de Granada"
-  campus: Ceuta
+    start: 2013
+    end: 2015
+  degree:      Bachelor
+  focus:       Medicine
+  campus: Châtenay-Malabry
+  institution:  "Université Paris-Sud"
 
 programming:
   - C++
diff --git a/CV-Amin-Kasrou-Aouam-es.pdf b/CV-Amin-Kasrou-Aouam-es.pdf
index c224103..3cdbd7f 100644
Binary files a/CV-Amin-Kasrou-Aouam-es.pdf and b/CV-Amin-Kasrou-Aouam-es.pdf differ
diff --git a/CV-Amin-Kasrou-Aouam-es.yml b/CV-Amin-Kasrou-Aouam-es.yml
index 0b04873..6811b88 100644
--- a/CV-Amin-Kasrou-Aouam-es.yml
+++ b/CV-Amin-Kasrou-Aouam-es.yml
@@ -13,12 +13,12 @@ about:         |
 
 education:
 - years:
-    start: 2013
-    end: 2015
+    start: 2017
+    end: presente
   degree:      Grado
-  focus:       Medicina
-  campus: Châtenay-Malabry
-  institution:  "Université Paris-Sud"
+  focus:       Ingeniería Informática
+  institution:  "Universidad de Granada"
+  campus: Ceuta
 
 - years:
     start: 2015
@@ -28,13 +28,14 @@ education:
   campus: Sevilla
   institution:  "Universidad de Sevilla"
 
+
 - years:
-    start: 2017
-    end: presente
+    start: 2013
+    end: 2015
   degree:      Grado
-  focus:       Ingeniería Informática
-  institution:  "Universidad de Granada"
-  campus: Ceuta
+  focus:       Medicina
+  campus: Châtenay-Malabry
+  institution:  "Université Paris-Sud"
 
 programming:
   - C++
diff --git a/Makefile b/Makefile
index f2400f7..35b05a8 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ PANDOC_OPTIONS :=
 
 # Normally this does not need to be changed:
 # works if the template is local or in ~/.pandoc/templates
-PANDOC_TMPL :=
+PANDOC_TMPL := template-en.latex
 
 ## ---- subdirectories (normally, no need to change) ----