diff --git a/apps/frontend/components/professions/recipes/AbilityRow.svelte b/apps/frontend/components/professions/recipes/AbilityRow.svelte
index 32f2acad9..25dedee1b 100644
--- a/apps/frontend/components/professions/recipes/AbilityRow.svelte
+++ b/apps/frontend/components/professions/recipes/AbilityRow.svelte
@@ -10,6 +10,7 @@
         StaticDataSubProfession,
     } from '@/shared/stores/static/types';
     import type { Character } from '@/types/character';
+    import type { Icon } from '@/types/icons';
 
     import FactionIcon from '@/shared/components/images/FactionIcon.svelte';
     import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
@@ -22,17 +23,27 @@
         ability: StaticDataProfessionAbility;
         characters: Character[];
         profession: StaticDataProfession;
+        rank: number;
         subProfession: StaticDataSubProfession;
     };
-    let { ability, characters, profession, subProfession }: Props = $props();
+    let { ability, characters, profession, rank, subProfession }: Props = $props();
 
-    let recipes = $derived(wowthingData.static.skillLineAbilityItems[ability.id] || []);
-    let recipeItem = $derived(wowthingData.items.items[recipes[0]]);
-    let isHidden = $derived(hiddenSkillLineAbilitySpellIds.has(ability.spellId));
-    let isIgnored = $derived(
-        wowthingData.manual.ignoredSkillLineAbilitySpellIds.has(ability.spellId)
+    let [abilityId, spellId] = $derived(
+        rank > 1 ? ability.extraRanks[rank - 2] : [ability.id, ability.spellId]
     );
-    let anyCharacterHas = $derived(characters.some((char) => char?.knownRecipes?.has(ability.id)));
+
+    let recipes = $derived(wowthingData.static.skillLineAbilityItems[abilityId] || []);
+    let recipeItem = $derived(wowthingData.items.items[recipes[0]]);
+    let isHidden = $derived(hiddenSkillLineAbilitySpellIds.has(spellId));
+    let isIgnored = $derived(wowthingData.manual.ignoredSkillLineAbilitySpellIds.has(spellId));
+    let anyCharacterHas = $derived(characters.some((char) => char?.knownRecipes?.has(abilityId)));
+
+    const rankIcons: Record<number, Icon> = {
+        1: iconLibrary.mynauiNumber1Circle,
+        2: iconLibrary.mynauiNumber2Circle,
+        3: iconLibrary.mynauiNumber3Circle,
+        4: iconLibrary.mynauiNumber4Circle,
+    };
 </script>
 
 <style lang="scss">
@@ -57,9 +68,9 @@
                         {/if}
                     </WowheadLink>
                 </span>
-            {:else if ability.spellId}
-                <WowheadLink type="spell" id={ability.spellId}>
-                    <WowthingImage name="spell/{ability.spellId}" size={20} border={1} />
+            {:else if spellId}
+                <WowheadLink type="spell" id={spellId}>
+                    <WowthingImage name="spell/{spellId}" size={20} border={1} />
                 </WowheadLink>
             {:else}
                 <ProfessionIcon id={profession.id} border={1} />
@@ -70,12 +81,16 @@
                 ? `quality${wowthingData.items.items[ability.itemIds[0]].quality}`
                 : undefined}"
         >
