diff --git a/rendercv/themes/engineeringresumes/EducationEntry.j2.tex b/rendercv/themes/engineeringresumes/EducationEntry.j2.tex
index 9ceb57d..e7aa77f 100644
--- a/rendercv/themes/engineeringresumes/EducationEntry.j2.tex
+++ b/rendercv/themes/engineeringresumes/EducationEntry.j2.tex
@@ -6,17 +6,20 @@
 \begin{twocolentry}{
     <<entry.date_string>>
 }
+((* else *))
+\begin{onecolentry}
+((* endif *))
     \textbf{<<entry.institution>>}, ((* if entry.degree *))<<entry.degree>> in ((* endif *))<<entry.area>>((* if entry.location *)) -- <<entry.location>>((* endif *))
+((* if entry.date_string *))
 \end{twocolentry}
+((* else *))
+\end{onecolentry}
+((* endif *))
 
 \vspace{<<design.margins.highlights_area.top>>}
-((* endif *))
 ((* for item in entry.highlights *))
     ((* if loop.first *))
 \begin{onecolentry}
-        ((* if not entry.date_string *))
-    \textbf{<<entry.institution>>}, ((* if entry.degree *))<<entry.degree>> in ((* endif *))<<entry.area>>((* if entry.location *)) -- <<entry.location>>((* endif *))
-        ((* endif *))
     \begin{highlights}
     ((* endif *))
         \item <<item>>
diff --git a/rendercv/themes/engineeringresumes/ExperienceEntry.j2.tex b/rendercv/themes/engineeringresumes/ExperienceEntry.j2.tex
index 1c7578a..ed761df 100644
--- a/rendercv/themes/engineeringresumes/ExperienceEntry.j2.tex
+++ b/rendercv/themes/engineeringresumes/ExperienceEntry.j2.tex
@@ -6,17 +6,20 @@
 \begin{twocolentry}{
     <<entry.date_string>>
 }
+((* else *))
+\begin{onecolentry}
+((* endif *))
     \textbf{<<entry.position>>}, <<entry.company>>((* if entry.location *)) -- <<entry.location>>((* endif *))
+((* if entry.date_string *))
 \end{twocolentry}
+((* else *))
+\end{onecolentry}
+((* endif *))
 
 \vspace{<<design.margins.highlights_area.top>>}
-((* endif *))
 ((* for item in entry.highlights *))
     ((* if loop.first *))
 \begin{onecolentry}
-        ((* if not entry.date_string *))
-    \textbf{<<entry.position>>}, <<entry.company>>((* if entry.location *)) -- <<entry.location>>((* endif *))
-        ((* endif *))
     \begin{highlights}
     ((* endif *))
         \item <<item>>
diff --git a/rendercv/themes/engineeringresumes/NormalEntry.j2.tex b/rendercv/themes/engineeringresumes/NormalEntry.j2.tex
index 8911299..4f27589 100644
--- a/rendercv/themes/engineeringresumes/NormalEntry.j2.tex
+++ b/rendercv/themes/engineeringresumes/NormalEntry.j2.tex
@@ -6,17 +6,20 @@
 \begin{twocolentry}{
     <<entry.date_string>>
 }
+((* else *))
+\begin{onecolentry}
+((* endif *))
     \textbf{<<entry.name>>}((* if entry.location *)) -- <<entry.location>>((* endif *))
+((* if entry.date_string *))
 \end{twocolentry}
+((* else *))
+\end{onecolentry}
+((* endif *))
 
 \vspace{<<design.margins.highlights_area.top>>}
-((* endif *))
 ((* for item in entry.highlights *))
     ((* if loop.first *))
 \begin{onecolentry}
-        ((* if not entry.date_string *))
-    \textbf{<<entry.name>>}((* if entry.location *)) -- <<entry.location>>((* endif *))
-        ((* endif *))
     \begin{highlights}
     ((* endif *))
         \item <<item>>