diff --git a/README.md b/README.md
index 3eb1a32..d1a6aa3 100644
--- a/README.md
+++ b/README.md
@@ -3,62 +3,36 @@
     <h3>A passionate developer from France</h3>
 </div>
 
-<img src="https://komarev.com/ghpvc/?username=lucasvbr&amp;label=Profile%20views&amp;color=0e75b6&amp;style=flat" alt="Profile Views"/>
+<img src="https://komarev.com/ghpvc/?username=lucasvbr&amp;label=Profile%20views&amp;color=0e75b6&amp;style=flat" alt="Profile Views"> <img src="https://img.shields.io/freecodecamp/points/lucasvbr?label=FreeCodeCamp%20points" alt="freeCodeCamp points"> 
 
 <ul>
-    <li>🔭 I’m currently working on
-        <a href="https://github.com/LucasVbr/Portfolio">a new version of my portfolio</a>
-    </li>
+    <li>🔭 I’m currently working on <a href="https://github.com/LucasVbr/Portfolio">a new version of my portfolio</a></li>
     <li>🌱 I’m currently learning <b>Symfony</b></li>
     <li>📫 How to reach me <b>vabre.lucas.pro@gmail.com</b></li>
     <li>💻 Here is my <a href="https://lucasvbr.github.io/Portfolio">portfolio</a></li>
 </ul>
 
 <h3>Connect with me:</h3>
-<p>
-    <a href="https://codepen.io/LucasVbr"><img src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/codepen.svg" alt="CodePen" width="35px"></a>
-    <a href="www.linkedin.com/in/lucasvbr"><img src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="Linkedin" width="35px"></a>
-    <a href="https://www.root-me.org/LucasVbr?lang=fr"><img src="https://www.root-me.org/IMG/logo/siteon0.svg" alt="RootMe" width="35px"></a>
-    <a href="https://pydefis.callicode.fr/user/mhof/LucasVbr/bba98551173e6b21"><img src="https://pydefis.callicode.fr/static/callicode-vsm.png" alt="pydefis" width="35px"></a>
-</p>
-
+<p><a href="https://codepen.io/LucasVbr"><img src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/codepen.svg" alt="CodePen" width="35px"></a> <a href="www.linkedin.com/in/lucasvbr"><img src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="Linkedin" width="35px"></a> <a href="https://www.root-me.org/LucasVbr?lang=fr"><img src="https://www.root-me.org/IMG/logo/siteon0.svg" alt="RootMe" width="35px"></a> <a href="https://pydefis.callicode.fr/user/mhof/LucasVbr/bba98551173e6b21"><img src="https://pydefis.callicode.fr/static/callicode-vsm.png" alt="pydefis" width="35px"></a> </p>
 
 <h3>Language and Tools:</h3>
