diff --git a/packages/manfred-common/src/doc-parts/profile-section/profile-section.vm.ts b/packages/manfred-common/src/doc-parts/profile-section/profile-section.vm.ts
index 4bae9fbf..2b8bf49c 100644
--- a/packages/manfred-common/src/doc-parts/profile-section/profile-section.vm.ts
+++ b/packages/manfred-common/src/doc-parts/profile-section/profile-section.vm.ts
@@ -6,9 +6,9 @@ export interface ProfileSectionVm {
   fullname: string;
   emails: string[];
   relevantLinks: RelevantLinkVm[];
-  avatar: string;
-  regionLocation: string;
-  countryLocation: string;
+  avatar?: string;
+  regionLocation?: string;
+  countryLocation?: string;
 }
 
 export interface RelevantLinkVm {
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.helpers.spec.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.helpers.spec.ts
index f8d14a22..d11796cf 100644
--- a/packages/manfred-common/src/doc-parts/studies-section/studies-section.helpers.spec.ts
+++ b/packages/manfred-common/src/doc-parts/studies-section/studies-section.helpers.spec.ts
@@ -15,6 +15,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -31,6 +32,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -47,6 +49,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description',
           institution: {
             name: 'name',
+            description: 'description',
             location: {
               country: 'España',
               region: 'region',
@@ -69,6 +72,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description',
           institution: {
             name: 'name',
+            description: 'description',
             location: {
               country: 'España',
               region: 'region',
@@ -85,6 +89,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -101,6 +106,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -123,6 +129,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description',
           institution: {
             name: 'name',
+            description: 'description',
             location: {
               country: 'España',
               region: 'region',
@@ -139,6 +146,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -161,6 +169,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description',
           institution: {
             name: 'name',
+            description: 'description',
             location: {
               country: 'España',
               region: 'region',
@@ -177,6 +186,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -201,6 +211,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
@@ -223,6 +234,7 @@ describe('studies-section.helpers specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts
index 29756c5b..a53095c9 100644
--- a/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts
+++ b/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts
@@ -72,6 +72,7 @@ describe('studies-section.mapper specs', () => {
                   address: 'address',
                 },
               },
+              linkedCompetences: [{ name: 'Competence 1' }, { name: 'Competence 2' }],
             },
           ],
         },
@@ -91,12 +92,14 @@ describe('studies-section.mapper specs', () => {
           description: 'description',
           institution: {
             name: 'name',
+            description: 'description',
             location: {
               country: 'España',
               region: 'region',
               address: 'address',
             },
           },
+          linkedCompetences: ['Competence 1', 'Competence 2'],
         },
       ];
 
@@ -134,6 +137,7 @@ describe('studies-section.mapper specs', () => {
                   address: 'address',
                 },
               },
+              linkedCompetences: [{ name: 'Competence 1' }, { name: 'Competence 2' }],
             },
             {
               studyType: 'certification',
@@ -151,6 +155,7 @@ describe('studies-section.mapper specs', () => {
                   address: 'address2',
                 },
               },
+              linkedCompetences: [{ name: 'Competence 3' }, { name: 'Competence 4' }],
             },
           ],
         },
@@ -170,12 +175,14 @@ describe('studies-section.mapper specs', () => {
           description: 'description',
           institution: {
             name: 'name',
+            description: 'description',
             location: {
               country: 'España',
               region: 'region',
               address: 'address',
             },
           },
+          linkedCompetences: ['Competence 1', 'Competence 2'],
         },
         {
           studyType: 'Certificación',
@@ -186,12 +193,14 @@ describe('studies-section.mapper specs', () => {
           description: 'description2',
           institution: {
             name: 'name2',
+            description: 'description2',
             location: {
               country: 'Italia',
               region: 'region2',
               address: 'address2',
             },
           },
+          linkedCompetences: ['Competence 3', 'Competence 4'],
         },
       ];
 
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts
index f74a60c3..96847f68 100644
--- a/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts
+++ b/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts
@@ -1,4 +1,4 @@
-import { ManfredAwesomicCV } from '@/model';
+import { Competence, ManfredAwesomicCV } from '@/model';
 import { CountryType, Institution, StudiesSectionVm, StudyTypeWithTranslation } from './studies-section.vm';
 import { studiesTypes, countryList } from './studies-section.constants';
 import { sortedStudiesByStartDate } from './studies-section.helpers';
@@ -16,17 +16,18 @@ export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSe
       const description = study?.description ?? '';
       let institution: Institution = {
         name: study?.institution?.name ?? '',
+        description: study?.institution?.description ?? '',
         location: {
           country: study?.institution?.location?.country ?? '',
           region: study?.institution?.location?.region ?? '',
           address: study?.institution?.location?.address ?? '',
         },
       };
-
       const mapStudyType = mapStudiesTypes(studyType, studiesTypes);
       const mapCountry = mapCountries(institution.location.country, countryList);
       institution = { ...institution, location: { ...institution.location, country: mapCountry } };
-
+      const linkedCompetences: Competence[] = study?.linkedCompetences ?? [];
+      const mapLinkedCompetence = linkedCompetences.map(competence => competence.name);
       return {
         name,
         studyType: mapStudyType,
@@ -35,6 +36,7 @@ export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSe
         finishDate,
         description,
         institution,
+        linkedCompetences: mapLinkedCompetence,
       };
     }) ?? [];
 
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.vm.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.vm.ts
index ec088ff1..d3a88746 100644
--- a/packages/manfred-common/src/doc-parts/studies-section/studies-section.vm.ts
+++ b/packages/manfred-common/src/doc-parts/studies-section/studies-section.vm.ts
@@ -8,11 +8,13 @@ export interface StudiesSectionVm {
   finishDate: string;
   description: string;
   institution: Institution;
+  linkedCompetences: string[];
 }
 
 export interface Institution {
   name: string;
   location: Location;
+  description: string;
 }
 
 export interface Location {
diff --git a/packages/manfred-common/src/model/manfred-schema.model.ts b/packages/manfred-common/src/model/manfred-schema.model.ts
index 94178717..96e38b3d 100644
--- a/packages/manfred-common/src/model/manfred-schema.model.ts
+++ b/packages/manfred-common/src/model/manfred-schema.model.ts
@@ -398,6 +398,6 @@ export interface Role {
  */
 export interface Competence {
   name: string;
-  type: 'tool' | 'technology' | 'practice' | 'hardware' | 'domain';
+  type?: 'tool' | 'technology' | 'practice' | 'hardware' | 'domain';
   description?: string;
 }
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.ejs
index bc0d2b7a..360dffc7 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.ejs
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.ejs
@@ -4,7 +4,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" width="32" height="6" viewBox="0 0 32 6" fill="none">
         <path d="M5.51343e-07 3L32 3" stroke="#3BA0B7" stroke-width="6" />
       </svg>
-      <h2>Experiencia</h2>
+      <h2><%- labels.EXPERIENCE_CAREER_HEADING %></h2>
     </div>
     <%_ for(const experience of experienceCollection) { -%>
       <section class="main__section__item">
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.part.ts
index cad6e8b1..6e8a91f8 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.part.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.part.ts
@@ -1,16 +1,22 @@
 import { ExperienceVm, mapFromMacCvToExperienceSectionVm } from '@lemoncode/manfred-common/experience-section';
-import { ManfredAwesomicCV } from '@/model';
+import { ManfredAwesomicCV, Settings, Language } from '@/model';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { getLabels } from './labels';
 import ejs from 'ejs';
 import experienceTemplate from './experience-section.ejs?raw';
 
-export const generateExperienceSection = (cv: ManfredAwesomicCV): string => {
+export const generateExperienceSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
   const experienceSectionVm = mapFromMacCvToExperienceSectionVm(cv);
-  return generateExperienceSectionInner(experienceSectionVm);
+  return generateExperienceSectionInner(experienceSectionVm, settings.language);
 };
 
-const generateExperienceSectionInner = (experienceSectionVm: ExperienceVm[]): string => {
+const generateExperienceSectionInner = (
+  experienceSectionVm: ExperienceVm[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
   const rootObject = {
     experienceCollection: experienceSectionVm,
+    labels: getLabels(language),
   };
   return ejs.render(experienceTemplate, rootObject);
 };
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-english-labels.const.ts
new file mode 100644
index 00000000..32bfca4b
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-english-labels.const.ts
@@ -0,0 +1,5 @@
+import { ExperienceLabels } from './experience-label.model';
+
+export const englishExperienceLabels: ExperienceLabels = {
+  EXPERIENCE_CAREER_HEADING: 'Experience / Career',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-label.model.ts
new file mode 100644
index 00000000..6f3c04e3
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-label.model.ts
@@ -0,0 +1,3 @@
+export interface ExperienceLabels {
+  EXPERIENCE_CAREER_HEADING: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-spanish-labels.const.ts
new file mode 100644
index 00000000..40dee25d
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/experience-spanish-labels.const.ts
@@ -0,0 +1,5 @@
+import { ExperienceLabels } from './experience-label.model';
+
+export const spanishExperienceLabels: ExperienceLabels = {
+  EXPERIENCE_CAREER_HEADING: 'Experiencia / Carrera',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/index.ts
new file mode 100644
index 00000000..bf9c695e
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { ExperienceLabels } from './experience-label.model';
+import { spanishExperienceLabels } from './experience-spanish-labels.const';
+import { englishExperienceLabels } from './experience-english-labels.const';
+
+export const getLabels = (language: Language): ExperienceLabels => {
+  switch (language) {
+    case 'es':
+      return spanishExperienceLabels;
+    case 'en':
+      return englishExperienceLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.ejs
index d04afbab..82129716 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.ejs
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.ejs
@@ -4,7 +4,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" width="32" height="6" viewBox="0 0 32 6" fill="none">
         <path d="M5.51343e-07 3L32 3" stroke="#3BA0B7" stroke-width="6" />
       </svg>
-      <h2>Competencias</h2>
+      <h2><%- labels.HARD_SKILLS_HEADING %></h2>
     </div>
     <ul class="ul__technologies">
       <%_ for (const item of hardSkillsCollection) { -%>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.part.ts
index a5cf88df..3b815663 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.part.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/hard-skills-section.part.ts
@@ -1,16 +1,22 @@
-import { ManfredAwesomicCV } from '@/model';
+import { ManfredAwesomicCV, Settings, Language } from '@/model';
 import { HardSkillVM, mapFromCvToHardSkillVm } from '@lemoncode/manfred-common/hard-skill-section';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { getLabels } from './labels';
 import ejs from 'ejs';
 import hardSkillsTemplate from './hard-skills-section.ejs?raw';
 
-export const generateHardSkillsSection = (cv: ManfredAwesomicCV): string => {
+export const generateHardSkillsSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
   const hardSkillsSectionVm = mapFromCvToHardSkillVm(cv);
-  return generateHardSkillSectionInner(hardSkillsSectionVm);
+  return generateHardSkillSectionInner(hardSkillsSectionVm, settings.language);
 };
 
-const generateHardSkillSectionInner = (hardSkillsSectionVm: HardSkillVM[]): string => {
+const generateHardSkillSectionInner = (
+  hardSkillsSectionVm: HardSkillVM[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
   const rootObject = {
     hardSkillsCollection: hardSkillsSectionVm,
+    labels: getLabels(language),
   };
   return ejs.render(hardSkillsTemplate, rootObject);
 };
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-english-labels.const.ts
new file mode 100644
index 00000000..57fc749e
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-english-labels.const.ts
@@ -0,0 +1,5 @@
+import { HardSkillsLabels } from './hard-skills-label.model';
+
+export const englishHardSkillsLabels: HardSkillsLabels = {
+  HARD_SKILLS_HEADING: 'Hard Skills',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-label.model.ts
new file mode 100644
index 00000000..c054c0db
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-label.model.ts
@@ -0,0 +1,3 @@
+export interface HardSkillsLabels {
+  HARD_SKILLS_HEADING: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-spanish-labels.const.ts
new file mode 100644
index 00000000..688d9216
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/hard-skills-spanish-labels.const.ts
@@ -0,0 +1,5 @@
+import { HardSkillsLabels } from './hard-skills-label.model';
+
+export const spanishHardSkillsLabels: HardSkillsLabels = {
+  HARD_SKILLS_HEADING: 'Competencias',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/index.ts
new file mode 100644
index 00000000..2c8f54f5
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/hard-skills-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { HardSkillsLabels } from './hard-skills-label.model';
+import { spanishHardSkillsLabels } from './hard-skills-spanish-labels.const';
+import { englishHardSkillsLabels } from './hard-skills-english-labels.const';
+
+export const getLabels = (language: Language): HardSkillsLabels => {
+  switch (language) {
+    case 'es':
+      return spanishHardSkillsLabels;
+    case 'en':
+      return englishHardSkillsLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/index.ts
index 1fe2699c..c79bff55 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/index.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/index.ts
@@ -1 +1 @@
-export * from './langauge-section.part';
+export * from './language-section.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/index.ts
new file mode 100644
index 00000000..eca31dab
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { LanguageLabels } from './language-label.model';
+import { spanishLanguageLabels } from './language-spanish-labels.const';
+import { englishLanguageLabels } from './language-english-labels.const';
+
+export const getLabels = (language: Language): LanguageLabels => {
+  switch (language) {
+    case 'es':
+      return spanishLanguageLabels;
+    case 'en':
+      return englishLanguageLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-english-labels.const.ts
new file mode 100644
index 00000000..62a2acf8
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-english-labels.const.ts
@@ -0,0 +1,9 @@
+import { LanguageLabels } from './language-label.model';
+
+export const englishLanguageLabels: LanguageLabels = {
+  LANGUAGE_HEADING: 'Languages',
+  LEVEL_ONE: 'Native/Bilingual',
+  LEVEL_TWO: 'Fluent',
+  LEVEL_THREE: 'Intermediate',
+  LEVEL_FOUR: 'Basic',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-label.model.ts
new file mode 100644
index 00000000..8b966ee7
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-label.model.ts
@@ -0,0 +1,7 @@
+export interface LanguageLabels {
+  LANGUAGE_HEADING: string;
+  LEVEL_ONE: string;
+  LEVEL_TWO: string;
+  LEVEL_THREE: string;
+  LEVEL_FOUR: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-spanish-labels.const.ts
new file mode 100644
index 00000000..3b285d9f
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/labels/language-spanish-labels.const.ts
@@ -0,0 +1,9 @@
+import { LanguageLabels } from './language-label.model';
+
+export const spanishLanguageLabels: LanguageLabels = {
+  LANGUAGE_HEADING: 'Idiomas',
+  LEVEL_ONE: 'Nativo/Bilingue',
+  LEVEL_TWO: 'Fluido',
+  LEVEL_THREE: 'Intermedio',
+  LEVEL_FOUR: 'Basico',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/langauge-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/langauge-section.part.ts
deleted file mode 100644
index fba81325..00000000
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/langauge-section.part.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ManfredAwesomicCV } from '@/model';
-import { LanguageVm, mapFromCvToLanguageVm } from '@lemoncode/manfred-common/language-section';
-import ejs from 'ejs';
-import languageSection from './language-section.ejs?raw';
-
-export const generateLanguageSection = (cv: ManfredAwesomicCV): string => {
-  const languageSectionVm = mapFromCvToLanguageVm(cv);
-  return generateLanguageSectionInner(languageSectionVm);
-};
-
-const generateLanguageSectionInner = (languageSectionVm: LanguageVm[]): string => {
-  const rootObject = {
-    languageCollection: languageSectionVm,
-  };
-  return ejs.render(languageSection, rootObject);
-};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.ejs
index 19c27411..ca966a0c 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.ejs
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.ejs
@@ -4,45 +4,48 @@
       <svg xmlns="http://www.w3.org/2000/svg" width="32" height="6" viewBox="0 0 32 6" fill="none">
         <path d="M5.51343e-07 3L32 3" stroke="#3BA0B7" stroke-width="6" />
       </svg>
-      <h2>Idiomas</h2>
+      <h2><%= labels.LANGUAGE_HEADING %></h2>
     </div>
     <ul class="ul__languages">
       <%_ for(const language of languageCollection) { -%>
         <li class="li__languages"><%= language.name %>
           <div class="main__lang__level">
-            <%_ if(language.level === 'Habilidad básica' || language.level === 'Habilidad limitada en el trabajo') { -%>
+            <%_ if(language.level === 'Elementary proficiency' || language.level === 'Limited working proficiency') { -%>
               <svg xmlns="http://www.w3.org/2000/svg" width="137" height="29" viewBox="0 0 137 29" fill="none">
                 <path d="M0 28.9997L28.8421 22.8945V28.9997L0 28.9997Z" fill="#78D549" />
                 <path d="M36.0528 21.3681L64.8949 15.2568V28.9998H36.0528V21.3681Z" fill="#EBE8DF" />
                 <path d="M72.1055 13.7338L100.948 7.62939V28.9998H72.1055V13.7338Z" fill="#EBE8DF" />
                 <path d="M108.158 6.10749L137 0V29H108.158V6.10749Z" fill="#EBE8DF" />
               </svg>
+              <p><%= labels.LEVEL_FOUR %></p>
             <%_ } -%>
-            <%_ if(language.level === 'Habilidad profesional completo') { -%>
+            <%_ if(language.level === 'Professional working proficiency') { -%>
               <svg xmlns="http://www.w3.org/2000/svg" width="137" height="29" viewBox="0 0 137 29" fill="none">
                 <path d="M0 28.9997L28.8421 22.8945V28.9997L0 28.9997Z" fill="#78D549" />
                 <path d="M36.0528 21.3681L64.8949 15.2568V28.9998H36.0528V21.3681Z" fill="#78D549" />
                 <path d="M72.1055 13.7338L100.948 7.62939V28.9998H72.1055V13.7338Z" fill="#78D549" />
                 <path d="M108.158 6.10749L137 0V29H108.158V6.10749Z" fill="#EBE8DF" />
               </svg>
+              <p><%= labels.LEVEL_THREE %></p>
             <%_ } -%>
-            <%_ if(language.level === 'Habilidad profesional en el trabajo') { -%>
+            <%_ if(language.level === 'Full professional proficiency') { -%>
               <svg xmlns="http://www.w3.org/2000/svg" width="137" height="29" viewBox="0 0 137 29" fill="none">
                 <path d="M0 28.9997L28.8421 22.8945V28.9997L0 28.9997Z" fill="#78D549" />
                 <path d="M36.0528 21.3681L64.8949 15.2568V28.9998H36.0528V21.3681Z" fill="#78D549" />
                 <path d="M72.1055 13.7338L100.948 7.62939V28.9998H72.1055V13.7338Z" fill="#EBE8DF" />
                 <path d="M108.158 6.10749L137 0V29H108.158V6.10749Z" fill="#EBE8DF" />
               </svg>
+              <p><%= labels.LEVEL_TWO %></p>
             <%_ } -%>
-            <%_ if(language.level === 'Habilidad nativo o bilingüe') { -%>
+            <%_ if(language.level === 'Native or bilingual proficiency') { -%>
               <svg xmlns="http://www.w3.org/2000/svg" width="137" height="29" viewBox="0 0 137 29" fill="none">
                 <path d="M0 28.9997L28.8421 22.8945V28.9997L0 28.9997Z" fill="#78D549" />
                 <path d="M36.0528 21.3681L64.8949 15.2568V28.9998H36.0528V21.3681Z" fill="#78D549" />
                 <path d="M72.1055 13.7338L100.948 7.62939V28.9998H72.1055V13.7338Z" fill="#78D549" />
                 <path d="M108.158 6.10749L137 0V29H108.158V6.10749Z" fill="#78D549" />
               </svg>
+              <p><%= labels.LEVEL_ONE %></p>
             <%_ } -%>
-            <p><%= language.level %></p>
           </div>
         </li>
       <%_ } -%>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.part.ts
new file mode 100644
index 00000000..7ed3bf96
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/language-section/language-section.part.ts
@@ -0,0 +1,22 @@
+import { ManfredAwesomicCV, Settings, Language } from '@/model';
+import { LanguageVm, mapFromCvToLanguageVm } from '@lemoncode/manfred-common/language-section';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { getLabels } from './labels';
+import ejs from 'ejs';
+import languageTemplate from './language-section.ejs?raw';
+
+export const generateLanguageSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
+  const languageSectionVm = mapFromCvToLanguageVm(cv);
+  return generateLanguageSectionInner(languageSectionVm, settings.language);
+};
+
+const generateLanguageSectionInner = (
+  languageSectionVm: LanguageVm[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
+  const rootObject = {
+    languageCollection: languageSectionVm,
+    labels: getLabels(language),
+  };
+  return ejs.render(languageTemplate, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/index.ts
new file mode 100644
index 00000000..9529c12a
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { SoftSkillsLabels } from './soft-skills-label.model';
+import { spanishSoftSkillsLabels } from './soft-skills-spanish-labels.const';
+import { englishSoftSkillsLabels } from './soft-skills-english-labels.const';
+
+export const getLabels = (language: Language): SoftSkillsLabels => {
+  switch (language) {
+    case 'es':
+      return spanishSoftSkillsLabels;
+    case 'en':
+      return englishSoftSkillsLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-english-labels.const.ts
new file mode 100644
index 00000000..d2510c35
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-english-labels.const.ts
@@ -0,0 +1,5 @@
+import { SoftSkillsLabels } from './soft-skills-label.model';
+
+export const englishSoftSkillsLabels: SoftSkillsLabels = {
+  SOFT_SKILLS_HEADING: 'Soft skills',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-label.model.ts
new file mode 100644
index 00000000..602ec990
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-label.model.ts
@@ -0,0 +1,3 @@
+export interface SoftSkillsLabels {
+  SOFT_SKILLS_HEADING: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-spanish-labels.const.ts
new file mode 100644
index 00000000..446d1fe1
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/labels/soft-skills-spanish-labels.const.ts
@@ -0,0 +1,5 @@
+import { SoftSkillsLabels } from './soft-skills-label.model';
+
+export const spanishSoftSkillsLabels: SoftSkillsLabels = {
+  SOFT_SKILLS_HEADING: 'Habilidades',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.ejs
index de6ff876..4972f6cd 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.ejs
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.ejs
@@ -4,7 +4,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" width="32" height="6" viewBox="0 0 32 6" fill="none">
         <path d="M5.51343e-07 3L32 3" stroke="#3BA0B7" stroke-width="6" />
       </svg>
-      <h2>Habilidades</h2>
+      <h2><%= labels.SOFT_SKILLS_HEADING %></h2>
     </div>
     <ul class="main__section__skills__ul">
       <%_ for(const softSkill of softSkillsCollection) { -%>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.part.ts
index f95c24f6..1fd60b55 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.part.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/soft-skills-section/soft-skills-section.part.ts
@@ -1,16 +1,22 @@
 import { SoftSkillVM, mapFromCvToSoftSkillVm } from '@lemoncode/manfred-common/soft-skill-section';
-import { ManfredAwesomicCV } from '@/model';
+import { ManfredAwesomicCV, Settings, Language } from '@/model';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { getLabels } from './labels';
 import ejs from 'ejs';
 import softSkillsTemplate from './soft-skills-section.ejs?raw';
 
-export const generateSoftSkillsSection = (cv: ManfredAwesomicCV): string => {
+export const generateSoftSkillsSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
   const softSkillsSectionVm = mapFromCvToSoftSkillVm(cv);
-  return generateSoftSkillsSectionInner(softSkillsSectionVm);
+  return generateSoftSkillsSectionInner(softSkillsSectionVm, settings.language);
 };
 
-const generateSoftSkillsSectionInner = (softSkillsSectionVm: SoftSkillVM[]): string => {
+const generateSoftSkillsSectionInner = (
+  softSkillsSectionVm: SoftSkillVM[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
   const rootObject = {
     softSkillsCollection: softSkillsSectionVm,
+    labels: getLabels(language),
   };
   return ejs.render(softSkillsTemplate, rootObject);
 };
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/index.ts
new file mode 100644
index 00000000..d0f8daeb
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { StudiesLabels } from './studies-label.model';
+import { spanishStudiesLabels } from './studies-spanish-labels.const';
+import { englishStudiesLabels } from './studies-english-labels.const';
+
+export const getLabels = (language: Language): StudiesLabels => {
+  switch (language) {
+    case 'es':
+      return spanishStudiesLabels;
+    case 'en':
+      return englishStudiesLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts
new file mode 100644
index 00000000..b6c79a75
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts
@@ -0,0 +1,7 @@
+import { StudiesLabels } from './studies-label.model';
+
+export const englishStudiesLabels: StudiesLabels = {
+  STUDIES_HEADING: 'Studies',
+  TECH_TOOLS_HEADING: 'Technologies and Tools',
+  CURRENT_DATE: 'Now',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts
new file mode 100644
index 00000000..2337736a
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts
@@ -0,0 +1,5 @@
+export interface StudiesLabels {
+  STUDIES_HEADING: string;
+  TECH_TOOLS_HEADING: string;
+  CURRENT_DATE: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts
new file mode 100644
index 00000000..328dfbb9
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts
@@ -0,0 +1,7 @@
+import { StudiesLabels } from './studies-label.model';
+
+export const spanishStudiesLabels: StudiesLabels = {
+  STUDIES_HEADING: 'Estudios',
+  TECH_TOOLS_HEADING: 'Tecnologias y Herramientas',
+  CURRENT_DATE: 'Actualidad',
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs
index e933efc5..bf6688fa 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs
@@ -4,7 +4,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" width="32" height="6" viewBox="0 0 32 6" fill="none">
         <path d="M5.51343e-07 3L32 3" stroke="#3BA0B7" stroke-width="6" />
       </svg>
-      <h2>Educación</h2>
+      <h2><%= labels.STUDIES_HEADING</h2>
     </div>
     <%_ for (const study of studiesCollection) { -%>
       <section class="main__section__item">
@@ -27,7 +27,7 @@
             <%- new Date(study.startDate).toLocaleDateString(undefined, { year:"numeric", month:"short"})%> <%_ if(study.finishDate && study.finishDate.toLowerCase() !=='actualidad') { -%>
             <%- "- "+new Date(study.finishDate).toLocaleDateString(undefined, { year:"numeric", month:"short"}) -%>
             <%_ } else { -%>
-            - Actualidad
+            - <%= labels.CURRENT_DATE %>
             <%_}-%>
           </p>
         </div>
@@ -35,7 +35,7 @@
           <p><%= study.institution.description %></p>
         </div>
         <%_ if(study.linkedCompetences && study.linkedCompetences.length !== 0) { -%>
-          <h3 class="tech__tools__heading">Tecnologías y Herramientas</h3>
+          <h3 class="tech__tools__heading"><%= labels.TECH_TOOLS_HEADING  %></h3>
           <ul class="ul__technologies">
             <%_ for(const competence of study.linkedCompetences) { -%>
               <li class="li__technologies"><%= competence %></li>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts
index 8a60bbfb..bc3ce12e 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts
@@ -1,14 +1,22 @@
+import { StudiesSectionVm, mapFromMacCvToStudiesSectionVm } from '@lemoncode/manfred-common/studies-section';
+import { ManfredAwesomicCV, Settings, Language } from '@/model';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { getLabels } from './labels';
 import ejs from 'ejs';
 import studiesTemplate from './studies-section.ejs?raw';
-import { StudiesSectionVm, mapFromMacCvToStudiesSectionVm } from '@lemoncode/manfred-common/studies-section';
-import { ManfredAwesomicCV } from '@/model';
 
-export const generateStudiesSection = (cv: ManfredAwesomicCV): string => {
+export const generateStudiesSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
   const studiesSectionVm = mapFromMacCvToStudiesSectionVm(cv);
-  return generateStudiesSectionInner(studiesSectionVm);
+  return generateStudiesSectionInner(studiesSectionVm, settings.language);
 };
 
-const generateStudiesSectionInner = (studiesSectionVm: StudiesSectionVm[]): string => {
-  const rootObject = { studiesCollection: studiesSectionVm };
+const generateStudiesSectionInner = (
+  studiesSectionVm: StudiesSectionVm[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
+  const rootObject = {
+    studiesCollection: studiesSectionVm,
+    labels: getLabels(language),
+  };
   return ejs.render(studiesTemplate, rootObject);
 };
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
index 63eda005..010223d0 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
@@ -24,13 +24,13 @@ export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesom
   const headerSection = generateHeaderSection(manfredJsonContent);
   const mainElementStart = generateMainElementStart();
   const mainElementEnd = generateMainElementEnd();
-  const languageSection = generateLanguageSection(manfredJsonContent);
-  const hardSkillsSection = generateHardSkillsSection(manfredJsonContent);
-  const softSkillsSection = generateSoftSkillsSection(manfredJsonContent);
-  const experienceSection = generateExperienceSection(manfredJsonContent);
-  const studiesSection = generateStudiesSection(manfredJsonContent);
   const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent, settings);
   const aboutMeSection = generateAboutMeSection(manfredJsonContent);
+  const studiesSection = generateStudiesSection(manfredJsonContent, settings);
+  const experienceSection = generateExperienceSection(manfredJsonContent, settings);
+  const softSkillsSection = generateSoftSkillsSection(manfredJsonContent, settings);
+  const hardSkillsSection = generateHardSkillsSection(manfredJsonContent, settings);
+  const languageSection = generateLanguageSection(manfredJsonContent, settings);
   return `
     ${htmlDocumentStart}
       ${headerElementStart}