diff --git a/tests/testdata/test_generate_latex_file/classic_empty.tex b/tests/testdata/test_generate_latex_file/classic_empty.tex
index 96d71f8..d1f72e0 100644
--- a/tests/testdata/test_generate_latex_file/classic_empty.tex
+++ b/tests/testdata/test_generate_latex_file/classic_empty.tex
@@ -41,6 +41,7 @@
 \fi
 
 % Some settings:
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
diff --git a/tests/testdata/test_generate_latex_file/classic_filled.tex b/tests/testdata/test_generate_latex_file/classic_filled.tex
index 35b068a..7151797 100644
--- a/tests/testdata/test_generate_latex_file/classic_filled.tex
+++ b/tests/testdata/test_generate_latex_file/classic_filled.tex
@@ -41,6 +41,7 @@
 \fi
 
 % Some settings:
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -158,27 +159,27 @@
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{\hrefWithoutArrow{tel:+905419999999}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{{\small\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
         \hspace*{0.5 cm}
-        \mbox{{\small\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
+        \mbox{\hrefWithoutArrow{https://example.com/}{{\footnotesize\faLink}\hspace*{0.13cm}example.com}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://example.com/}{{\small\faLink}\hspace*{0.13cm}example.com}}
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\small\faLinkedinIn}\hspace*{0.13cm}johndoe}}
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{{\small\faGithub}\hspace*{0.13cm}johndoe}}
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{{\small\faInstagram}\hspace*{0.13cm}johndoe}}
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\small\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
+        \mbox{\hrefWithoutArrow{https://mastodon.social/@johndoe@example}{{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://mastodon.social/@johndoe@example}{{\small\faMastodon}\hspace*{0.13cm}@johndoe@example}}
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
     \end{header}
 
-    \vspace{0.3 cm}
+    \vspace{0.3 cm - 0.3 cm}
 
 
     \section{Text Entries}
@@ -223,11 +224,13 @@
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+            \end{minipage}
         \end{twocolentry}
 
         \vspace{0.2 cm}
@@ -235,42 +238,48 @@
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}\end{twocolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}    \end{minipage}
+        \end{twocolentry}
 
         \vspace{0.2 cm}
 
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        IEEE Transactions on Applied Superconductivity\end{twocolentry}
+        IEEE Transactions on Applied Superconductivity    \end{minipage}
+        \end{twocolentry}
 
         \vspace{0.2 cm}
 
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)\end{twocolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)    \end{minipage}
+        \end{twocolentry}
 
 
     
diff --git a/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex b/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex
index 41e229f..4c263da 100644
--- a/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex
+++ b/tests/testdata/test_generate_latex_file/engineeringresumes_empty.tex
@@ -41,6 +41,8 @@
 \fi
 
 % Some settings:
+\raggedright
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -132,7 +134,13 @@
 % \renewcommand{\href}[2]{\hrefWithoutArrow{#1}{\mbox{\ifthenelse{\equal{#2}{}}{ }{#2 }\raisebox{.15ex}{\footnotesize \faExternalLink*}}}}
 
 \begin{document}
-    
+    \makeatletter
+    \newcommand{\test}{%
+      \@ifnextchar\par{A}{B}%
+    }
+    \makeatother
+
+
 
     \section{Test}
 
diff --git a/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex b/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex
index f54d5f0..e039204 100644
--- a/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex
+++ b/tests/testdata/test_generate_latex_file/engineeringresumes_filled.tex
@@ -41,6 +41,8 @@
 \fi
 
 % Some settings:
+\raggedright
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -132,34 +134,56 @@
 % \renewcommand{\href}[2]{\hrefWithoutArrow{#1}{\mbox{\ifthenelse{\equal{#2}{}}{ }{#2 }\raisebox{.15ex}{\footnotesize \faExternalLink*}}}}
 
 \begin{document}
+    \makeatletter
+    \newcommand{\test}{%
+      \@ifnextchar\par{A}{B}%
+    }
+    \makeatother
+
     \begin{header}
-        \fontsize{25 pt}{25 pt}
-        \textbf{John Doe}
+        \fontsize{25 pt}{25 pt}\selectfont John Doe
 
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{\href{tel:+905419999999}{\color{black}{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
-        \hspace*{0.5 cm}
-        \mbox{\href{mailto:johndoe@example.com}{\color{black}{\small\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
-        \hspace*{0.5 cm}
-        \mbox{\color{black}{\small\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://example.com/}{\color{black}{\small\faLink}\hspace*{0.13cm}example.com}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://linkedin.com/in/johndoe}{\color{black}{\small\faLinkedinIn}\hspace*{0.13cm}johndoe}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://github.com/johndoe}{\color{black}{\small\faGithub}\hspace*{0.13cm}johndoe}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://instagram.com/johndoe}{\color{black}{\small\faInstagram}\hspace*{0.13cm}johndoe}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://orcid.org/0000-0000-0000-0000}{\color{black}{\small\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://mastodon.social/@johndoe@example}{\color{black}{\small\faMastodon}\hspace*{0.13cm}@johndoe@example}}
-        \hspace*{0.5 cm}
+        \mbox{\href{mailto:johndoe@example.com}{johndoe@example.com}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{tel:+90-541-999-99-99}{+90 541 999 99 99}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://example.com/}{example.com}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://linkedin.com/in/johndoe}{linkedin.com/in/johndoe}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://github.com/johndoe}{github.com/johndoe}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://instagram.com/johndoe}{instagram.com/johndoe}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://orcid.org/0000-0000-0000-0000}{orcid.org/0000-0000-0000-0000}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://mastodon.social/@johndoe@example}{mastodon.social/@johndoe@example}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://twitter.com/johndoe}{twitter.com/johndoe}}
+        \hspace*{0.25 cm}
+        \hspace*{0.25 cm}
     \end{header}
 
-    \vspace{0.3 cm}
+    \vspace{0.3 cm - 0.3 cm}
 
 
     \section{Text Entries}
@@ -202,48 +226,56 @@
 
         
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+        \end{minipage}
         \end{onecolentry}
 
         \vspace{0.1 cm}
 
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}\end{onecolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}\end{minipage}
+        \end{onecolentry}
 
         \vspace{0.1 cm}
 
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        IEEE Transactions on Applied Superconductivity\end{onecolentry}
+        IEEE Transactions on Applied Superconductivity\end{minipage}
+        \end{onecolentry}
 
         \vspace{0.1 cm}
 
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)\end{onecolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)\end{minipage}
+        \end{onecolentry}
 
 
     
diff --git a/tests/testdata/test_generate_latex_file/sb2nov_empty.tex b/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
index 78c95b8..6dc41d2 100644
--- a/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
+++ b/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
@@ -7,14 +7,14 @@
 \documentclass[10pt, letterpaper]{article}
 
 \usepackage[
-        ignoreheadfoot, % set margins without considering header and footer
-        top=2 cm, % seperation between body and page edge from the top
-        bottom=2 cm, % seperation between body and page edge from the bottom
-        left=2 cm, % seperation between body and page edge from the left
-        right=2 cm, % seperation between body and page edge from the right
-        footskip=1.0 cm, % seperation between body and footer
-        % showframe % for debugging 
-    ]{geometry} % for adjusting page geometry
+    ignoreheadfoot, % set margins without considering header and footer
+    top=2 cm, % seperation between body and page edge from the top
+    bottom=2 cm, % seperation between body and page edge from the bottom
+    left=2 cm, % seperation between body and page edge from the left
+    right=2 cm, % seperation between body and page edge from the right
+    footskip=1.0 cm, % seperation between body and footer
+    % showframe % for debugging 
+]{geometry} % for adjusting page geometry
 \usepackage{latexsym}
 \usepackage[nobottomtitles*]{titlesec}
 \usepackage{marvosym}
@@ -23,9 +23,9 @@
 \usepackage{xcolor}
 \usepackage{enumitem}
 \usepackage[
-  hidelinks,
-  pdftitle={None's CV},
-  pdfauthor={None}
+    hidelinks,
+    pdftitle={None's CV},
+    pdfauthor={None}
 ]{hyperref}
 \usepackage{fancyhdr}
 \usepackage[english]{babel}
diff --git a/tests/testdata/test_generate_latex_file/sb2nov_filled.tex b/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
index e65853b..07489cc 100644
--- a/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
+++ b/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
@@ -7,14 +7,14 @@
 \documentclass[10pt, letterpaper]{article}
 
 \usepackage[
-        ignoreheadfoot, % set margins without considering header and footer
-        top=2 cm, % seperation between body and page edge from the top
-        bottom=2 cm, % seperation between body and page edge from the bottom
-        left=2 cm, % seperation between body and page edge from the left
-        right=2 cm, % seperation between body and page edge from the right
-        footskip=1.0 cm, % seperation between body and footer
-        % showframe % for debugging 
-    ]{geometry} % for adjusting page geometry
+    ignoreheadfoot, % set margins without considering header and footer
+    top=2 cm, % seperation between body and page edge from the top
+    bottom=2 cm, % seperation between body and page edge from the bottom
+    left=2 cm, % seperation between body and page edge from the left
+    right=2 cm, % seperation between body and page edge from the right
+    footskip=1.0 cm, % seperation between body and footer
+    % showframe % for debugging 
+]{geometry} % for adjusting page geometry
 \usepackage{latexsym}
 \usepackage[nobottomtitles*]{titlesec}
 \usepackage{marvosym}
@@ -23,9 +23,9 @@
 \usepackage{xcolor}
 \usepackage{enumitem}
 \usepackage[
-  hidelinks,
-  pdftitle={John Doe's CV},
-  pdfauthor={John Doe}
+    hidelinks,
+    pdftitle={John Doe's CV},
+    pdfauthor={John Doe}
 ]{hyperref}
 \usepackage{fancyhdr}
 \usepackage[english]{babel}
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex
index 96d71f8..d1f72e0 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_empty/None_CV.tex
@@ -41,6 +41,7 @@
 \fi
 
 % Some settings:
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
index 35b068a..7151797 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
@@ -41,6 +41,7 @@
 \fi
 
 % Some settings:
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -158,27 +159,27 @@
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{\hrefWithoutArrow{tel:+905419999999}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
+        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{{\footnotesize\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{mailto:johndoe@example.com}{{\small\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
+        \mbox{\hrefWithoutArrow{tel:+90-541-999-99-99}{{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
         \hspace*{0.5 cm}
-        \mbox{{\small\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
+        \mbox{\hrefWithoutArrow{https://example.com/}{{\footnotesize\faLink}\hspace*{0.13cm}example.com}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://example.com/}{{\small\faLink}\hspace*{0.13cm}example.com}}
+        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\footnotesize\faLinkedinIn}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://linkedin.com/in/johndoe}{{\small\faLinkedinIn}\hspace*{0.13cm}johndoe}}
+        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{{\footnotesize\faGithub}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://github.com/johndoe}{{\small\faGithub}\hspace*{0.13cm}johndoe}}
+        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{{\footnotesize\faInstagram}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://instagram.com/johndoe}{{\small\faInstagram}\hspace*{0.13cm}johndoe}}
+        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\footnotesize\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://orcid.org/0000-0000-0000-0000}{{\small\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
+        \mbox{\hrefWithoutArrow{https://mastodon.social/@johndoe@example}{{\footnotesize\faMastodon}\hspace*{0.13cm}@johndoe@example}}
         \hspace*{0.5 cm}
-        \mbox{\hrefWithoutArrow{https://mastodon.social/@johndoe@example}{{\small\faMastodon}\hspace*{0.13cm}@johndoe@example}}
+        \mbox{\hrefWithoutArrow{https://twitter.com/johndoe}{{\footnotesize\faTwitter}\hspace*{0.13cm}johndoe}}
         \hspace*{0.5 cm}
     \end{header}
 
-    \vspace{0.3 cm}
+    \vspace{0.3 cm - 0.3 cm}
 
 
     \section{Text Entries}
@@ -223,11 +224,13 @@
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+            \end{minipage}
         \end{twocolentry}
 
         \vspace{0.2 cm}
@@ -235,42 +238,48 @@
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}\end{twocolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}    \end{minipage}
+        \end{twocolentry}
 
         \vspace{0.2 cm}
 
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        IEEE Transactions on Applied Superconductivity\end{twocolentry}
+        IEEE Transactions on Applied Superconductivity    \end{minipage}
+        \end{twocolentry}
 
         \vspace{0.2 cm}
 
         \begin{twocolentry}{
             Sept. 2021
         }
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils}
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)\end{twocolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)    \end{minipage}
+        \end{twocolentry}
 
 
     
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex
index 41e229f..4c263da 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_empty/None_CV.tex
@@ -41,6 +41,8 @@
 \fi
 
 % Some settings:
+\raggedright
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -132,7 +134,13 @@
 % \renewcommand{\href}[2]{\hrefWithoutArrow{#1}{\mbox{\ifthenelse{\equal{#2}{}}{ }{#2 }\raisebox{.15ex}{\footnotesize \faExternalLink*}}}}
 
 \begin{document}
-    
+    \makeatletter
+    \newcommand{\test}{%
+      \@ifnextchar\par{A}{B}%
+    }
+    \makeatother
+
+
 
     \section{Test}
 
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex
index f54d5f0..e039204 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/engineeringresumes_filled/John_Doe_CV.tex
@@ -41,6 +41,8 @@
 \fi
 
 % Some settings:
+\raggedright
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -132,34 +134,56 @@
 % \renewcommand{\href}[2]{\hrefWithoutArrow{#1}{\mbox{\ifthenelse{\equal{#2}{}}{ }{#2 }\raisebox{.15ex}{\footnotesize \faExternalLink*}}}}
 
 \begin{document}
+    \makeatletter
+    \newcommand{\test}{%
+      \@ifnextchar\par{A}{B}%
+    }
+    \makeatother
+
     \begin{header}
-        \fontsize{25 pt}{25 pt}
-        \textbf{John Doe}
+        \fontsize{25 pt}{25 pt}\selectfont John Doe
 
         \vspace{0.3 cm}
 
         \normalsize
-        \mbox{\href{tel:+905419999999}{\color{black}{\footnotesize\faPhone*}\hspace*{0.13cm}+90 541 999 99 99}}
-        \hspace*{0.5 cm}
-        \mbox{\href{mailto:johndoe@example.com}{\color{black}{\small\faEnvelope[regular]}\hspace*{0.13cm}johndoe@example.com}}
-        \hspace*{0.5 cm}
-        \mbox{\color{black}{\small\faMapMarker*}\hspace*{0.13cm}Istanbul, Turkey}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://example.com/}{\color{black}{\small\faLink}\hspace*{0.13cm}example.com}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://linkedin.com/in/johndoe}{\color{black}{\small\faLinkedinIn}\hspace*{0.13cm}johndoe}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://github.com/johndoe}{\color{black}{\small\faGithub}\hspace*{0.13cm}johndoe}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://instagram.com/johndoe}{\color{black}{\small\faInstagram}\hspace*{0.13cm}johndoe}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://orcid.org/0000-0000-0000-0000}{\color{black}{\small\faOrcid}\hspace*{0.13cm}0000-0000-0000-0000}}
-        \hspace*{0.5 cm}
-        \mbox{\href{https://mastodon.social/@johndoe@example}{\color{black}{\small\faMastodon}\hspace*{0.13cm}@johndoe@example}}
-        \hspace*{0.5 cm}
+        \mbox{\href{mailto:johndoe@example.com}{johndoe@example.com}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{tel:+90-541-999-99-99}{+90 541 999 99 99}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://example.com/}{example.com}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://linkedin.com/in/johndoe}{linkedin.com/in/johndoe}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://github.com/johndoe}{github.com/johndoe}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://instagram.com/johndoe}{instagram.com/johndoe}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://orcid.org/0000-0000-0000-0000}{orcid.org/0000-0000-0000-0000}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://mastodon.social/@johndoe@example}{mastodon.social/@johndoe@example}}
+        \hspace*{0.25 cm}
+        $|$
+        \hspace*{0.25 cm}
+        \mbox{\href{https://twitter.com/johndoe}{twitter.com/johndoe}}
+        \hspace*{0.25 cm}
+        \hspace*{0.25 cm}
     \end{header}
 
-    \vspace{0.3 cm}
+    \vspace{0.3 cm - 0.3 cm}
 
 
     \section{Text Entries}
@@ -202,48 +226,56 @@
 
         
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+        \end{minipage}
         \end{onecolentry}
 
         \vspace{0.1 cm}
 
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}\end{onecolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648}\end{minipage}
+        \end{onecolentry}
 
         \vspace{0.1 cm}
 
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        IEEE Transactions on Applied Superconductivity\end{onecolentry}
+        IEEE Transactions on Applied Superconductivity\end{minipage}
+        \end{onecolentry}
 
         \vspace{0.1 cm}
 
         \begin{onecolentry}
-            \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
+            \begin{minipage}{\linewidth}
+                \textbf{Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils} \hfill Sept. 2021
 
-            \vspace{0.10 cm}
+                \vspace{0.10 cm}
 
-            \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
-            \vspace{0.10 cm}
+                \mbox{J. Doe}, \mbox{\textbf{H. Tom}}, \mbox{S. Doe}, \mbox{A. Andsurname}
+                \vspace{0.10 cm}
 
-        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)\end{onecolentry}
+        \href{https://doi.org/10.1109/TASC.2023.3340648}{10.1109/TASC.2023.3340648} (IEEE Transactions on Applied Superconductivity)\end{minipage}
+        \end{onecolentry}
 
 
     
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex
index 78c95b8..6dc41d2 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_empty/None_CV.tex
@@ -7,14 +7,14 @@
 \documentclass[10pt, letterpaper]{article}
 
 \usepackage[
-        ignoreheadfoot, % set margins without considering header and footer
-        top=2 cm, % seperation between body and page edge from the top
-        bottom=2 cm, % seperation between body and page edge from the bottom
-        left=2 cm, % seperation between body and page edge from the left
-        right=2 cm, % seperation between body and page edge from the right
-        footskip=1.0 cm, % seperation between body and footer
-        % showframe % for debugging 
-    ]{geometry} % for adjusting page geometry
+    ignoreheadfoot, % set margins without considering header and footer
+    top=2 cm, % seperation between body and page edge from the top
+    bottom=2 cm, % seperation between body and page edge from the bottom
+    left=2 cm, % seperation between body and page edge from the left
+    right=2 cm, % seperation between body and page edge from the right
+    footskip=1.0 cm, % seperation between body and footer
+    % showframe % for debugging 
+]{geometry} % for adjusting page geometry
 \usepackage{latexsym}
 \usepackage[nobottomtitles*]{titlesec}
 \usepackage{marvosym}
@@ -23,9 +23,9 @@
 \usepackage{xcolor}
 \usepackage{enumitem}
 \usepackage[
-  hidelinks,
-  pdftitle={None's CV},
-  pdfauthor={None}
+    hidelinks,
+    pdftitle={None's CV},
+    pdfauthor={None}
 ]{hyperref}
 \usepackage{fancyhdr}
 \usepackage[english]{babel}
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
index e65853b..07489cc 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
@@ -7,14 +7,14 @@
 \documentclass[10pt, letterpaper]{article}
 
 \usepackage[
-        ignoreheadfoot, % set margins without considering header and footer
-        top=2 cm, % seperation between body and page edge from the top
-        bottom=2 cm, % seperation between body and page edge from the bottom
-        left=2 cm, % seperation between body and page edge from the left
-        right=2 cm, % seperation between body and page edge from the right
-        footskip=1.0 cm, % seperation between body and footer
-        % showframe % for debugging 
-    ]{geometry} % for adjusting page geometry
+    ignoreheadfoot, % set margins without considering header and footer
+    top=2 cm, % seperation between body and page edge from the top
+    bottom=2 cm, % seperation between body and page edge from the bottom
+    left=2 cm, % seperation between body and page edge from the left
+    right=2 cm, % seperation between body and page edge from the right
+    footskip=1.0 cm, % seperation between body and footer
+    % showframe % for debugging 
+]{geometry} % for adjusting page geometry
 \usepackage{latexsym}
 \usepackage[nobottomtitles*]{titlesec}
 \usepackage{marvosym}
@@ -23,9 +23,9 @@
 \usepackage{xcolor}
 \usepackage{enumitem}
 \usepackage[
-  hidelinks,
-  pdftitle={John Doe's CV},
-  pdfauthor={John Doe}
+    hidelinks,
+    pdftitle={John Doe's CV},
+    pdfauthor={John Doe}
 ]{hyperref}
 \usepackage{fancyhdr}
 \usepackage[english]{babel}
diff --git a/tests/testdata/test_latex_to_pdf/classic_empty.pdf b/tests/testdata/test_latex_to_pdf/classic_empty.pdf
index ba2f1aa..28c4dcc 100644
Binary files a/tests/testdata/test_latex_to_pdf/classic_empty.pdf and b/tests/testdata/test_latex_to_pdf/classic_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/classic_filled.pdf b/tests/testdata/test_latex_to_pdf/classic_filled.pdf
index 5f1d213..48bb6aa 100644
Binary files a/tests/testdata/test_latex_to_pdf/classic_filled.pdf and b/tests/testdata/test_latex_to_pdf/classic_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf b/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf
index 3f52350..8df0ab1 100644
Binary files a/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf and b/tests/testdata/test_latex_to_pdf/engineeringresumes_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf b/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf
index 7760a90..0424ee1 100644
Binary files a/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf and b/tests/testdata/test_latex_to_pdf/engineeringresumes_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf b/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf
index 8f56922..84c1434 100644
Binary files a/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf and b/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf b/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf
index 866d85a..cc5e400 100644
Binary files a/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf and b/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf b/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf
index ac304c9..7cd71d7 100644
Binary files a/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf and b/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf b/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf
index aefb0f2..41b2779 100644
Binary files a/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf and b/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf differ