diff --git a/Core/Tags.lua b/Core/Tags.lua
index 932accb539edc4133914a1d13975c40ffb1bd97b..bd23b0adf78c66da390fa962d0666c831d40d76a 100644
--- a/Core/Tags.lua
+++ b/Core/Tags.lua
@@ -71,7 +71,7 @@ end
 
 for textFormat in pairs(formattedTextStyles) do
 	local tagTextFormat = strlower(gsub(textFormat, '_', '-'))
-	ElvUF.Tags.Events[format('rayui-health:%s', tagTextFormat)] = 'UNIT_HEALTH_FREQUENT UNIT_MAXHEALTH UNIT_CONNECTION PLAYER_FLAGS_CHANGED'
+	ElvUF.Tags.Events[format('rayui-health:%s', tagTextFormat)] = 'UNIT_HEALTH UNIT_MAXHEALTH UNIT_CONNECTION PLAYER_FLAGS_CHANGED'
 	ElvUF.Tags.Methods[format('rayui-health:%s', tagTextFormat)] = function(unit)
 		local status = UnitIsDead(unit) and L["Dead"] or UnitIsGhost(unit) and L["Ghost"] or not UnitIsConnected(unit) and L["Offline"]
 		if (status) then
@@ -81,7 +81,7 @@ for textFormat in pairs(formattedTextStyles) do
 		end
 	end
 
-	ElvUF.Tags.Events[format('rayui-health:%s-nostatus', tagTextFormat)] = 'UNIT_HEALTH_FREQUENT UNIT_MAXHEALTH'
+	ElvUF.Tags.Events[format('rayui-health:%s-nostatus', tagTextFormat)] = 'UNIT_HEALTH UNIT_MAXHEALTH'
 	ElvUF.Tags.Methods[format('rayui-health:%s-nostatus', tagTextFormat)] = function(unit)
 		return GetFormattedText(textFormat, UnitHealth(unit), UnitHealthMax(unit))
 	end
@@ -96,7 +96,7 @@ for textFormat in pairs(formattedTextStyles) do
 end
 
 for _, textFormat in pairs({"veryshort", "short", "medium", "long"}) do
-	ElvUF.Tags.Events[format('rayui-health:deficit:name-%s', textFormat)] = 'UNIT_HEALTH_FREQUENT UNIT_MAXHEALTH UNIT_CONNECTION PLAYER_FLAGS_CHANGED UNIT_NAME_UPDATE'
+	ElvUF.Tags.Events[format('rayui-health:deficit:name-%s', textFormat)] = 'UNIT_HEALTH UNIT_MAXHEALTH UNIT_CONNECTION PLAYER_FLAGS_CHANGED UNIT_NAME_UPDATE'
 	ElvUF.Tags.Methods[format('rayui-health:deficit:name-%s', textFormat)] = function(unit)
 		local status = UnitIsDead(unit) and L["Dead"] or UnitIsGhost(unit) and L["Ghost"] or not UnitIsConnected(unit) and L["Offline"]
 		if (status) then
@@ -114,7 +114,7 @@ for _, textFormat in pairs({"veryshort", "short", "medium", "long"}) do
 		end
 	end
 
-	ElvUF.Tags.Events[format('rayui-health:deficit-nostatus:name-%s', textFormat)] = 'UNIT_HEALTH_FREQUENT UNIT_MAXHEALTH UNIT_NAME_UPDATE'
+	ElvUF.Tags.Events[format('rayui-health:deficit-nostatus:name-%s', textFormat)] = 'UNIT_HEALTH UNIT_MAXHEALTH UNIT_NAME_UPDATE'
 	ElvUF.Tags.Methods[format('rayui-health:deficit-nostatus:name-%s', textFormat)] = function(unit)
 		local cur = UnitHealth(unit)
 		local max = UnitHealthMax(unit)
diff --git a/ElvUI_RayUI.toc b/ElvUI_RayUI.toc
index 5e6024087f99ec52aad12c68939d00a3ab008f75..0d3fcd6112dcc70be7ad0ad38eddb8a8ef486159 100644
--- a/ElvUI_RayUI.toc
+++ b/ElvUI_RayUI.toc
@@ -1,6 +1,6 @@
-## Interface: 80300
+## Interface: 90001
 ## Author: fgprodigal
-## Version: 1.13
+## Version: 2.00
 ## Title: |cff1784d1ElvUI|r |cff7aa6d6Ray|r|cffff0000U|r|cff7aa6d6I|r
 ## RequiredDeps: ElvUI, ElvUI_MerathilisUI
 ## DefaultState: Enabled
@@ -8,7 +8,7 @@
 ## SavedVariablesPerCharacter: RayUIDataPerChar
 ## OptionalDeps: SharedMedia, AddOnSkins, ProjectAzilroka
 ## X-Credits: Benik, Blazeflack, Azilroka, Simpy, NihilisticPandemonium, Darth Predator, Merathilis, siweia, Solor, Elv & all AddOn Authors who inspired me.
-## X-ElvVersion: 11.46
+## X-ElvVersion: 12.00
 
 ## X-Curse-Project-ID: 349794
 
diff --git a/Layout/Layout.lua b/Layout/Layout.lua
index 05c44e2223d20eafd2ee0f0b712288c7519cea82..3bae90ac42ae18fb3129aa5bfd227be0fc24249e 100644
--- a/Layout/Layout.lua
+++ b/Layout/Layout.lua
@@ -1,6 +1,6 @@
 local RayUI, E, L, V, P, G = unpack(select(2, ...))
 local MER = ElvUI_MerathilisUI[1]
-local MERL = MER:GetModule("mUILayout")
+local MERL = MER:GetModule("MER_Layout")
 local module = RayUI:NewModule("RayUILayout", "AceHook-3.0", "AceEvent-3.0")
 local AB = E:GetModule("ActionBars")
 local CH = E:GetModule("Chat")
diff --git a/Modules/FreeMountCD/FreeMountCD.lua b/Modules/FreeMountCD/FreeMountCD.lua
index 2c7b4f541b9d27ee85ebecde9aae24507d3fdf46..5a2b26ba4cf79b5c1575cab8796af169f3fb6d2c 100644
--- a/Modules/FreeMountCD/FreeMountCD.lua
+++ b/Modules/FreeMountCD/FreeMountCD.lua
@@ -345,7 +345,7 @@ function FMC:CreateButton(parent, width, height, point, relativeto, point2, xOfs
 end
 
 function FMC:CreateMenu()
-    self.MainPanel = CreateFrame("Frame", nil, E.UIParent)
+    self.MainPanel = CreateFrame("Frame", nil, E.UIParent, 'BackdropTemplate')
 	self.MainPanel:SetTemplate('Transparent')
 	self.MainPanel:Width(120)
 	self.MainPanel:Height(260)