diff --git a/code/__DEFINES/modular_computer.dm b/code/__DEFINES/modular_computer.dm
new file mode 100644
index 000000000000..2bcb36f5b05b
--- /dev/null
+++ b/code/__DEFINES/modular_computer.dm
@@ -0,0 +1 @@
+#define PDA_DEFAULT_THEME "crtntos"
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index 640c1a648a02..dac199f77b5e 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -16,7 +16,7 @@
 		if(deployed_shell)
 			. += "The wireless networking light is blinking.\n"
 		else if (!shunted && !client)
-			. += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
+			. += "[src]Core.exe has stopped responding! ThinkDOS is searching for a solution to the problem...\n"
 	//. += "*---------*</span>" PARIAH EDIT REMOVAL
 
 	. += ..()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7bbb08583ee9..9dee3c382f3e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -111,7 +111,7 @@
 		modularInterface.icon_state_powered = "tablet-silicon-syndicate"
 		modularInterface.icon_state_unpowered = "tablet-silicon-syndicate"
 	else
-		modularInterface.device_theme = "ntos"
+		modularInterface.device_theme = PDA_DEFAULT_THEME
 		modularInterface.icon_state = "tablet-silicon"
 		modularInterface.icon_state_powered = "tablet-silicon"
 		modularInterface.icon_state_unpowered = "tablet-silicon"
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index a5cf3f2e60a1..b9024f41393c 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -36,7 +36,7 @@
 	/// Looks of the MOD.
 	var/skin = "standard"
 	/// Theme of the MOD TGUI
-	var/ui_theme = "ntos"
+	var/ui_theme = PDA_DEFAULT_THEME
 	/// If the suit is deployed and turned on.
 	var/active = FALSE
 	/// If the suit wire/module hatch is open.
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 2affea270fc6..8fcaaee4cd1a 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -46,7 +46,7 @@
 	/// How long this MOD takes each part to seal.
 	var/activation_step_time = MOD_ACTIVATION_STEP_TIME
 	/// Theme used by the MOD TGUI.
-	var/ui_theme = "ntos"
+	var/ui_theme = PDA_DEFAULT_THEME
 	/// List of inbuilt modules. These are different from the pre-equipped suits, you should mainly use these for unremovable modules with 0 complexity.
 	var/list/inbuilt_modules = list()
 	/// Modules blacklisted from the MOD.
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index bcd8489fc91a..e471d92b6241 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
 	var/upgradable = TRUE // whether or not the computer can be upgraded
 	var/deconstructable = TRUE // whether or not the computer can be deconstructed
 	var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
-	var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
+	var/device_theme = PDA_DEFAULT_THEME // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
 	var/datum/computer_file/program/active_program = null // A currently active program running on the computer.
 	var/hardware_flag = 0 // A flag that describes this device type
 	var/last_power_usage = 0
diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm
index c8b9b6ac0df9..bb0fbf4f59f2 100644
--- a/code/modules/modular_computers/computers/item/tablet.dm
+++ b/code/modules/modular_computers/computers/item/tablet.dm
@@ -27,7 +27,7 @@
 	var/obj/item/insert_type = /obj/item/pen
 	var/obj/item/inserted_item
 
-	var/note = "Congratulations on your station upgrading to the new NtOS and Thinktronic based collaboration effort, bringing you the best in electronics and software since 2467!"  // the note used by the notekeeping app, stored here for convenience
+	var/note = "Congratulations on your new ThinkTronic Personal Digital Assistant."  // the note used by the notekeeping app, stored here for convenience
 
 /obj/item/modular_computer/tablet/Destroy()
 	QDEL_NULL(inserted_item)
diff --git a/daedalus.dme b/daedalus.dme
index acba9598a0f6..abbbdc6f7766 100644
--- a/daedalus.dme
+++ b/daedalus.dme
@@ -151,6 +151,7 @@
 #include "code\__DEFINES\mob_spawn.dm"
 #include "code\__DEFINES\mobs.dm"
 #include "code\__DEFINES\mod.dm"
+#include "code\__DEFINES\modular_computer.dm"
 #include "code\__DEFINES\monkeys.dm"
 #include "code\__DEFINES\move_force.dm"
 #include "code\__DEFINES\movement.dm"
