diff --git a/frappe/public/css/hljs.css b/frappe/public/css/hljs.css
index a5c21784fa..eb568949c0 100644
--- a/frappe/public/css/hljs.css
+++ b/frappe/public/css/hljs.css
@@ -18,7 +18,7 @@ Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiac
 
 .hljs,
 .hljs-subst,
-.hljs-tag .hljs-title,
+/*.hljs-tag .hljs-title,*/
 .nginx .hljs-title {
   color: black;
 }
diff --git a/frappe/website/template.py b/frappe/website/template.py
index fffa226665..92ac2022b0 100644
--- a/frappe/website/template.py
+++ b/frappe/website/template.py
@@ -118,7 +118,10 @@ def add_index(out, context):
 		if next_item:
 			if next_item.name[0]!="/": next_item.name = "/" + next_item.name
 			html = ('<p class="btn-next-wrapper"><a class="btn-next" href="{name}">'+_("Next")+': {title}</a></p>').format(**next_item)
-			out["content"] = out["content"].replace("{next}", html)
+		else:
+			html = ""
+
+		out["content"] = out["content"].replace("{next}", html)
 
 def add_hero(out, context):
 	"""Add a hero element if specified in content or hooks.