diff --git a/data/localization/es-ES.json b/data/localization/es-ES.json
index fa19e43..050637e 100644
--- a/data/localization/es-ES.json
+++ b/data/localization/es-ES.json
@@ -9,64 +9,64 @@
     "7": "7",
     "8": "8",
     "9": "9",
-    "Restart": "Reanudar",
-    "Pause": "Pausa",
-    "Play": "Jugar",
+    "Restart": "Reiniciar",
+    "Pause": "Pausar",
+    "Play": "Reanudar",
     "Save State": "Guardar Estado",
-    "Load State": "Estado de carga",
-    "Control Settings": "Ajustes de control",
-    "Cheats": "trucos",
-    "Cache Manager": "Administrador de caché",
-    "Export Save File": "Exportar archivo guardado",
-    "Import Save File": "Importar archivo guardado",
-    "Netplay": "Juego de red",
+    "Load State": "Cargar Estado",
+    "Control Settings": "Ajustes de Control",
+    "Cheats": "Trucos",
+    "Cache Manager": "Administrador de Caché",
+    "Export Save File": "Exportar Archivo de Guardado",
+    "Import Save File": "Importar Archivo de Guardado",
+    "Netplay": "Juego en Red",
     "Mute": "Silenciar",
-    "Unmute": "No silenciar",
+    "Unmute": "Activar Sonido",
     "Settings": "Ajustes",
-    "Enter Fullscreen": "Ingrese a pantalla completa",
-    "Exit Fullscreen": "Salir de pantalla completa",
+    "Enter Fullscreen": "Pantalla Completa",
+    "Exit Fullscreen": "Salir de Pantalla Completa",
     "Reset": "Reiniciar",
-    "Clear": "Claro",
-    "Close": "Cerca",
-    "QUICK SAVE STATE": "ESTADO DE GUARDADO RÁPIDO",
-    "QUICK LOAD STATE": "ESTADO DE CARGA RÁPIDA",
-    "CHANGE STATE SLOT": "CAMBIAR ESTADO SLOT",
+    "Clear": "Limpiar",
+    "Close": "Cerrar",
+    "QUICK SAVE STATE": "GUARDADO RÁPIDO DE ESTADO",
+    "QUICK LOAD STATE": "CARGA RÁPIDA DE ESTADO",
+    "CHANGE STATE SLOT": "CAMBIAR RANURA DE ESTADO",
     "FAST FORWARD": "AVANCE RÁPIDO",
     "Player": "Jugador",
-    "Connected Gamepad": "Mando conectado",
-    "Gamepad": "mando",
+    "Connected Gamepad": "Mando Conectado",
+    "Gamepad": "Mando",
     "Keyboard": "Teclado",
-    "Set": "Colocar",
-    "Add Cheat": "Añadir truco",
-    "Create a Room": "Crear una habitación",
-    "Rooms": "Habitaciones",
-    "Start Game": "Empezar juego",
+    "Set": "Guardar",
+    "Add Cheat": "Añadir Truco",
+    "Create a Room": "Crear una Sala",
+    "Rooms": "Salas",
+    "Start Game": "Iniciar juego",
     "Loading...": "Cargando...",
-    "Download Game Core": "Descargar Game Core",
-    "Decompress Game Core": "Descomprimir Game Core",
-    "Download Game Data": "Descargar datos del juego",
-    "Decompress Game Data": "Descomprimir datos del juego",
-    "Shaders": "sombreadores",
+    "Download Game Core": "Descargando Núcleo del Juego",
+    "Decompress Game Core": "Descomprimiendo Núcleo del Juego",
+    "Download Game Data": "Descargando Datos del Juego",
+    "Decompress Game Data": "Descomprimiendo Datos del Juego",
+    "Shaders": "Shaders",
     "Disabled": "Desactivado",
-    "2xScaleHQ": "2xEscalaHQ",
-    "4xScaleHQ": "4xEscalaHQ",
-    "CRT easymode": "modo fácil CRT",
-    "CRT aperture": "Apertura de tubo de rayos catódicos",
-    "CRT geom": "geometría CRT",
+    "2xScaleHQ": "2xScaleHQ",
+    "4xScaleHQ": "4xScaleHQ",
+    "CRT easymode": "CRT easymode",
+    "CRT aperture": "CRT aperture",
+    "CRT geom": "CRT geom",
     "CRT mattias": "CRT mattias",
     "FPS": "FPS",
