From b84bbafead84ca74f83b2786a7edcd71458595c9 Mon Sep 17 00:00:00 2001
From: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Date: Fri, 10 Jan 2025 03:51:42 -0800
Subject: [PATCH] Bumps tgui core version (#88903)

---
 tgui/packages/tgui-bench/package.json         |  2 +-
 tgui/packages/tgui-panel/package.json         |  5 ++--
 tgui/packages/tgui-panel/styles/main.scss     |  2 +-
 .../tgui-panel/styles/themes/light.scss       | 18 ++++++-------
 tgui/packages/tgui-say/package.json           |  5 ++--
 tgui/packages/tgui-say/styles/main.scss       |  2 +-
 tgui/packages/tgui/package.json               |  5 ++--
 .../tgui/styles/interfaces/Fabricator.scss    |  4 +--
 tgui/packages/tgui/styles/main.scss           |  2 +-
 .../packages/tgui/styles/themes/abductor.scss | 14 +++++-----
 .../tgui/styles/themes/cardtable.scss         |  8 +++---
 .../tgui/styles/themes/hackerman.scss         | 10 +++----
 .../tgui/styles/themes/malfunction.scss       | 14 +++++-----
 tgui/packages/tgui/styles/themes/neutral.scss |  6 ++---
 tgui/packages/tgui/styles/themes/ntOS95.scss  |  8 +++---
 tgui/packages/tgui/styles/themes/ntos.scss    |  6 ++---
 .../packages/tgui/styles/themes/ntos_cat.scss |  8 +++---
 .../tgui/styles/themes/ntos_darkmode.scss     |  6 ++---
 .../tgui/styles/themes/ntos_lightmode.scss    |  8 +++---
 .../tgui/styles/themes/ntos_spooky.scss       | 20 +++++++-------
 .../tgui/styles/themes/ntos_synth.scss        |  8 +++---
 .../tgui/styles/themes/ntos_terminal.scss     | 10 +++----
 tgui/packages/tgui/styles/themes/paper.scss   |  6 ++---
 tgui/packages/tgui/styles/themes/retro.scss   |  6 ++---
 .../tgui/styles/themes/spookyconsole.scss     | 18 ++++++-------
 .../tgui/styles/themes/syndicate.scss         | 14 +++++-----
 tgui/packages/tgui/styles/themes/wizard.scss  | 14 +++++-----
 tgui/yarn.lock                                | 26 ++++++-------------
 28 files changed, 121 insertions(+), 134 deletions(-)

diff --git a/tgui/packages/tgui-bench/package.json b/tgui/packages/tgui-bench/package.json
index 51c71f76b25..6a42b87af9f 100644
--- a/tgui/packages/tgui-bench/package.json
+++ b/tgui/packages/tgui-bench/package.json
@@ -12,6 +12,6 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "tgui": "workspace:*",
-    "tgui-core": "^1.5.4"
+    "tgui-core": "^1.7.2"
   }
 }
diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json
index b78bd00da93..4b521d06185 100644
--- a/tgui/packages/tgui-panel/package.json
+++ b/tgui/packages/tgui-panel/package.json
@@ -10,9 +10,8 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "tgui": "workspace:*",
-    "tgui-core": "^1.5.4",
+    "tgui-core": "^1.7.2",
     "tgui-dev-server": "workspace:*",
-    "tgui-polyfill": "workspace:*",
-    "tgui-styles": "^0.0.10"
+    "tgui-polyfill": "workspace:*"
   }
 }
diff --git a/tgui/packages/tgui-panel/styles/main.scss b/tgui/packages/tgui-panel/styles/main.scss
index 60198a654b9..15df279db66 100644
--- a/tgui/packages/tgui-panel/styles/main.scss
+++ b/tgui/packages/tgui-panel/styles/main.scss
@@ -6,7 +6,7 @@
 @use 'sass:meta';
 @use 'sass:color';
 // Components
