diff --git a/src/TQVaultAE.GUI/Components/StashPanel.cs b/src/TQVaultAE.GUI/Components/StashPanel.cs
index 52d76a77..f78a9008 100644
--- a/src/TQVaultAE.GUI/Components/StashPanel.cs
+++ b/src/TQVaultAE.GUI/Components/StashPanel.cs
@@ -165,11 +165,11 @@ public StashPanel(ItemDragInfo dragInfo, Size panelSize, IServiceProvider servic
 				Size = new Size(PLAYERINFO_WIDTH, PLAYERINFO_HEIGHT),
 				//CellBorderStyle = TableLayoutPanelCellBorderStyle.Single,
 				Margin = new Padding(0),
-				Padding = new Padding(3),
+				Padding = new Padding(1),
 				BackColor = Color.Transparent,
 			};
-			table.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 60F));
-			table.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40F));
+			table.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+			table.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
 
 			this.Controls.Add(table);
 			this.PlayerPanel = table;
@@ -206,10 +206,14 @@ private void DisplayPlayerInfo()
 			if (this.Player?.PlayerInfo != null)
 			{
 				DisplayPlayerInfoLastName = this.Player.PlayerName;
+				var pclass = Resources.ResourceManager.GetString(this.Player.PlayerInfo.Class) ?? string.Empty;
+				var mclass = Resources.ResourceManager.GetString($"Masteries{this.Player.PlayerInfo.Class}") ?? string.Empty;
+				mclass = mclass == Resources.Masteries ? string.Empty : mclass;
 				var pi = new Dictionary<string, string>
 				{
 					[Resources.CurrentLevel] = this.Player.PlayerInfo.CurrentLevel.ToString(),
-					[Resources.Class] = Resources.ResourceManager.GetString(this.Player.PlayerInfo.Class) ?? string.Empty,
+					[Resources.Class] = pclass,
+					[Resources.Masteries] = mclass,
 					[Resources.CurrentXP] = this.Player.PlayerInfo.CurrentXP.ToString(),
 					[Resources.DifficultyUnlocked] = Resources.ResourceManager.GetString($"Difficulty{this.Player.PlayerInfo.DifficultyUnlocked}") ?? "unknown",
 					[Resources.Money] = this.Player.PlayerInfo.Money.ToString(),
@@ -259,6 +263,7 @@ private void DisplayPlayerInfo()
 					UseVisualStyleBackColor = false,
 					Font = FontService.GetFontAlbertusMTLight(11F),
 					Margin = new Padding(0, 0, 0, 10),
+					Padding = new Padding(10, 0, 10, 0),
 					Visible = Config.Settings.Default.AllowCharacterEdit,
 				};
 				editButton.FlatAppearance.BorderSize = 0;
diff --git a/src/TQVaultAE.Presentation/Resources.Designer.cs b/src/TQVaultAE.Presentation/Resources.Designer.cs
index 2607c080..1099405e 100644
--- a/src/TQVaultAE.Presentation/Resources.Designer.cs
+++ b/src/TQVaultAE.Presentation/Resources.Designer.cs
@@ -2062,6 +2062,510 @@ public static string ManaPotionsUsed {
             }
         }
         
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Masteries.
+        /// </summary>
+        public static string Masteries {
+            get {
+                return ResourceManager.GetString("Masteries", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit.
+        /// </summary>
+        public static string MasteriestagCClass01 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass01", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature.
+        /// </summary>
+        public static string MasteriestagCClass02 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass02", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue.
+        /// </summary>
+        public static string MasteriestagCClass03 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass03", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting.
+        /// </summary>
+        public static string MasteriestagCClass04 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass04", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Storm.
+        /// </summary>
+        public static string MasteriestagCClass05 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass05", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Earth.
+        /// </summary>
+        public static string MasteriestagCClass06 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass06", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Defense.
+        /// </summary>
+        public static string MasteriestagCClass07 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass07", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Warfare.
+        /// </summary>
+        public static string MasteriestagCClass08 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass08", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass09 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass09", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass10 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass10", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass11 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass11", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass12 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass12", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Storm-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass13 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass13", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Earth-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass14 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass14", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Defense-Warfare.
+        /// </summary>
+        public static string MasteriestagCClass15 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass15", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Defense.
+        /// </summary>
+        public static string MasteriestagCClass16 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass16", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Defense.
+        /// </summary>
+        public static string MasteriestagCClass17 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass17", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Defense.
+        /// </summary>
+        public static string MasteriestagCClass18 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass18", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting-Defense.
+        /// </summary>
+        public static string MasteriestagCClass19 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass19", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Storm-Defense.
+        /// </summary>
+        public static string MasteriestagCClass20 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass20", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Earth-Defense.
+        /// </summary>
+        public static string MasteriestagCClass21 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass21", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Earth.
+        /// </summary>
+        public static string MasteriestagCClass22 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass22", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Earth.
+        /// </summary>
+        public static string MasteriestagCClass23 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass23", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Earth.
+        /// </summary>
+        public static string MasteriestagCClass24 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass24", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting-Earth.
+        /// </summary>
+        public static string MasteriestagCClass25 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass25", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Storm-Earth.
+        /// </summary>
+        public static string MasteriestagCClass26 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass26", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Storm.
+        /// </summary>
+        public static string MasteriestagCClass27 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass27", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Storm.
+        /// </summary>
+        public static string MasteriestagCClass28 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass28", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Storm.
+        /// </summary>
+        public static string MasteriestagCClass29 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass29", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting-Storm.
+        /// </summary>
+        public static string MasteriestagCClass30 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass30", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Hunting.
+        /// </summary>
+        public static string MasteriestagCClass31 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass31", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Hunting.
+        /// </summary>
+        public static string MasteriestagCClass32 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass32", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Hunting.
+        /// </summary>
+        public static string MasteriestagCClass33 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass33", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Rogue.
+        /// </summary>
+        public static string MasteriestagCClass34 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass34", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Rogue.
+        /// </summary>
+        public static string MasteriestagCClass35 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass35", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Nature.
+        /// </summary>
+        public static string MasteriestagCClass36 {
+            get {
+                return ResourceManager.GetString("MasteriestagCClass36", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Defense-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_defense_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_defense_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Dream-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_dream_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_dream_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Earth-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_earth_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_earth_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_hunting_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_hunting_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_nature_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_nature_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_rm_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_rm_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_spirit_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_spirit_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_stealth_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_stealth_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Storm-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_storm_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_storm_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Warfare-Runes.
+        /// </summary>
+        public static string Masteriesx2tag_class_warfare_rm {
+            get {
+                return ResourceManager.GetString("Masteriesx2tag_class_warfare_rm", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass01 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass01", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Warfare-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass02 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass02", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Defense-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass03 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass03", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Earth-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass04 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass04", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Storm-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass05 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass05", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Hunting-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass06 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass06", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Rogue-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass07 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass07", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Nature-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass08 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass08", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Spirit-Dream.
+        /// </summary>
+        public static string MasteriesxtagCharacterClass09 {
+            get {
+                return ResourceManager.GetString("MasteriesxtagCharacterClass09", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Recherche une chaîne localisée semblable à Max Level.
         /// </summary>
@@ -3346,7 +3850,7 @@ public static string tagCClass14 {
         }
         
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à Conqueror.
+        ///   Recherche une chaîne localisée semblable à Conquerer.
         /// </summary>
         public static string tagCClass15 {
             get {
diff --git a/src/TQVaultAE.Presentation/Resources.fr.resx b/src/TQVaultAE.Presentation/Resources.fr.resx
index 7708ca58..f00581b2 100644
--- a/src/TQVaultAE.Presentation/Resources.fr.resx
+++ b/src/TQVaultAE.Presentation/Resources.fr.resx
@@ -1043,167 +1043,335 @@ Voici un exemple complexe: 'arctique &amp; gel @sabre $épique | rare'</value>
   <data name="tagCClass01" xml:space="preserve">
     <value>Théurgiste</value>
   </data>
+  <data name="MasteriestagCClass01" xml:space="preserve">
+    <value>Esprit</value>
+  </data>
   <data name="tagCClass02" xml:space="preserve">
     <value>Vagabond</value>
   </data>
+  <data name="MasteriestagCClass02" xml:space="preserve">
+    <value>Nature</value>
+  </data>
   <data name="tagCClass03" xml:space="preserve">
-    <value>Rogue</value>
+    <value>Rôdeur</value>
+  </data>
+  <data name="MasteriestagCClass03" xml:space="preserve">
+    <value>Ruse</value>
   </data>
   <data name="tagCClass04" xml:space="preserve">
     <value>Chasseur</value>
   </data>
+  <data name="MasteriestagCClass04" xml:space="preserve">
+    <value>Chasse</value>
+  </data>
   <data name="tagCClass05" xml:space="preserve">
-    <value>Stormcaller</value>
+    <value>Homme-tempête</value>
+  </data>
+  <data name="MasteriestagCClass05" xml:space="preserve">
+    <value>Tempête</value>
   </data>
   <data name="tagCClass06" xml:space="preserve">
     <value>Pyromancien</value>
   </data>
+  <data name="MasteriestagCClass06" xml:space="preserve">
+    <value>Terre</value>
+  </data>
   <data name="tagCClass07" xml:space="preserve">
     <value>Défenseur</value>
   </data>
+  <data name="MasteriestagCClass07" xml:space="preserve">
+    <value>Défense</value>
+  </data>
   <data name="tagCClass08" xml:space="preserve">
-    <value>guerrier</value>
+    <value>Guerrier</value>
+  </data>
+  <data name="MasteriestagCClass08" xml:space="preserve">
+    <value>Guerre</value>
   </data>
   <data name="tagCClass09" xml:space="preserve">
     <value>Briseur de sorts</value>
   </data>
+  <data name="MasteriestagCClass09" xml:space="preserve">
+    <value>Esprit-Guerre</value>
+  </data>
   <data name="tagCClass10" xml:space="preserve">
     <value>Champion</value>
   </data>
+  <data name="MasteriestagCClass10" xml:space="preserve">
+    <value>Nature-Guerre</value>
+  </data>
   <data name="tagCClass11" xml:space="preserve">
     <value>Assassin</value>
   </data>
+  <data name="MasteriestagCClass11" xml:space="preserve">
+    <value>Ruse-Guerre</value>
+  </data>
   <data name="tagCClass12" xml:space="preserve">
     <value>Tueur</value>
   </data>
+  <data name="MasteriestagCClass12" xml:space="preserve">
+    <value>Chasse-Guerre</value>
+  </data>
   <data name="tagCClass13" xml:space="preserve">
-    <value>Thane</value>
+    <value>Chevalier</value>
+  </data>
+  <data name="MasteriestagCClass13" xml:space="preserve">
+    <value>Tempête-Guerre</value>
   </data>
   <data name="tagCClass14" xml:space="preserve">
-    <value>Battlemage</value>
+    <value>Mage-guerrier</value>
+  </data>
+  <data name="MasteriestagCClass14" xml:space="preserve">
+    <value>Terre-Guerre</value>
   </data>
   <data name="tagCClass15" xml:space="preserve">
     <value>Conquérant</value>
   </data>
+  <data name="MasteriestagCClass15" xml:space="preserve">
+    <value>Défense-Guerre</value>
+  </data>
   <data name="tagCClass16" xml:space="preserve">
-    <value>Relieur de sorts</value>
+    <value>Ensorceleur</value>
+  </data>
+  <data name="MasteriestagCClass16" xml:space="preserve">
+    <value>Esprit-Défense</value>
   </data>
   <data name="tagCClass17" xml:space="preserve">
     <value>Gardien</value>
   </data>
+  <data name="MasteriestagCClass17" xml:space="preserve">
+    <value>Nature-Défense</value>
+  </data>
   <data name="tagCClass18" xml:space="preserve">
     <value>Corsaire</value>
   </data>
+  <data name="MasteriestagCClass18" xml:space="preserve">
+    <value>Ruse-Défense</value>
+  </data>
   <data name="tagCClass19" xml:space="preserve">
-    <value>Directeur</value>
+    <value>Garde</value>
+  </data>
+  <data name="MasteriestagCClass19" xml:space="preserve">
+    <value>Chasse-Défense</value>
   </data>
   <data name="tagCClass20" xml:space="preserve">
     <value>Paladin</value>
   </data>
+  <data name="MasteriestagCClass20" xml:space="preserve">
+    <value>Tempête-Défense</value>
+  </data>
   <data name="tagCClass21" xml:space="preserve">
-    <value>Juggernaut</value>
+    <value>Mastodonte</value>
+  </data>
+  <data name="MasteriestagCClass21" xml:space="preserve">
+    <value>Terre-Défense</value>
   </data>
   <data name="tagCClass22" xml:space="preserve">
-    <value>Illusionniste</value>
+    <value>Conjureur</value>
+  </data>
+  <data name="MasteriestagCClass22" xml:space="preserve">
+    <value>Esprit-Terre</value>
   </data>
   <data name="tagCClass23" xml:space="preserve">
     <value>Invocateur</value>
   </data>
+  <data name="MasteriestagCClass23" xml:space="preserve">
+    <value>Nature-Terre</value>
+  </data>
   <data name="tagCClass24" xml:space="preserve">
     <value>Magicien</value>
   </data>
+  <data name="MasteriestagCClass24" xml:space="preserve">
+    <value>Ruse-Terre</value>
+  </data>
   <data name="tagCClass25" xml:space="preserve">
     <value>Vengeur</value>
   </data>
+  <data name="MasteriestagCClass25" xml:space="preserve">
+    <value>Chasse-Terre</value>
+  </data>
   <data name="tagCClass26" xml:space="preserve">
     <value>Élémentaliste</value>
   </data>
+  <data name="MasteriestagCClass26" xml:space="preserve">
+    <value>Tempête-Terre</value>
+  </data>
   <data name="tagCClass27" xml:space="preserve">
     <value>Oracle</value>
   </data>
+  <data name="MasteriestagCClass27" xml:space="preserve">
+    <value>Esprit-Tempête</value>
+  </data>
   <data name="tagCClass28" xml:space="preserve">
     <value>Druide</value>
   </data>
+  <data name="MasteriestagCClass28" xml:space="preserve">
+    <value>Nature-Tempête</value>
+  </data>
   <data name="tagCClass29" xml:space="preserve">
     <value>Sorcier</value>
   </data>
+  <data name="MasteriestagCClass29" xml:space="preserve">
+    <value>Ruse-Tempête</value>
+  </data>
   <data name="tagCClass30" xml:space="preserve">
     <value>Sage</value>
   </data>
+  <data name="MasteriestagCClass30" xml:space="preserve">
+    <value>Chasse-Tempête</value>
+  </data>
   <data name="tagCClass31" xml:space="preserve">
     <value>Charmeur d'os</value>
   </data>
+  <data name="MasteriestagCClass31" xml:space="preserve">
+    <value>Esprit-Chasse</value>
+  </data>
   <data name="tagCClass32" xml:space="preserve">
-    <value>Rôdeur</value>
+    <value>Garde-chasse</value>
+  </data>
+  <data name="MasteriestagCClass32" xml:space="preserve">
+    <value>Nature-Chasse</value>
   </data>
   <data name="tagCClass33" xml:space="preserve">
     <value>Brigand</value>
   </data>
+  <data name="MasteriestagCClass33" xml:space="preserve">
+    <value>Ruse-Chasse</value>
+  </data>
   <data name="tagCClass34" xml:space="preserve">
-    <value>Démoniste</value>
+    <value>Enchanteur</value>
+  </data>
+  <data name="MasteriestagCClass34" xml:space="preserve">
+    <value>Esprit-Ruse</value>
   </data>
   <data name="tagCClass35" xml:space="preserve">
     <value>Illusionniste</value>
   </data>
+  <data name="MasteriestagCClass35" xml:space="preserve">
+    <value>Nature-Ruse</value>
+  </data>
   <data name="tagCClass36" xml:space="preserve">
-    <value>Devin</value>
+    <value>Augure</value>
+  </data>
+  <data name="MasteriestagCClass36" xml:space="preserve">
+    <value>Esprit-Nature</value>
   </data>
   <data name="xtagCharacterClass01" xml:space="preserve">
     <value>Voyant</value>
   </data>
+  <data name="MasteriesxtagCharacterClass01" xml:space="preserve">
+    <value>Rêve</value>
+  </data>
   <data name="xtagCharacterClass02" xml:space="preserve">
-    <value>Présage</value>
+    <value>Héraut</value>
+  </data>
+  <data name="MasteriesxtagCharacterClass02" xml:space="preserve">
+    <value>Guerre-Rêve</value>
   </data>
   <data name="xtagCharacterClass03" xml:space="preserve">
     <value>Templier</value>
   </data>
+  <data name="MasteriesxtagCharacterClass03" xml:space="preserve">
+    <value>Défense-Rêve</value>
+  </data>
   <data name="xtagCharacterClass04" xml:space="preserve">
     <value>Evocateur</value>
   </data>
+  <data name="MasteriesxtagCharacterClass04" xml:space="preserve">
+    <value>Terre-Rêve</value>
+  </data>
   <data name="xtagCharacterClass05" xml:space="preserve">
     <value>Prophète</value>
   </data>
+  <data name="MasteriesxtagCharacterClass05" xml:space="preserve">
+    <value>Tempête-Rêve</value>
+  </data>
   <data name="xtagCharacterClass06" xml:space="preserve">
-    <value>Haruspex</value>
+    <value>Aruspice</value>
+  </data>
+  <data name="MasteriesxtagCharacterClass06" xml:space="preserve">
+    <value>Chasse-Rêve</value>
   </data>
   <data name="xtagCharacterClass07" xml:space="preserve">
-    <value>Tueur de rêves</value>
+    <value>Briseur de rêves</value>
+  </data>
+  <data name="MasteriesxtagCharacterClass07" xml:space="preserve">
+    <value>Ruse-Rêve</value>
   </data>
   <data name="xtagCharacterClass08" xml:space="preserve">
     <value>Ritualiste</value>
   </data>
+  <data name="MasteriesxtagCharacterClass08" xml:space="preserve">
+    <value>Nature-Rêve</value>
+  </data>
   <data name="xtagCharacterClass09" xml:space="preserve">
     <value>Devin</value>
   </data>
+  <data name="MasteriesxtagCharacterClass09" xml:space="preserve">
+    <value>Esprit-Rêve</value>
+  </data>
   <data name="x2tag_class_rm_rm" xml:space="preserve">
     <value>Maître des runes</value>
   </data>
+  <data name="Masteriesx2tag_class_rm_rm" xml:space="preserve">
+    <value>Runes</value>
+  </data>
   <data name="x2tag_class_warfare_rm" xml:space="preserve">
     <value>Berserker</value>
   </data>
+  <data name="Masteriesx2tag_class_warfare_rm" xml:space="preserve">
+    <value>Guerre-Runes</value>
+  </data>
   <data name="x2tag_class_defense_rm" xml:space="preserve">
-    <value>Runesmith</value>
+    <value>Forgeur de runes</value>
+  </data>
+  <data name="Masteriesx2tag_class_defense_rm" xml:space="preserve">
+    <value>Défense-Runes</value>
   </data>
   <data name="x2tag_class_earth_rm" xml:space="preserve">
-    <value>Parle-pierre</value>
+    <value>Parlepierre</value>
+  </data>
+  <data name="Masteriesx2tag_class_earth_rm" xml:space="preserve">
+    <value>Terre-Runes</value>
   </data>
   <data name="x2tag_class_storm_rm" xml:space="preserve">
-    <value>Thunderer</value>
+    <value>Foudroyeur</value>
+  </data>
+  <data name="Masteriesx2tag_class_storm_rm" xml:space="preserve">
+    <value>Tempête-Runes</value>
   </data>
   <data name="x2tag_class_hunting_rm" xml:space="preserve">
-    <value>Chasseur de dragon</value>
+    <value>Chasseur de dragons</value>
+  </data>
+  <data name="Masteriesx2tag_class_hunting_rm" xml:space="preserve">
+    <value>Chasse-Runes</value>
   </data>
   <data name="x2tag_class_stealth_rm" xml:space="preserve">
-    <value>Filou</value>
+    <value>Spoliateur</value>
+  </data>
+  <data name="Masteriesx2tag_class_stealth_rm" xml:space="preserve">
+    <value>Ruse-Runes</value>
   </data>
   <data name="x2tag_class_nature_rm" xml:space="preserve">
-    <value>Change-peaux</value>
+    <value>Change-forme</value>
+  </data>
+  <data name="Masteriesx2tag_class_nature_rm" xml:space="preserve">
+    <value>Nature-Runes</value>
   </data>
   <data name="x2tag_class_spirit_rm" xml:space="preserve">
     <value>Chaman</value>
   </data>
+  <data name="Masteriesx2tag_class_spirit_rm" xml:space="preserve">
+    <value>Esprit-Runes</value>
+  </data>
   <data name="x2tag_class_dream_rm" xml:space="preserve">
-    <value>Seidr Worker</value>
+    <value>Ouvrier Seidr</value>
+  </data>
+  <data name="Masteriesx2tag_class_dream_rm" xml:space="preserve">
+    <value>Rêve-Runes</value>
+  </data>
+  <data name="Masteries" xml:space="preserve">
+    <value>Maîtrises</value>
   </data>
   <data name="CurrentLevel" xml:space="preserve">
     <value>Niveau</value>
@@ -1221,7 +1389,7 @@ Voici un exemple complexe: 'arctique &amp; gel @sabre $épique | rare'</value>
     <value>Argent</value>
   </data>
   <data name="SkillPoints" xml:space="preserve">
-    <value>compétences</value>
+    <value>Compétences</value>
   </data>
   <data name="AttributesPoints" xml:space="preserve">
     <value>Points d'attributs</value>
diff --git a/src/TQVaultAE.Presentation/Resources.resx b/src/TQVaultAE.Presentation/Resources.resx
index 79f1e74a..f7924daf 100644
--- a/src/TQVaultAE.Presentation/Resources.resx
+++ b/src/TQVaultAE.Presentation/Resources.resx
@@ -1222,168 +1222,336 @@ Here is a complex example: 'arctic &amp; of frost @ring $rare | common'</value>
   <data name="tagCClass01" xml:space="preserve">
     <value>Theurgist</value>
   </data>
+  <data name="MasteriestagCClass01" xml:space="preserve">
+    <value>Spirit</value>
+  </data>
   <data name="tagCClass02" xml:space="preserve">
     <value>Wanderer</value>
   </data>
+  <data name="MasteriestagCClass02" xml:space="preserve">
+    <value>Nature</value>
+  </data>
   <data name="tagCClass03" xml:space="preserve">
     <value>Rogue</value>
   </data>
+  <data name="MasteriestagCClass03" xml:space="preserve">
+    <value>Rogue</value>
+  </data>
   <data name="tagCClass04" xml:space="preserve">
     <value>Hunter</value>
   </data>
+  <data name="MasteriestagCClass04" xml:space="preserve">
+    <value>Hunting</value>
+  </data>
   <data name="tagCClass05" xml:space="preserve">
     <value>Stormcaller</value>
   </data>
+  <data name="MasteriestagCClass05" xml:space="preserve">
+    <value>Storm</value>
+  </data>
   <data name="tagCClass06" xml:space="preserve">
     <value>Pyromancer</value>
   </data>
+  <data name="MasteriestagCClass06" xml:space="preserve">
+    <value>Earth</value>
+  </data>
   <data name="tagCClass07" xml:space="preserve">
     <value>Defender</value>
   </data>
+  <data name="MasteriestagCClass07" xml:space="preserve">
+    <value>Defense</value>
+  </data>
   <data name="tagCClass08" xml:space="preserve">
     <value>Warrior</value>
   </data>
+  <data name="MasteriestagCClass08" xml:space="preserve">
+    <value>Warfare</value>
+  </data>
   <data name="tagCClass09" xml:space="preserve">
     <value>Spellbreaker</value>
   </data>
+  <data name="MasteriestagCClass09" xml:space="preserve">
+    <value>Spirit-Warfare</value>
+  </data>
   <data name="tagCClass10" xml:space="preserve">
     <value>Champion</value>
   </data>
+  <data name="MasteriestagCClass10" xml:space="preserve">
+    <value>Nature-Warfare</value>
+  </data>
   <data name="tagCClass11" xml:space="preserve">
     <value>Assassin</value>
   </data>
+  <data name="MasteriestagCClass11" xml:space="preserve">
+    <value>Rogue-Warfare</value>
+  </data>
   <data name="tagCClass12" xml:space="preserve">
     <value>Slayer</value>
   </data>
+  <data name="MasteriestagCClass12" xml:space="preserve">
+    <value>Hunting-Warfare</value>
+  </data>
   <data name="tagCClass13" xml:space="preserve">
     <value>Thane</value>
   </data>
+  <data name="MasteriestagCClass13" xml:space="preserve">
+    <value>Storm-Warfare</value>
+  </data>
   <data name="tagCClass14" xml:space="preserve">
     <value>Battlemage</value>
   </data>
+  <data name="MasteriestagCClass14" xml:space="preserve">
+    <value>Earth-Warfare</value>
+  </data>
   <data name="tagCClass15" xml:space="preserve">
-    <value>Conqueror</value>
+    <value>Conquerer</value>
+  </data>
+  <data name="MasteriestagCClass15" xml:space="preserve">
+    <value>Defense-Warfare</value>
   </data>
   <data name="tagCClass16" xml:space="preserve">
     <value>Spellbinder</value>
   </data>
+  <data name="MasteriestagCClass16" xml:space="preserve">
+    <value>Spirit-Defense</value>
+  </data>
   <data name="tagCClass17" xml:space="preserve">
     <value>Guardian</value>
   </data>
+  <data name="MasteriestagCClass17" xml:space="preserve">
+    <value>Nature-Defense</value>
+  </data>
   <data name="tagCClass18" xml:space="preserve">
     <value>Corsair</value>
   </data>
+  <data name="MasteriestagCClass18" xml:space="preserve">
+    <value>Rogue-Defense</value>
+  </data>
   <data name="tagCClass19" xml:space="preserve">
     <value>Warden</value>
   </data>
+  <data name="MasteriestagCClass19" xml:space="preserve">
+    <value>Hunting-Defense</value>
+  </data>
   <data name="tagCClass20" xml:space="preserve">
     <value>Paladin</value>
   </data>
+  <data name="MasteriestagCClass20" xml:space="preserve">
+    <value>Storm-Defense</value>
+  </data>
   <data name="tagCClass21" xml:space="preserve">
     <value>Juggernaut</value>
   </data>
+  <data name="MasteriestagCClass21" xml:space="preserve">
+    <value>Earth-Defense</value>
+  </data>
   <data name="tagCClass22" xml:space="preserve">
     <value>Conjurer</value>
   </data>
+  <data name="MasteriestagCClass22" xml:space="preserve">
+    <value>Spirit-Earth</value>
+  </data>
   <data name="tagCClass23" xml:space="preserve">
     <value>Summoner</value>
   </data>
+  <data name="MasteriestagCClass23" xml:space="preserve">
+    <value>Nature-Earth</value>
+  </data>
   <data name="tagCClass24" xml:space="preserve">
     <value>Magician</value>
   </data>
+  <data name="MasteriestagCClass24" xml:space="preserve">
+    <value>Rogue-Earth</value>
+  </data>
   <data name="tagCClass25" xml:space="preserve">
     <value>Avenger</value>
   </data>
+  <data name="MasteriestagCClass25" xml:space="preserve">
+    <value>Hunting-Earth</value>
+  </data>
   <data name="tagCClass26" xml:space="preserve">
     <value>Elementalist</value>
   </data>
+  <data name="MasteriestagCClass26" xml:space="preserve">
+    <value>Storm-Earth</value>
+  </data>
   <data name="tagCClass27" xml:space="preserve">
     <value>Oracle</value>
   </data>
+  <data name="MasteriestagCClass27" xml:space="preserve">
+    <value>Spirit-Storm</value>
+  </data>
   <data name="tagCClass28" xml:space="preserve">
     <value>Druid</value>
   </data>
+  <data name="MasteriestagCClass28" xml:space="preserve">
+    <value>Nature-Storm</value>
+  </data>
   <data name="tagCClass29" xml:space="preserve">
     <value>Sorcerer</value>
   </data>
+  <data name="MasteriestagCClass29" xml:space="preserve">
+    <value>Rogue-Storm</value>
+  </data>
   <data name="tagCClass30" xml:space="preserve">
     <value>Sage</value>
   </data>
+  <data name="MasteriestagCClass30" xml:space="preserve">
+    <value>Hunting-Storm</value>
+  </data>
   <data name="tagCClass31" xml:space="preserve">
     <value>Bone Charmer</value>
   </data>
+  <data name="MasteriestagCClass31" xml:space="preserve">
+    <value>Spirit-Hunting</value>
+  </data>
   <data name="tagCClass32" xml:space="preserve">
     <value>Ranger</value>
   </data>
+  <data name="MasteriestagCClass32" xml:space="preserve">
+    <value>Nature-Hunting</value>
+  </data>
   <data name="tagCClass33" xml:space="preserve">
     <value>Brigand</value>
   </data>
+  <data name="MasteriestagCClass33" xml:space="preserve">
+    <value>Rogue-Hunting</value>
+  </data>
   <data name="tagCClass34" xml:space="preserve">
     <value>Warlock</value>
   </data>
+  <data name="MasteriestagCClass34" xml:space="preserve">
+    <value>Spirit-Rogue</value>
+  </data>
   <data name="tagCClass35" xml:space="preserve">
     <value>Illusionist</value>
   </data>
+  <data name="MasteriestagCClass35" xml:space="preserve">
+    <value>Nature-Rogue</value>
+  </data>
   <data name="tagCClass36" xml:space="preserve">
     <value>Soothsayer</value>
   </data>
+  <data name="MasteriestagCClass36" xml:space="preserve">
+    <value>Spirit-Nature</value>
+  </data>
   <data name="xtagCharacterClass01" xml:space="preserve">
     <value>Seer</value>
   </data>
+  <data name="MasteriesxtagCharacterClass01" xml:space="preserve">
+    <value>Dream</value>
+  </data>
   <data name="xtagCharacterClass02" xml:space="preserve">
     <value>Harbinger</value>
   </data>
+  <data name="MasteriesxtagCharacterClass02" xml:space="preserve">
+    <value>Warfare-Dream</value>
+  </data>
   <data name="xtagCharacterClass03" xml:space="preserve">
     <value>Templar</value>
   </data>
+  <data name="MasteriesxtagCharacterClass03" xml:space="preserve">
+    <value>Defense-Dream</value>
+  </data>
   <data name="xtagCharacterClass04" xml:space="preserve">
     <value>Evoker</value>
   </data>
+  <data name="MasteriesxtagCharacterClass04" xml:space="preserve">
+    <value>Earth-Dream</value>
+  </data>
   <data name="xtagCharacterClass05" xml:space="preserve">
     <value>Prophet</value>
   </data>
+  <data name="MasteriesxtagCharacterClass05" xml:space="preserve">
+    <value>Storm-Dream</value>
+  </data>
   <data name="xtagCharacterClass06" xml:space="preserve">
     <value>Haruspex</value>
   </data>
+  <data name="MasteriesxtagCharacterClass06" xml:space="preserve">
+    <value>Hunting-Dream</value>
+  </data>
   <data name="xtagCharacterClass07" xml:space="preserve">
     <value>Dreamkiller</value>
   </data>
+  <data name="MasteriesxtagCharacterClass07" xml:space="preserve">
+    <value>Rogue-Dream</value>
+  </data>
   <data name="xtagCharacterClass08" xml:space="preserve">
     <value>Ritualist</value>
   </data>
+  <data name="MasteriesxtagCharacterClass08" xml:space="preserve">
+    <value>Nature-Dream</value>
+  </data>
   <data name="xtagCharacterClass09" xml:space="preserve">
     <value>Diviner</value>
   </data>
+  <data name="MasteriesxtagCharacterClass09" xml:space="preserve">
+    <value>Spirit-Dream</value>
+  </data>
   <data name="x2tag_class_rm_rm" xml:space="preserve">
     <value>Runemaster</value>
   </data>
+  <data name="Masteriesx2tag_class_rm_rm" xml:space="preserve">
+    <value>Runes</value>
+  </data>
   <data name="x2tag_class_warfare_rm" xml:space="preserve">
     <value>Berserker</value>
   </data>
+  <data name="Masteriesx2tag_class_warfare_rm" xml:space="preserve">
+    <value>Warfare-Runes</value>
+  </data>
   <data name="x2tag_class_defense_rm" xml:space="preserve">
     <value>Runesmith</value>
   </data>
+  <data name="Masteriesx2tag_class_defense_rm" xml:space="preserve">
+    <value>Defense-Runes</value>
+  </data>
   <data name="x2tag_class_earth_rm" xml:space="preserve">
     <value>Stonespeaker</value>
   </data>
+  <data name="Masteriesx2tag_class_earth_rm" xml:space="preserve">
+    <value>Earth-Runes</value>
+  </data>
   <data name="x2tag_class_storm_rm" xml:space="preserve">
     <value>Thunderer</value>
   </data>
+  <data name="Masteriesx2tag_class_storm_rm" xml:space="preserve">
+    <value>Storm-Runes</value>
+  </data>
   <data name="x2tag_class_hunting_rm" xml:space="preserve">
     <value>Dragon Hunter</value>
   </data>
+  <data name="Masteriesx2tag_class_hunting_rm" xml:space="preserve">
+    <value>Hunting-Runes</value>
+  </data>
   <data name="x2tag_class_stealth_rm" xml:space="preserve">
     <value>Trickster</value>
   </data>
+  <data name="Masteriesx2tag_class_stealth_rm" xml:space="preserve">
+    <value>Rogue-Runes</value>
+  </data>
   <data name="x2tag_class_nature_rm" xml:space="preserve">
     <value>Skinchanger</value>
   </data>
+  <data name="Masteriesx2tag_class_nature_rm" xml:space="preserve">
+    <value>Nature-Runes</value>
+  </data>
   <data name="x2tag_class_spirit_rm" xml:space="preserve">
     <value>Shaman</value>
   </data>
+  <data name="Masteriesx2tag_class_spirit_rm" xml:space="preserve">
+    <value>Spirit-Runes</value>
+  </data>
   <data name="x2tag_class_dream_rm" xml:space="preserve">
     <value>Seidr Worker</value>
   </data>
+  <data name="Masteriesx2tag_class_dream_rm" xml:space="preserve">
+    <value>Dream-Runes</value>
+  </data>
+  <data name="Masteries" xml:space="preserve">
+    <value>Masteries</value>
+  </data>
   <data name="CurrentLevel" xml:space="preserve">
     <value>Level</value>
   </data>