diff --git a/REFlex.lua b/REFlex.lua
index 6362120..abceaa6 100644
--- a/REFlex.lua
+++ b/REFlex.lua
@@ -11,47 +11,47 @@ local TOAST = LibStub("LibToast-1.0")
 local QTIP = LibStub("LibQTip-1.0")
 local DUMP = LibStub("LibTextDump-1.0")
 
-local tinsert = table.insert
-local mfloor = math.floor
-local time, date, pairs, select, print, tonumber, hooksecurefunc, strsplit, tostring = time, date, pairs, select, print, tonumber, hooksecurefunc, strsplit, tostring
-local PanelTemplates_GetSelectedTab, PanelTemplates_SetTab, PanelTemplates_SetNumTabs = PanelTemplates_GetSelectedTab, PanelTemplates_SetTab, PanelTemplates_SetNumTabs
-local StaticPopup_Show = StaticPopup_Show
-local IsAltKeyDown = IsAltKeyDown
-local IsControlKeyDown = IsControlKeyDown
-local IsShiftKeyDown = IsShiftKeyDown
-local IsInInstance = IsInInstance
-local IsInGuild = IsInGuild
-local IsActiveBattlefieldArena = IsActiveBattlefieldArena
-local IsInBrawl = C_PvP.IsInBrawl
-local IsWargame = IsWargame
-local IsArenaSkirmish = IsArenaSkirmish
-local IsRatedBattleground = IsRatedBattleground
-local GetNumSpecializations = GetNumSpecializations
-local GetSpecializationInfo = GetSpecializationInfo
-local GetPersonalRatedInfo = GetPersonalRatedInfo
-local GetBattlefieldWinner = GetBattlefieldWinner
-local GetBattlefieldScore = GetBattlefieldScore
-local GetBattlefieldTeamInfo = GetBattlefieldTeamInfo
-local GetBattlefieldStatData = GetBattlefieldStatData
-local GetInstanceInfo = GetInstanceInfo
-local GetBattlefieldArenaFaction = GetBattlefieldArenaFaction
-local GetNumBattlefieldScores = GetNumBattlefieldScores
-local GetNumBattlefieldStats = GetNumBattlefieldStats
-local GetBattlefieldInstanceRunTime = GetBattlefieldInstanceRunTime
-local GetCurrentArenaSeason = GetCurrentArenaSeason
-local GetServerTime = GetServerTime
-local GetCVar = GetCVar
-local UnitName = UnitName
-local UnitFactionGroup = UnitFactionGroup
-local CalendarGetDate = CalendarGetDate
-local UIParentLoadAddOn = UIParentLoadAddOn
-local RegisterAddonMessagePrefix = RegisterAddonMessagePrefix
-local SendAddonMessage = SendAddonMessage
-local RequestRatedInfo = RequestRatedInfo
-local InterfaceOptionsFrame_OpenToCategory = InterfaceOptionsFrame_OpenToCategory
-local TimerAfter = C_Timer.After
-
-RE.Version = 235
+local tinsert = _G.table.insert
+local mfloor = _G.math.floor
+local time, date, pairs, select, print, tonumber, hooksecurefunc, strsplit, tostring = _G.time, _G.date, _G.pairs, _G.select, _G.print, _G.tonumber, _G.hooksecurefunc, _G.strsplit, _G.tostring
+local PanelTemplates_GetSelectedTab, PanelTemplates_SetTab, PanelTemplates_SetNumTabs = _G.PanelTemplates_GetSelectedTab, _G.PanelTemplates_SetTab, _G.PanelTemplates_SetNumTabs
+local StaticPopup_Show = _G.StaticPopup_Show
+local IsAltKeyDown = _G.IsAltKeyDown
+local IsControlKeyDown = _G.IsControlKeyDown
+local IsShiftKeyDown = _G.IsShiftKeyDown
+local IsInInstance = _G.IsInInstance
+local IsInGuild = _G.IsInGuild
+local IsActiveBattlefieldArena = _G.IsActiveBattlefieldArena
+local IsInBrawl = _G.C_PvP.IsInBrawl
+local IsWargame = _G.IsWargame
+local IsArenaSkirmish = _G.IsArenaSkirmish
+local IsRatedBattleground = _G.IsRatedBattleground
+local GetNumSpecializations = _G.GetNumSpecializations
+local GetSpecializationInfo = _G.GetSpecializationInfo
+local GetPersonalRatedInfo = _G.GetPersonalRatedInfo
+local GetBattlefieldWinner = _G.GetBattlefieldWinner
+local GetBattlefieldScore = _G.GetBattlefieldScore
+local GetBattlefieldTeamInfo = _G.GetBattlefieldTeamInfo
+local GetBattlefieldStatData = _G.GetBattlefieldStatData
+local GetInstanceInfo = _G.GetInstanceInfo
+local GetBattlefieldArenaFaction = _G.GetBattlefieldArenaFaction
+local GetNumBattlefieldScores = _G.GetNumBattlefieldScores
+local GetNumBattlefieldStats = _G.GetNumBattlefieldStats
+local GetBattlefieldInstanceRunTime = _G.GetBattlefieldInstanceRunTime
+local GetCurrentArenaSeason = _G.GetCurrentArenaSeason
+local GetServerTime = _G.GetServerTime
+local GetCVar = _G.GetCVar
+local UnitName = _G.UnitName
+local UnitFactionGroup = _G.UnitFactionGroup
+local CalendarGetDate = _G.CalendarGetDate
+local UIParentLoadAddOn = _G.UIParentLoadAddOn
+local RegisterAddonMessagePrefix = _G.RegisterAddonMessagePrefix
+local SendAddonMessage = _G.SendAddonMessage
+local RequestRatedInfo = _G.RequestRatedInfo
+local InterfaceOptionsFrame_OpenToCategory = _G.InterfaceOptionsFrame_OpenToCategory
+local TimerAfter = _G.C_Timer.After
+
+RE.Version = 236
 RE.FoundNewVersion = false
 
 RE.DataSaved = false
