diff --git a/src/pages/index.liquid b/src/pages/index.liquid
index c89e211..882b4e7 100644
--- a/src/pages/index.liquid
+++ b/src/pages/index.liquid
@@ -6,27 +6,10 @@ permalink: /
 
 {% for subpage in collections.subpages %}
   {% if subpage.data.excludeFromList != true %}
-    {% if subpage.data.pageOrderId == 0 %}
-      {% include 'title.liquid' %}
+    {% if subpage.data.template == 'hero' %}
+      {% include 'hero.liquid' %}
     {% else %}
-      {% if subpage.data.sectionType == 'about' %}
-        {% include 'about.liquid' %}
-      {% else %}
-        {% include 'page.liquid' %}
-      {% endif %}
+      {% include 'page.liquid' %}
     {% endif %}
   {% endif %}
-{% endfor %}
-
-<!--{ % set postslist = collections.subpages % }-->
-<!--{ % include "partials/post-list.html" % }-->
-
-<!-- hero -->
-
-<!-- about -->
-
-<!-- projects -->
-
-<!-- experiences -->
-
-<!-- download -->
\ No newline at end of file
+{% endfor %}
\ No newline at end of file
diff --git a/src/pages/subpages/about.liquid b/src/pages/subpages/about.liquid
deleted file mode 100644
index 0af69d6..0000000
--- a/src/pages/subpages/about.liquid
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: About me
-pageOrderId: 1
-classes: 'wrapper about-section'
-sectionType: 'about'
-img: 
-  src: https://placehold.co/400
-  alt: This is a placeholder
----
-
-<p>Lorem ipsum dolor sit amet consectetur, adipisicing elit. Velit culpa dignissimos laborum, dolor voluptatem perspiciatis earum placeat modi minus officia perferendis rerum alias maiores deleniti et quia provident quo doloribus.</p>
\ No newline at end of file
diff --git a/src/pages/subpages/competences.liquid b/src/pages/subpages/competences.liquid
new file mode 100644
index 0000000..063692f
--- /dev/null
+++ b/src/pages/subpages/competences.liquid
@@ -0,0 +1,32 @@
+---
+title: Compétences WIP
+order: 1
+showTitle: false
+classes: 'competences-section experiences-section'
+---
+
+<div style="display: flex;flex-direction: row;gap:20rem;">
+  <div>
+    <h2>{{title}}</h2>
+    <ul style="list-style-type: initial">
+      <li>HTML</li>
+      <li>CSS</li>
+      <li>Bootstrap</li>
+      <li>Javascript</li>
+      <li>jQuery</li>
+      <li>Eleventy</li>
+    </ul>
+  </div>
+
+  <div>
+    <h2>Langues</h2>
+    <ul style="list-style-type: initial">
+      <li>HTML</li>
+      <li>CSS</li>
+      <li>Bootstrap</li>
+      <li>Javascript</li>
+      <li>jQuery</li>
+      <li>Eleventy</li>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/subpages/contact.liquid b/src/pages/subpages/contact.liquid
deleted file mode 100644
index de730b5..0000000
--- a/src/pages/subpages/contact.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Contact me
-pageOrderId: 5
-classes: 'wrapper-full contact-section'
-excludeFromNav: true
-excludeFromList: true
----
-
-<p>This is some "{{ title }}" content.</p>
-<p>Please don't</p>
\ No newline at end of file
diff --git a/src/pages/subpages/download.liquid b/src/pages/subpages/download.liquid
index 7ea3243..18d803e 100644
--- a/src/pages/subpages/download.liquid
+++ b/src/pages/subpages/download.liquid
@@ -1,12 +1,12 @@
 ---
 title: Download
 showTitle: false
-pageOrderId: 4
-classes: 'wrapper-full download-section'
+order: 4
+classes: 'download-section'
 ---
 
-<div class="flex-container column">
+<div class="flex-container justify-center">
     <p>You want to print this document ?</p>
-    <i></i>
+    <i>--></i>
     <button type="button" onclick="window.print()" class="btn icon--right icon-download">Download as PDF</button>
 </div>
\ No newline at end of file
diff --git a/src/pages/subpages/experiences.liquid b/src/pages/subpages/experiences.liquid
index 3203271..f680604 100644
--- a/src/pages/subpages/experiences.liquid
+++ b/src/pages/subpages/experiences.liquid
@@ -1,7 +1,7 @@
 ---
 title: Experiences
-pageOrderId: 3
-classes: 'wrapper-full experiences-section'
+order: 3
+classes: 'experiences-section'
 ---
 
 {% assign experiences = collections.experiences %}
diff --git a/src/pages/subpages/hero.liquid b/src/pages/subpages/hero.liquid
index 36d1ad0..1cec482 100644
--- a/src/pages/subpages/hero.liquid
+++ b/src/pages/subpages/hero.liquid
@@ -1,10 +1,8 @@
 ---
-title: Hi! I'm Thomas
-description: Welcome to my website
-pageOrderId: 0
-classes: 'wrapper-full hero-section'
-excludeFromNav: true
-excludeFromList: false
----
-
-<p>{{ description }}</p>
\ No newline at end of file
+title: About me
+order: 0
+template: 'hero'
+eleventyComputed:
+    description: "{{ author.about }}"
+    displayedTitle: "Moi c'est {{ author.name }}"
+---
\ No newline at end of file
diff --git a/src/pages/subpages/projects.liquid b/src/pages/subpages/projects.liquid
index 40f2b26..a969973 100644
--- a/src/pages/subpages/projects.liquid
+++ b/src/pages/subpages/projects.liquid
@@ -1,7 +1,7 @@
 ---
 title: Projects
-pageOrderId: 2
-classes: 'wrapper-full projects-section'
+order: 2
+classes: 'projects-section'
 ---
 
 {% assign projects = collections.projects %}