-<p>
-    <a href="https://www.w3.org/html/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/html5/html5-original-wordmark.svg" alt="html5" width="35px"></a>
-    <a href="https://www.w3schools.com/css/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/css3/css3-original-wordmark.svg" alt="css3" width="35px"></a>
-    <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/javascript/javascript-original.svg" alt="javascript" width="35px"></a>
-    <a href="https://pugjs.org"><img src="https://cdn.worldvectorlogo.com/logos/pug.svg" alt="pug" width="35px"></a>
-    <a href="https://sass-lang.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/sass/sass-original.svg" alt="sass" width="35px"></a>
-    <a href="https://www.typescriptlang.org/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/typescript/typescript-original.svg" alt="typescript" width="35px"></a>
-    <a href="https://www.php.net"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/php/php-original.svg" alt="php" width="35px"></a>
-    <a href="https://www.java.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/java/java-original.svg" alt="java" width="35px"></a>
-    <a href="https://www.cprogramming.com/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/c/c-original.svg" alt="c" width="35px"></a>
-    <a href="https://www.python.org"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/python/python-original.svg" alt="python" width="35px"></a>
-    <a href="https://www.gnu.org/software/bash/"><img src="https://www.vectorlogo.zone/logos/gnu_bash/gnu_bash-icon.svg" alt="bash" width="35px"></a>
-</p>
-<p>
-    <a href="https://getbootstrap.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/bootstrap/bootstrap-plain-wordmark.svg" alt="bootstrap" width="35px"></a>
-    <a href="https://bulma.io/"><img src="https://raw.githubusercontent.com/gilbarbara/logos/804dc257b59e144eaca5bc6ffd16949752c6f789/logos/bulma.svg" alt="bulma" width="35px"></a>
-    <a href="https://symfony.com"><img src="https://cdn.jsdelivr.net/gh/devicons/devicon/icons/symfony/symfony-original.svg" alt="symfony" width="35px"></a>
-    <a href="https://angular.io"><img src="https://angular.io/assets/images/logos/angular/angular.svg" alt="angular" width="35px"></a>
-</p>
-<p>
-    <a href="https://www.figma.com/"><img src="https://www.vectorlogo.zone/logos/figma/figma-icon.svg" alt="figma" width="35px"></a>
-    <a href="https://git-scm.com/"><img src="https://www.vectorlogo.zone/logos/git-scm/git-scm-icon.svg" alt="git" width="35px"></a>
-    <a href="https://mariadb.org/"><img src="https://www.vectorlogo.zone/logos/mariadb/mariadb-icon.svg" alt="mariadb" width="35px"></a>
-    <a href="https://www.microsoft.com/en-us/sql-server"><img src="https://www.svgrepo.com/show/303229/microsoft-sql-server-logo.svg" alt="mssql" width="35px"></a>
-    <a href="https://www.mysql.com/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/mysql/mysql-original-wordmark.svg" alt="mysql" width="35px"></a>
-    <a href="https://www.postgresql.org"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/postgresql/postgresql-original-wordmark.svg" alt="postgresql" width="35px"></a>
-    <a href="https://www.sqlite.org/"><img src="https://www.vectorlogo.zone/logos/sqlite/sqlite-icon.svg" alt="sqlite" width="35px"></a>
-</p>
-<p>
-    <a href="https://developer.android.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/android/android-original-wordmark.svg" alt="android" width="35px"></a>
-    <a href="https://www.linux.org/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/linux/linux-original.svg" alt="linux" width="35px"></a>
-    <a href="https://developer.microsoft.com/fr-fr/windows/"><img src="https://raw.githubusercontent.com/devicons/devicon/1119b9f84c0290e0f0b38982099a2bd027a48bf1/icons/windows8/windows8-original.svg" alt="Windows" width="35px"></a>
-</p>
+<a href="https://www.w3.org/html/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/html5/html5-original-wordmark.svg" alt="html5" width="35px"></a> <a href="https://www.w3schools.com/css/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/css3/css3-original-wordmark.svg" alt="css3" width="35px"></a> <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/javascript/javascript-original.svg" alt="javascript" width="35px"></a> <a href="https://pugjs.org"><img src="https://cdn.worldvectorlogo.com/logos/pug.svg" alt="pug" width="35px"></a> <a href="https://sass-lang.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/sass/sass-original.svg" alt="sass" width="35px"></a> <a href="https://www.typescriptlang.org/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/typescript/typescript-original.svg" alt="typescript" width="35px"></a> <a href="https://www.php.net"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/php/php-original.svg" alt="php" width="35px"></a> <a href="https://www.java.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/java/java-original.svg" alt="java" width="35px"></a> <a href="https://www.cprogramming.com/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/c/c-original.svg" alt="c" width="35px"></a> <a href="https://www.python.org"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/python/python-original.svg" alt="python" width="35px"></a> <a href="https://www.gnu.org/software/bash/"><img src="https://www.vectorlogo.zone/logos/gnu_bash/gnu_bash-icon.svg" alt="bash" width="35px"></a> 
+
+
+
+
+<a href="https://getbootstrap.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/bootstrap/bootstrap-plain-wordmark.svg" alt="bootstrap" width="35px"></a> <a href="https://bulma.io/"><img src="https://raw.githubusercontent.com/gilbarbara/logos/804dc257b59e144eaca5bc6ffd16949752c6f789/logos/bulma.svg" alt="bulma" width="35px"></a> <a href="https://symfony.com"><img src="https://cdn.jsdelivr.net/gh/devicons/devicon/icons/symfony/symfony-original.svg" alt="symfony" width="35px"></a> <a href="https://angular.io"><img src="https://angular.io/assets/images/logos/angular/angular.svg" alt="angular" width="35px"></a> 
+
+
+
+
+<a href="https://www.figma.com/"><img src="https://www.vectorlogo.zone/logos/figma/figma-icon.svg" alt="figma" width="35px"></a> <a href="https://git-scm.com/"><img src="https://www.vectorlogo.zone/logos/git-scm/git-scm-icon.svg" alt="git" width="35px"></a> <a href="https://mariadb.org/"><img src="https://www.vectorlogo.zone/logos/mariadb/mariadb-icon.svg" alt="mariadb" width="35px"></a> <a href="https://www.microsoft.com/en-us/sql-server"><img src="https://www.svgrepo.com/show/303229/microsoft-sql-server-logo.svg" alt="mssql" width="35px"></a> <a href="https://www.mysql.com/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/mysql/mysql-original-wordmark.svg" alt="mysql" width="35px"></a> <a href="https://www.postgresql.org"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/postgresql/postgresql-original-wordmark.svg" alt="postgresql" width="35px"></a> <a href="https://www.sqlite.org/"><img src="https://www.vectorlogo.zone/logos/sqlite/sqlite-icon.svg" alt="sqlite" width="35px"></a> 
+
+
+
+
+<a href="https://developer.android.com"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/android/android-original-wordmark.svg" alt="android" width="35px"></a> <a href="https://www.linux.org/"><img src="https://raw.githubusercontent.com/devicons/devicon/master/icons/linux/linux-original.svg" alt="linux" width="35px"></a> <a href="https://developer.microsoft.com/fr-fr/windows/"><img src="https://raw.githubusercontent.com/devicons/devicon/1119b9f84c0290e0f0b38982099a2bd027a48bf1/icons/windows8/windows8-original.svg" alt="Windows" width="35px"></a> 
 
 <div align="center">