-    "show": "espectáculo",
-    "hide": "esconder",
-    "Fast Forward Ratio": "Relación de avance rápido",
-    "Fast Forward": "Avance rápido",
+    "show": "mostrar",
+    "hide": "ocultar",
+    "Fast Forward Ratio": "Proporción de Avance Rápido",
+    "Fast Forward": "Avance Rápido",
     "Enabled": "Activado",
-    "Save State Slot": "Guardar ranura de estado",
-    "Save State Location": "Guardar ubicación de estado",
+    "Save State Slot": "Guardar Ranura de Estado",
+    "Save State Location": "Guardar Ubicación de Estado",
     "Download": "Descargar",
-    "Keep in Browser": "Mantener en el navegador",
+    "Keep in Browser": "Mantener en Navegador",
     "Auto": "Auto",
     "NTSC": "NTSC",
-    "PAL": "CAMARADA",
+    "PAL": "PAL",
     "Dendy": "Dendy",
     "8:7 PAR": "8:7 PAR",
     "4:3": "4:3",
@@ -79,95 +79,95 @@
     "Both": "Ambos",
     "SAVED STATE TO SLOT": "ESTADO GUARDADO EN RANURA",
     "LOADED STATE FROM SLOT": "ESTADO CARGADO DESDE LA RANURA",
-    "SET SAVE STATE SLOT TO": "ESTABLECER GUARDAR RANURA DE ESTADO EN",
-    "Network Error": "Error de red",
-    "Submit": "Entregar",
+    "SET SAVE STATE SLOT TO": "ESTABLECER RANURA DE GUARDADO DE ESTADO EN",
+    "Network Error": "Error de Red",
+    "Submit": "Enviar",
     "Description": "Descripción",
     "Code": "Código",
-    "Add Cheat Code": "Agregar código de trucos",
-    "Leave Room": "Dejar la habitación",
+    "Add Cheat Code": "Agregar Código de Trucos",
+    "Leave Room": "Dejar la Sala",
     "Password": "Contraseña",
     "Password (optional)": "Contraseña (opcional)",
-    "Max Players": "Jugadores máximos",
-    "Room Name": "Nombre de la habitación",
+    "Max Players": "Jugadores Máximos",
+    "Room Name": "Nombre de la Sala",
     "Join": "Unirse",
-    "Player Name": "Nombre del jugador",
-    "Set Player Name": "Establecer nombre de jugador",
-    "Left Handed Mode": "Modo para zurdos",
-    "Virtual Gamepad": "Mando virtual",
+    "Player Name": "Nombre del Jugador",
+    "Set Player Name": "Establecer Nombre de Jugador",
+    "Left Handed Mode": "Modo para Zurdos",
+    "Virtual Gamepad": "Mando Virtual",
     "Disk": "Disco",
-    "Press Keyboard": "Oprimá teclado",
+    "Press Keyboard": "Presionar Teclado",
     "INSERT COIN": "INSERTE MONEDA",
     "Remove": "Eliminar",
     "SAVE LOADED FROM BROWSER": "GUARDAR CARGADO DESDE EL NAVEGADOR",
     "SAVE SAVED TO BROWSER": "GUARDAR GUARDADO EN EL NAVEGADOR",
-    "Join the discord": "Únete a la discordia",
+    "Join the discord": "Únete al Discord",
     "View on GitHub": "Ver en GitHub",
