diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9dafd7fb71f3b8c3602798039a0e3ac0d8f658d9..05fb019fe8723ef9ca1f891a846f1d5434fbf74d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-Please delete the text below before submitting your contribution. 
+Please delete this line and the text below before submitting your contribution.
 
 ---
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6cc9e527e12245496742bfd11925554453abe3be..f5a44c8c720101985e7dfbc372ce0474b3d0fba0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-Please delete the text below before submitting your contribution. 
+Please delete this line and the text below before submitting your contribution.
 
 ---
 
diff --git a/_includes/links.md b/_includes/links.md
index 4e87b32afeed38f49150e4aacdb86bcff600de09..7ab32a9f65f5062ac165b4d00489b31a8ed6cf8c 100644
--- a/_includes/links.md
+++ b/_includes/links.md
@@ -1,7 +1,7 @@
 [cc-by-human]: https://creativecommons.org/licenses/by/4.0/
 [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
 [ci]: http://communityin.org/
-[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#reporting-guidelines
+[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#incident-reporting-guidelines
 [coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html
 [concept-maps]: https://carpentries.github.io/instructor-training/05-memory/
 [contrib-covenant]: https://contributor-covenant.org/
@@ -20,7 +20,13 @@
 [jupyter]: https://jupyter.org/
 [kramdown]: https://kramdown.gettalong.org/
 [lc-lessons]: https://librarycarpentry.org/lessons/
+[lesson-aio]: {{ relative_root_path }}{% link aio.md %}
+[lesson-coc]: {{ relative_root_path }}{% link CODE_OF_CONDUCT.md %}
 [lesson-example]: https://carpentries.github.io/lesson-example/
+[lesson-license]: {{ relative_root_path }}{% link LICENSE.md %}
+[lesson-mainpage]: {{ relative_root_path }}{% link index.md %}
+[lesson-reference]: {{ relative_root_path }}{% link reference.md %}
+[lesson-setup]: {{ relative_page_root }}{% link setup.md %}
 [mit-license]: https://opensource.org/licenses/mit-license.html
 [morea]: https://morea-framework.github.io/
 [numfocus]: https://numfocus.org/
diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css
index 6704f50ce3857f15a7e05f324e2fd54c468c2267..58a33dde93afff86d1a50bbe76d93f08db2501da 100644
--- a/assets/css/bootstrap.css
+++ b/assets/css/bootstrap.css
@@ -1098,7 +1098,7 @@ textarea {
   line-height: inherit;
 }
 a {
-  color: #337ab7;
+  color: #2876b5;
   text-decoration: none;
 }
 a:hover,
@@ -1562,15 +1562,14 @@ kbd kbd {
 pre {
   display: block;
   padding: 9.5px;
-  margin: 0 0 10px;
+  margin: 0;
   font-size: 13px;
   line-height: 1.42857143;
   color: inherit; /* #333; -- CHANGE -- */
   word-break: break-all;
   word-wrap: break-word;
   background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+  border: none;
 }
 pre code {
   padding: 0;
diff --git a/assets/css/lesson.scss b/assets/css/lesson.scss
index 6e9e81ea24fc38d6cfb41e07ca150de278e1499c..e0c34c991b675b53ecc78cd008040d842016ecf7 100644
--- a/assets/css/lesson.scss
+++ b/assets/css/lesson.scss
@@ -30,8 +30,9 @@ $color-testimonial: #fc8dc1 !default;
 
 @mixin cdSetup($color) {
     color: $color;
+    border: solid 0.5px $color;
     border-left: solid 5px $color;
-    margin: 15px 0;
+    margin: 15px 5px 10px 0;
     border-radius: 4px 0 0 4px;
 }
 
@@ -46,24 +47,32 @@ $color-testimonial: #fc8dc1 !default;
 .r, .language-r           { @include cdSetup($color-source); }
 .sql, .language-sql       { @include cdSetup($color-source); }
 
-.error pre,
-.output pre,
-.source pre,
-.bash pre,
-.language-bash pre,
-.make pre,
-.language-make pre,
-.matlab pre,
-.language-matlab pre,
-.python pre,
-.language-python pre,
-.r pre,
-.language-r pre,
-.sql pre ,
-.language-sql pre {
-  border-radius: 0 4px 4px 0;
+.error::before,
+.output::before,
+.source::before,
+.bash::before, .language-bash::before,
+.make::before, .language-make::before,
+.matlab::before, .language-matlab::before,
+.python::before, .language-python::before,
+.r::before, .language-r::before,
+.sql::before, .language-sql::before {
+  background-color: #f2eff6;
+  display: block;
+  font-weight: bold;
+  padding: 5px 10px;
 }
 
+.error::before  { background-color: #ffebe6; content: "Error"; }
+.output::before { background-color: #efefef; content: "Output"; }
+.source::before { content: "Code"; }
+.bash::before, .language-bash::before { content: "Bash"; }
+.make::before, .language-make::before { content: "Make"; }
+.matlab::before, .language-matlab::before { content: "Matlab"; }
+.python::before, .language-python::before { content: "Python"; }
+.r::before, .language-r::before { content: "R"; }
+.sql::before, .language-sql::before { content: "SQL"; }
+
+
 //----------------------------------------
 // Specialized blockquote environments for learning objectives, callouts, etc.
 //----------------------------------------
@@ -75,16 +84,12 @@ $codeblock-padding: 5px !default;
   $gradientcolor1: $color;
   $gradientcolor2: scale-color($color, $lightness: 10%);
 
-  padding-left: $codeblock-padding;
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-right: 0;
+  padding: 0 0 $codeblock-padding $codeblock-padding;
   border: 1px solid;
   border-color: $color;
   border-radius: 4px;
-  padding-bottom: $codeblock-padding;
 
-  margin: 15px 0;
+  margin: 15px 5px 10px 0;
 
   h2 {
     padding-top: $codeblock-padding;
@@ -129,6 +134,17 @@ $codeblock-padding: 5px !default;
 font-size: 18px;
 }
 
+.challenge    { background-color: #eec27520; }
+.callout      { background-color: #f4fd9c20; }
+.challenge    { background-color: #eec27520; }
+.checklist    { background-color: #dfd2a020; }
+.discussion   { background-color: #eec27520; }
+.keypoints    { background-color: #7ae78e20; }
+.objectives   { background-color: #daee8420; }
+.prereq       { background-color: #9cd6dc20; }
+.solution     { background-color: #ded4b94d; }
+.testimonial  { background-color: #fc8dc120; }
+
 blockquote p {
     margin: 5px;
 }
@@ -140,7 +156,7 @@ blockquote p {
 code {
   white-space: nowrap;
   padding: 2px 5px;
-  color: #3d90d9;
+  color: #006cad;
   background-color: #e7e7e7;
 }
 
diff --git a/assets/css/syntax.css b/assets/css/syntax.css
index 572069c1d26e3d0cabaa3f891369e0851fd39991..83a7e97938c38369227dc2483089074f4b0e2841 100644
--- a/assets/css/syntax.css
+++ b/assets/css/syntax.css
@@ -1,15 +1,15 @@
 .highlight .hll { background-color: #ffffcc }
 .highlight  { background: #f8f8f8; }
-.highlight .c { color: #408080; font-style: italic } /* Comment */
+.highlight .c { color: #387d7d; font-style: italic } /* Comment */
 .highlight .err { border: 1px solid #FF0000 } /* Error */
 .highlight .k { color: #008000; font-weight: bold } /* Keyword */
 .highlight .o { color: #666666 } /* Operator */
-.highlight .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
-.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+.highlight .ch { color: #387d7d; font-style: italic } /* Comment.Hashbang */
+.highlight .cm { color: #387d7d; font-style: italic } /* Comment.Multiline */
 .highlight .cp { color: #BC7A00 } /* Comment.Preproc */
-.highlight .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
-.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */
+.highlight .cpf { color: #387d7d; font-style: italic } /* Comment.PreprocFile */
+.highlight .c1 { color: #387d7d; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #387d7d; font-style: italic } /* Comment.Special */
 .highlight .gd { color: #A00000 } /* Generic.Deleted */
 .highlight .ge { font-style: italic } /* Generic.Emph */
 .highlight .gr { color: #FF0000 } /* Generic.Error */
diff --git a/bin/boilerplate/.travis.yml b/bin/boilerplate/.travis.yml
index d30f78a4fff74de828eabd1f8a055f7c1d40f44c..de304acaf4ba584a279007ec6529e41329f92c5a 100644
--- a/bin/boilerplate/.travis.yml
+++ b/bin/boilerplate/.travis.yml
@@ -1,6 +1,6 @@
 # dist: trusty  # Ubuntu 14.04
 language: python
-python: 3.6
+python: 3.7
 branches:
   only:
   - gh-pages
diff --git a/bin/boilerplate/README.md b/bin/boilerplate/README.md
index 43a6b7225e5de62ac66451d8b5628fb9f50bf369..ed47f43c8a7f4a156dc4a53e86e743cb9cfea319 100644
--- a/bin/boilerplate/README.md
+++ b/bin/boilerplate/README.md
@@ -2,7 +2,7 @@
 
 [![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/)
 
-FIXME
+This repository generates the corresponding lesson website from [The Carpentries](https://carpentries.org/) repertoire of lessons. 
 
 ## Contributing
 
@@ -13,9 +13,21 @@ We'd like to ask you to familiarize yourself with our [Contribution Guide](CONTR
 the [more detailed guidelines][lesson-example] on proper formatting, ways to render the lesson locally, and even
 how to write new episodes.
 
+Please see the current list of [issues][FIXME] for ideas for contributing to this
+repository. For making your contribution, we use the GitHub flow, which is
+nicely explained in the chapter [Contributing to a Project](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project) in Pro Git
+by Scott Chacon.
+Look for the tag ![good_first_issue](https://img.shields.io/badge/-good%20first%20issue-gold.svg). This indicates that the mantainers will welcome a pull request fixing this issue.  
+
+
 ## Maintainer(s)
 
+Current maintainers of this lesson are 
+
 * FIXME
+* FIXME
+* FIXME
+
 
 ## Authors
 
diff --git a/bin/knit_lessons.sh b/bin/knit_lessons.sh
index 194f12421a6d1fd64a7ee2b367bbcf776953da05..141c136adce04042732d19eb416bc915e57e2717 100755
--- a/bin/knit_lessons.sh
+++ b/bin/knit_lessons.sh
@@ -3,6 +3,6 @@
 # Only try running R to translate files if there are some files present.
 # The Makefile passes in the names of files.
 
-if [ $# -ne 0 ] ; then
+if [ $# -eq 2 ] ; then
     Rscript -e "source('bin/generate_md_episodes.R')" "$@"
 fi