diff --git a/rendercv/themes/classic/Header.j2.tex b/rendercv/themes/classic/Header.j2.tex
index 7ee0744..770cd3d 100644
--- a/rendercv/themes/classic/Header.j2.tex
+++ b/rendercv/themes/classic/Header.j2.tex
@@ -9,40 +9,11 @@
     \vspace{<<design.margins.header.vertical_between_name_and_connections>>}
 
     \normalsize
-((* if cv.phone *))
-    \mbox{\hrefWithoutArrow{<<cv.phone|replace("-","")>>}{{\footnotesize\faPhone*}\hspace*{0.13cm}<<cv.phone|replace("tel:", "")|replace("-"," ")>>}}
+    ((* for connection in cv.connections *))
+    \mbox{\hrefWithoutArrow{<<connection["url"]>>}{{\footnotesize<<connection["latex_icon"]>>}\hspace*{0.13cm}<<connection["placeholder"]>>}}
     \hspace*{<<design.margins.header.horizontal_between_connections>>}
-((* endif *))
-((* if cv.email *))
-    \mbox{\hrefWithoutArrow{mailto:<<cv.email>>}{{\small\faEnvelope[regular]}\hspace*{0.13cm}<<cv.email|escape_latex_characters>>}}
-    \hspace*{<<design.margins.header.horizontal_between_connections>>}
-((* endif *))
-((* if cv.location *))
-    \mbox{{\small\faMapMarker*}\hspace*{0.13cm}<<cv.location>>}
-    \hspace*{<<design.margins.header.horizontal_between_connections>>}
-((* endif *))
-((* if cv.website *))
-    \mbox{\hrefWithoutArrow{<<cv.website>>}{{\small\faLink}\hspace*{0.13cm}<<cv.website|replace("https://","")|reverse|replace("/", "", 1)|reverse>>}}
-    \hspace*{<<design.margins.header.horizontal_between_connections>>}
-((* endif *))
-((*
-    set icon_dictionary = {
-        "LinkedIn": "\\faLinkedinIn",
-        "GitHub": "\\faGithub",
-        "Instagram": "\\faInstagram",
-        "Mastodon": "\\faMastodon",
-        "Orcid": "\\faOrcid",
-    }
-*))
-((* if cv.social_networks *))
-    ((* for network in cv.social_networks *))
-        ((* if network.network in icon_dictionary *))
-    \mbox{\hrefWithoutArrow{<<network.url>>}{{\small<<icon_dictionary[network.network]>>}\hspace*{0.13cm}<<network.username>>}}
-    \hspace*{<<design.margins.header.horizontal_between_connections>>}
-        ((* endif *))
     ((* endfor *))
-((* endif *))
 \end{header}
 
-\vspace{<<design.margins.header.bottom>>}
+\vspace{<<design.margins.header.bottom>> - <<design.margins.section_title.top>>}
 ((* endif *))
\ No newline at end of file
diff --git a/rendercv/themes/classic/Preamble.j2.tex b/rendercv/themes/classic/Preamble.j2.tex
index 838344a..7891f6f 100644
--- a/rendercv/themes/classic/Preamble.j2.tex
+++ b/rendercv/themes/classic/Preamble.j2.tex
@@ -41,6 +41,13 @@
 \fi
 
 % Some settings:
+((* if design.text_alignment == "justified-with-no-hyphenation" *))
+\usepackage[none]{hyphenat}
+\sloppy
+((* elif design.text_alignment == "left-aligned" *))
+\raggedright
+((* endif *))
+
 \pagestyle{empty} % no header or footer
 \setcounter{secnumdepth}{0} % no section numbering
 \setlength{\parindent}{0pt} % no indentation
@@ -142,13 +149,16 @@
     \par\kern\topsep
 } % new environment for the header
 
+((* set last_updated_date_style_placeholders = {
+    "TODAY": today,
+} *))
 \newcommand{\placelastupdatedtext}{% \placetextbox{<horizontal pos>}{<vertical pos>}{<stuff>}
   \AddToShipoutPictureFG*{% Add <stuff> to current page foreground
     \put(
         \LenToUnit{\paperwidth-<<design.margins.page.right>>-<<design.margins.entry_area.left_and_right>>+0.05cm},
         \LenToUnit{\paperheight-<<design.margins.page.top|divide_length_by(2)>>}
     ){\vtop{{\null}\makebox[0pt][c]{
-        \small\color{gray}\textit{Last updated in <<today>>}\hspace{\widthof{Last updated in <<today>>}}
+        \small\color{gray}\textit{<<design.last_updated_date_style|replace_placeholders_with_actual_values(last_updated_date_style_placeholders)>>}\hspace{\widthof{<<design.last_updated_date_style|replace_placeholders_with_actual_values(last_updated_date_style_placeholders)>>}}
     }}}%
   }%
 }%