2 files changed, 199 insertions, 126 deletions

diff --git a/_scss/base/_highlight.scss b/_scss/base/_highlight.scss
index 9611eff..329a995 100644
--- a/_scss/base/_highlight.scss
+++ b/_scss/base/_highlight.scss
@@ -1,267 +1,358 @@
 /*! pygments-css | github.com/richleland/pygments-css */
 
-@import 'utilities/base16';
+// Tango theme
+$color01: #000;
+$color02: #000080;
+$color03: #0000cf;
+$color04: #00a000;
+$color05: #204a87;
+$color06: #3465a4;
+$color07: #4e9a06;
+$color08: #5c35cc;
+$color09: #800080;
+$color10: #8f5902;
+$color11: #a40000;
+$color12: #c4a000;
+$color13: #c00;
+$color14: #ce5c00;
+$color15: #ef2929;
+$color16: #f57900;
+$color17: #f8f8f8;
 
 .highlight {
-  background: $base00;
-  color: $base07;
+  .c {
+    color: $color10;
+    font-style: italic;
+  }
 
-  .bp {
-    color: $base07;
+  .err {
+    border: 1px solid $color15;
+    color: $color11;
   }
 
-  .c {
-    color: $base03;
+  .g {
+    color: $color01;
   }
 
-  .c1 {
-    color: $base03;
+  .k {
+    color: $color05;
+    font-weight: bold;
+  }
+
+  .l {
+    color: $color01;
+  }
+
+  .n {
+    color: $color01;
+  }
+
+  .o {
+    color: $color14;
+    font-weight: bold;
+  }
+
+  .x {
+    color: $color01;
+  }
+
+  .p {
+    color: $color01;
+    font-weight: bold;
+  }
+
+  .ch {
+    color: $color10;
+    font-style: italic;
   }
 
   .cm {
-    color: $base03;
+    color: $color10;
+    font-style: italic;
   }
 
   .cp {
-    color: $base03;
+    color: $color10;
+    font-style: italic;
   }
 
-  .cs {
-    color: $base03;
+  .cpf {
+    color: $color10;
+    font-style: italic;
   }
 
-  .err {
-    color: $base08;
+  .c1 {
+    color: $color10;
+    font-style: italic;
+  }
+
+  .cs {
+    color: $color10;
+    font-style: italic;
   }
 
   .gd {
-    color: $base08;
+    color: $color11;
   }
 
   .ge {
+    color: $color01;
     font-style: italic;
   }
 
+  .gr {
+    color: $color15;
+  }
+
   .gh {
-    color: $base07;
+    color: $color02;
     font-weight: bold;
   }
 
   .gi {
-    color: $base0B;
+    color: $color04;
+  }
+
+  .go {
+    color: $color01;
+    font-style: italic;
   }
 
   .gp {
-    color: $base03;
-    font-weight: bold;
+    color: $color10;
   }
 
   .gs {
+    color: $color01;
     font-weight: bold;
   }
 
   .gu {
-    color: $base0C;
+    color: $color09;
     font-weight: bold;
   }
 
-  .hll {
-    background-color: $base02;
-  }
-
-  .il {
-    color: $base09;
-  }
-
-  .k {
-    color: $base0E;
+  .gt {
+    color: $color11;
+    font-weight: bold;
   }
 
   .kc {
-    color: $base0E;
+    color: $color05;
+    font-weight: bold;
   }
 
   .kd {
-    color: $base0E;
+    color: $color05;
+    font-weight: bold;
   }
 
   .kn {
-    color: $base0C;
+    color: $color05;
+    font-weight: bold;
   }
 
   .kp {
-    color: $base0E;
+    color: $color05;
+    font-weight: bold;
   }
 
   .kr {
-    color: $base0E;
+    color: $color05;
+    font-weight: bold;
   }
 
   .kt {
-    color: $base0A;
-  }
-
-  .l {
-    color: $base09;
+    color: $color05;
+    font-weight: bold;
   }
 
   .ld {
-    color: $base0B;
+    color: $color01;
   }
 
   .m {
-    color: $base09;
-  }
-
-  .mf {
-    color: $base09;
-  }
-
-  .mh {
-    color: $base09;
-  }
-
-  .mi {
-    color: $base09;
-  }
-
-  .mo {
-    color: $base09;
+    color: $color03;
+    font-weight: bold;
   }
 
-  .n {
-    color: $base07;
+  .s {
+    color: $color07;
   }
 
   .na {
-    color: $base0D;
+    color: $color12;
   }
 
   .nb {
-    color: $base07;
+    color: $color05;
   }
 
   .nc {
-    color: $base0A;
+    color: $color01;
+  }
+
+  .no {
+    color: $color01;
   }
 
   .nd {
-    color: $base0C;
+    color: $color08;
+    font-weight: bold;
   }
 
-  .ne {
-    color: $base08;
+  .ni {
+    color: $color14;
   }
 
-  .nf {
-    color: $base0D;
+  .ne {
+    color: $color13;
+    font-weight: bold;
   }
 
-  .ni {
-    color: $base07;
+  .nf {
+    color: $color01;
   }
 
   .nl {
-    color: $base07;
+    color: $color16;
   }
 
   .nn {
-    color: $base0A;
+    color: $color01;
   }
 
-  .no {
-    color: $base08;
+  .nx {
+    color: $color01;
+  }
+
+  .py {
+    color: $color01;
   }
 
   .nt {
-    color: $base0C;
+    color: $color05;
+    font-weight: bold;
   }
 
   .nv {
-    color: $base08;
+    color: $color01;
   }
 
-  .nx {
-    color: $base0D;
+  .ow {
+    color: $color05;
+    font-weight: bold;
   }
 
-  .o {
-    color: $base0C;
+  .w {
+    color: $color17;
+    text-decoration: underline;
   }
 
-  .ow {
-    color: $base0C;
+  .mb {
+    color: $color03;
+    font-weight: bold;
   }
 
-  .p {
-    color: $base07;
+  .mf {
+    color: $color03;
+    font-weight: bold;
   }
 
-  .py {
-    color: $base07;
+  .mh {
+    color: $color03;
+    font-weight: bold;
   }
 
-  .s {
-    color: $base0B;
+  .mi {
+    color: $color03;
+    font-weight: bold;
   }
 
-  .s1 {
-    color: $base0B;
+  .mo {
+    color: $color03;
+    font-weight: bold;
   }
 
-  .s2 {
-    color: $base0B;
+  .sa {
+    color: $color07;
   }
 
   .sb {
-    color: $base0B;
+    color: $color07;
   }
 
   .sc {
-    color: $base07;
+    color: $color07;
+  }
+
+  .dl {
+    color: $color07;
   }
 
   .sd {
-    color: $base03;
+    color: $color10;
+    font-style: italic;
+  }
+
+  .s2 {
+    color: $color07;
   }
 
   .se {
-    color: $base09;
+    color: $color07;
   }
 
   .sh {
-    color: $base0B;
+    color: $color07;
   }
 
   .si {
-    color: $base09;
+    color: $color07;
+  }
+
+  .sx {
+    color: $color07;
   }
 
   .sr {
-    color: $base0B;
+    color: $color07;
+  }
+
+  .s1 {
+    color: $color07;
   }
 
   .ss {
-    color: $base0B;
+    color: $color07;
   }
 
-  .sx {
-    color: $base0B;
+  .bp {
+    color: $color06;
+  }
+
+  .fm {
+    color: $color01;
   }
 
   .vc {
-    color: $base08;
+    color: $color01;
   }
 
   .vg {
-    color: $base08;
+    color: $color01;
   }
 
   .vi {
-    color: $base08;
+    color: $color01;
   }
 
-  .w {
-    color: $base07;
+  .vm {
+    color: $color01;
+  }
+
+  .il {
+    color: $color03;
+    font-weight: bold;
   }
 }
diff --git a/_scss/utilities/_base16.scss b/_scss/utilities/_base16.scss
deleted file mode 100644
index 278d94b..0000000
--- a/_scss/utilities/_base16.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Tomorrow Night by Chris Kempson (http://chriskempson.com) */
-
-$base00: #1d1f21;
-$base01: #282a2e;
-$base02: #373b41;
-$base03: #969896;
-$base04: #b4b7b4;
-$base05: #c5c8c6;
-$base06: #e0e0e0;
-$base07: #ffffff;
-$base08: #cc6666;
-$base09: #de935f;
-$base0A: #f0c674;
-$base0B: #b5bd68;
-$base0C: #8abeb7;
-$base0D: #81a2be;
-$base0E: #b294bb;
-$base0F: #a3685a;