diff --git a/pages/_data/resume.json b/pages/_data/resume.json
index dc41223..e3acea5 100644
--- a/pages/_data/resume.json
+++ b/pages/_data/resume.json
@@ -1,29 +1,53 @@
 {
   "name": "Laurent Fainsin",
 
-  "meta": {
-    "format": "FRESH@0.6.0",
-    "version": "0.2.0"
-  },
-
   "info": {
     "label": "CS Engineering Student",
-    "brief": "A brief description of yourself as a candidate that appears in some résumé themes.",
-    "image": "super photo"
-  },
-  "contact": {
-    "website": "https://www.bde.inp-toulouse.fr/~fainsil/",
-    "phone": "+33781492838",
-    "email": "laurentfainsin@protonmail.com"
+    "brief": "Lorem ipsum, dolor sit amet consectetur adipisicing elit. Porro quo modi maiores debitis iure suscipit nobis labore tempora laudantium hic dignissimos nam dolores."
   },
+
+  "contacts": [
+    {
+      "type": "email",
+      "link": "laurentfainsin@protonmail.com",
+      "prefix": "mailto:",
+      "icon": "far fa-envelope"
+    },
+    {
+      "type": "phone",
+      "link": "+33781492838",
+      "prefix": "tel:",
+      "icon": "fas fa-phone"
+    },
+    {
+      "type": "website",
+      "link": "https://www.bde.inp-toulouse.fr/~fainsil/",
+      "prefix": "",
+      "icon": "fas fa-globe"
+    }
+  ],
+
   "location": {
-    "city": "Brest",
-    "country": "France"
+    "address": "Brest, France",
+    "link": "https://www.openstreetmap.org/#map=12/48.3930/-4.4601",
+    "icon": "fas fa-map-marker"
   },
-  "social": [
+
+  "socials": [
     {
       "network": "LinkedIn",
-      "url": "https://www.linkedin.com/in/laurent-fainsin/"
+      "url": "https://www.linkedin.com/in/laurent-fainsin/",
+      "icon": "fab fa-linkedin-in"
+    },
+    {
+      "network": "GitHub",
+      "url": "https://github.com/Laurent2916",
+      "icon": "fab fa-github"
+    },
+    {
+      "network": "Matrix.to",
+      "url": "https://matrix.to/#/@fainsil:inpt.fr",
+      "icon": "far fa-comments"
     }
   ],
 
@@ -73,8 +97,7 @@
   ],
 
   "education": {
-    "level": "degree",
-    "degree": "Master",
+    "level": "Master degree",
     "history": [
       {
         "institution": "ENSEEIHT",
@@ -84,7 +107,7 @@
         "end": "2023"
       },
       {
-        "institution": "Prépa Kérichen/Vauban",
+        "institution": "Lycée Kérichen/Vauban",
         "title": "CPGE PSI",
         "url": "http://www.lycee-kerichen.org/",
         "start": "2018",
@@ -100,40 +123,36 @@
     ]
   },
 
-  "skills": {
-    "sets": [
-      {
-        "name": "Web Development",
-        "level": "beginner",
-        "skills": [
-          "HTML 5",
-          "CSS 3",
-          "JavaScript",
-          "Node.js",
-          "11ty.js"
-        ]
-      },
-      {
-        "name": "General Softwares",
-        "level": "intermediate",
-        "skills": [
-          "Word",
-          "Excel",
-          "LaTeX",
-          "Linux"
-        ]
-      },
-      {
-        "name": "Scientific Computing",
-        "level": "intermediate",
-        "skills": [
-          "Matlab",
-          "Octave",
-          "Numpy"
-        ]
-      }
-    ]
-  },
+  "skills": [
+    {
+      "name": "Web Development",
+      "level": "beginner",
+      "tags": [
+        "HTML 5",
+        "CSS 3",
+        "JavaScript",
+        "11ty.js"
+      ]
+    },
+    {
+      "name": "General Softwares",
+      "level": "intermediate",
+      "tags": [
+        "Word",
+        "Excel",
+        "LaTeX",
+        "Linux"
+      ]
+    },
+    {
+      "name": "Scientific Computing",
+      "level": "intermediate",
+      "tags": [
+        "Matlab",
+        "Numpy"
+      ]
+    }
+  ],
 
   "writing": [
     {
@@ -229,31 +248,38 @@
   "languages": [
     {
       "language": "French",
-      "level": "native"
+      "level": "native",
+      "icon": "flag-icon flag-icon-fr"
     },
     {
       "language": "English",
-      "level": "bilingual"
+      "level": "bilingual",
+      "icon": "flag-icon flag-icon-gb"
     },
     {
       "language": "Japanese",
-      "level": "beginner"
+      "level": "beginner",
+      "icon": "flag-icon flag-icon-jp"
     },
     {
       "language": "Spanish",
-      "level": "basic"
+      "level": "basic",
+      "icon": "flag-icon flag-icon-es"
     },
     {
       "language": "Python",
-      "level": "intermediate"
+      "level": "intermediate",
+      "icon": "devicon-python-plain"
     },
     {
       "language": "C",
-      "level": "beginner"
+      "level": "beginner",
+      "icon": "devicon-c-plain"
     },
     {
       "language": "Rust.rs",
-      "level": "beginner"
+      "level": "beginner",
+      "icon": "devicon-rust-plain"
     }
   ],
   
@@ -263,7 +289,8 @@
       "summary": "Regular GitHub user and tinkerer.",
       "keywords": [
         "GitHub",
-        "git"
+        "git",
+        "Open Source"
       ]
     },
     {
@@ -290,7 +317,28 @@
       "name": "Climbing",
       "summary": "Nice way to get relief from stress",
       "keywords": [
-        "Climbing"
+        "Climbing",
+        "Strength"
+      ]
+    },
+    {
+      "name": "Aquariums",
+      "summary": "Tamagochis but with real responsabilities.",
+      "keywords": [
+        "Aquarium",
+        "Water",
+        "Fish",
+        "Patience"
+      ]
+    },
+    {
+      "name": "Plants",
+      "summary": "The environnement is a cool thing",
+      "keywords": [
+        "Plants",
+        "Trees",
+        "Gardening",
+        "Ecological"
       ]
     }
   ]
diff --git a/pages/css/resume.css b/pages/css/resume.css
index 47a2e8f..9b463e0 100644
--- a/pages/css/resume.css
+++ b/pages/css/resume.css
@@ -23,7 +23,7 @@ ul {
   padding-left: 15px;
 }
 
-li {
+.timeline > li {
   margin: 0;
 }
 
@@ -33,20 +33,17 @@ li.event {
   border-left: 2px solid;
 }
 
-.li {
-  display: flex;
+.tag {
+  display: inline;
+  border-bottom: 2px #283593 solid;
+  border-radius: 0.2em;
+  margin: .3em .3em 1em 0;
 }
 
-.fab {
-  order:1;
-  background-color: rgba(200,520,266,.75);
-  border-color: #b4b4b4;
-  width: 50px;
+small {
+  font-size: 15px;
 }
 
-.title, .description {
-  order:2;
-  background-color: rgba(145,223,0,.75);
-  border-color: transparent;
-  width: 50px;
+h2 > small {
+  font-size: 18px;
 }
\ No newline at end of file
diff --git a/pages/resume/index.njk b/pages/resume/index.njk
index 97ddd9e..033d2eb 100644
--- a/pages/resume/index.njk
+++ b/pages/resume/index.njk
@@ -13,7 +13,9 @@ username: Laureηt
     <link rel="stylesheet" href="{{ '/css/blink.css' | url }}">
     <link rel="shortcut icon" type="image/x-icon" href="{{ '/favicon.ico' | url }}">
     <script src="{{ '/javascript/chaffle.min.js' | url }}"></script>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.5.0/css/flag-icon.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/devicon/2.6/devicon.min.css" rel="stylesheet">
 </head>
 <body>
     
@@ -25,8 +27,8 @@ username: Laureηt
     <div class="row">
       <div class="col-1">
         
-        <h2>About</h2>
-        <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Atque quo libero nesciunt et dolorum hic aperiam eligendi neque nihil facilis cum sint corrupti, incidunt eum voluptas nisi reiciendis accusamus repellendus?</p>
+        <h2>{{ resume.name }} <small>({{ resume.info.label }})</small></h2>
+        <p>{{ resume.info.brief }}</p>
         
         <h2>Projects</h2>
 
@@ -40,44 +42,75 @@ username: Laureηt
       <div class="col-2">
 
         <h2>Contacts</h2>
-        <ul class="list">
+        <ul>
+          
+          {% for contact in resume.contacts %}
           <li>
-            <div class="fab fa-github"></div>
-            <div class="title">GitHub
-              <div class="description">Laurent2916</div>
-            </div>
+            <span class="{{ contact.icon }}"></span>
+            <a href="{{ contact.prefix + contact.link }}">
+              {% if contact.type == 'website' %}
+                Personnal website
+              {% else %}
+                {{ contact.link }}
+              {% endif %}
+            </a>
           </li>
+          {% endfor %}
+          
+          <li>
+            <span class="{{ resume.location.icon }}"></span>
+            <a href="{{ resume.location.link }}">{{ resume.location.address }}</a>
+          </li>
+        </ul>
 
-          <li>Lorem ipsum dolor sit amet.</li>
-          <li>Lorem ipsum dolor sit amet.</li>
-          <li>Lorem ipsum dolor sit amet.</li>
+        <h2>Socials</h2>
+        <ul>
+          {% for social in resume.socials %}
+          <li>
+            <span class="{{social.icon}}"></span>
+            <a href="{{social.url}}">{{social.network}}</a>
+          </li>
+          {% endfor %}
         </ul>
 
         <h2>Education</h2>
         <ul class="timeline">
           <li class="event"></li>
-          <li class="year">2023</li>
-          <li class="event">ingé</li>
-          <li class="year">2020</li>
-          <li class="event">prépa</li>
-          <li class="year">2018</li>
-          <li class="event">lycée</li>
-          <li class="year">2015</li>
+
+          <li class="year">{{ resume.education.history[0].end }}</li>
+          {% for edu in resume.education.history %}
+          <li class="event">
+            {{ edu.title }}<br>
+            <a href="{{ edu.url }}">{{ edu.institution }}</a>
+          </li>
+          <li class="year">{{ edu.start }}</li>
+          {% endfor %}
+
           <li class="event"></li>
         </ul>
         
         <h2>Skills</h2>
         <ul>
-          <li>Lorem ipsum dolor sit amet.</li>
-          <li>Lorem ipsum dolor sit amet.</li>
-          <li>Lorem ipsum dolor sit amet.</li>
+          {% for skill in resume.skills %}
+          <li>
+            {{ skill.name }} <small>({{ skill.level }})</small>
+            <ul>
+              {% for tag in skill.tags %}
+              <li class="tag">{{ tag }}</li>
+              {% endfor %}
+            </ul>
+        </li>
+          {% endfor %}
         </ul>
 
-        <h2>Interests</h2>
+        <h2>Languages</h2>
         <ul>
-          <li>Lorem ipsum dolor sit amet.</li>
-          <li>Lorem ipsum dolor sit amet.</li>
-          <li>Lorem ipsum dolor sit amet.</li>
+          {% for lang in resume.languages %}
+          <li>
+            <span class="{{ lang.icon }}"></span>
+            {{ lang.language }} <small>({{ lang.level }})</small>
+          </li>
+          {% endfor %}
         </ul>
 
       </div>