diff --git a/CV-Amin-Kasrou-Aouam-en.pdf b/CV-Amin-Kasrou-Aouam-en.pdf
new file mode 100644
index 0000000..0900f00
Binary files /dev/null and b/CV-Amin-Kasrou-Aouam-en.pdf differ
diff --git a/CV-Amin-Kasrou-Aouam-es.pdf b/CV-Amin-Kasrou-Aouam-es.pdf
new file mode 100644
index 0000000..f325369
Binary files /dev/null and b/CV-Amin-Kasrou-Aouam-es.pdf differ
diff --git a/assets/one-column.tex b/assets/one-column.tex
index 0b56e79..a11e0cb 100644
--- a/assets/one-column.tex
+++ b/assets/one-column.tex
@@ -2,6 +2,7 @@
 
 \usepackage{fontspec}
 \usepackage{fontawesome5}
+\usepackage[inline]{enumitem}
 
 %% ModernCV themes
 \moderncvstyle{fancy}
@@ -44,49 +45,59 @@
 ]{Cormorant Garamond}
 \makecvtitle{}
 
-\section{Education}
+
+\ifthenelse{\equal{$lang$}{en}}
+    {\section{Education}}
+    {\section{Educación}}
 $for(education)$
   \cventry{$education.years.start$ \textendash{} $education.years.end$}{$education.degree$}{$education.focus$}{$education.institution$}{}{}
 $endfor$
 
-\section{Skill Set}
-\cvitem{Programming languages}{
-  \begin{itemize*}
-    $for(programming)$
-        \item{$programming$}
-    $endfor$
-  \end{itemize*}}
 
-\cvitem{Technologies}{
-  \begin{itemize*}
-    $for(technologies)$
-        \item{$technologies$}
-    $endfor$
-  \end{itemize*}}
+\ifthenelse{\equal{$lang$}{en}}
+    {\section{Technologies}}
+    {\section{Tecnologías}}
+\cvline{Programming languages}{
+$for(technologies.programming)$
+\begin{itemize*}[label=, itemjoin={{,}}]
+    \item{$technologies.programming$}
+\end{itemize*}
+$endfor$}
 
-\cvitem{Platforms}{
-  \begin{itemize*}
-    $for(platforms)$
-        \item{$platforms$}
-    $endfor$
-  \end{itemize*}}
+\cvline{Tools}{
+$for(technologies.tools)$
+\begin{itemize*}[label=, itemjoin={{,}}]
+    \item{$technologies.tools$}
+\end{itemize*}
+$endfor$}
 
-\section{Work Experience}
+\cvline{Platforms}{
+$for(technologies.platforms)$
+\begin{itemize*}[label=, itemjoin={{,}}]
+    \item{$technologies.platforms$}
+\end{itemize*}
+$endfor$}
+
+
+\ifthenelse{\equal{$lang$}{en}}
+    {\section{Work Experience}}
+    {\section{Experiencia laboral}}
 $for(experience)$
-    \cventry{$experience.years.start$ \textendash{} $education.years.end$}{$experience.position$}{$experience.company$}{}{}{
-    \begin{tightitems}
-        \item $description$
-    \end{tightitems}}
+    \cventry{$experience.years.start$ \textendash{} $experience.years.end$}{$experience.position$}{$experience.company$}{$experience.location$}{}{$experience.description$}
 $endfor$
 
 
-\section{Personal Projects}
-\cvitem{}{
-  \begin{tightitems}
-    $for(projects)$
-        \item{$projects$}
-    $endfor$
-  \end{tightitems}}
+\ifthenelse{\equal{$lang$}{en}}
+    {\section{Personal Projects}}
+    {\section{Proyectos personales}}
+    \cvitem{}{
+      \begin{tightitems}
+        $for(projects)$
+          \item $projects$
+        $endfor$
+      \end{tightitems}
+    }
+
 \ifthenelse{\equal{$lang$}{en}}
     {\section{Languages}}
     {\section{Idiomas}}
diff --git a/input/CV-Amin-Kasrou-Aouam-en.yml b/input/CV-Amin-Kasrou-Aouam-en.yml
index 5c234f1..aac1e51 100644
--- a/input/CV-Amin-Kasrou-Aouam-en.yml
+++ b/input/CV-Amin-Kasrou-Aouam-en.yml
@@ -34,27 +34,26 @@ education:
   campus: Châtenay-Malabry
   institution:  "Université Paris-Sud"
 
-programming:
-- Python
-- C++
-- Nix
-- Java
-- PHP
-
 technologies:
-- \LaTeX
-- Git
-- REST APIs
-- SQL
-
-platforms:
-- Linux
-- FreeBSD
-- DragonFlyBSD
-- Android
+  programming:
+    - Python
+    - C++
+    - Nix
+    - Java
+    - PHP
+  tools:
+    - \LaTeX
+    - Git
+    - REST APIs
+    - SQL
+  platforms:
+    - Linux
+    - FreeBSD
+    - DragonFlyBSD
+    - Android
 
 projects:
-- COVID-19 Telegram Bot
+- "COVID-19 Telegram Bot"
 
 languages:
 - language: English
@@ -82,8 +81,9 @@ courses:
 experience:
 - company:     JITKey
   years:
-    start:     'February 2020'
-    end:       'March 2020'
+    start:     "February 2020"
+    end:       "March 2020"
   position:    Internship
+  location: Remote
   description: "Support Manager at a startup in Spain. Cut short due to the COVID-19 pandemic"
 ---
diff --git a/input/CV-Amin-Kasrou-Aouam-es.yml b/input/CV-Amin-Kasrou-Aouam-es.yml
index 17f57d0..82b9a05 100644
--- a/input/CV-Amin-Kasrou-Aouam-es.yml
+++ b/input/CV-Amin-Kasrou-Aouam-es.yml
@@ -35,28 +35,27 @@ education:
   campus: Châtenay-Malabry
   institution:  "Université Paris-Sud"
 
-programming:
-- Python
-- C++
-- Nix
-- Java
-- PHP
-
 technologies:
-- \LaTeX
-- Git
-- REST APIs
-- SQL
-- NixOS
-
-platforms:
-- Linux
-- FreeBSD
-- DragonFlyBSD
-- Android
+  programming:
+    - Python
+    - C++
+    - Nix
+    - Java
+    - PHP
+  tools:
+    - \LaTeX
+    - Git
+    - REST APIs
+    - SQL
+  platforms:
+    - Linux
+    - FreeBSD
+    - DragonFlyBSD
+    - Android
 
 projects:
-- Bot de Telegram COVID-19
+- "Bot de Telegram COVID-19"
+
 
 
 languages:
@@ -67,6 +66,8 @@ languages:
   proficiency: Nativo
 
 - language: Francés
+  proficiency: Nativo
+
 courses:
 - name: Fundamentos de Robótica
   institution: Adams Formación
@@ -83,8 +84,9 @@ courses:
 experience:
 - company:     JITKey
   years:
-    start:     'Febrero 2020'
-    end:       'Marzo 2020'
+    start:     "Febrero 2020"
+    end:       "Marzo 2020"
   position:    Prácticas
+  location: Remoto
   description: "Responsable de Soporte en una startup española. Suspendidas debido al COVID-19"
 ---