diff --git a/rendercv/themes/markdown/EducationEntry.j2.md b/rendercv/themes/markdown/EducationEntry.j2.md
index 431f642..630b07c 100644
--- a/rendercv/themes/markdown/EducationEntry.j2.md
+++ b/rendercv/themes/markdown/EducationEntry.j2.md
@@ -1,9 +1,9 @@
 ## <<entry.institution>>, ((* if entry.degree *))<<entry.degree>> in ((* endif *))<<entry.area>>
 
-((* if entry.date_string *))- <<entry.date_string>> ((* endif *))
-
-((* if entry.location *))- <<entry.location>> ((* endif *))
-
+((* if entry.date_string *))- <<entry.date_string>>
+((* endif *))
+((* if entry.location *))- <<entry.location>>
+((* endif *))
 ((* for item in entry.highlights *))
 - <<item>>
 ((* endfor *))
diff --git a/rendercv/themes/markdown/ExperienceEntry.j2.md b/rendercv/themes/markdown/ExperienceEntry.j2.md
index c998edd..44c3b7e 100644
--- a/rendercv/themes/markdown/ExperienceEntry.j2.md
+++ b/rendercv/themes/markdown/ExperienceEntry.j2.md
@@ -1,9 +1,9 @@
 ## <<entry.company>>, <<entry.position>>
 
-((* if entry.date_string *))- <<entry.date_string>> ((* endif *))
-
-((* if entry.location *))- <<entry.location>> ((* endif *))
-
+((* if entry.date_string *))- <<entry.date_string>>
+((* endif *))
+((* if entry.location *))- <<entry.location>>
+((* endif *))
 ((* for item in entry.highlights *))
 - <<item>>
 ((* endfor *))
diff --git a/rendercv/themes/markdown/NormalEntry.j2.md b/rendercv/themes/markdown/NormalEntry.j2.md
index cfa1860..374be0b 100644
--- a/rendercv/themes/markdown/NormalEntry.j2.md
+++ b/rendercv/themes/markdown/NormalEntry.j2.md
@@ -1,7 +1,9 @@
 ## <<entry.name>>
 
-((* if entry.date_string *))- <<entry.date_string>> ((* endif *))
-((* if entry.location *))- <<entry.location>> ((* endif *))
+((* if entry.date_string *))- <<entry.date_string>>
+((* endif *))
+((* if entry.location *))- <<entry.location>>
+((* endif *))
 ((* for item in entry.highlights *))
 - <<item>>
 ((* endfor *))