diff --git a/.gitignore b/.gitignore
index e842827e23..bf56ca9a61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ node_modules
 
 .DS_Store
 node_modules
+.yarn
 /dist
 
 /tests/e2e/reports/
diff --git a/src/i18n/de.csv b/src/i18n/de.csv
index 5cbf8d4a88..e4d80429eb 100644
--- a/src/i18n/de.csv
+++ b/src/i18n/de.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Sprache
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,Slowakisch (Slowakei)
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,Slowenisch (Slowenien)
 settingsPanel:osKeyboardLayout:label:keymap_spanish,Katalanisch (Spanien)
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,Spanisch (Dvorak)
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,Spanisch (Lateinamerika)
 settingsPanel:osKeyboardLayout:label:keymap_swedish,Schwedisch (Schweden)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,Schwedisch (Mac ANSI)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,Schwedisch (Mac ISO)
diff --git a/src/i18n/en.csv b/src/i18n/en.csv
index ccd00262a8..7de4d12b1a 100644
--- a/src/i18n/en.csv
+++ b/src/i18n/en.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,Change the language of the user interface
 settingsPanel:language:title,Language
+settingsPanel:legendType:index,Index
 settingsPanel:legendType:keymap,Keymap
 settingsPanel:legendType:matrix,"Matrix (row, col)"
-settingsPanel:legendType:index,Index
 settingsPanel:legendType:size,Size
 settingsPanel:legends:help,Change keycap display
 settingsPanel:legends:title,Legends
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,Slovak (Slovakia)
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,Slovenian (Slovenia)
 settingsPanel:osKeyboardLayout:label:keymap_spanish,Spanish (Spain)
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,Spanish (Dvorak)
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,Spanish (Latin America)
 settingsPanel:osKeyboardLayout:label:keymap_swedish,Swedish (Sweden)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,Swedish (Mac ANSI)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,Swedish (Mac ISO)
diff --git a/src/i18n/es.csv b/src/i18n/es.csv
index ccde9c3fde..bd97263d29 100644
--- a/src/i18n/es.csv
+++ b/src/i18n/es.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Idioma
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -164,8 +164,9 @@ settingsPanel:osKeyboardLayout:label:keymap_serbian,
 settingsPanel:osKeyboardLayout:label:keymap_serbian_latin,
 settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
-settingsPanel:osKeyboardLayout:label:keymap_spanish,
-settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish,Español
+settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,Español (Dvorak)
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,Español (Latinoamérica)
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/fr.csv b/src/i18n/fr.csv
index 7efc02cbe3..1eb1d6c361 100644
--- a/src/i18n/fr.csv
+++ b/src/i18n/fr.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Langue
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,Slovaque (Slovaquie)
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,Slovène (Slovénie)
 settingsPanel:osKeyboardLayout:label:keymap_spanish,Espagnol (Espagne)
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,Espagnol (Dvorak)
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,Espagnol (Amérique latine)
 settingsPanel:osKeyboardLayout:label:keymap_swedish,Suédois (Suède)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,Suédois (Mac ANSI)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,Suédois (Mac ISO)
diff --git a/src/i18n/it.csv b/src/i18n/it.csv
index 92639eb321..7bb0c8b3c8 100644
--- a/src/i18n/it.csv
+++ b/src/i18n/it.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,Cambia lingua dell'interfaccia utente
 settingsPanel:language:title,Lingua
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/ja.csv b/src/i18n/ja.csv
index b745243b58..950d1c3a9f 100644
--- a/src/i18n/ja.csv
+++ b/src/i18n/ja.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,ユーザインタフェースの言語を変更する
 settingsPanel:language:title,言語
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,スペイン語（ラテンアメリカ）
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/keymap_extras/index.js b/src/i18n/keymap_extras/index.js
index 6c260762c7..cb9a1643bd 100644
--- a/src/i18n/keymap_extras/index.js
+++ b/src/i18n/keymap_extras/index.js
@@ -42,6 +42,7 @@ import slovak from './keymap_slovak';
 import slovenian from './keymap_slovenian';
 import spanish from './keymap_spanish';
 import spanish_dvorak from './keymap_spanish_dvorak';