-    "Failed to start game": "No se pudo iniciar el juego",
-    "Download Game BIOS": "Descargar BIOS del juego",
-    "Decompress Game BIOS": "Descomprimir BIOS del juego",
-    "Download Game Parent": "Descargar juego para padres",
-    "Decompress Game Parent": "Padre del juego de descompresión",
-    "Download Game Patch": "Descargar el parche del juego",
-    "Decompress Game Patch": "Parche de descompresión del juego",
-    "Download Game State": "Descargar estado del juego",
-    "Check console": "Comprobar consola",
+    "Failed to start game": "Error al iniciar el juego",
+    "Download Game BIOS": "Descargando BIOS del Juego",
+    "Decompress Game BIOS": "Descomprimiendo BIOS del Juego",
+    "Download Game Parent": "Descargando Juego Principal",
+    "Decompress Game Parent": "Descomprimiendo Juego Principal",
+    "Download Game Patch": "Descargando Parche del Juego",
+    "Decompress Game Patch": "Descomprimiendo Parche del Juego",
+    "Download Game State": "Descargando Estado del Juego",
+    "Check console": "Verificar consola",
     "Error for site owner": "Error para el propietario del sitio",
-    "EmulatorJS": "EmuladorJS",
+    "EmulatorJS": "EmulatorJS",
     "Clear All": "Limpiar todo",
-    "Take Screenshot": "Tomar captura de pantalla",
-    "Quick Save": "Guardado rápido",
-    "Quick Load": "Carga rápida",
+    "Take Screenshot": "Tomar Captura de Pantalla",
+    "Quick Save": "Guardado Rápido",
+    "Quick Load": "Carga Rápida",
     "REWIND": "REBOBINAR",
-    "Rewind Enabled (requires restart)": "Rebobinado habilitado (requiere reinicio)",
-    "Rewind Granularity": "Granularidad de rebobinado",
-    "Slow Motion Ratio": "Relación de cámara lenta",
-    "Slow Motion": "Camara lenta",
-    "Home": "Hogar",
-    "EmulatorJS License": "Licencia EmulatorJS",
-    "RetroArch License": "Licencia RetroArch",
-    "SLOW MOTION": "CAMARA LENTA",
+    "Rewind Enabled (requires restart)": "Rebobinado Habilitado (requiere reinicio)",
+    "Rewind Granularity": "Granularidad de Rebobinado",
+    "Slow Motion Ratio": "Proporción de Cámara Lenta",
+    "Slow Motion": "Cámara Lenta",
+    "Home": "Inicio",
+    "EmulatorJS License": "Licencia de EmulatorJS",
+    "RetroArch License": "Licencia de RetroArch",
+    "SLOW MOTION": "CÁMARA LENTA",
     "A": "A",
     "B": "B",
-    "SELECT": "SELECCIONAR",
-    "START": "COMENZAR",
+    "SELECT": "SELECT",
+    "START": "START",
     "UP": "ARRIBA",
     "DOWN": "ABAJO",
     "LEFT": "IZQUIERDA",
-    "RIGHT": "BIEN",
+    "RIGHT": "DERECHA",
     "X": "X",
     "Y": "Y",
     "L": "L",
     "R": "R",
     "Z": "Z",
-    "STICK UP": "PEGARSE",
-    "STICK DOWN": "PEGAR",
-    "STICK LEFT": "PALO IZQUIERDO",
-    "STICK RIGHT": "PEGAR A LA DERECHA",
+    "STICK UP": "STICK ARRIBA",
+    "STICK DOWN": "STICK ABAJO",
+    "STICK LEFT": "STICK IZQUIERDA",
+    "STICK RIGHT": "STICK DERECHA",
     "C-PAD UP": "C-PAD ARRIBA",
     "C-PAD DOWN": "C-PAD ABAJO",
-    "C-PAD LEFT": "C-PAD IZQUIERDO",
-    "C-PAD RIGHT": "C-PAD DERECHO",
+    "C-PAD LEFT": "C-PAD IZQUIERDA",
+    "C-PAD RIGHT": "C-PAD DERECHA",
     "MICROPHONE": "MICRÓFONO",
     "BUTTON 1 / START": "BOTÓN 1 / INICIO",
     "BUTTON 2": "BOTÓN 2",
     "BUTTON": "BOTÓN",
     "LEFT D-PAD UP": "D-PAD IZQUIERDO ARRIBA",
     "LEFT D-PAD DOWN": "D-PAD IZQUIERDO ABAJO",
