diff --git a/site/blueprints/pages/about.yml b/site/blueprints/pages/about.yml
index f9d0a97..49e4c00 100644
--- a/site/blueprints/pages/about.yml
+++ b/site/blueprints/pages/about.yml
@@ -33,15 +33,32 @@ tabs:
                 label: corps
                 type: blocks
                 fieldsets:
-                  - type: text
+                  heading:
+                    extends: blocks/heading
+                    fields:
+                      level:
+                        default: h3
+                        options:
+                          h3: Titre H3
+                  text:
                     extends: blocks/text
                     fields:
                       text:
-                        type: writer
-                        nodes:
-                          - heading
-                        headings:
-                          - h3
+                        marks:
+                          - bold
+                          - italic
+                          - green
+                          - pixel
+                          - underline
+                          - strike
+                          - clear
+                          - link
+                  list:
+                    extends: blocks/list
+                  image:
+                    extends: blocks/image
+                  video:
+                    extends: blocks/video
           team:
             type: files
             label: Membres de l'équipe
diff --git a/site/blueprints/pages/article.yml b/site/blueprints/pages/article.yml
index 2620402..e921d61 100644
--- a/site/blueprints/pages/article.yml
+++ b/site/blueprints/pages/article.yml
@@ -42,11 +42,32 @@ tabs:
                 label: Contenu de l'article
                 type: blocks
                 fieldsets:
-                  - heading
-                  - text
-                  - list
-                  - image
-                  - video
+                  heading:
+                    extends: blocks/heading
+                    fields:
+                      level:
+                        default: h3
+                        options:
+                          h3: Titre H3
+                  text:
+                    extends: blocks/text
+                    fields:
+                      text:
+                        marks:
+                          - bold
+                          - italic
+                          - green
+                          - pixel
+                          - underline
+                          - strike
+                          - clear
+                          - link
+                  list:
+                    extends: blocks/list
+                  image:
+                    extends: blocks/image
+                  video:
+                    extends: blocks/video
 
       # Sidebar
       sidebar:
@@ -59,6 +80,7 @@ tabs:
               date:
                 label: Date de publication
                 type: date
+                display: DD/MM/YYYY
                 required: true
                 default: today
                 translate: false
diff --git a/site/blueprints/pages/blog.yml b/site/blueprints/pages/blog.yml
index d17fc5b..b65cec5 100644
--- a/site/blueprints/pages/blog.yml
+++ b/site/blueprints/pages/blog.yml
@@ -30,8 +30,7 @@ tabs:
         label: Articles
         type: pages
         headline: Liste des articles
-        layout: cards
-        size: medium
+        layout: cardlets
         image:
           cover: true
         template: article
diff --git a/site/blueprints/pages/expertise.yml b/site/blueprints/pages/expertise.yml
index b837433..0205c8f 100644
--- a/site/blueprints/pages/expertise.yml
+++ b/site/blueprints/pages/expertise.yml
@@ -30,6 +30,20 @@ tabs:
                 label: corps
                 type: blocks
                 fieldsets:
-                  - text
-                  - list
-                type: blocks
+                  text:
+                    extends: blocks/text
+                    fields:
+                      text:
+                        marks:
+                          - bold
+                          - italic
+                          - green
+                          - pixel
+                          - underline
+                          - strike
+                          - clear
+                          - link
+                        nodes:
+                          - heading
+                        headings:
+                          - 3
diff --git a/site/blueprints/pages/game.yml b/site/blueprints/pages/game.yml
index 60fa7c0..dbb2ccc 100644
--- a/site/blueprints/pages/game.yml
+++ b/site/blueprints/pages/game.yml
@@ -17,7 +17,7 @@ columns:
   - width: 2/3
     sections:
       # Informations principales
-      info:
+      main:
         type: fields
         fields:
           description:
@@ -36,8 +36,7 @@ columns:
   # Sidebar
   - width: 1/3
     sections:
-      # Visuel
-      visual:
+      info:
         type: fields
         fields:
           thumbnail:
@@ -66,36 +65,9 @@ columns:
             uploads:
               template: image
             help: Image affichée en arrière-plan quand le jeu est sélectionné
-          badge:
-            label: Badge
-            type: tags
-            max: 1
-            translate: false
-            options:
-              - NEW
-              - Populaire
-            help: Choisissez une suggestion ou tapez votre propre badge
-
-      # Statut
-      status:
-        type: fields
-        fields:
-          game_status:
-            label: Statut du jeu
-            type: select
-            required: true
-            default: available
-            translate: false
-            options:
-              available: Disponible
-              coming_soon: Bientôt disponible
-              maintenance: En maintenance
-      # Liens
-      links:
-        type: fields
-        fields:
           play_links:
             label: Lien(s) pour jouer
+            help: sans lien renseigner, le jeu aura une étiquette "coming soon"
             type: structure
             fields:
               link_label: