diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
index 6486dba..f7f460b 100644
--- a/grammars/MagicPython.cson
+++ b/grammars/MagicPython.cson
@@ -37,7 +37,7 @@ repository:
   statement:
     patterns: [
       {
-        include: "#import"
+        include: "#importar"
       }
       {
         include: "#class-declaration"
@@ -108,10 +108,10 @@ repository:
             match: '''
               (?x)
                 (?<!\\.)\\b(
-                  bool | bytes | float | int | object | str
-                  | List | Dict | Iterable | Sequence | Set
-                  | FrozenSet | Callable | Union | Tuple
-                  | Any | None
+                  bool | bytes | flotador | núm | objeto | str
+                  | Lista | Dicc | Itreable | Secuencia | Conjunto
+                  | FrozenSet | Llamable | Unión | Tupla
+                  | Cualquiara | Ningún
                 )\\b
               
             '''
@@ -275,21 +275,21 @@ repository:
                   pass
           
         '''
-        match: "\\b(?<!\\.)as\\b(?=.*[:\\\\])"
+        match: "\\b(?<!\\.)como\\b(?=.*[:\\\\])"
       }
       {
-        name: "keyword.control.import.python"
-        comment: "other legal use of `as` is in an import"
-        match: "\\b(?<!\\.)as\\b"
+        name: "keyword.control.importar.python"
+        comment: "other legal use of `as` is in an importar"
+        match: "\\b(?<!\\.)como\\b"
       }
       {
         name: "keyword.control.flow.python"
         match: '''
           (?x)
             \\b(?<!\\.)(
-              async | continue | del | assert | break | finally | for
-              | from | elif | else | if | except | pass | raise
-              | return | try | while | with
+              async | continuar | borrar | afirmar | cortar | finalmente | para
+              | desde | otro_si | otro | si | excepto | pasar | plantear
+              | devolver | intentar | mientras | con
             )\\b
           
         '''
@@ -299,14 +299,14 @@ repository:
         match: '''
           (?x)
             \\b(?<!\\.)(
-              global | nonlocal
+              global | ~local
             )\\b
           
         '''
       }
       {
         name: "storage.type.class.python"
-        match: "\\b(?<!\\.)(class)\\b"
+        match: "\\b(?<!\\.)(clase)\\b"
       }
     ]
   "expression-bare":
@@ -607,9 +607,9 @@ repository:
       (?x)
           \\b(?<!\\.)
             (?:
-              (and | or | not | in | is)                         (?# 1)
+              (y | o | ~ | en | es)                         (?# 1)
               |
-              (for | if | else | await | (?:yield(?:\\s+from)?))  (?# 2)
+              (para | si | otro | aguardar | (?:ceder(?:\\s+desde)?))  (?# 2)
             )
           (?!\\s*:)\\b
       
@@ -646,7 +646,7 @@ repository:
     patterns: [
       {
         name: "constant.language.python"
-        match: "\\b(True|False|None|NotImplemented|Ellipsis)\\b"
+        match: "\\b(Verdadero|Falso|Ningún|No_se_ha_implementado|Elipsis)\\b"
       }
       {
         include: "#number"
@@ -1056,18 +1056,18 @@ repository:
   "fstring-formatting-singe-brace":
     name: "invalid.illegal.brace.python"
     match: "(}(?!}))"
-  import:
+  importar:
     comment: '''
-      Import statements used to correctly mark `from`, `import`, and `as`
+      importar statements used to correctly mark `from`, `importar`, and `as`
       
     '''
     patterns: [
       {
-        begin: "\\b(?<!\\.)(from)\\b(?=.+import)"
-        end: "$|(?=import)"
+        begin: "\\b(?<!\\.)(desde)\\b(?=.+importar)"
+        end: "$|(?=importar)"
         beginCaptures:
           "1":
-            name: "keyword.control.import.python"
+            name: "keyword.control.importar.python"
         patterns: [
           {
             name: "punctuation.separator.period.python"
@@ -1079,15 +1079,15 @@ repository:
         ]
       }
       {
-        begin: "\\b(?<!\\.)(import)\\b"
+        begin: "\\b(?<!\\.)(importar)\\b"
         end: "$"
         beginCaptures:
           "1":
-            name: "keyword.control.import.python"
+            name: "keyword.control.importar.python"
         patterns: [
           {
-            name: "keyword.control.import.python"
-            match: "\\b(?<!\\.)as\\b"
+            name: "keyword.control.importar.python"
+            match: "\\b(?<!\\.)como\\b"
           }
           {
             include: "#expression"
@@ -1166,7 +1166,7 @@ repository:
       }
       {
         name: "support.type.metaclass.python"
-        match: "\\bmetaclass\\b"
+        match: "\\bmetaclase\\b"
       }
       {
         include: "#illegal-names"
@@ -1444,7 +1444,7 @@ repository:
   "parameter-special":
     match: '''
       (?x)
-        \\b ((self)|(cls)) \\b \\s*(?:(,)|(?=\\)))
+        \\b ((mismo)|(cls)) \\b \\s*(?:(,)|(?=\\)))
       
     '''
     captures:
@@ -1796,26 +1796,26 @@ repository:
     match: '''
       (?x) (?<!\\.) \\b(
         (
-          Arithmetic | Assertion | Attribute | Buffer | BlockingIO
-          | BrokenPipe | ChildProcess
-          | (Connection (Aborted | Refused | Reset)?)
-          | EOF | Environment | FileExists | FileNotFound
-          | FloatingPoint | IO | Import | Indentation | Index | Interrupted
-          | IsADirectory | NotADirectory | Permission | ProcessLookup
-          | Timeout
-          | Key | Lookup | Memory | Name | NotImplemented | OS | Overflow
-          | Reference | Runtime | Recursion | Syntax | System
-          | Tab | Type | UnboundLocal | Unicode(Encode|Decode|Translate)?
-          | Value | Windows | ZeroDivision | ModuleNotFound
+          Aritmética | Afirmación | Atributo | Búfer | BloqueandoIO
+          | TuberíaRota | ProcessoInfantil
+          | (Conexión (Abortada | Rechazada | Reiniciada)?)
+          | EOF | MedioAmbiente | ArchivoExiste | ArchivoNoEncontrado
+          | FlotatingPoint | IO | importaración | Muesca | Índice | Interrumpido
+          | EsADirectorio | NoADirectorio | Permiso | ProcesoBùsqueda
+          | SeAcabóElTiempo
+          | Clave | Búsqueda | Memoria | Nombre | NoSeHaImplementado | OS | Desbordamiento
+          | Referencia | TiempoDeEjecución | Recursión | Sintaxis | Sistema
+          | Pestaña | Tipo | SueltoLocal | Unicode(Codificar|Descodificar|Traducir)?
+          | Valor | Windows | CeroDivisión | MóduloNoEncontrado
         ) Error
       |
-        ((Pending)?Deprecation | Runtime | Syntax | User | Future | Import
-          | Unicode | Bytes | Resource
-        )? Warning
+        ((Pendiente)?Deprecation | TiempoDeEjecución | Sintaxis | Usario | Futuro | importar
+          | Unicode | Bytes | Recurso
+        )? Aviso
       |
-        SystemExit | Stop(Async)?Iteration
-        | KeyboardInterrupt
-        | GeneratorExit | (Base)?Exception
+        SistemaSalida | Para(Async)?Iteración
+        | TecladoInterruptado
+        | GeneradorSalida | (Base)?Excepción
       )\\b
       
     '''
@@ -1826,14 +1826,14 @@ repository:
         match: '''
           (?x)
             (?<!\\.) \\b(
-              __import__ | abs | all | any | ascii | bin | breakpoint | callable
-              | chr | compile | copyright | credits | delattr | dir | divmod
-              | enumerate | eval | exec | exit | filter | format | getattr
-              | globals | hasattr | hash | help | hex | id | input
-              | isinstance | issubclass | iter | len | license | locals | map
-              | max | memoryview | min | next | oct | open | ord | pow | print
-              | quit | range | reload | repr | reversed | round
-              | setattr | sorted | sum | vars | zip
+              __importar__ | abs | todo | cualquiara | ascii | contenedor | punto_de_ruptura | llamable
+              | chr | compilar | copyright | créditos | borraratri | dir | divmod
+              | enumerar | eval | ejec | salir | filtro | formato | obteneratri
+              | globals | teneratri | hash | ayudar | hex | id | entrada
+              | escaso | essubclase | iter | lar | licencia | locales | mapa
+              | max | memoriavista | min | siguiente | oct | abrir | ord | pot | imprimir
+              | dejar | rango | recargar | repr | invertido | redondear
+              | poneratri | ordenado | suma | vars | comprimir
             )\\b
           
         '''
@@ -1843,8 +1843,8 @@ repository:
         match: '''
           (?x)
             (?<!\\.) \\b(
-              file | reduce | intern | raw_input | unicode | cmp | basestring
-              | execfile | long | xrange
+              archivo | reducir | pasante | entrada_sin_procesar | unicode | cmp | baseguirnalda
+              | ejecarchivo | largo | xrango
             )\\b
           
         '''
@@ -1855,14 +1855,14 @@ repository:
     match: '''
       (?x)
         (?<!\\.) \\b(
-          bool | bytearray | bytes | classmethod | complex | dict
-          | float | frozenset | int | list | object | property
-          | set | slice | staticmethod | str | tuple | type
+          bool | matrizdebytes | bytes | métododeclase | complejo | dicc
+          | flotador | conjuntocongelado | núm | lista | objeto | propriedad
+          | conjunto | rebanar | métodoestático | guir | tupla | tipo
       
           (?# Although 'super' is not a type, it's related to types,
               and is special enough to be highlighted differently from
               other built-ins)
-          | super
+          | súper
         )\\b
       
     '''
@@ -1876,24 +1876,24 @@ repository:
       (?x)
         \\b(
           __(?:
-            abs | add | aenter | aexit | aiter | and | anext | await
-            | bool | call | ceil | cmp | coerce | complex | contains
-            | copy | deepcopy | del | delattr | delete | delitem
-            | delslice | dir | div | divmod | enter | eq | exit | float
-            | floor | floordiv | format | ge | get | getattr
-            | getattribute | getinitargs | getitem | getnewargs
-            | getslice | getstate | gt | hash | hex | iadd | iand | idiv
-            | ifloordiv | ilshift | imod | imul | index | init
-            | instancecheck | int | invert | ior | ipow | irshift | isub
-            | iter | itruediv | ixor | le | len | long | lshift | lt
-            | missing | mod | mul | ne | neg | new | next | nonzero | oct | or
-            | pos | pow | radd | rand | rdiv | rdivmod | reduce
-            | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod
-            | rmul | ror | round | rpow | rrshift | rshift | rsub
-            | rtruediv | rxor | set | setattr | setitem | setslice
-            | setstate | sizeof | str | sub | subclasscheck | truediv
-            | trunc | unicode | xor | matmul | rmatmul | imatmul
-            | init_subclass | set_name | fspath | bytes | prepare
+            abs | añadir | aentrar | asalir | aiter | and | anext | await
+            | bool | llamar | techo | cmp | coaccionar | complejo | contener
+            | copia | copiaprofunda | borrar | borraratri | borrar | borrarartículo
+            | borrarparte | dir | div | divmod | entrar | eq | salir | flotador
+            | piso | pisodiv | formato | ge | obtener | obteneratri
+            | obteneratributo | obtenerparámetrosiniciales | obtenerartículo | obtenerparámetrosnuevos
+            | obtenerparte | obtenerestado | gt | hash | hex | iañadir | iy | idiv
+            | ipisodiv | iizqmover | imod | imul | índice | inicializar
+            | casochequeo | núm | invertir | ior | ipot | idmover | isub
+            | iter | idivverdadero | ixor | le | lar | largo | izqmover | lt
+            | perdido | mod | mul | ne | neg | nuevo | siguiente | nocero | oct | or
+            | pos | pot | radd | azar | ddiv | ddivmod | reducir
+            | reducir_ex | repr | invertido | dpisodiv | dizqmover | dmod
+            | dmul | dor | redondear | dpot | ddmover | dmover | dsub
+            | ddivverdadero | dxor | poner | poneratri | ponerartículo | ponerparte
+            | ponerestado | tamañode | str | sub | subclasechequeo | divverdadero
+            | trunc | unicode | xor | matmul | dmatmul | imatmul
+            | subclase_initializar | poner_nombre | fscamino | bytes | preparar
           )__
         )\\b
       
@@ -1907,12 +1907,12 @@ repository:
       (?x)
         \\b(
           __(?:
-            all | bases | builtins | class | class_getitem | code | debug
-            | defaults | dict | doc | file | func | kwdefaults | members
-            | metaclass | methods | module | mro | mro_entries | name
-            | qualname | post_init | self | signature | slots | subclasses
-            | version | weakref | wrapped | annotations | classcell
-            | spec | path | package | future | traceback
+            todo | bases | incorporados | clase | clase_obtenerartículo | código | depurar
+            | los_valores_por_defecto | dicc | doc | archivo | func | kw_los_valores_por_defecto | miembros
+            | metaclase | métodos | módulo | mro | mro_entradas | nombre
+            | qualnombre | post_inicial | mismo | firma | ranuras | subclases
+            | version | débilref | envuelto | anotaciones | classcelda
+            | espec | camino | paquete | futuro | localizaratrás
           )__
         )\\b
       
@@ -1934,13 +1934,13 @@ repository:
       (?x)
         \\b(?:
           (
-            and | assert | async | await | break | class | continue | def
-            | del | elif | else | except | finally | for | from | global
-            | if | in | is | (?<=\\.)lambda | lambda(?=\\s*[\\.=])
-            | nonlocal | not | or | pass | raise | return | try | while | with
-            | yield
+            y | afirmar | async | aguardar | cortar | clase | continuar | def
+            | borrar | otro_si | otro | excepto | finalmente | para | desde | global
+            | si | en | es | (?<=\\.)lambda | lambda(?=\\s*[\\.=])
+            | ~local | ~ | o | pasar | plantear | devolver | intentar | mientras | con
+            | ceder
           ) | (
-            as | import
+            como | importar
           )
         )\\b
       
@@ -1949,12 +1949,12 @@ repository:
       "1":
         name: "keyword.control.flow.python"
       "2":
-        name: "keyword.control.import.python"
+        name: "keyword.control.importar.python"
   "special-variables":
     match: '''
       (?x)
         \\b (?<!\\.) (?:
-          (self) | (cls)
+          (mismo) | (cls)
         )\\b
       
     '''
@@ -1994,7 +1994,7 @@ repository:
   "illegal-object-name":
     comment: "It's illegal to name class or function \"True\""
     name: "keyword.illegal.name.python"
-    match: "\\b(True|False|None)\\b"
+    match: "\\b(Verdadero|Falso|Ningún)\\b"
   "illegal-anno":
     name: "invalid.illegal.annotation.python"
     match: "->"
@@ -2176,7 +2176,7 @@ repository:
       }
     ]
   codetags:
-    match: "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
+    match: "(?:\\b(NOTAR|XXX|HACKEAR|ARREGLARME|BICHO|HACER)\\b)"
     captures:
       "1":
         name: "keyword.codetag.notation.python"
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
index 5a07f54..3ea2353 100644
--- a/grammars/MagicPython.tmLanguage
+++ b/grammars/MagicPython.tmLanguage
@@ -57,7 +57,7 @@
         <array>
           <dict>
             <key>include</key>
-            <string>#import</string>
+            <string>#importar</string>
           </dict>
           <dict>
             <key>include</key>
@@ -156,10 +156,10 @@
                 <key>match</key>
                 <string>(?x)
   (?&lt;!\.)\b(
-    bool | bytes | float | int | object | str
-    | List | Dict | Iterable | Sequence | Set
-    | FrozenSet | Callable | Union | Tuple
-    | Any | None
+     bool | bytes | flotador | núm | objeto | str
+                  | Lista | Dicc | Itreable | Secuencia | Conjunto
+                  | FrozenSet | Llamable | Unión | Tupla
+                  | Cualquiara | Ningún
   )\b
 </string>
               </dict>
@@ -433,15 +433,15 @@ it's probably control flow like:
         pass
 </string>
             <key>match</key>
-            <string>\b(?&lt;!\.)as\b(?=.*[:\\])</string>
+            <string>\b(?&lt;!\.)como\b(?=.*[:\\])</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.control.import.python</string>
+            <string>keyword.control.importar.python</string>
             <key>comment</key>
-            <string>other legal use of `as` is in an import</string>
+            <string>other legal use of `as` is in an importar</string>
             <key>match</key>
-            <string>\b(?&lt;!\.)as\b</string>
+            <string>\b(?&lt;!\.)como\b</string>
           </dict>
           <dict>
             <key>name</key>
@@ -449,9 +449,9 @@ it's probably control flow like:
             <key>match</key>
             <string>(?x)
   \b(?&lt;!\.)(
-    async | continue | del | assert | break | finally | for
-    | from | elif | else | if | except | pass | raise
-    | return | try | while | with
+    async | continuar | borrar | afirmar | cortar | finalmente | para
+              | desde | otro_si | otro | si | excepto | pasar | plantear
+              | devolver | intentar | mientras | con
   )\b
 </string>
           </dict>
@@ -461,7 +461,7 @@ it's probably control flow like:
             <key>match</key>
             <string>(?x)
   \b(?&lt;!\.)(
-    global | nonlocal
+    global | ~local
   )\b
 </string>
           </dict>
@@ -469,7 +469,7 @@ it's probably control flow like:
             <key>name</key>
             <string>storage.type.class.python</string>
             <key>match</key>
-            <string>\b(?&lt;!\.)(class)\b</string>
+            <string>\b(?&lt;!\.)(clase)\b</string>
           </dict>
         </array>
       </dict>
@@ -922,9 +922,9 @@ E.g. "arr[idx](args)"
         <string>(?x)
     \b(?&lt;!\.)
       (?:
-        (and | or | not | in | is)                         (?# 1)
+        (y | o | ~ | en | es)                        (?# 1)
         |
-        (for | if | else | await | (?:yield(?:\s+from)?))  (?# 2)
+       (para | si | otro | aguardar | (?:ceder(?:\\s+desde)?))  (?# 2)
       )
     (?!\s*:)\b
 
@@ -989,7 +989,7 @@ E.g. "arr[idx](args)"
             <key>name</key>
             <string>constant.language.python</string>
             <key>match</key>
-            <string>\b(True|False|None|NotImplemented|Ellipsis)\b</string>
+            <string>\b(Verdadero|Falso|Ningún|No_se_ha_implementado|Elipsis)\b</string>
           </dict>
           <dict>
             <key>include</key>
@@ -1605,24 +1605,24 @@ E.g. "arr[idx](args)"
         <key>match</key>
         <string>(}(?!}))</string>
       </dict>
-      <key>import</key>
+      <key>importar</key>
       <dict>
         <key>comment</key>
-        <string>Import statements used to correctly mark `from`, `import`, and `as`
+        <string>importar statements used to correctly mark `from`, `importar`, and `as`
 </string>
         <key>patterns</key>
         <array>
           <dict>
             <key>begin</key>
-            <string>\b(?&lt;!\.)(from)\b(?=.+import)</string>
+            <string>\b(?&lt;!\.)(desde)\b(?=.+importar)</string>
             <key>end</key>
-            <string>$|(?=import)</string>
+            <string>$|(?=importar)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>keyword.control.import.python</string>
+                <string>keyword.control.importar.python</string>
               </dict>
             </dict>
             <key>patterns</key>
@@ -1641,7 +1641,7 @@ E.g. "arr[idx](args)"
           </dict>
           <dict>
             <key>begin</key>
-            <string>\b(?&lt;!\.)(import)\b</string>
+            <string>\b(?&lt;!\.)(importar)\b</string>
             <key>end</key>
             <string>$</string>
             <key>beginCaptures</key>
@@ -1649,16 +1649,16 @@ E.g. "arr[idx](args)"
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>keyword.control.import.python</string>
+                <string>keyword.control.importar.python</string>
               </dict>
             </dict>
             <key>patterns</key>
             <array>
               <dict>
                 <key>name</key>
-                <string>keyword.control.import.python</string>
+                <string>keyword.control.importar.python</string>
                 <key>match</key>
-                <string>\b(?&lt;!\.)as\b</string>
+                <string>\b(?&lt;!\.)como\b</string>
               </dict>
               <dict>
                 <key>include</key>
@@ -1677,7 +1677,7 @@ E.g. "arr[idx](args)"
             <string>meta.class.python</string>
             <key>begin</key>
             <string>(?x)
-  \s*(class)\s+
+  \s*(clase)\s+
     (?=
       [[:alpha:]_]\w* \s* (:|\()
     )
@@ -1784,7 +1784,7 @@ E.g. "arr[idx](args)"
             <key>name</key>
             <string>support.type.metaclass.python</string>
             <key>match</key>
-            <string>\bmetaclass\b</string>
+            <string>\bmetaclase\b</string>
           </dict>
           <dict>
             <key>include</key>
@@ -2244,7 +2244,7 @@ correctly identify the "in" as a control flow keyword.
       <dict>
         <key>match</key>
         <string>(?x)
-  \b ((self)|(cls)) \b \s*(?:(,)|(?=\)))
+  \b ((mismo)|(cls)) \b \s*(?:(,)|(?=\)))
 </string>
         <key>captures</key>
         <dict>
@@ -2816,26 +2816,26 @@ correctly identify the "in" as a control flow keyword.
         <key>match</key>
         <string>(?x) (?&lt;!\.) \b(
   (
-    Arithmetic | Assertion | Attribute | Buffer | BlockingIO
-    | BrokenPipe | ChildProcess
-    | (Connection (Aborted | Refused | Reset)?)
-    | EOF | Environment | FileExists | FileNotFound
-    | FloatingPoint | IO | Import | Indentation | Index | Interrupted
-    | IsADirectory | NotADirectory | Permission | ProcessLookup
-    | Timeout
-    | Key | Lookup | Memory | Name | NotImplemented | OS | Overflow
-    | Reference | Runtime | Recursion | Syntax | System
-    | Tab | Type | UnboundLocal | Unicode(Encode|Decode|Translate)?
-    | Value | Windows | ZeroDivision | ModuleNotFound
-  ) Error
-|
-  ((Pending)?Deprecation | Runtime | Syntax | User | Future | Import
-    | Unicode | Bytes | Resource
-  )? Warning
-|
-  SystemExit | Stop(Async)?Iteration
-  | KeyboardInterrupt
-  | GeneratorExit | (Base)?Exception
+    Aritmética | Afirmación | Atributo | Búfer | BloqueandoIO
+          | TuberíaRota | ProcessoInfantil
+          | (Conexión (Abortada | Rechazada | Reiniciada)?)
+          | EOF | MedioAmbiente | ArchivoExiste | ArchivoNoEncontrado
+          | FlotatingPoint | IO | importaración | Muesca | Índice | Interrumpido
+          | EsADirectorio | NoADirectorio | Permiso | ProcesoBùsqueda
+          | SeAcabóElTiempo
+          | Clave | Búsqueda | Memoria | Nombre | NoSeHaImplementado | OS | Desbordamiento
+          | Referencia | TiempoDeEjecución | Recursión | Sintaxis | Sistema
+          | Pestaña | Tipo | SueltoLocal | Unicode(Codificar|Descodificar|Traducir)?
+          | Valor | Windows | CeroDivisión | MóduloNoEncontrado
+        ) Error
+      |
+        ((Pendiente)?Deprecation | TiempoDeEjecución | Sintaxis | Usario | Futuro | importar
+          | Unicode | Bytes | Recurso
+        )? Aviso
+      |
+        SistemaSalida | Para(Async)?Iteración
+        | TecladoInterruptado
+        | GeneradorSalida | (Base)?Excepción
 )\b
 </string>
       </dict>
@@ -2849,14 +2849,14 @@ correctly identify the "in" as a control flow keyword.
             <key>match</key>
             <string>(?x)
   (?&lt;!\.) \b(
-    __import__ | abs | all | any | ascii | bin | breakpoint | callable
-    | chr | compile | copyright | credits | delattr | dir | divmod
-    | enumerate | eval | exec | exit | filter | format | getattr
-    | globals | hasattr | hash | help | hex | id | input
-    | isinstance | issubclass | iter | len | license | locals | map
-    | max | memoryview | min | next | oct | open | ord | pow | print
-    | quit | range | reload | repr | reversed | round
-    | setattr | sorted | sum | vars | zip
+  __importar__ | abs | todo | cualquiara | ascii | contenedor | punto_de_ruptura | llamable
+              | chr | compilar | copyright | créditos | borraratri | dir | divmod
+              | enumerar | eval | ejec | salir | filtro | formato | obteneratri
+              | globals | teneratri | hash | ayudar | hex | id | entrada
+              | escaso | essubclase | iter | lar | licencia | locales | mapa
+              | max | memoriavista | min | siguiente | oct | abrir | ord | pot | imprimir
+              | dejar | rango | recargar | repr | invertido | redondear
+              | poneratri | ordenado | suma | vars | comprimir
   )\b
 </string>
           </dict>
@@ -2866,8 +2866,8 @@ correctly identify the "in" as a control flow keyword.
             <key>match</key>
             <string>(?x)
   (?&lt;!\.) \b(
-    file | reduce | intern | raw_input | unicode | cmp | basestring
-    | execfile | long | xrange
+      archivo | reducir | pasante | entrada_sin_procesar | unicode | cmp | baseguirnalda
+              | ejecarchivo | largo | xrango
   )\b
 </string>
           </dict>
@@ -2880,14 +2880,14 @@ correctly identify the "in" as a control flow keyword.
         <key>match</key>
         <string>(?x)
   (?&lt;!\.) \b(
-    bool | bytearray | bytes | classmethod | complex | dict
-    | float | frozenset | int | list | object | property
-    | set | slice | staticmethod | str | tuple | type
-
-    (?# Although 'super' is not a type, it's related to types,
-        and is special enough to be highlighted differently from
-        other built-ins)
-    | super
+     bool | matrizdebytes | bytes | métododeclase | complejo | dicc
+          | flotador | conjuntocongelado | núm | lista | objeto | propriedad
+          | conjunto | rebanar | métodoestático | guir | tupla | tipo
+      
+          (?# Although 'super' is not a type, it's related to types,
+              and is special enough to be highlighted differently from
+              other built-ins)
+          | súper
   )\b
 </string>
       </dict>
@@ -2901,24 +2901,24 @@ indirectly through syntactic constructs
         <string>(?x)
   \b(
     __(?:
-      abs | add | aenter | aexit | aiter | and | anext | await
-      | bool | call | ceil | cmp | coerce | complex | contains
-      | copy | deepcopy | del | delattr | delete | delitem
-      | delslice | dir | div | divmod | enter | eq | exit | float
-      | floor | floordiv | format | ge | get | getattr
-      | getattribute | getinitargs | getitem | getnewargs
-      | getslice | getstate | gt | hash | hex | iadd | iand | idiv
-      | ifloordiv | ilshift | imod | imul | index | init
-      | instancecheck | int | invert | ior | ipow | irshift | isub
-      | iter | itruediv | ixor | le | len | long | lshift | lt
-      | missing | mod | mul | ne | neg | new | next | nonzero | oct | or
-      | pos | pow | radd | rand | rdiv | rdivmod | reduce
-      | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod
-      | rmul | ror | round | rpow | rrshift | rshift | rsub
-      | rtruediv | rxor | set | setattr | setitem | setslice
-      | setstate | sizeof | str | sub | subclasscheck | truediv
-      | trunc | unicode | xor | matmul | rmatmul | imatmul
-      | init_subclass | set_name | fspath | bytes | prepare
+     abs | añadir | aentrar | asalir | aiter | and | anext | await
+            | bool | llamar | techo | cmp | coaccionar | complejo | contener
+            | copia | copiaprofunda | borrar | borraratri | borrar | borrarartículo
+            | borrarparte | dir | div | divmod | entrar | eq | salir | flotador
+            | piso | pisodiv | formato | ge | obtener | obteneratri
+            | obteneratributo | obtenerparámetrosiniciales | obtenerartículo | obtenerparámetrosnuevos
+            | obtenerparte | obtenerestado | gt | hash | hex | iañadir | iy | idiv
+            | ipisodiv | iizqmover | imod | imul | índice | inicializar
+            | casochequeo | núm | invertir | ior | ipot | idmover | isub
+            | iter | idivverdadero | ixor | le | lar | largo | izqmover | lt
+            | perdido | mod | mul | ne | neg | nuevo | siguiente | nocero | oct | or
+            | pos | pot | radd | azar | ddiv | ddivmod | reducir
+            | reducir_ex | repr | invertido | dpisodiv | dizqmover | dmod
+            | dmul | dor | redondear | dpot | ddmover | dmover | dsub
+            | ddivverdadero | dxor | poner | poneratri | ponerartículo | ponerparte
+            | ponerestado | tamañode | str | sub | subclasechequeo | divverdadero
+            | trunc | unicode | xor | matmul | dmatmul | imatmul
+            | subclase_initializar | poner_nombre | fscamino | bytes | preparar
     )__
   )\b
 </string>
@@ -2939,12 +2939,12 @@ indirectly through syntactic constructs
         <string>(?x)
   \b(
     __(?:
-      all | bases | builtins | class | class_getitem | code | debug
-      | defaults | dict | doc | file | func | kwdefaults | members
-      | metaclass | methods | module | mro | mro_entries | name
-      | qualname | post_init | self | signature | slots | subclasses
-      | version | weakref | wrapped | annotations | classcell
-      | spec | path | package | future | traceback
+       todo | bases | incorporados | clase | clase_obtenerartículo | código | depurar
+            | los_valores_por_defecto | dicc | doc | archivo | func | kw_los_valores_por_defecto | miembros
+            | metaclase | métodos | módulo | mro | mro_entradas | nombre
+            | qualnombre | post_inicial | mismo | firma | ranuras | subclases
+            | version | débilref | envuelto | anotaciones | classcelda
+            | espec | camino | paquete | futuro | localizaratrás
     )__
   )\b
 </string>
@@ -2977,13 +2977,13 @@ indirectly through syntactic constructs
         <string>(?x)
   \b(?:
     (
-      and | assert | async | await | break | class | continue | def
-      | del | elif | else | except | finally | for | from | global
-      | if | in | is | (?&lt;=\.)lambda | lambda(?=\s*[\.=])
-      | nonlocal | not | or | pass | raise | return | try | while | with
-      | yield
-    ) | (
-      as | import
+       y | afirmar | async | aguardar | cortar | clase | continuar | def
+            | borrar | otro_si | otro | excepto | finalmente | para | desde | global
+            | si | en | es | (?<=\\.)lambda | lambda(?=\\s*[\\.=])
+            | ~local | ~ | o | pasar | plantear | devolver | intentar | mientras | con
+            | ceder
+          ) | (
+            como | importar
     )
   )\b
 </string>
@@ -2997,7 +2997,7 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>keyword.control.import.python</string>
+            <string>keyword.control.importar.python</string>
           </dict>
         </dict>
       </dict>
@@ -3006,7 +3006,7 @@ indirectly through syntactic constructs
         <key>match</key>
         <string>(?x)
   \b (?&lt;!\.) (?:
-    (self) | (cls)
+    (mismo) | (cls)
   )\b
 </string>
         <key>captures</key>
@@ -3079,7 +3079,7 @@ indirectly through syntactic constructs
         <key>name</key>
         <string>keyword.illegal.name.python</string>
         <key>match</key>
-        <string>\b(True|False|None)\b</string>
+        <string>\b(Verdadero|Falso|Ningún)\b</string>
       </dict>
       <key>illegal-anno</key>
       <dict>
@@ -3373,7 +3373,7 @@ indirectly through syntactic constructs
       <key>codetags</key>
       <dict>
         <key>match</key>
-        <string>(?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)</string>
+        <string>(?:\b(NOTAR|XXX|HACKEAR|ARREGLARME|BICHO|HACER)\b)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
index 9c80c8b..6247b8e 100644
--- a/grammars/src/MagicPython.syntax.yaml
+++ b/grammars/src/MagicPython.syntax.yaml
@@ -263,10 +263,10 @@ repository:
             match: |
               (?x)
                 (?<!\.)\b(
-                  bool | bytes | float | int | object | str
-                  | List | Dict | Iterable | Sequence | Set
-                  | FrozenSet | Callable | Union | Tuple
-                  | Any | None
+                  bool | bytes | flotador | núm | objeto | str
+                  | Lista | Dicc | Itreable | Secuencia | Conjunto
+                  | FrozenSet | Llamable | Unión | Tupla
+                  | Cualquiara | Ningún
                 )\b
 
           - name: comment.typehint.punctuation.notation.python
@@ -377,9 +377,9 @@ repository:
         match: |
           (?x)
             \b(?<!\.)(
-              async | continue | del | assert | break | finally | for
-              | from | elif | else | if | except | pass | raise
-              | return | try | while | with
+               async | continuar | borrar | afirmar | cortar | finalmente | para
+              | desde | otro_si | otro | si | excepto | pasar | plantear
+              | devolver | intentar | mientras | con
             )\b
       - name: storage.modifier.declaration.python
         match: |
@@ -570,9 +570,9 @@ repository:
       (?x)
           \b(?<!\.)
             (?:
-              (and | or | not | in | is)                         (?# 1)
+              (y | o | ~ | en | es)                         (?# 1)
               |
-              (for | if | else | await | (?:yield(?:\s+from)?))  (?# 2)
+             (para | si | otro | aguardar | (?:ceder(?:\\s+from)?))  (?# 2)
             )
           (?!\s*:)\b
 
@@ -1117,7 +1117,7 @@ repository:
   parameter-special:
     match: |
       (?x)
-        \b ((self)|(cls)) \b \s*(?:(,)|(?=\)))
+        \b ((mismo)|(cls)) \b \s*(?:(,)|(?=\)))
     captures:
       '1': {name: variable.parameter.function.language.python}
       '2': {name: variable.parameter.function.language.special.self.python}
@@ -1329,26 +1329,26 @@ repository:
     match: |
       (?x) (?<!\.) \b(
         (
-          Arithmetic | Assertion | Attribute | Buffer | BlockingIO
-          | BrokenPipe | ChildProcess
-          | (Connection (Aborted | Refused | Reset)?)
-          | EOF | Environment | FileExists | FileNotFound
-          | FloatingPoint | IO | Import | Indentation | Index | Interrupted
-          | IsADirectory | NotADirectory | Permission | ProcessLookup
-          | Timeout
-          | Key | Lookup | Memory | Name | NotImplemented | OS | Overflow
-          | Reference | Runtime | Recursion | Syntax | System
-          | Tab | Type | UnboundLocal | Unicode(Encode|Decode|Translate)?
-          | Value | Windows | ZeroDivision | ModuleNotFound
+         Aritmética | Afirmación | Atributo | Búfer | BloqueandoIO
+          | TuberíaRota | ProcessoInfantil
+          | (Conexión (Abortada | Rechazada | Reiniciada)?)
+          | EOF | MedioAmbiente | ArchivoExiste | ArchivoNoEncontrado
+          | FlotatingPoint | IO | Importación | Muesca | Índice | Interrumpido
+          | EsADirectorio | NoADirectorio | Permiso | ProcesoBùsqueda
+          | SeAcabóElTiempo
+          | Clave | Búsqueda | Memoria | Nombre | NoSeHaImplementado | OS | Desbordamiento
+          | Referencia | TiempoDeEjecución | Recursión | Sintaxis | Sistema
+          | Pestaña | Tipo | SueltoLocal | Unicode(Codificar|Descodificar|Traducir)?
+          | Valor | Windows | CeroDivisión | MóduloNoEncontrado
         ) Error
       |
-        ((Pending)?Deprecation | Runtime | Syntax | User | Future | Import
-          | Unicode | Bytes | Resource
-        )? Warning
+        ((Pendiente)?Deprecation | TiempoDeEjecución | Sintaxis | Usario | Futuro | Importar
+          | Unicode | Bytes | Recurso
+        )? Aviso
       |
-        SystemExit | Stop(Async)?Iteration
-        | KeyboardInterrupt
-        | GeneratorExit | (Base)?Exception
+        SistemaSalida | Para(Async)?Iteración
+        | TecladoInterruptado
+        | GeneradorSalida | (Base)?Excepción
       )\b
 
   builtin-functions:
@@ -1357,22 +1357,22 @@ repository:
         match: |
           (?x)
             (?<!\.) \b(
-              __import__ | abs | all | any | ascii | bin | breakpoint | callable
-              | chr | compile | copyright | credits | delattr | dir | divmod
-              | enumerate | eval | exec | exit | filter | format | getattr
-              | globals | hasattr | hash | help | hex | id | input
-              | isinstance | issubclass | iter | len | license | locals | map
-              | max | memoryview | min | next | oct | open | ord | pow | print
-              | quit | range | reload | repr | reversed | round
-              | setattr | sorted | sum | vars | zip
+              __importar__ | abs | todo | cualquiara | ascii | contenedor | punto_de_ruptura | llamable
+              | chr | compilar | copyright | créditos | borraratri | dir | divmod
+              | enumerar | eval | ejec | salir | filtro | formato | obteneratri
+              | globals | teneratri | hash | ayudar | hex | id | entrada
+              | escaso | essubclase | iter | lar | licencia | locales | mapa
+              | max | memoriavista | min | siguiente | oct | abrir | ord | pot | imprimir
+              | dejar | rango | recargar | repr | invertido | redondear
+              | poneratri | ordenado | suma | vars | comprimir
             )\b
 
       - name: variable.legacy.builtin.python
         match: |
           (?x)
             (?<!\.) \b(
-              file | reduce | intern | raw_input | unicode | cmp | basestring
-              | execfile | long | xrange
+              archivo | reducir | pasante | entrada_sin_procesar | unicode | cmp | baseguirnalda
+              | ejecarchivo | largo | xrango
             )\b
 
   builtin-types:
@@ -1380,9 +1380,9 @@ repository:
     match: |
       (?x)
         (?<!\.) \b(
-          bool | bytearray | bytes | classmethod | complex | dict
-          | float | frozenset | int | list | object | property
-          | set | slice | staticmethod | str | tuple | type
+          bool | matrizdebytes | bytes | métododeclase | complejo | dicc
+          | flotador | conjuntocongelado | núm | lista | objeto | propriedad
+          | conjunto | rebanar | métodoestático | guir | tupla | tipo
 
           (?# Although 'super' is not a type, it's related to types,
               and is special enough to be highlighted differently from
@@ -1398,24 +1398,24 @@ repository:
       (?x)
         \b(
           __(?:
-            abs | add | aenter | aexit | aiter | and | anext | await
-            | bool | call | ceil | cmp | coerce | complex | contains
-            | copy | deepcopy | del | delattr | delete | delitem
-            | delslice | dir | div | divmod | enter | eq | exit | float
-            | floor | floordiv | format | ge | get | getattr
-            | getattribute | getinitargs | getitem | getnewargs
-            | getslice | getstate | gt | hash | hex | iadd | iand | idiv
-            | ifloordiv | ilshift | imod | imul | index | init
-            | instancecheck | int | invert | ior | ipow | irshift | isub
-            | iter | itruediv | ixor | le | len | long | lshift | lt
-            | missing | mod | mul | ne | neg | new | next | nonzero | oct | or
-            | pos | pow | radd | rand | rdiv | rdivmod | reduce
-            | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod
-            | rmul | ror | round | rpow | rrshift | rshift | rsub
-            | rtruediv | rxor | set | setattr | setitem | setslice
-            | setstate | sizeof | str | sub | subclasscheck | truediv
-            | trunc | unicode | xor | matmul | rmatmul | imatmul
-            | init_subclass | set_name | fspath | bytes | prepare
+           abs | añadir | aentrar | asalir | aiter | and | anext | await
+            | bool | llamar | techo | cmp | coaccionar | complejo | contener
+            | copia | copiaprofunda | borrar | borraratri | borrar | borrarartículo
+            | borrarparte | dir | div | divmod | entrar | eq | salir | flotador
+            | piso | pisodiv | formato | ge | obtener | obteneratri
+            | obteneratributo | obtenerparámetrosiniciales | obtenerartículo | obtenerparámetrosnuevos
+            | obtenerparte | obtenerestado | gt | hash | hex | iañadir | iy | idiv
+            | ipisodiv | iizqmover | imod | imul | índice | inicializar
+            | casochequeo | núm | invertir | ior | ipot | idmover | isub
+            | iter | idivverdadero | ixor | le | lar | largo | izqmover | lt
+            | perdido | mod | mul | ne | neg | nuevo | siguiente | nocero | oct | or
+            | pos | pot | radd | azar | ddiv | ddivmod | reducir
+            | reducir_ex | repr | invertido | dpisodiv | dizqmover | dmod
+            | dmul | dor | redondear | dpot | ddmover | dmover | dsub
+            | ddivverdadero | dxor | poner | poneratri | ponerartículo | ponerparte
+            | ponerestado | tamañode | str | sub | subclasechequeo | divverdadero
+            | trunc | unicode | xor | matmul | dmatmul | imatmul
+            | subclase_initializar | poner_nombre | fscamino | bytes | preparar
           )__
         )\b
     captures:
@@ -1427,12 +1427,12 @@ repository:
       (?x)
         \b(
           __(?:
-            all | bases | builtins | class | class_getitem | code | debug
-            | defaults | dict | doc | file | func | kwdefaults | members
-            | metaclass | methods | module | mro | mro_entries | name
-            | qualname | post_init | self | signature | slots | subclasses
-            | version | weakref | wrapped | annotations | classcell
-            | spec | path | package | future | traceback
+             todo | bases | incorporados | clase | clase_obtenerartículo | código | depurar
+            | los_valores_por_defecto | dicc | doc | archivo | func | kw_los_valores_por_defecto | miembros
+            | metaclase | métodos | módulo | mro | mro_entradas | nombre
+            | qualnombre | post_inicial | mismo | firma | ranuras | subclases
+            | version | débilref | envuelto | anotaciones | classcelda
+            | espec | camino | paquete | futuro | localizaratrás
           )__
         )\b
     captures:
@@ -1448,13 +1448,13 @@ repository:
       (?x)
         \b(?:
           (
-            and | assert | async | await | break | class | continue | def
-            | del | elif | else | except | finally | for | from | global
-            | if | in | is | (?<=\.)lambda | lambda(?=\s*[\.=])
-            | nonlocal | not | or | pass | raise | return | try | while | with
-            | yield
+            y | afirmar | async | aguardar | cortar | clase | continuar | def
+            | borrar | otro_si | otro | excepto | finalmente | para | desde | global
+            | si | en | es | (?<=\\.)lambda | lambda(?=\\s*[\\.=])
+            | ~local | ~ | o | pasar | plantear | devolver | intentar | mientras | con
+            | ceder
           ) | (
-            as | import
+            como | importar
           )
         )\b
     captures:
@@ -1466,7 +1466,7 @@ repository:
     match: |
       (?x)
         \b (?<!\.) (?:
-          (self) | (cls)
+          (mismo) | (cls)
         )\b
     captures:
       '1': {name: variable.language.special.self.python}