-    "LEFT D-PAD LEFT": "D-PAD IZQUIERDO IZQUIERDO",
-    "LEFT D-PAD RIGHT": "D-PAD IZQUIERDO DERECHO",
+    "LEFT D-PAD LEFT": "D-PAD IZQUIERDO IZQUIERDA",
+    "LEFT D-PAD RIGHT": "D-PAD IZQUIERDO DERECHA",
     "RIGHT D-PAD UP": "D-PAD DERECHO ARRIBA",
     "RIGHT D-PAD DOWN": "D-PAD DERECHO ABAJO",
     "RIGHT D-PAD LEFT": "D-PAD DERECHO IZQUIERDO",
-    "RIGHT D-PAD RIGHT": "D-PAD DERECHO DERECHO",
+    "RIGHT D-PAD RIGHT": "D-PAD DERECHO DERECHA",
     "C": "C",
     "MODE": "MODO",
     "FIRE": "FUEGO",
-    "RESET": "REINICIAR",
+    "RESET": "RESET",
     "LEFT DIFFICULTY A": "IZQUIERDA DIFICULTAD A",
     "LEFT DIFFICULTY B": "IZQUIERDA DIFICULTAD B",
-    "RIGHT DIFFICULTY A": "CORRECTA DIFICULTAD A",
-    "RIGHT DIFFICULTY B": "CORRECTA DIFICULTAD B",
+    "RIGHT DIFFICULTY A": "DERECHA DIFICULTAD A",
+    "RIGHT DIFFICULTY B": "DERECHA DIFICULTAD B",
     "COLOR": "COLOR",
     "B/W": "B/N",
     "PAUSE": "PAUSA",
@@ -178,48 +178,48 @@
     "R2": "R2",
     "L3": "L3",
     "R3": "R3",
-    "L STICK UP": "L STICK UP",
+    "L STICK UP": "L STICK ARRIBA",
     "L STICK DOWN": "L STICK ABAJO",
-    "L STICK LEFT": "PALO L IZQUIERDO",
-    "L STICK RIGHT": "PALO L DERECHO",
-    "R STICK UP": "R STICK UP",
-    "R STICK DOWN": "PALO R HACIA ABAJO",
-    "R STICK LEFT": "PALANCA R IZQUIERDA",
-    "R STICK RIGHT": "PALANCA R DERECHA",
-    "Start": "Comenzar",
-    "Select": "Seleccionar",
+    "L STICK LEFT": "L STICK IZQUIERDA",
+    "L STICK RIGHT": "L STICK DERECHA",
+    "R STICK UP": "R STICK ARRIBA",
+    "R STICK DOWN": "R STICK ABAJO",
+    "R STICK LEFT": "R STICK IZQUIERDA",
+    "R STICK RIGHT": "R STICK DERECHA",
+    "Start": "Start",
+    "Select": "Select",
     "Fast": "Rápido",
     "Slow": "Lento",
     "a": "a",
     "b": "b",
-    "c": "C",
+    "c": "c",
     "d": "d",
-    "e": "mi",
-    "f": "F",
-    "g": "gramo",
+    "e": "e",
+    "f": "f",
+    "g": "g",
     "h": "h",
     "i": "i",
     "j": "j",
     "k": "k",
-    "l": "yo",
-    "m": "metro",
-    "n": "norte",
+    "l": "l",
+    "m": "m",
+    "n": "n",
     "o": "o",
-    "p": "pag",
+    "p": "p",
     "q": "q",
     "r": "r",
     "s": "s",
     "t": "t",
-    "u": "tu",
+    "u": "u",
     "v": "v",
     "w": "w",
-    "x": "X",
+    "x": "x",
     "y": "y",
     "z": "z",
-    "enter": "ingresar",
-    "escape": "escapar",
+    "enter": "intro",
+    "escape": "escape",
     "space": "espacio",
-    "tab": "pestaña",
+    "tab": "tabulador",
     "backspace": "retroceso",
     "delete": "borrar",
     "arrowup": "flecha arriba",
@@ -238,20 +238,20 @@
     "f10": "f10",
     "f11": "f11",
     "f12": "f12",
-    "shift": "cambio",
+    "shift": "shift",
     "control": "control",
-    "alt": "alternativa",
+    "alt": "alt",
     "meta": "meta",
-    "capslock": "Bloq Mayús",
+    "capslock": "bloq mayús",
     "insert": "insertar",
