diff --git a/slides/common/title.md b/slides/common/title.md
index 2dc50d32..1b9f7beb 100644
--- a/slides/common/title.md
+++ b/slides/common/title.md
@@ -2,7 +2,7 @@ class: title, self-paced
 
 @@TITLE@@
 
-*Self-paced version*
+.nav[*Self-paced version*]
 
 ---
 
@@ -11,11 +11,10 @@ class: title, in-person
 @@TITLE@@
 
 **Be kind to the WiFi!**
-
-*Use the 5G network*
 <br/>
-*Don't use your hotspot*
+*Use the 5G network.*
+*Don't use your hotspot.*
 <br/>
-*Don't stream videos or download big files during the workshop*
+*Don't stream videos or download big files during the workshop.*
 
-Thank you!
+*Thank you!*
diff --git a/slides/dockercon.yml b/slides/dockercon.yml
index 4c2f66d4..a57a0188 100644
--- a/slides/dockercon.yml
+++ b/slides/dockercon.yml
@@ -38,5 +38,4 @@ chapters:
   - swarm/metrics.md
   - swarm/stateful.md
   - swarm/extratips.md
-  - swarm/end.md
-- common/thankyou.md
+  - common/thankyou.md
diff --git a/slides/kube.yml b/slides/kube.yml
index c6347277..7b052922 100644
--- a/slides/kube.yml
+++ b/slides/kube.yml
@@ -28,4 +28,4 @@ chapters:
   - kube/daemonset.md
   - kube/rollout.md
   - kube/whatsnext.md
-- common/thankyou.md
+  - common/thankyou.md
diff --git a/slides/lisa.yml b/slides/lisa.yml
index e2413e4e..1fd4ea70 100644
--- a/slides/lisa.yml
+++ b/slides/lisa.yml
@@ -39,5 +39,4 @@ chapters:
   - swarm/metrics.md
   #- swarm/stateful.md
   #- swarm/extratips.md
-  - swarm/end.md
-- common/thankyou.md
+  - common/thankyou.md
diff --git a/slides/markmaker.py b/slides/markmaker.py
index c1563fa6..2b6309bd 100755
--- a/slides/markmaker.py
+++ b/slides/markmaker.py
@@ -90,7 +90,7 @@ def generatefromyaml(manifest, filename):
 
     markdown = markdown.replace(
         ".debug[",
-        ".debug[{}\n\nThese sides have been built from commit: {}\n\n".format(dirtyfiles, commit),
+        ".debug[\n```\n{}\n```\n\nThese slides have been built from commit: {}\n\n".format(dirtyfiles, commit),
         1)
 
     markdown = markdown.replace("@@TITLE@@", manifest["title"].replace("\n", "<br/>"))
