diff --git a/data/cv-en.json b/data/cv-en.json
index 1e67501..e95246d 100644
--- a/data/cv-en.json
+++ b/data/cv-en.json
@@ -128,7 +128,7 @@
     {
       "position": "Junior Technical Consultant",
       "company": "Gigya",
-      "companyURL": "https://www.gigya.com/",
+      "companyURL": "https://www.sap.com/uk/products/acquired-brands/what-is-gigya.html",
       "location": "Barcelona, Spain",
       "startDate": "2017-10",
       "endDate": "2019-10",
@@ -153,6 +153,7 @@
     {
       "position": "Fullstack Developer",
       "company": "Megabanner",
+      "expired": true,
       "location": "Barcelona, Spain",
       "startDate": "2016-12",
       "endDate": "2017-08",
@@ -176,6 +177,7 @@
     {
       "position": "Fullstack Developer",
       "company": "Ebantic",
+      "companyURL": "https://ebantic.com/en/",
       "location": "Barcelona, Spain",
       "startDate": "2016-09",
       "endDate": "2017-04",
@@ -194,7 +196,7 @@
         "CI/CD",
         "DevOps"
       ],
-      "companyLogo": "everis.png",
+      "companyLogo": "ebantic.png",
       "shortDescription": "API design and automated deployment pipelines. Software testing and scalability implementation."
     },
     {
@@ -241,6 +243,7 @@
     {
       "position": "Technical Director / Programmer",
       "company": "Emailing Network S.R.L.",
+      "companyURL": "https://business-people.es/economia/tradedoubler-adquiere-la-empresa-espantola-emailing-network/",
       "location": "Barcelona, Spain",
       "startDate": "2012-11",
       "endDate": "2015-06",
@@ -262,11 +265,13 @@
         "Reduced production times by 75% through optimized pipelines",
         "Successfully managed technical team and product development"
       ],
+      "companyLogo": "emailing-network.png",
       "shortDescription": "Technical Director leading development of backend and 5 websites. Reduced production times by 75%."
     },
     {
       "position": "Programmer Analyst (Freelance)",
       "company": "TwenTiC + ALTEN",
+      "companyURL": "https://www.twentic.com/kit-digital/",
       "location": "Barcelona, Spain",
       "startDate": "2012-05",
       "endDate": "2012-10",
@@ -281,11 +286,14 @@
         "MySQL",
         "JavaScript"
       ],
+      "companyLogo": "twentic.png",
       "shortDescription": "WordPress and PHP website development as freelance programmer."
     },
     {
       "position": "Analyst Programmer / Expert Technician",
       "company": "Penta MSI",
+      "companyURL": "http://pentamsi.com/",
+      "expired": true,
       "location": "Barcelona, Spain",
       "startDate": "2010-10",
       "endDate": "2011-11",
@@ -305,6 +313,8 @@
     {
       "position": "Senior Programmer",
       "company": "Homeria + WebRatio S.R.L.",
+      "companyURL": "http://webratio.com/",
+      "companyLogo": "webratio.png",
       "location": "Cáceres (Spain) / Como (Italy)",
       "startDate": "2008-01",
       "endDate": "2008-12",
@@ -324,6 +334,9 @@
     {
       "position": "Junior Programmer",
       "company": "Insa",
+      "companyURL": "http://insags.com/",
+      "companyLogo": "insa.png",
+      "expired": true,
       "location": "Cáceres, Spain",
       "startDate": "2006-09",
       "endDate": "2008-01",
@@ -651,7 +664,7 @@
       "issuer": "Universidad de Extremadura",
       "date": "2004-04",
       "description": "Academic scholarship for software development work",
-      "awardLogo": "teseo.png"
+      "awardLogo": "uex.png"
     }
   ],
   "certifications": [
diff --git a/data/cv-es.json b/data/cv-es.json
index 06451ea..ff19d09 100644
--- a/data/cv-es.json
+++ b/data/cv-es.json
@@ -153,6 +153,7 @@
     {
       "position": "Desarrollador Fullstack",
       "company": "Megabanner",
+      "expired": true,
       "location": "Barcelona, España",
       "startDate": "2016-12",
       "endDate": "2017-08",
@@ -291,6 +292,8 @@
     {
       "position": "Analista Programador / Técnico Experto",
       "company": "Penta MSI",
+      "companyURL": "http://pentamsi.com/",
+      "expired": true,
       "location": "Barcelona, España",
       "startDate": "2010-10",
       "endDate": "2011-11",
@@ -333,6 +336,7 @@
       "company": "Insa",
       "companyURL": "http://insags.com/",
       "companyLogo": "insa.png",
+      "expired": true,
       "location": "Cáceres, España",
       "startDate": "2006-09",
       "endDate": "2008-01",