diff --git a/ElvUI.lua b/ElvUI.lua
index 1baf55b..45fa9f7 100644
--- a/ElvUI.lua
+++ b/ElvUI.lua
@@ -22,7 +22,7 @@ function AS:REFlex()
     AS:SkinTab(_G["REFlexFrameTab"..i])
   end
   _G.REFlexFrame_Title:SetPoint("TOP", 0, -10)
-  _G.REFlexFrame_HKBar:SetPoint("BOTTOM", 0, 19)
+  _G.REFlexFrame_HKBar:SetPoint("BOTTOM", 0, 18)
 end
 
 AS:RegisterSkin("REFlex", AS.REFlex)
diff --git a/REFlex.lua b/REFlex.lua
index 40ebda7..80e15c0 100644
--- a/REFlex.lua
+++ b/REFlex.lua
@@ -105,7 +105,7 @@ local RegisterAddonMessagePrefix = _G.C_ChatInfo.RegisterAddonMessagePrefix
 local SendAddonMessage = _G.C_ChatInfo.SendAddonMessage
 local ElvUI = _G.ElvUI
 
-RE.Version = 264
+RE.Version = 265
 RE.LastSquash = 1531828800
 RE.FoundNewVersion = false
 
@@ -905,14 +905,8 @@ function RE:PVPEnd()
 	RE.MatchData.isBrawl = IsInBrawl()
 	RE.MatchData.Version = RE.Version
 
-	if RE.MatchData.Map == 968 then
-		RE.MatchData.Map = 566
-	end
-	if RE.MatchData.Map == 1035 then
-		RE.MatchData.Map = 998
-	end
-	if RE.MatchData.Map == 1681 then
-		RE.MatchData.Map = 529
+	if RE.MapIDRemap[RE.MatchData.Map] then
+		RE.MatchData.Map = RE.MapIDRemap[RE.MatchData.Map]
 	end
 
 	if (IsRatedBattleground() and not IsWargame()) or (RE.MatchData.isArena and not IsArenaSkirmish()) then
diff --git a/REFlex.toc b/REFlex.toc
index 919a1e8..f498ff3 100644
--- a/REFlex.toc
+++ b/REFlex.toc
@@ -1,7 +1,7 @@
 ## Interface: 80100
 ## Title: |cFF74D06CRE|rFlex
 ## Notes: Collect statistics of played arena matches and battlegrounds.
-## Version: 2.6.4
+## Version: 2.6.5
 ## Author: AcidWeb
 ## SavedVariablesPerCharacter: REFlexSettings, REFlexDatabase, REFlexHonorDatabase
 ## X-Website: https://www.curseforge.com/wow/addons/reflex-battleground-historian