@@ -172,6 +172,7 @@ try:
         branch = os.environ["BRANCH"]
     else:
         branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+        branch = branch.strip()
     base = subprocess.check_output(["git", "rev-parse", "--show-prefix"])
     base = base.strip().strip("/")
     urltemplate = ("{repo}/tree/{branch}/{base}/{filename}"
diff --git a/slides/selfpaced.yml b/slides/selfpaced.yml
index ba41f922..59217246 100644
--- a/slides/selfpaced.yml
+++ b/slides/selfpaced.yml
@@ -52,5 +52,4 @@ chapters:
   - swarm/metrics.md
   - swarm/stateful.md
   - swarm/extratips.md
-  - swarm/end.md
-- common/thankyou.md
+  - common/thankyou.md
diff --git a/slides/swarm/creatingswarm.md b/slides/swarm/creatingswarm.md
index b6139b07..463f0f21 100644
--- a/slides/swarm/creatingswarm.md
+++ b/slides/swarm/creatingswarm.md
@@ -226,8 +226,6 @@ class: extra-details
   docker node ls
   ```
 
-```wait```
-
 - This is because the node that we added is currently a *worker*
 - Only *managers* can accept Swarm-specific commands
 
diff --git a/slides/swarm/end.md b/slides/swarm/end.md
deleted file mode 100644
index c1a7b9be..00000000
--- a/slides/swarm/end.md
+++ /dev/null
@@ -1,38 +0,0 @@
-class: title, extra-details
-
-# What's next?
-
-## (What to expect in future versions of this workshop)
-
----
-
-class: extra-details
-
-## Implemented and stable, but out of scope
-
-- [Docker Content Trust](https://docs.docker.com/engine/security/trust/content_trust/) and
-  [Notary](https://github.com/docker/notary) (image signature and verification)
-
-- Image security scanning (many products available, Docker Inc. and 3rd party)
-
-- [Docker Cloud](https://cloud.docker.com/) and
-  [Docker Datacenter](https://www.docker.com/products/docker-datacenter)
-  (commercial offering with node management, secure registry, CI/CD pipelines, all the bells and whistles)
-
-- Network and storage plugins
-
----
-
-class: extra-details
-
-## Work in progress
-
-- Demo at least one volume plugin
-  <br/>(bonus points if it's a distributed storage system)
-
-- ..................................... (your favorite feature here)
-
-Reminder: there is a tag for each iteration of the content
-in the Github repository.
-
-It makes it easy to come back later and check what has changed since you did it!
diff --git a/slides/workshop.css b/slides/workshop.css
index 05da7720..cd350b5e 100644
--- a/slides/workshop.css
+++ b/slides/workshop.css
@@ -1,7 +1,28 @@
-@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz);
 @import url(https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic);
 @import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic);
 
+@import url('https://fonts.googleapis.com/css?family=Inconsolata:400,700');
+@import url('https://fonts.googleapis.com/css?family=Open+Sans');
+
+/* Fonts! Sizes! And a bit of color. */
+.remark-slide-content {
+  font-family: 'Droid Serif';
+  font-size: 25px !important;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'Droid Serif';
+  font-weight: bold;
+  font-size: 45px !important;
+  margin-top: 0.5em;
+}
+
+code.remark-code, code.remark-inline-code {
+  font-family: 'Inconsolata';
+  font-size: 110%;
+  background-color: #ccc;
+}
+
 /* For print! Borrowed from https://github.com/gnab/remark/issues/50 */
 @page {
   size: 1210px 681px;
@@ -18,6 +39,8 @@
   }
 }
 
+/* Don't change things below this unless you know what you're doing! */
+
 /* put slide numbers in top-right corner instead of bottom-right */
 div.remark-slide-number {
   top: 6px;
@@ -27,12 +50,11 @@ div.remark-slide-number {
 }
 
 .debug {
-  font-size: 25px;
+  font-family: monospace;
   position: absolute;
   left: 0px;
   right: 0px;
   bottom: 0px;
-  font-family: monospace;
   color: white;
   background-color: black;
   opacity: 0;
@@ -43,19 +65,6 @@ div.remark-slide-number {
 .debug:hover {
   opacity: 1;
 }
-div.debug {
-  vertical-align: initial;
-  text-align: initial;
-  font-size: initial;
-}
-
-body { font-family: 'Droid Serif'; }
-
-h1, h2, h3 {
-  font-family: 'Yanone Kaffeesatz';
-  font-weight: normal;
-  margin-top: 0.5em;
-}
 
 a {
   text-decoration: none;
@@ -63,23 +72,12 @@ a {
 }
 
 .remark-slide-content { padding: 1em 2.5em 1em 2.5em; }
-.remark-slide-content { font-size: 25px; }
-.remark-slide-content h1 { font-size: 50px; }
-.remark-slide-content h2 { font-size: 50px; }
-.remark-slide-content h3 { font-size: 25px; }
 
 .footnote {
   position: absolute;
   bottom: 3em;
 }
 
-.remark-code { font-size: 25px; }
-.small .remark-code { font-size: 16px; }
-.remark-code, .remark-inline-code { font-family: 'Ubuntu Mono'; }
-.remark-inline-code {
-   background-color: #ccc;
-}
-
 .red { color: #fa0000; }
 .gray { color: #ccc; }
 .small { font-size: 70%; }
@@ -100,39 +98,21 @@ img {
   max-height: 250px;
 }
 
-.title {
-  vertical-align: middle;
-  text-align: center;
+div.title {
+  vertical-align: middle; 
+}
+div.title > p:first-child {
+  text-align: center;
+  font-size: 300%;
 }
-.title h1 { font-size: 3em; font-family: unset;}
-.title p { font-size: 3em; }
 
 .nav {
-  font-size: 25px;
+  text-align: center;
   position: absolute;
   left: 0;
   right: 0;
-  bottom: 2em;
-}
-
-.quote {
-  background: #eee;
-  border-left: 10px solid #ccc;
-  margin: 1.5em 10px;
-  padding: 0.5em 10px;
-  quotes: "\201C""\201D""\2018""\2019";
-  font-style: italic;
-}
-.quote:before {
-  color: #ccc;
-  content: open-quote;
-  font-size: 4em;
-  line-height: 0.1em;
-  margin-right: 0.25em;
-  vertical-align: -0.4em;
-}
-.quote p {
-  display: inline;
+  bottom: 25px;
+  font-size: 150%;
 }
 
 .blackbelt {