diff --git a/src/Pages/Software/SoftwareMain.js b/src/Pages/Software/SoftwareMain.js
index 5c9a186..0f40465 100644
--- a/src/Pages/Software/SoftwareMain.js
+++ b/src/Pages/Software/SoftwareMain.js
@@ -13,13 +13,32 @@ const SoftwareMain = () => {
             <MarkdownPage md={'Software/' + language + '/main.md'} />
             <hr />
 
+            <h2>{getString('education')}</h2>
+            {educationData.education.map((edu, index) => (
+                <div key={edu.name + index}>
+                    <h4>{edu.name}</h4>
+                    <h6>{edu.diploma}</h6>
+                    <p>{edu.school} - {edu.location}</p>
+                    <p>{edu.start} - {edu.end}</p>
+                </div>
+            ))}
+            <hr />
+            <h2>{getString('certification')}</h2>
+            {educationData.certifications.map((certification, index) => (
+                <div key={certification.name + index}>
+                    <h4>{certification.name}</h4>
+                    <h6><a href={certification.link}>{certification.institution}</a></h6>
+                    <p>{getString('issued')}: {certification.issueYear}</p>
+                </div>
+            ))}
+            <hr />
             <h2>{getString('courses')}</h2>
-            <div class="card-deck">
+            <div className="card-deck">
                 {educationData.courses.map((course, index) => (
-                    <div className='card courses-card' key={index}>
-                        <div class="card-body">
-                            <h5 class="card-title">{course.name}</h5>
-                            <p class="card-text">
+                    <div className='card courses-card' key={course.name + index}>
+                        <div className="card-body">
+                            <h5 className="card-title">{course.name}</h5>
+                            <p className="card-text">
                                 <i className='small'>{course.sub}, {course.instructor}</i>
                                 <br />
                                 <a href={course.link}>{course.intstitution}</a> | <a href={course.certificate}>certificate</a>
@@ -27,8 +46,8 @@ const SoftwareMain = () => {
                                 {getString('completed')}: {course.achieveDate}
                             </p>
                         </div>
-                        <div class="card-footer">
-                            <small class="text-muted">{course.duration} hours</small>
+                        <div className="card-footer">
+                            <small className="text-muted">{course.duration} hours</small>
                         </div>
                     </div>
                 ))}
diff --git a/src/Pages/Software/education.json b/src/Pages/Software/education.json
index 350567b..0e4d8e2 100644
--- a/src/Pages/Software/education.json
+++ b/src/Pages/Software/education.json
@@ -1,4 +1,20 @@
 {
+    "certifications": [
+        {
+            "name": "LPIC-1",
+            "institution": "Linux professional institute certification",
+            "link": "https://www.lpi.org/our-certifications/lpic-1-overview",
+            "issueYear": 2022,
+            "expiryYear": 2027
+        },
+        {
+            "name": "Drupal 9 Site Builder",
+            "institution": "Acquia",
+            "link": "https://certification.acquia.com/user/18196",
+            "issueYear": 2022,
+            "expiryYear": 9999
+        }
+    ],
     "courses": [
         {
             "name": "Docker Mastery",
@@ -30,5 +46,23 @@
             "link": "https://www.udemy.com/course/learn-linux-in-5-days/",
             "certificate": "https://www.matsubara.nl/udemy-certs/UC-0BB6GYJ1.pdf"
         }
+    ],
+    "education": [
+        {
+            "name": "Computer engineering of applied computer science",
+            "diploma": "Bachelor of computer science",
+            "school": "Avans Hogeschool",
+            "location": "Breda, Netherlands",
+            "start": 2012,
+            "end": 2016
+        },
+        {
+            "name": "Interactive media design",
+            "diploma": "MBO diploma",
+            "school": "Eindhovenseschool / Sint Lucas",
+            "location": "Eindhoven, Netherlands",
+            "start": 2009,
+            "end": 2012
+        }
     ]
 }
\ No newline at end of file
diff --git a/src/Pages/Software/en/main.md b/src/Pages/Software/en/main.md
index 0831c86..cd7256f 100644
--- a/src/Pages/Software/en/main.md
+++ b/src/Pages/Software/en/main.md
@@ -1,51 +1 @@
-Skills
-------
-
-#### Programming languages & Tools
-
-*   Python
-*   PHP
-*   Docker
-*   C#
-*   JavaScript
-*   Node JS
-*   Git
-*   Jenkins
-
-
-Education
----------
-
-#### Computer engineering of applied computer science
-
-###### Bachelor of computer science
-
-Avans Hogeschool - Breda, Netherlands
-
-2012 - 2016
-
-#### Interactive media design
-
-###### MBO diploma
-
-Eindhovenseschool / Sint Lucas - Eindhoven, Netherlands
-
-2009 - 2012
-
-
-Certification
--------------
-
-#### LPIC-1
-
-###### Linux professional institute certification
-
-[lpi.org](https://www.lpi.org/our-certifications/lpic-1-overview)
-
-2022 (expires in 2027)
-
-#### Drupal 9 Site Builder
-
-[acquia.com](https://certification.acquia.com/user/18196)
-
-2022
+Here are my skills, education and other snippits of professional value.
\ No newline at end of file
diff --git a/src/Pages/Software/nl/main.md b/src/Pages/Software/nl/main.md
index 3daa106..de3c815 100644
--- a/src/Pages/Software/nl/main.md
+++ b/src/Pages/Software/nl/main.md
@@ -1,51 +1 @@
-Vaardigheden
-------------
-
-#### Programmeertalen en tools
-
-*   Python
-*   PHP
-*   Docker
-*   C#
-*   JavaScript
-*   Node JS
-*   Git
-*   Jenkins
-
-
-Opleiding
----------
-
-#### Computer engineering of applied computer science
-
-###### Bachelor of computer science
-
-Avans Hogeschool - Breda
-
-2012 - 2016
-
-#### Interactieve media design
-
-###### MBO diploma
-
-Eindhovenseschool / Sint Lucas - Eindhoven
-
-2009 - 2012
-
-
-Certificering
--------------
-
-#### LPIC-1
-
-###### Linux professional institute certification
-
-[lpi.org](https://www.lpi.org/our-certifications/lpic-1-overview)
-
-2022 (verloopt 2027)
-
-#### Drupal 9 Site Builder
-
-[acquia.com](https://certification.acquia.com/user/18196)
-
-2022
+Hier staat mijn vaardigheden, opleiding en andere dingetjes van professionele waarde.
\ No newline at end of file