diff --git a/_includes/2017/head.html b/_includes/2017/head.html
index 50d74dcac..1bebb7a6f 100644
--- a/_includes/2017/head.html
+++ b/_includes/2017/head.html
@@ -9,14 +9,18 @@
   <script src='https://unpkg.com/isotope-layout@3.0.4/dist/isotope.pkgd.min.js'></script>
   <script src='https://unpkg.com/prismjs@1.6.0'></script>
   {% for lang in page.prism_languages %}
-  <script src='https://unpkg.com/prismjs@1.6.0/components/prism-{{lang}}.min.js'></script>
-  {% endfor %}
+  <script src='https://unpkg.com/prismjs@1.6.0/components/prism-{{lang}}.min.js'></script>{% endfor %}
   <script src='https://unpkg.com/prismjs@1.6.0/plugins/line-highlight/prism-line-highlight.min.js'></script>
+
+  <!-- 3rd-party CSS -->
   <link rel='stylesheet' href='https://unpkg.com/sanitize.css@5.0.0/sanitize.css'>
-  <!-- <link rel='stylesheet' href='https://unpkg.com/prismjs@1.6.0/themes/prism.css'> -->
   <link rel='stylesheet' href='https://unpkg.com/prismjs@1.6.0/plugins/line-highlight/prism-line-highlight.css'>
+
+  {% comment %}
+  <!-- No custom fonts -->
   <link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Fira+Code:400'>
   <link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Roboto:300,400,700'>
+  {% endcomment %}
 
   <!-- 2017 layout -->
   <link href='{{base}}/assets/2017/style.css?t={{ timestamp }}' rel='stylesheet'>
diff --git a/_sass/2017/base/base.scss b/_sass/2017/base/base.scss
index 581c4cfc8..5b5c924fa 100644
--- a/_sass/2017/base/base.scss
+++ b/_sass/2017/base/base.scss
@@ -34,7 +34,7 @@ pre {
  * Antialias
  */
 
-* {
+*:not(pre):not(code) {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
diff --git a/_sass/2017/components/pages-list.scss b/_sass/2017/components/pages-list.scss
index cfdb9e83f..ae35b11bf 100644
--- a/_sass/2017/components/pages-list.scss
+++ b/_sass/2017/components/pages-list.scss
@@ -69,5 +69,5 @@
   margin: 16px 0;
   padding: 0 0 16px 0;
   font-weight: normal;
-  color: $base-b;
+  color: $base-a;
 }
diff --git a/_sass/2017/markdown/code.scss b/_sass/2017/markdown/code.scss
index b8e69c553..46dc61e2c 100644
--- a/_sass/2017/markdown/code.scss
+++ b/_sass/2017/markdown/code.scss
@@ -22,7 +22,7 @@
   }
 
   pre > code {
-    color: $base-text;
+    color: $base-head;
     max-height: auto;
     padding: 0;
     background: transparent;
@@ -62,11 +62,11 @@
 
 .token {
   $cA: $base-b;
-  $cA-3: adjust-color($cA, $lightness: 15%, $hue: -10deg);
-  $cA-7: adjust-color($cA, $lightness: -15%, $hue: 10deg);
+  $cA-3: adjust-color($cA, $lightness: 8%, $hue: -10deg);
+  $cA-7: adjust-color($cA, $lightness: -8%, $hue: 10deg);
 
   $cB: $base-c;
-  $cB-3: adjust-color($cB, $lightness: 15%, $hue: -10deg);
+  $cB-3: adjust-color($cB, $lightness: 8%, $hue: -10deg);
 
   $cM: #aaa; // Mute
 
diff --git a/_sass/2017/variables.scss b/_sass/2017/variables.scss
index 0998831c6..631040e88 100644
--- a/_sass/2017/variables.scss
+++ b/_sass/2017/variables.scss
@@ -5,17 +5,18 @@
 $gut-small: 16px; // max 480px width
 $gut: 16px;
 $column: 400px;
-$code-size: 0.92em;
+$code-size: 1em;
 $area-width: $column * 3 + 32px;
 
 /*
  * Fonts
  */
 
-$system-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-$body-font: 'Roboto', $system-font;
-$heading-font: 'Roboto', $system-font;
-$monospace-font: 'Fira Mono', Consolas, menlo, 'Andale Mono', 'Ubuntu Mono', monospace;
+$system-sans: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+$system-mono: 'SFMono-Regular', Consolas, Menlo, 'Liberation Mono', 'Ubuntu Mono', Courier, monospace;
+$body-font: $system-sans;
+$heading-font: $system-sans;
+$monospace-font: $system-mono;
 
 /*
  * Base colors
@@ -27,9 +28,9 @@ $base-head: #111;
 $base-text: #345;
 $base-mute: #667788; // gray
 
-$base-a: #8370bd; // indigo
-$base-b: #2b72a2; // blue
-$base-c: #17c694; // teal
+$base-a: adjust-color(#8370bd, $lightness: -5%); // indigo
+$base-b: adjust-color(#2b72a2, $lightness: -5%); // blue
+$base-c: adjust-color(#17c694, $lightness: -5%); // teal
 
 $base-b3: adjust-color($base-b, $lightness: 16%, $hue: -20deg);
 $base-b7: adjust-color($base-b, $lightness: -16%, $hue: 20deg);
@@ -59,15 +60,16 @@ $base-a-gradient: linear-gradient(
 //
 
 $shadow2:
-  0 1px 1px rgba($base-mute, 0.30);
+  0 1px 1px rgba($base-mute, 0.55);
 
 $shadow3:
-  0 6px 8px rgba($base-mute, 0.02),
-  0 1px 2px rgba($base-mute, 0.20);
+  0 6px 8px rgba($base-mute, 0.03),
+  0 1px 2px rgba($base-mute, 0.30);
 
 $shadow6:
-  0 8px 12px rgba($base-b3, 0.1),
-  0 2px 3px rgba($base-b, 0.18);
+  0 6px 8px rgba($base-mute, 0.03),
+  0 1px 2px rgba($base-mute, 0.30),
+  0 8px 12px rgba($base-b3, 0.1);
 
 /*
  * Mod scale
diff --git a/vimscript.md b/vimscript.md
index 3aced7996..f16222026 100644
--- a/vimscript.md
+++ b/vimscript.md
@@ -165,13 +165,14 @@ echo "Result: " . s:Initialize()
 ```
 
 ### Abortable
-Aborts when error is detected
 
 ```vim
 function! myfunction() abort
 endfunction
 ```
 
+Aborts when an error occurs.
+
 ### Var arguments
 
 ```vim
@@ -215,6 +216,7 @@ Custom commands
 ```vim
 command! Save :set fo=want tw=80 nowrap
 ```
+{: .-setup}
 
 Custom commands start with uppercase letters. The `!` redefines a command if it already exists.
 
@@ -222,6 +224,9 @@ Custom commands start with uppercase letters. The `!` redefines a command if it
 
 ```vim
 command! Save call script#foo()
+```
+
+```vim
 function! script#foo()
   ...
 endfunction