diff --git a/_data/accepted.yaml b/_data/accepted.yaml
deleted file mode 100644
index 2d8b556..0000000
--- a/_data/accepted.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- authors:
-    - jd
-    - me
-    - pam
-  title: "Stationary solutions of Keller-Segel type crowd motion and herding models: multiplicity and dynamical stability"
-  journal: Mathematics and  Mechanics of Complex Systems
-  arxiv: 1305.1715
-  hal: 00821206
-
-# vim: ts=2:sts=2:sw=2
diff --git a/_data/submitted.yaml b/_data/submitted.yaml
index 9278706..a063904 100644
--- a/_data/submitted.yaml
+++ b/_data/submitted.yaml
@@ -1,3 +1,16 @@
+## Accepted
+
+- authors:
+    - jd
+    - me
+    - pam
+  title: "Stationary solutions of Keller-Segel type crowd motion and herding models: multiplicity and dynamical stability"
+  journal: Mathematics and  Mechanics of Complex Systems
+  arxiv: 1305.1715
+  hal: 00821206
+
+## Submitted
+
 - authors:
     - jd
     - me
diff --git a/_includes/prep_publi_row.html b/_includes/prep_publi_row.html
new file mode 100644
index 0000000..b49ff1c
--- /dev/null
+++ b/_includes/prep_publi_row.html
@@ -0,0 +1 @@
+{% assign pub = include.pub %}{% assign authors = include.authors %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | {{pub.title}} |
diff --git a/_includes/publi_row.html b/_includes/publi_row.html
new file mode 100644
index 0000000..0b1333c
--- /dev/null
+++ b/_includes/publi_row.html
@@ -0,0 +1 @@
+{% assign pub = include.pub %}{% assign authors = include.authors %}| {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | {{pub.title}} - {% if pub.journal %}*{{pub.journal}}* {{pub.issue}}{% else %}*preprint*{% endif %} | {% if pub.arxiv %}<span class="paper_link">[arXiv](http://arxiv.org/abs/{{pub.arxiv}})</span> {% endif %}{% if pub.hal %}<span class="paper_link">[HAL](http://hal.archives-ouvertes.fr/hal-{{pub.hal}})</span>{% endif %} |
diff --git a/_includes/publis-acc.markdown b/_includes/publis-acc.markdown
deleted file mode 100644
index fc0ec32..0000000
--- a/_includes/publis-acc.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-| - | - | :-: |
-| J. Dobleault, P. Markowich, G. Jankowiak | *Stationary solutions of Keller-Segel type crowd motion and herding models: multiplicity and dynamical stability* (Math. Mech. Compl. Sys.) | [preprint](http://arxiv.org/pdf/1305.1715v2)
-{: .accepted}
diff --git a/_includes/publis-sub.markdown b/_includes/publis-sub.markdown
deleted file mode 100644
index 678a551..0000000
--- a/_includes/publis-sub.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-| - | - | :-: |
-| J. Dobleault, P. Markowich, G. Jankowiak | *Stationary solutions of Keller-Segel type crowd motion and herding models: multiplicity and dynamical stability* | [preprint](http://arxiv.org/pdf/1305.1715v2)
-{: .submitted}
diff --git a/en.markdown b/en.markdown
index e13b4bb..358ddc6 100644
--- a/en.markdown
+++ b/en.markdown
@@ -30,26 +30,15 @@ to the Keller-Segel model.
 ## Publications
 {% assign authors = site.data.authors %}
 
-### Accepted
-
 | Authors | Title | Links |
 | - | - | :-: |
-{% for pub in site.data.accepted %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | *{{pub.title}}* <br>{{pub.journal}} {{pub.issue}} | {% if pub.arxiv %}<span class="paper_link">[arXiv](http://arxiv.org/abs/{{pub.arxiv}})</span> {% endif %}{% if pub.hal %}<span class="paper_link">[HAL](http://hal.archives-ouvertes.fr/hal-{{pub.hal}})</span>{% endif %} |
-{% endfor %}{: .publi_table}
-
-### Submitted
-
-| Authors | Title | Links |
-| - | - | :-: |
-{% for pub in site.data.submitted %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | *{{pub.title}}* <br>{{pub.journal}} {{pub.issue}} | {% if pub.arxiv %}<span class="paper_link">[arXiv](http://arxiv.org/abs/{{pub.arxiv}})</span> {% endif %}{% if pub.hal %}<span class="paper_link">[HAL](http://hal.archives-ouvertes.fr/hal-{{pub.hal}})</span>{% endif %} |
-{% endfor %}{: .publi_table}
+{% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}{: .publi_table}
 
 ### In preparation
 
 | Authors | Title |
 | - | - |
-{% for pub in site.data.prep %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | *{{pub.title}}* |
-{% endfor %}{: .publi_table}
+{% for pub in site.data.prep %}{% include prep_publi_row.html pub=pub authors=authors %}{% endfor %}{: .publi_table}
 
 ## Visits & conferences
 
diff --git a/index.markdown b/index.markdown
index 9a67b84..5019839 100644
--- a/index.markdown
+++ b/index.markdown
@@ -28,26 +28,15 @@ ainsi que leurs liens avec certaines inégalités fonctionnelles.
 ## Publications
 {% assign authors = site.data.authors %}
 
-### Acceptées
-
 | Auteurs | Titre | Liens |
 | - | - | :-: |
-{% for pub in site.data.accepted %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | *{{pub.title}}* <br>{{pub.journal}} {{pub.issue}} | {% if pub.arxiv %}<span class="paper_link">[arXiv](http://arxiv.org/abs/{{pub.arxiv}})</span> {% endif %}{% if pub.hal %}<span class="paper_link">[HAL](http://hal.archives-ouvertes.fr/hal-{{pub.hal}})</span>{% endif %} |
-{% endfor %}{: .publi_table}
-
-### Soumises
-
-| Auteurs | Titre | Liens |
-| - | - | :-: |
-{% for pub in site.data.submitted %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | *{{pub.title}}* <br>{{pub.journal}} {{pub.issue}} | {% if pub.arxiv %}<span class="paper_link">[arXiv](http://arxiv.org/abs/{{pub.arxiv}})</span> {% endif %}{% if pub.hal %}<span class="paper_link">[HAL](http://hal.archives-ouvertes.fr/hal-{{pub.hal}})</span>{% endif %} |
-{% endfor %}{: .publi_table}
+{% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}{: .publi_table}
 
 ### En préparation
 
 | Auteurs | Titre |
 | - | - |
-{% for pub in site.data.prep %} | {% for a in pub.authors %}{% assign ca = authors[a] %}{% if ca.home %}<a href="{{ca.home)}}">{{ca.name}}</a>{%else%}{{ca.name}}{%endif%}{% if forloop.last %}{%else%}, {% endif %}{% endfor %} | *{{pub.title}}* |
-{% endfor %}{: .publi_table}
+{% for pub in site.data.prep %}{% include prep_publi_row.html pub=pub authors=authors %}{% endfor %}{: .publi_table}
 
 ## Déplacements & conférences