diff --git a/rendercv/templates/classic/classic.tex.j2 b/rendercv/templates/classic/classic.tex.j2
index 60c1485..98c6e99 100644
--- a/rendercv/templates/classic/classic.tex.j2
+++ b/rendercv/templates/classic/classic.tex.j2
@@ -5,10 +5,6 @@
 
 \documentclass[10pt, a4paper]{memoir}
 
-
-% ======================================================================================
-% ======================================================================================
-% ======================================================================================
 % Packages:
 \usepackage[
         ignoreheadfoot, % set margins without considering header and footer
@@ -23,7 +19,7 @@
 \usepackage{array} % tabularx requires this
 \usepackage{xifthen} % for if-then-else statements
 \usepackage[dvipsnames]{xcolor} % for coloring text
-\definecolor{primaryColor}{RGB}{<<design.primary_color.as_rgb_tuple()|join(", ")>>}
+\definecolor{primaryColor}{RGB}{<<design.primary_color.as_rgb_tuple()|join(", ")>>} % define primary color
 \usepackage{enumitem} % for customizing lists
 \usepackage{fontawesome5} % for using icons
 \usepackage[
@@ -32,32 +28,40 @@
     colorlinks=true,
     urlcolor=primaryColor
 ]{hyperref} % for links, metadata and bookmarks
-% ======================================================================================
-% ======================================================================================
-% ======================================================================================
 
-% ======================================================================================
-% ======================================================================================
-% ======================================================================================
 % Some settings:
+\pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
 \setlength{\topskip}{0pt} % no top skip
 \pagenumbering{gobble} % no page numbering
 
+\setmainfont{SourceSans3}[
+    Extension = .ttf,
+    UprightFont = *-Regular,
+    ItalicFont = *-Italic,
+    BoldFont = *-Bold,
+    BoldItalicFont = *-BoldItalic] % set main font
+
 \titleformat{\section}{
+        % Make the font size of the section title large and color it with the primary color
         \LARGE\color{primaryColor}
     }{
     }{
     }{
+        % Print bold title, give 0.15cm space and draw a line of 0.8pt thickness
+        % from the end of the title to the end of the body
         \textbf{#1}\hspace{0.15cm}\titlerule[0.8pt]
     }[] % Section title formatting
 
 \titlespacing{\section}{
+        % Left space:
         0pt
     }{
+        % Top space:
         <<design.section_title_top_margin>>
     }{
+        % Bottom space:
         <<design.section_title_bottom_margin>>
     } % Section title spacing
 
@@ -81,40 +85,15 @@
         \end{itemize}
     } % New environment for highlights
 
-\newenvironment{header}{\setlength{\topsep}{0pt}\par\kern\topsep\centering\color{primaryColor}\linespread{1.5}}{\par\kern\topsep} % New environment for the header
-% ======================================================================================
-% ======================================================================================
-% ======================================================================================
-
-
-\newcommand{\EducationEntry}[8]{
-    \begin{tabularx}{\textwidth}{p{0.55cm} >{\raggedright}X R{<<design.date_and_location_width>>}}
-        \textbf{#1} & \textbf{#2}, #3 \ifthenelse{\isempty{#6}}{}{\vspace{<<design.vertical_margin_between_bullet_points>>}\begin{highlights} \item #6 \ifthenelse{\isempty{#7}}{\end{highlights}}{\item #7 \ifthenelse{\isempty{#8}}{\end{highlights}}{\item #8 \end{highlights}}}} & \ifthenelse{\isempty{#4}}{#5}{#4\newline #5} \\
-    \end{tabularx}
-
-    \vspace{<<design.vertical_margin_between_entries>>}
-}
-
-\newcommand{\Header}[6]{
-    \begin{header}
-        \Huge
-        \textbf{#1}
-
-        \normalsize
-        \faPhone\hspace{0.13cm}#2 \hspace{0.5cm}
-        \href{mailto:#3}{\faEnvelope[regular]\hspace{0.13cm}#3} \hspace{0.5cm}
-        \href{https://#4}{\faLaptop\hspace{0.13cm}#4} \hspace{0.5cm}
-        \href{https://www.linkedin.com/in/#5}{\faLinkedin\hspace{0.13cm}#5} \hspace{0.5cm}
-        \href{https://www.github.com/#6}{\faGithub\hspace{0.13cm}#6}
-    \end{header}
-}
+\newenvironment{header}{
+        \setlength{\topsep}{0pt}\par\kern\topsep\centering\color{primaryColor}\linespread{1.5}
+    }{
+        \par\kern\topsep
+    } % New environment for the header
 
 \begin{document}
     % Test out the 4 main entry types with the commands below:
-    <<header(
-        name=cv.name,
-        connections=cv.connections
-    )>>
+    <<header(name=cv.name, connections=cv.connections)|indent(4)>>
 
     \section{Education}
     ((* for edu in cv.education *))
diff --git a/rendercv/tinytex/vendor/README.md b/rendercv/tinytex/vendor/README.md
index e6d47fb..57d45d6 100644
--- a/rendercv/tinytex/vendor/README.md
+++ b/rendercv/tinytex/vendor/README.md
@@ -10,6 +10,9 @@ Attempts to make TinyTeX smaller for CV purposes only.
 - mkdir TinyTeX/textmf-local/fonts/opentype/FontAwesome and copy FontAwesome's opentype contents inside.
 - mkdir TinyTeX/textmf-local/tex/latex/FontAwesome and copy FontAwesome's tex contents inside.
 
+### SourceSans3 Font
+- mkdir TinyTeX\texmf-local\fonts\truetype and copy all ttf files inside.
+
 ### Removing files
 
 - In TinyTeX/, remove all the files except LICENSE.CTAN and LICENSE.TL