diff --git a/REFlex.toc b/REFlex.toc
index 5e64329..453cbc1 100644
--- a/REFlex.toc
+++ b/REFlex.toc
@@ -1,7 +1,7 @@
 ## Interface: 70300
 ## Title: |cFF74D06CRE|rFlex
 ## Notes: Collect statistics of played arena matches and battlegrounds.
-## Version: 2.3.5
+## Version: 2.3.6
 ## Author: AcidWeb
 ## SavedVariablesPerCharacter: REFlexSettings, REFlexDatabase
 
diff --git a/REFlexFunctions.lua b/REFlexFunctions.lua
index 4cf7927..b014ecf 100644
--- a/REFlexFunctions.lua
+++ b/REFlexFunctions.lua
@@ -2,16 +2,16 @@ local _G = _G
 local RE = REFlexNamespace
 local BR = LibStub("LibBabble-Race-3.0"):GetReverseLookupTable()
 
-local tinsert, tsort, tconcat, tremove = table.insert, table.sort, table.concat, table.remove
-local mfloor = math.floor
-local sgsub, sbyte = string.gsub, string.byte
-local strsplit, date, select, tostring, PlaySound, time = strsplit, date, select, tostring, PlaySound, time
-local GetAchievementCriteriaInfo = GetAchievementCriteriaInfo
-local GetServerTime = GetServerTime
-local GetPrestigeInfo = GetPrestigeInfo
-local PanelTemplates_GetSelectedTab = PanelTemplates_GetSelectedTab
-local StaticPopup_Hide = StaticPopup_Hide
-local CLASS_ICON_TCOORDS, RAID_CLASS_COLORS = CLASS_ICON_TCOORDS, RAID_CLASS_COLORS
+--GLOBALS: CLASS_ICON_TCOORDS, RAID_CLASS_COLORS
+local tinsert, tsort, tconcat, tremove = _G.table.insert, _G.table.sort, _G.table.concat, _G.table.remove
+local mfloor = _G.math.floor
+local sgsub, sbyte = _G.string.gsub, _G.string.byte
+local strsplit, date, select, tostring, PlaySound, time = _G.strsplit, _G.date, _G.select, _G.tostring, _G.PlaySound, _G.time
+local GetAchievementCriteriaInfo = _G.GetAchievementCriteriaInfo
+local GetServerTime = _G.GetServerTime
+local GetPrestigeInfo = _G.GetPrestigeInfo
+local PanelTemplates_GetSelectedTab = _G.PanelTemplates_GetSelectedTab
+local StaticPopup_Hide = _G.StaticPopup_Hide
 
 function RE:GetPlayerData(databaseID)
 	return RE.Database[databaseID].Players[RE.Database[databaseID].PlayerNum]
diff --git a/REFlexStructures.lua b/REFlexStructures.lua
index 5246fcf..84d54d0 100644
--- a/REFlexStructures.lua
+++ b/REFlexStructures.lua
@@ -2,11 +2,11 @@ local _G = _G
 local RE = REFlexNamespace
 local L = LibStub("AceLocale-3.0"):GetLocale("REFlex")
 
-local GetRealZoneText = GetRealZoneText
-local GetClassInfoByID = GetClassInfoByID
-local GetNumSpecializationsForClassID = GetNumSpecializationsForClassID
-local GetSpecializationInfoForClassID = GetSpecializationInfoForClassID
-local ReloadUI = ReloadUI
+local GetRealZoneText = _G.GetRealZoneText
+local GetClassInfoByID = _G.GetClassInfoByID
+local GetNumSpecializationsForClassID = _G.GetNumSpecializationsForClassID
+local GetSpecializationInfoForClassID = _G.GetSpecializationInfoForClassID
+local ReloadUI = _G.ReloadUI
 
 RE.DefaultConfig = {
 	["MiniMapButtonSettings"] = {["hide"] = false},