diff --git a/SmartBuff.lua b/SmartBuff.lua
index 1a41f1f..ebe57fb 100644
--- a/SmartBuff.lua
+++ b/SmartBuff.lua
@@ -472,6 +472,7 @@ function SMARTBUFF_OnLoad(self)
   self:RegisterEvent("UNIT_SPELLCAST_FAILED");
   self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");
   self:RegisterEvent("PLAYER_LEVEL_UP");
+  self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED");
   --auto template events
   self:RegisterEvent("ZONE_CHANGED_NEW_AREA")
   self:RegisterEvent("GROUP_ROSTER_UPDATE")
@@ -708,7 +709,8 @@ function SMARTBUFF_OnEvent(self, event, ...)
   local name, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceID, instanceGroupSize, LfgDungeonID =
   GetInstanceInfo()
   -- Any other event here
-  if event == "ZONE_CHANGED_NEW_AREA" or (event == "GROUP_ROSTER_UPDATE" and instanceType ~= "scenario") or event == PLAYER_LEVEL_UP then
+  if event == "ZONE_CHANGED_NEW_AREA" or (event == "GROUP_ROSTER_UPDATE" and instanceType ~= "scenario") or
+    event == PLAYER_LEVEL_UP or event == PLAYER_SPECIALIZATION_CHANGED then
     SMARTBUFF_SetTemplate()
   end
 end
diff --git a/localization.de.lua b/localization.de.lua
index 2326d91..07db925 100644
--- a/localization.de.lua
+++ b/localization.de.lua
@@ -14,7 +14,7 @@ SMARTBUFF_CREDITS = "|cffffffff"
 ;
 
 -- Weapon types
-SMARTBUFF_WEAPON_STANDARD = {"Dolche", "äxte", "schwerter", "streitkolben", "Stäbe", "Faustwaffen", "Stangenwaffen", "Wurfwaffe"};
+SMARTBUFF_WEAPON_STANDARD = {"Dolche", "äxte", "schwerter", "streitkolben", "Stäbe", "Faustwaffen", "Stangenwaffen", "Wurfwaffe", "Schild"};
 SMARTBUFF_WEAPON_BLUNT = {"streitkolben", "Faustwaffen", "Stäbe"};
 SMARTBUFF_WEAPON_BLUNT_PATTERN = "ewichtsstein$";
 SMARTBUFF_WEAPON_SHARP = {"Dolche", "äxte", "schwerter", "Stangenwaffen"};
diff --git a/localization.en.lua b/localization.en.lua
index 8d26a2a..bbfc3ca 100644
--- a/localization.en.lua
+++ b/localization.en.lua
@@ -43,8 +43,8 @@ SMARTBUFF_UNDEAD    = "Undead";
 SMARTBUFF_CLASSES = {"Druid", "Hunter", "Mage", "Paladin", "Priest", "Rogue", "Shaman", "Warlock", "Warrior", "Death Knight", "Monk", "Demon Hunter", "Evoker", "Hunter Pet", "Warlock Pet", "Death Knight Pet", "Tank", "Healer", "Damage Dealer"};
 
 -- Templates and Instances
-SMARTBUFF_TEMPLATES = {"Solo", "Party", "LFR", "Raid", "Mythic Keystone", "Battleground", "Arena", "Castle Nathria", "Sanctum of Domination", "Sepulcher of the First Ones", "Vault of the Incarnates", "Aberrus, The Shadowed Crucible", "Amirdrassil, the Dream's Hope", "Custom 1", "Custom 2", "Custom 3", "Custom 4", "Custom 5"};
-SMARTBUFF_INSTANCES = {"Castle Nathria", "Sanctum of Domination", "Sepulcher of the First Ones", "Vault of the Incarnates", "Aberrus, the Shadowed Crucible", "Amirdrassil, the Dream's Hope" };
+SMARTBUFF_TEMPLATES = {"Solo", "Party", "LFR", "Raid", "Mythic Keystone", "Battleground", "Arena", "Vault of the Incarnates", "Aberrus, The Shadowed Crucible", "Amirdrassil, the Dream's Hope", "Nerub-ar Palace", "Custom 1", "Custom 2", "Custom 3", "Custom 4", "Custom 5"};
+SMARTBUFF_INSTANCES = {"Vault of the Incarnates", "Aberrus, the Shadowed Crucible", "Amirdrassil, the Dream's Hope", "Nerub-ar Palace"};
 
 -- Mount
 SMARTBUFF_MOUNT = "Increases speed by (%d+)%%.";