diff --git a/REFlexStructures.lua b/REFlexStructures.lua
index 31fadbd..e551ac8 100644
--- a/REFlexStructures.lua
+++ b/REFlexStructures.lua
@@ -23,7 +23,7 @@ RE.DefaultConfig = {
 
 RE.MapList = {
 	[30] = GetRealZoneText(30),
-	[529] = GetRealZoneText(529),
+	[2107] = GetRealZoneText(2107),
 	[1691] = GetRealZoneText(1691),
 	[1105] = GetRealZoneText(1105),
 	[566] = GetRealZoneText(566),
@@ -31,13 +31,13 @@ RE.MapList = {
 	[628] = GetRealZoneText(628),
 	[727] = GetRealZoneText(727),
 	[607] = GetRealZoneText(607),
-	[998] = GetRealZoneText(998),
-	[1035] = GetRealZoneText(998),
+	[1035] = GetRealZoneText(1035),
 	[761] = GetRealZoneText(761),
 	[726] = GetRealZoneText(726),
-	[489] = GetRealZoneText(489),
+	[2106] = GetRealZoneText(2106),
 	[1280] = GetRealZoneText(1280),
 	[1803] = GetRealZoneText(1803),
+	[2118] = GetRealZoneText(2118),
 	[1552] = RE:GetShortMapName(GetRealZoneText(1552)),
 	[1504] = RE:GetShortMapName(GetRealZoneText(1504)),
 	[562] = RE:GetShortMapName(GetRealZoneText(1672)),
@@ -55,7 +55,7 @@ RE.MapList = {
 RE.MapListLongBG = {
 	[1] = ALL,
 	[30] = GetRealZoneText(30),
-	[529] = GetRealZoneText(529),
+	[2107] = GetRealZoneText(2107),
 	[1691] = GetRealZoneText(1691),
 	[1105] = GetRealZoneText(1105),
 	[566] = GetRealZoneText(566),
@@ -64,10 +64,11 @@ RE.MapListLongBG = {
 	[727] = GetRealZoneText(727),
 	[607] = GetRealZoneText(607),
 	[1280] = GetRealZoneText(1280),
-	[998] = GetRealZoneText(998),
+	[1035] = GetRealZoneText(1035),
 	[761] = GetRealZoneText(761),
 	[726] = GetRealZoneText(726),
-	[489] = GetRealZoneText(489)
+	[2106] = GetRealZoneText(2106),
+	[2118] = GetRealZoneText(2118),
 }
 
 RE.MapListLongArena = {
@@ -85,7 +86,7 @@ RE.MapListLongArena = {
 }
 
 RE.MapListLongOrderBG = {
-	1, 30, 529, 1691, 1105, 566, 628, 1803, 727, 607, 1280, 998, 761, 726, 489
+	1, 30, 2118, 2107, 1691, 1105, 566, 628, 1803, 727, 607, 1280, 1035, 761, 726, 2106
 }
 
 RE.MapListLongOrderArena = {
@@ -93,13 +94,13 @@ RE.MapListLongOrderArena = {
 }
 
 RE.MapListStat = {
-	[489] = {true, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture", "Interface\\WorldStateFrame\\ColumnIcon-FlagReturn"},
+	[2106] = {true, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture", "Interface\\WorldStateFrame\\ColumnIcon-FlagReturn"},
 	[726] = {true, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture", "Interface\\WorldStateFrame\\ColumnIcon-FlagReturn"},
-	[529] = {true, "Interface\\WorldStateFrame\\ColumnIcon-TowerCapture", "Interface\\WorldStateFrame\\ColumnIcon-TowerDefend"},
+	[2107] = {true, "Interface\\WorldStateFrame\\ColumnIcon-TowerCapture", "Interface\\WorldStateFrame\\ColumnIcon-TowerDefend"},
 	[566] = {false, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture2"},
 	[567] = {true, "Interface\\WorldStateFrame\\ColumnIcon-TowerCapture", "Interface\\WorldStateFrame\\ColumnIcon-TowerDefend", "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture2"},
 	[761] = {true, "Interface\\WorldStateFrame\\ColumnIcon-TowerCapture", "Interface\\WorldStateFrame\\ColumnIcon-TowerDefend"},
-	[998] = {false, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture2", "Interface\\GroupFrame\\UI-Group-MasterLooter"},
+	[1035] = {false, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture2", "Interface\\GroupFrame\\UI-Group-MasterLooter"},
 	[1105] = {true, "Interface\\WorldStateFrame\\ColumnIcon-FlagCapture", "Interface\\WorldStateFrame\\ColumnIcon-FlagReturn", "Interface\\WorldStateFrame\\ColumnIcon-TowerCapture", "Interface\\WorldStateFrame\\ColumnIcon-TowerDefend"},
 	[727] = {false, "Interface\\MINIMAP\\Vehicle-SilvershardMines-MineCart"},
 	[30] = {true, "Interface\\WorldStateFrame\\ColumnIcon-GraveyardCapture", "Interface\\WorldStateFrame\\ColumnIcon-GraveyardDefend", "Interface\\WorldStateFrame\\ColumnIcon-TowerCapture", "Interface\\WorldStateFrame\\ColumnIcon-TowerDefend"},
@@ -129,7 +130,8 @@ RE.RaceIcons = {
 	["Lightforged Draenei"] = {0.5, 0.625, 0, 0.25},
 	["Dark Iron Dwarf"] = {0.125, 0.25, 0, 0.25},
 	["Mag'har Orc"] = {0.375, 0.5, 0.25, 0.5},
-	["Zandalari Troll"] = {0.25, 0.375, 0.25, 0.5}
+	["Zandalari Troll"] = {0.25, 0.375, 0.25, 0.5},
+	["Kul Tiran"] = {0, 0.125, 0, 0.25}
 }
 
 RE.BracketNames = {
@@ -139,6 +141,11 @@ RE.BracketNames = {
 	BATTLEGROUND_10V10
 }
 
+RE.MapIDRemap = {
+	[968] = 566,
+	[1681] = 2107
+}
+
 RE.Roles = {}
 for classID=1, MAX_CLASSES do
 	local _, classTag = GetClassInfo(classID)
diff --git a/REFlexUpdater.lua b/REFlexUpdater.lua
index 663e912..e685403 100644
--- a/REFlexUpdater.lua
+++ b/REFlexUpdater.lua
@@ -36,10 +36,10 @@ end
 
 function RE:UpdateDatabase()
   for i=1, #RE.Database do
-    if RE.Database[i].Version < 260 then
+    if RE.Database[i].Version < 265 then
       if RE.Database[i].Version < 224 then
         if RE.Database[i].Map == 1681 then
-          RE.Database[i].Map = 529
+          RE.Database[i].Map = 2107
           RE.Database[i].isBrawl = true
         else
           RE.Database[i].isBrawl = false
@@ -73,8 +73,19 @@ function RE:UpdateDatabase()
         RE.Database[i].Version = 235
       end
 
-      RE.Database[i].Time = RE.Database[i].Time - (RE.PlayerTimezone * 3600)
-      RE.Database[i].Version = 260
+      if RE.Database[i].Version < 260 then
+        RE.Database[i].Time = RE.Database[i].Time - (RE.PlayerTimezone * 3600)
+        RE.Database[i].Version = 260
+      end
+
+      if RE.Database[i].Map == 489 then
+        RE.Database[i].Map = 2106
+      elseif RE.Database[i].Map == 529 then
+        RE.Database[i].Map = 2107
+      elseif RE.Database[i].Map == 998 then
+        RE.Database[i].Map = 1035
+      end
+      RE.Database[i].Version = 265
     end
   end
 end