diff --git a/src/Notifications/Sovereignties/Discord/EntosisCaptureStarted.php b/src/Notifications/Sovereignties/Discord/EntosisCaptureStarted.php
index 0a26981..34e629d 100644
--- a/src/Notifications/Sovereignties/Discord/EntosisCaptureStarted.php
+++ b/src/Notifications/Sovereignties/Discord/EntosisCaptureStarted.php
@@ -24,7 +24,7 @@
 
 use Seat\Eveapi\Models\Character\CharacterNotification;
 use Seat\Eveapi\Models\Sde\InvType;
-use Seat\Eveapi\Models\Sde\SolarSystem;
+use Seat\Eveapi\Models\Sde\MapDenormalize;
 use Seat\Notifications\Notifications\AbstractDiscordNotification;
 use Seat\Notifications\Services\Discord\Messages\DiscordEmbed;
 use Seat\Notifications\Services\Discord\Messages\DiscordEmbedField;
@@ -68,7 +68,7 @@ public function populateMessage(DiscordMessage $message, $notifiable)
                 $embed->author('SeAT Sovereignty Health', asset('web/img/favico/apple-icon-180x180.png'));
 
                 $embed->field(function (DiscordEmbedField $field) {
-                    $system = SolarSystem::find($this->notification->text['solarSystemID']);
+                    $system = MapDenormalize::find($this->notification->text['solarSystemID']);
 
                     $field->name('System')
                         ->value($this->zKillBoardToDiscordLink(
diff --git a/src/Notifications/Sovereignties/Discord/SovCommandNodeEventStarted.php b/src/Notifications/Sovereignties/Discord/SovCommandNodeEventStarted.php
index ffab0d1..8d16b80 100644
--- a/src/Notifications/Sovereignties/Discord/SovCommandNodeEventStarted.php
+++ b/src/Notifications/Sovereignties/Discord/SovCommandNodeEventStarted.php
@@ -23,7 +23,7 @@
 namespace Seat\Notifications\Notifications\Sovereignties\Discord;
 
 use Seat\Eveapi\Models\Character\CharacterNotification;
-use Seat\Eveapi\Models\Sde\SolarSystem;
+use Seat\Eveapi\Models\Sde\MapDenormalize;
 use Seat\Notifications\Notifications\AbstractDiscordNotification;
 use Seat\Notifications\Services\Discord\Messages\DiscordEmbed;
 use Seat\Notifications\Services\Discord\Messages\DiscordEmbedField;
@@ -67,7 +67,7 @@ public function populateMessage(DiscordMessage $message, $notifiable)
                 $embed->author('SeAT Sovereignty Health', asset('web/img/favico/apple-icon-180x180.png'));
 
                 $embed->field(function (DiscordEmbedField $field) {
-                    $system = SolarSystem::find($this->notification->text['solarSystemID']);
+                    $system = MapDenormalize::find($this->notification->text['solarSystemID']);
 
                     $field->name('System')
                         ->value($this->zKillBoardToDiscordLink(
diff --git a/src/Notifications/Structures/Traits/MoonMiningNotificationTrait.php b/src/Notifications/Structures/Traits/MoonMiningNotificationTrait.php
index cea5a8c..aecc54d 100644
--- a/src/Notifications/Structures/Traits/MoonMiningNotificationTrait.php
+++ b/src/Notifications/Structures/Traits/MoonMiningNotificationTrait.php
@@ -38,17 +38,17 @@ trait MoonMiningNotificationTrait
 
     const R64_MARKET_GROUP_ID = 2401;
 
-    const ORE_COLOR = '#d2d6de';
+    const ORE_COLOR = 12370112;
 
-    const GAZ_COLOR = '#00a65a';
+    const GAZ_COLOR = 5763719;
 
-    const R8_COLOR = '#3c8dbc';
+    const R8_COLOR = 9936031;
 
-    const R16_COLOR = '#00c0ef';
+    const R16_COLOR = 10038562;
 
-    const R32_COLOR = '#f39c12';
+    const R32_COLOR = 11027200;
 
-    const R64_COLOR = '#dd4b39';
+    const R64_COLOR = 15844367;
 
     /**
      * @return array<string, array<int|string, mixed>>