diff --git a/CONDUCT.md b/CONDUCT.md
index c3b9669073c596aa8081d17f06a0f8a04c677c08..95d254d436f1f753dd3fbc0bcc226fea38c9c181 100644
--- a/CONDUCT.md
+++ b/CONDUCT.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: "Contributor Code of Conduct"
 ---
 As contributors and maintainers of this project,
diff --git a/LICENSE.md b/LICENSE.md
index e4dde15c12100d1849993a5084567aee95647eb5..3b41b07454e8d419c8a781da5e9058d4bbad7716 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,5 @@
 ---
-layout: page
 title: "Licenses"
-root: .
 ---
 ## Instructional Material
 
diff --git a/_config.yml b/_config.yml
index f4f2f7fc848631a4a04005ff7ad1ab0ad3b2fbe3..d807f3e9bd523fb25fcfe3beebabbd8c3e38422f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -59,12 +59,20 @@ collections:
 # Set the default layout for things in the episodes collection.
 defaults:
   - values:
-      root: ..
+      root: .
+      layout: page
   - scope:
       path: ""
       type: episodes
     values:
       layout: episode
+      root: ..
+  - scope:
+      path: ""
+      type: extras
+    values:
+      root: ..
+      layout: page
 
 #------------------------------------------------------------
 # Jekyll Generic settings (should not need to change).
diff --git a/_extras/about.md b/_extras/about.md
index 6d7b16b883c4d42e6d88804f98c2cfa5fa995bbf..718fdfdefc483b54e67099160be8021d973295f7 100644
--- a/_extras/about.md
+++ b/_extras/about.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: About
 ---
 
diff --git a/_extras/discuss.md b/_extras/discuss.md
index 89ab216f730ee0cbf0fd232cd1fb817ce3240de7..e7906d57596b8216aa26fbdace49592af48656d5 100644
--- a/_extras/discuss.md
+++ b/_extras/discuss.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: Discussion
 ---
 
diff --git a/_extras/figures.md b/_extras/figures.md
index f0401f07237817f09fb402361fd81f8e87d25bb5..b807e484d61632e3b93a5f6b9a3d2120b4f46541 100644
--- a/_extras/figures.md
+++ b/_extras/figures.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: Figures
 ---
 <script>
diff --git a/_extras/guide.md b/_extras/guide.md
index 64a7862b0d5130c278b8d46c36ac6e8574c4db23..de8d505dbffe3f99f0be53166d2b47c4bba12acf 100644
--- a/_extras/guide.md
+++ b/_extras/guide.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: "Instructor Notes"
 ---
 
diff --git a/aio.md b/aio.md
index c75bc606a864433b482d3be6b3c26f3712e91f70..a418f3b45ee2c3a59950a49e5f5434cbd7dada46 100644
--- a/aio.md
+++ b/aio.md
@@ -1,6 +1,4 @@
 ---
-layout: page 
-root: .
 ---
 <script>
   window.onload = function() {
diff --git a/index.md b/index.md
index 078896fbcbe7406cc25fdddfd2c603e5322964fb..0b7b5cf9048f94fc65ecd8bfa3546511d725e577 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,6 @@
 ---
 layout: lesson
-root: .
+root: .  # Is the only page that don't follow the partner /:path/index.html
 permalink: index.html  # Is the only page that don't follow the partner /:path/index.html
 ---
 
diff --git a/setup.md b/setup.md
index 17e264b826caf0186dba09ed898fdcdb115a6342..ae839b0e8f86e07d28b0cb75c1c1d7bd0c349153 100644
--- a/setup.md
+++ b/setup.md
@@ -1,7 +1,5 @@
 ---
-layout: page
 title: Setup
-root: .
 ---
 
 Our lesson template is kept in the [`swcarpentry/styles` repository][styles]. The `styles` repository is carefully curated so that