**v3.3.1**

diff --git a/Change_log.txt b/Change_log.txt
index d04e3f8..6398935 100755
--- a/Change_log.txt
+++ b/Change_log.txt
@@ -1,5 +1,6 @@
 **v3.3.1**
 * Fixed: Lightning shield tracking
+* Fixed: Tier6Talent detection

 **v3.3.0**
 * Change: 6.0 compatibility
diff --git a/Ele_GUI.lua b/Ele_GUI.lua
index 8ede23e..ddb71f4 100755
--- a/Ele_GUI.lua
+++ b/Ele_GUI.lua
@@ -185,7 +185,7 @@ function Elementarist:ApplySettings()
 		Elementarist:SetTexture(Elementarist.textureList["int"],"")
 		Elementarist:SetTexture(Elementarist.textureList["misc"],"")
 	end
-	if (ElementaristDB.Layout == Elementarist.EleLayout["1"]) then	-- grow layout
+	if (ElementaristDB.Layout == L.LAYOUT_GROW) then	-- grow layout
 		Elementarist.displayFrame_next:SetPoint("TOPLEFT", 45, -30)
 		Elementarist.displayFrame_next1:SetPoint("TOPLEFT", 55, -10)
 		Elementarist.displayFrame_next2:SetPoint("TOPLEFT", 65, 0)
@@ -196,7 +196,7 @@ function Elementarist:ApplySettings()
 		Elementarist.displayFrame_next2:SetHeight(20)
 		Elementarist.displayFrame_next2:SetWidth(20)
 	end
-	if (ElementaristDB.Layout == Elementarist.EleLayout["2"]) then	-- right to left flow layout
+	if (ElementaristDB.Layout == L.LAYOUT_RIGHTTOLEFT) then	-- right to left flow layout
 		Elementarist.displayFrame_next:SetPoint("TOPLEFT", 0, 0)
 		Elementarist.displayFrame_next1:SetPoint("TOPLEFT", 50, 0)
 		Elementarist.displayFrame_next2:SetPoint("TOPLEFT", 100, 0)
@@ -354,7 +354,7 @@ function Elementarist:CreateConfig()
 	local ThreatWarnBtn = Elementarist:CreateCheckButton(L.CONFIG_THREAT_WARNING, Elementarist.configPanel, ElementaristDB, "ThreatWarning", false)
 	ThreatWarnBtn:SetPoint('TOPLEFT', 10, -258)

-	local EleLayout = Elementarist:CreateDropDownMenu(L.CONFIG_LAYOUT, Elementarist.configPanel, ElementaristDB, "Layout", {{text = Elementarist.EleLayout["1"]}, {text = Elementarist.EleLayout["2"]}},200)
+	local EleLayout = Elementarist:CreateDropDownMenu(L.CONFIG_LAYOUT, Elementarist.configPanel, ElementaristDB, "Layout", {{text = L.LAYOUT_GROW},{text = L.LAYOUT_RIGHTTOLEFT}}, 200)
 	EleLayout:SetPoint('TOPLEFT', 10, -288)

 	local ResetBtn = Elementarist:CreateButton(L.CONFIG_RESET_POSITIONS, Elementarist.configPanel)
diff --git a/Elementarist.lua b/Elementarist.lua
index ff820e8..c5982e5 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -67,7 +67,7 @@ Elementarist.SpellList = {
 	["Searing Totem"] = GetSpellInfo(3599),
 	["Magma Totem"] = GetSpellInfo(8190),
 	["Lightning Shield"] = GetSpellInfo(324),
-	["Unleash Elements"] = GetSpellInfo(73680),
+	["Unleash Flame"] = GetSpellInfo(73683),
 	["Earthquake"] = GetSpellInfo(61882),
 	["Elemental Blast"] = GetSpellInfo(117014),
 	["Ascendance"] = GetSpellInfo(114049),
diff --git a/modules/elemental.lua b/modules/elemental.lua
index 4ae669c..5901df2 100755
--- a/modules/elemental.lua
+++ b/modules/elemental.lua
@@ -97,7 +97,17 @@ Elementarist.elemental = {
 				timeshift = timeshift + Elementarist.lastBaseGCD
 			end
 		end
-
+
+		-- if Tier6 talent is Unleashed Fury Unleash Flame
+		if (Elementarist.tier6Talent == 21773) then
+			if (exspell1 ~= Elementarist.SpellList["Unleash Flame"]) and (exspell2 ~= Elementarist.SpellList["Unleash Flame"]) then
+				e = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Unleash Flame"])
+				if (e-timeshift <= 0) then
+					return Elementarist.SpellList["Unleash Flame"];
+				end
+			end
+		end
+
 		-- check if Flame shock applied on target first
 		name, _, _, _, _, _, fsExpiration, unitCaster = Elementarist:hasDeBuff("target", Elementarist.SpellList["Flame Shock"], "player");
 		if (not fsExpiration) then
@@ -131,17 +141,6 @@ Elementarist.elemental = {
 			end
 		end

-		-- if Tier6 talent is Unleashed Fury Unleash Elements
-		if (Elementarist.tier6Talent == 16) then
-			name, _, _, _, _, _, e, unitCaster = Elementarist:hasDeBuff("target", Elementarist.SpellList["Unleashed Fury"], "player");
-			if (name == nil) or (e - GetTime() - timeshift) then
-				e = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Unleash Elements"])
-				if (e-timeshift <= 0) then
-					return Elementarist.SpellList["Unleash Elements"];
-				end
-			end
-		end
-
 		-- Lava Burst if not on Cooldown
 		local ascendance, _, _, _, _, _, ascendanceExp = Elementarist:hasBuff("player",Elementarist.SpellList["AscendanceElementalBuff"]);
 		if (ascendance == nil) then
@@ -169,7 +168,7 @@ Elementarist.elemental = {
 		end

 		-- if Tier6 talent is Elemental Blast use it
-		if (Elementarist.tier6Talent == 18) then
+		if (Elementarist.tier6Talent == 19267) then
 			if (
 				(exspell1 ~= Elementarist.SpellList["Elemental Blast"]) and
 				(exspell2 ~= Elementarist.SpellList["Elemental Blast"]) and