-            <WowheadLink type="spell" id={ability.spellId}>
+            <WowheadLink type="spell" id={spellId}>
                 {#if ability.name}
                     {ability.name}
                 {:else}
                     {wowthingData.items.items[ability.itemIds[0] || 0]?.name}
                 {/if}
+
+                {#if ability.extraRanks.length > 0}
+                    <IconifyWrapper cls="quality1" icon={rankIcons[rank]} scale="1.1" />
+                {/if}
             </WowheadLink>
         </td>
         <td class="auctions">
@@ -85,7 +100,7 @@
                     target="_blank"
                     data-tooltip="Find auctions"
                 >
-                    <IconifyWrapper icon={iconLibrary.mdiBank} />
+                    <IconifyWrapper cls="quality1" icon={iconLibrary.mdiBank} />
                 </a>
             {/if}
         </td>
@@ -98,7 +113,7 @@
             {:else}
                 {@const charProf =
                     character.professions[profession.id]?.subProfessions?.[subProfession.id]}
-                {@const charHas = charProf?.knownRecipes?.has?.(ability.id)}
+                {@const charHas = charProf?.knownRecipes?.has?.(abilityId)}
                 <td class="status" class:status-success={charHas} class:status-fail={!charHas}>
                     <YesNoIcon state={charHas} />
                 </td>
diff --git a/apps/frontend/components/professions/recipes/View.svelte b/apps/frontend/components/professions/recipes/View.svelte
index b91dbfcd4..8c817b868 100644
--- a/apps/frontend/components/professions/recipes/View.svelte
+++ b/apps/frontend/components/professions/recipes/View.svelte
@@ -208,7 +208,12 @@
                 </tr>
 
                 {#each abilities as ability (ability.id)}
-                    <AbilityRow {ability} {characters} {profession} {subProfession} />
+                    {@const ranks = [1].concat(
+                        ability.extraRanks.length > 0 ? ability.extraRanks.map((_, i) => i + 2) : []
+                    )}
+                    {#each ranks as rank}
+                        <AbilityRow {ability} {rank} {characters} {profession} {subProfession} />
+                    {/each}
                 {/each}
             {/if}
         {/each}
diff --git a/apps/frontend/components/tooltips/reputation/hacks.ts b/apps/frontend/components/tooltips/reputation/hacks.ts
index dbfaa4c82..760b60139 100644
--- a/apps/frontend/components/tooltips/reputation/hacks.ts
+++ b/apps/frontend/components/tooltips/reputation/hacks.ts
@@ -1,5 +1,5 @@
 export function nazjatarHack(levelString: string): number {
-    const level = parseInt(levelString.split(' ')[1]);
+    const level = parseInt(levelString.split(' ').at(-1));
     return level === 30 ? 0 : 6 - Math.max(0, Math.floor(level / 5));
 }
 
diff --git a/apps/frontend/package-lock.json b/apps/frontend/package-lock.json
index bd316444d..c35a9ad01 100644
--- a/apps/frontend/package-lock.json
+++ b/apps/frontend/package-lock.json
@@ -19,7 +19,7 @@
             },
             "devDependencies": {
                 "@eslint/js": "^10.0.1",
-                "@iconify/json": "^2.2.537",
+                "@iconify/json": "^2.2.544",
                 "@iconify/svelte": "^5.2.2",
                 "@iconify/types": "^2.0.0",
                 "@sveltejs/vite-plugin-svelte": "^7.3.1",
@@ -333,9 +333,9 @@
             }
         },
         "node_modules/@iconify/json": {
-            "version": "2.2.537",
-            "resolved": "https://registry.npmjs.org/@iconify/json/-/json-2.2.537.tgz",
-            "integrity": "sha512-GjMung20j59gXKDekv9PHMNF38aGnFH/+RkLo0jpfmN70gfUykMepWF5b/9y2MpCYxDHviiYDBWQ0Yoa+a2W7A==",
+            "version": "2.2.544",
+            "resolved": "https://registry.npmjs.org/@iconify/json/-/json-2.2.544.tgz",
+            "integrity": "sha512-xsG0R+cohL1LagZc7Fr2zWMLRDDGb7tbQJ2ZhM8iL4itCvA6HhKx7UjuCjz6KnuBcQr1jkIiI3vXd7uZpd+yfQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 35e4c3e1e..8388ab5df 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -24,7 +24,7 @@
     },
     "devDependencies": {
         "@eslint/js": "^10.0.1",
-        "@iconify/json": "^2.2.537",
+        "@iconify/json": "^2.2.544",
         "@iconify/svelte": "^5.2.2",
         "@iconify/types": "^2.0.0",
         "@sveltejs/vite-plugin-svelte": "^7.3.1",
diff --git a/apps/frontend/shared/icons/library.ts b/apps/frontend/shared/icons/library.ts
index 1695b0d0f..05e558ea8 100644
--- a/apps/frontend/shared/icons/library.ts
+++ b/apps/frontend/shared/icons/library.ts
@@ -227,6 +227,10 @@ export { default as mynauiLetterPSquare } from '~icons/mynaui/letter-p-square';
 export { default as mynauiLetterRCircle } from '~icons/mynaui/letter-r-circle';
 export { default as mynauiLetterSCircle } from '~icons/mynaui/letter-s-circle';
 export { default as mynauiLetterWSquare } from '~icons/mynaui/letter-w-square';
+export { default as mynauiNumber1Circle } from '~icons/mynaui/one-circle';
+export { default as mynauiNumber2Circle } from '~icons/mynaui/two-circle';
+export { default as mynauiNumber3Circle } from '~icons/mynaui/three-circle';
+export { default as mynauiNumber4Circle } from '~icons/mynaui/four-circle';
 
 export { default as notoAngryFaceWithHorns } from '~icons/noto/angry-face-with-horns';
 export { default as notoBackpack } from '~icons/noto/backpack';
diff --git a/apps/frontend/user-home/components/reputations/AccountWide.svelte b/apps/frontend/user-home/components/reputations/AccountWide.svelte
index 3bd6a6f00..fa79891fa 100644
--- a/apps/frontend/user-home/components/reputations/AccountWide.svelte
+++ b/apps/frontend/user-home/components/reputations/AccountWide.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
     import { getRenownData } from './get-renown-data';
+    import { Faction } from '@/enums/faction';
     import { componentTooltip } from '@/shared/utils/tooltips';
     import type { ManualDataReputationSet } from '@/types/data/manual';
 
+    import FactionIcon from '@/shared/components/images/FactionIcon.svelte';
+    import ProgressBar from '@/components/common/ProgressBar.svelte';
     import TooltipReputation from '@/components/tooltips/reputation/TooltipReputation.svelte';
     import WowheadLink from '@/shared/components/links/WowheadLink.svelte';
     import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';
-    import ProgressBar from '@/components/common/ProgressBar.svelte';
 
     type Props = {
         accountSets: [ManualDataReputationSet[], number][];
@@ -38,7 +40,14 @@
     .icon {
         flex-shrink: 0;
         height: 50px;
+        position: relative;
         width: 50px;
+
+        .faction {
+            top: -2px;
+            position: absolute;
+            left: 0;
+        }
     }
     .data {
         --bar-height: 1.25rem;
@@ -87,6 +96,8 @@
                     reputationSetsIndex,
                     slug,
                 })}
+                {@const hasAlliance = !!reputationSet.alliance}
+                {@const hasHorde = !!reputationSet.horde}
                 {@const repId =
                     reputationSet.both?.id || reputationSet.alliance?.id || reputationSet.horde?.id}
                 {@const repIcon =
@@ -95,6 +106,7 @@
                     reputationSet.horde?.icon}
                 <div
                     class="account-rep {cls} flex-wrapper"
+                    data-id={repId}
                     use:componentTooltip={{
                         component: TooltipReputation,
                         propsFunc: () => ({
@@ -109,6 +121,16 @@
                         <WowheadLink type="faction" id={repId}>
                             <WowthingImage name={repIcon} size={48} border={2} />
                         </WowheadLink>
+
+                        {#if hasAlliance && !hasHorde}
+                            <div class="faction drop-shadow">
+                                <FactionIcon faction={Faction.Alliance} border={2} />
+                            </div>
+                        {:else if !hasAlliance && hasHorde}
+                            <div class="faction drop-shadow">
+                                <FactionIcon faction={Faction.Horde} border={2} />
+                            </div>
+                        {/if}
                     </div>
                     <div class="data">
                         <div class="flex-wrapper {cls}">
diff --git a/apps/frontend/user-home/components/reputations/Category.svelte b/apps/frontend/user-home/components/reputations/Category.svelte
index c7faa2c01..fed9d51d4 100644
--- a/apps/frontend/user-home/components/reputations/Category.svelte
+++ b/apps/frontend/user-home/components/reputations/Category.svelte
@@ -18,7 +18,10 @@
         for (let setIndex = 0; setIndex < reputationSets.length; setIndex++) {
             const reputationSet = reputationSets[setIndex];
             const hasAccountWide = reputationSet.some(
-                (rep) => wowthingData.static.reputationById.get(rep.both?.id)?.accountWide
+                (rep) =>
+                    wowthingData.static.reputationById.get(
+                        rep.both?.id || rep.alliance?.id || rep.horde?.id
+                    )?.accountWide
             );
             (hasAccountWide ? accountRet : characterRet).push([reputationSet, setIndex]);
         }
diff --git a/apps/frontend/user-home/components/reputations/get-renown-data.ts b/apps/frontend/user-home/components/reputations/get-renown-data.ts
index e52121b1e..515e2cf86 100644
--- a/apps/frontend/user-home/components/reputations/get-renown-data.ts
+++ b/apps/frontend/user-home/components/reputations/get-renown-data.ts
@@ -1,4 +1,4 @@
-import { brannHack, valeeraHack } from '@/components/tooltips/reputation/hacks';
+import { brannHack, nazjatarHack, valeeraHack } from '@/components/tooltips/reputation/hacks';
 import { Constants } from '@/data/constants';
 import { wowthingData } from '@/shared/stores/data';
 import { userState } from '@/user-home/state/user';
@@ -47,15 +47,17 @@ export function getRenownData({
     character ||= userState.general.characters[0];
 
     ret.characterRep = character.reputationData[slug].sets[reputationsIndex][reputationSetsIndex];
-    ret.dataRep = wowthingData.static.reputationById.get(ret.characterRep.reputationId);
+    ret.dataRep = wowthingData.static.reputationById.get(
+        ret.characterRep?.reputationId ||
+            reputation.both?.id ||
+            reputation.alliance?.id ||
+            reputation.horde?.id
+    );
 
     const actualCharacter = ret.dataRep.accountWide
         ? userState.general.characterById[userState.reputations[ret.dataRep.id]?.characterId]
         : character;
 
-    if (ret.dataRep.name === "Preyhunter's Journey")
-        console.log(ret, userState.reputations[ret.dataRep.id], actualCharacter.name);
-
     ret.characterRep =
         actualCharacter.reputationData[slug].sets[reputationsIndex][reputationSetsIndex];
     const repValue =
@@ -88,15 +90,20 @@ export function getRenownData({
         ret.repTier = findReputationTier(tiers, repValue);
 
         if (
+            Constants.reputations.nazjatarFriends.includes(ret.dataRep.id) ||
             ret.dataRep.id === Constants.reputations.delveBrann ||
             ret.dataRep.id === Constants.reputations.delveValeera
         ) {
             const levelMatch = ret.repTier.name.match(/(\d{1,3})$/);
             if (levelMatch) {
-                const oof =
-                    ret.dataRep.id === Constants.reputations.delveBrann
-                        ? brannHack(levelMatch[1])
-                        : valeeraHack(levelMatch[1]);
+                let oof: number;
+                if (Constants.reputations.nazjatarFriends.includes(ret.dataRep.id)) {
+                    oof = nazjatarHack(levelMatch[1]);
+                } else if (ret.dataRep.id === Constants.reputations.delveBrann) {
+                    oof = brannHack(levelMatch[1]);
+                } else {
+                    oof = valeeraHack(levelMatch[1]);
+                }
                 ret.cls = `reputation${oof} reputation${oof}-border`;
 
                 // Brann hack to treat him as blocks of 10 levels
@@ -128,5 +135,12 @@ export function getRenownData({
         }
     }
 
+    if (
+        (ret.dataRep?.id >= 2375 && ret.dataRep?.id <= 2377) ||
+        (ret.dataRep?.id >= 2388 && ret.dataRep?.id < 2390)
+    ) {
+        console.log(ret);
+    }
+
     return ret;
 }
diff --git a/apps/tool/Data/InstanceBonusIds.cs b/apps/tool/Data/InstanceBonusIds.cs
index 5a7f22a2b..5a5fa4eba 100644
--- a/apps/tool/Data/InstanceBonusIds.cs
+++ b/apps/tool/Data/InstanceBonusIds.cs
@@ -143,10 +143,12 @@ public static partial class Hardcoded
 
     private static readonly Dictionary<int, int> MidnightRaid = new()
     {
-        { 14, 13471 }, // Normal
-        { 15, 13472 }, // Heroic
-        { 16, 13473 }, // Mythic
-        { 17, 13470 }, // LFR
+        { (int)WowDifficulty.RaidLookingForRaid, 13470 },
+        { (int)WowDifficulty.RaidWorld, 13470 },
+        { (int)WowDifficulty.RaidNormal, 13471 },
+        { (int)WowDifficulty.RaidHeroic, 13472 },
+        { (int)WowDifficulty.RaidMythic, 13473 },
+        { (int)WowDifficulty.RaidMythicFlex, 13473 },
     };
 
     private static readonly Dictionary<int, int> MidnightWorldBoss = new()
@@ -255,6 +257,7 @@ public static partial class Hardcoded
         { 1305, MidnightRaid }, // Sporefall
         { 1317, MidnightWorldBoss2 }, // The Tidebound Grotto (world boss lair)
         { 1320, MidnightRaid }, // The Venomous Abyss
+        { 1324, MidnightRaid }, // The Unbinding of Kith'ix
     };
 }
 
diff --git a/packages/csharp-lib/Enums/WowDifficulty.cs b/packages/csharp-lib/Enums/WowDifficulty.cs
index 10e30204c..7659f314d 100644
--- a/packages/csharp-lib/Enums/WowDifficulty.cs
+++ b/packages/csharp-lib/Enums/WowDifficulty.cs
@@ -2,25 +2,27 @@
 
 public enum WowDifficulty
 {
-    NormalDungeon = 1,
-    HeroicDungeon = 2,
-    MythicKeystone = 8,
-    MythicDungeon = 23,
-    TimewalkingDungeon = 24,
+    DungeonNormal = 1,
+    DungeonHeroic = 2,
+    DungeonMythicKeystone = 8,
+    DungeonMythic = 23,
+    DungeonTimewalking = 24,
 
     // Legacy Raids
-    Legacy10NRaid = 3,
-    Legacy25NRaid = 4,
-    Legacy10HRaid = 5,
-    Legacy25HRaid = 6,
-    LegacyLookingForRaid = 7,
-    Legacy40Raid = 9,
+    RaidLegacy10Normal = 3,
+    RaidLegacy25Normal = 4,
+    RaidLegacy10Heroic = 5,
+    RaidLegacy25Heroic = 6,
+    RaidLegacyLookingForRaid = 7,
+    RaidLegacy40 = 9,
 
     // Raids
-    NormalRaid = 14,
-    HeroicRaid = 15,
-    MythicRaid = 16,
-    LookingForRaid = 17,
-    EventRaid = 18,
-    TimewalkingRaid = 33,
+    RaidNormal = 14,
+    RaidHeroic = 15,
+    RaidMythic = 16,
+    RaidLookingForRaid = 17,
+    RaidEvent = 18,
+    RaidTimewalking = 33,
+    RaidMythicFlex = 233,
+    RaidWorld = 250,
 }