-@use 'pkg:tgui-styles';
+@use '~tgui-core/styles';
 
 @use '~tgui/styles/colors.scss';
 @use '~tgui/styles/base.scss' with (
diff --git a/tgui/packages/tgui-panel/styles/themes/light.scss b/tgui/packages/tgui-panel/styles/themes/light.scss
index 0d8e301001f..e79bf1480ad 100644
--- a/tgui/packages/tgui-panel/styles/themes/light.scss
+++ b/tgui/packages/tgui-panel/styles/themes/light.scss
@@ -32,7 +32,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tabs',
+    '~tgui-core/styles/components/Tabs',
     $with: (
       'text-color': rgba(0, 0, 0, 0.5),
       'color-default': rgba(0, 0, 0, 1),
@@ -41,12 +41,12 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Section',
+    '~tgui-core/styles/components/Section',
     $with: ('background-color': hsl(0, 0%, 100%))
   );
 
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(0, 0%, 73.3%),
       'color-disabled': hsl(0, 0%, 21.2%),
@@ -57,17 +57,17 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: (
       'border-color': colors.fg(colors.$label),
       'background-color': hsl(0, 0%, 90.2%)
     )
   );
-  @include meta.load-css('pkg:tgui-styles/components/NumberInput');
-  @include meta.load-css('pkg:tgui-styles/components/TextArea');
-  @include meta.load-css('pkg:tgui-styles/components/Knob');
-  @include meta.load-css('pkg:tgui-styles/components/Slider');
-  @include meta.load-css('pkg:tgui-styles/components/ProgressBar');
+  @include meta.load-css('~tgui-core/styles/components/NumberInput');
+  @include meta.load-css('~tgui-core/styles/components/TextArea');
+  @include meta.load-css('~tgui-core/styles/components/Knob');
+  @include meta.load-css('~tgui-core/styles/components/Slider');
+  @include meta.load-css('~tgui-core/styles/components/ProgressBar');
 
   // Components specific to tgui-panel
   @include meta.load-css(
diff --git a/tgui/packages/tgui-say/package.json b/tgui/packages/tgui-say/package.json
index 9c3e5efd95f..b535dbccad6 100644
--- a/tgui/packages/tgui-say/package.json
+++ b/tgui/packages/tgui-say/package.json
@@ -9,8 +9,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "tgui": "workspace:*",
-    "tgui-core": "^1.5.4",
-    "tgui-polyfill": "workspace:*",
-    "tgui-styles": "^0.0.10"
+    "tgui-core": "^1.7.2",
+    "tgui-polyfill": "workspace:*"
   }
 }
diff --git a/tgui/packages/tgui-say/styles/main.scss b/tgui/packages/tgui-say/styles/main.scss
index bafc850e242..c5ec8221220 100644
--- a/tgui/packages/tgui-say/styles/main.scss
+++ b/tgui/packages/tgui-say/styles/main.scss
@@ -7,7 +7,7 @@
 // Atomic styles
 @include meta.load-css('~tgui/styles/atomic/text.scss');
 // External styles
-@include meta.load-css('pkg:tgui-styles/components/TextArea');
+@include meta.load-css('~tgui-core/styles/components/TextArea');
 // Local styles
 @include meta.load-css('./button.scss');
 @include meta.load-css('./content.scss');
diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index 404fed14729..3e9ef3c02cf 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -18,9 +18,8 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-popper": "^2.3.0",
-    "tgui-core": "^1.5.4",
+    "tgui-core": "^1.7.2",
     "tgui-dev-server": "workspace:*",
-    "tgui-polyfill": "workspace:*",
-    "tgui-styles": "^0.0.10"
+    "tgui-polyfill": "workspace:*"
   }
 }
diff --git a/tgui/packages/tgui/styles/interfaces/Fabricator.scss b/tgui/packages/tgui/styles/interfaces/Fabricator.scss
index 5016094c646..391cdb14a26 100644
--- a/tgui/packages/tgui/styles/interfaces/Fabricator.scss
+++ b/tgui/packages/tgui/styles/interfaces/Fabricator.scss
@@ -3,8 +3,8 @@
 @use '../base.scss';
 @use '../colors.scss';
 @use '../functions.scss' as *;