diff --git a/tgui/packages/tgui/components/Button.jsx b/tgui/packages/tgui/components/Button.jsx
index 99e8132e6f5d..b50304bc3f92 100644
--- a/tgui/packages/tgui/components/Button.jsx
+++ b/tgui/packages/tgui/components/Button.jsx
@@ -19,6 +19,8 @@ export const Button = (props) => {
   const {
     className,
     fluid,
+    verticalFluid,
+    buttonList,
     icon,
     iconRotation,
     iconSpin,
@@ -52,6 +54,8 @@ export const Button = (props) => {
       className={classes([
         'Button',
         fluid && 'Button--fluid',
+        verticalFluid && 'Button--verticalFluid',
+        buttonList && 'Button--buttonList',
         disabled && 'Button--disabled',
         selected && 'Button--selected',
         hasContent && 'Button--hasContent',
diff --git a/tgui/packages/tgui/components/LabeledList.tsx b/tgui/packages/tgui/components/LabeledList.tsx
index ecf4e3b4895c..7f94f8f81318 100644
--- a/tgui/packages/tgui/components/LabeledList.tsx
+++ b/tgui/packages/tgui/components/LabeledList.tsx
@@ -42,7 +42,7 @@ const LabeledListItem = (props: LabeledListItemProps) => {
     buttons,
     content,
     children,
-    verticalAlign = 'baseline',
+    verticalAlign = 'middle',
   } = props;
   return (
     <tr className={classes(['LabeledList__row', className])}>
diff --git a/tgui/packages/tgui/components/Section.tsx b/tgui/packages/tgui/components/Section.tsx
index 10cd2ba0843d..2afce60d2996 100644
--- a/tgui/packages/tgui/components/Section.tsx
+++ b/tgui/packages/tgui/components/Section.tsx
@@ -13,6 +13,8 @@ import { BoxProps, computeBoxClassName, computeBoxProps } from './Box';
 interface SectionProps extends BoxProps {
   buttons?: ReactNode;
   className?: string;
+  // Property used to cleanly hide the borders of tables using the crt theme
+  crtFitted?: boolean;
   fill?: boolean;
   fitted?: boolean;
   /** @deprecated This property no longer works, please remove it. */
@@ -52,6 +54,7 @@ export class Section extends Component<SectionProps> {
       buttons,
       fill,
       fitted,
+      crtFitted,
       scrollable,
       children,
       ...rest
@@ -63,6 +66,7 @@ export class Section extends Component<SectionProps> {
           'Section',
           fill && 'Section--fill',
           fitted && 'Section--fitted',
+          !fitted && crtFitted && 'Section--crtfitted',
           scrollable && 'Section--scrollable',
           className,
           computeBoxClassName(rest),
diff --git a/tgui/packages/tgui/components/Table.jsx b/tgui/packages/tgui/components/Table.jsx
index 31a0a82d041c..992b4103464e 100644
--- a/tgui/packages/tgui/components/Table.jsx
+++ b/tgui/packages/tgui/components/Table.jsx
@@ -41,13 +41,14 @@ export const TableRow = (props) => {
 };
 
 export const TableCell = (props) => {
-  const { className, collapsing, header, ...rest } = props;
+  const { className, collapsing, header, fluid, ...rest } = props;
   return (
     <td
       className={classes([
         'Table__cell',
         collapsing && 'Table__cell--collapsing',
         header && 'Table__cell--header',
+        fluid && 'Table__cell--fluid',
         className,
         computeBoxClassName(props),
       ])}
diff --git a/tgui/packages/tgui/index.jsx b/tgui/packages/tgui/index.jsx
index 380a85a3fec8..9f003b34b0ed 100644
--- a/tgui/packages/tgui/index.jsx
+++ b/tgui/packages/tgui/index.jsx
@@ -12,6 +12,7 @@ import './styles/themes/cardtable.scss';
 import './styles/themes/crt/crt-blue.scss';
 import './styles/themes/crt/crt-green.scss';
 import './styles/themes/crt/crt-yellow.scss';
+import './styles/themes/crt/crt-ntos.scss';
 import './styles/themes/spookyconsole.scss';
 import './styles/themes/flock.scss';
 import './styles/themes/hackerman.scss';
diff --git a/tgui/packages/tgui/interfaces/AiAirlock.jsx b/tgui/packages/tgui/interfaces/AiAirlock.jsx
index b74735d8e6a1..1df7039e55e3 100644
--- a/tgui/packages/tgui/interfaces/AiAirlock.jsx
+++ b/tgui/packages/tgui/interfaces/AiAirlock.jsx
@@ -23,15 +23,16 @@ export const AiAirlock = (props) => {
   const statusBackup = dangerMap[data.power.backup] || dangerMap[0];
   const statusElectrify = dangerMap[data.shock] || dangerMap[0];
   return (
-    <Window width={500} height={390}>
+    <Window width={500} height={505}>
       <Window.Content>
-        <Section title="Power Status">
+        <Section title="Power Status" crtFitted>
           <LabeledList>
             <LabeledList.Item
               label="Main"
               color={statusMain.color}
               buttons={
                 <Button
+                  verticalFluid
                   icon="lightbulb-o"
                   disabled={!data.power.main}
                   content="Disrupt"
@@ -50,6 +51,7 @@ export const AiAirlock = (props) => {
               color={statusBackup.color}
               buttons={
                 <Button
+                  verticalFluid
                   icon="lightbulb-o"
                   disabled={!data.power.backup}
                   content="Disrupt"
@@ -69,18 +71,21 @@ export const AiAirlock = (props) => {
               buttons={
                 <>
                   <Button
+                    fluid
                     icon="wrench"
                     disabled={!(data.wires.shock && data.shock === 0)}
                     content="Restore"
                     onClick={() => act('shock-restore')}
                   />
                   <Button
+                    fluid
                     icon="bolt"
                     disabled={!data.wires.shock}
                     content="Temporary"
                     onClick={() => act('shock-temp')}
                   />
                   <Button
+                    fluid
                     icon="bolt"
                     disabled={!data.wires.shock}
                     content="Permanent"
@@ -96,13 +101,15 @@ export const AiAirlock = (props) => {
             </LabeledList.Item>
           </LabeledList>
         </Section>
-        <Section title="Access and Door Control">
+        <Section title="Access and Door Control" crtFitted>
           <LabeledList>
             <LabeledList.Item
               label="ID Scan"
               color="bad"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.id_scanner ? 'power-off' : 'times'}
                   content={data.id_scanner ? 'Enabled' : 'Disabled'}
                   selected={data.id_scanner}
@@ -117,6 +124,8 @@ export const AiAirlock = (props) => {
               label="Emergency Access"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.emergency ? 'power-off' : 'times'}
                   content={data.emergency ? 'Enabled' : 'Disabled'}
                   selected={data.emergency}
@@ -130,6 +139,8 @@ export const AiAirlock = (props) => {
               color="bad"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.locked ? 'lock' : 'unlock'}
                   content={data.locked ? 'Lowered' : 'Raised'}
                   selected={data.locked}
@@ -145,6 +156,8 @@ export const AiAirlock = (props) => {
               color="bad"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.lights ? 'power-off' : 'times'}
                   content={data.lights ? 'Enabled' : 'Disabled'}
                   selected={data.lights}
@@ -160,6 +173,8 @@ export const AiAirlock = (props) => {
               color="bad"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.safe ? 'power-off' : 'times'}
                   content={data.safe ? 'Enabled' : 'Disabled'}
                   selected={data.safe}
@@ -175,6 +190,8 @@ export const AiAirlock = (props) => {
               color="bad"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.speed ? 'power-off' : 'times'}
                   content={data.speed ? 'Enabled' : 'Disabled'}
                   selected={data.speed}
@@ -191,6 +208,8 @@ export const AiAirlock = (props) => {
               color="bad"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={data.opened ? 'sign-out-alt' : 'sign-in-alt'}
                   content={data.opened ? 'Open' : 'Closed'}
                   selected={data.opened}
diff --git a/tgui/packages/tgui/interfaces/AirAlarm.jsx b/tgui/packages/tgui/interfaces/AirAlarm.jsx
index b9c062cb8955..53a27d149578 100644
--- a/tgui/packages/tgui/interfaces/AirAlarm.jsx
+++ b/tgui/packages/tgui/interfaces/AirAlarm.jsx
@@ -20,7 +20,7 @@ export const AirAlarm = (props) => {
   const { act, data } = useBackend();
   const locked = data.locked && !data.siliconUser;
   return (
-    <Window width={440} height={650}>
+    <Window width={440} height={670}>
       <Window.Content scrollable>
         <InterfaceLockNoticeBox />
         <ThermostatControl />
@@ -52,7 +52,7 @@ const AirAlarmStatus = (props) => {
   };
   const localStatus = dangerMap[data.danger_level] || dangerMap[0];
   return (
-    <Section title="Air Status">
+    <Section title="Air Status" crtFitted>
       <LabeledList>
         {(entries.length > 0 && (
           <>
@@ -127,7 +127,7 @@ const ThermostatControl = (props) => {
                   fluid
                   position="absolute"
                   top="16px"
-                  right="-20px"
+                  right="-28px"
                   color="transparent"
                   icon="undo"
                   onClick={() =>
diff --git a/tgui/packages/tgui/interfaces/Apc.jsx b/tgui/packages/tgui/interfaces/Apc.jsx
index ea125ec7e981..cbccb2a5c4a4 100644
--- a/tgui/packages/tgui/interfaces/Apc.jsx
+++ b/tgui/packages/tgui/interfaces/Apc.jsx
@@ -12,7 +12,7 @@ import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox';
 
 export const Apc = (props) => {
   return (
-    <Window width={450} height={432}>
+    <Window width={450} height={500}>
       <Window.Content>
         <ApcContent />
       </Window.Content>
@@ -93,11 +93,12 @@ const ApcContent = (props) => {
       <InterfaceLockNoticeBox />
       <Section
         title="Power Status"
+        crtFitted
         buttons={
           <Button
             icon={data.mainLights ? 'lightbulb' : 'lightbulb-o'}
             content="Main Lights"
-            color={data.mainLights ? 'green' : 'red'}
+            selected={!!data.mainLights}
             onClick={() => act('main_lights')}
           />
         }
@@ -108,6 +109,8 @@ const ApcContent = (props) => {
             color={externalPowerStatus.color}
             buttons={
               <Button
+                fluid
+                verticalFluid
                 icon={data.isOperating ? 'power-off' : 'times'}
                 content={data.isOperating ? 'On' : 'Off'}
                 selected={data.isOperating && !locked}
@@ -126,6 +129,7 @@ const ApcContent = (props) => {
             color={chargingStatus.color}
             buttons={
               <Button
+                verticalFluid
                 icon={data.chargeMode ? 'sync' : 'times'}
                 content={data.chargeMode ? 'Auto' : 'Off'}
                 disabled={locked}
@@ -137,7 +141,7 @@ const ApcContent = (props) => {
           </LabeledList.Item>
         </LabeledList>
       </Section>
-      <Section title="Power Channels">
+      <Section title="Power Channels" crtFitted>
         <LabeledList>
           {channelArray.map((channel) => {
             const { topicParams } = channel;
@@ -155,6 +159,8 @@ const ApcContent = (props) => {
                       {channel.status >= 2 ? 'On' : 'Off'}
                     </Box>
                     <Button
+                      verticalFluid
+                      buttonList
                       icon="sync"
                       content="Auto"
                       selected={
@@ -165,6 +171,8 @@ const ApcContent = (props) => {
                       onClick={() => act('channel', topicParams.auto)}
                     />
                     <Button
+                      verticalFluid
+                      buttonList
                       icon="power-off"
                       content="On"
                       selected={!locked && channel.status === 2}
@@ -172,6 +180,8 @@ const ApcContent = (props) => {
                       onClick={() => act('channel', topicParams.on)}
                     />
                     <Button
+                      verticalFluid
+                      buttonList
                       icon="times"
                       content="Off"
                       selected={!locked && channel.status === 0}
@@ -192,6 +202,7 @@ const ApcContent = (props) => {
       </Section>
       <Section
         title="Misc"
+        crtFitted
         buttons={
           !!data.siliconUser && (
             <>
@@ -217,8 +228,12 @@ const ApcContent = (props) => {
             label="Cover Lock"
             buttons={
               <Button
+                verticalFluid
                 icon={data.coverLocked ? 'lock' : 'unlock'}
                 content={data.coverLocked ? 'Engaged' : 'Disengaged'}
+                width={8.5}
+                textAlign="left"
+                selected={data.coverLocked}
                 disabled={locked}
                 onClick={() => act('cover')}
               />
@@ -228,9 +243,10 @@ const ApcContent = (props) => {
             label="Emergency Lighting"
             buttons={
               <Button
+                verticalFluid
                 icon={data.emergencyLights ? 'lightbulb' : 'lightbulb-o'}
                 content={data.emergencyLights ? 'Enabled' : 'Disabled'}
-                width={6.6}
+                width={8.5}
                 textAlign="left"
                 selected={data.emergencyLights}
                 disabled={locked}
@@ -242,11 +258,13 @@ const ApcContent = (props) => {
             label="Night Shift Lighting"
             buttons={
               <Button
+                verticalFluid
                 icon={data.nightshiftLights ? 'lightbulb' : 'lightbulb-o'}
                 content={data.nightshiftLights ? 'Enabled' : 'Disabled'}
-                width={6.6}
+                width={8.5}
                 textAlign="left"
                 selected={data.nightshiftLights}
+                disabled={locked}
                 onClick={() => act('toggle_nightshift')}
               />
             }
diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
index 8e1c4e68ca9c..e1f986849b5f 100644
--- a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
@@ -70,7 +70,7 @@ export const AtmosControlConsole = (props) => {
           )}
         </Section>
         {!!selectedChamber && !!data.control && (
-          <Section title="Chamber Controls">
+          <Section title="Chamber Controls" crtFitted>
             <Stack>
               <Stack.Item grow>
                 {selectedChamber.input_info ? (
diff --git a/tgui/packages/tgui/interfaces/Cargo.jsx b/tgui/packages/tgui/interfaces/Cargo.jsx
index 294897d6067a..95392109f493 100644
--- a/tgui/packages/tgui/interfaces/Cargo.jsx
+++ b/tgui/packages/tgui/interfaces/Cargo.jsx
@@ -101,6 +101,7 @@ const CargoStatus = (props) => {
   return (
     <Section
       title="Cargo"
+      crtFitted
       buttons={
         <Box inline bold>
           <AnimatedNumber
@@ -275,7 +276,7 @@ export const CargoCatalog = (props) => {
                   <Table.Cell collapsing color="label" textAlign="right">
                     {tags.join(', ')}
                   </Table.Cell>
-                  <Table.Cell collapsing textAlign="right">
+                  <Table.Cell fluid collapsing textAlign="right">
                     <Button
                       fluid
                       tooltip={pack.desc}
diff --git a/tgui/packages/tgui/interfaces/Changelog.jsx b/tgui/packages/tgui/interfaces/Changelog.jsx
index d247924c74cc..30f466a2c0c4 100644
--- a/tgui/packages/tgui/interfaces/Changelog.jsx
+++ b/tgui/packages/tgui/interfaces/Changelog.jsx
@@ -351,7 +351,7 @@ export class Changelog extends Component {
         ));
 
     return (
-      <Window title="Changelog" width={675} height={650}>
+      <Window title="Changelog" width={675} height={650} theme={'nanotrasen'}>
         <Window.Content scrollable>
           {header}
           {changes}
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.jsx b/tgui/packages/tgui/interfaces/ChemMaster.jsx
index 264df984b388..039319430dc3 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.jsx
+++ b/tgui/packages/tgui/interfaces/ChemMaster.jsx
@@ -110,7 +110,7 @@ const ChemMasterContent = (props) => {
           ))}
         </ChemicalBuffer>
       </Section>
-      <Section title="Packaging">
+      <Section title="Packaging" crtFitted>
         <PackagingControls />
       </Section>
       {!!isPillBottleLoaded && (
diff --git a/tgui/packages/tgui/interfaces/DisposalUnit.jsx b/tgui/packages/tgui/interfaces/DisposalUnit.jsx
index f163c3c1c2c2..7dd0bac2e51d 100644
--- a/tgui/packages/tgui/interfaces/DisposalUnit.jsx
+++ b/tgui/packages/tgui/interfaces/DisposalUnit.jsx
@@ -20,9 +20,9 @@ export const DisposalUnit = (props) => {
     stateText = 'Off';
   }
   return (
-    <Window width={300} height={180}>
+    <Window width={300} height={200}>
       <Window.Content>
-        <Section>
+        <Section crtFitted>
           <LabeledList>
             <LabeledList.Item label="State" color={stateColor}>
               {stateText}
diff --git a/tgui/packages/tgui/interfaces/MechBayPowerConsole.jsx b/tgui/packages/tgui/interfaces/MechBayPowerConsole.jsx
index 94b102d0fc68..35a7efa73e7a 100644
--- a/tgui/packages/tgui/interfaces/MechBayPowerConsole.jsx
+++ b/tgui/packages/tgui/interfaces/MechBayPowerConsole.jsx
@@ -20,6 +20,7 @@ export const MechBayPowerConsole = (props) => {
         <Section
           title="Mech status"
           textAlign="center"
+          crtFitted
           buttons={
             <Button
               icon="sync"
diff --git a/tgui/packages/tgui/interfaces/NtosAiRestorer.jsx b/tgui/packages/tgui/interfaces/NtosAiRestorer.jsx
index e6b10a293596..1e393c41721d 100644
--- a/tgui/packages/tgui/interfaces/NtosAiRestorer.jsx
+++ b/tgui/packages/tgui/interfaces/NtosAiRestorer.jsx
@@ -1,9 +1,12 @@
+import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
 import { AiRestorerContent } from './AiRestorer';
 
 export const NtosAiRestorer = () => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={370} height={400}>
+    <NtosWindow width={370} height={400} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <AiRestorerContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosCard.jsx b/tgui/packages/tgui/interfaces/NtosCard.jsx
index 34fbc683b543..915749f397fc 100644
--- a/tgui/packages/tgui/interfaces/NtosCard.jsx
+++ b/tgui/packages/tgui/interfaces/NtosCard.jsx
@@ -14,8 +14,10 @@ import { NtosWindow } from '../layouts';
 import { AccessList } from './common/AccessList';
 
 export const NtosCard = (props) => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={500} height={670}>
+    <NtosWindow width={500} height={670} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <NtosCardContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosCargo.jsx b/tgui/packages/tgui/interfaces/NtosCargo.jsx
index 19e36180f4bc..df60b31f122f 100644
--- a/tgui/packages/tgui/interfaces/NtosCargo.jsx
+++ b/tgui/packages/tgui/interfaces/NtosCargo.jsx
@@ -1,9 +1,12 @@
+import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
 import { CargoContent } from './Cargo';
 
 export const NtosCargo = (props) => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={800} height={500}>
+    <NtosWindow width={800} height={500} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <CargoContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx b/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
index 3a6e77254719..a569f2482f5c 100644
--- a/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
+++ b/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
@@ -13,9 +13,9 @@ import { NtosWindow } from '../layouts';
 
 export const NtosCrewManifest = (props) => {
   const { act, data } = useBackend();
-  const { have_printer, manifest = {}, manifest_key } = data;
+  const { have_printer, manifest = {}, PC_device_theme, manifest_key } = data;
   return (
-    <NtosWindow width={500} height={480}>
+    <NtosWindow width={500} height={480} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <Section
           title="Staff Manifest"
diff --git a/tgui/packages/tgui/interfaces/NtosFileManager.jsx b/tgui/packages/tgui/interfaces/NtosFileManager.jsx
index 5c618d953c3a..a49bd688706a 100644
--- a/tgui/packages/tgui/interfaces/NtosFileManager.jsx
+++ b/tgui/packages/tgui/interfaces/NtosFileManager.jsx
@@ -63,13 +63,15 @@ const FileTable = (props) => {
         <Table.Cell>File</Table.Cell>
         <Table.Cell collapsing>Type</Table.Cell>
         <Table.Cell collapsing>Size</Table.Cell>
+        <Table.Cell collapsing>Actions</Table.Cell>
       </Table.Row>
       {files.map((file) => (
         <Table.Row key={file.name} className="candystripe">
-          <Table.Cell>
+          <Table.Cell fluid>
             {!file.undeletable ? (
               <Button.Input
                 fluid
+                verticalFluid
                 content={file.name}
                 currentValue={file.name}
                 tooltip="Rename"
@@ -81,9 +83,11 @@ const FileTable = (props) => {
           </Table.Cell>
           <Table.Cell>{file.type}</Table.Cell>
           <Table.Cell>{file.size}</Table.Cell>
-          <Table.Cell collapsing>
+          <Table.Cell collapsing fluid>
             {!!file.alert_able && (
               <Button
+                verticalFluid
+                buttonList
                 icon={file.alert_silenced ? 'bell-slash' : 'bell'}
                 color={file.alert_silenced ? 'red' : 'default'}
                 tooltip={file.alert_silenced ? 'Unmute Alerts' : 'Mute Alerts'}
@@ -93,6 +97,8 @@ const FileTable = (props) => {
             {!file.undeletable && (
               <>
                 <Button.Confirm
+                  verticalFluid
+                  buttonList
                   icon="trash"
                   confirmIcon="times"
                   confirmContent=""
@@ -102,12 +108,16 @@ const FileTable = (props) => {
                 {!!usbconnected &&
                   (usbmode ? (
                     <Button
+                      verticalFluid
+                      buttonList
                       icon="download"
                       tooltip="Download"
                       onClick={() => onUpload(file.name)}
                     />
                   ) : (
                     <Button
+                      verticalFluid
+                      buttonList
                       icon="upload"
                       tooltip="Upload"
                       onClick={() => onUpload(file.name)}
diff --git a/tgui/packages/tgui/interfaces/NtosJobManager.jsx b/tgui/packages/tgui/interfaces/NtosJobManager.jsx
index 53f2ea2b220b..06279ea203a1 100644
--- a/tgui/packages/tgui/interfaces/NtosJobManager.jsx
+++ b/tgui/packages/tgui/interfaces/NtosJobManager.jsx
@@ -3,8 +3,10 @@ import { Box, Button, Dimmer, NoticeBox, Section, Table } from '../components';
 import { NtosWindow } from '../layouts';
 
 export const NtosJobManager = (props) => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={400} height={620}>
+    <NtosWindow width={400} height={620} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <NtosJobManagerContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosMain.jsx b/tgui/packages/tgui/interfaces/NtosMain.jsx
index 4b2b95aff8d3..234b86c36b1f 100644
--- a/tgui/packages/tgui/interfaces/NtosMain.jsx
+++ b/tgui/packages/tgui/interfaces/NtosMain.jsx
@@ -1,5 +1,5 @@
 import { useBackend } from '../backend';
-import { Button, ColorBox, Section, Table } from '../components';
+import { Button, ColorBox, LabeledList, Section, Table } from '../components';
 import { NtosWindow } from '../layouts';
 
 export const NtosMain = (props) => {
@@ -23,7 +23,8 @@ export const NtosMain = (props) => {
   return (
     <NtosWindow
       title={
-        (device_theme === 'syndicate' && 'Syndix Main Menu') || 'NtOS Main Menu'
+        (device_theme === 'syndicate' && 'Syndix Main Menu') ||
+        'ThinkDOS Control Panel'
       }
       theme={device_theme}
       width={400}
@@ -33,7 +34,7 @@ export const NtosMain = (props) => {
         {!!has_light && (
           <Section>
             <Button
-              width="144px"
+              width="168px"
               icon="lightbulb"
               selected={light_on}
               onClick={() => act('PC_toggle_light')}
@@ -70,14 +71,16 @@ export const NtosMain = (props) => {
               </>
             }
           >
-            <Table>
-              <Table.Row>
-                ID Name: {login.IDName} ({proposed_login.IDName})
-              </Table.Row>
-              <Table.Row>
-                Assignment: {login.IDJob} ({proposed_login.IDJob})
-              </Table.Row>
-            </Table>
+            <LabeledList>
+              <LabeledList.Item label="Identification">
+                {login.IDName}{' '}
+                {proposed_login.IDName && '(' + proposed_login.IDName + ')'}
+              </LabeledList.Item>
+              <LabeledList.Item label="Assignment">
+                {login.IDJob}{' '}
+                {proposed_login.IDJob && '(' + proposed_login.IDJob + ')'}
+              </LabeledList.Item>
+            </LabeledList>
           </Section>
         )}
         {!!removable_media.length && (
@@ -139,7 +142,7 @@ export const NtosMain = (props) => {
           <Table>
             {programs.map((program) => (
               <Table.Row key={program.name}>
-                <Table.Cell>
+                <Table.Cell fluid>
                   <Button
                     fluid
                     color={program.alert ? 'yellow' : 'transparent'}
@@ -153,27 +156,26 @@ export const NtosMain = (props) => {
                     }
                   />
                 </Table.Cell>
-                <Table.Cell collapsing width="18px">
-                  {!!program.running && (
-                    <Button
-                      color="transparent"
-                      icon="times"
-                      tooltip="Close program"
-                      tooltipPosition="left"
-                      onClick={() =>
-                        act('PC_killprogram', {
-                          name: program.name,
-                        })
-                      }
-                    />
-                  )}
+                <Table.Cell collapsing fluid width="18px">
+                  <Button
+                    color="transparent"
+                    icon="times"
+                    tooltip="Close program"
+                    tooltipPosition="left"
+                    disabled={!!program.running}
+                    onClick={() =>
+                      act('PC_killprogram', {
+                        name: program.name,
+                      })
+                    }
+                  />
                 </Table.Cell>
-                <Table.Cell collapsing width="18px">
+                <Table.Cell collapsing fluid width="16px">
                   <Button
-                    color={program.autorun ? 'yellow' : null}
                     content="A"
                     tooltip="Set Autorun"
                     tooltipPosition="left"
+                    selected={!!program.autorun}
                     onClick={() =>
                       act('PC_setautorun', {
                         name: program.name,
diff --git a/tgui/packages/tgui/interfaces/NtosMessenger.jsx b/tgui/packages/tgui/interfaces/NtosMessenger.jsx
index 1b0f12f0f0ad..0ebc6b043fe8 100644
--- a/tgui/packages/tgui/interfaces/NtosMessenger.jsx
+++ b/tgui/packages/tgui/interfaces/NtosMessenger.jsx
@@ -41,10 +41,11 @@ export const NtosMessenger = (props) => {
     isSilicon,
     virus_attach,
     sending_virus,
+    PC_device_theme,
   } = data;
   if (viewing_messages) {
     return (
-      <NtosWindow width={600} height={800}>
+      <NtosWindow width={600} height={800} theme={PC_device_theme}>
         <NtosWindow.Content>
           <Stack vertical>
             <Section fill>
@@ -95,7 +96,7 @@ export const NtosMessenger = (props) => {
     );
   }
   return (
-    <NtosWindow width={600} height={800}>
+    <NtosWindow width={600} height={800} theme={PC_device_theme}>
       <NtosWindow.Content>
         <Stack vertical>
           <Section fill textAlign="center">
diff --git a/tgui/packages/tgui/interfaces/NtosNetChat.jsx b/tgui/packages/tgui/interfaces/NtosNetChat.jsx
index 5cd37ca0ec55..e4ca386aa589 100644
--- a/tgui/packages/tgui/interfaces/NtosNetChat.jsx
+++ b/tgui/packages/tgui/interfaces/NtosNetChat.jsx
@@ -66,6 +66,7 @@ export const NtosNetChat = (props) => {
     all_channels = [],
     clients = [],
     messages = [],
+    PC_device_theme,
   } = data;
   const in_channel = active_channel !== null;
   const authorized = authed || adminmode;
@@ -96,7 +97,7 @@ export const NtosNetChat = (props) => {
   // client from this computer!
   const this_client = clients.find((client) => client.ref === selfref);
   return (
-    <NtosWindow width={1000} height={675}>
+    <NtosWindow width={1000} height={675} theme={PC_device_theme}>
       <NtosWindow.Content>
         <Stack fill>
           <Stack.Item>
diff --git a/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx b/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx
index fbfb9a2f0c22..9e7c66d7893f 100644
--- a/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx
+++ b/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx
@@ -45,7 +45,7 @@ export const NtosNetDownloader = (props) => {
       filter((program) => program.category === selectedCategory),
     // This filters the list to only contain verified programs
     !emagged &&
-      PC_device_theme === 'ntos' &&
+      PC_device_theme === 'crtntos' &&
       filter((program) => program.verifiedsource === 1),
     // This sorts all programs in the lists by name and compatibility
     sortBy(
@@ -211,9 +211,9 @@ const Program = (props) => {
       <Box mt={1} italic color="label">
         {program.fileinfo}
       </Box>
-      {!program.verifiedsource && PC_device_theme === 'ntos' && (
+      {!program.verifiedsource && PC_device_theme === 'crtntos' && (
         <NoticeBox mt={1} mb={0} danger fontSize="12px">
-          Unverified source. Please note that Nanotrasen does not recommend
+          Unverified source. Please note that ThinkTronic does not recommend
           download and usage of software from non-official servers.
         </NoticeBox>
       )}
diff --git a/tgui/packages/tgui/interfaces/NtosNotepad.jsx b/tgui/packages/tgui/interfaces/NtosNotepad.jsx
index 53c332dd2b07..4a483167aa27 100644
--- a/tgui/packages/tgui/interfaces/NtosNotepad.jsx
+++ b/tgui/packages/tgui/interfaces/NtosNotepad.jsx
@@ -4,9 +4,9 @@ import { NtosWindow } from '../layouts';
 
 export const NtosNotepad = (props) => {
   const { act, data } = useBackend();
-  const { note } = data;
+  const { note, PC_device_theme } = data;
   return (
-    <NtosWindow width={600} height={800}>
+    <NtosWindow width={600} height={800} theme={PC_device_theme}>
       <NtosWindow.Content>
         <Stack fill vertical direction="column" justify="space-between">
           <Stack.Item>
diff --git a/tgui/packages/tgui/interfaces/NtosPowerMonitor.jsx b/tgui/packages/tgui/interfaces/NtosPowerMonitor.jsx
index 475d5e0d18e2..0e8eb9642225 100644
--- a/tgui/packages/tgui/interfaces/NtosPowerMonitor.jsx
+++ b/tgui/packages/tgui/interfaces/NtosPowerMonitor.jsx
@@ -1,9 +1,12 @@
+import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
 import { PowerMonitorContent } from './PowerMonitor';
 
 export const NtosPowerMonitor = () => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={550} height={700}>
+    <NtosWindow width={550} height={700} theme={PC_device_theme}>
       <NtosWindow.Content>
         <PowerMonitorContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosShipping.jsx b/tgui/packages/tgui/interfaces/NtosShipping.jsx
index 6302c77be780..12a6c625c85d 100644
--- a/tgui/packages/tgui/interfaces/NtosShipping.jsx
+++ b/tgui/packages/tgui/interfaces/NtosShipping.jsx
@@ -4,6 +4,7 @@ import { NtosWindow } from '../layouts';
 
 export const NtosShipping = (props) => {
   const { act, data } = useBackend();
+
   return (
     <NtosWindow width={450} height={350}>
       <NtosWindow.Content scrollable>
diff --git a/tgui/packages/tgui/interfaces/NtosSignaler.jsx b/tgui/packages/tgui/interfaces/NtosSignaler.jsx
index c04ee3c7e36e..6aea4eda8f7d 100644
--- a/tgui/packages/tgui/interfaces/NtosSignaler.jsx
+++ b/tgui/packages/tgui/interfaces/NtosSignaler.jsx
@@ -1,9 +1,12 @@
+import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
 import { SignalerContent } from './Signaler';
 
 export const NtosSignaler = (props) => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={400} height={300}>
+    <NtosWindow width={400} height={300} theme={PC_device_theme}>
       <NtosWindow.Content>
         <SignalerContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosStationAlertConsole.jsx b/tgui/packages/tgui/interfaces/NtosStationAlertConsole.jsx
index a3c9ae8f00f9..38209508b12f 100644
--- a/tgui/packages/tgui/interfaces/NtosStationAlertConsole.jsx
+++ b/tgui/packages/tgui/interfaces/NtosStationAlertConsole.jsx
@@ -1,9 +1,12 @@
+import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
 import { StationAlertConsoleContent } from './StationAlertConsole';
 
 export const NtosStationAlertConsole = () => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={335} height={587}>
+    <NtosWindow width={335} height={587} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <StationAlertConsoleContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/NtosStatus.jsx b/tgui/packages/tgui/interfaces/NtosStatus.jsx
index 9b54f2b69657..a379ea9729a7 100644
--- a/tgui/packages/tgui/interfaces/NtosStatus.jsx
+++ b/tgui/packages/tgui/interfaces/NtosStatus.jsx
@@ -4,10 +4,10 @@ import { NtosWindow } from '../layouts';
 
 export const NtosStatus = (props) => {
   const { act, data } = useBackend();
-  const { upper, lower } = data;
+  const { upper, lower, PC_device_theme } = data;
 
   return (
-    <NtosWindow width={310} height={200}>
+    <NtosWindow width={310} height={200} theme={PC_device_theme}>
       <NtosWindow.Content>
         <Section>
           <Input
diff --git a/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.jsx b/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.jsx
index cf921706b96b..c79b0abde3c9 100644
--- a/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.jsx
+++ b/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.jsx
@@ -1,9 +1,12 @@
+import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
 import { SupermatterMonitorContent } from './SupermatterMonitor';
 
 export const NtosSupermatterMonitor = (props) => {
+  const { act, data } = useBackend();
+  const { PC_device_theme } = data;
   return (
-    <NtosWindow width={600} height={350}>
+    <NtosWindow width={600} height={350} theme={PC_device_theme}>
       <NtosWindow.Content scrollable>
         <SupermatterMonitorContent />
       </NtosWindow.Content>
diff --git a/tgui/packages/tgui/interfaces/Radio.jsx b/tgui/packages/tgui/interfaces/Radio.jsx
index d25409e033ad..919a738d1be7 100644
--- a/tgui/packages/tgui/interfaces/Radio.jsx
+++ b/tgui/packages/tgui/interfaces/Radio.jsx
@@ -28,7 +28,7 @@ export const Radio = (props) => {
     status: !!value,
   }))(data.channels);
   // Calculate window height
-  let height = 106;
+  let height = 116;
   if (subspace) {
     if (channels.length > 0) {
       height += channels.length * 21 + 6;
diff --git a/tgui/packages/tgui/interfaces/Smes.jsx b/tgui/packages/tgui/interfaces/Smes.jsx
index 91d252eb118a..987f72491f29 100644
--- a/tgui/packages/tgui/interfaces/Smes.jsx
+++ b/tgui/packages/tgui/interfaces/Smes.jsx
@@ -36,7 +36,7 @@ export const Smes = (props) => {
   const outputState =
     (outputting && 'good') || (charge > 0 && 'average') || 'bad';
   return (
-    <Window width={340} height={350}>
+    <Window width={340} height={390}>
       <Window.Content>
         <Section title="Stored Energy">
           <ProgressBar
@@ -57,6 +57,7 @@ export const Smes = (props) => {
                   icon={inputAttempt ? 'sync-alt' : 'times'}
                   selected={inputAttempt}
                   onClick={() => act('tryinput')}
+                  verticalFluid
                 >
                   {inputAttempt ? 'Auto' : 'Off'}
                 </Button>
@@ -139,6 +140,8 @@ export const Smes = (props) => {
               label="Output Mode"
               buttons={
                 <Button
+                  fluid
+                  verticalFluid
                   icon={outputAttempt ? 'power-off' : 'times'}
                   selected={outputAttempt}
                   onClick={() => act('tryoutput')}
diff --git a/tgui/packages/tgui/interfaces/ThermoMachine.jsx b/tgui/packages/tgui/interfaces/ThermoMachine.jsx
index 379b5a2312be..9e8b093350dd 100644
--- a/tgui/packages/tgui/interfaces/ThermoMachine.jsx
+++ b/tgui/packages/tgui/interfaces/ThermoMachine.jsx
@@ -15,7 +15,7 @@ export const ThermoMachine = (props) => {
   return (
     <Window width={300} height={350}>
       <Window.Content>
-        <Section title="Status">
+        <Section title="Status" crtFitted>
           <LabeledList>
             <LabeledList.Item label="Temperature">
               <AnimatedNumber
@@ -35,6 +35,7 @@ export const ThermoMachine = (props) => {
         </Section>
         <Section
           title="Controls"
+          crtFitted
           buttons={
             <Button
               icon={data.on ? 'power-off' : 'times'}
diff --git a/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.jsx b/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.jsx
index d7a0df8f8d2f..2e922d10fd56 100644
--- a/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.jsx
+++ b/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.jsx
@@ -33,7 +33,7 @@ export const InterfaceLockNoticeBox = (props) => {
           <Flex.Item>
             <Button
               m={0}
-              color={locked ? 'red' : 'green'}
+              selected={!!locked}
               icon={locked ? 'lock' : 'unlock'}
               content={locked ? 'Locked' : 'Unlocked'}
               onClick={() => {
diff --git a/tgui/packages/tgui/layouts/Layout.jsx b/tgui/packages/tgui/layouts/Layout.jsx
index cba10104ec3d..841fb55076af 100644
--- a/tgui/packages/tgui/layouts/Layout.jsx
+++ b/tgui/packages/tgui/layouts/Layout.jsx
@@ -9,7 +9,7 @@ import { classes } from 'common/react';
 import { computeBoxClassName, computeBoxProps } from '../components/Box';
 
 export const Layout = (props) => {
-  const { className, theme = 'nanotrasen', children, ...rest } = props;
+  const { className, theme = 'crtyellow', children, ...rest } = props;
   return (
     <div className={'theme-' + theme}>
       <div
diff --git a/tgui/packages/tgui/layouts/NtosWindow.jsx b/tgui/packages/tgui/layouts/NtosWindow.jsx
index 4e87de5d6905..9745071aa6b3 100644
--- a/tgui/packages/tgui/layouts/NtosWindow.jsx
+++ b/tgui/packages/tgui/layouts/NtosWindow.jsx
@@ -10,7 +10,13 @@ import { Box, Button } from '../components';
 import { Window } from './Window';
 
 export const NtosWindow = (props) => {
-  const { title, width = 575, height = 700, theme = 'ntos', children } = props;
+  const {
+    title,
+    width = 575,
+    height = 700,
+    theme = 'crtntos',
+    children,
+  } = props;
   const { act, data } = useBackend();
   const {
     PC_device_theme,
@@ -34,6 +40,7 @@ export const NtosWindow = (props) => {
             <Box inline italic mr={2} opacity={0.33}>
               {PC_device_theme === 'ntos' && 'NtOS'}
               {PC_device_theme === 'syndicate' && 'Syndix'}
+              {PC_device_theme === 'crtntos' && 'ThinkDOS'}
             </Box>
           </div>
           <div className="NtosHeader__right">
diff --git a/tgui/packages/tgui/styles/base.scss b/tgui/packages/tgui/styles/base.scss
index 1ce8539babc2..4027449f4297 100644
--- a/tgui/packages/tgui/styles/base.scss
+++ b/tgui/packages/tgui/styles/base.scss
@@ -19,9 +19,11 @@ $color-bg-end: color.adjust(
   $lightness: -$color-bg-grad-spread
 ) !default;
 
+$border-radius: 0em !default;
+
 $unit: 12px;
 $font-size: 1 * $unit !default;
-$border-radius: 0em !default;
+$font-family: (Verdana, Geneva, sans-serif) !default;
 
 @function em($px) {
   @return 1em * math.div($px, $unit);
diff --git a/tgui/packages/tgui/styles/components/Button.scss b/tgui/packages/tgui/styles/components/Button.scss
index bcc73924bf70..c548ba18ed3c 100644
--- a/tgui/packages/tgui/styles/components/Button.scss
+++ b/tgui/packages/tgui/styles/components/Button.scss
@@ -104,6 +104,28 @@ $bg-map: colors.$bg-map !default;
   margin-right: 0;
 }
 
+.Button--verticalFluid {
+  display: block;
+  margin-top: 0;
+  margin-bottom: 0;
+  height: 100%;
+}
+
+.Button--buttonList {
+  display: inline-block;
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: base.em(2px);
+  margin-right: base.em(2px);
+
+  &:first-child {
+    margin-left: 0;
+  }
+  &:last-child {
+    margin-right: 0;
+  }
+}
+
 .Button--circular {
   border-radius: 50%;
 }
diff --git a/tgui/packages/tgui/styles/components/Input.scss b/tgui/packages/tgui/styles/components/Input.scss
index e35102d9aa0b..09ccd4fc93ba 100644
--- a/tgui/packages/tgui/styles/components/Input.scss
+++ b/tgui/packages/tgui/styles/components/Input.scss
@@ -10,7 +10,6 @@ $text-color: base.$color-fg !default;
 $background-color: #0a0a0a !default;
 $border-color: #88bfff !default;
 $border-radius: base.$border-radius !default;
-$font-family: Verdana, sans-serif !default;
 
 .Input {
   position: relative;
@@ -52,7 +51,7 @@ $font-family: Verdana, sans-serif !default;
   height: base.em(17px);
   margin: 0;
   padding: 0 0.5em;
-  font-family: $font-family;
+  font-family: base.$font-family;
   background-color: transparent;
   color: $text-color;
   color: inherit;
diff --git a/tgui/packages/tgui/styles/components/LabeledList.scss b/tgui/packages/tgui/styles/components/LabeledList.scss
index 9a0a82d0378d..69d980990cb9 100644
--- a/tgui/packages/tgui/styles/components/LabeledList.scss
+++ b/tgui/packages/tgui/styles/components/LabeledList.scss
@@ -5,6 +5,8 @@
 
 @use '../base.scss';
 
+$height: 0px !default;
+
 .LabeledList {
   display: table;
   // IE8: Does not support calc
@@ -16,10 +18,12 @@
   margin: -0.25em -0.5em;
   margin-bottom: 0;
   padding: 0;
+  font-family: base.$font-family;
 }
 
 .LabeledList__row {
   display: table-row;
+  height: $height;
 }
 
 .LabeledList__row:last-child .LabeledList__cell {
@@ -44,6 +48,5 @@
   width: 0.1%;
   white-space: nowrap;
   text-align: right;
-  padding-top: base.em(1px);
-  padding-bottom: 0;
+  padding: 0;
 }
diff --git a/tgui/packages/tgui/styles/components/Section.scss b/tgui/packages/tgui/styles/components/Section.scss
index 662d13cfdf8b..e692d78c1c69 100644
--- a/tgui/packages/tgui/styles/components/Section.scss
+++ b/tgui/packages/tgui/styles/components/Section.scss
@@ -55,6 +55,11 @@ $separator-color: colors.$primary !default;
   padding: 0;
 }
 
+.Section--crtfitted > .Section__rest > .Section__content {
+  padding-top: 3px;
+  padding-bottom: 0;
+}
+
 .Section--fill {
   display: flex;
   flex-direction: column;
diff --git a/tgui/packages/tgui/styles/components/Table.scss b/tgui/packages/tgui/styles/components/Table.scss
index ecc47e5ba9a7..5e591d000611 100644
--- a/tgui/packages/tgui/styles/components/Table.scss
+++ b/tgui/packages/tgui/styles/components/Table.scss
@@ -42,3 +42,7 @@
   width: 1%;
   white-space: nowrap;
 }
+
+.Table__cell--fluid {
+  padding: 0;
+}
diff --git a/tgui/packages/tgui/styles/reset.scss b/tgui/packages/tgui/styles/reset.scss
index b25845915e2f..18fafe13d5bd 100644
--- a/tgui/packages/tgui/styles/reset.scss
+++ b/tgui/packages/tgui/styles/reset.scss
@@ -20,7 +20,7 @@ html {
 
 body {
   overflow: auto;
-  font-family: Verdana, Geneva, sans-serif;
+  font-family: base.$font-family;
 }
 
 *,
diff --git a/tgui/packages/tgui/styles/themes/crt.scss b/tgui/packages/tgui/styles/themes/crt.scss
index dd2cf2935494..a2db1190dde0 100644
--- a/tgui/packages/tgui/styles/themes/crt.scss
+++ b/tgui/packages/tgui/styles/themes/crt.scss
@@ -2,17 +2,34 @@
 @use 'sass:math';
 @use 'sass:meta';
 
-$font-family: monospace;
 $background-radial-opacity: 0.2 !default;
+$color-bg: #ffffff !default;
+$color-fg: #333333 !default;
 
-@use '../base.scss';
+$dark-fg: darken($color-fg, 30);
+
+@use '../base.scss' with (
+  $color-bg: $color-bg,
+  $color-fg: $color-fg,
+  $font-family: (
+    monospace,
+    Verdana,
+    sans-serif,
+  )
+);
 
 @use '../colors.scss' with (
   $primary: base.$color-fg,
-  $label: base.$color-fg
+  $label: base.$color-fg,
+  $good: base.$color-fg,
+  $bad: base.$color-fg,
+  $average: base.$color-fg
 );
 
 %theme-crt {
+  // Atomic classes
+  @include meta.load-css('../atomic/color.scss');
+
   @include meta.load-css(
     '../components/Divider.scss',
     $with: ('color': base.$color-fg)
@@ -33,8 +50,7 @@ $background-radial-opacity: 0.2 !default;
     $with: (
       'text-color': base.$color-fg,
       'background-color': base.$color-bg,
-      'border-color': base.$color-fg,
-      'font-family': $font-family
+      'border-color': base.$color-fg
     )
   );
 
@@ -59,7 +75,11 @@ $background-radial-opacity: 0.2 !default;
 
   @include meta.load-css(
     '../components/ProgressBar.scss',
-    $with: ('color-default-fill': base.$color-fg)
+    $with: (
+      'color-default-fill': base.$color-fg,
+      'background-color': $dark-fg,
+      'bg-map': colors.$bg-map
+    )
   );
 
   @include meta.load-css(
@@ -83,22 +103,25 @@ $background-radial-opacity: 0.2 !default;
   @include meta.load-css(
     '../components/Button.scss',
     $with: (
-      'color-default': base.$color-fg,
-      'color-disabled': darken(base.$color-fg, 30)
+      'color-default': $dark-fg,
+      'color-selected': base.$color-fg,
+      'color-disabled': rbga(base.$color-fg, 0),
+      'color-transparent-text': base.$color-fg
     )
   );
 
   @include meta.load-css(
     '../components/Tabs.scss',
     $with: (
-      'tab-color': base.$color-bg,
-      'tab-color-selected': base.$color-fg,
+      'tab-color': $dark-fg,
       'text-color': base.$color-fg,
       'text-color-selected': base.$color-bg,
       'tab-color-hovered': rgba(base.$color-fg, 0.3)
     )
   );
 
+  @include meta.load-css('../components/LabeledList.scss');
+
   .Layout__content {
     background-image: none;
     background: radial-gradient(
@@ -110,7 +133,7 @@ $background-radial-opacity: 0.2 !default;
   .Layout__content::after {
     content: ' ';
     display: block;
-    position: absolute;
+    position: fixed;
     top: 0;
     left: 0;
     bottom: 0;
@@ -123,7 +146,7 @@ $background-radial-opacity: 0.2 !default;
   .Layout__content::before {
     content: ' ';
     display: block;
-    position: absolute;
+    position: fixed;
     top: 0;
     left: 0;
     bottom: 0;
@@ -155,33 +178,74 @@ $background-radial-opacity: 0.2 !default;
 
   span {
     color: base.$color-fg;
-    font-family: $font-family;
+    font-family: base.$font-family;
     font-weight: bold;
   }
 
   .Button {
-    font-family: $font-family;
+    font-family: base.$font-family;
     font-weight: bold;
     border: 1px solid base.$color-fg;
+    cursor: pointer;
     &:hover,
-    &:focus,
     &:visited,
     &:target {
-      background-color: base.$color-fg;
+      background-color: rgba(base.$color-fg, 0.5);
       color: base.$color-bg;
     }
   }
 
   .Button--disabled {
     background-color: none;
-    color: base.$color-fg;
+    color: base.$color-bg;
+    cursor: auto;
+    &:hover,
+    &:focus,
+    &:visited,
+    &:target {
+      color: base.$color-bg;
+    }
+  }
+
+  .Button--color--transparent {
+    background-color: $dark-fg;
+  }
+
+  .Dropdown__control {
+    &:hover,
+    &:focus,
+    &:visited,
+    &:target {
+      .Dropdown__selected-text,
+      .Dropdown__arrow-button {
+        color: base.$color-bg;
+      }
+    }
+    .Dropdown__selected-text,
+    .Dropdown__arrow-button {
+      color: base.$color-bg;
+    }
+  }
 
+  .Dropdown__control.Button--disabled {
     &:hover,
     &:focus,
     &:visited,
     &:target {
-      color: base.$color-fg;
+      .Dropdown__selected-text,
+      .Dropdown__arrow-button {
+        color: base.$color-bg;
+      }
     }
+    .Dropdown__selected-text,
+    .Dropdown__arrow-button {
+      color: base.$color-bg;
+    }
+  }
+
+  .ProgressBar__content {
+    color: white;
+    font-weight: bold;
   }
 
   hr {
@@ -190,21 +254,42 @@ $background-radial-opacity: 0.2 !default;
   }
 
   .Tab__text {
-    font-family: $font-family;
+    font-family: base.$font-family;
   }
 
   .Tabs--horizontal {
     .Tab {
       border: 2px solid base.$color-fg;
-      border-bottom: 6px solid base.$color-fg;
+      border-bottom: 3px solid base.$color-fg;
       text-align: center;
-      background-color: rgba(0, 0, 0, 0);
+      background-color: $dark-fg;
       font-weight: bold;
     }
 
     .Tab--selected {
+      border: 2px solid $dark-fg;
+      border-bottom: 3px solid base.$color-fg;
+      background-color: base.$color-fg;
+      .Tab__left,
+      .Tab__text {
+        color: base.$color-bg;
+      }
+      &:hover {
+        outline: none;
+      }
+    }
+  }
+
+  .Tabs--vertical {
+    .Tab {
       border: 2px solid base.$color-fg;
-      border-bottom: none;
+      text-align: center;
+      background-color: $dark-fg;
+      font-weight: bold;
+    }
+
+    .Tab--selected {
+      border: 2px solid $dark-fg;
       background-color: base.$color-fg;
       .Tab__left,
       .Tab__text {
@@ -216,6 +301,20 @@ $background-radial-opacity: 0.2 !default;
     }
   }
 
+  .LabeledList {
+    border: 1px solid base.$color-fg;
+  }
+
+  .LabeledList__row {
+    height: 2.2em;
+  }
+
+  .LabeledList__cell {
+    border: 1px solid base.$color-fg;
+    margin-top: 1px;
+    margin-bottom: 1px;
+  }
+
   .Table {
     border: 1px solid base.$color-fg;
   }
@@ -229,6 +328,7 @@ $background-radial-opacity: 0.2 !default;
     margin-top: 1px;
     margin-bottom: 1px;
     justify-content: center;
+    height: 1.5em;
   }
 }
 
diff --git a/tgui/packages/tgui/styles/themes/crt/crt-blue.scss b/tgui/packages/tgui/styles/themes/crt/crt-blue.scss
index bb3a4d4adea5..ed6b57ce65c0 100644
--- a/tgui/packages/tgui/styles/themes/crt/crt-blue.scss
+++ b/tgui/packages/tgui/styles/themes/crt/crt-blue.scss
@@ -3,13 +3,11 @@
 $light: #8ac8ff;
 $dark: #000011;
 
-@use '../../base.scss' with (
+@use '../crt.scss' with (
   $color-bg: $dark,
   $color-fg: $light
 );
 
-@use '../crt.scss';
-
 .theme-crtblue {
   @extend %theme-crt;
 
diff --git a/tgui/packages/tgui/styles/themes/crt/crt-green.scss b/tgui/packages/tgui/styles/themes/crt/crt-green.scss
index cdc3f7df65ae..b77f5af723aa 100644
--- a/tgui/packages/tgui/styles/themes/crt/crt-green.scss
+++ b/tgui/packages/tgui/styles/themes/crt/crt-green.scss
@@ -3,13 +3,11 @@
 $light: #00e94e;
 $dark: #001100;
 
-@use '../../base.scss' with (
+@use '../crt.scss' with (
   $color-bg: $dark,
   $color-fg: $light
 );
 
-@use '../crt.scss';
-
 .theme-crtgreen {
   @extend %theme-crt;
 
diff --git a/tgui/packages/tgui/styles/themes/crt/crt-ntos.scss b/tgui/packages/tgui/styles/themes/crt/crt-ntos.scss
new file mode 100644
index 000000000000..83e9725a0f14
--- /dev/null
+++ b/tgui/packages/tgui/styles/themes/crt/crt-ntos.scss
@@ -0,0 +1,12 @@
+@use 'sass:meta';
+$light: #ffbf00;
+$dark: #111100;
+
+@use '../crt.scss' with (
+  $color-bg: $dark,
+  $color-fg: $light
+);
+
+.theme-crtntos {
+  @extend %theme-crt;
+}
diff --git a/tgui/packages/tgui/styles/themes/crt/crt-yellow.scss b/tgui/packages/tgui/styles/themes/crt/crt-yellow.scss
index f5369d653ada..3d5cc669e7cf 100644
--- a/tgui/packages/tgui/styles/themes/crt/crt-yellow.scss
+++ b/tgui/packages/tgui/styles/themes/crt/crt-yellow.scss
@@ -3,13 +3,11 @@
 $light: #ffbf00;
 $dark: #111100;
 
-@use '../../base.scss' with (
+@use '../crt.scss' with (
   $color-bg: $dark,
   $color-fg: $light
 );
 
-@use '../crt.scss';
-
 .theme-crtyellow {
   @extend %theme-crt;
 
diff --git a/tgui/public/tgui.html b/tgui/public/tgui.html
index 7ca3c383c780..81bde28651eb 100644
--- a/tgui/public/tgui.html
+++ b/tgui/public/tgui.html
@@ -597,24 +597,25 @@
 <!-- Fatal error container -->
 <div id="FatalError" class="FatalError">
 <div class="FatalError__logo">
-ooooo      ooo     .     .oooooo.    .oooooo..o
-`888b.     `8'   .o8    d8P'  `Y8b  d8P'    `Y8
- 8 `88b.    8  .o888oo 888      888 Y88bo.
- 8   `88b.  8    888   888      888  `"Y8888o.
- 8     `88b.8    888   888      888      `"Y88b
- 8       `888    888 . `88b    d88' oo     .d8P
-o8o        `8    "888"  `Y8bood8P'  8""88888P'
+<pre>
+    ___  _    _       _    ___  ___  ___
+  |_ _|| |_ &lt;_&gt;._ _ | |__| . \| . |/ __&gt;
+   | | | . || || &#39; || / /| | || | |\__ \
+   |_| |_|_||_||_|_||_\_\|___/`___&#39;&lt;___/
+
+</pre>
+
 </div>
 <marquee class="FatalError__header">
 A fatal exception has occurred at 002B:C562F1B7 in TGUI.
 The current application will be terminated.
 Send the copy of the following stack trace to an authorized
-Nanotrasen incident handler at https://github.com/DaedalusDock/Gameserver.
+ThinkTronic incident handler at https://github.com/DaedalusDock/Gameserver.
 Thank you for your cooperation.
 </marquee>
 <div id="FatalError__stack" class="FatalError__stack"></div>
 <div class="FatalError__footer">
-Nanotrasen (c) 2525-2562
+Copyright (c) ThinkTronic All Rights Reserved
 </div>
 </div>