diff --git a/vignettes/data_retrieval.md b/vignettes/data_retrieval.md
index 749bddf408ea1ced152244b64e745922e6639926..0fc874e1af3f186c7ba7f0a3ff305fe5fdffc160 100644
--- a/vignettes/data_retrieval.md
+++ b/vignettes/data_retrieval.md
@@ -1,7 +1,11 @@
 ---
-output:
-  pdf_document: default
-  html_document: default
+author: "Nicolau Manubens"
+date: "`r Sys.Date()`"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteEngine{knitr::knitr}
+  %\VignetteIndexEntry{data_retrieval}
+  \usepackage[utf8]{inputenc}
 ---
 Data retrieval
 ==============
diff --git a/vignettes/example.md b/vignettes/example.md
index fb521df1c0e2f98244848d0c15ae76351b13770b..60d1757e8a5d2001f6115785f008686ca6837dbd 100644
--- a/vignettes/example.md
+++ b/vignettes/example.md
@@ -1,7 +1,11 @@
 ---
-output:
-  pdf_document: default
-  html_document: default
+author: "Nicolau Manubens"
+date: "`r Sys.Date()`"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteEngine{knitr::knitr}
+  %\VignetteIndexEntry{example}
+  \usepackage[utf8]{inputenc}
 ---
 Example
 =======
diff --git a/vignettes/snippets.md b/vignettes/snippets.md
index f3e0ad2a3aff5a4c39d134bb5b29110f12d4dcff..3e44c4f5dfd8704db51ecc6cdf9cf4b894d56e4e 100644
--- a/vignettes/snippets.md
+++ b/vignettes/snippets.md
@@ -1,7 +1,11 @@
 ---
-output:
-  pdf_document: default
-  html_document: default
+author: "Nicolau Manubens"
+date: "`r Sys.Date()`"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteEngine{knitr::knitr}
+  %\VignetteIndexEntry{snippets}
+  \usepackage[utf8]{inputenc}
 ---
 Snippets
 ========
diff --git a/vignettes/statistics.md b/vignettes/statistics.md
index 608d80f268a6c1bfe54c97c7387da46e48579c2a..953cddb4f02e1d09922309a35ea3184ebb2825fb 100644
--- a/vignettes/statistics.md
+++ b/vignettes/statistics.md
@@ -1,7 +1,11 @@
 ---
-output:
-  pdf_document: default
-  html_document: default
+author: "Nicolau Manubens"
+date: "`r Sys.Date()`"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteEngine{knitr::knitr}
+  %\VignetteIndexEntry{statistics}
+  \usepackage[utf8]{inputenc}
 ---
 Statistics
 ==========
diff --git a/vignettes/tutorial.md b/vignettes/tutorial.md
index d77a028199eda36d13ed38307ab8b8d776ef1440..d3dd781a5a3d58ed62ce59f2e3ea38dfe9c860db 100644
--- a/vignettes/tutorial.md
+++ b/vignettes/tutorial.md
@@ -1,7 +1,11 @@
 ---
-output:
-  pdf_document: default
-  html_document: default
+author: "Nicolau Manubens"
+date: "`r Sys.Date()`"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteEngine{knitr::knitr}
+  %\VignetteIndexEntry{tutorial}
+  \usepackage[utf8]{inputenc}
 ---
 Tutorial
 ========
diff --git a/vignettes/visualisation.md b/vignettes/visualisation.md
index a61a75ca6841027dba2152b8713c61f43a9d43e8..537b3978d8600f2138159cc3f9e75a0b3ef3ee23 100644
--- a/vignettes/visualisation.md
+++ b/vignettes/visualisation.md
@@ -1,7 +1,11 @@
 ---
-output:
-  pdf_document: default
-  html_document: default
+author: "Nicolau Manubens"
+date: "`r Sys.Date()`"
+output: rmarkdown::html_vignette
+vignette: >
+  %\VignetteEngine{knitr::knitr}
+  %\VignetteIndexEntry{visualisation}
+  \usepackage[utf8]{inputenc}
 ---
 Visualisation
 =============