diff --git a/rendercv/themes/classic/PublicationEntry.j2.tex b/rendercv/themes/classic/PublicationEntry.j2.tex
index 328d155..78c9d40 100644
--- a/rendercv/themes/classic/PublicationEntry.j2.tex
+++ b/rendercv/themes/classic/PublicationEntry.j2.tex
@@ -21,12 +21,14 @@
         ((* endif *))
         ((* if entry.doi -*))
         \href{<<entry.doi_url>>}{<<entry.doi>>}
+        ((* elif entry.url -*))
+        \href{<<entry.url>>}{<<entry.clean_url>>}
         ((*- endif -*))
-        ((*- if entry.doi and entry.journal *)) (((* endif -*))
+        ((*- if (entry.doi or entry.url) and entry.journal *)) (((* endif -*))
         ((*- if entry.journal -*))
         <<entry.journal>>
         ((*- endif -*))
-        ((*- if entry.doi and entry.journal *)))((* endif *))
+        ((*- if (entry.doi or entry.url) and entry.journal *)))((* endif *))
     ((* if entry.date_string *))
     \end{twocolentry}
     ((* else *))
diff --git a/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex b/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
index 89083ed..cb310e8 100644
--- a/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
+++ b/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
@@ -26,11 +26,13 @@
         
         ((* if entry.doi -*))
         \href{<<entry.doi_url>>}{<<entry.doi>>}
+        ((* elif entry.url -*))
+        \href{<<entry.url>>}{<<entry.clean_url>>}
         ((*- endif -*))
-        ((*- if entry.doi and entry.journal *)) (((* endif -*))
+        ((*- if (entry.doi or entry.url) and entry.journal *)) (((* endif -*))
         ((*- if entry.journal -*))
         <<entry.journal>>
         ((*- endif -*))
-        ((*- if entry.doi and entry.journal *)))((* endif -*))
+        ((*- if (entry.doi or entry.url) and entry.journal *)))((* endif -*))
     \end{onecolentry}
 \end{samepage}
diff --git a/rendercv/themes/markdown/PublicationEntry.j2.md b/rendercv/themes/markdown/PublicationEntry.j2.md
index 115c632..73aef66 100644
--- a/rendercv/themes/markdown/PublicationEntry.j2.md
+++ b/rendercv/themes/markdown/PublicationEntry.j2.md
@@ -1,9 +1,9 @@
-## <<entry.title>> ((* if entry.doi != "" *))([<<entry.doi>>](<<entry.doi_url>>))((* endif *))
+## <<entry.title>> ((* if entry.doi *))([<<entry.doi>>](<<entry.doi_url>>))((* elif entry.url *))([<<entry.url>>](<<entry.clean_url>>))((* endif *))
 
 ((* if entry.date_string *))
 - <<entry.date_string>>
 ((* endif *))
 - <<entry.authors|join(", ")>>
-((* if entry.journal != "" *))
+((* if entry.journal *))
 - <<entry.journal>>
 ((* endif *))
diff --git a/rendercv/themes/moderncv/PublicationEntry.j2.tex b/rendercv/themes/moderncv/PublicationEntry.j2.tex
index 8699c82..107c4ea 100644
--- a/rendercv/themes/moderncv/PublicationEntry.j2.tex
+++ b/rendercv/themes/moderncv/PublicationEntry.j2.tex
@@ -3,6 +3,6 @@
 }{\textbf{<<entry.title>>}}{
     <<-entry.journal->>
 }{
-((*- if entry.doi -*))\href{<<entry.doi_url>>}{<<entry.doi>>}((*- endif -*))
+((*- if entry.doi -*))\href{<<entry.doi_url>>}{<<entry.doi>>}((* elif entry.url *))\href{<<entry.url>>}{<<entry.clean_url>>}((*- endif -*))
 }{}{}
 \cvline{}{\small <<entry.authors|map("make_it_nolinebreak")|join(", ")>>}
\ No newline at end of file
diff --git a/rendercv/themes/sb2nov/PublicationEntry.j2.tex b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
index d3647cc..f65c1a0 100644
--- a/rendercv/themes/sb2nov/PublicationEntry.j2.tex
+++ b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
@@ -29,12 +29,14 @@
     ((* endif *))
         ((* if entry.doi -*))
         \href{<<entry.doi_url>>}{<<entry.doi>>}
+        ((* elif entry.url -*))
+        \href{<<entry.url>>}{<<entry.clean_url>>}
         ((*- endif -*))
-        ((*- if entry.doi and entry.journal *)) (((* endif -*))
+        ((*- if (entry.doi or entry.url) and entry.journal *)) (((* endif -*))
         ((*- if entry.journal -*))
         <<entry.journal>>
         ((*- endif -*))
-        ((*- if entry.doi and entry.journal *)))((* endif -*))
+        ((*- if (entry.doi or entry.url) and entry.journal *)))((* endif -*))
     ((* if entry.doi or entry.journal *))
     \end{onecolentry}
     ((* endif *))