diff --git a/Makefile b/Makefile
index f24b31a..17aef00 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ PANDOC_OPTIONS :=
 
 # Normally this does not need to be changed:
 # works if the template is local or in ~/.pandoc/templates
-PANDOC_TMPL := assets/one-column.tex
+PANDOC_TMPL := assets/template.tex
 
 ## ---- subdirectories (normally, no need to change) ----
 
diff --git a/assets/one-column.tex b/assets/one-column.tex
deleted file mode 100644
index fbc0de0..0000000
--- a/assets/one-column.tex
+++ /dev/null
@@ -1,124 +0,0 @@
-\documentclass[11pt,letterpaper]{moderncv}
-
-\usepackage{fontspec}
-\usepackage{fontawesome5}
-\usepackage[inline]{enumitem}
-
-%% ModernCV themes
-\moderncvstyle{fancy}
-\moderncvcolor{blue}
-\nopagenumbers{}
-
-\usepackage[utf8]{inputenc}
-\usepackage[scale=0.75,right=.45in,left=.45in,top=.4in,bottom=.4in]{geometry}
-
-% Change email icon
-\providecommand*{\emailsymbol}{}
-\renewcommand*{\emailsymbol}{{\small\faEnvelope}~}
-
-% Workaround to show gitlab icon in social
-\providecommand*{\gitlabsocialsymbol}{}
-\renewcommand*{\gitlabsocialsymbol}{{\small\faGitlab}~}
-
-%% Personal data
-\firstname{$name$}
-\familyname{$lastname$}
-\title{$about$}
-\email{$email$}
-\social[gitlab][gitlab.com/$gitlab$]{$gitlab$}
-\photo[64pt][0.4pt]{assets/photo.png}
-
-\setlength{\hintscolumnwidth}{1.7in}
-
-\newenvironment{tightitems}
-               {\noindent\ignorespaces\vspace{-15pt}
-                 \begin{itemize}[topsep=0pt,partopsep=0pt,itemsep=0pt,parsep=0pt]}
-               {\end{itemize}\vspace{-10pt}}
-\newenvironment{lesstightitems}
-               {\noindent\ignorespaces{}
-                 \begin{itemize}[topsep=0pt,partopsep=0pt,itemsep=0pt,parsep=0pt]}
-               {\end{itemize}\vspace{-10pt}}
-
-\begin{document}
-\setmainfont[
-  BoldFont = * Bold
-]{Cormorant Garamond}
-\makecvtitle{}
-
-
-\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$
-
-\ifthenelse{\equal{$lang$}{en}}
-    {\subsection{Courses}}
-    {\subsection{Cursos}}
-$for(courses)$
-  \cvitem{$courses.name$}{
-    $courses.institution$
-  }{}
-$endfor$
-
-
-\ifthenelse{\equal{$lang$}{en}}
-    {\section{Technologies}}
-    {\section{Tecnologías}}
-$for(technologies)$
-  \cvline{$technologies.category$}{
-  \begin{itemize*}[label=, itemjoin={{,}}]
-    $for(technologies.items)$
-      \item{$technologies.items$}
-    $endfor$
-  \end{itemize*}}
-$endfor$
-
-
-\ifthenelse{\equal{$lang$}{en}}
-    {\section{Work Experience}}
-    {\section{Experiencia laboral}}
-$for(experience)$
-\cventry{$experience.years.start$ \textendash{} $experience.years.end$}{$experience.position$}{$experience.company$}{$experience.city$}{$experience.country$}{
-  \begin{tightitems}
-    $for(experience.description)$
-      \item $experience.description$
-    $endfor$
-  \end{tightitems}}
-$endfor$
-
-\ifthenelse{\equal{$lang$}{en}}
-    {\subsection{Freelance projects}}
-    {\subsection{Proyectos freelance}}
-$for(freelance)$
-  \cventry{}{$freelance.summary$}{$freelance.client$}{}{}{
-  \begin{tightitems}
-    $for(freelance.description)$
-      \item{$freelance.description$}
-    $endfor$
-  \end{tightitems}}
-$endfor$
-
-
-\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}}
-$for(languages)$
-  \cvlanguage{$languages.language$}{
-    $languages.proficiency$
-  }{}
-$endfor$
-
-\end{document}
diff --git a/assets/template.tex b/assets/template.tex
index dde74e5..fbc0de0 100644
--- a/assets/template.tex
+++ b/assets/template.tex
@@ -1,357 +1,124 @@
-% !TEX encoding = UTF-8 Unicode
+\documentclass[11pt,letterpaper]{moderncv}
 