-    <img src="https://github-readme-stats.vercel.app/api?username=lucasvbr&amp;show_icons=true&amp;locale=en" alt="github-stats"><br>
-    <img src="https://github-readme-stats.vercel.app/api/top-langs?username=lucasvbr&amp;show_icons=true&amp;locale=en&amp;layout=compact" alt="most-used-languages"><br>
+    <img src="https://github-readme-stats.vercel.app/api?username=lucasvbr&amp;show_icons=true&amp;locale=en" alt="github-stats"><br><img src="https://github-readme-stats.vercel.app/api/top-langs?username=lucasvbr&amp;show_icons=true&amp;locale=en&amp;layout=compact" alt="most-used-languages"><br>
 </div>
\ No newline at end of file
diff --git a/src/README.mustache b/src/README.mustache
index 1b4d441..d39ef13 100644
--- a/src/README.mustache
+++ b/src/README.mustache
@@ -3,53 +3,26 @@
     <h3>A passionate developer from France</h3>
 </div>
 
-{{#profile-views}}
-<img src="{{img}}" alt="{{alt}}"/>
-{{/profile-views}}
+{{#badges}}{{> image }} {{/badges}}
 
 <ul>
-    <li>🔭 I’m currently working on
-        {{#working}}<a href="{{link}}">{{ text }}</a>{{/working}}
-    </li>
+    <li>🔭 I’m currently working on {{#working}}{{>link}}{{/working}}</li>
     <li>🌱 I’m currently learning <b>Symfony</b></li>
     <li>📫 How to reach me <b>{{ email }}</b></li>
     <li>💻 Here is my <a href="{{ portfolio-url }}">portfolio</a></li>
 </ul>
 
 <h3>Connect with me:</h3>
-<p>
-{{#connect-with-me}}
-    <a href="{{ link }}"><img src="{{ img }}" alt="{{ alt }}" width="{{ imgSize }}"></a>
-{{/connect-with-me}}
-</p>
-
+<p>{{#connect-with-me}}{{> linkOnImage}} {{/connect-with-me}}</p>
 
 <h3>Language and Tools:</h3>
 {{#languages-and-tools}}
-<p>
-{{# languages }}
-    <a href="{{ link }}"><img src="{{ img }}" alt="{{ alt }}" width="{{ imgSize }}"></a>
-{{/languages}}
-</p>
-<p>
-{{# frameworks }}
-    <a href="{{ link }}"><img src="{{ img }}" alt="{{ alt }}" width="{{ imgSize }}"></a>
-{{/frameworks}}
-</p>
-<p>
-{{# tools }}
-    <a href="{{ link }}"><img src="{{ img }}" alt="{{ alt }}" width="{{ imgSize }}"></a>
-{{/tools}}
-</p>
-<p>
-{{# os }}
-    <a href="{{ link }}"><img src="{{ img }}" alt="{{ alt }}" width="{{ imgSize }}"></a>
-{{/os}}
-</p>
+{{# languages }}{{> linkOnImage}} {{/languages}}
+{{# frameworks }}{{> linkOnImage}} {{/frameworks}}
+{{# tools }}{{> linkOnImage}} {{/tools}}
+{{# os }}{{> linkOnImage}} {{/os}}
 {{/languages-and-tools}}
 
 <div align="center">
-{{#stats}}
-    <img src="{{ img }}" alt="{{ alt }}"><br>
-{{/stats}}
+    {{#stats}}{{>image}}<br>{{/stats}}
 </div>
\ No newline at end of file
diff --git a/src/data.yaml b/src/data.yaml
index 1747406..ea02485 100644
--- a/src/data.yaml
+++ b/src/data.yaml
@@ -4,9 +4,13 @@ email: "vabre.lucas.pro@gmail.com"
 portfolio-url: "https://lucasvbr.github.io/Portfolio"
 
 # Sections
-profile-views:
-  img: "https://komarev.com/ghpvc/?username=lucasvbr&label=Profile%20views&color=0e75b6&style=flat"
-  alt: "Profile Views"
+badges:
+  -
+    img: "https://komarev.com/ghpvc/?username=lucasvbr&label=Profile%20views&color=0e75b6&style=flat"
+    alt: "Profile Views"
+  -
+    img: "https://img.shields.io/freecodecamp/points/lucasvbr?label=FreeCodeCamp%20points"
+    alt: "freeCodeCamp points"
 
 working:
   link: "https://github.com/LucasVbr/Portfolio"
@@ -34,7 +38,7 @@ connect-with-me:
     alt: "pydefis"
 
 languages-and-tools:
-  languages:
+  - languages:
     - html5:
       link: "https://www.w3.org/html/"
       img: "https://raw.githubusercontent.com/devicons/devicon/master/icons/html5/html5-original-wordmark.svg"
@@ -90,7 +94,7 @@ languages-and-tools:
       img: "https://www.vectorlogo.zone/logos/gnu_bash/gnu_bash-icon.svg"
       alt: "bash"
 
-  frameworks:
+  - frameworks:
     - bootstrap:
       link: "https://getbootstrap.com"
       img: "https://raw.githubusercontent.com/devicons/devicon/master/icons/bootstrap/bootstrap-plain-wordmark.svg"
@@ -111,7 +115,7 @@ languages-and-tools:
       img: "https://angular.io/assets/images/logos/angular/angular.svg"
       alt: "angular"
 
-  tools:
+  - tools:
     - figma:
       link: "https://www.figma.com/"
       img: "https://www.vectorlogo.zone/logos/figma/figma-icon.svg"
@@ -147,7 +151,7 @@ languages-and-tools:
       img: "https://www.vectorlogo.zone/logos/sqlite/sqlite-icon.svg"
       alt: "sqlite"
 
-  os:
+  - os:
     - android:
       link: "https://developer.android.com"
       img: "https://raw.githubusercontent.com/devicons/devicon/master/icons/android/android-original-wordmark.svg"
diff --git a/src/image.mustache b/src/image.mustache
new file mode 100644
index 0000000..851b1f2
--- /dev/null
+++ b/src/image.mustache
@@ -0,0 +1 @@
+<img src="{{ img }}" alt="{{ alt }}">
\ No newline at end of file
diff --git a/src/link.mustache b/src/link.mustache
new file mode 100644
index 0000000..5f2d646
--- /dev/null
+++ b/src/link.mustache
@@ -0,0 +1 @@
+<a href="{{ link }}">{{ text }}</a>
\ No newline at end of file
diff --git a/src/linkOnImage.mustache b/src/linkOnImage.mustache
new file mode 100644
index 0000000..107823b
--- /dev/null
+++ b/src/linkOnImage.mustache
@@ -0,0 +1 @@
+<a href="{{ link }}"><img src="{{ img }}" alt="{{ alt }}" width="{{ imgSize }}"></a>
\ No newline at end of file