diff --git a/Modules/CastBars/_Focus.lua b/Modules/CastBars/_Focus.lua
index 07381b2..6815bf2 100755
--- a/Modules/CastBars/_Focus.lua
+++ b/Modules/CastBars/_Focus.lua
@@ -17,28 +17,24 @@ function Module:OnEnable()
     end
 
     FocusFrameSpellBar:HookScript("OnEvent", function(self, event)
-        if (event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED") then
-            self:SetStatusBarColor(self.failedCastColor.r, self.failedCastColor.g, self.failedCastColor.b)
+        local _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
+        local _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
+
+        if (notInterruptibleCast) then
+            self:SetStatusBarColor(.7, .7, .7)
+        elseif (notInterruptibleChannel) then
+            self:SetStatusBarColor(.7, .7, .7)
         else
-            local _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
-            local _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
+            local color
+            local isChannel = UnitChannelInfo(self.unit);
 
-            if (notInterruptibleCast) then
-                self:SetStatusBarColor(.7, .7, .7)
-            elseif (notInterruptibleChannel) then
-                self:SetStatusBarColor(.7, .7, .7)
+            if (isChannel) then
+                color = self.startChannelColor
             else
-                local color
-                local isChannel = UnitChannelInfo(self.unit);
-
-                if (isChannel) then
-                    color = self.startChannelColor
-                else
-                    color = self.startCastColor
-                end
-
-                self:SetStatusBarColor(color.r, color.g, color.b)
+                color = self.startCastColor
             end
+
+            self:SetStatusBarColor(color.r, color.g, color.b)
         end
     end)
 
diff --git a/Modules/CastBars/_Player.lua b/Modules/CastBars/_Player.lua
index 889294a..c4ae7e2 100755
--- a/Modules/CastBars/_Player.lua
+++ b/Modules/CastBars/_Player.lua
@@ -12,28 +12,24 @@ function Module:OnEnable()
     end
 
     CastingBarFrame:HookScript("OnEvent", function(self, event)
-        if (event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED") then
-            self:SetStatusBarColor(self.failedCastColor.r, self.failedCastColor.g, self.failedCastColor.b)
+        local _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo("player")
+        local _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo("player")
+
+        if (notInterruptibleCast) then
+            self:SetStatusBarColor(.7, .7, .7)
+        elseif (notInterruptibleChannel) then
+            self:SetStatusBarColor(.7, .7, .7)
         else
-            local _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo("player")
-            local _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo("player")
-    
-            if (notInterruptibleCast) then
-                self:SetStatusBarColor(.7, .7, .7)
-            elseif (notInterruptibleChannel) then
-                self:SetStatusBarColor(.7, .7, .7)
+            local color
+            local isChannel = UnitChannelInfo("player");
+
+            if (isChannel) then
+                color = self.startChannelColor
             else
-                local color
-                local isChannel = UnitChannelInfo("player");
-    
-                if (isChannel) then
-                    color = self.startChannelColor
-                else
-                    color = self.startCastColor
-                end
-    
-                self:SetStatusBarColor(color.r, color.g, color.b)
+                color = self.startCastColor
             end
+
+            self:SetStatusBarColor(color.r, color.g, color.b)
         end
     end)
 
diff --git a/Modules/CastBars/_Target.lua b/Modules/CastBars/_Target.lua
index 6b39cc3..f37bdec 100755
--- a/Modules/CastBars/_Target.lua
+++ b/Modules/CastBars/_Target.lua
@@ -14,29 +14,25 @@ function Module:OnEnable()
         TargetFrameSpellBar.Border:SetVertexColor(unpack(SUI:Color(0.15)))
     end
 
-    TargetFrameSpellBar:HookScript("OnEvent", function(self, event)
-        if (event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED") then
-            self:SetStatusBarColor(self.failedCastColor.r, self.failedCastColor.g, self.failedCastColor.b)
+    TargetFrameSpellBar:HookScript("OnEvent", function(self, event, unit)
+        local _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
+        local _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
+
+        if (notInterruptibleCast) then
+            self:SetStatusBarColor(.7, .7, .7)
+        elseif (notInterruptibleChannel) then
+            self:SetStatusBarColor(.7, .7, .7)
         else
-            local _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
-            local _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
+            local color
+            local isChannel = UnitChannelInfo(self.unit);
 
-            if (notInterruptibleCast) then
-                self:SetStatusBarColor(.7, .7, .7)
-            elseif (notInterruptibleChannel) then
-                self:SetStatusBarColor(.7, .7, .7)
+            if (isChannel) then
+                color = self.startChannelColor
             else
-                local color
-                local isChannel = UnitChannelInfo(self.unit);
-
-                if (isChannel) then
-                    color = self.startChannelColor
-                else
-                    color = self.startCastColor
-                end
-
-                self:SetStatusBarColor(color.r, color.g, color.b)
+                color = self.startCastColor
             end
+
+            self:SetStatusBarColor(color.r, color.g, color.b)
         end
     end)
     
diff --git a/Modules/Skins/Blizzard/_quest.lua b/Modules/Skins/Blizzard/_quest.lua
index 8731f38..21277f4 100755
--- a/Modules/Skins/Blizzard/_quest.lua
+++ b/Modules/Skins/Blizzard/_quest.lua
@@ -21,6 +21,7 @@ function Module:OnEnable()
         SUI:Skin(QuestFrameGoodbyeButton)
         SUI:Skin(QuestFrameCompleteQuestButton)
         SUI:Skin(QuestFrameCancelButton)
+        SUI:Skin(QuestFrameGreetingPanel)
 
         if not QuestFrameDetailPanel.ParchmentFrame then
             QuestFrameDetailPanel.ParchmentFrame = QuestFrameDetailPanel:CreateTexture(nil, "OVERLAY", nil, 1)
diff --git a/SUI.toc b/SUI.toc
index 1e418b8..6920991 100755
--- a/SUI.toc
+++ b/SUI.toc
@@ -1,6 +1,6 @@
 ## Interface: 40400
 ## Author: Syiana & Muleyo
-## Version: 4.4.18
+## Version: 4.4.19
 ## Title: |cffff00d5S|r|cff027bffUI|r
 ## Notes: Made with <3 by Syiana & Muleyo
 ## SavedVariables: SUIDB