diff --git a/README.MD b/README.MD
index 923916a..3128711 100644
--- a/README.MD
+++ b/README.MD
@@ -310,6 +310,9 @@ The following `JSON` is a result of [this Google Spreadsheet](https://docs.googl
 ![ScreenShot](https://raw.githubusercontent.com/blopa/Resume-Builder/main/screenshots/v4/screenshot_3.png)
 
 ## Release Notes
+- **v4.0.7:**
+	- Fix builder page translations.
+	- Add more Spanish translations (Thanks Leandro).
 - **v4.0.6:**
 	- Create form to create a JSON resume from scratch
 	- Add theme switcher in the sidebar
diff --git a/package-lock.json b/package-lock.json
index 3007814..a28b725 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "resume-builder",
-    "version": "4.0.6",
+    "version": "4.0.7",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index 61470e9..db65860 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "resume-builder",
-    "version": "4.0.6",
+    "version": "4.0.7",
     "description": "Resume Builder",
     "main": "index.js",
     "author": "Pablo Pirata",
diff --git a/src/components/DynamicForm.jsx b/src/components/DynamicForm.jsx
index 91eaf22..28b4e46 100644
--- a/src/components/DynamicForm.jsx
+++ b/src/components/DynamicForm.jsx
@@ -98,7 +98,7 @@ const DynamicForm = ({
                                     color="primary"
                                     variant="contained"
                                 >
-                                    {`+ ${key}`}
+                                    {`+ ${intl.formatMessage({ id: `builder.${key}` })}`}
                                 </Button>
                                 {currQuantity > 1 && (
                                     <Button
@@ -112,7 +112,7 @@ const DynamicForm = ({
                                         variant="contained"
                                         className={classes.removeButton}
                                     >
-                                        {`- ${key}`}
+                                        {`- ${intl.formatMessage({ id: `builder.${key}` })}`}
                                     </Button>
                                 )}
                             </div>
diff --git a/src/intl/es.json b/src/intl/es.json
index b929098..5031b88 100644
--- a/src/intl/es.json
+++ b/src/intl/es.json
@@ -40,61 +40,61 @@
     "disclaimer_description_1": "Este software tiene licencia del MIT y se proporciona 'tal cual', sin garantía de ningún tipo, expresa o implícita, incluyendo pero no limitado a, las garantías de comerciabilidad, adecuación para un propósito particular y no infracción. En ningún caso los autores o los derechos de autor titulares será responsable de cualquier reclamación, daño u otra responsabilidad, ya sea en una acción de contrato, agravio o de otra manera, que surge de, fuera de o en conexión con el software o el uso u otras operaciones en el software.",
     "disclaimer_description_2": "Verifique todos los datos en su currículum antes de compartirlo con otros, no me hago responsable de la información compartida incorrectamente.",
     "builder": {
-        "previous": "Previous",
-        "next": "Next",
-        "basics": "Basics",
-        "work": "Work",
-        "volunteer": "Volunteer",
-        "education": "Education",
-        "awards": "Awards",
-        "certificates": "Certificates",
-        "publications": "Publications",
-        "skills": "Skills",
-        "languages": "Languages",
-        "interests": "Interests",
-        "references": "References",
-        "projects": "Projects",
-        "profiles": "Profiles",
-        "name": "Name",
-        "label": "Label",
-        "image": "Image URL",
-        "email": "E-mail",
-        "phone": "Phone",
+        "previous": "Anterior",
+        "next": "Próximo",
+        "basics": "Datos básicos",
+        "work": "Trabaja",
+        "volunteer": "Voluntario",
+        "education": "Educación",
+        "awards": "Premios",
+        "certificates": "Certificados",
+        "publications": "Publicaciones",
+        "skills": "Habilidades",
+        "languages": "Idiomas",
+        "interests": "Intereses",
+        "references": "Referencias",
+        "projects": "Proyectos",
+        "profiles": "Perfiles",
+        "name": "Nombre",
+        "label": "Etiqueta",
+        "image": "URL de la imagen",
+        "email": "Correo electrónico",
+        "phone": "Teléfono",
         "url": "URL",
-        "summary": "Summary",
-        "address": "Address",
-        "postalCode": "Postal code",
-        "city": "City",
-        "countryCode": "Country code",
-        "region": "Region",
-        "network": "Network",
-        "username": "Username",
-        "location": "Location",
-        "description": "Description",
-        "position": "Position",
-        "startDate": "Start date",
-        "endDate": "End date",
-        "highlights": "Highlights",
-        "organization": "Organization",
-        "institution": "Institution",
-        "area": "Area",
-        "studyType": "Study type",
-        "score": "Score",
-        "courses": "Courses",
-        "title": "Title",
-        "date": "Date",
-        "awarder": "Awarder",
-        "issuer": "Issuer",
-        "publisher": "Publisher",
-        "releaseDate": "Release date",
-        "level": "Level",
-        "keywords": "Keywords",
-        "language": "Language",
-        "fluency": "Fluency",
-        "reference": "Reference",
-        "roles": "Roles",
-        "entity": "Entity",
-        "type": "Type"
+        "summary": "Resumen",
+        "address": "Dirección",
+        "postalCode": "Código postal",
+        "city": "Ciudad",
+        "countryCode": "Código de país",
+        "region": "Región",
+        "network": "Red",
+        "username": "Usuario",
+        "location": "Localización",
+        "description": "Descripción",
+        "position": "Posición",
+        "startDate": "Fecha de inicio",
+        "endDate": "Fecha de finalización",
+        "highlights": "Reflejos",
+        "organization": "Organización",
+        "institution": "Institución",
+        "area": "Área",
+        "studyType": "Tipo de estudio",
+        "score": "Nota",
+        "courses": "Cursos",
+        "title": "Título",
+        "date": "Fecha",
+        "awarder": "Premiador",
+        "issuer": "Editor",
+        "publisher": "Editor",
+        "releaseDate": "Fecha de lanzamiento",
+        "level": "Nivel",
+        "keywords": "Palabras clave",
+        "language": "Idioma",
+        "fluency": "Fluidez",
+        "reference": "Referencia",
+        "roles": "Funciones",
+        "entity": "Entidad",
+        "type": "Tipo"
     },
     "error": {
         "something_went_wrong_parsing": "¡Vaya! Se produjo un error al descargar la hoja de cálculo desde la URL proporcionada. Intente descargar la hoja de cálculo manualmente y cárguela aquí.",