diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm
index 106673334d7..d6ed871dd42 100644
--- a/code/_helpers/text.dm
+++ b/code/_helpers/text.dm
@@ -569,15 +569,32 @@
 	t = replacetext(t, "</I>", "\[/i\]")
 	t = replacetext(t, "<U>", "\[u\]")
 	t = replacetext(t, "</U>", "\[/u\]")
-	t = replacetext(t, "<BR>", "\[br\]")
-	t = replacetext(t, "<HR>", "\[hr\]")
-	t = replacetext(t, "<ul>", "\[list\]")
-	t = replacetext(t, "</ul>", "\[/list\]")
-	t = replacetext(t, "<li>", "\[*\]")
 	t = replacetext(t, "<font size=\"4\">", "\[large\]")
 	t = replacetext(t, "</font>", "\[/large\]")
 	t = replacetext(t, "<font size = \"1\">", "\[small\]")
 	t = replacetext(t, "</font>", "\[/small\]")
+	t = replacetext(t, current_map.station_name, "\[station\]")
+	t = replacetext(t, "<BR>", "\n")
+	t = replacetext(t, "<center>", "\[center\]")
+	t = replacetext(t, "</center>", "\[/center\]")
+	t = replacetext(t, "<BR>", "\[br\]")
+	t = replacetext(t, "<span class=\"paper_field\"></span>", "\[field\]")
+	t = replacetext(t, "<H1>", "\[h1\]")
+	t = replacetext(t, "</H1>", "\[/h1\]")
+	t = replacetext(t, "<H2>", "\[h2\]")
+	t = replacetext(t, "</H2>", "\[/h2\]")
+	t = replacetext(t, "<H3>", "\[h3\]")
+	t = replacetext(t, "</H3>", "\[/h3\]")
+	t = replacetext(t, "<li>", "\[*\]")
+	t = replacetext(t, "<HR>", "\[hr\]")
+	t = replacetext(t, "<ul>", "\[list\]")
+	t = replacetext(t, "</ul>", "\[/list\]")
+	t = replacetext(t, "<table border=1 cellspacing=0 cellpadding=3 style='border: 1px solid black;'>", "\[table\]")
+	t = replacetext(t, "</td></tr></table>", "\[/table\]")
+	t = replacetext(t, "<table>", "\[grid\]")
+	t = replacetext(t, "</td></tr></table>", "\[/grid\]")
+	t = replacetext(t, "</td><tr>", "\[row\]")
+	t = replacetext(t, "<td>", "\[cell\]")
 
 	if(include_images)
 		t = replacetext(t, "<img src = scclogo.png>", "\[logo_scc\]")
diff --git a/html/changelogs/pencode2html.yml b/html/changelogs/pencode2html.yml
new file mode 100644
index 00000000000..7073857000d
--- /dev/null
+++ b/html/changelogs/pencode2html.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes:
+  - bugfix: "Converting from pencode to html (e.g. in the holomenu) will now properly convert center, heading, tables, lists, and more."