From cdb769a7c71c91821f7c72c2fd97147da6747917 Mon Sep 17 00:00:00 2001
From: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com>
Date: Mon, 5 May 2025 21:51:24 +0100
Subject: [PATCH] 516 compatibility for simple HTML (#37508)

* 516 compat: HTML wrappers

* More HTML

* Legacy gult

* Forgot these

* forgot that thanks travis
---
 __DEFINES/html_wrappers.dm                    |  8 +++++
 .../trinary_devices/pressure_valve.dm         |  2 +-
 code/ZAS/NewSettings.dm                       |  2 +-
 code/controllers/subsystem/garbage.dm         |  2 +-
 code/datums/datumvars.dm                      |  4 +--
 code/datums/gamemode/dynamic/dynamic.dm       |  2 +-
 .../factions/bloodcult/bloodcult_items.dm     | 11 ++++---
 .../gamemode/factions/legacy_cult/ritual.dm   |  2 +-
 .../gamemode/factions/legacy_cult/talisman.dm |  2 +-
 code/datums/gamemode/powers/powers.dm         |  2 +-
 code/datums/helper_datums/getrev.dm           |  2 +-
 code/datums/mind.dm                           |  4 +--
 code/game/gamemodes/nuclear/nuclearbomb.dm    |  2 +-
 code/game/gamemodes/sandbox/h_sandbox.dm      |  2 +-
 code/game/gamemodes/wizard/spellbook.dm       |  2 +-
 code/game/machinery/ATM.dm                    |  2 +-
 code/game/machinery/Freezer.dm                |  4 +--
 code/game/machinery/Sleeper.dm                |  2 +-
 code/game/machinery/adv_med.dm                |  2 +-
 code/game/machinery/alarm.dm                  |  6 ++--
 code/game/machinery/atmo_control.dm           |  2 +-
 code/game/machinery/biogenerator.dm           |  2 +-
 code/game/machinery/computer/Operating.dm     |  2 +-
 code/game/machinery/computer/aifixer.dm       |  2 +-
 code/game/machinery/computer/arcade/arcade.dm |  4 +--
 code/game/machinery/computer/message.dm       |  2 +-
 code/game/machinery/computer/pod.dm           |  2 +-
 code/game/machinery/computer/prisonshuttle.dm |  2 +-
 .../machinery/computer/specops_shuttle.dm     |  2 +-
 code/game/machinery/computer/station_alert.dm |  2 +-
 .../computer/syndicate_specops_shuttle.dm     |  2 +-
 code/game/machinery/doors/brigdoors.dm        |  2 +-
 code/game/machinery/magnet.dm                 |  2 +-
 code/game/machinery/metaldetector.dm          |  2 +-
 code/game/machinery/newscaster.dm             |  2 +-
 code/game/machinery/suit_storage_unit.dm      | 10 +++---
 code/game/machinery/syndicate_beacon.dm       |  2 +-
 code/game/machinery/telecomms/logbrowser.dm   |  2 +-
 code/game/machinery/telecomms/telemonitor.dm  |  2 +-
 .../machinery/telecomms/traffic_control.dm    |  4 +--
 code/game/machinery/turrets.dm                |  2 +-
 code/game/machinery/vending.dm                |  4 +--
 code/game/objects/items/blueprints.dm         |  2 +-
 code/game/objects/items/devices/PDA/PDA.dm    |  2 +-
 .../objects/items/devices/PDA/PDA_types.dm    |  4 +--
 code/game/objects/items/devices/aicard.dm     |  2 +-
 .../items/devices/healthanalyzerpro.dm        |  4 +--
 code/game/objects/items/devices/megaphone.dm  |  2 +-
 code/game/objects/items/devices/paicard.dm    |  2 +-
 .../objects/items/devices/radio/cyborg.dm     |  2 +-
 .../items/devices/radio/electropack.dm        |  2 +-
 .../game/objects/items/devices/radio/radio.dm |  6 ++--
 .../objects/items/devices/transfer_valve.dm   |  2 +-
 .../items/weapons/implants/implantchair.dm    |  2 +-
 .../items/weapons/implants/implantpad.dm      |  2 +-
 code/game/objects/items/weapons/scrolls.dm    |  2 +-
 .../objects/items/weapons/storage/secure.dm   |  2 +-
 .../objects/items/weapons/teleportation.dm    |  2 +-
 code/game/objects/objs.dm                     |  2 +-
 code/hub.dm                                   |  2 +-
 code/modules/Economy/Accounts.dm              |  2 +-
 code/modules/Economy/AdminTools.dm            |  2 +-
 code/modules/Economy/EFTPOS.dm                |  2 +-
 code/modules/Economy/POS.dm                   |  2 +-
 code/modules/admin/DB ban/functions.dm        |  2 +-
 code/modules/admin/NewBan.dm                  |  2 +-
 code/modules/admin/admin.dm                   | 24 +++++++-------
 code/modules/admin/admin_mass_del_in_zone.dm  |  2 +-
 code/modules/admin/artifacts_panel.dm         |  2 +-
 code/modules/admin/body_archive_panel.dm      |  2 +-
 code/modules/admin/check_antagonists.dm       |  2 +-
 code/modules/admin/climate_panel.dm           |  2 +-
 code/modules/admin/diseases_panel.dm          |  2 +-
 code/modules/admin/emergency_shuttle_panel.dm |  2 +-
 code/modules/admin/newbanjob.dm               |  2 +-
 .../admin/permissionverbs/permissionedit.dm   |  2 +-
 code/modules/admin/player_panel.dm            |  4 +--
 code/modules/admin/topic.dm                   | 33 +++++++++++--------
 code/modules/admin/verbs/atmosdebug.dm        |  4 +--
 .../admin/verbs/check_customitem_activity.dm  |  2 +-
 code/modules/admin/verbs/diagnostics.dm       |  2 +-
 code/modules/admin/verbs/mapping.dm           |  4 +--
 code/modules/admin/verbs/one_click_antag.dm   |  2 +-
 code/modules/assembly/proximity.dm            |  2 +-
 code/modules/assembly/signaler.dm             |  2 +-
 code/modules/assembly/timer.dm                |  2 +-
 .../awaymissions/bluespaceartillery.dm        |  2 +-
 code/modules/client/preferences.dm            |  6 ++--
 code/modules/clothing/suits/miscellaneous.dm  |  8 ++---
 code/modules/detectivework/detective_work.dm  |  2 +-
 code/modules/hydroponics/hydro_tools.dm       |  2 +-
 code/modules/library/computers/checkout.dm    |  3 +-
 code/modules/library/lib_machines.dm          |  2 +-
 .../media/broadcast/receivers/radio.dm        |  2 +-
 code/modules/medical/computer/cloning.dm      |  2 +-
 code/modules/mob/dead/observer/verbs.dm       |  2 +-
 code/modules/mob/language.dm                  |  4 +--
 code/modules/mob/living/silicon/ai/ai.dm      |  2 +-
 .../modules/mob/living/silicon/mommi/mommi.dm |  2 +-
 .../modules/mob/living/silicon/pai/recruit.dm |  4 +--
 .../mob/living/silicon/pai/software.dm        |  2 +-
 .../modules/mob/living/silicon/robot/robot.dm |  4 +--
 code/modules/mob/living/silicon/silicon.dm    |  4 +--
 .../borer/verbs_attached_chest.dm             |  2 +-
 .../mob/living/simple_animal/parrot.dm        |  2 +-
 code/modules/mob/mob.dm                       |  4 +--
 code/modules/mob/new_player/new_player.dm     |  6 ++--
 code/modules/mob/new_player/poll.dm           | 10 +++---
 code/modules/paperwork/fax.dm                 |  2 +-
 code/modules/paperwork/folders.dm             |  2 +-
 code/modules/paperwork/photocopier.dm         |  2 +-
 code/modules/power/gravitygenerator.dm        |  2 +-
 code/modules/power/rust/fuel_control.dm       |  2 +-
 .../particle_accelerator/particle_control.dm  |  2 +-
 code/modules/power/turbine.dm                 |  2 +-
 .../projectile/constructable/flamethrower.dm  |  2 +-
 code/modules/reagents/dartgun.dm              |  2 +-
 .../artifact/artifact_replicator.dm           |  2 +-
 .../machinery/artifact_harvester.dm           |  2 +-
 .../tools/ano_device_battery.dm               |  2 +-
 .../tools/suspension_generator.dm             |  2 +-
 .../tools/tools_depthscanner.dm               |  2 +-
 .../xenoarchaeology/tools/tools_locater.dm    |  2 +-
 .../security levels/keycard authentication.dm |  4 +--
 code/modules/virus2/curer.dm                  |  2 +-
 maps/randomvaults/objects.dm                  |  4 +--
 vgstation13.dme                               |  1 +
 127 files changed, 208 insertions(+), 188 deletions(-)
 create mode 100644 __DEFINES/html_wrappers.dm

diff --git a/__DEFINES/html_wrappers.dm b/__DEFINES/html_wrappers.dm
new file mode 100644
index 00000000000..ed7b985a926
--- /dev/null
+++ b/__DEFINES/html_wrappers.dm
@@ -0,0 +1,8 @@
+// Wrappers needed for webview 2.0 / 516 compat.
+
+#define HTML_SKELETON_INTERNAL(head, body, style) \
+"<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><meta http-equiv='X-UA-Compatible' content='IE=edge'>[head]</head><body style=[style]>[body]</body></html>"
+
+#define HTML_SKELETON_TITLE_STYLE(title, body, style) HTML_SKELETON_INTERNAL("<title>[title]</title>", body, style)
+#define HTML_SKELETON_TITLE(title, body) HTML_SKELETON_INTERNAL("<title>[title]</title>", body, "")
+#define HTML_SKELETON(body) HTML_SKELETON_INTERNAL("", body, "")
diff --git a/code/ATMOSPHERICS/components/trinary_devices/pressure_valve.dm b/code/ATMOSPHERICS/components/trinary_devices/pressure_valve.dm
index 8f2906bf32c..a09f1fb7a2f 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/pressure_valve.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/pressure_valve.dm
@@ -99,7 +99,7 @@
 				</body>
 			"}
 
-	user << browse(dat, "window=atmo_conditional_valve")
+	user << browse(HTML_SKELETON(dat), "window=atmo_conditional_valve")
 	onclose(user, "atmo_conditional_valve")
 	return
 
diff --git a/code/ZAS/NewSettings.dm b/code/ZAS/NewSettings.dm
index 2d833fed4d0..9304115654c 100644
--- a/code/ZAS/NewSettings.dm
+++ b/code/ZAS/NewSettings.dm
@@ -420,7 +420,7 @@ a { color: white; }
 		dat += {"<dt><b>[s.name]</b> = <i>[s.value]</i> <A href='?src=\ref[src];changevar=[id]'>\[Change\]</A></dt>
 			<dd>[s.desc]</i></dd>"}
 	dat += "</dl></body></html>"
-	user << browse(dat,"window=settings")
+	user << browse(HTML_SKELETON(dat),"window=settings")
 
 /ZAS_Settings/Topic(href,href_list)
 	if("changevar" in href_list)
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 0785f117d01..183b89667e1 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -228,7 +228,7 @@ List of hard deletions:"}
 	if(L.len == 1)
 		to_chat(usr, "No garbage collector deletions this round")
 		return
-	usr << browse(jointext(L,""),"window=harddellogs")
+	usr << browse(HTML_SKELETON(jointext(L, "")),"window=harddellogs")
 
 /*
  * NEVER USE THIS FOR /atom OTHER THAN /atom/movable
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 09cdb5fadbc..39fbc98d112 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -346,7 +346,7 @@ function loadPage(list) {
 
 	html += "</html>"
 
-	usr << browse(html, "window=variables\ref[D];size=475x650")
+	usr << browse(HTML_SKELETON(html), "window=variables\ref[D];size=475x650")
 
 /client/proc/debug_variable(name, value, list/searched, var/datum/DA = null)
 	var/html = ""
@@ -453,7 +453,7 @@ function loadPage(list) {
 		html += "<hr>"
 		html += debug_variable(null, L)
 
-	usr << browse(html, "window=listedit\ref[L];size=475x650")
+	usr << browse(HTML_SKELETON(html), "window=listedit\ref[L];size=475x650")
 
 /client/proc/view_var_Topic(href, href_list, hsrc)
 	//This should all be moved over to datum/admins/Topic() or something ~Carn
diff --git a/code/datums/gamemode/dynamic/dynamic.dm b/code/datums/gamemode/dynamic/dynamic.dm
index 74ade9321fb..bf69c1b9dcc 100644
--- a/code/datums/gamemode/dynamic/dynamic.dm
+++ b/code/datums/gamemode/dynamic/dynamic.dm
@@ -146,7 +146,7 @@ var/stacking_limit = 90
 	out += "<B>Remaining threat/threat_level:</B> [threat]/[threat_level]<br/>"
 	out += "<B>Remaining midround threat/threat_level:</B> [midround_threat]/[midround_threat_level]"
 
-	usr << browse(out, "window=threatlog;size=700x500")
+	usr << browse(HTML_SKELETON(out), "window=threatlog;size=700x500")
 
 /datum/gamemode/dynamic/GetScoreboard()
 
diff --git a/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm b/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
index 85476ba6e4b..6f2ef33a5de 100644
--- a/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
+++ b/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
@@ -75,8 +75,11 @@ var/list/arcane_tomes = list()
 
 /obj/item/weapon/tome/proc/tome_text()
 	var/page_data = null
-	var/dat = {"<title>arcane tome</title><body style="color:#FFFFFF" bgcolor="#110000">
-
+	var/title = "arcane tome"
+	var/body_style = {"
+	"color:#FFFFFF" bgcolor="#110000"
+	"}
+	var/dat = {"
 			<style>
 				label {display: inline-block; width: 50px;text-align: right;float: left;margin: 0 0 0 10px;}
 				ul {list-style-type: none;}
@@ -122,9 +125,9 @@ var/list/arcane_tomes = list()
 	else
 		dat += page_special()
 
-	dat += {"</div></div></div></body>"}
+	dat += {"</div></div></div>"}
 
-	return dat
+	return HTML_SKELETON_TITLE_STYLE(title, dat, body_style)
 
 /obj/item/weapon/tome/proc/page_special()
 	var/dat = null
diff --git a/code/datums/gamemode/factions/legacy_cult/ritual.dm b/code/datums/gamemode/factions/legacy_cult/ritual.dm
index 97ec8723569..be72b342d9c 100644
--- a/code/datums/gamemode/factions/legacy_cult/ritual.dm
+++ b/code/datums/gamemode/factions/legacy_cult/ritual.dm
@@ -294,7 +294,7 @@ var/runedec = 0 // Rune cap ?
 					[words[9]] is <a href='byond://?src=\ref[src];number=9;action=change'>[words[words[9]]]</A> <A href='byond://?src=\ref[src];number=9;action=clear'>Clear</A><BR>
 					[words[10]] is <a href='byond://?src=\ref[src];number=10;action=change'>[words[words[10]]]</A> <A href='byond://?src=\ref[src];number=10;action=clear'>Clear</A><BR>
 					"}
-		usr << browse("[notedat]", "window=notes")
+		usr << browse(HTML_SKELETON(notedat), "window=notes")
 //		call(/obj/item/weapon/tome_legacy/proc/edit_notes)()
 	else
 		usr << browse(null, "window=notes")
diff --git a/code/datums/gamemode/factions/legacy_cult/talisman.dm b/code/datums/gamemode/factions/legacy_cult/talisman.dm
index f96b81cd583..e324c849c84 100644
--- a/code/datums/gamemode/factions/legacy_cult/talisman.dm
+++ b/code/datums/gamemode/factions/legacy_cult/talisman.dm
@@ -143,7 +143,7 @@
 <A href='?src=\ref[src];rune=soulstone'>Kal om neth</A> - Summons a soul stone<BR>
 <A href='?src=\ref[src];rune=construct'>Da A'ig Osk</A> - Summons a construct shell for use with captured souls. It is too large to carry on your person.<BR>"}
 //<A href='?src=\ref[src];rune=armor'>Sa tatha najin</A> - Allows you to summon armored robes and an unholy blade<BR> //Kept for reference
-	usr << browse(dat, "window=id_com;size=350x200")
+	usr << browse(HTML_SKELETON(dat), "window=id_com;size=350x200")
 	return
 
 
diff --git a/code/datums/gamemode/powers/powers.dm b/code/datums/gamemode/powers/powers.dm
index dd8e9aea065..05a9ca1178f 100644
--- a/code/datums/gamemode/powers/powers.dm
+++ b/code/datums/gamemode/powers/powers.dm
@@ -333,7 +333,7 @@
 	</body></html>
 	"}
 
-	usr << browse(dat, "window=powers;size=900x480")
+	usr << browse(HTML_SKELETON(dat), "window=powers;size=900x480")
 
 
 
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index f4fad8837c7..902516a44f7 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -13,5 +13,5 @@
 	output += {"Current Infomational Settings: <br>
 		BYOND version of server: [world.byond_version].[world.byond_build]<br>
 		Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]<br>"}
-	usr << browse(output,"window=revdata");
+	usr << browse(HTML_SKELETON(output),"window=revdata");
 	return
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 6e2759c36f3..5c626d9a382 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -224,7 +224,7 @@
 
 	//<a href='?src=\ref[src];obj_announce=1'>Announce objectives</a><br><br>"} TODO: make sure that works
 
-	usr << browse(out, "window=role_panel[src];size=700x500")
+	usr << browse(HTML_SKELETON(out), "window=role_panel[src];size=700x500")
 
 /datum/mind/proc/role_purchase_log()
 	if(!ticker || !ticker.mode)
@@ -255,7 +255,7 @@
 				for(var/entry in W.potions_bought)
 					out += "[entry]<BR>"
 
-	usr << browse(out, "window=role_purchase_log[src];size=300x500")
+	usr << browse(HTML_SKELETON(out), "window=role_purchase_log[src];size=300x500")
 
 /datum/mind/proc/get_faction_list()
 	var/list/all_factions = list()
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 6c4661f4af7..2cc07a47be8 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -153,7 +153,7 @@ var/list/nuclear_bombs = list()
 		<A href='?src=\ref[src];type=4'>4</A>-<A href='?src=\ref[src];type=5'>5</A>-<A href='?src=\ref[src];type=6'>6</A><BR>\n
 		<A href='?src=\ref[src];type=7'>7</A>-<A href='?src=\ref[src];type=8'>8</A>-<A href='?src=\ref[src];type=9'>9</A><BR>\n
 		<A href='?src=\ref[src];type=R'>R</A>-<A href='?src=\ref[src];type=0'>0</A>-<A href='?src=\ref[src];type=E'>E</A><BR>\n</TT>"}
-		user << browse(dat, "window=nuclearbomb;size=300x400")
+		user << browse(HTML_SKELETON(dat), "window=nuclearbomb;size=300x400")
 		onclose(user, "nuclearbomb")
 	else if (src.deployable)
 		if(removal_stage < 5)
diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm
index 31b97183b3f..6e2323da3bc 100644
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ b/code/game/gamemodes/sandbox/h_sandbox.dm
@@ -105,7 +105,7 @@ var/global/list/banned_sandbox_types=list(
 		hsbpanel += "- <a href=\"?\ref[src];hsb=[T]\">[hrefs[T]]</a><br>"
 	if(hsboxspawn)
 		hsbpanel += "- <a href=\"?\ref[src];hsb=hsbobj\">Spawn Object</a><br><br>"
-	usr << browse(hsbpanel, "window=hsbpanel")
+	usr << browse(HTML_SKELETON(hsbpanel), "window=hsbpanel")
 
 /datum/hSB/Topic(href, href_list)
 	if(!(src.owner == usr.ckey))
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index b22a1452af3..67b8bfd870c 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -210,7 +210,7 @@
 
 	dat += "</body>"
 
-	user << browse(dat, "window=spellbook;size=[book_window_size]")
+	user << browse(HTML_SKELETON(dat), "window=spellbook;size=[book_window_size]")
 	onclose(user, "spellbook")
 
 /obj/item/weapon/spellbook/proc/build_description(var/mob/user, var/spell_path) //Building sounds more coderlike doesn't it
diff --git a/code/game/machinery/ATM.dm b/code/game/machinery/ATM.dm
index 97ff101c24e..ae60d5349e3 100644
--- a/code/game/machinery/ATM.dm
+++ b/code/game/machinery/ATM.dm
@@ -283,7 +283,7 @@ log transactions
 			dat += "<span class='warning'>Unable to connect to accounts database, please retry and if the issue persists contact Nanotrasen IT support.</span>"
 			reconnect_database()
 
-		user << browse(dat,"window=atm;size=550x650")
+		user << browse(HTML_SKELETON(dat),"window=atm;size=550x650")
 	else
 		user << browse(null,"window=atm")
 
diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index ea7ec71f250..d6e06b62bb3 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -106,7 +106,7 @@
 	Target gas temperature: <A href='?src=\ref[src];temp=-100'>-</A> <A href='?src=\ref[src];temp=-10'>-</A> <A href='?src=\ref[src];temp=-1'>-</A> [current_temperature] <A href='?src=\ref[src];temp=1'>+</A> <A href='?src=\ref[src];temp=10'>+</A> <A href='?src=\ref[src];temp=100'>+</A><BR>
 	"}
 
-	user << browse(dat, "window=freezer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=freezer;size=400x500")
 	onclose(user, "freezer")
 
 /obj/machinery/atmospherics/unary/cold_sink/freezer/Topic(href, href_list)
@@ -274,7 +274,7 @@
 	Target gas temperature: <A href='?src=\ref[src];temp=-100'>-</A> <A href='?src=\ref[src];temp=-10'>-</A> <A href='?src=\ref[src];temp=-1'>-</A> [current_temperature] <A href='?src=\ref[src];temp=1'>+</A> <A href='?src=\ref[src];temp=10'>+</A> <A href='?src=\ref[src];temp=100'>+</A><BR>
 	"}
 
-	user << browse(dat, "window=heater;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=heater;size=400x500")
 	onclose(user, "heater")
 
 /obj/machinery/atmospherics/unary/heat_reservoir/heater/Topic(href, href_list)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 9d9819ec596..1f72d2e158d 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -641,7 +641,7 @@
 	dat += "[(emagged) ? "<A href='?src=\ref[src];security=1'>Re-enable Security Features.</A><BR>" : ""]"
 	dat += "[(on) ? "<A href='?src=\ref[src];turnoff=1'>\[EMERGENCY STOP\]</A> <i>: cancels the current job.</i><BR>" : ""]"
 	dat += text("<BR><BR><A href='?src=\ref[];mach_close=\ref[src]'>Close</A>", user)
-	user << browse(dat, "window=\ref[src];size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=\ref[src];size=400x500")
 	onclose(user, "\ref[src]")
 
 
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index e9ad6e63d1f..a4cf7d6c7af 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -331,7 +331,7 @@
 	dat += "<HR><A href='?src=\ref[src];print=1'>Print</A><BR>"
 
 	dat += text("<BR><A href='?src=\ref[];mach_close=scanconsole'>Close</A>", user)
-	user << browse(dat, "window=scanconsole;size=430x600")
+	user << browse(HTML_SKELETON(dat), "window=scanconsole;size=430x600")
 	return
 
 
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 617bd1404cf..dd2ce2981cd 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -1453,7 +1453,7 @@ FIRE ALARM
 		dat += "An emergency shelter is mounted within. <A href='?src=\ref[src];shelter=1'>Retrieve</A>"
 	else
 		dat += "The shelter has been removed. <A href='?src=\ref[src];shelter=1'>Insert</A>"
-	user << browse(dat, "window=firealarm")
+	user << browse(HTML_SKELETON(dat), "window=firealarm")
 	onclose(user, "firealarm")
 
 /obj/machinery/firealarm/Topic(href, href_list)
@@ -1609,7 +1609,7 @@ var/global/list/firealarms = list() //shrug
 		var/second = time % 60
 		var/minute = (time - second) / 60
 		var/dat = text("<HTML><HEAD></HEAD><BODY><TT><B>Party Button</B> []\n<HR>\nTimer System: []<BR>\nTime Left: [][] <A href='?src=\ref[];tp=-30'>-</A> <A href='?src=\ref[];tp=-1'>-</A> <A href='?src=\ref[];tp=1'>+</A> <A href='?src=\ref[];tp=30'>+</A>\n</TT></BODY></HTML>", d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src)
-		user << browse(dat, "window=partyalarm")
+		user << browse(HTML_SKELETON(dat), "window=partyalarm")
 		onclose(user, "partyalarm")
 	else
 		if (this_area.fire)
@@ -1623,7 +1623,7 @@ var/global/list/firealarms = list() //shrug
 		var/second = time % 60
 		var/minute = (time - second) / 60
 		var/dat = text("<HTML><HEAD></HEAD><BODY><TT><B>[]</B> []\n<HR>\nTimer System: []<BR>\nTime Left: [][] <A href='?src=\ref[];tp=-30'>-</A> <A href='?src=\ref[];tp=-1'>-</A> <A href='?src=\ref[];tp=1'>+</A> <A href='?src=\ref[];tp=30'>+</A>\n</TT></BODY></HTML>", stars("Party Button"), d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src)
-		user << browse(dat, "window=partyalarm")
+		user << browse(HTML_SKELETON(dat), "window=partyalarm")
 		onclose(user, "partyalarm")
 	return
 
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 79ba47cd09e..a443c54be12 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -131,7 +131,7 @@
 	if(..(user))
 		return
 	var/html=return_text()+"</body></html>"
-	user << browse(html,"window=gac")
+	user << browse(html,"window=gac") // Already well-formed HTML
 	user.set_machine(src)
 	onclose(user, "gac")
 
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index 3c39f166b36..c19606fa576 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -614,7 +614,7 @@
 
 				dat += {"<FONT COLOR=red>Error: No growns inside.</FONT><BR>Please, put growns into reactor.<BR>
 					<A href='?src=\ref[src];action=menu'>Return to menu</A>"}
-	user << browse(dat, "window=biogenerator")
+	user << browse(HTML_SKELETON(dat), "window=biogenerator")
 	onclose(user, "biogenerator")
 	return
 
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 944b31db560..784b6379ed7 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -77,7 +77,7 @@
 <B>No Patient Detected</B><BR>
 <BR>
 <A HREF='?src=\ref[user];mach_close=op'>Close</A>"}
-	user << browse(dat, "window=op")
+	user << browse(HTML_SKELETON(dat), "window=op")
 	user.set_machine(src)
 	onclose(user, "op")
 
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 111023ff7bf..d7062176a34 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -67,7 +67,7 @@
 
 	user.set_machine(src)
 
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 	onclose(user, "computer")
 	return
 
diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm
index 4b65bf373f3..d1a42484f2b 100644
--- a/code/game/machinery/computer/arcade/arcade.dm
+++ b/code/game/machinery/computer/arcade/arcade.dm
@@ -56,14 +56,14 @@
 	playerone = user
 	var/dat = game.get_dat()
 
-	user << browse(dat, "window=arcade")
+	user << browse(HTML_SKELETON(dat), "window=arcade")
 	onclose(user, "arcade")
 
 // Lets you be "player two" against a human
 /obj/machinery/computer/arcade/attack_ai(mob/user)
     playertwo = user
     var/dat = game.get_p2_dat()
-    user << browse(dat, "window=arcade")
+    user << browse(HTML_SKELETON(dat), "window=arcade")
     onclose(user, "arcade")
 
 /obj/machinery/computer/arcade/emag_act(mob/user)
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 4c68e3bdf93..f98a3c249f5 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -305,7 +305,7 @@ var/list/message_monitors = list()
 
 	dat += "</body>"
 	message = defaultmsg
-	user << browse(dat, "window=message;size=700x700")
+	user << browse(HTML_SKELETON(dat), "window=message;size=700x700")
 	onclose(user, "message")
 	return
 
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 37e5d5acda7..187329050f6 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -170,7 +170,7 @@
 	dat += "<BR><A href='?src=\ref[src];add=1'>add another id_tag</A>"
 
 	dat += "<BR><BR><A href='?src=\ref[user];mach_close=computer'>Close</A></TT></BODY></HTML>"
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 	add_fingerprint(usr)
 	onclose(user, "computer")
 	return
diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm
index 6bfe691d9e2..0344719b1e4 100644
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -54,7 +54,7 @@ var/prison_shuttle_timeleft = 0
 		[prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called*<BR>\n<BR>":prison_shuttle_at_station ? "\n<A href='?src=\ref[src];sendtodock=1'>Send to Dock</A><BR>\n<BR>":"\n<A href='?src=\ref[src];sendtostation=1'>Send to station</A><BR>\n<BR>"]
 		\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
 
-	user << browse(dat, "window=computer;size=575x450")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=575x450")
 	onclose(user, "computer")
 
 
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index e2ac0f3c8bb..3f92bf6cf8a 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -273,7 +273,7 @@ var/specops_shuttle_timeleft = 0
 		[specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*<BR>\n<BR>":specops_shuttle_at_station ? "\n<A href='?src=\ref[src];sendtodock=1'>Shuttle standing by...</A><BR>\n<BR>":"\n<A href='?src=\ref[src];sendtostation=1'>Depart to [station_name]</A><BR>\n<BR>"]
 		\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
 
-	user << browse(dat, "window=computer;size=575x450")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=575x450")
 	onclose(user, "computer")
 	return
 
diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm
index 41d6053620f..406d91fb843 100644
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -74,7 +74,7 @@
 		else
 			dat += "-- All Systems Nominal<BR>\n"
 		dat += "<BR>\n"
-	user << browse(dat, "window=alerts")
+	user << browse(HTML_SKELETON(dat), "window=alerts")
 	onclose(user, "alerts")
 
 
diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm
index f3a3d8385f2..67788231f73 100644
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -209,7 +209,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 		[syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*<BR>\n<BR>":syndicate_elite_shuttle_at_station ? "\n<A href='?src=\ref[src];sendtodock=1'>Shuttle Offline</A><BR>\n<BR>":"\n<A href='?src=\ref[src];sendtostation=1'>Depart to [station_name]</A><BR>\n<BR>"]
 		\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
 
-	user << browse(dat, "window=computer;size=575x450")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=575x450")
 	onclose(user, "computer")
 	return
 
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 8fa9ac4eaa1..8dc908854c4 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -154,7 +154,7 @@
 
 	dat += {"<br/><br/><a href='?src=\ref[user];mach_close=computer'>Close</a>
 			</TT></BODY></HTML>"}
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 	onclose(user, "computer")
 
 
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 4fa9187930b..c8d45477e5c 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -265,7 +265,7 @@
 	dat += {"<br>Speed: <a href='?src=\ref[src];operation=minusspeed'>-</a> [speed] <a href='?src=\ref[src];operation=plusspeed'>+</a><br>
 		Path: {<a href='?src=\ref[src];operation=setpath'>[path]</a>}<br>
 		Moving: <a href='?src=\ref[src];operation=togglemoving'>[moving ? "Enabled":"Disabled"]</a>"}
-	user << browse(dat, "window=magnet;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=magnet;size=400x500")
 	onclose(user, "magnet")
 
 /obj/machinery/magnetic_controller/Topic(href, href_list)
diff --git a/code/game/machinery/metaldetector.dm b/code/game/machinery/metaldetector.dm
index 52446d9b0d0..f74a81ecaa8 100644
--- a/code/game/machinery/metaldetector.dm
+++ b/code/game/machinery/metaldetector.dm
@@ -168,7 +168,7 @@
 		<br>DeMil Alerts: <A href='?src=\ref[src];action=senmode'>Turn [senset ? "Off" : "On"]</A></h4>
 		"}
 
-		user << browse(dat, "window=detector;size=575x300")
+		user << browse(HTML_SKELETON(dat), "window=detector;size=575x300")
 		onclose(user, "detector")
 		return
 
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 167f23924bd..0de2be67c31 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -559,7 +559,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 				dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
 
 
-		M << browse(dat, "window=newscaster_main;size=400x600")
+		M << browse(HTML_SKELETON(dat), "window=newscaster_main;size=400x600")
 		onclose(M, "newscaster_main")
 
 /obj/machinery/newscaster/Topic(href, href_list)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 71e0f6e2bf0..ee6e6f39b24 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -244,14 +244,14 @@
 		dat+= text("<font color ='black'>A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads []</font>.<BR> <font color='blue'><A href='?src=\ref[];toggleUV=1'> Turn towards []</A><BR>",(issuperUV ? "15nm" : "185nm"),src,(issuperUV ? "185nm" : "15nm") )
 		dat+= text("<font color ='black'>A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.</font><BR><font color ='blue'><A href='?src=\ref[];togglesafeties=1'>Press button</a></font>",(safetieson? "<font color='green'><B>GREEN</B></font>" : "<font color='red'><B>RED</B></font>"),src)
 		dat+= text("<HR><BR><A href='?src=\ref[];mach_close=suit_storage_unit'>Close panel</A>", user)
-		//user << browse(dat, "window=ssu_m_panel;size=400x500")
+		//user << browse(HTML_SKELETON(dat), "window=ssu_m_panel;size=400x500")
 		//onclose(user, "ssu_m_panel")
 	else if(isUV) //The thing is running its cauterisation cycle. You have to wait.
 
 		dat += {"<HEAD><TITLE>Suit storage unit</TITLE></HEAD>
 			<font color ='red'><B>Unit is cauterising contents with selected UV ray intensity. Please wait.</font></B><BR>"}
 		//dat+= "<font colr='black'><B>Cycle end in: [cycletimeleft()] seconds. </font></B>"
-		//user << browse(dat, "window=ssu_cycling_panel;size=400x500")
+		//user << browse(HTML_SKELETON(dat), "window=ssu_cycling_panel;size=400x500")
 		//onclose(user, "ssu_cycling_panel")
 
 	else
@@ -287,17 +287,17 @@
 			dat+= text("Unit status: []",(islocked? "<font color ='red'><B>**LOCKED**</B></font><BR>" : "<font color ='green'><B>**UNLOCKED**</B></font><BR>") )
 			dat+= text("<A href='?src=\ref[];start_UV=1'>Start Disinfection cycle</A><BR>",src)
 			dat += text("<BR><BR><A href='?src=\ref[];mach_close=suit_storage_unit'>Close control panel</A>", user)
-			//user << browse(dat, "window=Suit Storage Unit;size=400x500")
+			//user << browse(HTML_SKELETON(dat), "window=Suit Storage Unit;size=400x500")
 			//onclose(user, "Suit Storage Unit")
 		else //Ohhhh shit it's dirty or broken! Let's inform the guy.
 
 			dat += {"<HEAD><TITLE>Suit storage unit</TITLE></HEAD>
 				<font color='maroon'><B>Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.</font></B><BR><BR>"}
 			dat+= text("<HR><A href='?src=\ref[];mach_close=suit_storage_unit'>Close control panel</A>", user)
-			//user << browse(dat, "window=suit_storage_unit;size=400x500")
+			//user << browse(HTML_SKELETON(dat), "window=suit_storage_unit;size=400x500")
 			//onclose(user, "suit_storage_unit")
 
-	user << browse(dat, "window=suit_storage_unit;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=suit_storage_unit;size=400x500")
 	onclose(user, "suit_storage_unit")
 	return
 
diff --git a/code/game/machinery/syndicate_beacon.dm b/code/game/machinery/syndicate_beacon.dm
index 6f17fbf45a2..5c060f4c251 100644
--- a/code/game/machinery/syndicate_beacon.dm
+++ b/code/game/machinery/syndicate_beacon.dm
@@ -45,7 +45,7 @@
 				dat += "<br><br><A href='?src=\ref[src];betraitor=1'>\"[pick("I want to switch teams.", "I want to work for you.", "Let me join you.", "I can be of use to you.", "You want me working for you, and here's why...", "Give me an objective.", "How's the 401k over at the Syndicate?")]\"</A><BR>"
 	dat += temptext
 	dat += "</body>"
-	user << browse(dat, "window=syndbeacon")
+	user << browse(HTML_SKELETON(dat), "window=syndbeacon")
 	onclose(user, "syndbeacon")
 
 /obj/machinery/syndicate_beacon/Topic(href, href_list)
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index c92d32ad18f..f575083e0d1 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -142,7 +142,7 @@ var/list/static/list_of_animal_types = typesof(/mob/living/simple_animal)
 
 
 
-	user << browse(dat, "window=comm_monitor;size=575x400")
+	user << browse(HTML_SKELETON(dat), "window=comm_monitor;size=575x400")
 	onclose(user, "server_control")
 
 	temp = ""
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 7530cbe2f42..908163227f0 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -85,7 +85,7 @@
 
 
 
-	user << browse(dat, "window=comm_monitor;size=575x400")
+	user << browse(HTML_SKELETON(dat), "window=comm_monitor;size=575x400")
 	onclose(user, "server_control")
 
 	temp = ""
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index f6ad4067aa0..c76d932581a 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -135,7 +135,7 @@
 					return
 
 
-	user << browse(dat, "window=traffic_control;size=575x400")
+	user << browse(HTML_SKELETON(dat), "window=traffic_control;size=575x400")
 	onclose(user, "server_control")
 
 	temp = ""
@@ -188,7 +188,7 @@
 			return
 
 	if(href_list["print"])
-		usr << browse(print_logs(), "window=traffic_logs")
+		usr << browse(HTML_SKELETON(print_logs()), "window=traffic_logs")
 		return
 
 	if(!auth && !issilicon(usr) && !emagged)
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 73c8bab8cc3..c6efbaacf1c 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -665,7 +665,7 @@
 
 				</body>
 				</html>"}
-	user << browse(dat, "window=turret")
+	user << browse(HTML_SKELETON(dat), "window=turret")
 	onclose(user, "turret")
 	return
 
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index a4b52c37c93..0ccc5e20167 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -815,7 +815,7 @@ var/global/num_vending_terminals = 1
 		dat += {"<b>You have selected [currently_vending.product_name].<br>Please ensure your ID is in your ID holder or hand.</b><br>
 			<a href='byond://?src=\ref[src];buy=1'>Pay</a> |
 			<a href='byond://?src=\ref[src];cancel_buying=1'>Cancel</a>"}
-		user << browse(dat, "window=vending")
+		user << browse(HTML_SKELETON(dat), "window=vending")
 		onclose(user, "")
 		return
 
@@ -908,7 +908,7 @@ var/global/num_vending_terminals = 1
 		if(!account_first_linked)
 			dat += "<br><br><i>Note: Remember to slide your ID on this machine to link your account. Once this is done, sliding your ID will enable editing and loading.</i>"
 
-	user << browse(dat, "window=vending;size=400x[vertical]")
+	user << browse(HTML_SKELETON(dat), "window=vending;size=400x[vertical]")
 	onclose(user, "vending")
 
 // returns the wire panel text
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 3182880da34..58b6733af1e 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -197,7 +197,7 @@ these cannot rename rooms that are in by default BUT can rename rooms that are c
 		text += "<p><a href='?src=\ref[src];action=delete_area'>Erase this drawing</a></p>"
 
 	text += "</BODY></HTML>"
-	usr << browse(text, "window=blueprints")
+	usr << browse(text, "window=blueprints") // NB: no need for HTML_SKELETON as it already HTML'd
 	onclose(usr, "blueprints")
 
 /obj/item/blueprints/proc/get_area_type(var/area/A)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 9cc2603675b..f2d6ae85662 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -213,7 +213,7 @@ var/global/msg_id = 0
 	dat += "</body></html>"
 	dat = jointext(dat,"") //Optimize BYOND's shittiness by making "dat" actually a list of strings and join it all together afterwards! Yes, I'm serious, this is actually a big deal
 
-	user << browse(dat, "window=pda;size=400x444;border=1;can_resize=1;can_minimize=0")
+	user << browse(HTML_SKELETON(dat), "window=pda;size=400x444;border=1;can_resize=1;can_minimize=0")
 	onclose(user, "pda", src)
 
 /obj/item/device/pda/Topic(href, href_list)
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index f559a4a7cc3..d7aedd293c8 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -559,7 +559,7 @@
 			usr << browse_rsc(img, "tmp_photo_[note].png")
 			dat += "<img src='tmp_photo_[note].png' width = '192' style='-ms-interpolation-mode:nearest-neighbor'><BR>"
 	dat += "</body></html>"
-	usr << browse(dat, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
+	usr << browse(HTML_SKELETON(dat), "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
 
 /mob/living/silicon/ai/proc/cmd_show_message_log()
 	if(usr.isDead())
@@ -578,7 +578,7 @@
 				usr << browse_rsc(img, "tmp_photo_[note].png")
 				dat += "<img src='tmp_photo_[note].png' width = '192' style='-ms-interpolation-mode:nearest-neighbor'><BR>"
 		dat += "</body></html>"
-		usr << browse(dat, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
+		usr << browse(HTML_SKELETON(dat), "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
 	else
 		to_chat(usr, "You do not have a PDA. You should make an issue report about this.")
 
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 9bf81f9d159..22f9acef14c 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -77,7 +77,7 @@
 			dat += {"<a href='byond://?src=\ref[src];choice=Wireless'>[A.control_disabled ? "Enable" : "Disable"] Wireless Activity</a>"}
 			dat += "<br>"
 			dat += {"<a href='byond://?src=\ref[src];choice=Close'> Close</a>"}
-	user << browse(dat, "window=aicard")
+	user << browse(HTML_SKELETON(dat), "window=aicard")
 	onclose(user, "aicard")
 	return
 
diff --git a/code/game/objects/items/devices/healthanalyzerpro.dm b/code/game/objects/items/devices/healthanalyzerpro.dm
index 1fa652f6834..31202cea424 100644
--- a/code/game/objects/items/devices/healthanalyzerpro.dm
+++ b/code/game/objects/items/devices/healthanalyzerpro.dm
@@ -165,7 +165,7 @@
 			to_chat(user, "<span class='warning'>Insuffient data retrieved. Please ensure that subject has proper surgical incisions.</span>")
 		else
 			to_chat(user, "<span class='info'>Autopsy analysis of [M] concluded.</span>")
-			user << browse(dat, "window=borerscan;size=430x600")
+			user << browse(HTML_SKELETON(dat), "window=borerscan;size=430x600")
 			last_reading = dat
 			last_scantime = world.time
 
@@ -189,7 +189,7 @@
 		to_chat(user, "<span class='info'>Showing medical statistics of [M]...</span>")
 		var/dat
 		dat = format_occupant_data(get_occupant_data(M),1) //basic scan in unupgraded body analyzer
-		user << browse(dat, "window=borerscan;size=430x600")
+		user << browse(HTML_SKELETON(dat), "window=borerscan;size=430x600")
 		last_reading = dat
 		last_scantime = world.time
 	return
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 06cb2551f7d..acb7b1bf6ba 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -76,7 +76,7 @@ var/list/megaphone_channels = list("DISABLE" = 0) + stationchannels
 			dat += "<a href='?src=\ref[src];setfreq=[megaphone_channels[index]]'>[index]</a>"
 		dat += "<BR>"
 	dat+={"</TT></body></html>"}
-	user << browse(dat, "window=megaphone")
+	user << browse(HTML_SKELETON(dat), "window=megaphone")
 	onclose(user, "megaphone")
 
 /obj/item/device/megaphone/madscientist/Topic(href,href_list)
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 6024982f4e3..b4aa62e6064 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -59,7 +59,7 @@
 			dat += {"No personality is installed.<br>
 				<A href='byond://?src=\ref[src];request=1'>\[Request personal AI personality\]</a><br>
 				Each time this button is pressed, a request will be sent out to any available personalities. Check back often and alot time for personalities to respond. This process could take anywhere from 15 seconds to several minutes, depending on the available personalities' timeliness."}
-	user << browse(dat, "window=paicard")
+	user << browse(HTML_SKELETON(dat), "window=paicard")
 	onclose(user, "paicard")
 
 /obj/item/device/paicard/attack_ghost(var/mob/dead/observer/O)
diff --git a/code/game/objects/items/devices/radio/cyborg.dm b/code/game/objects/items/devices/radio/cyborg.dm
index b70bf62dd23..c811156c937 100644
--- a/code/game/objects/items/devices/radio/cyborg.dm
+++ b/code/game/objects/items/devices/radio/cyborg.dm
@@ -109,7 +109,7 @@
 		for (var/ch_name in channels)
 			dat+=text_sec_channel(ch_name, channels[ch_name])
 	dat+={"[text_wires()]</TT></body></html>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 	return
 
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 62b09b6e706..41ff563bcb1 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -167,6 +167,6 @@ Code:
 <A href='byond://?src=\ref[src];code=1'>+</A>
 <A href='byond://?src=\ref[src];code=5'>+</A><BR>
 </TT>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 	return
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 9b24d301dfd..d16ca46fc21 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -107,7 +107,7 @@
 	for (var/ch_name in channels)
 		dat+=text_sec_channel(ch_name, channels[ch_name])
 	dat+={"[text_wires()]</TT></body></html>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 	return
 
@@ -614,7 +614,7 @@
 		dat += "Channel: <A href='byond://?src=\ref[src];toggle_channel=1'>Responder</A> <b>Command</b>"
 
 	dat+={"</TT></body></html>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 
 /obj/item/device/radio/phone/Topic(href, href_list)
@@ -692,7 +692,7 @@
 
 	dat += "Speaker: [listening ? "<A href='byond://?src=\ref[src];listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];listen=1'>Disengaged</A>"]<BR>"
 	dat+={"</TT></body></html>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 
 /obj/item/device/radio/phone/surveillance/Topic(href, href_list)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 7f86033ade2..69fdab318d4 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -94,7 +94,7 @@
 	<BR> <B> Valve attachment:</B> [attached_device ? "<A href='?src=\ref[src];device=1'>[attached_device]</A>" : "None"] [attached_device ? "<A href='?src=\ref[src];rem_device=1'>Remove</A>" : ""]
 	<BR> <B> Valve status: </B> [ valve_open ? "<A href='?src=\ref[src];open=1'>Closed</A> <B>Open</B>" : "<B>Closed</B> <A href='?src=\ref[src];open=1'>Open</A>"]"}
 
-	user << browse(dat, "window=trans_valve;size=600x300")
+	user << browse(HTML_SKELETON(dat), "window=trans_valve;size=600x300")
 	onclose(user, "trans_valve")
 	return
 
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 30a22a100b4..307c96a10a6 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -47,7 +47,7 @@
 	if(src.occupant)
 		dat += "[src.ready ? "<A href='?src=\ref[src];implant=1'>Implant</A>" : "Recharging"]<BR>"
 	user.set_machine(src)
-	user << browse(dat, "window=implant")
+	user << browse(HTML_SKELETON(dat), "window=implant")
 	onclose(user, "implant")
 
 
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index cf5368cc88d..38e4723edb9 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -64,7 +64,7 @@
 			dat += "The implant casing is empty."
 	else
 		dat += "Please insert an implant casing!"
-	user << browse(dat, "window=implantpad")
+	user << browse(HTML_SKELETON(dat), "window=implantpad")
 	onclose(user, "implantpad")
 
 
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index 93b542abeb3..d48d8c69be8 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -29,7 +29,7 @@
 	dat += "<B>Four uses, use them wisely:</B><BR>"
 	dat += "<A href='byond://?src=\ref[src];spell_teleport=1'>Teleport</A><BR>"
 	dat += "Kind regards,<br>Wizards Federation<br><br>P.S. Don't forget to bring your gear, you'll need it to cast most spells.<HR>"
-	user << browse(dat, "window=scroll")
+	user << browse(HTML_SKELETON(dat), "window=scroll")
 	onclose(user, "scroll")
 	return
 
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 6b60b22ee4f..18e565fa167 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -104,7 +104,7 @@
 		<A href='?src=\ref[src];type=4'>4</A>-<A href='?src=\ref[src];type=5'>5</A>-<A href='?src=\ref[src];type=6'>6</A><BR>\n
 		<A href='?src=\ref[src];type=7'>7</A>-<A href='?src=\ref[src];type=8'>8</A>-<A href='?src=\ref[src];type=9'>9</A><BR>\n
 		<A href='?src=\ref[src];type=R'>R</A>-<A href='?src=\ref[src];type=0'>0</A>-<A href='?src=\ref[src];type=E'>E</A><BR>\n</TT>"}
-	user << browse(dat, "window=caselock;size=300x280")
+	user << browse(HTML_SKELETON(dat), "window=caselock;size=300x280")
 
 /obj/item/weapon/storage/secure/Topic(href, href_list)
 	..()
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 2ab21977582..d29491e025f 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -42,7 +42,7 @@ Frequency:
 <A href='byond://?src=\ref[src];freq=10'>+</A><BR>
 
 <A href='?src=\ref[src];refresh=1'>Refresh</A>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 	return
 
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 9260340e461..a8181b3524d 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -614,7 +614,7 @@ a {
 		else
 			dat += "<p><b>MULTITOOL BUFFER:</b> <a href='?src=\ref[src];buffer=1'>\[Add Machine\]</a></p>"
 	dat += "</body></html>"
-	user << browse(dat, "window=mtcomputer")
+	user << browse(HTML_SKELETON(dat), "window=mtcomputer")
 	user.set_machine(src)
 	onclose(user, "mtcomputer")
 
diff --git a/code/hub.dm b/code/hub.dm
index b78a494e503..091d4793e85 100644
--- a/code/hub.dm
+++ b/code/hub.dm
@@ -41,7 +41,7 @@ var/global/byond_hub_playercount = OPEN_TO_HUB_PLAYERCOUNT_DEFAULT
 		<i>\[station_name\], \[map_name\], \[roundtime\], \[playercount\] can all be used to substitute their respective values.</i>
 	"}
 
-	usr << browse(dat, "window=admin2;size=600x400")
+	usr << browse(HTML_SKELETON(dat), "window=admin2;size=600x400")
 	return
 
 /world/proc/update_status()
diff --git a/code/modules/Economy/Accounts.dm b/code/modules/Economy/Accounts.dm
index dc801953ee9..42b8957909a 100644
--- a/code/modules/Economy/Accounts.dm
+++ b/code/modules/Economy/Accounts.dm
@@ -326,7 +326,7 @@ var/station_bonus = 0 //A bonus to station allowance that gets reset after wage
 							<td><a href='?src=\ref[src];choice=view_account_detail;account_index=[i]'>View in detail</a></td>
 							</tr>"}
 					dat += "</table>"
-		user << browse(dat,"window=account_db;size=700x650")
+		user << browse(HTML_SKELETON(dat),"window=account_db;size=700x650")
 	else
 		user << browse(null,"window=account_db")
 
diff --git a/code/modules/Economy/AdminTools.dm b/code/modules/Economy/AdminTools.dm
index a8288bf7835..8c67c1a5e43 100644
--- a/code/modules/Economy/AdminTools.dm
+++ b/code/modules/Economy/AdminTools.dm
@@ -100,4 +100,4 @@
                     </tr>"}
             dat += "</table>"
 
-    usr << browse(dat, "window=econ_panel")
+    usr << browse(HTML_SKELETON(dat), "window=econ_panel")
diff --git a/code/modules/Economy/EFTPOS.dm b/code/modules/Economy/EFTPOS.dm
index ceb5ff7e7bb..8cf797dbb38 100644
--- a/code/modules/Economy/EFTPOS.dm
+++ b/code/modules/Economy/EFTPOS.dm
@@ -82,7 +82,7 @@
 				<a href='?src=\ref[src];choice=change_code'>Change access code</a><br/>
 				<a href='?src=\ref[src];choice=change_id'>Change EFTPOS ID</a><br/>
 				Scan card to reset access code <a href='?src=\ref[src];choice=reset'>\[------\]</a>"}
-		user << browse(dat,"window=eftpos")
+		user << browse(HTML_SKELETON(dat),"window=eftpos")
 	else
 		user << browse(null,"window=eftpos")
 
diff --git a/code/modules/Economy/POS.dm b/code/modules/Economy/POS.dm
index b0a5a2bd10d..91b7f3a5788 100644
--- a/code/modules/Economy/POS.dm
+++ b/code/modules/Economy/POS.dm
@@ -447,7 +447,7 @@ var/const/POS_HEADER = {"<html>
 			dat += SettingsScreen()
 
 	dat += "</body></html>"
-	user << browse(dat, "window=pos")
+	user << browse(HTML_SKELETON(dat), "window=pos")
 	onclose(user, "pos")
 	return
 
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index 86eb4d607e4..982f95eeb36 100644
--- a/code/modules/admin/DB ban/functions.dm	
+++ b/code/modules/admin/DB ban/functions.dm	
@@ -539,4 +539,4 @@
 		output += "</table></div>"
 		qdel(select_query)
 
-	usr << browse(output,"window=lookupbans;size=900x500")
+	usr << browse(HTML_SKELETON(output),"window=lookupbans;size=900x500")
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 86099c91bd4..00bc1025b7d 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -217,7 +217,7 @@ var/savefile/Banlist
 
 	dat += {"</table>
 		<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , (E) = Edit Ban</FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]"}
-	usr << browse(dat, "window=unbanp;size=875x400")
+	usr << browse(HTML_SKELETON(dat), "window=unbanp;size=875x400")
 
 //////////////////////////////////// DEBUG ////////////////////////////////////
 
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index c8a35f6c602..f70f2f3b3d9 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -242,7 +242,7 @@ var/global/floorIsLava = 0
 		</body></html>
 	"}
 
-	usr << browse(body, "window=adminplayeropts-\ref[M];size=550x515")
+	usr << browse(HTML_SKELETON(body), "window=adminplayeropts-\ref[M];size=550x515")
 	feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
@@ -331,7 +331,7 @@ var/global/floorIsLava = 0
 			if(index == page)
 				dat += "</b>"
 
-	usr << browse(dat, "window=player_notes;size=400x400")
+	usr << browse(HTML_SKELETON(dat), "window=player_notes;size=400x400")
 
 
 /datum/admins/proc/player_has_info(var/key as text)
@@ -407,7 +407,7 @@ var/global/floorIsLava = 0
 		<A href='?src=\ref[src];add_player_info=[key]'>Add Comment</A><br>
 		</body></html>"}
 
-	usr << browse(dat, "window=adminplayerinfo;size=480x480")
+	usr << browse(HTML_SKELETON(dat), "window=adminplayerinfo;size=480x480")
 
 /datum/admins/proc/access_news_network() //MARKER
 	set category = "Fun"
@@ -650,7 +650,7 @@ var/global/floorIsLava = 0
 
 //	to_chat(world, "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]")
 //	to_chat(world, "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]")
-	usr << browse(dat, "window=admincaster_main;size=400x600")
+	usr << browse(HTML_SKELETON(dat), "window=admincaster_main;size=400x600")
 	onclose(usr, "admincaster_main")
 
 
@@ -666,7 +666,7 @@ var/global/floorIsLava = 0
 			r = copytext( r, 1, findtext(r,"##") )//removes the description
 		dat += text("<tr><td>[t] (<A href='?src=\ref[src];removejobban=[r]'>unban</A>)</td></tr>")
 	dat += "</table>"
-	usr << browse(dat, "window=ban;size=400x400")
+	usr << browse(HTML_SKELETON(dat), "window=ban;size=400x400")
 
 /datum/admins/proc/Game()
 	if(!check_rights(0))
@@ -728,7 +728,7 @@ var/global/floorIsLava = 0
 	dat += "<A href ='?src=\ref[src];econ_panel=open'>Manage accounts database</A><br>"
 	dat += "<A href ='?src=\ref[src];religions=1&display=1'>Manage religions</A><br>"
 
-	usr << browse(dat, "window=admin2;size=280x370")
+	usr << browse(HTML_SKELETON(dat), "window=admin2;size=280x370")
 	return
 
 /datum/admins/proc/dynamic_mode_options(mob/user)
@@ -764,7 +764,7 @@ var/global/floorIsLava = 0
 		Curve width: <A href='?src=\ref[src];f_dynamic_roundstart_width=1'>-> [dynamic_curve_width] <-</A><br>
 		"}
 
-	user << browse(dat, "window=dyn_mode_options;size=900x650")
+	user << browse(HTML_SKELETON(dat), "window=dyn_mode_options;size=900x650")
 
 /datum/admins/proc/Secrets()
 	if(!check_rights(0))
@@ -947,7 +947,7 @@ var/global/floorIsLava = 0
 		"}
 
 
-	usr << browse(dat, "window=secrets")
+	usr << browse(HTML_SKELETON(dat), "window=secrets")
 	return
 
 /datum/admins/var/datum/shuttle/selected_shuttle
@@ -986,7 +986,7 @@ var/global/floorIsLava = 0
 	<a href='?src=\ref[src];shuttle_add_docking_port=1'>Create a shuttle docking port</a><br>
 	<a href='?src=\ref[src];shuttle_mass_lockdown=1'>Lock down all shuttles</a><br>
 	"}
-	usr << browse(dat, "window=shuttlemagic")
+	usr << browse(HTML_SKELETON(dat), "window=shuttlemagic")
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////admins2.dm merge
@@ -1624,7 +1624,7 @@ var/alien_ship_location = 1 // 0 = base , 1 = mine
 
 	dat += "<hr><br><center>ADVANCED: <a href='?_src_=vars;Vars=\ref[end_credits]'>Debug Credits Datum</A></center>"
 
-	usr << browse(dat, "window=creditspanel;size=600x800")
+	usr << browse(HTML_SKELETON(dat), "window=creditspanel;size=600x800")
 
 /datum/admins/proc/PersistencePanel()
 	if(!check_rights(0))
@@ -1646,7 +1646,7 @@ var/alien_ship_location = 1 // 0 = base , 1 = mine
 		dat += "<b>[T.name]</b>: [T.tracking.len] entries - <A href='?src=\ref[src];persistencedatum=\ref[T];persistenceaction=qdelall'>(DELETE)</A><br>"
 		dat += "Max [T.max_per_turf] per turf. Lasts up to [T.max_age] rounds.<hr>"
 
-	usr << browse(dat, "window=persistencepanel;size=350x600")
+	usr << browse(HTML_SKELETON(dat), "window=persistencepanel;size=350x600")
 
 /datum/admins/proc/ViewAllRods()
 	if(!check_rights(0))
@@ -1660,4 +1660,4 @@ var/alien_ship_location = 1 // 0 = base , 1 = mine
 			dat += "- <A href='?src=\ref[src];rod_to_untrack=\ref[rod]'>(UNTRACK)</A>"
 		dat += "<br/>"
 
-	usr << browse(dat, "window=rodswindow;size=350x300")
+	usr << browse(HTML_SKELETON(dat), "window=rodswindow;size=350x300")
diff --git a/code/modules/admin/admin_mass_del_in_zone.dm b/code/modules/admin/admin_mass_del_in_zone.dm
index 43549e7dd25..84316cadf0a 100644
--- a/code/modules/admin/admin_mass_del_in_zone.dm
+++ b/code/modules/admin/admin_mass_del_in_zone.dm
@@ -34,4 +34,4 @@
 	"<br/>"
 	"<a href='?src=\ref[src];change_zone_del=exec'>Delete it.</a>'"}
 
-	usr << browse(jointext(dat, ""), "window=mass_del_in_zone;size=490x310")
\ No newline at end of file
+	usr << browse(HTML_SKELETON(jointext(dat, "")), "window=mass_del_in_zone;size=490x310")
\ No newline at end of file
diff --git a/code/modules/admin/artifacts_panel.dm b/code/modules/admin/artifacts_panel.dm
index cb0bb147a38..b2e0ad62a9f 100644
--- a/code/modules/admin/artifacts_panel.dm
+++ b/code/modules/admin/artifacts_panel.dm
@@ -182,4 +182,4 @@
 		</html>
 		"}
 
-	usr << browse(dat, "window=artifactspanel;size=840x450")
+	usr << browse(HTML_SKELETON(dat), "window=artifactspanel;size=840x450")
diff --git a/code/modules/admin/body_archive_panel.dm b/code/modules/admin/body_archive_panel.dm
index 4a3500d270c..48cdec57f8b 100644
--- a/code/modules/admin/body_archive_panel.dm
+++ b/code/modules/admin/body_archive_panel.dm
@@ -53,4 +53,4 @@
 		</html>
 		"}
 
-	usr << browse(dat, "window=bodyarchivepanel;size=860x640")
+	usr << browse(HTML_SKELETON(dat), "window=bodyarchivepanel;size=860x640")
diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm
index 4db39f810b8..522949eb009 100644
--- a/code/modules/admin/check_antagonists.dm
+++ b/code/modules/admin/check_antagonists.dm
@@ -44,4 +44,4 @@
 			dat += "<br/>"
 
 	dat += "</body></html>"
-	usr << browse(dat, "window=roundstatus;size=750x500")
+	usr << browse(HTML_SKELETON(dat), "window=roundstatus;size=750x500")
diff --git a/code/modules/admin/climate_panel.dm b/code/modules/admin/climate_panel.dm
index e7ac6dc2ce9..21b5aacd88c 100644
--- a/code/modules/admin/climate_panel.dm
+++ b/code/modules/admin/climate_panel.dm
@@ -33,4 +33,4 @@
 		</html>
 		"}
 
-	usr << browse(dat, "window=climatepanel;size=360x175")
+	usr << browse(HTML_SKELETON(dat), "window=climatepanel;size=360x175")
diff --git a/code/modules/admin/diseases_panel.dm b/code/modules/admin/diseases_panel.dm
index bf50dfc8160..2cd56eabeb0 100644
--- a/code/modules/admin/diseases_panel.dm
+++ b/code/modules/admin/diseases_panel.dm
@@ -65,5 +65,5 @@
 		</html>
 		"}
 
-	usr << browse(dat, "window=diseasespanel;size=705x450")
+	usr << browse(HTML_SKELETON(dat), "window=diseasespanel;size=705x450")
 
diff --git a/code/modules/admin/emergency_shuttle_panel.dm b/code/modules/admin/emergency_shuttle_panel.dm
index a77a145a426..5ff1284572b 100644
--- a/code/modules/admin/emergency_shuttle_panel.dm
+++ b/code/modules/admin/emergency_shuttle_panel.dm
@@ -66,4 +66,4 @@
 		dat += "Move All Pods : <a href='?src=\ref[src];move_escape_pod=all;move_destination=station'>station</a> - <a href='?src=\ref[src];move_escape_pod=all;move_destination=transit'>transit</a> - <a href='?src=\ref[src];move_escape_pod=all;move_destination=centcom'>centcom</a> - <a href='?src=\ref[src];move_escape_pod=all;move_destination=shuttle'>crash into shuttle</a><br>"
 
 	dat += "</body></html>"
-	usr << browse(dat, "window=emergencyshuttle;size=440x500")
+	usr << browse(HTML_SKELETON(dat), "window=emergencyshuttle;size=440x500")
diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm
index 799d5eb65cb..151e4c39a15 100644
--- a/code/modules/admin/newbanjob.dm
+++ b/code/modules/admin/newbanjob.dm
@@ -225,7 +225,7 @@ var/savefile/Banlistjob
 
 	dat += {"</table>
 		<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , </FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]"}
-	usr << browse(dat, "window=unbanp;size=875x400")
+	usr << browse(HTML_SKELETON(dat), "window=unbanp;size=875x400")
 
 /*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
 	if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job))
diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm
index f045d3fde27..a5152c80b7b 100644
--- a/code/modules/admin/permissionverbs/permissionedit.dm
+++ b/code/modules/admin/permissionverbs/permissionedit.dm
@@ -52,7 +52,7 @@
 </body>
 </html>"}
 
-	usr << browse(output,"window=editrights;size=600x500")
+	usr << browse(HTML_SKELETON(output),"window=editrights;size=600x500")
 
 /datum/admins/proc/log_admin_rank_modification(var/adm_ckey, var/new_rank)
 	if(config.admin_legacy_system)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index c608010fca3..41496e201a1 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -340,7 +340,7 @@
 	</body></html>
 	"}
 
-	usr << browse(dat, "window=players;size=600x480")
+	usr << browse(HTML_SKELETON(dat), "window=players;size=600x480")
 
 //The old one
 /datum/admins/proc/player_panel_old()
@@ -402,4 +402,4 @@
 
 	dat += "</table></body></html>"
 
-	usr << browse(dat, "window=players;size=640x480")
+	usr << browse(HTML_SKELETON(dat), "window=players;size=640x480")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 1de877d78dc..a8e035c909a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1402,7 +1402,7 @@
 
 		body = "<body>[jobs]</body>"
 		dat = "<tt>[header][body]</tt>"
-		usr << browse(dat, "window=jobban2;size=800x490")
+		usr << browse(HTML_SKELETON(dat), "window=jobban2;size=800x490")
 		return
 
 	//JOBBAN'S INNARDS
@@ -1710,7 +1710,7 @@
 		dat += {"<A href='?src=\ref[src];c_mode2=secret'>Secret</A><br>"}
 		dat += {"<A href='?src=\ref[src];c_mode2=random'>Random</A><br>"}
 		dat += {"Now: [master_mode]"}
-		usr << browse(dat, "window=c_mode")
+		usr << browse(HTML_SKELETON(dat), "window=c_mode")
 
 	else if(href_list["f_secret"])
 		if(!check_rights(R_ADMIN))
@@ -1725,7 +1725,7 @@
 			dat += {"<A href='?src=\ref[src];f_secret2=[mode]'>[config.mode_names[mode]]</A><br>"}
 		dat += {"<A href='?src=\ref[src];f_secret2=secret'>Random (default)</A><br>"}
 		dat += {"Now: [secret_force_mode]"}
-		usr << browse(dat, "window=f_secret")
+		usr << browse(HTML_SKELETON(dat), "window=f_secret")
 
 	else if(href_list["f_dynamic_roundstart"])
 		if(!check_rights(R_ADMIN))
@@ -2637,7 +2637,7 @@
 				foo += text("<A HREF='?src=\ref[];forcespeech=\ref[]'>Say</A> \]", src, M)
 			dat += text("N: [] R: [] (K: []) (IP: []) []<BR>", M.name, M.real_name, (M.client ? M.client : "No client"), M.lastKnownIP, foo)
 
-		usr << browse(dat, "window=players;size=900x480")
+		usr << browse(HTML_SKELETON(dat), "window=players;size=900x480")
 
 *****************AFTER******************/
 
@@ -3081,7 +3081,14 @@
 		if(P.img)
 			usr << browse_rsc(P.img.img, "tmp_photo.png")
 			info_2 = "<img src='tmp_photo.png' width='192' style='-ms-interpolation-mode:nearest-neighbor' /><br>"
-		usr << browse("<HTML><HEAD><TITLE>Centcomm Fax Message</TITLE></HEAD><BODY>[info_2][P.info][P.stamps]</BODY></HTML>", "window=Centcomm Fax Message")
+		var/text = {"<!DOCTYPE html><HEAD>
+		<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+		<meta http-equiv='X-UA-Compatible' content='IE=edge'>
+		<TITLE>Centcomm Fax Message</TITLE></HEAD>
+		<BODY>[info_2][P.info][P.stamps]</BODY>
+		</HTML>
+		"}
+		usr << browse(text, "window=Centcomm Fax Message") // No need to HTML_SKELETON() this
 
 	else if(href_list["CentcommFaxReply"])
 		var/mob/living/carbon/human/H = locate(href_list["CentcommFaxReply"])
@@ -4424,12 +4431,12 @@ access_sec_doors,access_salvage_captain,access_cent_ert,access_syndicate,access_
 				var/dat = "<B>Bombing List<HR>"
 				for(var/l in bombers)
 					dat += text("[l]<BR>")
-				usr << browse(dat, "window=bombers")
+				usr << browse(HTML_SKELETON(dat), "window=bombers")
 			if("list_lawchanges")
 				var/dat = "<B>Showing last [length(lawchanges)] law changes.</B><HR>"
 				for(var/sig in lawchanges)
 					dat += "[sig]<BR>"
-				usr << browse(dat, "window=lawchanges;size=800x500")
+				usr << browse(HTML_SKELETON(dat), "window=lawchanges;size=800x500")
 			if("list_job_debug")
 				var/dat = "<B>Job Debug info.</B><HR>"
 				if(job_master)
@@ -4440,7 +4447,7 @@ access_sec_doors,access_salvage_captain,access_cent_ert,access_syndicate,access_
 						if(!job)
 							continue
 						dat += "job: [job.title], current_positions: [job.current_positions], total_positions: [job.get_total_positions()] <BR>"
-					usr << browse(dat, "window=jobdebug;size=600x500")
+					usr << browse(HTML_SKELETON(dat), "window=jobdebug;size=600x500")
 			if("showailaws")
 				output_ai_laws()
 			if("showgm")
@@ -4457,7 +4464,7 @@ access_sec_doors,access_salvage_captain,access_cent_ert,access_syndicate,access_
 					if(H.ckey)
 						dat += text("<tr><td>[]</td><td>[]</td></tr>", H.name, H.get_assignment())
 				dat += "</table>"
-				usr << browse(dat, "window=manifest;size=440x410")
+				usr << browse(HTML_SKELETON(dat), "window=manifest;size=440x410")
 			// if("check_antagonist")
 			// 	check_antagonists()
 			if("emergency_shuttle_panel")
@@ -4469,7 +4476,7 @@ access_sec_doors,access_salvage_captain,access_cent_ert,access_syndicate,access_
 					if(H.dna && H.ckey)
 						dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.dna.b_type]</td></tr>"
 				dat += "</table>"
-				usr << browse(dat, "window=DNA;size=440x410")
+				usr << browse(HTML_SKELETON(dat), "window=DNA;size=440x410")
 			if("fingerprints")
 				var/dat = "<B>Showing Fingerprints.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>Fingerprints</th></tr>"
@@ -4482,14 +4489,14 @@ access_sec_doors,access_salvage_captain,access_cent_ert,access_syndicate,access_
 						else if(!H.dna)
 							dat += "<tr><td>[H]</td><td>H.dna = null</td></tr>"
 				dat += "</table>"
-				usr << browse(dat, "window=fingerprints;size=440x410")
+				usr << browse(HTML_SKELETON(dat), "window=fingerprints;size=440x410")
 			if("show_admin_log")
 				var/dat = "<B>Admin Log<HR></B>"
 				for(var/l in admin_log)
 					dat += "<li>[l]</li>"
 				if(!admin_log.len)
 					dat += "No-one has done anything this round!"
-				usr << browse(dat, "window=admin_log")
+				usr << browse(HTML_SKELETON(dat), "window=admin_log")
 
 		if (usr)
 			log_admin("[key_name(usr)] used secret [href_list["secretsadmin"]]")
@@ -5937,4 +5944,4 @@ access_sec_doors,access_salvage_captain,access_cent_ert,access_syndicate,access_
 			text +="</ul>"
 			text += "<A HREF='?src=\ref[src];religions=global_subtle_pm&rel=\ref[R]'>Subtle PM all believers</a> <br/>"
 	text += "<A HREF='?src=\ref[src];religions=new'>Bus in a new religion</a> <br/>"
-	usr << browse(jointext(text, ""), "window=admin2;size=300x370")
+	usr << browse(HTML_SKELETON(jointext(text, "")), "window=admin2;size=300x370")
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index 6c85bdb78c0..e4cf08787f0 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -35,7 +35,7 @@
 		output += "<li>Unconnected [plumbing.name] located at [formatJumpTo(plumbing.loc)]</li>"
 
 	output += "</ul>"
-	usr << browse(output,"window=pipereport;size=1000x500")
+	usr << browse(HTML_SKELETON(output),"window=pipereport;size=1000x500")
 /client/proc/powerdebug()
 	set category = "Mapping"
 	set name = "Check Power"
@@ -63,4 +63,4 @@
 				low_nets++
 
 	output += "</ul><br>[empty_nets] powernets without nodes detected, [low_nets] with less than 10 cables."
-	usr << browse(output,"window=pipereport;size=1000x500")
+	usr << browse(HTML_SKELETON(output),"window=pipereport;size=1000x500")
diff --git a/code/modules/admin/verbs/check_customitem_activity.dm b/code/modules/admin/verbs/check_customitem_activity.dm
index 447e7fbcf50..15709fdc6f0 100644
--- a/code/modules/admin/verbs/check_customitem_activity.dm
+++ b/code/modules/admin/verbs/check_customitem_activity.dm
@@ -24,7 +24,7 @@ var/inactive_keys = "None<br>"
 	else
 		dat += "<a href='?src=\ref[src];_src_=holder;populate_inactive_customitems=1'>Populate list (requires an active database connection)</a><br>"
 
-	usr << browse(dat, "window=inactive_customitems;size=600x480")
+	usr << browse(HTML_SKELETON(dat), "window=inactive_customitems;size=600x480")
 
 /proc/populate_inactive_customitems_list(var/client/C)
 	//set background = 1
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 6d39d8ca62c..bac115d36cf 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -66,7 +66,7 @@
 				else
 					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"
 
-	usr << browse(output,"window=radioreport")
+	usr << browse(HTML_SKELETON(output),"window=radioreport")
 	feedback_add_details("admin_verb","RR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/reload_admins()
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 4d56a6348ec..96d362002cf 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -82,7 +82,7 @@
 					output += "<li><font color='red'>Camera not connected to wall at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Network: [C1.network]</color></li>"
 
 	output += "</ul>"
-	usr << browse(output,"window=airreport;size=1000x500")
+	usr << browse(HTML_SKELETON(output),"window=airreport;size=1000x500")
 	feedback_add_details("admin_verb","mCRP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/intercom_view()
@@ -496,4 +496,4 @@ var/global/movement_disabled_exception //This is the client that calls the proc,
 							continue
 
 	output += "</ul><br>[bad_pipes] bad pipes detected."
-	usr << browse(output,"window=distrowastemixreport;size=1000x500")
+	usr << browse(HTML_SKELETON(output),"window=distrowastemixreport;size=1000x500")
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 4be10f3afda..b19e8cb3eed 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -21,7 +21,7 @@
 		<a href='?src=\ref[src];makeAntag=8'>Make Aliens (Requires Ghosts)</a><br>
 		"}
 
-	usr << browse(dat, "window=oneclickantag;size=400x400")
+	usr << browse(HTML_SKELETON(dat), "window=oneclickantag;size=400x400")
 	return
 
 
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index f44dd95094b..851bcc9f934 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -168,7 +168,7 @@
 	dat += {"<BR><A href='?src=\ref[src];scanning=1'>[scanning?"Armed":"Unarmed"]</A> (Movement sensor active when armed!)
 		<BR><BR><A href='?src=\ref[src];set_default_time=1'>After countdown, reset time to [(default_time - default_time%60)/60]:[(default_time % 60)]</A>
 		<BR><BR><A href='?src=\ref[src];toggle_mode=1'>Mode: [constant_pulse ? PROXMODE_CONSTANT : PROXMODE_ENTER]</A>"}
-	user << browse(dat, "window=prox")
+	user << browse(HTML_SKELETON(dat), "window=prox")
 	onclose(user, "prox")
 	return
 
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 33ee87c9533..3ef49515a15 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -109,7 +109,7 @@
 		<A href='byond://?src=\ref[src];code=5'>+</A><BR>
 		[t1]
 		</TT>"}
-	user << browse(dat, "window=radio")
+	user << browse(HTML_SKELETON(dat), "window=radio")
 	onclose(user, "radio")
 	return
 
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 1fed916459c..3ff5984a245 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -93,7 +93,7 @@
 	var/dat = text("<TT><B>Timing Unit</B>\n[] []:[]\n<A href='?src=\ref[];tp=-30'>-</A> <A href='?src=\ref[];tp=-1'>-</A> <A href='?src=\ref[];tp=1'>+</A> <A href='?src=\ref[];tp=30'>+</A>\n</TT>", (timing ? text("<A href='?src=\ref[];time=1'>Timing</A>", src) : text("<A href='?src=\ref[];time=1'>Not Timing</A>", src)), minute, second, src, src, src, src)
 	dat += "<BR><BR><A href='?src=\ref[src];set_default_time=1'>After countdown, reset time to [(default_time - default_time%60)/60]:[(default_time % 60)]</A>"
 	dat += "<BR><BR><A href='?src=\ref[src];toggle_mode=1'>Mode: [repeat ? TIMEMODE_REPEAT : TIMEMODE_ONCE]</A>"
-	user << browse(dat, "window=timer")
+	user << browse(HTML_SKELETON(dat), "window=timer")
 	onclose(user, "timer")
 	return
 
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index 2b75b399e45..a341b507b72 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -28,7 +28,7 @@
 		<B>Charge progress: [reload]/180:</B><BR>
 		<A href='byond://?src=\ref[src];fire=1'>Open Fire</A><BR>
 		Deployment of weapon authorized by <br>Nanotrasen Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"}
-	user << browse(dat, "window=scroll")
+	user << browse(HTML_SKELETON(dat), "window=scroll")
 	onclose(user, "scroll")
 	return
 
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ca47d383f72..aee682234f7 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -662,7 +662,7 @@ var/const/MAX_SAVE_SLOTS = 16
 	dat += {"<a href='?_src_=prefs;preference=reset_all'>Reset Setup</a>
 		</center></div></body></html>"}
 
-	//user << browse(dat, "window=preferences;size=560x580")
+	//user << browse(HTML_SKELETON(dat), "window=preferences;size=560x580")
 	var/datum/browser/popup = new(user, "preferences", "<div align='center'>Character Setup</div>", 680, 640)
 	popup.set_content(dat)
 	popup.open(0)
@@ -698,7 +698,7 @@ var/const/MAX_SAVE_SLOTS = 16
 		<a href=\"?_src_=prefs;task=reset;preference=disabilities\">\[Reset\]</a>
 		</center></tt>"}
 	user << browse(null, "window=preferences")
-	user << browse(HTML, "window=disabil;size=350x300")
+	user << browse(HTML_SKELETON(HTML), "window=disabil;size=350x300")
 	return
 
 /datum/preferences/proc/SetRecords(mob/user)
@@ -731,7 +731,7 @@ var/const/MAX_SAVE_SLOTS = 16
 		<a href=\"byond://?src=\ref[user];preference=records;records=-1\">\[Done\]</a>
 		</center></tt>"}
 	user << browse(null, "window=preferences")
-	user << browse(HTML, "window=records;size=350x300")
+	user << browse(HTML_SKELETON(HTML), "window=records;size=350x300")
 	return
 
 
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6b16653a41e..d379d52db11 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -90,7 +90,7 @@ var/list/tag_suits_list = list()
 		<br/>
 		<b><a href='?src=\ref[src]&edition_done=\ref[my_laser_tag_game]'>Done</a></b>
 	""}
-	user << browse(dat,"window=laser_tag_window2;size=250x250")
+	user << browse(HTML_SKELETON(dat),"window=laser_tag_window2;size=250x250")
 
 /obj/item/clothing/suit/tag/Topic(href, href_list)
 	if(..())
@@ -100,7 +100,7 @@ var/list/tag_suits_list = list()
 		var/datum/laser_tag_game/game = locate(href_list["join_game"])
 		game.handle_new_player(player, usr)
 		my_laser_tag_game = game
-		usr << browse(get_window_text(usr),"window=laser_tag_window;size=500x250")
+		usr << browse(HTML_SKELETON(get_window_text(usr)),"window=laser_tag_window;size=500x250")
 		return
 
 	if (href_list["create_game"])
@@ -110,7 +110,7 @@ var/list/tag_suits_list = list()
 		game.name = "[get_first_word(usr.name)]'s game"
 		game.handle_new_player(player, usr)
 		refresh_edit_window(usr, game)
-		usr << browse(get_window_text(usr),"window=laser_tag_window;size=500x250")
+		usr << browse(HTML_SKELETON(get_window_text(usr)),"window=laser_tag_window;size=500x250")
 		return
 
 	// Game parametrisation
@@ -188,7 +188,7 @@ var/list/tag_suits_list = list()
 	if (href_list["leave_game"])
 		var/datum/laser_tag_game/game = locate(href_list["leave_game"])
 		game.kick_player(usr)
-		usr << browse(get_window_text(usr),"window=laser_tag_window;size=500x250")
+		usr << browse(HTML_SKELETON(get_window_text(usr)),"window=laser_tag_window;size=500x250")
 		return
 
 	if (href_list["clear_gamertag"])
diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm
index c178ad73f9e..39460871971 100644
--- a/code/modules/detectivework/detective_work.dm
+++ b/code/modules/detectivework/detective_work.dm
@@ -132,7 +132,7 @@ var/const/FINGERPRINT_COMPLETE = 6	//This is the output of the stringpercent(pri
 				<tt>[scan_data]</tt>"}
 			if(scan_data && !scan_process)
 				dat += "<br><a href='?src=\ref[src];operation=erase'>{Erase Data}</a>"
-	user << browse(dat,"window=scanner")
+	user << browse(HTML_SKELETON(dat),"window=scanner")
 	onclose(user,"scanner")
 
 
diff --git a/code/modules/hydroponics/hydro_tools.dm b/code/modules/hydroponics/hydro_tools.dm
index 47717dbd8a6..da2ee248ce9 100644
--- a/code/modules/hydroponics/hydro_tools.dm
+++ b/code/modules/hydroponics/hydro_tools.dm
@@ -213,7 +213,7 @@
 		dat = jointext(dat,"")
 		last_data = dat
 		dat += "<br>\[<a href='?src=\ref[src];print=1'>print report</a>\] \[<a href='?src=\ref[src];clear=1'>clear</a>\]"
-		user << browse(dat,"window=plant_analyzer_\ref[src];size=500x600")
+		user << browse(HTML_SKELETON(dat),"window=plant_analyzer_\ref[src];size=500x600")
 	return
 
 /obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob)
diff --git a/code/modules/library/computers/checkout.dm b/code/modules/library/computers/checkout.dm
index 79d9d96dba2..87ce663362e 100644
--- a/code/modules/library/computers/checkout.dm
+++ b/code/modules/library/computers/checkout.dm
@@ -533,7 +533,8 @@
 		var/http = file2text(_http["CONTENT"])
 		if(!http)
 			return*/
-		usr << browse("<TT><I>[PVB.title] by [PVB.author].</I></TT> <BR>" + "[PVB.content]", "window=[PVB.title];size=600x800")
+		var/book_text = "<TT><I>[PVB.title] by [PVB.author].</I></TT> <BR>[PVB.content]"
+		usr << browse(HTML_SKELETON(book_text), "window=[PVB.title];size=600x800")
 
 	if(href_list["delqueue"])
 		var/slot = text2num(href_list["delqueue"])
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 59f382d9855..812c57eade1 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -169,7 +169,7 @@ var/global/datum/library_catalog/library_catalog = new()
 	else
 		dat += "<BR>"
 	dat+= "<BR><A href='?src=\ref[src];eject=1'>\[Remove Book\]</A>"
-	user << browse(dat, "window=scanner")
+	user << browse(HTML_SKELETON(dat), "window=scanner")
 	onclose(user, "scanner")
 
 /obj/machinery/libraryscanner/Topic(href, href_list)
diff --git a/code/modules/media/broadcast/receivers/radio.dm b/code/modules/media/broadcast/receivers/radio.dm
index 3333808754d..6b10a02cb8d 100644
--- a/code/modules/media/broadcast/receivers/radio.dm
+++ b/code/modules/media/broadcast/receivers/radio.dm
@@ -27,7 +27,7 @@
 				Volume: <A href='byond://?src=\ref[src];set_volume=-1'>[volume*100]%</a><BR>
 				"}
 	dat+={"</TT></body></html>"}
-	user << browse(dat, "window=radio-recv")
+	user << browse(HTML_SKELETON(dat), "window=radio-recv")
 	onclose(user, "radio-recv")
 	return
 
diff --git a/code/modules/medical/computer/cloning.dm b/code/modules/medical/computer/cloning.dm
index 420267645e8..b79dbf6f37b 100644
--- a/code/modules/medical/computer/cloning.dm
+++ b/code/modules/medical/computer/cloning.dm
@@ -227,7 +227,7 @@
                         <h4>Record Deletion</h4>
                         <b><a href='byond://?src=\ref[src];del_rec=1'>Scan card to confirm.</a></b><br>
                         <b><a href='byond://?src=\ref[src];menu=3'>Return</a></b>"}
-	user << browse(dat, "window=cloning")
+	user << browse(HTML_SKELETON(dat), "window=cloning")
 	onclose(user, "cloning")
 	return
 
diff --git a/code/modules/mob/dead/observer/verbs.dm b/code/modules/mob/dead/observer/verbs.dm
index b441e2d815a..b1848d2edc8 100644
--- a/code/modules/mob/dead/observer/verbs.dm
+++ b/code/modules/mob/dead/observer/verbs.dm
@@ -303,7 +303,7 @@
 	dat += "<h4>Crew Manifest</h4>"
 	dat += data_core.get_manifest(OOC = 1)
 
-	src << browse(dat, "window=manifest;size=370x420;can_close=1")
+	src << browse(HTML_SKELETON(dat), "window=manifest;size=370x420;can_close=1")
 
 //Used for drawing on walls with blood puddles as a spooky ghost.
 /mob/dead/verb/bloody_doodle()
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 8eaff428850..f4724ee151e 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -378,7 +378,7 @@
 	for(var/datum/language/L in languages)
 		dat += "<b>[L.name] (:[L.key])</b><br/>[L.desc]<br/><br/>"
 
-	src << browse(dat, "window=checklanguage")
+	src << browse(HTML_SKELETON(dat), "window=checklanguage")
 	return
 
 /mob/living/check_languages()
@@ -393,7 +393,7 @@
 		else
 			dat += "<b>[L.name] (:[L.key])</b> - <a href='byond://?src=\ref[src];default_lang=[L]'>set default</a><br/>[L.desc]<br/><br/>"
 
-	src << browse(dat, "window=checklanguage")
+	src << browse(HTML_SKELETON(dat), "window=checklanguage")
 
 /mob/living/Topic(href, href_list)
 	if(href_list["default_lang"])
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index b8d41c7b552..fd07a6193ac 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -359,7 +359,7 @@ var/static/list/ai_icon_states = list(
 		dat += "<BR>\n"
 
 	viewalerts = TRUE
-	src << browse(dat, "window=aialerts&can_close=0")
+	src << browse(HTML_SKELETON(dat), "window=aialerts&can_close=0")
 
 // this verb lets the ai see the stations manifest
 /mob/living/silicon/ai/proc/ai_roster()
diff --git a/code/modules/mob/living/silicon/mommi/mommi.dm b/code/modules/mob/living/silicon/mommi/mommi.dm
index 2a14dfd24fd..c35d91290d0 100644
--- a/code/modules/mob/living/silicon/mommi/mommi.dm
+++ b/code/modules/mob/living/silicon/mommi/mommi.dm
@@ -274,7 +274,7 @@ They can only use one tool at a time, they can't choose modules, and they have 1
 			dat += text("[module.emag]: <B>Activated</B><BR>")
 		else
 			dat += text("[module.emag]: <A HREF=?src=\ref[src];act=\ref[module.emag]>Activate</A><BR>")
-	src << browse(dat, "window=robotmod&can_close=1")
+	src << browse(HTML_SKELETON(dat), "window=robotmod&can_close=1")
 	onclose(src,"robotmod") // Register on-close shit, which unsets machinery.
 
 
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index b94111f528f..9fece48ff45 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -147,7 +147,7 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		<h3><a href='byond://?src=\ref[src];option=submit;new=1;candidate=\ref[candidate]'>Submit Personality</a></h3><br>
 		<a href='byond://?src=\ref[src];option=save;new=1;candidate=\ref[candidate]'>Save Personality</a><br>
 		<a href='byond://?src=\ref[src];option=load;new=1;candidate=\ref[candidate]'>Load Personality</a><br>"}
-	M << browse(dat, "window=paiRecruit")
+	M << browse(HTML_SKELETON(dat), "window=paiRecruit")
 
 /datum/paiController/proc/findPAI(var/obj/item/device/paicard/p, var/mob/user)
 	requestRecruits(p)
@@ -191,7 +191,7 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 
 	dat += "</table>"
 
-	user << browse(dat, "window=findPai")
+	user << browse(HTML_SKELETON(dat), "window=findPai")
 
 /datum/paiController/proc/requestRecruits(var/obj/item/device/paicard/p)
 	for(var/mob/dead/observer/O in player_list) // We handle polling ourselves.
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 7b635a58542..80374e10ea1 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -110,7 +110,7 @@
 				</div>
 			</body>
 			</html>"}
-	src << browse(dat, "window=pai;size=640x480;border=0;can_close=1;can_resize=1;can_minimize=1;titlebar=1")
+	src << browse(HTML_SKELETON(dat), "window=pai;size=640x480;border=0;can_close=1;can_resize=1;can_minimize=1;titlebar=1")
 	onclose(usr, "pai")
 	temp = null
 	return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 1decca9f264..b28cc23bc2e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -338,7 +338,7 @@
 		dat += "<BR>\n"
 
 	viewalerts = TRUE
-	src << browse(dat, "window=robotalerts&can_close=0")
+	src << browse(HTML_SKELETON(dat), "window=robotalerts&can_close=0")
 
 /mob/living/silicon/robot/can_diagnose()
 	return is_component_functioning("diagnosis unit")
@@ -1089,7 +1089,7 @@
 		else
 			dat += text("[obj]: <A HREF=?src=\ref[src];act=\ref[obj]>Activate</A><BR>")
 
-	src << browse(dat, "window=robotmod&can_close=1")
+	src << browse(HTML_SKELETON(dat), "window=robotmod&can_close=1")
 	onclose(src,"robotmod") // Register on-close shit, which unsets machinery.
 
 
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index d64634cb3a2..6a4e8020be3 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -235,7 +235,7 @@
 	if(data_core)
 		dat += data_core.get_manifest(1) // make it monochrome
 	dat += "<br>"
-	src << browse(dat, "window=airoster")
+	src << browse(HTML_SKELETON(dat), "window=airoster")
 	onclose(src, "airoster")
 
 /mob/living/silicon/electrocute_act(const/shock_damage, const/obj/source, const/siemens_coeff = 1.0)
@@ -311,7 +311,7 @@
 		var/synth = (L in speech_synthesizer_langs)
 		dat += "<b>[L.name] (:[L.key])</b>[synth ? default_str : null]<br/>Speech Synthesizer: <i>[synth ? "YES" : "NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
 
-	src << browse(dat, "window=checklanguage")
+	src << browse(HTML_SKELETON(dat), "window=checklanguage")
 	return
 
 /mob/living/silicon/dexterity_check()
diff --git a/code/modules/mob/living/simple_animal/borer/verbs_attached_chest.dm b/code/modules/mob/living/simple_animal/borer/verbs_attached_chest.dm
index 83a6e5f1484..fc0ae790240 100644
--- a/code/modules/mob/living/simple_animal/borer/verbs_attached_chest.dm
+++ b/code/modules/mob/living/simple_animal/borer/verbs_attached_chest.dm
@@ -50,7 +50,7 @@
 	spawn(5 SECONDS)
 		var/dat
 		dat = format_host_data(get_host_data())
-		src << browse(dat, "window=borerscan;size=430x600")
+		src << browse(HTML_SKELETON(dat), "window=borerscan;size=430x600")
 		return
 
 /mob/living/simple_animal/borer/proc/get_host_data()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index a3f8a9807e4..816612298b2 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -214,7 +214,7 @@
 	else
 		dat +=	"<br><b>Headset:</b> <a href='?src=\ref[src];add_inv=ears'>Nothing</a>"
 
-	user << browse(dat, "window=mob[real_name];size=325x500")
+	user << browse(HTML_SKELETON(dat), "window=mob[real_name];size=325x500")
 	onclose(user, "mob[real_name]")
 
 
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 1f0a1b202ca..4dabd76884b 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1240,7 +1240,7 @@ Use this proc preferably at the end of an equipment loadout
 	var/dat = {"	<title>/vg/station Github Ingame Reporting</title>
 					Version: [byond_version].[byond_build] Revision: [return_revision()]
 					<iframe src='http://ss13.moe/issues/?ckey=[ckey(key)]&address=[world.internet_address]:[world.port]&byondver=[byond_version].[byond_build]&revision=[return_revision()]' style='border:none' width='480' height='480' scroll=no></iframe>"}
-	src << browse(dat, "window=github;size=480x480")
+	src << browse(HTML_SKELETON(dat), "window=github;size=480x480")
 
 /client/verb/changes()
 	set name = "Changelog"
@@ -1277,7 +1277,7 @@ Use this proc preferably at the end of an equipment loadout
 	set category = "OOC"
 	var/output = {"Your BYOND version is: <b>[byond_version].[byond_build]</b><br>
 		You can view all of the latest server-compatible BYOND builds here: https://www.byond.com/download/build/[world.byond_version]/"}
-	usr << browse(output, "window=byond-version-data");
+	usr << browse(HTML_SKELETON(output), "window=byond-version-data");
 
 /mob/verb/observe()
 	set name = "Observe"
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index b4c218c848a..cafd4b8a590 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -662,7 +662,7 @@
 
 	dat += "</table>"
 	dat += "</center>"
-	src << browse(dat, "window=latechoices;size=360x640;can_close=1")
+	src << browse(HTML_SKELETON(dat), "window=latechoices;size=360x640;can_close=1")
 
 
 /mob/new_player/proc/create_human(var/datum/preferences/prefs)
@@ -829,14 +829,14 @@
 	<h4>High Job Preferences</h4>"}
 	dat += job_master.display_prediction()
 
-	src << browse(dat, "window=manifest;size=370x420;can_close=1")
+	src << browse(HTML_SKELETON(dat), "window=manifest;size=370x420;can_close=1")
 
 /mob/new_player/proc/ViewManifest()
 	var/dat = {"<html><body>
 <h4>Crew Manifest</h4>"}
 	dat += data_core.get_manifest(OOC = 1)
 
-	src << browse(dat, "window=manifest;size=370x420;can_close=1")
+	src << browse(HTML_SKELETON(dat), "window=manifest;size=370x420;can_close=1")
 
 /mob/new_player/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0)
 	return 0
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 619d4a72805..61ad71a3a64 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -34,7 +34,7 @@
 
 		output += "</table>"
 		qdel(select_query)
-		src << browse(output,"window=playerpolllist;size=500x300")
+		src << browse(HTML_SKELETON(output),"window=playerpolllist;size=500x300")
 
 
 
@@ -134,7 +134,7 @@
 
 				output += "</div>"
 
-				src << browse(output,"window=playerpoll;size=500x250")
+				src << browse(HTML_SKELETON(output),"window=playerpoll;size=500x250")
 
 			//Polls with a text input
 			if("TEXT")
@@ -180,7 +180,7 @@
 				else
 					output += "[vote_text]"
 
-				src << browse(output,"window=playerpoll;size=500x500")
+				src << browse(HTML_SKELETON(output),"window=playerpoll;size=500x500")
 
 			//Polls with a text input
 			if("NUMVAL")
@@ -264,7 +264,7 @@
 						<p><input type='submit' value='Submit'>
 						</form>"}
 					qdel(option_query)
-				src << browse(output,"window=playerpoll;size=500x500")
+				src << browse(HTML_SKELETON(output),"window=playerpoll;size=500x500")
 			if("SELECT_ALL_THAT_APPLY")
 				var/datum/DBQuery/voted_query = SSdbcore.NewQuery("SELECT optionid FROM erro_poll_vote WHERE pollid = :id AND ckey = :ckey", list("id" = pollid, "ckey" = "[usr.ckey]"))
 				if(!voted_query.Execute())
@@ -334,7 +334,7 @@
 
 				output += "</div>"
 
-				src << browse(output,"window=playerpoll;size=500x250")
+				src << browse(HTML_SKELETON(output),"window=playerpoll;size=500x250")
 		return
 
 /mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/select_all_that_apply = 0)
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index 8c8ad87c18b..d81da9a49f1 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -119,7 +119,7 @@ var/list/alldepartments = list("Central Command", "Nanotrasen HR")
 		if(tofax)
 			dat += "<a href ='byond://?src=\ref[src];remove=1'>Remove Paper</a><br>"
 
-	user << browse(dat, "window=copier")
+	user << browse(HTML_SKELETON(dat), "window=copier")
 	onclose(user, "copier")
 	return
 
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index dee87b25b82..1c424efa6b0 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -92,7 +92,7 @@
 		dat += "<A href='?src=\ref[src];remove=\ref[P]'>Remove</A> - <A href='?src=\ref[src];read=\ref[P]'>[P.name]</A><BR>"
 	for(var/obj/item/weapon/photo/Ph in src)
 		dat += "<A href='?src=\ref[src];remove=\ref[Ph]'>Remove</A> - <A href='?src=\ref[src];look=\ref[Ph]'>[Ph.name]</A><BR>"
-	user << browse(dat, "window=folder")
+	user << browse(HTML_SKELETON(dat), "window=folder")
 	onclose(user, "folder")
 	add_fingerprint(usr)
 	return
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 532cf186f4c..70345cfc959 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -196,7 +196,7 @@
 	dat += "Current toner level: [toner]"
 	if(!toner)
 		dat +="<BR>Please insert a new toner cartridge!"
-	user << browse(dat, "window=copier")
+	user << browse(HTML_SKELETON(dat), "window=copier")
 	onclose(user, "copier")
 
 /obj/machinery/photocopier/Topic(href, href_list)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 70498744915..1444e2170c1 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -106,7 +106,7 @@
 	else
 		dat += "No local gravity generator detected!"
 
-	user << browse(dat, "window=gravgen")
+	user << browse(HTML_SKELETON(dat), "window=gravgen")
 	onclose(user, "gravgen")
 
 
diff --git a/code/modules/power/rust/fuel_control.dm b/code/modules/power/rust/fuel_control.dm
index 434a66fd6bd..609b291dfa9 100644
--- a/code/modules/power/rust/fuel_control.dm
+++ b/code/modules/power/rust/fuel_control.dm
@@ -113,7 +113,7 @@
 		<hr>
 		<A href='?src=\ref[src];refresh=1'>Refresh</A>
 		<A href='?src=\ref[src];close=1'>Close</A><BR>"}
-	user << browse(dat, "window=fuel_control;size=800x400")
+	user << browse(HTML_SKELETON(dat), "window=fuel_control;size=800x400")
 	user.set_machine(src)
 
 /obj/machinery/computer/rust_fuel_control/Topic(href, href_list)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index dffeb84c2db..42ee30b25d8 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -280,7 +280,7 @@
 		dat += "Particle Strength: [src.strength] "
 		dat += "<A href='?src=\ref[src];strengthdown=1'>--</A>|<A href='?src=\ref[src];strengthup=1'>++</A><BR><BR>"
 
-	//user << browse(dat, "window=pacontrol;size=420x500")
+	//user << browse(HTML_SKELETON(dat), "window=pacontrol;size=420x500")
 	//onclose(user, "pacontrol")
 	var/datum/browser/popup = new(user, "pacontrol", name, 420, 500)
 	popup.set_content(dat)
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 17dd4ab8928..da21cb72865 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -273,7 +273,7 @@
 	else
 		dat += "<span class='warning'><B>No compatible attached compressor found.</span>"
 
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 	onclose(user, "computer")
 	return
 
diff --git a/code/modules/projectiles/guns/projectile/constructable/flamethrower.dm b/code/modules/projectiles/guns/projectile/constructable/flamethrower.dm
index c7cf95e6e95..a6c6b0bee25 100644
--- a/code/modules/projectiles/guns/projectile/constructable/flamethrower.dm
+++ b/code/modules/projectiles/guns/projectile/constructable/flamethrower.dm
@@ -198,7 +198,7 @@
 	if(window_open)
 		user.set_machine(src)
 		var/dat = text("<TT><B>Flamethrower (<A HREF='?src=\ref[src];light=1'>[lit ? "<font color='red'>Lit</font>" : "Unlit"]</a>)</B><BR>\n Tank Pressure: [ptank ? "[ptank.air_contents.return_pressure()]" : "No tank loaded."]<BR>\nPercentage to throw: <A HREF='?src=\ref[src];amount=-100'>-</A> <A HREF='?src=\ref[src];amount=-10'>-</A> <A HREF='?src=\ref[src];amount=-1'>-</A> [throw_percent] <A HREF='?src=\ref[src];amount=1'>+</A> <A HREF='?src=\ref[src];amount=10'>+</A> <A HREF='?src=\ref[src];amount=100'>+</A><BR>\n<A HREF='?src=\ref[src];remove=1'>Remove plasmatank</A> - <A HREF='?src=\ref[src];close=1'>Close</A></TT>")
-		user << browse(dat, "window=flamethrower;size=600x300")
+		user << browse(HTML_SKELETON(dat), "window=flamethrower;size=600x300")
 		onclose(user, "flamethrower", src)
 
 /obj/item/weapon/gun/projectile/flamethrower/Topic(href,href_list[])
diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm
index 9238fa3d018..e1e80d0f196 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/reagents/dartgun.dm
@@ -198,7 +198,7 @@
 			dat += "<font color='red'>The dart cartridge is empty!</font>"
 		dat += " \[<A href='?src=\ref[src];eject_cart=1'>Eject</A>\]"
 
-	user << browse(dat, "window=dartgun")
+	user << browse(HTML_SKELETON(dat), "window=dartgun")
 	onclose(user, "dartgun", src)
 
 /obj/item/weapon/gun/dartgun/proc/check_beaker_mixing(var/obj/item/B)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
index 3bf6e56dc05..55bc7d9c760 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
@@ -176,7 +176,7 @@
 	for(var/index=1, index<=construction.len, index++)
 		dat += "<A href='?src=\ref[src];activate=[index]'>\[[construction[index]]\]</a><br>"
 
-	user << browse(dat, "window=alien_replicator")
+	user << browse(HTML_SKELETON(dat), "window=alien_replicator")
 
 /obj/machinery/replicator/Topic(href, href_list)
 	if(spawning_types.len > 0)
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
index a280bb5c22f..4b785a9d9db 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
@@ -136,7 +136,7 @@
 	//
 	dat += "<HR>"
 	dat += "<A href='?src=\ref[src];refresh=1'>Refresh</A> <A href='?src=\ref[src];close=1'>Close<BR>"
-	user << browse(dat, "window=artharvester;size=450x500")
+	user << browse(HTML_SKELETON(dat), "window=artharvester;size=450x500")
 	onclose(user, "artharvester")
 
 /obj/machinery/artifact_harvester/process()
diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
index ec8be241451..fb23a06a518 100644
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -112,7 +112,7 @@ var/list/anomaly_power_utilizers = list()
 	dat += "<hr>"
 	dat += "<a href='?src=\ref[src]'>Refresh</a> <a href='?src=\ref[src];close=1'>Close</a>"
 
-	user << browse(dat, "window=anodevice;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=anodevice;size=400x500")
 	onclose(user, "anodevice")
 
 /obj/item/weapon/anodevice/process()
diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
index 8cf48af3ce9..d792a06e37e 100644
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -134,7 +134,7 @@
 		dat += "<br>"
 	dat += "<A href='?src=\ref[src];refresh=1'>Refresh console</A><br>"
 	dat += "<A href='?src=\ref[src];close=1'>Close console</A>"
-	user << browse(dat, "window=suspension;size=500x400")
+	user << browse(HTML_SKELETON(dat), "window=suspension;size=500x400")
 	onclose(user, "suspension")
 
 /obj/machinery/suspension_gen/Topic(href, href_list)
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 19ba072dff4..83520fdb1ef 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -117,7 +117,7 @@
 	dat += "<hr>"
 	dat += "<A href='?src=\ref[src];refresh=1'>Refresh</a><br>"
 	dat += "<A href='?src=\ref[src];close=1'>Close</a><br>"
-	user << browse(dat,"window=depth_scanner;size=300x500")
+	user << browse(HTML_SKELETON(dat),"window=depth_scanner;size=300x500")
 	onclose(user, "depth_scanner")
 
 /obj/item/device/depth_scanner/Topic(href, href_list)
diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
index c56def7dcd5..ebe847cf868 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
@@ -74,7 +74,7 @@
 				"}
 
 	dat += "<A href='?src=\ref[src];close=1'>Close</a><br>"
-	user << browse(dat,"window=locater;size=300x150")
+	user << browse(HTML_SKELETON(dat),"window=locater;size=300x150")
 	onclose(user, "locater")
 
 /obj/item/device/beacon_locator/Topic(href, href_list)
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 0ef22a4c653..1d4c762d3a8 100644
--- a/code/modules/security levels/keycard authentication.dm	
+++ b/code/modules/security levels/keycard authentication.dm	
@@ -104,7 +104,7 @@ var/global/list/obj/machinery/keycard_auth/authenticators = list()
 		dat += {"<li><A href='?src=\ref[src];triggerevent=Grant Emergency Maintenance Access'>Grant Emergency Maintenance Access</A></li>
 			<li><A href='?src=\ref[src];triggerevent=Revoke Emergency Maintenance Access'>Revoke Emergency Maintenance Access</A></li>
 			</ul>"}
-		user << browse(dat, "window=keycard_auth;size=500x300")
+		user << browse(HTML_SKELETON(dat), "window=keycard_auth;size=500x300")
 	if(screen == 2)
 
 		dat += "Please swipe your card to authorize the following event: <b>[event]</b>"
@@ -112,7 +112,7 @@ var/global/list/obj/machinery/keycard_auth/authenticators = list()
 			dat += "<p>Given reason for ERT request: '[ert_reason]'"
 
 		dat += "<p><A href='?src=\ref[src];reset=1'>Back</A>"
-		user << browse(dat, "window=keycard_auth;size=500x300")
+		user << browse(HTML_SKELETON(dat), "window=keycard_auth;size=500x300")
 	return
 
 
diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm
index 6cb7e6b6447..5b859cee02c 100644
--- a/code/modules/virus2/curer.dm
+++ b/code/modules/virus2/curer.dm
@@ -63,7 +63,7 @@
 	else
 		dat = "Please insert a container."
 
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 	onclose(user, "computer")
 	return
 
diff --git a/maps/randomvaults/objects.dm b/maps/randomvaults/objects.dm
index 2df1a29aec4..c741bc44bc7 100644
--- a/maps/randomvaults/objects.dm
+++ b/maps/randomvaults/objects.dm
@@ -653,7 +653,7 @@
 		return
 
 	var/dat = text("<B>Engine Ejection Module</B><HR>\nStatus: Ejected<BR>\n<BR>\nCountdown: N/60 \[Reset\]<BR>\n<BR>\nEngine Ejected!<BR>\n<BR>\n<A href='?src=\ref[];mach_close=computer'>Close</A>", user)
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 
 /obj/machinery/computer/ejectedengine/shield
 	name = "Shield Control Console"
@@ -666,7 +666,7 @@
 		return
 
 	var/dat = text("<B>Shield Generator Control</B><HR>\n<font color=red>Error:</font> Cannot locate projector array<BR>\n<font color=red>Error:</font> Cannot locate shield capacitors<BR>\n<font color=red>Error:</font> Cannot locate command signal<BR>\n<BR>\n<A href='?src=\ref[];mach_close=computer'>Close</A>", user)
-	user << browse(dat, "window=computer;size=400x500")
+	user << browse(HTML_SKELETON(dat), "window=computer;size=400x500")
 
 /obj/machinery/door/firedoor/red
 	name = "\improper Firelock"
diff --git a/vgstation13.dme b/vgstation13.dme
index 0222da36023..3b45573e49d 100644
--- a/vgstation13.dme
+++ b/vgstation13.dme
@@ -39,6 +39,7 @@
 #include "__DEFINES\game.dm"
 #include "__DEFINES\gases.dm"
 #include "__DEFINES\global.dm"
+#include "__DEFINES\html_wrappers.dm"
 #include "__DEFINES\human.dm"
 #include "__DEFINES\hydroponics.dm"
 #include "__DEFINES\implants.dm"