-@use 'pkg:tgui-styles/components/Button' as button;
-@use 'pkg:tgui-styles/components/Tabs' as tabs;
+@use '~tgui-core/styles/components/Button' as button;
+@use '~tgui-core/styles/components/Tabs' as tabs;
 
 .Fabricator__Recipe {
   padding: 0.25em 0;
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index a00d7cd9734..3db8e518454 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -5,7 +5,7 @@
 
 @use 'sass:meta';
 @use 'base';
-@use 'pkg:tgui-styles';
+@use '~tgui-core/styles';
 
 // Core styles
 @include meta.load-css('./reset.scss');
diff --git a/tgui/packages/tgui/styles/themes/abductor.scss b/tgui/packages/tgui/styles/themes/abductor.scss
index c80bacf0fa0..69feb9f78d5 100644
--- a/tgui/packages/tgui/styles/themes/abductor.scss
+++ b/tgui/packages/tgui/styles/themes/abductor.scss
@@ -23,7 +23,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': colors.$primary,
       'color-disabled': hsl(0, 0%, 21%),
@@ -33,24 +33,24 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': hsl(227, 29%, 27%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NoticeBox',
+    '~tgui-core/styles/components/NoticeBox',
     $with: ('background-color': hsl(340, 67%, 41%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NumberInput',
+    '~tgui-core/styles/components/NumberInput',
     $with: ('border-color': hsl(227, 29%, 27%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': hsla(0, 0%, 0%, 0.5))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(340, 67%, 41%))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/cardtable.scss b/tgui/packages/tgui/styles/themes/cardtable.scss
index ba1f2bcf1a9..882078c9571 100644
--- a/tgui/packages/tgui/styles/themes/cardtable.scss
+++ b/tgui/packages/tgui/styles/themes/cardtable.scss
@@ -24,7 +24,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(145.26, 73.64%, 25.29%),
       'color-disabled': hsl(0, 0%, 21.18%),
@@ -34,14 +34,14 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NumberInput',
+    '~tgui-core/styles/components/NumberInput',
     $with: ('border-color': #fff)
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': rgba(0, 0, 0, 0.5))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/hackerman.scss b/tgui/packages/tgui/styles/themes/hackerman.scss
index 25c6956fc3d..19a107a5a62 100644
--- a/tgui/packages/tgui/styles/themes/hackerman.scss
+++ b/tgui/packages/tgui/styles/themes/hackerman.scss
@@ -22,7 +22,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': colors.$primary,
       'color-disabled': hsl(120, 17.78%, 35.29%),
@@ -30,7 +30,7 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tabs',
+    '~tgui-core/styles/components/Tabs',
     $with: (
       'color-default': colors.$primary,
       'tab-color-selected': hsla(120, 100%, 50%, 0.25),
@@ -38,11 +38,11 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': colors.$primary)
   );
-  @include meta.load-css('pkg:tgui-styles/components/Modal');
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Modal');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/malfunction.scss b/tgui/packages/tgui/styles/themes/malfunction.scss
index 9e2abe451a6..f6ee3402b69 100644
--- a/tgui/packages/tgui/styles/themes/malfunction.scss
+++ b/tgui/packages/tgui/styles/themes/malfunction.scss
@@ -22,7 +22,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': colors.$primary,
       'color-disabled': hsl(0, 0%, 21%),
@@ -32,24 +32,24 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': hsl(0, 99%, 29%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NoticeBox',
+    '~tgui-core/styles/components/NoticeBox',
     $with: ('background-color': hsl(204, 54%, 23%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NumberInput',
+    '~tgui-core/styles/components/NumberInput',
     $with: ('border-color': hsl(0, 99%, 29%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': hsla(0, 0%, 0%, 0.5))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(204, 54%, 29%))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/neutral.scss b/tgui/packages/tgui/styles/themes/neutral.scss
index 6665a6673c4..62a4b789511 100644
--- a/tgui/packages/tgui/styles/themes/neutral.scss
+++ b/tgui/packages/tgui/styles/themes/neutral.scss
@@ -21,20 +21,20 @@ $neutral: hsl(42.12, 100%, 50%);
 .theme-neutral {
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': color.scale($neutral, $lightness: -30%),
       'color-transparent-text': color.scale($neutral, $lightness: 30%)
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: (
       'color-default-fill': $neutral,
       'background-color': rgba(0, 0, 0, 0.5)
     )
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/ntOS95.scss b/tgui/packages/tgui/styles/themes/ntOS95.scss
index 90c0d3ed765..7543c0d0141 100644
--- a/tgui/packages/tgui/styles/themes/ntOS95.scss
+++ b/tgui/packages/tgui/styles/themes/ntOS95.scss
@@ -29,7 +29,7 @@ $scrollbar-color-multiplier: 1;
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(52.3, 40.3%, 84.9%),
       'color-disabled': hsl(0, 0%, 43.9%),
@@ -39,16 +39,16 @@ $scrollbar-color-multiplier: 1;
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': rgba(0, 0, 0, 0.5))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Section',
+    '~tgui-core/styles/components/Section',
     $with: ('background-color': rgba(0, 0, 0, 0.4))
   );
 
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(61.5, 70.2%, 77.6%))
   );
   // Layouts
diff --git a/tgui/packages/tgui/styles/themes/ntos.scss b/tgui/packages/tgui/styles/themes/ntos.scss
index a43210b616a..2cc685ec685 100644
--- a/tgui/packages/tgui/styles/themes/ntos.scss
+++ b/tgui/packages/tgui/styles/themes/ntos.scss
@@ -19,20 +19,20 @@ $nanotrasen: hsl(213, 30%, 32%);
 .theme-ntos {
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': $nanotrasen,
       'color-transparent-text': rgba(227, 240, 255, 0.75)
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: (
       'color-default-fill': $nanotrasen,
       'background-color': rgba(0, 0, 0, 0.5)
     )
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/ntos_cat.scss b/tgui/packages/tgui/styles/themes/ntos_cat.scss
index f09bbbf5c0d..f1db0ca3eb0 100644
--- a/tgui/packages/tgui/styles/themes/ntos_cat.scss
+++ b/tgui/packages/tgui/styles/themes/ntos_cat.scss
@@ -38,7 +38,7 @@ $scrollbar-color-multiplier: 0.5;
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(300, 91%, 52%),
       'color-transparent-text': hsla(210, 100%, 94%, 0.75),
@@ -48,15 +48,15 @@ $scrollbar-color-multiplier: 0.5;
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('color-default-fill': hsla(350, 100%, 76.5%, 0.75))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Section',
+    '~tgui-core/styles/components/Section',
     $with: ('background-color': hsla(24, 56%, 31%, 0.75))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsla(36, 100%, 50%, 0.75))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/ntos_darkmode.scss b/tgui/packages/tgui/styles/themes/ntos_darkmode.scss
index 0e3ec116f07..b7f7b255b8b 100644
--- a/tgui/packages/tgui/styles/themes/ntos_darkmode.scss
+++ b/tgui/packages/tgui/styles/themes/ntos_darkmode.scss
@@ -19,20 +19,20 @@ $nanotrasen: hsl(0, 0%, 17.25%);
 .theme-ntos_darkmode {
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': $nanotrasen,
       'color-transparent-text': rgba(227, 240, 255, 0.75)
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: (
       'color-default-fill': $nanotrasen,
       'background-color': rgba(0, 0, 0, 0.5)
     )
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/ntos_lightmode.scss b/tgui/packages/tgui/styles/themes/ntos_lightmode.scss
index 797fa101a99..1a1f17843eb 100644
--- a/tgui/packages/tgui/styles/themes/ntos_lightmode.scss
+++ b/tgui/packages/tgui/styles/themes/ntos_lightmode.scss
@@ -20,22 +20,22 @@ $nanotrasen: hsl(0, 0%, 100%);
   @include meta.load-css('../atomic/color.scss', $with: ());
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: ('color-default': $nanotrasen)
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: (
       'color-default-fill': $nanotrasen,
       'background-color': hsla(0, 0%, 0%, 0.5)
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Section',
+    '~tgui-core/styles/components/Section',
     $with: ('background-color': hsla(0, 0%, 47%, 0.4))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(0, 0%, 100%))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/ntos_spooky.scss b/tgui/packages/tgui/styles/themes/ntos_spooky.scss
index 5d1243c0b41..c874096a88b 100644
--- a/tgui/packages/tgui/styles/themes/ntos_spooky.scss
+++ b/tgui/packages/tgui/styles/themes/ntos_spooky.scss
@@ -18,7 +18,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(345, 96%, 25%),
       'color-disabled': hsl(0, 0%, 21%),
@@ -28,27 +28,27 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Dimmer',
+    '~tgui-core/styles/components/Dimmer',
     $with: ('background-dimness': 0.45)
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': hsl(15, 14%, 26%))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Modal');
+  @include meta.load-css('~tgui-core/styles/components/Modal');
   @include meta.load-css(
-    'pkg:tgui-styles/components/NoticeBox',
+    '~tgui-core/styles/components/NoticeBox',
     $with: ('background-color': hsl(0, 90%, 23%))
   );
-  @include meta.load-css('pkg:tgui-styles/components/NumberInput');
-  @include meta.load-css('pkg:tgui-styles/components/Section');
-  @include meta.load-css('pkg:tgui-styles/components/Table');
+  @include meta.load-css('~tgui-core/styles/components/NumberInput');
+  @include meta.load-css('~tgui-core/styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Table');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(0, 0%, 0%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: (
       'color-default-fill': hsla(0, 100%, 37%, 0.75),
       'background-color': hsla(0, 97%, 7%, 0.5)
diff --git a/tgui/packages/tgui/styles/themes/ntos_synth.scss b/tgui/packages/tgui/styles/themes/ntos_synth.scss
index 5cc62094895..46504a90b8d 100644
--- a/tgui/packages/tgui/styles/themes/ntos_synth.scss
+++ b/tgui/packages/tgui/styles/themes/ntos_synth.scss
@@ -32,7 +32,7 @@ $purple: hsl(248, 47%, 37%);
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': $cyan,
       'color-transparent-text': hsla(210, 100%, 94%, 0.75),
@@ -42,15 +42,15 @@ $purple: hsl(248, 47%, 37%);
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('color-default-fill': hsla(300, 91%, 52%, 0.75))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Section',
+    '~tgui-core/styles/components/Section',
     $with: ('background-color': hsla(0, 0%, 0%, 0.3))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsla(36, 100%, 50%, 0.75))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/ntos_terminal.scss b/tgui/packages/tgui/styles/themes/ntos_terminal.scss
index 3d9230c2088..da65f08bd06 100644
--- a/tgui/packages/tgui/styles/themes/ntos_terminal.scss
+++ b/tgui/packages/tgui/styles/themes/ntos_terminal.scss
@@ -24,7 +24,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': rgba(0, 0, 0, 0),
       'color-disabled': hsl(120, 18%, 35%),
@@ -32,18 +32,18 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': colors.$primary)
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: (
       'background-color': hsla(0, 0%, 0%, 0.5),
       'color-default-fill': hsla(146, 82%, 53%, 0.5)
     )
   );
-  @include meta.load-css('pkg:tgui-styles/components/Modal');
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Modal');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/paper.scss b/tgui/packages/tgui/styles/themes/paper.scss
index 65b23a93136..e34507d5b8b 100644
--- a/tgui/packages/tgui/styles/themes/paper.scss
+++ b/tgui/packages/tgui/styles/themes/paper.scss
@@ -30,13 +30,13 @@ $font-size: 24px;
   @include meta.load-css('../atomic/color.scss');
 
   // Components
-  @include meta.load-css('pkg:tgui-styles/components/Tabs');
+  @include meta.load-css('~tgui-core/styles/components/Tabs');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Section',
+    '~tgui-core/styles/components/Section',
     $with: ('background-color': hsla(0, 0%, 0%, 0.1))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(50, 50%, 90%),
       'color-disabled': hsl(0, 0%, 21%),
diff --git a/tgui/packages/tgui/styles/themes/retro.scss b/tgui/packages/tgui/styles/themes/retro.scss
index f36aaa5c8ac..86a7dd5e95c 100644
--- a/tgui/packages/tgui/styles/themes/retro.scss
+++ b/tgui/packages/tgui/styles/themes/retro.scss
@@ -25,7 +25,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(48, 38%, 84%),
       'color-disabled': hsl(60, 6%, 28%),
@@ -35,10 +35,10 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': hsla(0, 0%, 0%, 0.5))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
 
   // Layouts
   @include meta.load-css('../layouts/Layout.scss');
diff --git a/tgui/packages/tgui/styles/themes/spookyconsole.scss b/tgui/packages/tgui/styles/themes/spookyconsole.scss
index a15cf23aa11..a75d1b5ac5c 100644
--- a/tgui/packages/tgui/styles/themes/spookyconsole.scss
+++ b/tgui/packages/tgui/styles/themes/spookyconsole.scss
@@ -28,7 +28,7 @@ $updated-bg-map: map.set($updated-bg-map, 'bad', colors.$bad);
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': hsl(345, 96%, 25%),
       'color-disabled': hsl(0, 0%, 21%),
@@ -39,23 +39,23 @@ $updated-bg-map: map.set($updated-bg-map, 'bad', colors.$bad);
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Dimmer',
+    '~tgui-core/styles/components/Dimmer',
     $with: ('background-dimness': 0.45)
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': hsl(15, 14%, 26%))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Modal');
+  @include meta.load-css('~tgui-core/styles/components/Modal');
   @include meta.load-css(
-    'pkg:tgui-styles/components/NoticeBox',
+    '~tgui-core/styles/components/NoticeBox',
     $with: ('background-color': hsl(0, 90%, 23%))
   );
-  @include meta.load-css('pkg:tgui-styles/components/NumberInput');
-  @include meta.load-css('pkg:tgui-styles/components/Section');
-  @include meta.load-css('pkg:tgui-styles/components/Table');
+  @include meta.load-css('~tgui-core/styles/components/NumberInput');
+  @include meta.load-css('~tgui-core/styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Table');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(0, 0%, 0%))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/syndicate.scss b/tgui/packages/tgui/styles/themes/syndicate.scss
index f4f82a6c171..4badfdb585d 100644
--- a/tgui/packages/tgui/styles/themes/syndicate.scss
+++ b/tgui/packages/tgui/styles/themes/syndicate.scss
@@ -22,7 +22,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': colors.$primary,
       'color-disabled': hsl(0, 0%, 21%),
@@ -32,24 +32,24 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': hsl(120, 60%, 70%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NoticeBox',
+    '~tgui-core/styles/components/NoticeBox',
     $with: ('background-color': hsl(0, 98%, 28%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NumberInput',
+    '~tgui-core/styles/components/NumberInput',
     $with: ('border-color': hsl(120, 60%, 70%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': hsla(0, 0%, 0%, 0.5))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(0, 96%, 14%))
   );
 
diff --git a/tgui/packages/tgui/styles/themes/wizard.scss b/tgui/packages/tgui/styles/themes/wizard.scss
index 3de051e8e63..88b98557265 100644
--- a/tgui/packages/tgui/styles/themes/wizard.scss
+++ b/tgui/packages/tgui/styles/themes/wizard.scss
@@ -23,7 +23,7 @@
 
   // Components
   @include meta.load-css(
-    'pkg:tgui-styles/components/Button',
+    '~tgui-core/styles/components/Button',
     $with: (
       'color-default': colors.$primary,
       'color-disabled': hsl(204, 97%, 21%),
@@ -33,24 +33,24 @@
     )
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/Input',
+    '~tgui-core/styles/components/Input',
     $with: ('border-color': hsl(227, 25%, 34%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NoticeBox',
+    '~tgui-core/styles/components/NoticeBox',
     $with: ('background-color': hsl(340, 58%, 41%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/NumberInput',
+    '~tgui-core/styles/components/NumberInput',
     $with: ('border-color': hsl(227, 25%, 34%))
   );
   @include meta.load-css(
-    'pkg:tgui-styles/components/ProgressBar',
+    '~tgui-core/styles/components/ProgressBar',
     $with: ('background-color': hsla(0, 0%, 0%, 0.5))
   );
-  @include meta.load-css('pkg:tgui-styles/components/Section');
+  @include meta.load-css('~tgui-core/styles/components/Section');
   @include meta.load-css(
-    'pkg:tgui-styles/components/Tooltip',
+    '~tgui-core/styles/components/Tooltip',
     $with: ('background-color': hsl(134, 61%, 42%))
   );
 
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index fa0c9be980a..b080e0484a3 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -18723,17 +18723,17 @@ __metadata:
     react: "npm:^18.3.1"
     react-dom: "npm:^18.3.1"
     tgui: "workspace:*"
-    tgui-core: "npm:^1.5.4"
+    tgui-core: "npm:^1.7.2"
   languageName: unknown
   linkType: soft
 
-"tgui-core@npm:^1.5.4":
-  version: 1.5.4
-  resolution: "tgui-core@npm:1.5.4"
+"tgui-core@npm:^1.7.2":
+  version: 1.7.2
+  resolution: "tgui-core@npm:1.7.2"
   peerDependencies:
     react: ^18.2.0
     react-dom: ^18.2.0
-  checksum: 10c0/c9959690ff905ddf57b241918cfe889bf840efc70271a7e35832f2a5a2854506ad0e9086a02f16a1a2bd02196a311afb0516b0af3769ca1992072fe7d85c2f1b
+  checksum: 10c0/401102042d4d0ede4f8658160124cd523c4ffc44492e0f7d0500d25e0b8a085be2b6f829c89b81eb706c369af16d6d57375704337d7bcc813480caa749c258d4
   languageName: node
   linkType: hard
 
@@ -18761,10 +18761,9 @@ __metadata:
     react: "npm:^18.3.1"
     react-dom: "npm:^18.3.1"
     tgui: "workspace:*"
-    tgui-core: "npm:^1.5.4"
+    tgui-core: "npm:^1.7.2"
     tgui-dev-server: "workspace:*"
     tgui-polyfill: "workspace:*"
-    tgui-styles: "npm:^0.0.10"
   languageName: unknown
   linkType: soft
 
@@ -18789,19 +18788,11 @@ __metadata:
     react: "npm:^18.3.1"
     react-dom: "npm:^18.3.1"
     tgui: "workspace:*"
-    tgui-core: "npm:^1.5.4"
+    tgui-core: "npm:^1.7.2"
     tgui-polyfill: "workspace:*"
-    tgui-styles: "npm:^0.0.10"
   languageName: unknown
   linkType: soft
 
-"tgui-styles@npm:^0.0.10":
-  version: 0.0.10
-  resolution: "tgui-styles@npm:0.0.10"
-  checksum: 10c0/90d3c9d891680289e79fd1f44dcf15a0cc956345e0337b2f89a64ceb1c5192da217dd8ac64566731471684b6bb6d3b4fc92ff6a072f9d8138e71d423c94821a6
-  languageName: node
-  linkType: hard
-
 "tgui-workspace@workspace:.":
   version: 0.0.0-use.local
   resolution: "tgui-workspace@workspace:."
@@ -18859,10 +18850,9 @@ __metadata:
     react: "npm:^18.3.1"
     react-dom: "npm:^18.3.1"
     react-popper: "npm:^2.3.0"
-    tgui-core: "npm:^1.5.4"
+    tgui-core: "npm:^1.7.2"
     tgui-dev-server: "workspace:*"
     tgui-polyfill: "workspace:*"
-    tgui-styles: "npm:^0.0.10"
   languageName: unknown
   linkType: soft