diff --git a/Key Information.lua b/Key Information.lua
index 1e6067a..a68cd8e 100644
--- a/Key Information.lua	
+++ b/Key Information.lua	
@@ -59,7 +59,7 @@ function e.CreateKeyLink(mapID, keyLevel)
 	else
 		mapName = e.GetMapName(mapID)
 	end
-	return strformat('|c' .. COLOUR[3] .. '|Hkeystone:158923:%d:%d:%d:%d:%d:%d|h[Keystone: %s (%d)]|h|r', mapID, keyLevel, e.AffixOne(), e.AffixTwo(), e.AffixThree(), e.AffixFour(), mapName, keyLevel):gsub('\124\124', '\124')
+	return strformat('|c' .. COLOUR[3] .. '|Hkeystone:158923:%d:%d:%d:%d:%d:%d|h[%s: %s (%d)]|h|r', mapID, keyLevel, e.AffixOne(), e.AffixTwo(), e.AffixThree(), e.AffixFour(), L['Keystone'], mapName, keyLevel):gsub('\124\124', '\124')
 end
 
 AstralEvents:Register('CHALLENGE_MODE_COMPLETED', function()
diff --git a/Localization/esMX.lua b/Localization/esMX.lua
index c3c2e85..c381913 100644
--- a/Localization/esMX.lua
+++ b/Localization/esMX.lua
@@ -1,26 +1,26 @@
 local L = select(2, ...)[2]('esMX')
 
 -- Default tab names
-L['GUILD'] = GUILD
-L['FRIENDS'] = FRIENDS
-L['PARTY'] = PARTY
-L['RAID'] = RAID
+L['GUILD'] = 'HERMANDAD'
+L['FRIENDS'] = 'AMIGOS'
+L['PARTY'] = 'GRUPO'
+L['RAID'] = 'BANDA'
 
 -- Column Headers
-L['LEVEL'] = LEVEL
-L['DUNGEON'] = DUNGEONS
-L['CHARACTER'] = CHARACTER
+L['LEVEL'] = 'NIVEL'
+L['DUNGEON'] = 'CALABOZOS'
+L['CHARACTER'] = 'PERSONAJE'
 
 -- Subsection Headers
-L['CHARACTERS'] = 'CHARACTERS'
-L['AFFIXES'] = 'AFFIXES'
+L['CHARACTERS'] = 'PERSONAJES'
+L['AFFIXES'] = 'MODIFICADORES'
 
 -- Character Labels
-L['CURRENT_KEY'] = 'CURRENT'
-L['WEEKLY_BEST'] = 'WKLY BEST'
+L['CURRENT_KEY'] = 'ACTUAL'
+L['WEEKLY_BEST'] = 'SEMANAL'
 
-L['CHARACTER_DUNGEON_NOT_RAN'] = 'No mythic+ ran'
-L['CHARACTER_KEY_NOT_FOUND'] = 'No key found'
+L['CHARACTER_DUNGEON_NOT_RAN'] = 'No se ha hecho un calabozo'
+L['CHARACTER_KEY_NOT_FOUND'] = 'No se ha encontrado piedra angular'
 
 
 -- Dropdown menu selections
@@ -31,15 +31,38 @@ L['REQUEST_INVITE'] = REQUEST_INVITE
 L['CANCEL'] = CANCEL
 
 -- Announce messages
-L['ANNOUNCE_NEW_KEY'] = 'Astral Keys: New key %s'
-L['NO_KEY'] = 'No key'
-L['KEYS_RESPOND_ON_NO_KEY'] = 'Respond even if you do not have a key'
+L['REPORT_TO'] = 'Avisar a'
+L['ANNOUNCE_NEW_KEY'] = 'Astral Keys: Nueva piedra angular %s'
+L['NO_KEY'] = 'Sin piedra angular'
+L['KEYS_RESPOND_ON_NO_KEY'] = 'Responder incluso si no posees una piedra angular'
 
 
 -- Search field texts
-L['FILTER_TEXT_DUNGEON'] = 'Filter by dungeon'
-L['FILTER_TEXT_CHARACTER'] = 'Filter by character name'
+L['FILTER_TEXT_DUNGEON'] = 'Filtrar por calabozo'
+L['FILTER_TEXT_CHARACTER'] = 'Filtrar por nombre de personaje'
+
+-- Options headers
+L['GENERAL OPTIONS'] = 'OPCIONES GENERALES'
+L['!keys chat command'] = 'Comando de chat !keys'
+L['SYNC OPTIONS'] = 'OPCIONES DE SINCRONIZACIÓN'
+L['Rank Filter'] = 'Filtro por Rango'
 
 -- Options
-L['!KEYS_DESC'] = 'Respond to !keys command in the following chat channels'
-L['EXPANDED_TOOLTIP'] = 'Show affix description in the tooltip'
\ No newline at end of file
+L['Show offline players'] = 'Mostrar desconectados'
+L['Show Minimap button'] = 'Mostrar botón de minimapa'
+L['Show current key in tooltip'] = 'Mostrar piedra actual en globo'
+L['Display offline below online'] = 'Mostrar desconectados bajo conectados'
+L['Announce new keys to party']  = 'Anunciar nueva piedra a grupo'
+L['Announce new keys to guild'] = 'Anunciar nuevas piedras a la hermandad'
+L['!KEYS_DESC'] = 'Responder al comando !keys en los siguientes canales de chat'
+L['EXPANDED_TOOLTIP'] = 'Mostrar descripción de afijo en el globo de texto'
+L['Sync with friends'] = 'Sincronizar con amigos'
+L['Show other faction'] = 'Mostrar otra facción'
+L['Include these ranks in the guild listing'] = 'Incluir los siguientes rangos en el listado de hermandad'
+
+-- Minimap Button
+L['Left click to toggle main window'] = 'Click izquierdo para alternar ventana principal'
+L['Right Click to toggle options'] = 'Click derecho para alternar opciones'
+
+-- Key string generation
+L['Keystone'] = 'Piedra angular'
\ No newline at end of file
diff --git a/MinimapButton.lua b/MinimapButton.lua
index dcbd57f..eab7296 100644
--- a/MinimapButton.lua
+++ b/MinimapButton.lua
@@ -15,8 +15,8 @@ local astralkeysLDB = LibStub("LibDataBroker-1.1"):NewDataObject("AstralKeys", {
 	end,
 	OnTooltipShow = function(tooltip)
 		tooltip:AddLine("Astral Keys")
-		tooltip:AddLine('Left click to toggle main window')
-		tooltip:AddLine('Right Click to toggle options')
+		tooltip:AddLine(L['Left click to toggle main window'])
+		tooltip:AddLine(L['Right Click to toggle options'])
 	end,
 })