diff --git a/localization.es.lua b/localization.es.lua
index dbf2ed5..93aa5e1 100644
--- a/localization.es.lua
+++ b/localization.es.lua
@@ -15,7 +15,7 @@ SMARTBUFF_CREDITS = "|cffffffff"
 ;
 
 -- Weapon types
-SMARTBUFF_WEAPON_STANDARD = {"Dagas", "Hachas", "Espadas", "Mazas", "Bastones", "Armas de pu\195\177o", "Lanzas", "Arma arrojadiza"};
+SMARTBUFF_WEAPON_STANDARD = {"Dagas", "Hachas", "Espadas", "Mazas", "Bastones", "Armas de pu\195\177o", "Lanzas", "Arma arrojadiza", "Escudo"};
 SMARTBUFF_WEAPON_BLUNT = {"Mazas", "Bastones", "Armas de pu\195\177o"};
 SMARTBUFF_WEAPON_BLUNT_PATTERN = "^Contrapeso %a+";
 SMARTBUFF_WEAPON_SHARP = {"Dagas", "Hachas", "Espadas", "Lanzas"};
diff --git a/localization.fr.lua b/localization.fr.lua
index 99b99ac..e9e14ee 100644
--- a/localization.fr.lua
+++ b/localization.fr.lua
@@ -16,7 +16,7 @@ SMARTBUFF_CREDITS = "|cffffffff"
 ;
 
 -- Weapon types
-SMARTBUFF_WEAPON_STANDARD = {"Dagues", "Haches", "Ep\195\169es", "Masses", "B\195\162tons", "Armes de pugilat", "Armes d\'hast", "Armes de jet"};
+SMARTBUFF_WEAPON_STANDARD = {"Dagues", "Haches", "Ep\195\169es", "Masses", "B\195\162tons", "Armes de pugilat", "Armes d\'hast", "Armes de jet", "Bouclier"};
 SMARTBUFF_WEAPON_BLUNT = {"Masses", "B\195\162tons", "Armes de pugilat"};
 SMARTBUFF_WEAPON_BLUNT_PATTERN = "^Pierre de lest ";
 SMARTBUFF_WEAPON_SHARP = {"Dagues", "Haches", "Ep\195\169es", "Armes d\'hast"};
diff --git a/localization.ru.lua b/localization.ru.lua
index 32dd8ed..bb0e737 100644
--- a/localization.ru.lua
+++ b/localization.ru.lua
@@ -14,7 +14,7 @@ SMARTBUFF_CREDITS = "|cffffffff"
 ;
 
 -- Weapon types
-SMARTBUFF_WEAPON_STANDARD = {"Кинжалы", "топоры", "мечи", "дробящее", "Посохи", "Кистевое", "Древковое", "Метательное"};
+SMARTBUFF_WEAPON_STANDARD = {"Кинжалы", "топоры", "мечи", "дробящее", "Посохи", "Кистевое", "Древковое", "Метательное", "Щит"};
 SMARTBUFF_WEAPON_BLUNT = {"дробящее", "Посохи", "Кистевое"};
 SMARTBUFF_WEAPON_BLUNT_PATTERN = "грузик$";
 SMARTBUFF_WEAPON_SHARP = {"Кинжалы", "топоры", "мечи", "Древковое"};
diff --git a/localization.tw.lua b/localization.tw.lua
index 430f85a..87f230d 100644
--- a/localization.tw.lua
+++ b/localization.tw.lua
@@ -15,7 +15,7 @@ SMARTBUFF_CREDITS = "|cffffffff"
 ;
 
 -- Weapon types
-SMARTBUFF_WEAPON_STANDARD = {"匕首", "斧", "劍", "錘", "法杖", "拳套", "長柄武器", "投擲武器"};
+SMARTBUFF_WEAPON_STANDARD = {"匕首", "斧", "劍", "錘", "法杖", "拳套", "長柄武器", "投擲武器", "護盾"};
 SMARTBUFF_WEAPON_BLUNT = {"錘", "法杖", "拳套"};
 SMARTBUFF_WEAPON_BLUNT_PATTERN = "平衡石$";
 SMARTBUFF_WEAPON_SHARP = {"匕首", "斧", "劍", "長柄武器"};