+import spanish_latin_america from './keymap_spanish_latin_america';
 import swedish from './keymap_swedish';
 import swedish_mac_ansi from './keymap_swedish_mac_ansi';
 import swedish_mac_iso from './keymap_swedish_mac_iso';
@@ -467,17 +468,21 @@ export default {
     prefix: 'ES',
     sendstring: 'spanish',
     isANSI: false,
+    locales: ['ca-ES', 'es', 'es-ES', 'eu-ES', 'gl-ES'],
+    keycodeLUT: spanish
+  },
+  keymap_spanish_latin_america: {
+    prefix: 'ES',
+    sendstring: 'spanish_latin_america',
+    isANSI: false,
     locales: [
-      'ca-ES',
-      'es',
+      'es-CO',
       'es-AR',
       'es-BO',
       'es-CL',
-      'es-CO',
       'es-CR',
       'es-DO',
       'es-EC',
-      'es-ES',
       'es-GT',
       'es-HN',
       'es-MX',
@@ -488,11 +493,9 @@ export default {
       'es-PY',
       'es-SV',
       'es-UY',
-      'es-VE',
-      'eu-ES',
-      'gl-ES'
+      'es-VE'
     ],
-    keycodeLUT: spanish
+    keycodeLUT: spanish_latin_america
   },
   keymap_swedish: {
     prefix: 'SE',
diff --git a/src/i18n/keymap_extras/keymap_spanish_latin_america.js b/src/i18n/keymap_extras/keymap_spanish_latin_america.js
new file mode 100644
index 0000000000..03c782787d
--- /dev/null
+++ b/src/i18n/keymap_extras/keymap_spanish_latin_america.js
@@ -0,0 +1,182 @@
+/* Copyright 2024 - Generated by convert_keymap_extras_header.js
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export default {
+  /*
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+   * │ | │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ¿ │       │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+   * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ´ │ + │     │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+   * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ñ │ { │ } │    │
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+   * │    │ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │          │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+   * │    │    │    │                        │    │    │    │    │
+   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+   */
+  // Row 1
+  KC_GRV: { name: '°\n|', title: 'ES_PIPE' },
+  KC_1: { name: '!\n1', title: 'ES_1' },
+  KC_2: { name: '"\n2', title: 'ES_2' },
+  KC_3: { name: '#\n3', title: 'ES_3' },
+  KC_4: { name: '$\n4', title: 'ES_4' },
+  KC_5: { name: '%\n5', title: 'ES_5' },
+  KC_6: { name: '&\n6', title: 'ES_6' },
+  KC_7: { name: '/\n7', title: 'ES_7' },
+  KC_8: { name: '(\n8', title: 'ES_8' },
+  KC_9: { name: ')\n9', title: 'ES_9' },
+  KC_0: { name: '=\n0', title: 'ES_0' },
+  KC_MINS: { name: "?\n'", title: 'ES_QUOT' },
+  KC_EQL: { name: '¡\n¿', title: 'ES_IQUE' },
+  // Row 2
+  KC_Q: { name: 'Q', title: 'ES_Q' },
+  KC_W: { name: 'W', title: 'ES_W' },
+  KC_E: { name: 'E', title: 'ES_E' },
+  KC_R: { name: 'R', title: 'ES_R' },
+  KC_T: { name: 'T', title: 'ES_T' },
+  KC_Y: { name: 'Y', title: 'ES_Y' },
+  KC_U: { name: 'U', title: 'ES_U' },
+  KC_I: { name: 'I', title: 'ES_I' },
+  KC_O: { name: 'O', title: 'ES_O' },
+  KC_P: { name: 'P', title: 'ES_P' },
+  KC_LBRC: { name: '¨\n´', title: 'ES_ACUT (dead)' },
+  KC_RBRC: { name: '*\n+', title: 'ES_PLUS' },
+  // Row 3
+  KC_A: { name: 'A', title: 'ES_A' },
+  KC_S: { name: 'S', title: 'ES_S' },
+  KC_D: { name: 'D', title: 'ES_D' },
+  KC_F: { name: 'F', title: 'ES_F' },
+  KC_G: { name: 'G', title: 'ES_G' },
+  KC_H: { name: 'H', title: 'ES_H' },
+  KC_J: { name: 'J', title: 'ES_J' },
+  KC_K: { name: 'K', title: 'ES_K' },
+  KC_L: { name: 'L', title: 'ES_L' },
+  KC_SCLN: { name: 'Ñ', title: 'ES_NTIL' },
+  KC_QUOT: { name: '[\n{', title: 'ES_LCBR' },
+  KC_NUHS: { name: ']\n}', title: 'ES_RCBR' },
+  // Row 4
+  KC_NUBS: { name: '>\n<', title: 'ES_LABK' },
+  KC_Z: { name: 'Z', title: 'ES_Z' },
+  KC_X: { name: 'X', title: 'ES_X' },
+  KC_C: { name: 'C', title: 'ES_C' },
+  KC_V: { name: 'V', title: 'ES_V' },
+  KC_B: { name: 'B', title: 'ES_B' },
+  KC_N: { name: 'N', title: 'ES_N' },
+  KC_M: { name: 'M', title: 'ES_M' },
+  KC_COMM: { name: ';\n,', title: 'ES_COMM' },
+  KC_DOT: { name: ':\n.', title: 'ES_DOT' },
+  KC_SLSH: { name: '_\n-', title: 'ES_MINS' },
+
+  /* Shifted symbols
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+   * │ ° │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¡ │       │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+   * │     │   │   │   │   │   │   │   │   │   │   │ ¨ │ * │     │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+   * │      │   │   │   │   │   │   │   │   │   │   │ [ │ ] │    │
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+   * │    │ > │   │   │   │   │   │   │   │ ; │ : │ _ │          │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+   * │    │    │    │                        │    │    │    │    │
+   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+   */
+  // Row 1
+  'S(KC_GRV)': { name: '°', title: 'ES_MORD' },
+  KC_TILD: { name: '°', title: 'ES_MORD' },
+  'S(KC_1)': { name: '!', title: 'ES_EXLM' },
+  KC_EXLM: { name: '!', title: 'ES_EXLM' },
+  'S(KC_2)': { name: '"', title: 'ES_DQUO' },
+  KC_AT: { name: '"', title: 'ES_DQUO' },
+  'S(KC_3)': { name: '#', title: 'ES_NUMB' },
+  KC_HASH: { name: '#', title: 'ES_NUMB' },
+  'S(KC_4)': { name: '$', title: 'ES_DLR' },
+  KC_DLR: { name: '$', title: 'ES_DLR' },
+  'S(KC_5)': { name: '%', title: 'ES_PERC' },
+  KC_PERC: { name: '%', title: 'ES_PERC' },
+  'S(KC_6)': { name: '&', title: 'ES_AMPR' },
+  KC_CIRC: { name: '&', title: 'ES_AMPR' },
+  'S(KC_7)': { name: '/', title: 'ES_SLSH' },
+  KC_AMPR: { name: '/', title: 'ES_SLSH' },
+  'S(KC_8)': { name: '(', title: 'ES_LPRN' },
+  KC_ASTR: { name: '(', title: 'ES_LPRN' },
+  'S(KC_9)': { name: ')', title: 'ES_RPRN' },
+  KC_LPRN: { name: ')', title: 'ES_RPRN' },
+  'S(KC_0)': { name: '=', title: 'ES_EQL' },
+  KC_RPRN: { name: '=', title: 'ES_EQL' },
+  'S(KC_MINS)': { name: '?', title: 'ES_QUES' },
+  KC_UNDS: { name: '?', title: 'ES_QUES' },
+  'S(KC_EQL)': { name: '¡', title: 'ES_IEXL' },
+  KC_PLUS: { name: '¡', title: 'ES_IEXL' },
+  // Row 2
+  'S(KC_LBRC)': { name: '¨', title: 'ES_DIAE (dead)' },
+  KC_LCBR: { name: '¨', title: 'ES_DIAE (dead)' },
+  'S(KC_RBRC)': { name: '*', title: 'ES_ASTR' },
+  KC_RCBR: { name: '*', title: 'ES_ASTR' },
+  // Row 3
+  'S(KC_QUOT)': { name: '[', title: 'ES_LBRC' },
+  KC_DQUO: { name: '[', title: 'ES_LBRC' },
+  // Row 4
+  'S(KC_NUHS)': { name: ']', title: 'ES_RBRC' },
+  'S(KC_NUBS)': { name: '>', title: 'ES_RABK' },
+  'S(KC_COMM)': { name: ';', title: 'ES_SCLN' },
+  KC_LT: { name: ';', title: 'ES_SCLN' },
+  'S(KC_DOT)': { name: ':', title: 'ES_COLN' },
+  KC_GT: { name: ':', title: 'ES_COLN' },
+  'S(KC_SLSH)': { name: '_', title: 'ES_UNDS' },
+  KC_QUES: { name: '_', title: 'ES_UNDS' },
+
+  /* AltGr symbols
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+   * │ ¬ │   │   │   │   │   │   │   │   │   │   │ \ │   │       │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+   * │     │ @ │   │   │   │   │   │   │   │   │   │   │ ~ │     │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+   * │      │   │   │   │   │   │   │   │   │   │   │ ^ │ ` │    │
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+   * │    │   │   │   │   │   │   │   │   │   │   │   │          │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+   * │    │    │    │                        │    │    │    │    │
+   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+   */
+  // Row 1
+  'ALGR(KC_GRV)': { name: '¬', title: 'ES_NOT' },
+  'ALGR(KC_MINS)': { name: '\\', title: 'ES_BSLS' },
+  // Row 2
+  'ALGR(KC_Q)': { name: '@', title: 'ES_AT' },
+  'ALGR(KC_RBRC)': { name: '~', title: 'ES_TILD' },
+  // Row 3
+  'ALGR(KC_QUOT)': { name: '^', title: 'ES_CIRC' },
+  'ALGR(KC_NUHS)': { name: '`', title: 'ES_GRV (dead)' },
+
+  /* Other keys */
+  KC_BSLS: { name: ']\n}', title: '' },
+  'S(KC_BSLS)': { name: ']', title: '' },
+  KC_COLN: { name: 'Ñ', title: 'S(ES_NTIL) (capital Ñ)' },
+  KC_PIPE: { name: ']', title: '' },
+
+  SC_LSPO: { name: 'LS / )', title: 'Left Shift when held, ) when tapped' },
+  SC_RSPC: { name: 'RS / =', title: 'Right Shift when held, = when tapped' },
+  SC_LCPO: { name: 'LC / )', title: 'Left Control when held, ) when tapped' },
+  SC_RCPC: { name: 'RC / =', title: 'Right Control when held, = when tapped' },
+  SC_LAPO: { name: 'LA / )', title: 'Left Alt when held, ) when tapped' },
+  SC_RAPC: { name: 'RA / =', title: 'Right Alt when held, = when tapped' },
+
+  QK_GESC: {
+    name: '|/°\nEsc',
+    title: 'Esc normally, but | when GUI is active or ° when Shift is active'
+  }
+};
diff --git a/src/i18n/ms.csv b/src/i18n/ms.csv
index 756042bd91..fedbfc5970 100644
--- a/src/i18n/ms.csv
+++ b/src/i18n/ms.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Bahasa
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/pl-PL.csv b/src/i18n/pl-PL.csv
index 7330c48576..9b7fb20287 100644
--- a/src/i18n/pl-PL.csv
+++ b/src/i18n/pl-PL.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Język
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/pt-BR.csv b/src/i18n/pt-BR.csv
index 37d20a5f55..a2047735d4 100644
--- a/src/i18n/pt-BR.csv
+++ b/src/i18n/pt-BR.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Linguagem
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/ru.csv b/src/i18n/ru.csv
index 0da2434f6e..9b91276982 100644
--- a/src/i18n/ru.csv
+++ b/src/i18n/ru.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,Язык
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,Словацкий (Слов
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,Словенский (Словения)
 settingsPanel:osKeyboardLayout:label:keymap_spanish,Испанский (Испания)
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,Испанский (Дворак)
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,Испанский (Латинская Америка)
 settingsPanel:osKeyboardLayout:label:keymap_swedish,Шведский (Швеция)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,Шведский (Mac ANSI)
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,Шведский (Mac ISO)
diff --git a/src/i18n/zh-CN.csv b/src/i18n/zh-CN.csv
index d7f1924c9a..b5d4ee211a 100644
--- a/src/i18n/zh-CN.csv
+++ b/src/i18n/zh-CN.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,
 settingsPanel:kctrns:label,
 settingsPanel:language:help,更改用户界面语言
 settingsPanel:language:title,语言
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/zh-HK.csv b/src/i18n/zh-HK.csv
index caf7964fd8..b038bb6b9c 100644
--- a/src/i18n/zh-HK.csv
+++ b/src/i18n/zh-HK.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,
 settingsPanel:kctrns:label,
 settingsPanel:language:help,更改用户界面語言
 settingsPanel:language:title,語言
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/zh-TW.csv b/src/i18n/zh-TW.csv
index 982c0092ba..2086dd5adc 100644
--- a/src/i18n/zh-TW.csv
+++ b/src/i18n/zh-TW.csv
@@ -113,9 +113,9 @@ settingsPanel:kcno:label,
 settingsPanel:kctrns:label,
 settingsPanel:language:help,更改使用者介面語言
 settingsPanel:language:title,語言
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -166,6 +166,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/i18n/zh.csv b/src/i18n/zh.csv
index e259fcf0e9..8851cf6540 100644
--- a/src/i18n/zh.csv
+++ b/src/i18n/zh.csv
@@ -111,9 +111,9 @@ settingsPanel:kcno:label,KC_NO
 settingsPanel:kctrns:label,KC_TRNS
 settingsPanel:language:help,
 settingsPanel:language:title,
+settingsPanel:legendType:index,
 settingsPanel:legendType:keymap,
 settingsPanel:legendType:matrix,
-settingsPanel:legendType:index,
 settingsPanel:legendType:size,
 settingsPanel:legends:help,
 settingsPanel:legends:title,
@@ -164,6 +164,7 @@ settingsPanel:osKeyboardLayout:label:keymap_slovak,
 settingsPanel:osKeyboardLayout:label:keymap_slovenian,
 settingsPanel:osKeyboardLayout:label:keymap_spanish,
 settingsPanel:osKeyboardLayout:label:keymap_spanish_dvorak,
+settingsPanel:osKeyboardLayout:label:keymap_spanish_latin_america,
 settingsPanel:osKeyboardLayout:label:keymap_swedish,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_ansi,
 settingsPanel:osKeyboardLayout:label:keymap_swedish_mac_iso,
diff --git a/src/os_keyboard_layouts.js b/src/os_keyboard_layouts.js
index 37e255a4a1..9e1a906a69 100644
--- a/src/os_keyboard_layouts.js
+++ b/src/os_keyboard_layouts.js
@@ -43,6 +43,7 @@ export default [
   'keymap_slovenian',
   'keymap_spanish_dvorak',
   'keymap_spanish',
+  'keymap_spanish_latin_america',
   'keymap_swedish',
   'keymap_swedish_mac_ansi',
   'keymap_swedish_mac_iso',