-\documentclass[letterpaper,11pt]{article}
+\usepackage{fontspec}
+\usepackage{fontawesome5}
+\usepackage[inline]{enumitem}
 
-%A Few Useful Packages
-%\usepackage{marvosym}
-\usepackage{fontspec}     %for loading fonts
-\usepackage{xunicode,xltxtra,url,parskip} 	%other packages for formatting
-\usepackage{graphicx}
-\usepackage[usenames,dvipsnames]{xcolor}
-\usepackage[left=1.3cm,
-            top=0.9cm,
-            right=1.3cm,
-            bottom=1.2cm,
-            nohead,
-            nofoot
-            ]{geometry}
-\usepackage{tabularx}
-\usepackage{titlesec}
-%\usepackage{tabto}        % tab spacing
+%% ModernCV themes
+\moderncvstyle{fancy}
+\moderncvcolor{blue}
+\nopagenumbers{}
 
-\usepackage{setspace}     % line spacing
-\usepackage{booktabs,colortbl}       % thicker rules between table cells
-\usepackage{bibentry}     % bibliography
+\usepackage[utf8]{inputenc}
+\usepackage[scale=0.75,right=.45in,left=.45in,top=.4in,bottom=.4in]{geometry}
 
-% SORTED LISTS
-\usepackage{paralist}
-\usepackage{datatool}% http://ctan.org/pkg/datatool
-\newcommand{\sortitem}[1]{%
-  \DTLnewrow{list}% Create a new entry
-  \DTLnewdbentry{list}{description}{#1}% Add entry as description
-}
-\newenvironment{sortedlist}{%
-  \DTLifdbexists{list}{\DTLcleardb{list}}{\DTLnewdb{list}}% Create new/discard old list
-}{%
-  \DTLsort{description}{list}% Sort list
-  \begin{inparaitem}[]%
-    \DTLforeach*{list}{\theDesc=description}{%
-      \item \theDesc, }% Print each item
-  \end{inparaitem}%
-}
+% Change email icon
+\providecommand*{\emailsymbol}{}
+\renewcommand*{\emailsymbol}{{\small\faEnvelope}~}
 
-%Setup hyperref package, and colours for links
-\usepackage[colorlinks,
-            breaklinks,
-            pagebackref=false,
-            debug=true,
-            xetex,
-            bookmarks=false,
-            pdfpagelabels=false,
-            hyperfootnotes=false,
-            hyperindex=false,
-            pageanchor=false]{hyperref}
-\definecolor{linkcolor}{gray}{0.2}
-\hypersetup{
-  pdfauthor={$name$},
-  pdfsubject={$name$ - Resume},
-  pdftitle={$name$ - Resume},
-  urlcolor=linkcolor,
-  linkcolor=linkcolor
-}
-% colors
-\definecolor{dark-gray}{gray}{0.15}
-\definecolor{light-gray}{gray}{0.55}
+% Workaround to show gitlab icon in social
+\providecommand*{\gitlabsocialsymbol}{}
+\renewcommand*{\gitlabsocialsymbol}{{\small\faGitlab}~}
 
-%FONTS
-\setmainfont{Cormorant Garamond}
-\newfontfamily{\hlight}[UprightFont={* Light}]{Cormorant Garamond}
-%\defaultfontfeatures{Mapping=tex-text} % converts LaTeX specials (``quotes'' --- dashes etc.) to unicode
-\defaultfontfeatures{
-    Path = /nix/store/nl6mv0aymmla9c57bdpxg4yzf888qjlj-emacs-all-the-icons-fonts-3.2.0/share/fonts/all-the-icons/fontawesome.ttf }
-\usepackage{fontawesome5}  % glyphs for contact info
+%% Personal data
+\firstname{$name$}
+\familyname{$lastname$}
+\title{$about$}
+\email{$email$}
+\social[gitlab][gitlab.com/$gitlab$]{$gitlab$}
+\photo[64pt][0.4pt]{assets/photo.png}
 
-% CUSTOM COMMANDS
-  \newcommand{\titlerulethick}{{%
-    {\color{dark-gray} \titlerule[0.5mm] }%
-  }}
+\setlength{\hintscolumnwidth}{1.7in}
 
-  % old section title format
-  \titleformat{\section}{\fontsize{28pt}{38pt}\color{dark-gray}\normalfont}{}{0mm}{}[\titlerulethick]
-  %\titlespacing{\section}{0pt}{3pt}{3pt}
+\newenvironment{tightitems}
+               {\noindent\ignorespaces\vspace{-15pt}
+                 \begin{itemize}[topsep=0pt,partopsep=0pt,itemsep=0pt,parsep=0pt]}
+               {\end{itemize}\vspace{-10pt}}
+\newenvironment{lesstightitems}
+               {\noindent\ignorespaces{}
+                 \begin{itemize}[topsep=0pt,partopsep=0pt,itemsep=0pt,parsep=0pt]}
+               {\end{itemize}\vspace{-10pt}}
 
-  \newcommand{\namefont}[1]{{%
-    \fontsize{42pt}{50pt}\normalfont\textbf{#1}%
-  }}
-
-  \newcommand{\spacerule}{
-    \addlinespace[0.5em]
-    \midrule[0.5mm]
-    \addlinespace[0.5em]
-  }
-
-  \newcommand{\bigfont}[1]{{%
-    \fontsize{32pt}{38pt}\normalfont{#1} %
-  }}
-
-  \newcommand{\lightfont}[1]{{%
-    {\hlight\color{light-gray}#1}
-  }}
-
-  \newcommand{\contactinfo}{%
-    {\hlight\color{dark-gray}}
-  }
-
-  \newcommand{\lightsmall}[1]{{%
-    {\fontsize{11pt}{14pt}\hlight\color{light-gray}#1}
-  }}
-
-  \newcommand{\pubstyle}[1]{{%
-    {\fontsize{10pt}{13pt}\hlight\color{light-gray}#1}
-  }}
-
-  \newcommand{\lightbf}[1]{{%
-    \textbf{\lightfont{#1}}
-  }}
-
-  \newcommand{\emphasized}[1]{{%
-    {\fontsize{12pt}{14pt}\textbf{#1}}
-  }}
-
-  \newcommand{\position}[1]{{%
-    {\fontsize{12pt}{14pt} \hlight{#1}}
-  }}
-
-  \newcommand{\company}[1]{{%
-    {\fontsize{12pt}{14pt} \textbf{#1}}
-  }}
-
-  \newcommand{\headline}{
-    {\fontsize{14pt}{17pt}\bfseries\color{dark-gray}$headline$}
-  }
-
-  \newcommand{\name}{
-    \raggedright\fontsize{38pt}{38pt}\bfseries\flushleft\color{dark-gray}{$name$}
-  }
-
-  \newcommand{\lighthrule}{
-    {\color{light-gray}\par\rule[0mm]{\hsize}{0.5mm}\par\vspace{0.0em}}
-  }
-
-% hack to remove bibliography numbering
-\makeatletter
-\renewcommand\@biblabel[1]{}
-\renewenvironment{thebibliography}[1]
-     {\section*{\refname}%
-      \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}%
-      \list{}%
-           {\leftmargin0pt
-            \@openbib@code
-            \usecounter{enumiv}}%
-      \sloppy
-      \clubpenalty4000
-      \@clubpenalty \clubpenalty
-      \widowpenalty4000%
-      \sfcode`\.\@m}
-     {\def\@noitemerr
-       {\@latex@warning{Empty `thebibliography' environment}}%
-      \endlist}
-\makeatother
-%
-%-------------------- BEGIN DOCUMENT ----------------------
 \begin{document}
-%\nocite{$publications$}
-\pagestyle{empty} % non-numbered pages
-\font\fb=''[cmr10]'' %for use with \LaTeX command
-%---------- SPECIFY LENGTHS ----------
-\newlength{\leftwide}
-\setlength{\leftwide}{0.34\textwidth}
-%
-\newlength{\centerwide}
-\setlength{\centerwide}{0.33\textwidth}
-%
-\newlength{\rightwide}
-\setlength{\rightwide}{0.28\textwidth}
-%---------- TOP SECTION ----------
-\begin{tabular}[b]{@{}p{\leftwide}@{}p{\centerwide}@{}p{\rightwide}@{}}
-  % NAME (left)
-  \noindent
-  \begin{minipage}[b]{\leftwide}
-    \name
-  \end{minipage} & %
-  % CONTACT INFO (middle)
-  \begin{minipage}[b]{\centerwide}
-    \renewcommand\arraystretch{1.25}
-    \contactinfo
-    \begin{tabular}[b]{@{}cl@{}}
-      \faEnvelope & \href{mailto:$email$}{$email$}\\ %{}
-      \faPhone & $phone$\\
-      \faGitlab & \href{https://gitlab.com/akasroua}{gitlab.com/$gitlab$}\\
-    \end{tabular}
-  \end{minipage} & %
-% PHOTO (right)
-  \begin{minipage}[b]{\rightwide}
-    \includegraphics[width=7em]{Assets/photo.png}
-  \end{minipage} 
-\end{tabular}
-\lighthrule
-%---------- MAIN BODY ----------
-% ABOUT
-\vspace{-1.6em}
+\setmainfont[
+  BoldFont = * Bold
+]{Cormorant Garamond}
+\makecvtitle{}
+
+
 \ifthenelse{\equal{$lang$}{en}}
-    {\section{about}}
-    {\section{extracto}}%
-\parbox[t][][t]{\textwidth}{
-    $about$
-}
-%---------- LEFT SIDE ----------
-\newlength{\hwide}
-\begin{minipage}[t]{0.31\textwidth}
-  \raggedright
-    % PROGRAMMING
-    \ifthenelse{\equal{$lang$}{en}}
-        {\section{programming}}
-        {\section{programación}}%
-    \setlength{\parskip}{1mm}
-    \setlength{\hwide}{\dimexpr.5\hsize-3\tabcolsep}
-    %
-    \hlight
-    \begin{tabular}{@{}p{\hwide}p{\centerwide}}
-      $for(programming)$
-        \parbox[t][][t]{\hwide}{%
-          \emphasized{$programming.language$}
-          \medskip
-        } & %
-        \parbox[t][][t]{\centerwide}{%
-          \lightbf{$programming.proficiency$}
-          \medskip
-        } \\ %
-      $endfor$
-    \end{tabular}
+    {\section{Education}}
+    {\section{Educación}}
+$for(education)$
+  \cventry{$education.years.start$ \textendash{} $education.years.end$}{$education.degree$}{$education.focus$}{$education.institution$}{}{}
+$endfor$
 
-    % TECHNOLOGIES
-    %
-    \ifthenelse{\equal{$lang$}{en}}
-        {\section{technical skills}}
-        {\section{tecnologías}}%
-    \hlight
-    \begin{itemize}[]
-      $for(technologies)$
-      \item{$technologies$}
-      $endfor$
-    \end{itemize}
+\ifthenelse{\equal{$lang$}{en}}
+    {\subsection{Courses}}
+    {\subsection{Cursos}}
+$for(courses)$
+  \cvitem{$courses.name$}{
+    $courses.institution$
+  }{}
+$endfor$
 
-    % COURSES
-    %
-    \ifthenelse{\equal{$lang$}{en}}
-        {\section{courses}}
-        {\section{cursos}}%
-    \hlight
-    $for(courses)$
-    \emphasized{$courses.name$} \\
-    \lightfont{\textbf{$courses.institution$}} \\
-    $endfor$
-\end{minipage}%
-%
-%---------- RIGHT SIDE ----------
-\newlength{\hwideright}
-\newlength{\buffer}
-\setlength{\buffer}{4pt plus 1pt minus 1pt}
-%
-\begin{minipage}[t]{0.64\textwidth}
-  % EXPERIENCE
-  \ifthenelse{\equal{$lang$}{en}}
-      {\section{experience}}
-      {\section{experiencia laboral}}%
-  \setlength{\hwide}{\dimexpr.5\hsize-4\tabcolsep}
-  \setlength{\hwideright}{\dimexpr\hwide+5\tabcolsep}
-  %
-  \begin{tabular}{@{}p{\hwide}p{\hwideright}}
-    \arrayrulecolor{light-gray}
-    $for(experience)$
-      \parbox[t][][t]{\hwide}{%
-          \raggedright
-          \company{$experience.company$}\\
-          \vspace{\buffer}
-          \lightfont{%
-          $experience.years.start$ \textendash{} $experience.years.end$\\
-          $if(experience.location)$
-            $experience.location$\\
-          $endif$
-          \vspace{\buffer}}
-          $if(experience.group)$
-            \lightsmall{\emph{$experience.group$}}%
-          $endif$
-        } & %
-      \parbox[t][][t]{\hwideright}{%
-          \raggedright
-          \position{$experience.position$}\\
-          \vspace{\buffer}
-          \lightsmall{$experience.description$}
-        }\\
-        \spacerule
-    $endfor$
-  \end{tabular}
-  % EDUCATION
-  \ifthenelse{\equal{$lang$}{en}}
-      {\section{education}}
-      {\section{formación académica}}%
-  \setlength{\hwide}{\dimexpr.5\hsize-4\tabcolsep}
-  \setlength{\hwideright}{\dimexpr\hwide+5\tabcolsep}
-  % 
-  \setlength{\parskip}{1mm}
-  \vspace{-0.5em}
-  \begin{tabular}{@{}p{\hwide}p{\rightwide}}
-    $for(education)$
-      \parbox[t][][t]{\hwide}{%
-        \lightfont{$education.years.start$ \textendash{} $education.years.end$} \\
-        \smallskip
-        \emphasized{$education.degree$} \\
-        \smallskip
-        \emphasized{$education.focus$} \\
-      } & %
-      \parbox[t][][t]{\rightwide}{%
-        \lightfont{\textbf{$education.institution$} \\
-          \emph{$education.campus$}} \\ %
-        \medskip %
-      } \\
-    $endfor$
-  \end{tabular}
-  \vspace{-0.8em}
-  % 
 
-  % LANGUAGES
-  \ifthenelse{\equal{$lang$}{en}}
-      {\section{languages}}
-      {\section{idiomas}}%
-  %
-  \setlength{\parskip}{1mm}
-  \setlength{\hwide}{\dimexpr.5\hsize-4\tabcolsep}
-  \setlength{\hwideright}{\dimexpr\hwide+5\tabcolsep}
-
-  \begin{tabular}{@{}p{\hwide}p{\rightwide}}
-    $for(languages)$
-      \parbox[t][][t]{\hwide}{%
-        \emphasized{$languages.language$}
-        \medskip
-      } & %
-      \parbox[t][][t]{\rightwide}{%
-        \lightbf{$languages.proficiency$}
-        \medskip
-      } \\ %
+\ifthenelse{\equal{$lang$}{en}}
+    {\section{Technologies}}
+    {\section{Tecnologías}}
+$for(technologies)$
+  \cvline{$technologies.category$}{
+  \begin{itemize*}[label=, itemjoin={{,}}]
+    $for(technologies.items)$
+      \item{$technologies.items$}
     $endfor$
-  \end{tabular}
-%
-%\section{publications}
-%\vspace{-0.5em}
-%\begingroup
-%\renewcommand{\section}[2]{}%
-%\pubstyle{
-%  \bibliography{pubs}
-%  \bibliographystyle{cvbib}
-%}
-%\endgroup
-\end{minipage}
-% ==========================================================
-%-------------------- END OF DOCUMENT ----------------------
+  \end{itemize*}}
+$endfor$
+
+
+\ifthenelse{\equal{$lang$}{en}}
+    {\section{Work Experience}}
+    {\section{Experiencia laboral}}
+$for(experience)$
+\cventry{$experience.years.start$ \textendash{} $experience.years.end$}{$experience.position$}{$experience.company$}{$experience.city$}{$experience.country$}{
+  \begin{tightitems}
+    $for(experience.description)$
+      \item $experience.description$
+    $endfor$
+  \end{tightitems}}
+$endfor$
+
+\ifthenelse{\equal{$lang$}{en}}
+    {\subsection{Freelance projects}}
+    {\subsection{Proyectos freelance}}
+$for(freelance)$
+  \cventry{}{$freelance.summary$}{$freelance.client$}{}{}{
+  \begin{tightitems}
+    $for(freelance.description)$
+      \item{$freelance.description$}
+    $endfor$
+  \end{tightitems}}
+$endfor$
+
+
+\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}}
+$for(languages)$
+  \cvlanguage{$languages.language$}{
+    $languages.proficiency$
+  }{}
+$endfor$
+
 \end{document}