diff --git a/.resources/cpu_tier_list.conf b/.resources/cpu_tier_list.conf
index 42a62020..04f6f376 100644
--- a/.resources/cpu_tier_list.conf
+++ b/.resources/cpu_tier_list.conf
@@ -10,19 +10,22 @@
 ; Models are matching as regex as a result (ignoring the letter case)
 ; e.g.: 12900K will match 12900KF or 12900KS too, but not 12900
 
-[S]
+[S+]
 Ryzen 9 9950X3D
 Ryzen 7 9800X3D
 i9-12900K AVX-512
 i7-12700K AVX-512
+
+[S]
 Ryzen 9 9950X
 Ryzen 7 9700X
+Ryzen 9 9900X
+i9-14900KS
 i9-14900K
 i9-13900KS
 Ultra 9 285K
 i9-13900K
 i7-14700K
-Ryzen 9 9900X
 Ultra 7 265K
 i7-13700K
 Ryzen 9 7950X3D
@@ -30,17 +33,26 @@ Ryzen 9 7950X
 Ryzen 7 7700X
 Ryzen 9 7900X
 Ryzen 7 7800X3D
-Ultra 5 245K
 
 [A]
+; desktop
+Ryzen 5 9600X
 i5-14600K
 i5-13600K
-Ryzen 5 9600X
+Ultra 5 245K
 Ryzen 5 7600X
 Ryzen 5 7500F
 i7-12700 AVX-512
 i9-12900KS
 i9-12900K
+
+; mobile
+Ryzen 9 7945HX
+i9-14900HX
+i9-13980HX
+
+[B]
+; desktop
 i5-12600K AVX-512
 i9-11900K
 i7-11700K
@@ -48,23 +60,23 @@ i7-12700K
 i7-12700
 i5-12600K
 i5-12400 AVX-512
-Ryzen 9 7945HX
-i9-14900HX
-i9-13980HX
+Ryzen 7 5800X
+Ryzen 9 5950X
+Ryzen 9 5900X
+
+; mobile
 i7-14650HX
 i7-13620H
 i9-12900HX
 i9-11980HK
-i7-12650H
 i9-11950H
 i9-11900H
 i7-11850H
 i7-11800H
+i7-12650H
 
-[B]
-Ryzen 7 5800X
-Ryzen 9 5950X
-Ryzen 9 5900X
+[C]
+; desktop
 i5-11600K
 i5-13500
 Ryzen 7 5800X3D
@@ -79,25 +91,24 @@ i9-9900K
 i5-11400
 Ryzen 5 5600X
 Ryzen 7 5700G
+Ryzen 9 3950X
 Ryzen 7 3800X
-Ryzen 7 3700X
+Ryzen 9 3900X
+Ryzen 9 3700X
 i5-10600K
 i7-8700K
 i3-12100
-Ryzen 9 3950X
-Ryzen 9 3900X
-Ryzen 5 5600G
-Ryzen 5 3600
-i5-10400
-i7-11600H
-i5-11400H
-; GPD Win Max 2
+
+; mobile
 Ryzen 7 8840U
 Ryzen 7 7840U
-Ryzen 5 8640U
-; Legion Go
+i5-11600H
+i5-11400H
 ; ROG Ally X
 Ryzen Z1 Extreme
+; GPD Win Max 2
+Ryzen 5 8640U
+; Legion Go
 ; ROG Ally
 Ryzen Z1
 Ryzen 9 6900HX
@@ -111,11 +122,14 @@ Ryzen 9 5900HX
 Ryzen 7 5800H
 Ryzen 7 5800HS
 Ryzen 7 4800H
-Ryzen 7 6800U
 Ryzen 5 5600H
 Ryzen 5 5600HS
 
-[C]
+[D]
+; desktop
+Ryzen 5 5600G
+Ryzen 5 3600
+i5-10400
 i5-9600K
 i5-8600K
 i5-9400
@@ -124,6 +138,9 @@ Ryzen 7 2700X
 i7-7700K
 i7-4790K
 Ryzen 7 1700