-    "home": "hogar",
+    "home": "inicio",
     "end": "fin",
     "pageup": "página arriba",
-    "pagedown": "Página abajo",
+    "pagedown": "página abajo",
     "!": "!",
     "@": "@",
     "#": "#",
-    "$": "ps",
+    "$": "$",
     "%": "%",
     "^": "^",
     "&": "&",
@@ -276,24 +276,24 @@
     ">": ">",
     "/": "/",
     "?": "?",
-    "LEFT_STICK_X": "LEFT_STICK_X",
-    "LEFT_STICK_Y": "LEFT_STICK_Y",
-    "RIGHT_STICK_X": "PALO_DERECHO_X",
-    "RIGHT_STICK_Y": "PALO_DERECHO_Y",
-    "LEFT_TRIGGER": "GATILLO IZQUIERDO",
-    "RIGHT_TRIGGER": "DERECHO_TRIGGER",
-    "A_BUTTON": "UN BOTÓN",
-    "B_BUTTON": "B_BOTÓN",
+    "LEFT_STICK_X": "STICK_IZQUIERDO_X",
+    "LEFT_STICK_Y": "STICK_IZQUIERDO_Y",
+    "RIGHT_STICK_X": "STICK_DERECHO_X",
+    "RIGHT_STICK_Y": "STICK_DERECHO_Y",
+    "LEFT_TRIGGER": "GATILLO_IZQUIERDO",
+    "RIGHT_TRIGGER": "GATILLO_DERECHO",
+    "A_BUTTON": "BOTÓN_A",
+    "B_BUTTON": "BOTÓN_B",
     "X_BUTTON": "BOTÓN_X",
-    "Y_BUTTON": "BOTÓN Y_",
-    "START_BUTTON": "BOTÓN DE INICIO",
-    "SELECT_BUTTON": "SELECCIONAR_BOTÓN",
-    "L1_BUTTON": "L1_BOTÓN",
-    "R1_BUTTON": "R1_BOTÓN",
-    "L2_BUTTON": "L2_BOTÓN",
-    "R2_BUTTON": "R2_BOTÓN",
-    "LEFT_THUMB_BUTTON": "LEFT_THUMB_BUTTON",
-    "RIGHT_THUMB_BUTTON": "DERECHO_THUMB_BOTÓN",
+    "Y_BUTTON": "BOTÓN_Y",
+    "START_BUTTON": "BOTÓN_START",
+    "SELECT_BUTTON": "BOTÓN_SELECT",
+    "L1_BUTTON": "BOTÓN_L1",
+    "R1_BUTTON": "BOTÓN_R1",
+    "L2_BUTTON": "BOTÓN_L2",
+    "R2_BUTTON": "BOTÓN_R2",
+    "LEFT_THUMB_BUTTON": "BOTÓN_L3",
+    "RIGHT_THUMB_BUTTON": "BOTÓN_R3",
     "DPAD_UP": "DPAD ARRIBA",
     "DPAD_DOWN": "DPAD_ABAJO",
     "DPAD_LEFT": "DPAD_IZQUIERDA",
diff --git a/data/localization/readme.md b/data/localization/readme.md
index b62d4d8..0234fd1 100644
--- a/data/localization/readme.md
+++ b/data/localization/readme.md
@@ -32,7 +32,7 @@ If the language file is not found or there was an error fetching the file, the e
 
 ## Credits
 
-Translated for `es-ES` by [@cesarcristianodeoliveira](https://github.com/cesarcristianodeoliveira) <br>
+Translated for `es-ES` originally by [@cesarcristianodeoliveira](https://github.com/cesarcristianodeoliveira) and updated by [@angelmarfil](https://github.com/angelmarfil)  <br>
 Translated for `el-GR` by [@imneckro](https://github.com/imneckro) <br>
 Translated for `ja-JA`, `hi-HI`, `ar-AR`, `jv-JV`, `ben-BEN`, `ru-RU`, `de-GER`, `ko-KO`, `af-FR` by [@allancoding](https://github.com/allancoding) <br>
 Translated for `pt-BR` originally by [@allancoding](https://github.com/allancoding) and updated by [@zmarteline](https://github.com/zmarteline)<br>