diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index fdf6ba121c..68b4e03d8a 100644
--- a/code/game/machinery/telecomms/computers/logbrowser.dm
+++ b/code/game/machinery/telecomms/computers/logbrowser.dm
@@ -21,7 +21,7 @@
 														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "tcommsserver", "Telecomms Server Monitor", 575, 400, master_ui, state)
+		ui = new(user, src, ui_key, "TeleLogBrowser", "Telecomms Server Monitor", 575, 400, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/telecomms/server/ui_data(mob/user)
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index 4a884af16c..78d0cba6e7 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -41,7 +41,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
 	if(!ui)
-		ui = new(user, src, ui_key, "telepdalog", name, 727, 510, master_ui, state)
+		ui = new(user, src, ui_key, "TelePDALog", name, 727, 510, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/message_monitor/ui_static_data(mob/user)
diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm
index bca16a0de4..36a12bb37a 100644
--- a/code/game/machinery/telecomms/computers/telemonitor.dm
+++ b/code/game/machinery/telecomms/computers/telemonitor.dm
@@ -22,7 +22,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
 	if(!ui)
-		ui = new(user, src, ui_key, "telemonitor", name, 575, 400, master_ui, state)
+		ui = new(user, src, ui_key, "Telemonitor", name, 575, 400, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/telecomms/monitor/ui_data(mob/user)
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 6d299f4413..0b1e5058cf 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -36,7 +36,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
 	if(!ui)
-		ui = new(user, src, ui_key, "teleinteract", "[name] Access", 520, 500, master_ui, state)
+		ui = new(user, src, ui_key, "TeleInteract", "[name] Access", 520, 500, master_ui, state)
 		ui.open()
 
 /obj/machinery/telecomms/ui_data(mob/user)
diff --git a/tgstation.dme b/tgstation.dme
index 114090dccc..0b9da34aff 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -527,7 +527,6 @@
 #include "code\datums\elements\art.dm"
 #include "code\datums\elements\beauty.dm"
 #include "code\datums\elements\cleaning.dm"
-#include "code\datums\elements\decal.dm"
 #include "code\datums\elements\dusts_on_catatonia.dm"
 #include "code\datums\elements\dusts_on_leaving_area.dm"
 #include "code\datums\elements\dwarfism.dm"
@@ -538,7 +537,6 @@
 #include "code\datums\elements\forced_gravity.dm"
 #include "code\datums\elements\ghost_role_eligibility.dm"
 #include "code\datums\elements\mob_holder.dm"
-#include "code\datums\elements\photosynthesis.dm"
 #include "code\datums\elements\polychromic.dm"
 #include "code\datums\elements\scavenging.dm"
 #include "code\datums\elements\snail_crawl.dm"
@@ -1795,6 +1793,7 @@
 #include "code\modules\clothing\gloves\tacklers.dm"
 #include "code\modules\clothing\head\_head.dm"
 #include "code\modules\clothing\head\beanie.dm"
+#include "code\modules\clothing\head\cit_hats.dm"
 #include "code\modules\clothing\head\collectable.dm"
 #include "code\modules\clothing\head\hardhat.dm"
 #include "code\modules\clothing\head\helmet.dm"
@@ -3142,7 +3141,6 @@
 #include "code\modules\shuttle\ripple.dm"
 #include "code\modules\shuttle\shuttle.dm"
 #include "code\modules\shuttle\shuttle_rotate.dm"
-#include "code\modules\shuttle\snaxi.dm"
 #include "code\modules\shuttle\special.dm"
 #include "code\modules\shuttle\supply.dm"
 #include "code\modules\shuttle\syndicate.dm"
@@ -3412,6 +3410,7 @@
 #include "modular_citadel\code\modules\mob\living\carbon\reindex_screams.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
+#include "modular_citadel\code\modules\projectiles\gun.dm"
 #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm"
 #include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg\smg.dm"
 #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm"
diff --git a/tgui-next/packages/tgui/interfaces/TelecommsInteraction.js b/tgui/packages/tgui/interfaces/TelecommsInteraction.js
similarity index 98%
rename from tgui-next/packages/tgui/interfaces/TelecommsInteraction.js
rename to tgui/packages/tgui/interfaces/TelecommsInteraction.js
index a67bfdf987..259e6f9a23 100644
--- a/tgui-next/packages/tgui/interfaces/TelecommsInteraction.js
+++ b/tgui/packages/tgui/interfaces/TelecommsInteraction.js
@@ -4,8 +4,8 @@ import { toFixed } from 'common/math';
 import { RADIO_CHANNELS } from '../constants';
 import { Button, LabeledList, NumberInput, NoticeBox, Section, Input } from '../components';
 
-export const TeleInteract = props => {
-  const { act, data } = useBackend(props);
+export const TeleInteract = (props, context) => {
+  const { act, data } = useBackend(context);
   const {
     notice = "",
     multitool = false,
diff --git a/tgui-next/packages/tgui/interfaces/TelecommsLogBrowser.js b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js
similarity index 98%
rename from tgui-next/packages/tgui/interfaces/TelecommsLogBrowser.js
rename to tgui/packages/tgui/interfaces/TelecommsLogBrowser.js
index 4b485a5880..fb67464604 100644
--- a/tgui-next/packages/tgui/interfaces/TelecommsLogBrowser.js
+++ b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js
@@ -2,8 +2,8 @@ import { Fragment } from 'inferno';
 import { useBackend } from '../backend';
 import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components';
 
-export const TeleLogBrowser = props => {
-  const { act, data } = useBackend(props);
+export const TeleLogBrowser = (props, context) => {
+  const { act, data } = useBackend(context);
   const {
     notice,
     network = "NULL",
diff --git a/tgui-next/packages/tgui/interfaces/TelecommsMonitor.js b/tgui/packages/tgui/interfaces/TelecommsMonitor.js
similarity index 98%
rename from tgui-next/packages/tgui/interfaces/TelecommsMonitor.js
rename to tgui/packages/tgui/interfaces/TelecommsMonitor.js
index 2b235d584b..30aa05f1fe 100644
--- a/tgui-next/packages/tgui/interfaces/TelecommsMonitor.js
+++ b/tgui/packages/tgui/interfaces/TelecommsMonitor.js
@@ -4,8 +4,8 @@ import { RADIO_CHANNELS } from '../constants';
 import { Box, Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components';
 
 
-export const Telemonitor = props => {
-  const { act, data } = useBackend(props);
+export const Telemonitor = (props, context) => {
+  const { act, data } = useBackend(context);
   const {
     notice,
     network = "NULL",
diff --git a/tgui-next/packages/tgui/interfaces/TelecommsPDALog.js b/tgui/packages/tgui/interfaces/TelecommsPDALog.js
similarity index 99%
rename from tgui-next/packages/tgui/interfaces/TelecommsPDALog.js
rename to tgui/packages/tgui/interfaces/TelecommsPDALog.js
index 914e751d05..d14bf38aa7 100644
--- a/tgui-next/packages/tgui/interfaces/TelecommsPDALog.js
+++ b/tgui/packages/tgui/interfaces/TelecommsPDALog.js
@@ -3,8 +3,8 @@ import { useBackend } from '../backend';
 import { act as _act } from '../byond';
 import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components';
 
-export const TelePDALog = props => {
-  const { act, data } = useBackend(props);
+export const TelePDALog = (props, context) => {
+  const { act, data } = useBackend(context);
   const {
     network,
     notice = "",