+
+; mobile
+Ryzen 7 6800U
 i7-1165G7
 i7-8750H
 i5-8300H
@@ -131,6 +148,8 @@ i7-7700HQ
 ; Steam Deck OLED
 ; Steam Deck LCD
 Custom APU 0405
+
+; generic
 ; "Intel 7000 - 4000 4c/8t"
 ; 4xxx-7xxx except U with 5-8 threads
 Intel [4-7]\d{3}(?!U) \b[5-8]\sThreads
@@ -138,7 +157,8 @@ Intel [4-7]\d{3}(?!U) \b[5-8]\sThreads
 ; 1xxxx or 2xxxx with 13-16 threads
 Ryzen [12]\d{3} 1[3-6]\sThreads
 
-[D]
+[E]
+; desktop
 Ryzen 5 2600
 Ryzen 5 1600AF
 i5-7600k
@@ -146,11 +166,15 @@ i5-6600K
 Ryzen 5 3400G
 i5-4690K
 i5-4690
+
+; mobile
 i5-1035G1
 i3-N305
 i7-4700MQ
 i5-8250U
 i5-7300HQ
+
+; generic
 ; "Ryzen 1000 - 2000 6c/12t or worse"
 ; 1xxx or 2xxx with 1-9 or 10-12 threads
 Ryzen [12]\d{3} \b([1-9]|1[0-2])\sThreads
@@ -158,12 +182,15 @@ Ryzen [12]\d{3} \b([1-9]|1[0-2])\sThreads
 4\sThreads
 
 [F]
+; mobile
 i3-1005G1 
 i3-10110U
 Intel N200
 Intel N100
 i5-4300M
 Intel N50
+
+; generic
 ; "Intel 7000 - 100 U Series"
 ; 7xxx-9xxx or 10xxx or 1xxx
 Intel ([7-9]|10?)\d{3}U
diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
index 6f5fabea..00b0f3ca 100644
--- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
+++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
@@ -195,15 +195,13 @@ internal static partial class LogParserResult
                 var status = items["game_status"] ?? "unknown";
                 var msg = (tier, status) switch
                 {
-                    ("S" or "A", _) => $"ℹ️ This is an **{tier}** Tier CPU",
-                    ("B", "Ingame") => "⚠️ This is a **B** Tier CPU, and may not be sufficient for some ingame titles",
-                    ("B", _) => "ℹ️ This is a **B** Tier CPU",
-                    ("C", "Playable") => "⚠️ This is a **C** Tier CPU, which is below the recommended system requirements",
-                    ("C", _) => "⚠️ This is a **C** Tier CPU, please stick to the playable game titles",
-                    ("D", "Playable") => "⚠️ This is a **D** Tier CPU, only lighter playable game titles will work",
-                    ("D", _) => "⚠️ This is a **D** Tier CPU, please stick to the lighter playable game titles",
-                    ("F", _) => "❌ This is an **F** Tier CPU, which is below the minimum system requirements",
-                    _ => "",
+                    ("S+" or "S" or "A", _) => $"ℹ️ This is an [**{tier}** Tier CPU](<https://rpcs3.net/cputierlist>)",
+                    ( "B", _) => "ℹ️ This is a [**B** Tier CPU](<https://rpcs3.net/cputierlist>)",
+                    ("C", "Ingame") => "⚠️ This is a [**C** Tier CPU](<https://rpcs3.net/cputierlist>), and may not be sufficient for some ingame titles",
+                    ("C", _) => "ℹ️ This is a [**C** Tier CPU](<https://rpcs3.net/cputierlist>)",
+                    ("D", "Playable") => "⚠️ This is a [**D** Tier CPU](<https://rpcs3.net/cputierlist>), which is below the recommended system requirements",
+                    ("D", _) => "⚠️ This is a [**D** Tier CPU](<https://rpcs3.net/cputierlist>), please stick to the lighter playable game titles",
+                    _ => $"❌ This is an [**{tier}** Tier CPU](<https://rpcs3.net/cputierlist>), which is below the minimum system requirements",
                 };
                 if (msg is {Length: >0})
                 {