diff --git a/bundle.js b/bundle.js
index 68c66ec1a..289a38126 100644
--- a/bundle.js
+++ b/bundle.js
@@ -78950,13 +78950,9 @@ const hasLootWithRequirements = (dungeon) => {
 hasLootWithRequirements.cache = new WeakMap();
 
 const getDungeonShadowPokemon = (dungeon) => {
-    // This will need to be updated to skip checking requirements once Orre XD is released
-    const shadows = [];
+    let shadows = [];
     dungeon.enemyList.forEach(enemy => {
         if (enemy instanceof DungeonTrainer) {
-            if (enemy.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             enemy.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -78970,9 +78966,6 @@ const getDungeonShadowPokemon = (dungeon) => {
     });
     dungeon.bossList.forEach(boss => {
         if (boss instanceof DungeonTrainer) {
-            if (boss.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             boss.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -78986,6 +78979,15 @@ const getDungeonShadowPokemon = (dungeon) => {
         }
     });
 
+    // Some dungeons have duplicate trainers with the same shadow form, filter these out
+    shadows = shadows.reduce((unique, s) => {
+        if (!unique.some(obj => obj.pokemon === s.pokemon && obj.dungeon === s.dungeon
+            && obj.trainer.name === s.trainer.name && obj.boss === s.boss)) {
+            unique.push(s);
+        }
+        return unique;
+    }, []);
+
     return shadows;
 };
 
diff --git "a/data/Shadow Pok\303\251mon/overview_description.md" "b/data/Shadow Pok\303\251mon/overview_description.md"
index 700e403c7..0826c7f5b 100644
--- "a/data/Shadow Pok\303\251mon/overview_description.md"	
+++ "b/data/Shadow Pok\303\251mon/overview_description.md"	
@@ -1,4 +1,4 @@
-Shadow Pokémon are Pokémon with a shadowy aura that can be encountered in Orre, a subregion from [[Regions/Hoenn]]. They can only be encountered as part of a trainer battle and never as a wild encounter.
+Shadow Pokémon are Pokémon with a shadowy aura that can be encountered in Orre, a subregion from [[Regions/Hoenn]]. They can only be encountered as part of a trainer battle and never as a wild encounter. There are a total of **131** Pokémon that can be obtained as shadows.
 
 These Pokémon have a **0.8x** multiplier to its attack. However, they can be purified which will change the multiplier to **1.2x** instead, making Purified Pokémon stronger than a regular one.
 
diff --git a/images/settings.svg b/images/settings.svg
new file mode 100644
index 000000000..b48030bca
--- /dev/null
+++ b/images/settings.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="800" class="icon flat-line" data-name="Flat Line" viewBox="0 0 24 24">
+  <path d="M20 10h-.59a1 1 0 0 1-.94-.67 1 1 0 0 1 .2-1.14l.41-.41a1 1 0 0 0 0-1.42l-1.42-1.43a1 1 0 0 0-1.42 0l-.41.41a1 1 0 0 1-1.14.2 1 1 0 0 1-.69-.95V4a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v.59a1 1 0 0 1-.67.94 1 1 0 0 1-1.14-.2l-.41-.41a1 1 0 0 0-1.42 0L4.93 6.34a1 1 0 0 0 0 1.42l.41.41a1 1 0 0 1 .2 1.14 1 1 0 0 1-.94.67H4a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h.59a1 1 0 0 1 .94.67 1 1 0 0 1-.2 1.14l-.41.41a1 1 0 0 0 0 1.42l1.41 1.41a1 1 0 0 0 1.42 0l.41-.41a1 1 0 0 1 1.14-.2 1 1 0 0 1 .67.94V20a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.59a1 1 0 0 1 .67-.94 1 1 0 0 1 1.14.2l.41.41a1 1 0 0 0 1.42 0l1.41-1.41a1 1 0 0 0 0-1.42l-.41-.41a1 1 0 0 1-.2-1.14 1 1 0 0 1 .94-.67H20a1 1 0 0 0 1-1V11a1 1 0 0 0-1-1Zm-8 5a3 3 0 1 1 3-3 3 3 0 0 1-3 3Z" style="fill:whitesmoke;stroke-width:2"/>
+  <path d="M15 12a3 3 0 1 1-3-3 3 3 0 0 1 3 3Zm5-2h-.59a1 1 0 0 1-.94-.67v0a1 1 0 0 1 .2-1.14l.41-.41a1 1 0 0 0 0-1.42l-1.42-1.43a1 1 0 0 0-1.42 0l-.41.41a1 1 0 0 1-1.14.2h0a1 1 0 0 1-.69-.95V4a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v.59a1 1 0 0 1-.67.94h0a1 1 0 0 1-1.14-.2l-.41-.41a1 1 0 0 0-1.42 0L4.93 6.34a1 1 0 0 0 0 1.42l.41.41a1 1 0 0 1 .2 1.14v0a1 1 0 0 1-.94.67H4a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h.59a1 1 0 0 1 .94.67v0a1 1 0 0 1-.2 1.14l-.41.41a1 1 0 0 0 0 1.42l1.41 1.41a1 1 0 0 0 1.42 0l.41-.41a1 1 0 0 1 1.14-.2h0a1 1 0 0 1 .67.94V20a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.59a1 1 0 0 1 .67-.94h0a1 1 0 0 1 1.14.2l.41.41a1 1 0 0 0 1.42 0l1.41-1.41a1 1 0 0 0 0-1.42l-.41-.41a1 1 0 0 1-.2-1.14v0a1 1 0 0 1 .94-.67H20a1 1 0 0 0 1-1V11a1 1 0 0 0-1-1Z" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:2"/>
+</svg>
\ No newline at end of file
diff --git a/images/user.svg b/images/user.svg
new file mode 100644
index 000000000..8881f85f3
--- /dev/null
+++ b/images/user.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="800" viewBox="-1 0 20 20">
+  <g transform="translate(-3 -2)">
+    <path fill="whitesmoke" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7.46 13.26A5 5 0 0 0 4 18v1s2 2 8 2 8-2 8-2v-1a5 5 0 0 0-3.51-4.75"/>
+    <circle cx="6" cy="6" r="6" fill="whitesmoke" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" data-name="primary" transform="translate(6 3)"/>
+  </g>
+</svg>
diff --git "a/pages/Pok\303\251mon/main.html" "b/pages/Pok\303\251mon/main.html"
index d7c63bf7b..1b0028125 100644
--- "a/pages/Pok\303\251mon/main.html"
+++ "b/pages/Pok\303\251mon/main.html"
@@ -101,7 +101,14 @@ <h4 class="accordion-header">
                     </h4>
                     <div id="obtain-method-dungeon" class="accordion-collapse collapse">
                         <div class="accordion-body" data-bind="foreach: Object.values($data[PokemonLocationType.Dungeon])">
-                            <a class="badge text-bg-secondary" data-bind="text: $data, attr: { href: `#!Dungeons/${$data}` }"></a>
+                            <a class="badge text-bg-secondary" data-bind="text: $data.dungeon + `${$data.requirements ? ' 🔒' : ''}`,
+                            attr: { href: `#!Dungeons/${$data.dungeon}` },
+                            tooltip: {
+                                title: $data.requirements ?? '',
+                                html: false,
+                                placement: 'bottom',
+                                trigger: 'hover'
+                            }"></a>
                         </div>
                     </div>
                 </div>
diff --git a/scripts/pages/dungeons.js b/scripts/pages/dungeons.js
index 7b4a6ec92..66d43cf4f 100644
--- a/scripts/pages/dungeons.js
+++ b/scripts/pages/dungeons.js
@@ -316,13 +316,9 @@ const hasLootWithRequirements = (dungeon) => {
 hasLootWithRequirements.cache = new WeakMap();
 
 const getDungeonShadowPokemon = (dungeon) => {
-    // This will need to be updated to skip checking requirements once Orre XD is released
-    const shadows = [];
+    let shadows = [];
     dungeon.enemyList.forEach(enemy => {
         if (enemy instanceof DungeonTrainer) {
-            if (enemy.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             enemy.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -336,9 +332,6 @@ const getDungeonShadowPokemon = (dungeon) => {
     });
     dungeon.bossList.forEach(boss => {
         if (boss instanceof DungeonTrainer) {
-            if (boss.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             boss.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -352,6 +345,15 @@ const getDungeonShadowPokemon = (dungeon) => {
         }
     });
 
+    // Some dungeons have duplicate trainers with the same shadow form, filter these out
+    shadows = shadows.reduce((unique, s) => {
+        if (!unique.some(obj => obj.pokemon === s.pokemon && obj.dungeon === s.dungeon
+            && obj.trainer.name === s.trainer.name && obj.boss === s.boss)) {
+            unique.push(s);
+        }
+        return unique;
+    }, []);
+
     return shadows;
 };