diff --git a/rendercv/themes/classic/EducationEntry.j2.tex b/rendercv/themes/classic/EducationEntry.j2.tex
index 00f94f2..48c1d13 100644
--- a/rendercv/themes/classic/EducationEntry.j2.tex
+++ b/rendercv/themes/classic/EducationEntry.j2.tex
@@ -1,3 +1,11 @@
+((* if section_title in design.show_time_span_in *))
+    ((* set date_and_location_strings = [entry.location, entry.date_string, entry.time_span_string] *))
+((* else *))
+    ((* set date_and_location_strings = [entry.location, entry.date_string] *))
+((* endif *))
+((* if not is_first_entry *))
+\vspace{<<design.margins.entry_area.vertical_between>>}
+((* endif *))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
     ((# width: \textwidth #))
     ((# preamble: first column, second column, third column #))
@@ -5,12 +13,12 @@
         ((# second column: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
         ((# third column: R{<<design.date_and_location_width>>}; constant widthm ragged right column #))
 \begin{tabularx}{
-        \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
-    }{
-        L{0.85cm}
-        K{<<design.margins.entry_area.left_and_right>>}
-        R{<<design.date_and_location_width>>}
-    }
+    \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
+}{
+    L{0.85cm}
+    K{<<design.margins.entry_area.left_and_right>>}
+    R{<<design.date_and_location_width>>}
+}
     \textbf{<<entry.study_type>>}
     &
     \textbf{<<entry.institution>>}, <<entry.area>>
@@ -22,15 +30,15 @@
     \begin{highlights}
     ((* endif *))
         \item <<item>>
-
     ((* if loop.last *))
     \end{highlights}
     ((* endif *))
 ((* endfor *))
     &
-((*set date_and_location_strings = [entry.location, entry.date_string, entry.time_span_string]*))
 ((* for item in date_and_location_strings *))
     <<item>>
+    ((* if not loop.last *))
 
+    ((* endif *))
 ((* endfor *))
-\end{tabularx}
\ No newline at end of file
+\end{tabularx}
diff --git a/rendercv/themes/classic/ExperienceEntry.j2.tex b/rendercv/themes/classic/ExperienceEntry.j2.tex
index dffa4a4..c0ce340 100644
--- a/rendercv/themes/classic/ExperienceEntry.j2.tex
+++ b/rendercv/themes/classic/ExperienceEntry.j2.tex
@@ -1,14 +1,22 @@
+((* if section_title in design.show_time_span_in *))
+    ((* set date_and_location_strings = [entry.location, entry.date_string, entry.time_span_string] *))
+((* else *))
+    ((* set date_and_location_strings = [entry.location, entry.date_string] *))
+((* endif *))
+((* if not is_first_entry *))
+\vspace{<<design.margins.entry_area.vertical_between>>}
+((* endif *))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
     ((# width: \textwidth #))
     ((# preamble: first column, second column #))
         ((# first column:: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
         ((# second column: R{<<design.date_and_location_width>>}; constant width ragged right column #))
 \begin{tabularx}{
-        \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
-    }{
-        K{<<design.margins.entry_area.left_and_right>>}
-        R{<<design.date_and_location_width>>}
-    }
+    \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
+}{
+    K{<<design.margins.entry_area.left_and_right>>}
+    R{<<design.date_and_location_width>>}
+}
     \textbf{<<entry.company>>}, <<entry.position>>
 
     \vspace{<<design.margins.highlights_area.top>>}
@@ -18,15 +26,15 @@
     \begin{highlights}
     ((* endif *))
         \item <<item>>
-
     ((* if loop.last *))
     \end{highlights}
     ((* endif *))
 ((* endfor *))
     &
-((*set date_and_location_strings = [entry.location, entry.date_string, entry.time_span_string]*))
 ((* for item in date_and_location_strings *))
     <<item>>
+    ((* if not loop.last *))
 
+    ((* endif *))
 ((* endfor *))
-\end{tabularx}
\ No newline at end of file
+\end{tabularx}
diff --git a/rendercv/themes/classic/Header.j2.tex b/rendercv/themes/classic/Header.j2.tex
index 6fef266..d25e90b 100644
--- a/rendercv/themes/classic/Header.j2.tex
+++ b/rendercv/themes/classic/Header.j2.tex
@@ -1,3 +1,7 @@
+((* if design.show_last_updated_date *))
+    \placelastupdatedtext
+((* endif *))
+
 \begin{header}
     \fontsize{<<design.header_font_size>>}{<<design.header_font_size>>}
     \textbf{<<cv.name>>}
@@ -34,7 +38,6 @@
     \mbox{\hrefWithoutArrow{network.url}{{\small<<icon_dictionary[network.network]>>}\hspace{0.13cm}<<network.username>>}}
     \hspace{0.5cm}
 ((* endfor *))
-
 \end{header}
 
 \vspace{<<design.margins.header.bottom>>}
\ No newline at end of file
diff --git a/rendercv/themes/classic/NormalEntry.j2.tex b/rendercv/themes/classic/NormalEntry.j2.tex
index f13d277..f0f809d 100644
--- a/rendercv/themes/classic/NormalEntry.j2.tex
+++ b/rendercv/themes/classic/NormalEntry.j2.tex
@@ -1,25 +1,34 @@
-((*set date_and_location_strings = [entry.location, entry.date_string, entry.time_span_string]*))
-((* if date_and_location_strings == ["", "", ""]*))
+((* if section_title in design.show_time_span_in *))
+    ((* set date_and_location_strings = [entry.location, entry.date_string, entry.time_span_string] *))
+((* else *))
+    ((* set date_and_location_strings = [entry.location, entry.date_string] *))
+((* endif *))
+((* if not is_first_entry *))
+\vspace{<<design.margins.entry_area.vertical_between>>}
+((* endif *))
+((* if date_and_location_strings == ["", "", ""] or date_and_location_strings == ["", ""] *))
+((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
+    ((# width: \textwidth #))
+    ((# preamble: first column #))
+        ((# first column:: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
 \begin{tabularx}{
     \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
 }{
     K{<<design.margins.entry_area.left_and_right>>}
 }
-\textbf{<<entry.name>>}
+    \textbf{<<entry.name>>}
 
-\vspace{<<design.margins.highlights_area.top>>}
+    \vspace{<<design.margins.highlights_area.top>>}
 
     ((* for item in entry.highlights *))
         ((* if loop.first *))
-\begin{highlights}
+    \begin{highlights}
         ((* endif *))
-    \item <<item>>
-
+        \item <<item>>
         ((* if loop.last *))
-\end{highlights}
+    \end{highlights}
         ((* endif *))
     ((* endfor *))
-
 \end{tabularx}
 ((* else *))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
@@ -33,24 +42,25 @@
     K{<<design.margins.entry_area.left_and_right>>}
     R{<<design.date_and_location_width>>}
 }
-\textbf{<<entry.name>>}
+    \textbf{<<entry.name>>}
 
-\vspace{<<design.margins.highlights_area.top>>}
+    \vspace{<<design.margins.highlights_area.top>>}
 
     ((* for item in entry.highlights *))
         ((* if loop.first *))
-\begin{highlights}
+    \begin{highlights}
         ((* endif *))
-    \item <<item>>
-
+        \item <<item>>
         ((* if loop.last *))
-\end{highlights}
+    \end{highlights}
         ((* endif *))
     ((* endfor *))
-&
+    &
     ((* for item in date_and_location_strings *))
-<<item>>
+    <<item>>
+        ((* if not loop.last *))
 
+        ((* endif *))
     ((* endfor *))
 \end{tabularx}
-((* endif *))
\ No newline at end of file
+((* endif *))
diff --git a/rendercv/themes/classic/OneLineEntry.j2.tex b/rendercv/themes/classic/OneLineEntry.j2.tex
index bc97c14..6ec1748 100644
--- a/rendercv/themes/classic/OneLineEntry.j2.tex
+++ b/rendercv/themes/classic/OneLineEntry.j2.tex
@@ -1,3 +1,6 @@
+((* if not is_first_entry *))
+\vspace{<<design.margins.entry_area.vertical_between>>}
+((* endif *))
 \begingroup((* if design.text_alignment == "left-aligned" *))\raggedright((* endif *))
 \leftskip=<<design.margins.entry_area.left_and_right>>
 \advance\csname @rightskip\endcsname <<design.margins.entry_area.left_and_right>>
diff --git a/rendercv/themes/classic/Preamble.j2.tex b/rendercv/themes/classic/Preamble.j2.tex
index d9bc8ba..8c3a098 100644
--- a/rendercv/themes/classic/Preamble.j2.tex
+++ b/rendercv/themes/classic/Preamble.j2.tex
@@ -123,4 +123,9 @@
 % save the original href command in a new command:
 \let\hrefWithoutArrow\href
  % new command for external links:
-\renewcommand{\href}[2]{\hrefWithoutArrow{#1}{#2 \raisebox{.15ex}{\footnotesize \faExternalLink*}}}
\ No newline at end of file
+\renewcommand{\href}[2]{\hrefWithoutArrow{#1}{#2 \raisebox{.15ex}{\footnotesize \faExternalLink*}}}
+
+\let\originalTabularx\tabularx
+\let\originalEndTabularx\endtabularx
+
+\renewenvironment{tabularx}{\bgroup\centering\originalTabularx}{\originalEndTabularx\par\egroup}
diff --git a/rendercv/themes/classic/PublicationEntry.j2.tex b/rendercv/themes/classic/PublicationEntry.j2.tex
index 255236e..237501a 100644
--- a/rendercv/themes/classic/PublicationEntry.j2.tex
+++ b/rendercv/themes/classic/PublicationEntry.j2.tex
@@ -1,3 +1,6 @@
+((* if not is_first_entry *))
+\vspace{<<design.margins.entry_area.vertical_between>>}
+((* endif *))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
     ((# width: \textwidth #))
     ((# preamble: first column, second column #))
@@ -15,5 +18,4 @@
     \href{<<entry.doi_url>>}{<<entry.doi>>} (<<entry.journal>>)
     &
     <<entry.date_string>>
-
-\end{tabularx}
\ No newline at end of file
+\end{tabularx}
diff --git a/rendercv/themes/classic/TextEntry.j2.tex b/rendercv/themes/classic/TextEntry.j2.tex
index 6ce18d6..6f40ea9 100644
--- a/rendercv/themes/classic/TextEntry.j2.tex
+++ b/rendercv/themes/classic/TextEntry.j2.tex
@@ -1 +1,15 @@
-<<entry>>
\ No newline at end of file
+((* if not is_first_entry *))
+\vspace{<<design.margins.entry_area.vertical_between>>}
+((* endif *))
+{
+((* if design.text_alignment == "left-aligned" *))
+\raggedright
+((* endif *))
+\setlength{\leftskip}{<<design.margins.entry_area.left_and_right>>}
+\setlength{\rightskip}{<<design.margins.entry_area.left_and_right>>}
+
+<<entry>>
+
+\setlength{\leftskip}{0cm}
+\setlength{\rightskip}{0cm}
+}