Merge pull request #239 from Keats/next

Next version
2018-03-05 19:23:18 +01:00 · 2018-03-05 19:23:18 +01:00 · f9bb73f7bb
parent 24fad7a5e8 fcd6cbcd32
commit f9bb73f7bb
55 changed files with 8996 additions and 211 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,11 @@
 # Changelog
 ## 0.3.2 (unreleased)
 - Fix `serve` command trying to read all files as markdown
 - Add many syntax highlighting themes
 - Fix date being serialised incorrectly in page `extra` section of front-matter
 ## 0.3.1 (2018-02-15)
 - Update Tera and other dependencies
--- a/Cargo.lock
+++ b/Cargo.lock
@ -24,7 +24,7 @@ name = "atty"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -36,8 +36,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -46,8 +46,8 @@ name = "backtrace-sys"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -127,7 +127,7 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -163,7 +163,7 @@ name = "cmake"
 version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -172,6 +172,7 @@ version = "0.1.0"
 dependencies = [
 "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "errors 0.1.0",
 "globset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "highlighting 0.1.0",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
@ -185,12 +186,13 @@ dependencies = [
 "config 0.1.0",
 "errors 0.1.0",
 "front_matter 0.1.0",
 "globset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rendering 0.1.0",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
@ -247,7 +249,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "shared_child 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -270,7 +272,7 @@ name = "errors"
 version = "0.1.0"
 dependencies = [
 "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -280,7 +282,7 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -289,7 +291,7 @@ name = "flate2"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -308,7 +310,7 @@ dependencies = [
 "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -324,7 +326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -332,7 +334,7 @@ name = "fsevent-sys"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -364,6 +366,18 @@ name = "glob"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "globset"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gutenberg"
 version = "0.3.1"
@ -382,7 +396,7 @@ dependencies = [
 "staticfile 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 "ws 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -420,7 +434,7 @@ dependencies = [
 "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -438,7 +452,7 @@ name = "inotify"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -446,7 +460,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -457,12 +471,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 1.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -506,7 +520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.36"
+version = "0.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -540,7 +554,7 @@ name = "memchr"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -558,7 +572,7 @@ dependencies = [
 [[package]]
 name = "mime_guess"
-version = "1.8.3"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -572,8 +586,8 @@ name = "miniz-sys"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -582,10 +596,10 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@ -602,10 +616,10 @@ dependencies = [
 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -616,7 +630,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -627,7 +641,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -648,14 +662,12 @@ dependencies = [
 [[package]]
 name = "net2"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -664,7 +676,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -674,7 +686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -694,9 +706,9 @@ dependencies = [
 "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "inotify 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -707,7 +719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -715,7 +727,7 @@ name = "num-integer"
 version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -724,20 +736,12 @@ version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "num-traits"
-version = "0.1.43"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "num-traits"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -745,7 +749,7 @@ name = "num_cpus"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -755,7 +759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "onig_sys 67.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -766,7 +770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "duct 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -790,7 +794,7 @@ dependencies = [
 "front_matter 0.1.0",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
@ -801,15 +805,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "pest"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "pest_derive"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "pest 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -876,7 +880,7 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -894,7 +898,7 @@ version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -904,7 +908,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -924,7 +928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -989,20 +993,20 @@ dependencies = [
 "front_matter 0.1.0",
 "highlighting 0.1.0",
 "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pulldown-cmark 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syntect 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "templates 0.1.0",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
 [[package]]
 name = "rustc-demangle"
-version = "0.1.5"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -1023,7 +1027,7 @@ name = "sass-rs"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "sass-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1033,7 +1037,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1073,12 +1077,12 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1093,7 +1097,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1119,9 +1123,9 @@ dependencies = [
 "taxonomies 0.1.0",
 "tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "templates 0.1.0",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
- "walkdir 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -1150,7 +1154,7 @@ dependencies = [
 "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "mount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -1191,8 +1195,8 @@ dependencies = [
 "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "yaml-rust 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1207,7 +1211,7 @@ dependencies = [
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
@ -1229,15 +1233,15 @@ dependencies = [
 "content 0.1.0",
 "errors 0.1.0",
 "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pulldown-cmark 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "taxonomies 0.1.0",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
 [[package]]
 name = "tera"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1245,13 +1249,13 @@ dependencies = [
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_derive 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -1276,7 +1280,7 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1303,7 +1307,7 @@ name = "time"
 version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1388,7 +1392,7 @@ dependencies = [
 [[package]]
 name = "url"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1407,7 +1411,7 @@ version = "0.1.0"
 dependencies = [
 "errors 0.1.0",
 "tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -1427,7 +1431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "walkdir"
-version = "2.1.3"
+version = "2.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1476,7 +1480,7 @@ dependencies = [
 "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -1522,7 +1526,7 @@ dependencies = [
 "checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
 "checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27"
 "checksum bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b7db437d718977f6dc9b2e3fd6fc343c02ac6b899b73fdd2179163447bd9ce9"
-"checksum cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0"
+"checksum cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9be26b24e988625409b19736d130f0c7d224f01d06454b5f81d8d23d6c1a618f"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c07b9257a00f3fc93b7f3c417fc15607ec7a56823bc2c37ec744e266387de5b"
@ -1546,6 +1550,7 @@ dependencies = [
 "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
 "checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum globset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96ab92362c06811385ae9a34d2698e8a1160745e0c78fbb434a44c8de3fabc"
 "checksum httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f407128745b78abc95c0ffbe4e5d37427fdc0d45470710cfef8c44522a2e37"
 "checksum humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e"
 "checksum hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)" = "368cb56b2740ebf4230520e2b90ebb0461e69034d85d1945febd9b3971426db2"
@ -1560,7 +1565,7 @@ dependencies = [
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
 "checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
 "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
-"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121"
+"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"
 "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
@ -1568,7 +1573,7 @@ dependencies = [
 "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
 "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-"checksum mime_guess 1.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dc7e82a15629bb4ecd9e72365bf33d1382be91e030f820edb8e2a21c02430da8"
+"checksum mime_guess 1.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b7e2b09d08313f84e0fb82d13a4d859109a17543fe9af3b6d941dc1431f7de79"
 "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
 "checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
 "checksum mio 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "7da01a5e23070d92d99b1ecd1cd0af36447c6fd44b0fe283c2db199fa136724f"
@ -1576,7 +1581,7 @@ dependencies = [
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
 "checksum mount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e25c06012941aaf8c75f2eaf7ec5c48cf69f9fc489ab3eb3589edc107e386f0b"
-"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
+"checksum net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "9044faf1413a1057267be51b5afba8eb1090bd2231c693664aa1db716fe1eae0"
 "checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79"
 "checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32"
 "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
@ -1584,15 +1589,14 @@ dependencies = [
 "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
 "checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
 "checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
-"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+"checksum num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3c2bd9b9d21e48e956b763c9f37134dc62d9e95da6edb3f672cacb6caf3cd3"
 "checksum num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10"
 "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
 "checksum onig 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf9c54a94ac4d9f3eec22b189b8a727e2ded82aee21e8ae7ffbba2468739161b"
 "checksum onig_sys 67.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34d894e8da3390097d99eb197eac2ec443277551388eff0f97c5f789933350ee"
 "checksum os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f547689aea1f11fac90333d573854a8e3e52a9160df1c42aefa8cd16734a3c0"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum pest 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1117ca38a751edc66a4cd9ca1b35644b7d00305971306e07e0d3befbc61e906"
+"checksum pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0fce5d8b5cc33983fc74f78ad552b5522ab41442c4ca91606e4236eb4b5ceefc"
-"checksum pest_derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1debf85717cb8fa6bf2aad21fbbe888fda5797aae22d332cefec9ba79b6c7a33"
+"checksum pest_derive 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6453faedc5c9980a3c278f28b1df33344a79cc6d4a2fd96e2b56288374dc822a"
 "checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc"
 "checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f"
 "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03"
@ -1600,7 +1604,7 @@ dependencies = [
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
 "checksum plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c61ac2afed2856590ae79d6f358a24b85ece246d2aa134741a66d589519b7503"
 "checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
-"checksum pulldown-cmark 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a656fdb8b6848f896df5e478a0eb9083681663e37dcb77dd16981ff65329fe8b"
+"checksum pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdf85cda6cadfae5428a54661d431330b312bc767ddbc57adbedc24da66e32"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
 "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
@ -1611,7 +1615,7 @@ dependencies = [
 "checksum regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5be5347bde0c48cfd8c3fdc0766cdfe9d8a755ef84d620d6794c778c91de8b2b"
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5d2f806b0fcdabd98acd380dc8daef485e22bcb7cddc811d1337967f2528cf5"
-"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
+"checksum rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11fb43a206a04116ffd7cfcf9bcb941f8eb6cc7ff667272246b0a1c74259a3cb"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
 "checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637"
 "checksum sass-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90f8cf6e645aa843ffffcbdc1e8752b1f221dfa314c81895aeb229a77aea7e05"
@ -1621,7 +1625,7 @@ dependencies = [
 "checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"
 "checksum serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ba7591cfe93755e89eeecdbcc668885624829b020050e6aec99c2a03bd3fd0"
 "checksum serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e03f1c9530c3fb0a0a5c9b826bdd9246a5921ae995d75f512ac917fc4dd55b5"
-"checksum serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9db7266c7d63a4c4b7fe8719656ccdd51acf1bed6124b174f933b009fb10bcb"
+"checksum serde_json 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "57781ed845b8e742fc2bf306aba8e3b408fe8c366b900e3769fbc39f49eb8b39"
 "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
 "checksum shared_child 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bcd5e483b3475af9bc2a35311c2f3bbf0bd98fde91410ab15a0d4ba3c3127b4e"
 "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
@ -1634,7 +1638,7 @@ dependencies = [
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum syntect 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db9fffcb25a761118df53811bd1cfcd54cf57fcbc51e1ea3167ae263477129ad"
 "checksum tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f73eebdb68c14bcb24aef74ea96079830e7fa7b31a6106e42ea7ee887c1e134e"
-"checksum tera 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8049891f7e86cd728119734998a193163fb32fa8883379020738f529511acf2"
+"checksum tera 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fc1a35d04c2444875b1319293fbc72c00215ae6220f8c70f9f14fefa5eaae0c6"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "dcaa948f0e3e38470cd8dc8dcfe561a75c9e43f28075bb183845be2b9b3c08cf"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
@ -1653,12 +1657,12 @@ dependencies = [
 "checksum unidecode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2adb95ee07cd579ed18131f2d9e7a17c25a4b76022935c7f2460d2bfae89fd2"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
-"checksum url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa35e768d4daf1d85733418a49fb42e10d7f633e394fccab4ab7aba897053fe2"
+"checksum url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f808aadd8cfec6ef90e4a14eb46f24511824d1ac596b9682703c87056c8678b7"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
 "checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum walkdir 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b167e9a4420d8dddb260e70c90a4a375a1e5691f21f70e715553da87b6c2503a"
+"checksum walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "63636bd0eb3d00ccb8b9036381b526efac53caf112b7783b730ab3f8e44da369"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
--- a/EXAMPLES.md
+++ b/EXAMPLES.md
@ -0,0 +1,16 @@
 # Example sites
 - [vincent.is](https://vincent.is): https://gitlab.com/Keats/vincent.is
 - [code<future](http://www.codelessfuture.com/)
 - http://t-rex.tileserver.ch (https://github.com/pka/t-rex-website/)
 - [adrien.is](https://adrien.is): https://github.com/Fandekasp/fandekasp.github.io
 - [Philipp Oppermann's blog](https://os.phil-opp.com/): https://github.com/phil-opp/blog_os/tree/master/blog
 - [seventeencups](https://www.seventeencups.net): https://github.com/17cupsofcoffee/seventeencups.net
 - [j1m.net](https://j1m.net): https://gitlab.com/jwcampbell/j1mnet
 - [vaporsoft.net](http://vaporsoft.net): https://github.com/piedoom/vaporsoft
 - [bharatkalluri.in](https://bharatkalluri.in): https://github.com/BharatKalluri/Blog
 - [verpeteren.nl](http://www.verpeteren.nl)
 - [atlasreports.nl](http://www.atlasreports.nl)
 - [groksome.com](http://www.groksome.com)
 - [tuckersiemens.com](https://tuckersiemens.com): https://github.com/reillysiemens/tuckersiemens.com
 - [andrei.blue](https://andrei.blue): https://github.com/azah/personal-blog
--- a/README.md
+++ b/README.md
@ -7,22 +7,6 @@ An opinionated static site generator written in Rust.
 Documentation is available on [its site](https://www.getgutenberg.io/documentation/getting-started/installation/) or
 in the `docs/content` folder of the repository.
 ## Example sites
 - [vincent.is](https://vincent.is): https://gitlab.com/Keats/vincent.is
 - [code<future](http://www.codelessfuture.com/)
 - http://t-rex.tileserver.ch (https://github.com/pka/t-rex-website/)
 - [adrien.is](https://adrien.is): https://github.com/Fandekasp/fandekasp.github.io
 - [Philipp Oppermann's blog](https://os.phil-opp.com/): https://github.com/phil-opp/blog_os/tree/master/blog
 - [seventeencups](https://www.seventeencups.net): https://github.com/17cupsofcoffee/seventeencups.net
 - [j1m.net](https://j1m.net): https://gitlab.com/jwcampbell/j1mnet
 - [vaporsoft.net](http://vaporsoft.net): https://github.com/piedoom/vaporsoft
 - [bharatkalluri.in](https://bharatkalluri.in): https://github.com/BharatKalluri/Blog
 - [verpeteren.nl](http://www.verpeteren.nl)
 - [atlasreports.nl](http://www.atlasreports.nl)
 - [groksome.com](http://www.groksome.com)
 - [tuckersiemens.com](https://tuckersiemens.com): https://github.com/reillysiemens/tuckersiemens.com
 ## Contributing
 As the documentation site is automatically built on commits to master, all development
 should happen on the `next` branch, unless it is fixing the current documentation.
--- a/components/config/Cargo.toml
+++ b/components/config/Cargo.toml
@ -8,6 +8,7 @@ toml = "0.4"
 serde = "1"
 serde_derive = "1"
 chrono = "0.4"
 globset = "0.3.0"
 errors = { path = "../errors" }
 highlighting = { path = "../highlighting"}
--- a/components/config/src/lib.rs
+++ b/components/config/src/lib.rs
@ -5,6 +5,7 @@ extern crate toml;
 extern crate errors;
 extern crate highlighting;
 extern crate chrono;
 extern crate globset;
 use std::collections::HashMap;
 use std::fs::File;
@ -13,6 +14,7 @@ use std::path::{Path, PathBuf};
 use toml::{Value as Toml};
 use chrono::Utc;
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use errors::{Result, ResultExt};
 use highlighting::THEME_SET;
@ -22,7 +24,7 @@ mod theme;
 use theme::Theme;
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Config {
    /// Base URL of the site, the only required config argument
    pub base_url: String,
@ -49,6 +51,12 @@ pub struct Config {
    pub generate_categories_pages: Option<bool>,
    /// Whether to compile the `sass` directory and output the css files into the static folder
    pub compile_sass: Option<bool>,
    /// A list of file glob patterns to ignore when processing the content folder. Defaults to none.
    /// Had to remove the PartialEq derive because GlobSet does not implement it. No impact
    /// because it's unused anyway (who wants to sort Configs?).
    pub ignored_content: Option<Vec<String>>,
    #[serde(skip_serializing, skip_deserializing)]  // not a typo, 2 are needed
    pub ignored_content_globber: Option<GlobSet>,
    /// Languages list and translated strings
    pub translations: Option<HashMap<String, Toml>>,
@ -84,6 +92,7 @@ impl Config {
        set_default!(config.generate_tags_pages, false);
        set_default!(config.generate_categories_pages, false);
        set_default!(config.compile_sass, false);
        set_default!(config.ignored_content, Vec::new());
        set_default!(config.translations, HashMap::new());
        set_default!(config.extra, HashMap::new());
@ -97,6 +106,25 @@ impl Config {
        };
        config.build_timestamp = Some(Utc::now().timestamp());
        // Convert the file glob strings into a compiled glob set matcher. We want to do this once,
        // at program initialization, rather than for every page, for example. We arrange for the
        // globset matcher to always exist (even though it has to be an inside an Option at the
        // moment because of the TOML serializer); if the glob set is empty the `is_match` function
        // of the globber always returns false.
        let mut glob_set_builder = GlobSetBuilder::new();
        if let Some(ref v) = config.ignored_content {
            for pat in v {
                let glob = match Glob::new(pat) {
                    Ok(g) => g,
                    Err(e) => bail!("Invalid ignored_content glob pattern: {}, error = {}", pat, e)
                };
                glob_set_builder.add(glob);
            }
        }
        config.ignored_content_globber = Some(glob_set_builder.build().expect("Bad ignored_content in config file."));
        Ok(config)
    }
@ -176,6 +204,8 @@ impl Default for Config {
            generate_tags_pages: Some(true),
            generate_categories_pages: Some(true),
            compile_sass: Some(false),
            ignored_content: Some(Vec::new()),
            ignored_content_globber: Some(GlobSetBuilder::new().build().unwrap()),
            translations: None,
            extra: None,
            build_timestamp: Some(1),
@ -330,4 +360,51 @@ title = "A title"
        assert_eq!(translations["en"]["title"].as_str().unwrap(), "A title");
    }
    #[test]
    fn missing_ignored_content_results_in_empty_vector_and_empty_globber() {
        let config_str = r#"
 title = "My site"
 base_url = "example.com"
        "#;
        let config = Config::parse(config_str).unwrap();
        let v = config.ignored_content.unwrap();
        assert_eq!(v.len(), 0);
        assert!(config.ignored_content_globber.unwrap().is_empty());
    }
    #[test]
    fn empty_ignored_content_results_in_empty_vector_and_empty_globber() {
        let config_str = r#"
 title = "My site"
 base_url = "example.com"
 ignored_content = []
        "#;
        let config = Config::parse(config_str).unwrap();
        assert_eq!(config.ignored_content.unwrap().len(), 0);
        assert!(config.ignored_content_globber.unwrap().is_empty());
    }
    #[test]
    fn non_empty_ignored_content_results_in_vector_of_patterns_and_configured_globber() {
        let config_str = r#"
 title = "My site"
 base_url = "example.com"
 ignored_content = ["*.{graphml,iso}", "*.py?"]
        "#;
        let config = Config::parse(config_str).unwrap();
        let v = config.ignored_content.unwrap();
        assert_eq!(v, vec!["*.{graphml,iso}", "*.py?"]);
        let g = config.ignored_content_globber.unwrap();
        assert_eq!(g.len(), 2);
        assert!(g.is_match("foo.graphml"));
        assert!(g.is_match("foo.iso"));
        assert!(!g.is_match("foo.png"));
        assert!(g.is_match("foo.py2"));
        assert!(g.is_match("foo.py3"));
        assert!(!g.is_match("foo.py"));
    }
 }
--- a/components/content/Cargo.toml
+++ b/components/content/Cargo.toml
@ -18,3 +18,4 @@ front_matter = { path = "../front_matter" }
 [dev-dependencies]
 tempdir = "0.3"
 toml = "0.4"
 globset = "0.3.0"
--- a/components/content/src/lib.rs
+++ b/components/content/src/lib.rs
@ -13,6 +13,8 @@ extern crate utils;
 extern crate tempdir;
 #[cfg(test)]
 extern crate toml;
 #[cfg(test)]
 extern crate globset;
 mod file_info;
 mod page;
--- a/components/content/src/page.rs
+++ b/components/content/src/page.rs
@ -128,10 +128,27 @@ impl Page {
        let path = path.as_ref();
        let content = read_file(path)?;
        let mut page = Page::parse(path, &content, config)?;
        page.assets = vec![];
        if page.file.name == "index" {
-            page.assets = find_related_assets(path.parent().unwrap());
+            // `find_related_assets` only scans the immediate directory (it is not recursive) so our
            // filtering only needs to work against the file_name component, not the full suffix. If
            // `find_related_assets` was changed to also return files in subdirectories, we could
            // use `PathBuf.strip_prefix` to remove the parent directory and then glob-filter
            // against the remaining path. Note that the current behaviour effectively means that
            // the `ignored_content` setting in the config file is limited to single-file glob
            // patterns (no "**" patterns).
            let globber = config.ignored_content_globber.as_ref().unwrap();
            let parent_dir = path.parent().unwrap();
            page.assets = find_related_assets(parent_dir).into_iter()
                .filter(|path|
                    match path.file_name() {
                        None => true,
                        Some(file) => !globber.is_match(file)
                    }
                ).collect();
        } else {
            page.assets = vec![];
        }
        Ok(page)
@ -206,12 +223,7 @@ impl ser::Serialize for Page {
        state.serialize_field("content", &self.content)?;
        state.serialize_field("title", &self.meta.title)?;
        state.serialize_field("description", &self.meta.description)?;
-        // From a TOML datetime to a String first
+        state.serialize_field("date", &self.meta.date)?;
        let date = match self.meta.date {
            Some(ref d) => Some(d.to_string()),
            None => None,
        };
        state.serialize_field("date", &date)?;
        state.serialize_field("slug", &self.slug)?;
        state.serialize_field("path", &self.path)?;
        state.serialize_field("components", &self.components)?;
@ -240,6 +252,7 @@ mod tests {
    use tera::Tera;
    use tempdir::TempDir;
    use globset::{Glob, GlobSetBuilder};
    use config::Config;
    use super::Page;
@ -419,4 +432,34 @@ Hello world
        assert_eq!(page.assets.len(), 3);
        assert_eq!(page.permalink, "http://a-website.com/posts/hey/");
    }
    #[test]
    fn page_with_ignored_assets_filters_out_correct_files() {
        let tmp_dir = TempDir::new("example").expect("create temp dir");
        let path = tmp_dir.path();
        create_dir(&path.join("content")).expect("create content temp dir");
        create_dir(&path.join("content").join("posts")).expect("create posts temp dir");
        let nested_path = path.join("content").join("posts").join("with-assets");
        create_dir(&nested_path).expect("create nested temp dir");
        let mut f = File::create(nested_path.join("index.md")).unwrap();
        f.write_all(b"+++\nslug=\"hey\"\n+++\n").unwrap();
        File::create(nested_path.join("example.js")).unwrap();
        File::create(nested_path.join("graph.jpg")).unwrap();
        File::create(nested_path.join("fail.png")).unwrap();
        let mut gsb = GlobSetBuilder::new();
        gsb.add(Glob::new("*.{js,png}").unwrap());
        let mut config = Config::default();
        config.ignored_content_globber = Some(gsb.build().unwrap());
        let res = Page::from_file(
            nested_path.join("index.md").as_path(),
            &config
        );
        assert!(res.is_ok());
        let page = res.unwrap();
        assert_eq!(page.assets.len(), 1);
        assert_eq!(page.assets[0].file_name().unwrap().to_str(), Some("graph.jpg"));
    }
 }
--- a/components/content/src/sorting.rs
+++ b/components/content/src/sorting.rs
@ -98,16 +98,13 @@ pub fn populate_previous_and_next_pages(input: &[Page]) -> Vec<Page> {
 #[cfg(test)]
 mod tests {
    use std::str::FromStr;
    use toml::value::Datetime;
    use front_matter::{PageFrontMatter, SortBy};
    use page::Page;
    use super::{sort_pages, populate_previous_and_next_pages};
    fn create_page_with_date(date: &str) -> Page {
        let mut front_matter = PageFrontMatter::default();
-        front_matter.date = Some(Datetime::from_str(date).unwrap());
+        front_matter.date = Some(date.to_string());
        Page::new("content/hello.md", front_matter)
    }
--- a/components/front_matter/src/page.rs
+++ b/components/front_matter/src/page.rs
@ -1,12 +1,65 @@
-use std::collections::HashMap;
+use std::result::{Result as StdResult};
 use chrono::prelude::*;
-use tera::Value;
+use tera::{Map, Value};
 use serde::{Deserialize, Deserializer};
 use toml;
 use errors::Result;
 fn from_toml_datetime<'de, D>(deserializer: D) -> StdResult<Option<String>, D::Error>
    where
        D: Deserializer<'de>,
 {
    toml::value::Datetime::deserialize(deserializer)
        .map(|s| Some(s.to_string()))
 }
 /// Returns key/value for a converted date from TOML.
 /// If the table itself is the TOML struct, only return its value without the key
 fn convert_toml_date(table: Map<String, Value>) -> Value {
    let mut new = Map::new();
    for (k, v) in table.into_iter() {
        if k == "$__toml_private_datetime" {
            return v;
        }
        match v {
            Value::Object(mut o) => {
                // that was a toml datetime object, just return the date
                if let Some(toml_date) = o.remove("$__toml_private_datetime") {
                    new.insert(k, toml_date);
                    return Value::Object(new);
                }
                new.insert(k, convert_toml_date(o));
            },
            _ => { new.insert(k, v); }
        }
    }
    Value::Object(new)
 }
 /// TOML datetimes will be serialized as a struct but we want the
 /// stringified version for json, otherwise they are going to be weird
 fn fix_toml_dates(table: Map<String, Value>) -> Value {
    let mut new = Map::new();
    for (key, value) in table {
        match value {
            Value::Object(mut o) => {
                new.insert(key, convert_toml_date(o));
            },
            _ => { new.insert(key, value); },
        }
    }
    Value::Object(new)
 }
 /// The front matter of every page
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct PageFrontMatter {
@ -15,7 +68,8 @@ pub struct PageFrontMatter {
    /// Description in <meta> that appears when linked, e.g. on twitter
    pub description: Option<String>,
    /// Date if we want to order pages (ie blog post)
-    pub date: Option<toml::value::Datetime>,
+    #[serde(default, deserialize_with = "from_toml_datetime")]
    pub date: Option<String>,
    /// Whether this page is a draft and should be ignored for pagination etc
    pub draft: Option<bool>,
    /// The page slug. Will be used instead of the filename if present
@ -41,12 +95,13 @@ pub struct PageFrontMatter {
    #[serde(skip_serializing)]
    pub template: Option<String>,
    /// Any extra parameter present in the front matter
-    pub extra: Option<HashMap<String, Value>>,
+    #[serde(default)]
    pub extra: Map<String, Value>,
 }
 impl PageFrontMatter {
    pub fn parse(toml: &str) -> Result<PageFrontMatter> {
-        let f: PageFrontMatter = match toml::from_str(toml) {
+        let mut f: PageFrontMatter = match toml::from_str(toml) {
            Ok(d) => d,
            Err(e) => bail!(e),
        };
@ -69,17 +124,20 @@ impl PageFrontMatter {
            }
        }
        f.extra = match fix_toml_dates(f.extra) {
            Value::Object(o) => o,
            _ => unreachable!("Got something other than a table in page extra"),
        };
        Ok(f)
    }
    /// Converts the TOML datetime to a Chrono naive datetime
    pub fn date(&self) -> Option<NaiveDateTime> {
        if let Some(ref d) = self.date {
-            let d2 = d.to_string();
+            if d.contains('T') {
-            if d2.contains('T') {
+                DateTime::parse_from_rfc3339(&d).ok().and_then(|s| Some(s.naive_local()))
                DateTime::parse_from_rfc3339(&d2).ok().and_then(|s| Some(s.naive_local()))
            } else {
-                NaiveDate::parse_from_str(&d2, "%Y-%m-%d").ok().and_then(|s| Some(s.and_hms(0, 0, 0)))
+                NaiveDate::parse_from_str(&d, "%Y-%m-%d").ok().and_then(|s| Some(s.and_hms(0, 0, 0)))
            }
        } else {
            None
@ -117,7 +175,7 @@ impl Default for PageFrontMatter {
            weight: None,
            aliases: None,
            template: None,
-            extra: None,
+            extra: Map::new(),
        }
    }
 }
@ -125,12 +183,14 @@ impl Default for PageFrontMatter {
 #[cfg(test)]
 mod tests {
    use tera::to_value;
    use super::PageFrontMatter;
    #[test]
    fn can_have_empty_front_matter() {
        let content = r#"  "#;
        let res = PageFrontMatter::parse(content);
        println!("{:?}", res);
        assert!(res.is_ok());
    }
@ -251,4 +311,32 @@ mod tests {
        let res = PageFrontMatter::parse(content);
        assert!(res.is_err());
    }
    #[test]
    fn can_parse_dates_in_extra() {
        let content = r#"
    title = "Hello"
    description = "hey there"
    [extra]
    some-date = 2002-14-01"#;
        let res = PageFrontMatter::parse(content);
        println!("{:?}", res);
        assert!(res.is_ok());
        assert_eq!(res.unwrap().extra["some-date"], to_value("2002-14-01").unwrap());
    }
    #[test]
    fn can_parse_nested_dates_in_extra() {
        let content = r#"
    title = "Hello"
    description = "hey there"
    [extra.something]
    some-date = 2002-14-01"#;
        let res = PageFrontMatter::parse(content);
        println!("{:?}", res);
        assert!(res.is_ok());
        assert_eq!(res.unwrap().extra["something"]["some-date"], to_value("2002-14-01").unwrap());
    }
 }
--- a/components/rebuild/src/lib.rs
+++ b/components/rebuild/src/lib.rs
@ -1,4 +1,5 @@
 extern crate site;
 #[macro_use]
 extern crate errors;
 extern crate content;
 extern crate front_matter;
@ -266,19 +267,51 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> {
 }
-// What happens when a section or a page is changed
+/// What happens when a section or a page is changed
 pub fn after_content_change(site: &mut Site, path: &Path) -> Result<()> {
    let is_section = path.file_name().unwrap() == "_index.md";
    let is_md = path.extension().unwrap() == "md";
    let index = path.parent().unwrap().join("index.md");
-    // A page or section got deleted
+    // A few situations can happen:
-    if !path.exists() {
+    // 1. Change on .md files
-        delete_element(site, path, is_section)?;
+    //    a. Is there an `index.md`? Return an error if it's something other than delete
-    }
+    //    b. Deleted? remove the element
    //    c. Edited?
    //       1. filename is `_index.md`, this is a section
    //       1. it's a page otherwise
    // 2. Change on non .md files
    //    a. Try to find a corresponding `_index.md`
    //       1. Nothing? Return Ok
    //       2. Something? Update the page
    if is_md {
        // only delete if it was able to be added in the first place
        if !index.exists() && !path.exists() {
            delete_element(site, path, is_section)?;
        }
-    if is_section {
+        // Added another .md in a assets directory
-        handle_section_editing(site, path)
+        if index.exists() && path.exists() && path != index {
            bail!(
                "Change on {:?} detected but there is already an `index.md` in the same folder",
                path.display()
            );
        } else if index.exists() && !path.exists() {
            // deleted the wrong .md, do nothing
            return Ok(());
        }
        if is_section {
            handle_section_editing(site, path)
        } else {
            handle_page_editing(site, path)
        }
    } else {
-        handle_page_editing(site, path)
+        if index.exists()  {
            handle_page_editing(site, &index)
        } else {
            Ok(())
        }
    }
 }
--- a/docs/content/documentation/content/overview.md
+++ b/docs/content/documentation/content/overview.md
@ -5,8 +5,8 @@ weight = 10
 Gutenberg uses the folder structure to determine the site structure.
-Each folder in the `content` directory represents a [section](./documentation/content/section.md) 
+Each folder in the `content` directory represents a [section](./documentation/content/section.md)
-that contains [pages](./documentation/content/page.md): your `.md` files. 
+that contains [pages](./documentation/content/page.md): your `.md` files.
 ```bash
 .
@ -26,21 +26,21 @@ that contains [pages](./documentation/content/page.md): your `.md` files.
 Each page path (the part after the `base_url`, for example `blog/cli-usage/`) can be customised by changing the `path` or `slug`
 attribute of the [page front-matter](./documentation/content/page.md#front-matter).
-You might have noticed a file named `_index.md` in the example above. 
+You might have noticed a file named `_index.md` in the example above.
 This file will be used for the metadata and content of the section itself and is not considered a page.
 To make sure the terminology used in the rest of the documentation is understood, let's go over the example above.
 The `content` directory in this case has three `sections`: `content`, `blog` and `landing`. The `content` section has only
-one page, `something.md`, the `landing` section has no page and the `blog` section has 4 pages: `cli-usage.md`, `configuration.md`, `directory-structure.md` 
+one page, `something.md`, the `landing` section has no page and the `blog` section has 4 pages: `cli-usage.md`, `configuration.md`, `directory-structure.md`
 and `installation.md`.
 While not shown in the example, sections can be nested indefinitely.
 ## Assets colocation
-The `content` directory is not limited to markup files though: it's natural to want to co-locate a page and some related 
+The `content` directory is not limited to markup files though: it's natural to want to co-locate a page and some related
-assets. 
+assets.
 Gutenberg supports that pattern out of the box: create a folder, add a `index.md` file and as many non-markdown files as you want.
 Those assets will be copied in the same folder when building the site which allows you to use a relative path to access them.
@ -52,3 +52,14 @@ Those assets will be copied in the same folder when building the site which allo
 ```
 By default, this page will get the folder name (`with-assets` in this case) as its slug.
 It is possible to ignore selected asset files using the
 [ignored_content](./documentation/getting-started/configuration.md) setting in the config file.
 For example, say you have an Excel spreadsheet from which you are taking several screenshots and
 then linking to those image files on your website. For maintainability purposes, you want to keep
 the spreadsheet in the same folder as the markdown, but you don't want to copy the spreadsheet to
 the public web site. You can achieve this by simply setting `ignored_content` in the config file:
 ```
 ignored_content = ["*.xlsx"]
 ```
--- a/docs/content/documentation/deployment/_index.md
+++ b/docs/content/documentation/deployment/_index.md
@ -0,0 +1,8 @@
 +++
 title = "Deployment"
 weight = 5
 sort_by = "weight"
 insert_anchor_links = "left"
 redirect_to = "documentation/deployment/overview"
 +++
--- a/docs/content/documentation/deployment/github-pages.md
+++ b/docs/content/documentation/deployment/github-pages.md
@ -0,0 +1,54 @@
 +++
 title = "GitHub Pages"
 weight = 30
 +++
 By default, GitHub Pages uses Jekyll (A ruby based static site generator), 
 but you can use whatever you want provided you have an `index.html` file in the root of a branch called `gh-pages`.
 That branch name can also be manually changed in the settings of a repository.
 We are going to use [TravisCI](https://travis-ci.org) to automatically publish the site. If you are not using Travis already,
 you will need to login with the GitHub OAuth and activate Travis for the repository.
 Don't forget to also check if your repository allows GitHub Pages in its settings.
 ## Allowing Travis to push to GitHub
 Before pushing anything, Travis needs a Github private access key in order to make changes to your repository. 
 If you're already logged in to your account, just click [here](https://github.com/settings/tokens) to go to your tokens page. 
 Otherwise, navigate to `Settings > Developer Settings > Personal Access Tokens`. 
 Generate a new token, and give it any description you'd like. 
 Under the "Select Scopes" section, give it repo permissions. Click "Generate token" to finish up.
 Your token will now be visible! 
 Copy it into your clipboard and head back to Travis. 
 Once on Travis, click on your project, and navigate to "Settings". Scroll down to "Environment Variables" and input a name of `GH_TOKEN` with a value of your access token. 
 Make sure "Display value in build log" is off, and then click add. Now Travis has access to your repository.
 ## Setting up Travis
 We're almost done. We just need some scripts in a .travis.yml file to tell Travis what to do.
 ```yaml
 before_script:
  # Download and unzip the gutenberg executable
  # Replace the version numbers in the URL by the version you want to use
  - curl -s -L https://github.com/Keats/gutenberg/releases/download/v0.3.1/gutenberg-v0.3.1-x86_64-unknown-linux-gnu.tar.gz | sudo tar xvzf - -C /usr/local/bin
 script:
  - gutenberg build
 # If you are using a different folder than `public` for the output directory, you will
 # need to change the `gutenberg` command and the `ghp-import` path
 after_success: |
  [ $TRAVIS_BRANCH = master ] &&
  [ $TRAVIS_PULL_REQUEST = false ] &&
  gutenberg build &&
  sudo pip install ghp-import &&
  ghp-import -n public && 
  git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
 ```
 If your site is using a custom domain, you will need to mention it in the `ghp-import` command: `ghp-import -c vaporsoft.net -n public`
 for example.
 Credits: this page is based on the article https://vaporsoft.net/publishing-gutenberg-to-github/
--- a/docs/content/documentation/deployment/netlify.md
+++ b/docs/content/documentation/deployment/netlify.md
@ -0,0 +1,44 @@
 +++
 title = "Netlify"
 weight = 20
 +++
 Netlify provides best practices like SSL, CDN distribution, caching and continuous deployment 
 with no effort. This very site is hosted by Netlify and automatically deployed on commits.
 If you don't have an account with Netlify, you can [sign up](https://app.netlify.com) for one.
 Once you are in the admin interface, you can add a site from a Git provider (GitHub, GitLab or Bitbucket). At the end
 of this process, you can select the deploy settings for the project:
 - build command: `GUTENBERG_VERSION=0.3.1 gutenberg build` (replace the version number in the variable by the version you want to use)
 - publish directory: the path to where the `public` directory is
 With this setup, your site should be automatically deployed on every commit on master.
 However, if you want to use everything that Netlify gives you, you should also publish temporary sites for pull requests.
 This is done by adding the following `netlify.toml` file in your repository and removing the build command/publish directory in
 the admin interface.
 ```toml
 [build]
 # assuming the gutenberg site is in a docs folder, if it isn't you don't need 
 # to have a `base` variable but you do need the `publish` and `command`
 base    = "docs"
 publish = "docs/public"
 command = "gutenberg build"
 [build.environment]
 # Set the version name that you want to use and Netlify will automatically use it
 GUTENBERG_VERSION = "0.3.1"
 # The magic for deploying previews of branches
 # We need to override the base url with what the url of the preview is ($DEPLOY_PRIME_URL)
 # otherwise links would not work properly
 [context.deploy-preview]
 command = "gutenberg build --base-url $DEPLOY_PRIME_URL"
 ```
--- a/docs/content/documentation/deployment/overview.md
+++ b/docs/content/documentation/deployment/overview.md
@ -0,0 +1,9 @@
 +++
 title = "Overview"
 weight = 10
 +++
 Gutenberg outputs plain files, no databases needed. This makes hosting and deployment
 trivial on many providers.
--- a/docs/content/documentation/getting-started/configuration.md
+++ b/docs/content/documentation/getting-started/configuration.md
@ -3,10 +3,10 @@ title = "Configuration"
 weight = 4
 +++
-The default configuration will be enough to get Gutenberg running locally but not more than that. 
+The default configuration will be enough to get Gutenberg running locally but not more than that.
 It follows the philosophy of only paying for what you need: almost everything is turned off by default.
-To change the config, edit the `config.toml` file. 
+To change the config, edit the `config.toml` file.
 If you are not familiar with TOML, have a look at [the TOML Spec](https://github.com/toml-lang/toml)
 to learn about it.
@ -30,7 +30,7 @@ theme = ""
 # Highlight all code blocks found
 highlight_code = false
-# Which theme to use for the code highlighting. 
+# Which theme to use for the code highlighting.
 # See below for list of accepted values
 highlight_theme = "base16-ocean-dark"
@ -40,21 +40,28 @@ generate_rss = false
 # The number of articles to include in the RSS feed
 rss_limit = 20
-# Whether to generate a tags page and individual 
+# Whether to generate a tags page and individual
 # tag pages for pages with tags
 generate_tags_pages = false
-# Whether to generate a categories page and individual 
+# Whether to generate a categories page and individual
 # category pages for pages with a category
 generate_categories_pages = false
 # Whether to compile the Sass files found in the `sass` directory
 compile_sass = false
 # A list of glob patterns specifying asset files to ignore when
 # processing the content directory. 
 # Defaults to none, which means all asset files are copied over to the public folder.
 # Example:
 #     ignored_content = ["*.{graphml,xlsx}", "temp.*"]
 ignored_content = []
 # Optional translation object. The key if present should be a language code
 [translations]
-# You can put any kind of data in there and it 
+# You can put any kind of data in there and it
 # will be accessible in all templates
 [extra]
 ```
@ -63,18 +70,34 @@ compile_sass = false
 Gutenberg currently has the following highlight themes available:
 - 1337: https://tmtheme-editor.herokuapp.com/#!/editor/theme/1337
 - agola-dark: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Agola%20Dark
 - ascetic-white: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Ascetic%20White
 - axar: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Axar
 - base16-ocean-dark
- base16-ocean-light
+- base16-ocean-light 
- gruvbox-dark
+- bbedit: https://tmtheme-editor.herokuapp.com/#!/editor/theme/BBEdit
- gruvbox-light
+- boron: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Boron
- inspired-github
+- charcoal: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Charcoal
- kronuz
+- cheerfully-light: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Cheerfully%20Light
- material-dark
+- classic-modified: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Classic%20Modified
- material-light
+- demain: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Demain
- monokai
+- dimmed-fluid: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Dimmed%20Fluid
- solarized-dark
+- gray-matter-dark: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Gray%20Matter%20Dark
- solarized-light
+- gruvbox-dark: https://github.com/morhetz/gruvbox
- 1337
+- gruvbox-light: https://github.com/morhetz/gruvbox
 - idle: https://tmtheme-editor.herokuapp.com/#!/editor/theme/IDLE
 - inspired-github: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Inspiredgithub
 - ir-white: https://tmtheme-editor.herokuapp.com/#!/editor/theme/IR_White
 - kronuz: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Kronuz
 - material-dark: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Material%20Dark
 - material-light: https://github.com/morhetz/gruvbox
 - monokai: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Monokai
 - solarized-dark: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Solarized%20(dark)
 - solarized-light: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Solarized%20(light)
 - subway-madrid: https://github.com/idleberg/Subway.tmTheme
 - subway-moscow: https://github.com/idleberg/Subway.tmTheme
 - visual-studio-dark: https://tmtheme-editor.herokuapp.com/#!/editor/theme/Visual%20Studio%20Dark
-Gutenberg uses the Sublime Text themes, making it very easy to add more. 
+Gutenberg uses the Sublime Text themes, making it very easy to add more.
 If you want a theme not on that list, please open an issue or a pull request on the [Gutenberg repo](https://github.com/Keats/gutenberg).
--- a/docs/content/documentation/themes/creating-a-theme.md
+++ b/docs/content/documentation/themes/creating-a-theme.md
@ -7,29 +7,25 @@ Creating is exactly like creating a normal site with Gutenberg, except you
 will want to use many [Tera blocks](https://tera.netlify.com/docs/templates/#inheritance) to
 allow users to easily modify it.
-A theme also need to have a `theme.toml` configuration file with the
+## Getting started
-following fields, here's the one from a [real template](https://github.com/Keats/hyde):
+As mentioned, a theme is just like any site: start with running `gutenberg init MY_THEME_NAME`.
 The only thing needed to turn that site into a theme is to add `theme.toml` configuration file with the
 following fields:
 ```toml
-name = "hyde"
+name = "my theme name"
 description = "A classic blog theme"
 license = "MIT"
 homepage = "https://github.com/Keats/gutenberg-hyde"
 # The minimum version of Gutenberg required
-min_version = "0.1"
+min_version = "0.3"
 # Any variable there can be overriden in the end user `config.toml`
 # You don't need to prefix variables by the theme name but as this will
 # be merged with user data, some kind of prefix or nesting is preferable
 # Use snake_casing to be consistent with the rest of Gutenberg
 [extra]
 hyde_sticky = true
 hyde_reverse = false
 hyde_theme = ""
 hyde_links = [
    {url = "https://google.com", name = "Google.com"},
    {url = "https://google.fr", name = "Google.fr"},
 ]
 # The theme author info: you!
 [author]
@ -44,21 +40,36 @@ homepage = "http://markdotto.com/"
 repo = "https://www.github.com/mdo/hyde"
 ```
-A theme will also need three directories to work:
+A simple theme you can use as example is [Hyde](https://github.com/Keats/hyde).
- `static`: any static files used in this theme
+## Working on a theme
- `templates`: all templates used in this theme
+As a theme is just a site, you can simply use `gutenberg serve` and make changes to your
- `sass`: Sass stylesheets for this theme, can be empty
+theme, with live reloading working as expected.
-To be featured on this site, the theme will require two more things:
+Make sure to commit every directory (including `content`) in order for other people 
 to be able to build the theme from your repository.
- `screenshot.png`: a screenshot of the theme in action, its size needs to be reasonable
+### Caveat
 Please note that [include paths](https://tera.netlify.com/docs/templates/#include) can only be used in used in normal templates. 
 Theme templates should use [macros](https://tera.netlify.com/docs/templates/#macros) instead.
 ## Submitting a theme to the gallery
 If you want your theme to be featured in the [themes](./themes/_index.md) section
 of this site, the theme will require two more things:
 - `screenshot.png`: a screenshot of the theme in action with a max size of around 2000x1000
 - `README.md`: a thorough README explaining how to use the theme and any other information
 of importance
-A simple theme you can use as example is [Hyde](https://github.com/Keats/hyde).
+The first step is to make sure the theme is fulfilling those three requirements:
-# Caveat
+- have a `screenshot.png` of the theme in action with a max size of around 2000x1000
 - have a thorough `README.md` explaining how to use the theme and any other information
 of importance
 - be of reasonably high quality
-Please note that [include paths](https://tera.netlify.com/docs/templates/#include) can only be used in used in normal templates. Theme templates should use [macro's](https://tera.netlify.com/docs/templates/#macros) instead.
+When your theme is ready, you can submit it to the [themes repository](https://github.com/Keats/gutenberg-themes)
 by following the process in the README.
--- a/docs/content/documentation/themes/themes-list.md
+++ b/docs/content/documentation/themes/themes-list.md
@ -1,9 +0,0 @@
 +++
 title = "List of themes"
 weight = 40
 +++
 The following themes are available for Gutenberg:
 - [Hyde](https://github.com/Keats/gutenberg-hyde)
 - [Materialize](https://github.com/verpeteren/gutenberg-materialize)
--- a/docs/content/themes/_index.md
+++ b/docs/content/themes/_index.md
@ -0,0 +1,5 @@
 +++
 template = "themes.html"
 sort_by = "date"
 +++        
--- a/docs/content/themes/after-dark/index.md
+++ b/docs/content/themes/after-dark/index.md
@ -0,0 +1,70 @@
 +++
 title = "after-dark"
 description = "A robust, elegant dark theme"
 template = "theme.html"
 date = 2017-11-07T17:39:37+01:00
 [extra]
 created = 2018-02-22T19:13:36+01:00
 updated = 2017-11-07T17:39:37+01:00
 repository = "https://github.com/Keats/after-dark"
 homepage = "https://github.com/Keats/after-dark"
 minimum_version = "0.2"
 license = "MIT"
 [extra.author]
 name = "Vincent Prouillet"
 homepage = "https://vincent.is"
 +++        
 # after-dark
 ![after-dark screenshot](https://github.com/Keats/after-dark/blob/master/screenshot.png?raw=true)
 ## Contents
 - [Installation](#installation)
 - [Options](#options)
  - [Top menu](#top-menu)
  - [Title](#title)
 ## Installation
 First download this theme to your `themes` directory:
 ```bash
 $ cd themes
 $ git clone https://github.com/Keats/after-dark.git
 ```
 and then enable it in your `config.toml`:
 ```toml
 theme = "after-dark"
 ```
 ## Options
 ### Top-menu
 Set a field in `extra` with a key of `after_dark_menu`:
 ```toml
 after_dark_menu = [
    {url = "$BASE_URL", name = "Home"},
    {url = "$BASE_URL/categories", name = "Categories"},
    {url = "$BASE_URL/tags", name = "Tags"},
    {url = "https://google.com", name = "Google"},
 ]
 ```
 If you put `$BASE_URL` in a url, it will automatically be replaced by the actual
 site URL.
 ### Title
 The site title is shown on the homepage. As it might be different from the `<title>`
 element that the `title` field in the config represents, you can set the `after_dark_title`
 instead.
 ## Original
 This template is based on the Hugo template https://github.com/comfusion/after-dark
--- a/docs/content/themes/after-dark/screenshot.png
+++ b/docs/content/themes/after-dark/screenshot.png
--- a/docs/content/themes/book/index.md
+++ b/docs/content/themes/book/index.md
@ -0,0 +1,58 @@
 +++
 title = "book"
 description = "A book theme inspired from GitBook/mdBook"
 template = "theme.html"
 date = 2018-01-28T10:53:19+01:00
 [extra]
 created = 2018-02-22T19:13:36+01:00
 updated = 2018-01-28T10:53:19+01:00
 repository = "https://github.com/Keats/book"
 homepage = "https://github.com/Keats/book"
 minimum_version = "0.2"
 license = "MIT"
 [extra.author]
 name = "Vincent Prouillet"
 homepage = "https://vincent.is"
 +++        
 # book
 A theme based on [Gitbook](https://www.gitbook.com), to write documentation
 or books.
 ![book screenshot](https://github.com/Keats/book/blob/master/screenshot.png?raw=true)
 ## Contents
 - [Installation](#installation)
 - [Options](#options)
  - [Numbered chapters](#numbered-chapters)
 ## Installation
 First download this theme to your `themes` directory:
 ```bash
 $ cd themes
 $ git clone https://github.com/Keats/book.git
 ```
 and then enable it in your `config.toml`:
 ```toml
 theme = "book"
 ```
 ## Options
 ### Numbered chapters
 By default, the `book` theme will number the chapters and pages in the left menu.
 You can disable that by setting the `book_numbered_chapters` in `extra`:
 ```toml
 book_numbered_chapters = false
 ```
--- a/docs/content/themes/book/screenshot.png
+++ b/docs/content/themes/book/screenshot.png
--- a/docs/content/themes/even/index.md
+++ b/docs/content/themes/even/index.md
@ -0,0 +1,69 @@
 +++
 title = "even"
 description = "A robust, elegant dark theme"
 template = "theme.html"
 date = 2018-01-25T18:44:44+01:00
 [extra]
 created = 2018-02-22T19:13:36+01:00
 updated = 2018-01-25T18:44:44+01:00
 repository = "https://github.com/Keats/even"
 homepage = "https://github.com/Keats/even"
 minimum_version = "0.3"
 license = "MIT"
 [extra.author]
 name = "Vincent Prouillet"
 homepage = "https://vincent.is"
 +++        
 # Even
 Even is a clean, responsive theme based on the Hugo theme with the same name featuring categories, tags and pagination.
 ![even screenshot](https://github.com/Keats/even/blob/master/screenshot.png?raw=true)
 ## Contents
 - [Installation](#installation)
 - [Options](#options)
  - [Top menu](#top-menu)
  - [Title](#title)
 ## Installation
 First download this theme to your `themes` directory:
 ```bash
 $ cd themes
 $ git clone https://github.com/Keats/even.git
 ```
 and then enable it in your `config.toml`:
 ```toml
 theme = "even"
 ```
 ## Options
 ### Top-menu
 Set a field in `extra` with a key of `even_menu`:
 ```toml
 # This is the default menu
 even_menu = [
    {url = "$BASE_URL", name = "Home"},
    {url = "$BASE_URL/categories", name = "Categories"},
    {url = "$BASE_URL/tags", name = "Tags"},
    {url = "$BASE_URL/about", name = "About"},
 ]
 ```
 If you put `$BASE_URL` in a url, it will automatically be replaced by the actual
 site URL.
 ### Title
 The site title is shown on the header. As it might be different from the `<title>`
 element that the `title` field in the config represents, you can set the `even_title`
 instead.
--- a/docs/content/themes/even/screenshot.png
+++ b/docs/content/themes/even/screenshot.png
--- a/docs/content/themes/feather/index.md
+++ b/docs/content/themes/feather/index.md
@ -0,0 +1,90 @@
 +++
 title = "feather"
 description = "A modern blog theme"
 template = "theme.html"
 date = 2018-01-21T04:35:36-05:00
 [extra]
 created = 2018-01-21T04:35:36-05:00
 updated = 2018-01-21T04:35:36-05:00
 repository = "https://github.com/piedoom/feather"
 homepage = "https://github.com/piedoom/feather"
 minimum_version = "0.2"
 license = "MIT"
 [extra.author]
 name = "doomy"
 homepage = "https://alexanderlozada.com"
 +++        
 # feather
 A lightweight theme for gutenberg
 Feather is a blog theme specifically designed for the static site generator [Gutenberg](https://github.com/Keats/gutenberg).  It's as far as 
 I know the first theme for the platform that isn't a port or just contained within template files.  
 Feather is *not* intended for anything other than blogs.  
 # Developing & Contributing
 Because feather comes with example content, you can run the theme just like any Gutenberg
 blog with `gutenberg serve`.  Your changes will autoreload!
 ## Considerations
 Please don't edit the `content` folder directly for your own blog, use it as a theme like
 intended!
 # Usage
 Using feather is easy.  Install [Gutenberg](https://github.com/Keats/gutenberg) and follow 
 [the guide for creating a site and using a theme](https://www.getgutenberg.io/documentation/themes/installing-and-using-themes/).  Then,
 add `theme = "feather"` to your `config.toml` file.
 If you intend to publish your site to Github Pages, please check out [this tutorial](http://vaporsoft.net/publishing-gutenberg-to-github/).
 ## Options
 Gutenberg allows themes to [define `[extra]` variables](https://www.getgutenberg.io/documentation/getting-started/configuration/)
 in the config.  Here's a full list of theme variables with example values and comments.
 ```
 [extra]
 # specify an image for the big header at the top of the page.
 # this will be a background cover image, so make it large enough
 # so that it won't upscale enough to pixelate
 feather_header_image = "/theme_images/default.gif"
 # if you want comments, add your disqus embed code here.  
 # you can obtain a code on the disqus website.
 feather_disqus_code = "<div id='disqus_thread'></div><script> var disqus_config = ... etc ... etc ..."
 # if you'd like people to be able to donate to you, you can include a donate link
 # to be displayed in the footer of the website.
 feather_donate_link = "https://paypal.me/piedoomy"
 # if you want analytics, add your tracking code HTML here.
 feather_analytics = "<script async src='https://www.googletagmanager.com/gtag/... etc ... etc ..."
 ```
 ## Features
 Feather also provides several features optional.
 - [x] Categories page
 - [x] Tags page
 - [x] Sorting chronologically 
 - [x] Comments
 - [x] Analytics 
 - [x] Donate links
 ## Using Categories and Tags
 In order to use categories and tags, you'll need to enable their compilation by adding the following lines to your `config.toml`
 (make sure they aren't under `[extra]`):
 ```toml
 generate_categories_pages = true
 generate_tags_pages = true
 ```
 # Live demo
 [My dev site](http://vaporsoft.net/) uses the latest version of feather.
--- a/docs/content/themes/feather/screenshot.png
+++ b/docs/content/themes/feather/screenshot.png
--- a/docs/content/themes/hyde/index.md
+++ b/docs/content/themes/hyde/index.md
@ -0,0 +1,89 @@
 +++
 title = "hyde"
 description = "A classic blog theme"
 template = "theme.html"
 date = 2017-10-24T15:01:52+02:00
 [extra]
 created = 2018-02-28T19:41:16+01:00
 updated = 2017-10-24T15:01:52+02:00
 repository = "https://github.com/Keats/hyde"
 homepage = "https://github.com/Keats/gutenberg-hyde"
 minimum_version = "0.2"
 license = "MIT"
 [extra.author]
 name = "Vincent Prouillet"
 homepage = "https://vincent.is"
 +++        
 # hyde
 Hyde is a brazen two-column [Gutenberg](https://github.com/Keats/gutenberg) based on the Jekyll theme of the same name that pairs a prominent sidebar with uncomplicated content.
 ![Hyde screenshot](https://f.cloud.github.com/assets/98681/1831228/42af6c6a-7384-11e3-98fb-e0b923ee0468.png)
 ## Contents
 - [Installation](#installation)
 - [Options](#options)
  - [Sidebar menu](#sidebar-menu)
  - [Sticky sidebar content](#sticky-sidebar-content)
  - [Themes](#themes)
  - [Reverse layout](#reverse-layout)
 ## Installation
 First download this theme to your `themes` directory:
 ```bash
 $ cd themes
 $ git clone https://github.com/Keats/hyde.git
 ```
 and then enable it in your `config.toml`:
 ```toml
 theme = "hyde"
 ```
 ## Options
 ### Sidebar menu
 Set a field in `extra` with a key of `hyde_links`:
 ```toml
 [extra]
 hyde_links = [
    {url = "https://google.com", name = "Google.com"},
    {url = "https://google.fr", name = "Google.fr"},
 ]
 ```
 Each link needs to have a `url` and a `name`.
 ### Sticky sidebar content
 By default Hyde ships with a sidebar that affixes it's content to the bottom of the sidebar. You can optionally disable this by setting `hyde_sticky` to false in your `config.toml`.
 ### Themes
 Hyde ships with eight optional themes based on the [base16 color scheme](https://github.com/chriskempson/base16). Apply a theme to change the color scheme (mostly applies to sidebar and links).
 ![Hyde in red](https://f.cloud.github.com/assets/98681/1831229/42b0b354-7384-11e3-8462-31b8df193fe5.png)
 There are eight themes available at this time.
 ![Hyde theme classes](https://f.cloud.github.com/assets/98681/1817044/e5b0ec06-6f68-11e3-83d7-acd1942797a1.png)
 To use a theme, set the `hyde_theme` field in `config.toml` to any of the themes name:
 ```toml
 [extra]
 hyde_theme = "theme-base-08"
 ```
 To create your own theme, look to the Themes section of [included CSS file](https://github.com/poole/hyde/blob/master/public/css/hyde.css). Copy any existing theme (they're only a few lines of CSS), rename it, and change the provided colors.
 ### Reverse layout
 ![Hyde with reverse layout](https://f.cloud.github.com/assets/98681/1831230/42b0d3ac-7384-11e3-8d54-2065afd03f9e.png)
 Hyde's page orientation can be reversed by setting `hyde_reversed` to `true` in the `config.toml`.
--- a/docs/content/themes/hyde/screenshot.png
+++ b/docs/content/themes/hyde/screenshot.png
--- a/docs/sass/_themes.scss
+++ b/docs/sass/_themes.scss
@ -0,0 +1,79 @@
 .themes-container {
  padding: 3rem;
  width: 80%;
  margin: 0 auto;
  img {
    max-width: 100%;
  }
 }
@media only screen and (max-width: 1000px)  {
  .themes-container {
    width: 100%;
    margin: 0 1rem;
  }
 }
 .themes {
  display: flex;
  flex-wrap: wrap;
  justify-content: space-between;
  .theme {
    width: 45%;
    text-decoration: none;
    cursor: pointer;
    margin-bottom: 2rem;
    border-bottom: none;
    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
    padding: 10px;
    img {
      width: 100%;
      height: 90%;
    }
    span {
      display: block;
      text-align: center;
      font-size: 1.1rem;
    }
  }
 }
 .theme-info {
  display: flex;
  align-items: flex-start;
  .thumb {
    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07);
    width: 400px;
    margin-right: 2rem;
  }
  h1, p {
    margin: 0;
  }
  padding: 1rem;
 }
@media only screen and (max-width: 1000px)  {
  .themes .theme {
    width: 100%;
  }
 }
@media only screen and (max-width: 1000px)  {
  .theme-info {
    flex-direction: column;
    align-items: center;
    img {
      margin-bottom: 1rem;
    }
  }
 }
--- a/docs/sass/site.scss
+++ b/docs/sass/site.scss
@ -15,3 +15,4 @@ $link-color: #007CBC;
@import "header";
@import "index";
@import "docs";
@import "themes";
--- a/docs/templates/index.html
+++ b/docs/templates/index.html
@ -16,6 +16,7 @@
            <nav class="{% block extra_nav_class %}container{% endblock extra_nav_class %}">
                <a class="header__logo white" href="{{ config.base_url }}">Gutenberg</a>
                <a class="white" href="{{ get_url(path="./documentation/_index.md") }}" class="nav-link">Docs</a>
                <a class="white" href="{{ get_url(path="./themes/_index.md") }}" class="nav-link">Themes</a>
                <a class="white" href="https://github.com/Keats/gutenberg" class="nav-link">GitHub</a>
            </nav>
        </header>
@ -90,7 +91,7 @@
            {% endblock content %}
        </div>
        <footer>
-            ©2017 — <a class="white" href="https://vincent.is">Vincent Prouillet</a> and <a class="white" href="https://github.com/Keats/gutenberg/graphs/contributors">contributors</a>
+            ©2017-2018 — <a class="white" href="https://vincent.is">Vincent Prouillet</a> and <a class="white" href="https://github.com/Keats/gutenberg/graphs/contributors">contributors</a>
        </footer>
    </body>
 </html>
--- a/docs/templates/theme.html
+++ b/docs/templates/theme.html
@ -0,0 +1,19 @@
 {% extends "themes.html" %}
 {% block title %}{{ page.title }} | Gutenberg {% endblock title %}
 {% block theme_content %}
    <div class="theme-info">
        <img src="{{page.permalink}}screenshot.png" class="thumb">
        <div class="metadata">
            <h1>{{ page.title }}</h1>
            <p>{{ page.description }}</p>
            <p><b>Author:</b> {{page.extra.author.name}}</p>
            <p><b>License:</b> {{page.extra.license}}</p>
            <p><b>Homepage:</b> <a href="{{page.extra.homepage}}">{{page.extra.homepage}}</a></p>
            <p><b>Last updated:</b> {{page.extra.updated }}</p>
        </div>
    </div>
    <hr>
    {{page.content | safe}}
 {% endblock theme_content %}
--- a/docs/templates/themes.html
+++ b/docs/templates/themes.html
@ -0,0 +1,22 @@
 {% extends "index.html" %}
 {% block extra_nav_class %}{% endblock extra_nav_class %}
 {% block extra_content_class %}content--reversed{% endblock extra_content_class %}
 {% block title %}Themes | {{ super() }} {% endblock title %}
 {% block content %}
    <div class="themes-container">
        {% block theme_content %}
            <h1>Gutenberg themes</h1>
            <div class="themes">
                {% for theme in section.pages %}
                    <a class="theme" href="{{theme.permalink}}">
                        <img src="{{theme.permalink}}screenshot.png" alt="Screenshot of {{theme.title}}">
                        <span>{{theme.title}}</span>
                    </a>
                {% endfor %}
            </div>
        {% endblock theme_content %}
    </div>
 {% endblock content %}
--- a/netlify.toml
+++ b/netlify.toml
@ -1,8 +1,10 @@
 [build]
-  base    = "docs"
+    base    = "docs"
-  publish = "docs/public"
+    publish = "docs/public"
-  command = "curl -sL https://github.com/Keats/gutenberg/releases/download/v0.2.1/gutenberg-v0.2.1-x86_64-unknown-linux-gnu.tar.gz | tar zxvf - && /opt/build/repo/docs/gutenberg build"
+    command = "gutenberg build"
 [build.environment]
    GUTENBERG_VERSION = "0.3.1"
 [context.deploy-preview]
-  command = "curl -sL https://github.com/Keats/gutenberg/releases/download/v0.2.1/gutenberg-v0.2.1-x86_64-unknown-linux-gnu.tar.gz | tar zxvf - && /opt/build/repo/docs/gutenberg build --base-url $DEPLOY_PRIME_URL"
+    command = "gutenberg build --base-url $DEPLOY_PRIME_URL"
--- a/sublime_themes/agola-dark.tmTheme
+++ b/sublime_themes/agola-dark.tmTheme
--- a/sublime_themes/all.themedump
+++ b/sublime_themes/all.themedump
--- a/sublime_themes/ascetic-white.tmTheme
+++ b/sublime_themes/ascetic-white.tmTheme
@ -0,0 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>Ascetic White</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>caret</key>
 				<string>#202020</string>
 				<key>foreground</key>
 				<string>#202020</string>
 				<key>invisibles</key>
 				<string>#D0D0D0</string>
 				<key>lineHighlight</key>
 				<string>#D0D0D0</string>
 				<key>selection</key>
 				<string>#C0C0C0</string>
 				<key>findHighlight</key>
 				<string>#FFE792</string>
 				<key>findHighlightForeground</key>
 				<string>#000000</string>
 				<key>selectionBorder</key>
 				<string>#CCCCCC</string>
 				<key>activeGuide</key>
 				<string>#9D550FB0</string>
 				<key>gutterForeground</key>
 				<string>#303030</string>
 				<key>bracketsForeground</key>
 				<string>#F8F8F2A5</string>
 				<key>bracketsOptions</key>
 				<string>underline</string>
 				<key>bracketContentsForeground</key>
 				<string>#F8F8F2A5</string>
 				<key>bracketContentsOptions</key>
 				<string>underline</string>
 				<key>tagsOptions</key>
 				<string>stippled_underline</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#BBBBBB</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#707070</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#707070</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.header</string>
 			<key>scope</key>
 			<string>meta.diff, meta.diff.header</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#707070</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FF8888</string>
 				<key>foreground</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#99CC99</string>
 				<key>foreground</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#E6DB74</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>scope</key>
 			<string>constant.numeric.line-number.find-in-files - match</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#202020</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>scope</key>
 			<string>entity.name.filename.find-in-files</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#707070</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>F01C6DC0-0977-11E3-8FFD-0800200C9A66</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.ascetic_white</string>
 </dict>
 </plist>
--- a/sublime_themes/axar.tmTheme
+++ b/sublime_themes/axar.tmTheme
@ -0,0 +1,692 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>Axar</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#191919</string>
 				<key>caret</key>
 				<string>#FFFFFF</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 				<key>invisibles</key>
 				<string>#404040</string>
 				<key>lineHighlight</key>
 				<string>#FFFFFF0D</string>
 				<key>selection</key>
 				<string>#FFFFFF26</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Text base</string>
 			<key>scope</key>
 			<string>text</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Source base</string>
 			<key>scope</key>
 			<string>source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#CCCCCC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#616161</string>
 				<key>background</key>
 				<string>#171717</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>PHP Variable</string>
 			<key>scope</key>
 			<string>variable.other.php</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5697B8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Language Constant</string>
 			<key>scope</key>
 			<string>constant.language</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#80D500</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword, keyword.operator.logical</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Operators</string>
 			<key>scope</key>
 			<string>keyword.operator</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Control</string>
 			<key>scope</key>
 			<string>keyword.control</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#80d500</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Type</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#80D500</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function Declaration</string>
 			<key>scope</key>
 			<string>declaration.function, entity.name.function</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Pre-processor Line</string>
 			<key>scope</key>
 			<string>other.preprocessor.c</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#B6B9F9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function argument</string>
 			<key>scope</key>
 			<string>variable.parameter</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#8AA6C1</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FFD700</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String escapes</string>
 			<key>scope</key>
 			<string>string constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#FF2837</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String Embedded Source</string>
 			<key>scope</key>
 			<string>source string source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String (executed)</string>
 			<key>scope</key>
 			<string>string.interpolated</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF7819</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Regular expression</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#CA4344</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Regexp Escapes</string>
 			<key>scope</key>
 			<string>string.regexp constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#FF7819</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Numbers</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#EDDD5A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Symbols</string>
 			<key>scope</key>
 			<string>constant.other</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#66CCFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#670000</string>
 				<key>fontStyle</key>
 				<string>bold</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
 			<string>entity.name.class, declaration.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string> bold</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class inheritance</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic bold</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library funct&#x2f;const&#x2f;var</string>
 			<key>scope</key>
 			<string>support.function, support.constant, support.variable, support.other</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#8AA6C1</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library object</string>
 			<key>scope</key>
 			<string>support.class, support.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#8AA6C1</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tag name</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#80d500</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tag Attribute</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#80d500</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS Selector</string>
 			<key>scope</key>
 			<string>meta.selector.css, entity.other.attribute-name.pseudo-class.css, entity.name.tag.wildcard.css, entity.other.attribute-name.id.css, entity.other.attribute-name.class.css</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#B53B3C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS Property</string>
 			<key>scope</key>
 			<string>support.type.property-name.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8AA6C1</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff Header</string>
 			<key>scope</key>
 			<string>meta.diff, meta.diff.header</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#0E2231</string>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff Inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#253B22</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff Changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#4A410D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff Deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#420E09</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Underline</string>
 			<key>scope</key>
 			<string>markup.underline</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Link</string>
 			<key>scope</key>
 			<string>markup.underline.link</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 				<key>foreground</key>
 				<string>#66CCFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bold</string>
 			<key>scope</key>
 			<string>markup.bold</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Italic</string>
 			<key>scope</key>
 			<string>markup.italic</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.header</string>
 			<key>scope</key>
 			<string>meta.diff, meta.diff.header</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#0E2231</string>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#D03620</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#C4B14A</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>diff.inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#41A83E</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Annotations</string>
 			<key>scope</key>
 			<string>sublimelinter.outline.notes</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFAA50</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Outline</string>
 			<key>scope</key>
 			<string>sublimelinter.outline.illegal</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FF4A5250</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Underline</string>
 			<key>scope</key>
 			<string>sublimelinter.underline.illegal</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Warning Outline</string>
 			<key>scope</key>
 			<string>sublimelinter.outline.warning</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#DF940050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Warning Underline</string>
 			<key>scope</key>
 			<string>sublimelinter.underline.warning</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Violation Outline</string>
 			<key>scope</key>
 			<string>sublimelinter.outline.violation</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#ffffff33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>SublimeLinter Violation Underline</string>
 			<key>scope</key>
 			<string>sublimelinter.underline.violation</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bracket Curly</string>
 			<key>scope</key>
 			<string>brackethighlighter.curly</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bracket Round</string>
 			<key>scope</key>
 			<string>brackethighlighter.round</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bracket Square</string>
 			<key>scope</key>
 			<string>brackethighlighter.square</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bracket angle</string>
 			<key>scope</key>
 			<string>brackethighlighter.angle</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bracket tag</string>
 			<key>scope</key>
 			<string>brackethighlighter.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bracket single_quote</string>
 			<key>scope</key>
 			<string>brackethighlighter.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF000050</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>AEB6F160-B257-11E2-9E96-0800200C9A66</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.dark.axar</string>
 </dict>
 </plist>
--- a/sublime_themes/bbedit.tmTheme
+++ b/sublime_themes/bbedit.tmTheme
@ -0,0 +1,445 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>BBEdit</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>caret</key>
 				<string>#000000</string>
 				<key>foreground</key>
 				<string>#000000</string>
 				<key>invisibles</key>
 				<string>#BFBFBF</string>
 				<key>lineHighlight</key>
 				<string>#00000012</string>
 				<key>selection</key>
 				<string>#FFD420</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#804000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword, storage</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0000FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FF0080</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FF0080</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>User-defined constant</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C5060B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Built-in constant</string>
 			<key>scope</key>
 			<string>constant.language</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#004080</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable.language, variable.other</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#006600</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String interpolation</string>
 			<key>scope</key>
 			<string>constant.character.escaped, constant.character.escape, string source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#33CC33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Preprocessor line</string>
 			<key>scope</key>
 			<string>other.preprocessor</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#1A921C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Preprocessor directive</string>
 			<key>scope</key>
 			<string>entity.name.preprocessor</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0C450D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function name</string>
 			<key>scope</key>
 			<string>entity.name.function, keyword.other.name-of-parameter.objc</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0000A2</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
 			<string>entity.name.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inherited class name</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function parameter</string>
 			<key>scope</key>
 			<string>variable.parameter</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function argument and result types</string>
 			<key>scope</key>
 			<string>storage.type.method</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#70727E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Section</string>
 			<key>scope</key>
 			<string>meta.section entity.name.section, declaration.section entity.name.section</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library function</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0000FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library object</string>
 			<key>scope</key>
 			<string>support.class, support.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#6D79DE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library constant</string>
 			<key>scope</key>
 			<string>support.constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#06960E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library variable</string>
 			<key>scope</key>
 			<string>support.other.variable</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#21439C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>JS: Operator</string>
 			<key>scope</key>
 			<string>keyword.operator.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#687687</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#990000</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid trailing whitespace</string>
 			<key>scope</key>
 			<string>invalid.trailing-whitespace</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFD0D0</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Embedded source</string>
 			<key>scope</key>
 			<string>text source, string.unquoted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#427FF51A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup XML declaration</string>
 			<key>scope</key>
 			<string>meta.xml-processing, declaration.xml-processing</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#68685B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup DOCTYPE</string>
 			<key>scope</key>
 			<string>meta.doctype, declaration.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#888888</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup DTD</string>
 			<key>scope</key>
 			<string>meta.doctype.DTD, declaration.doctype.DTD</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup tag</string>
 			<key>scope</key>
 			<string>meta.tag, declaration.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#1C02FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup name of tag</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup tag attribute</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Heading</string>
 			<key>scope</key>
 			<string>markup.heading</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0C07FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Quote</string>
 			<key>scope</key>
 			<string>markup.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: List</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#B90690</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>0047F0B6-DB9C-4533-A155-5BAA91BD70F2</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.bb_edit</string>
 </dict>
 </plist>
--- a/sublime_themes/boron.tmTheme
+++ b/sublime_themes/boron.tmTheme
@ -0,0 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>Boron</string>
 	<key>website</key>
 	<string>https:&#x2f;&#x2f;github.com&#x2f;mjio&#x2f;boron.tmtheme</string>
 	<key>comment</key>
 	<string>Last update: Feb 25 2013</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#151515</string>
 				<key>caret</key>
 				<string>#b0d0f0</string>
 				<key>foreground</key>
 				<string>#e8e8d3</string>
 				<key>invisibles</key>
 				<string>#e8e8d3</string>
 				<key>selection</key>
 				<string>#404040</string>
 				<key>lineHighlight</key>
 				<string>#010101</string>
 				<key>gutterForeground</key>
 				<string>#373737</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#888888</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#99ad6a</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String begin&#x2f;end</string>
 			<key>scope</key>
 			<string>punctuation.definition.string.begin, punctuation.definition.string.end</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#556633</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Symbol</string>
 			<key>scope</key>
 			<string>constant.other</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#7697d6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Regexp</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#dd0093</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable, support.class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ffb964</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#cf6a4c</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Entity</string>
 			<key>scope</key>
 			<string>entity</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ffb964</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Entity Function</string>
 			<key>scope</key>
 			<string>entity.name.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fad07a</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword.control</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8fbfdc</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8fbfdc</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff insertion</string>
 			<key>scope</key>
 			<string>diff.inserted, markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#558f1f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff deletion</string>
 			<key>scope</key>
 			<string>diff.deleted, markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#a1000d</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff header</string>
 			<key>scope</key>
 			<string>meta.diff.header</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 				<key>background</key>
 				<string>#4e738a</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff range</string>
 			<key>scope</key>
 			<string>meta.diff.range</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#888888</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#967efb</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>4e4cdb00-2fb2-11e2-81c1-0800200c9a66</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.dark.boron</string>
 </dict>
 </plist>
--- a/sublime_themes/charcoal.tmTheme
+++ b/sublime_themes/charcoal.tmTheme
@ -0,0 +1,330 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>author</key>
 	<string>Don Steinert (http:&#x2f;&#x2f;www.dnld.cc)</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>gutterSettings</key>
 	<dict>
 		<key>background</key>
 		<string>#2B2C2F</string>
 		<key>divider</key>
 		<string>#2B2C2F</string>
 		<key>foreground</key>
 		<string>#CCCECE</string>
 		<key>selectionBackground</key>
 		<string>#3E4044</string>
 		<key>selectionForeground</key>
 		<string>#CCCECE</string>
 	</dict>
 	<key>name</key>
 	<string>Charcoal</string>
 	<key>semanticClass</key>
 	<string>theme.dark.charcoal</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#2B2C2F</string>
 				<key>caret</key>
 				<string>#CCCECE</string>
 				<key>foreground</key>
 				<string>#CCCECE</string>
 				<key>invisibles</key>
 				<string>#3E4044</string>
 				<key>lineHighlight</key>
 				<string>#3E4044</string>
 				<key>selection</key>
 				<string>#3E4044</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comments</string>
 			<key>scope</key>
 			<string>comment, punctuation.definition.comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5F6364</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#CCCECE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword, Storage</string>
 			<key>scope</key>
 			<string>keyword, storage.type, storage.modifier</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#C594C5</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Operator, Misc</string>
 			<key>scope</key>
 			<string>keyword.operator, constant.other.color, punctuation, meta.tag, punctuation.definition.tag, punctuation.separator.inheritance.php, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded, keyword.other.template, keyword.other.substitution</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5FB3B3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tag</string>
 			<key>scope</key>
 			<string>entity.name.tag, meta.tag.sgml, markup.deleted.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#EB606B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function, Special Method, Block Level</string>
 			<key>scope</key>
 			<string>entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#6699CC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Other Variable, String Link</string>
 			<key>scope</key>
 			<string>support.other.variable, string.other.link</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#F2777A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number, Constant, Function Argument, Tag Attribute, Embedded</string>
 			<key>scope</key>
 			<string>constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#F99157</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String, Symbols, Inherited Class, Markup Heading</string>
 			<key>scope</key>
 			<string>string, constant.other.symbol, constant.other.key, entity.other.inherited-class, markup.heading, markup.inserted.git_gutter, meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
 				<string>#99C794</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class, Support</string>
 			<key>scope</key>
 			<string>entity.name.class, entity.name.type.class, support.type, support.class, support.orther.namespace.use.php, meta.use.php, support.other.namespace.php, markup.changed.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FAC863</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Sub-methods</string>
 			<key>scope</key>
 			<string>entity.name.module.js, variable.import.parameter.js, variable.other.class.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#EC5F67</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Language methods</string>
 			<key>scope</key>
 			<string>variable.language</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#EC5F67</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>entity.name.method.js</string>
 			<key>scope</key>
 			<string>entity.name.method.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#D8DEE9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>meta.method.js</string>
 			<key>scope</key>
 			<string>meta.class-method.js entity.name.function.js, variable.function.constructor</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#D8DEE9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Attributes</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#BB80B3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#99C794</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#EC5F67</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#BB80B3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Regular Expressions</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5FB3B3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Escape Characters</string>
 			<key>scope</key>
 			<string>constant.character.escape</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5FB3B3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>URL</string>
 			<key>scope</key>
 			<string>*url*, *link*, *uri*</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Search Results Nums</string>
 			<key>scope</key>
 			<string>constant.numeric.line-number.find-in-files - match</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#AB7967</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Search Results Lines</string>
 			<key>scope</key>
 			<string>entity.name.filename.find-in-files</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#99C794</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Decorators</string>
 			<key>scope</key>
 			<string>tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#6699CC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>ES7 Bind Operator</string>
 			<key>scope</key>
 			<string>source.js constant.other.object.key.js string.unquoted.label.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#EC5F67</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>091c9b5a-9e64-4001-8c15-4c7c42840eb4</string>
 </dict>
 </plist>
--- a/sublime_themes/cheerfully-light.tmTheme
+++ b/sublime_themes/cheerfully-light.tmTheme
@ -0,0 +1,527 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>author</key>
 	<string>Jorge Herrera</string>
 	<key>name</key>
 	<string>Cheerfully Light</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#F5F5F5</string>
 				<key>caret</key>
 				<string>#668F14</string>
 				<key>foreground</key>
 				<string>#1F1F1F</string>
 				<key>invisibles</key>
 				<string>#FFFFFF40</string>
 				<key>lineHighlight</key>
 				<string>#C7C7BF2E</string>
 				<key>selection</key>
 				<string>#BCCDE0A3</string>
 				<key>findHighlight</key>
 				<string>#85E366</string>
 				<key>findHighlightForeground</key>
 				<string>#C8C8C8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#7F8989</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Constant</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#B3933A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Entity</string>
 			<key>scope</key>
 			<string>entity</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C23F31</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#72AB00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#668F14</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#D07711</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Support</string>
 			<key>scope</key>
 			<string>support</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#A2A001</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5597D6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid – Deprecated</string>
 			<key>scope</key>
 			<string>invalid.deprecated</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic underline</string>
 				<key>foreground</key>
 				<string>#D2A8A1</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid – Illegal</string>
 			<key>scope</key>
 			<string>invalid.illegal</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#562D56BF</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>-----------------------------------</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Embedded Source</string>
 			<key>scope</key>
 			<string>text source</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#B0B3BA14</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Embedded Source (Bright)</string>
 			<key>scope</key>
 			<string>text.html.ruby source</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#B1B3BA21</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Entity inherited-class</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#b06936</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String embedded-source</string>
 			<key>scope</key>
 			<string>string source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#7C8F4C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String constant</string>
 			<key>scope</key>
 			<string>string constant</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#AEB52B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String.regexp</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C49A39</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String.regexp.«special»</string>
 			<key>scope</key>
 			<string>string.regexp constant.character.escape, string.regexp source.ruby.embedded, string.regexp string.regexp.arbitrary-repitition</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#108f3d</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String variable</string>
 			<key>scope</key>
 			<string>string variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#acb3c2</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Support.function</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#B39F04</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Support.constant</string>
 			<key>scope</key>
 			<string>support.constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#da5d42</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>c C&#x2f;C++ Preprocessor Line</string>
 			<key>scope</key>
 			<string>meta.preprocessor.c</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8996A8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>c C&#x2f;C++ Preprocessor Directive</string>
 			<key>scope</key>
 			<string>meta.preprocessor.c keyword</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5A9BDB</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Doctype&#x2f;XML Processing</string>
 			<key>scope</key>
 			<string>meta.tag.sgml.doctype, meta.tag.sgml.doctype entity, meta.tag.sgml.doctype string, meta.tag.preprocessor.xml, meta.tag.preprocessor.xml entity, meta.tag.preprocessor.xml string</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#494949</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Meta.tag.«all»</string>
 			<key>scope</key>
 			<string>declaration.tag, declaration.tag entity, meta.tag, meta.tag entity</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#6486AB</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Meta.tag.inline</string>
 			<key>scope</key>
 			<string>declaration.tag.inline, declaration.tag.inline entity, source entity.name.tag, source entity.other.attribute-name, meta.tag.inline, meta.tag.inline entity</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#7F902A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css tag-name</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#CDA869</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css:pseudo-class</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.tag.pseudo-class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8F9D6A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css#id</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.id</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8B98AB</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css.class</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9B703F</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css property-name:</string>
 			<key>scope</key>
 			<string>support.type.property-name.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#C5AF75</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css property-value;</string>
 			<key>scope</key>
 			<string>meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#949175</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css @at-rule</string>
 			<key>scope</key>
 			<string>meta.preprocessor.at-rule keyword.control.at-rule</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#6f7ca6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css additional-constants</string>
 			<key>scope</key>
 			<string>meta.property-value support.constant.named-color.css, meta.property-value constant</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#CA7840</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css constructor.argument</string>
 			<key>scope</key>
 			<string>meta.constructor.argument.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#92b45d</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.header</string>
 			<key>scope</key>
 			<string>meta.diff, meta.diff.header, meta.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#234561</string>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#6c1d15</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#796b1a</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#3b5a37</string>
 				<key>foreground</key>
 				<string>#F8F8F8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: List</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A8A248</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Heading</string>
 			<key>scope</key>
 			<string>markup.heading</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#B82812</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>766026CB-703D-4610-B070-8DE07D967C5F</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.cheerfully_light</string>
 </dict>
 </plist>
--- a/sublime_themes/classic-modified.tmTheme
+++ b/sublime_themes/classic-modified.tmTheme
@ -0,0 +1,477 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>author</key>
 	<string>Chris Thomas</string>
 	<key>name</key>
 	<string>Classic Modified</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>caret</key>
 				<string>#000000</string>
 				<key>foreground</key>
 				<string>#000000</string>
 				<key>invisibles</key>
 				<string>#BFBFBF</string>
 				<key>lineHighlight</key>
 				<string>#00000012</string>
 				<key>selection</key>
 				<string>#4D97FF54</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment, extract.custom.title.sql</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#CCCCCC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Query Title</string>
 			<key>scope</key>
 			<string>custom.title.sql</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#CC6633</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword, storage</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#0000FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FF0000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>User-defined constant</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Built-in constant</string>
 			<key>scope</key>
 			<string>constant.language</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#000CFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable.language, variable.other</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#318495</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#666666</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String interpolation</string>
 			<key>scope</key>
 			<string>constant.character.escape, string source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#33CC33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Preprocessor line</string>
 			<key>scope</key>
 			<string>meta.preprocessor</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#1A921C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Preprocessor directive</string>
 			<key>scope</key>
 			<string>keyword.control.import</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#0C450D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function name</string>
 			<key>scope</key>
 			<string>entity.name.function, support.function.any-method</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#000099</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Type name</string>
 			<key>scope</key>
 			<string>entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inherited class name</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function parameter</string>
 			<key>scope</key>
 			<string>variable.parameter</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function argument and result types</string>
 			<key>scope</key>
 			<string>storage.type.method</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#70727E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Section</string>
 			<key>scope</key>
 			<string>meta.section entity.name.section, declaration.section entity.name.section</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library function</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#990099</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library object</string>
 			<key>scope</key>
 			<string>support.class, support.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#CC6633</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library constant</string>
 			<key>scope</key>
 			<string>support.constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#990099</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library variable</string>
 			<key>scope</key>
 			<string>support.variable</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#CC6633</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>JS: Operator</string>
 			<key>scope</key>
 			<string>keyword.operator.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#990000</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid trailing whitespace</string>
 			<key>scope</key>
 			<string>invalid.deprecated.trailing-whitespace</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFD0D0</string>
 				<key>foreground</key>
 				<string>#00000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Embedded source</string>
 			<key>scope</key>
 			<string>text source, string.unquoted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Embedded embedded source</string>
 			<key>scope</key>
 			<string>text source string.unquoted, text source text source</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#0000000F</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup XML declaration</string>
 			<key>scope</key>
 			<string>meta.tag.preprocessor.xml</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#68685B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup DOCTYPE</string>
 			<key>scope</key>
 			<string>meta.tag.sgml.doctype, meta.tag.sgml.doctype entity, meta.tag.sgml.doctype string, meta.tag.preprocessor.xml, meta.tag.preprocessor.xml entity, meta.tag.preprocessor.xml string</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#888888</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup DTD</string>
 			<key>scope</key>
 			<string>string.quoted.docinfo.doctype.DTD</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup tag</string>
 			<key>scope</key>
 			<string>meta.tag, declaration.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#1C02FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup name of tag</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup tag attribute</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Heading</string>
 			<key>scope</key>
 			<string>markup.heading</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#0C07FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Quote</string>
 			<key>scope</key>
 			<string>markup.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: List</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#B90690</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>9E6E7BB1-7FCE-4989-B617-0BFA754F9E08</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.classic_modified</string>
 </dict>
 </plist>
--- a/sublime_themes/demain.tmTheme
+++ b/sublime_themes/demain.tmTheme
@ -0,0 +1,388 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>comment</key>
 	<string>Adapted from Tomorrow</string>
 	<key>name</key>
 	<string>Demain</string>
 	<key>semanticClass</key>
 	<string>theme.light.demain</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#f9f9f9</string>
 				<key>caret</key>
 				<string>#000000</string>
 				<key>foreground</key>
 				<string>#111111</string>
 				<key>invisibles</key>
 				<string>#D1D1D1</string>
 				<key>lineHighlight</key>
 				<string>#ffffff</string>
 				<key>selection</key>
 				<string>#B5D5FF</string>
 				<key>selectionBorder</key>
 				<string>#B5D5FF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8E908C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Foreground</string>
 			<key>scope</key>
 			<string>keyword.operator.class, constant.other, source.php.embedded.line, source.ruby.embedded</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#111111</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Babel ES6 tweaks</string>
 			<key>scope</key>
 			<string>variable.other.object.js, punctuation.definition.parameters, meta.group.braces.round.function.arguments.js, variable.other.readwrite.js, variable.other.constant.js, string.unquoted.label.js</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#111111</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable, String Link, Regular Expression, Tag Name</string>
 			<key>scope</key>
 			<string>variable, support.other.variable, string.other.link, string.regexp, entity.name.tag, meta.tag, entity.other.attribute-name, declaration.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#c82728</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number, Constant, Function Argument, Tag Attribute, Embedded</string>
 			<key>scope</key>
 			<string>constant.numeric, constant.language, support.constant, constant.character, variable.parameter, punctuation.section.embedded, keyword.other.unit, punctuation.quasi.element.begin.js, punctuation.quasi.element.end.js</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#f07219</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class, Support</string>
 			<key>scope</key>
 			<string>entity.name.class, entity.name.type.class, support.type, support.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C99E00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String, Inherited Class, Markup Heading</string>
 			<key>scope</key>
 			<string>string, entity.other.inherited-class, markup.heading, constant.other.symbol</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#839c00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Operator, Misc</string>
 			<key>scope</key>
 			<string>keyword.operator, constant.other.color</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#3E999F</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function, Special Method, Block Level</string>
 			<key>scope</key>
 			<string>entity.name.function, entity.name.method, meta.function-call, support.function, keyword.other.special-method, meta.block-level</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#4271AE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword, Storage</string>
 			<key>scope</key>
 			<string>keyword, storage, storage.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#8959A8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#C82829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Separator</string>
 			<key>scope</key>
 			<string>meta.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#4271AE</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Deprecated</string>
 			<key>scope</key>
 			<string>invalid.deprecated</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#8959A8</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>markup.deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#c82728</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>markup.inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#628536</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>markup.changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#7557be</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>HTML: Tags</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#4170ad</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>HTML: Tag Punctuation</string>
 			<key>scope</key>
 			<string>punctuation.definition.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5d9be5</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>HTML: Attribute Names</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5d9ae5</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>HTML: Attribute Punctuation</string>
 			<key>scope</key>
 			<string>meta.tag.other.html, meta.tag.any.html, meta.tag.block.any.html, meta.tag.inline.any.html</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#5d9ae5</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>HTML: Attribute Values</string>
 			<key>scope</key>
 			<string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#839c00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS: Attribute name</string>
 			<key>scope</key>
 			<string>support.type.property-name.css, support.type.property-name.sass, entity.other.attribute-name.tag.pseudo-element</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#839c00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS: Number</string>
 			<key>scope</key>
 			<string>constant.numeric.css, constant.numeric.sass, constant.other.unit.css, constant.other.unit.sass</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#f07219</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS: url</string>
 			<key>scope</key>
 			<string>variable.parameter.url</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#151515</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS: property value</string>
 			<key>scope</key>
 			<string>support.constant.property-value.sass, support.constant.property-value.css</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#3E999F</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS: hex colour</string>
 			<key>scope</key>
 			<string>constant.other.rgb-value.sass, constant.other.rgb-value.css, constant.other.color.rgb-value.css</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#c82728</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>CSS: @rule</string>
 			<key>scope</key>
 			<string>keyword.control.at-rule.sass, keyword.control.at-rule.css, keyword.control.at-rule.import.css</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C99E00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Sass variable</string>
 			<key>scope</key>
 			<string>variable.parameter.sass</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#c82728</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>82CCD69C-F1B1-4529-B39E-780F91F07604</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>author</key>
 	<string>Andrew Appleton - http:&#x2f;&#x2f;floatleft.com</string>
 </dict>
 </plist>
--- a/sublime_themes/dimmed-fluid.tmTheme
+++ b/sublime_themes/dimmed-fluid.tmTheme
@ -0,0 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>comment</key>
 	<string>https:&#x2f;&#x2f;github.com&#x2f;uonick</string>
 	<key>name</key>
 	<string>Dimmed Fluid</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>caret</key>
 				<string>#AEAFAD</string>
 				<key>foreground</key>
 				<string>#4D4D4C</string>
 				<key>invisibles</key>
 				<string>#D1D1D1</string>
 				<key>lineHighlight</key>
 				<string>#e8e8e8</string>
 				<key>selection</key>
 				<string>#D6D6D6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#999999</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Foreground</string>
 			<key>scope</key>
 			<string>keyword.operator.class, constant.other, source.php.embedded.line</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#666666</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable, String Link, Regular Expression, Tag Name</string>
 			<key>scope</key>
 			<string>variable, support.other.variable, string.other.link, string.regexp, entity.name.tag, entity.other.attribute-name, meta.tag, declaration.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f55800</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number, Constant, Function Argument, Tag Attribute, Embedded</string>
 			<key>scope</key>
 			<string>constant.numeric, constant.language, support.constant, constant.character, variable.parameter, punctuation.section.embedded, keyword.other.unit</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#6969ff</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class, Support</string>
 			<key>scope</key>
 			<string>entity.name.class, entity.name.type.class, support.type, support.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#f0ae00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String, Symbols, Inherited Class, Markup Heading</string>
 			<key>scope</key>
 			<string>string, constant.other.symbol, entity.other.inherited-class, markup.heading</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#699200</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Operator, Misc</string>
 			<key>scope</key>
 			<string>keyword.operator, constant.other.color</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#1aa7b0</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function, Special Method, Block Level</string>
 			<key>scope</key>
 			<string>entity.name.function, meta.function-call, support.function, keyword.other.special-method, meta.block-level</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#3366CC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword, Storage</string>
 			<key>scope</key>
 			<string>keyword, storage, storage.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#8e44be</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Separator</string>
 			<key>scope</key>
 			<string>meta.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#2169c7</string>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Deprecated</string>
 			<key>scope</key>
 			<string>invalid.deprecated</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#8e44be</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff foreground</string>
 			<key>scope</key>
 			<string>markup.inserted.diff, markup.deleted.diff, meta.diff.header.to-file, meta.diff.header.from-file</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff insertion</string>
 			<key>scope</key>
 			<string>markup.inserted.diff, meta.diff.header.to-file</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#008f00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff deletion</string>
 			<key>scope</key>
 			<string>markup.deleted.diff, meta.diff.header.from-file</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#ef0000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff header</string>
 			<key>scope</key>
 			<string>meta.diff.header.from-file, meta.diff.header.to-file</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ffffff</string>
 				<key>background</key>
 				<string>#333333</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Diff range</string>
 			<key>scope</key>
 			<string>meta.diff.range</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#333333</string>
 			</dict>
 		</dict>
 	</array>
 	<key>author</key>
 	<string>uonick</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.dimmed_fluid</string>
 </dict>
 </plist>
--- a/sublime_themes/gray-matter-dark.tmTheme
+++ b/sublime_themes/gray-matter-dark.tmTheme
@ -0,0 +1,420 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>Gray Matter Dark</string>
 	<key>comment</key>
 	<string>https:&#x2f;&#x2f;github.com&#x2f;philipbelesky&#x2f;gray-matter</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#BEBEBE</string>
 				<key>background</key>
 				<string>#1A191A</string>
 				<key>invisibles</key>
 				<string>#616161</string>
 				<key>caret</key>
 				<string>#29BEEA</string>
 				<key>lineHighlight</key>
 				<string>#222122</string>
 				<key>rangeHighlight</key>
 				<string>#222122</string>
 				<key>hoverHighlight</key>
 				<string>#222122</string>
 				<key>referenceHighlight</key>
 				<string>#222122</string>
 				<key>selection</key>
 				<string>#373737</string>
 				<key>selectionBorder</key>
 				<string>#373737</string>
 				<key>inactiveSelection</key>
 				<string>#373737</string>
 				<key>selectionHighlight</key>
 				<string>#373737</string>
 				<key>findHighlight</key>
 				<string>#373737</string>
 				<key>findHighlightForeground</key>
 				<string>#BEBEBE</string>
 				<key>findRangeHighlight</key>
 				<string>#29BEEA</string>
 				<key>findMatchHighlight</key>
 				<string>#373737</string>
 				<key>currentFindMatchHighlight</key>
 				<string>#373737</string>
 				<key>wordHighlight</key>
 				<string>#373737</string>
 				<key>wordHighlightStrong</key>
 				<string>#29BEEA</string>
 				<key>activeLinkForeground</key>
 				<string>#29BEEA</string>
 				<key>gotoDefinitionLinkForeground</key>
 				<string>#29BEEA</string>
 				<key>gutter</key>
 				<string>#1A191A</string>
 				<key>gutterForeground</key>
 				<string>#616161</string>
 				<key>guide</key>
 				<string>#1A191A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comments</string>
 			<key>scope</key>
 			<string>comment, comment punctuation</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Structural Elements</string>
 			<key>scope</key>
 			<string>punctuation.definition.constant.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown,punctuation.definition.heading.markdown,punctuation.definition.heading.begin.markdown,punctuation.definition.heading.end.markdown,punctuation.definition.heading.setext.markdown,punctuation.definition.list_item.markdown,markup.list.numbered.bullet.markdown,punctuation.definition.bold.begin.markdown,punctuation.definition.bold.end.markdown,punctuation.definition.italic.begin.markdown,punctuation.definition.italic.end.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Heading Text</string>
 			<key>scope</key>
 			<string>markup.heading.1.markdown,markup.heading.2.markdown,markup.heading.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#BEBEBE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Bold Text</string>
 			<key>scope</key>
 			<string>markup.bold.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Italic Text</string>
 			<key>scope</key>
 			<string>markup.italic.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Blockquote</string>
 			<key>scope</key>
 			<string>markup.quote.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown separators and hrs</string>
 			<key>scope</key>
 			<string>meta.separator.markdown,meta.separator.thematic-break.markdown, punctuation.definition.thematic-break.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Link Grammar syntax</string>
 			<key>scope</key>
 			<string>punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown, punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.link.markdown, punctuation.definition.link.begin.markdown, punctuation.definition.link.end.markdown, punctuation.definition.metadata.markdown,punctuation.definition.blockquote.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Link Reference</string>
 			<key>scope</key>
 			<string>punctuation.definition.metadata.markdown,string.other.link.title.markdown,meta.link.inline.markdown,meta.link.reference.markdown,string.other.link.description.title.markdown,meta.link.reference.literal.markdown,punctuation.separator.key-value.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Image</string>
 			<key>scope</key>
 			<string>meta.image.inline.markdown,punctuation.definition.image.begin.markdown,punctuation.definition.image.end.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Link Actual Text</string>
 			<key>scope</key>
 			<string>string.other.link.title.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#BEBEBE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Link Inline URL Text</string>
 			<key>scope</key>
 			<string>markup.underline.link.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Underline</string>
 			<key>scope</key>
 			<string>markup.underline</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown code blocks and inline code</string>
 			<key>scope</key>
 			<string>markup.raw.block.markdown,markup.raw.inline.markdown,markup.raw.code-fence.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#222122</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown code block&#x2f;inline code syntax </string>
 			<key>scope</key>
 			<string>punctuation.definition.raw.code-fence.begin.markdown,punctuation.definition.raw.code-fence.end.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown inline html</string>
 			<key>scope</key>
 			<string>meta.tag.inline.any.html,meta.tag.block.any.html</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Meta</string>
 			<key>scope</key>
 			<string>meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown table syntax</string>
 			<key>scope</key>
 			<string>punctuation.definition.table-cell-alignment.markdown,punctuation.section.table-header.markdown,punctuation.separator.table-cell.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inline Footnote</string>
 			<key>scope</key>
 			<string>footnote.delim.pandoc</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inline Citation</string>
 			<key>scope</key>
 			<string>citation.bracket.pandoc</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Footnote Reference</string>
 			<key>scope</key>
 			<string>footnote.num.pandoc</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bock Quote</string>
 			<key>scope</key>
 			<string>quote.pandoc</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>GitGutter (All)</string>
 			<key>scope</key>
 			<string>markup.deleted.git_gutter,markup.inserted.git_gutter,markup.changed.git_guttermmarkup.ignored.git_gutter,markup.untracked.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Addition</string>
 			<key>scope</key>
 			<string>string.addition</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#BEBEBE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Deletion</string>
 			<key>scope</key>
 			<string>string.deletion</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>substitution</string>
 			<key>scope</key>
 			<string>string.substitution</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>highlight</string>
 			<key>scope</key>
 			<string>string.highlight</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>background</key>
 				<string>#222122</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>comment</string>
 			<key>scope</key>
 			<string>string.comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>blockcomment</string>
 			<key>scope</key>
 			<string>string.blockcomment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#616161</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markdown Meta</string>
 			<key>scope</key>
 			<string>string.other.link.description.markdown</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#BEBEBE</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>2250B6DC-C3BE-4BE8-B815-17B11D90BD6G</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.dark.gray_matter_dark</string>
 </dict>
 </plist>
--- a/sublime_themes/idle.tmTheme
+++ b/sublime_themes/idle.tmTheme
@ -0,0 +1,250 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>author</key>
 	<string>Domenico Carbotta</string>
 	<key>name</key>
 	<string>IDLE</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>caret</key>
 				<string>#000000</string>
 				<key>foreground</key>
 				<string>#000000</string>
 				<key>invisibles</key>
 				<string>#BFBFBF</string>
 				<key>lineHighlight</key>
 				<string>#00000012</string>
 				<key>selection</key>
 				<string>#BAD6FD</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#919191</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#00A33F</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Built-in constant</string>
 			<key>scope</key>
 			<string>constant.language</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A535AE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>User-defined constant</string>
 			<key>scope</key>
 			<string>constant.character, constant.other</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable.language, variable.other</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF5600</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#FF5600</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Type name</string>
 			<key>scope</key>
 			<string>entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#21439C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inherited class</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function name</string>
 			<key>scope</key>
 			<string>entity.name.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#21439C</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function argument</string>
 			<key>scope</key>
 			<string>variable.parameter</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tag name</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tag attribute</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library function</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A535AE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library constant</string>
 			<key>scope</key>
 			<string>support.constant</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A535AE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library class&#x2f;type</string>
 			<key>scope</key>
 			<string>support.type, support.class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A535AE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library variable</string>
 			<key>scope</key>
 			<string>support.variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A535AE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#990000</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String interpolation</string>
 			<key>scope</key>
 			<string>constant.other.placeholder.py</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#990000</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>DDC0CBE1-442B-4CB5-80E4-26E4CFB3A277</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.idle</string>
 </dict>
 </plist>
--- a/sublime_themes/ir-white.tmTheme
+++ b/sublime_themes/ir-white.tmTheme
@ -0,0 +1,802 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>IR_White</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FFFFFF</string>
 				<key>caret</key>
 				<string>#A7A7A7</string>
 				<key>foreground</key>
 				<string>#010101</string>
 				<key>invisibles</key>
 				<string>#CAE2FB3D</string>
 				<key>lineHighlight</key>
 				<string>#FFFFFF0D</string>
 				<key>selection</key>
 				<string>#E0E0ED</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#898989</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Entity</string>
 			<key>scope</key>
 			<string>entity</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#A15001</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#016692</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class</string>
 			<key>scope</key>
 			<string>entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 				<key>foreground</key>
 				<string>#646409</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Support</string>
 			<key>scope</key>
 			<string>support</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#646409</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#877611</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage.modifier</string>
 			<key>scope</key>
 			<string>storage.modifier</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#014A69</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Constant</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#333366</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#009F78</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#8C008A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Punctuation</string>
 			<key>scope</key>
 			<string>punctuation</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#696989</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid – Deprecated</string>
 			<key>scope</key>
 			<string>invalid.deprecated</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic underline</string>
 				<key>foreground</key>
 				<string>#A00294</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid – Illegal</string>
 			<key>scope</key>
 			<string>invalid.illegal</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#DF68D9BF</string>
 				<key>foreground</key>
 				<string>#A00294</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>-----------------------------------</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Embedded Source (Bright)</string>
 			<key>scope</key>
 			<string>text source</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#B1B3BA08</string>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Entity inherited-class</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#D19264</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String embedded-variable</string>
 			<key>scope</key>
 			<string>source string source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String punctuation</string>
 			<key>scope</key>
 			<string>source string source punctuation.section.embedded</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#00FF00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String constant</string>
 			<key>scope</key>
 			<string>string constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#00FF00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String.regexp</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9D7416</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String.regexp.«special»</string>
 			<key>scope</key>
 			<string>string.regexp constant.character.escape, string.regexp source.ruby.embedded, string.regexp string.regexp.arbitrary-repitition</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#FF8000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String.regexp.group</string>
 			<key>scope</key>
 			<string>string.regexp.group</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#0000001A</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#B08C39</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String.regexp.character-class</string>
 			<key>scope</key>
 			<string>string.regexp.character-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C29B4E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ String variable</string>
 			<key>scope</key>
 			<string>string variable</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#756565</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Support.function</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#7A7025</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>♦ Support.constant</string>
 			<key>scope</key>
 			<string>support.constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#582B00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>c C&#x2f;C++ Preprocessor Line</string>
 			<key>scope</key>
 			<string>meta.preprocessor.c</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#765757</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>c C&#x2f;C++ Preprocessor Directive</string>
 			<key>scope</key>
 			<string>meta.preprocessor.c keyword</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#502424</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>j Cast</string>
 			<key>scope</key>
 			<string>meta.cast</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#010101</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Doctype&#x2f;XML Processing</string>
 			<key>scope</key>
 			<string>meta.sgml.html meta.doctype, meta.sgml.html meta.doctype entity, meta.sgml.html meta.doctype string, meta.xml-processing, meta.xml-processing entity, meta.xml-processing string</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#010101</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Meta.tag.«all»</string>
 			<key>scope</key>
 			<string>meta.tag, meta.tag entity</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0067C2</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Meta.tag.inline</string>
 			<key>scope</key>
 			<string>source entity.name.tag, source entity.other.attribute-name, meta.tag.inline, meta.tag.inline entity</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#00528B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Meta.tag.attribute-name</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#BC4D00</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>✘ Namespaces</string>
 			<key>scope</key>
 			<string>entity.name.tag.namespace, entity.other.attribute-name.namespace</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#9B431E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css tag-name</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 				<key>foreground</key>
 				<string>#0067C2</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css:pseudo-class</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.tag.pseudo-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#628795</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css#id</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.id</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#667587</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css.class</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#2A85CF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css property-name:</string>
 			<key>scope</key>
 			<string>support.type.property-name.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css property-value;</string>
 			<key>scope</key>
 			<string>meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#675C06</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css @at-rule</string>
 			<key>scope</key>
 			<string>meta.preprocessor.at-rule keyword.control.at-rule</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#795A5A</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css additional-constants</string>
 			<key>scope</key>
 			<string>meta.property-value support.constant.named-color.css, meta.property-value constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#3C785D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css constructor.argument</string>
 			<key>scope</key>
 			<string>meta.constructor.argument.css</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#628795</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.header</string>
 			<key>scope</key>
 			<string>meta.diff, meta.diff.header</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#0E2231</string>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#420E09</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#4A410D</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>⎇ diff.inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#253B22</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>--------------------------------</string>
 			<key>settings</key>
 			<dict>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Italic</string>
 			<key>scope</key>
 			<string>markup.italic</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#9D7416</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Bold</string>
 			<key>scope</key>
 			<string>markup.bold</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#9D7416</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Underline</string>
 			<key>scope</key>
 			<string>markup.underline</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>underline</string>
 				<key>foreground</key>
 				<string>#9B431E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Quote</string>
 			<key>scope</key>
 			<string>markup.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#FEE09C12</string>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#46391E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Heading</string>
 			<key>scope</key>
 			<string>markup.heading, markup.heading entity</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#632D04</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#D95B06</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: List</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#46391E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Raw</string>
 			<key>scope</key>
 			<string>markup.raw</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#B1B3BA08</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#7C4CA8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Comment</string>
 			<key>scope</key>
 			<string>markup comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#C84D09</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Separator</string>
 			<key>scope</key>
 			<string>meta.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#242424</string>
 				<key>foreground</key>
 				<string>#746DFF</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Log Entry</string>
 			<key>scope</key>
 			<string>meta.line.entry.logfile, meta.line.exit.logfile</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#EEEEEE29</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Log Entry Error</string>
 			<key>scope</key>
 			<string>meta.line.error.logfile</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#751012</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>BC53AA17-9977-4679-9CEF-F047BCC92152</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.light.ir_white</string>
 </dict>
 </plist>
--- a/sublime_themes/subway-madrid.tmTheme
+++ b/sublime_themes/subway-madrid.tmTheme
@ -0,0 +1,505 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>author</key>
 	<string>Jan T. Sott</string>
 	<key>name</key>
 	<string>Subway: Madrid</string>
 	<key>comment</key>
 	<string>https:&#x2f;&#x2f;github.com&#x2f;idleberg&#x2f;Subway.tmTheme</string>
 	<key>semanticClass</key>
 	<string>theme.light.subway:_madrid</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>gutterSettings</key>
 	<dict>
 		<key>background</key>
 		<string>#ffffff</string>
 		<key>divider</key>
 		<string>#ffffff</string>
 		<key>foreground</key>
 		<string>#303030</string>
 		<key>selectionBackground</key>
 		<string>#ffffff</string>
 		<key>selectionForeground</key>
 		<string>#c0c0c0</string>
 	</dict>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#ffffff</string>
 				<key>caret</key>
 				<string>#303030</string>
 				<key>foreground</key>
 				<string>#303030</string>
 				<key>invisibles</key>
 				<string>#e0e0e0</string>
 				<key>lineHighlight</key>
 				<string>#e0e0e0</string>
 				<key>selection</key>
 				<string>#e0e0e0</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Text</string>
 			<key>scope</key>
 			<string>variable.parameter.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#303030</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comments</string>
 			<key>scope</key>
 			<string>comment, punctuation.definition.comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#a0a0a0</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Punctuation</string>
 			<key>scope</key>
 			<string>punctuation.definition.string, punctuation.definition.variable, punctuation.definition.string, punctuation.definition.parameters, punctuation.definition.string, punctuation.definition.array</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#303030</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Delimiters</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#303030</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Operators</string>
 			<key>scope</key>
 			<string>keyword.operator</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#303030</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keywords</string>
 			<key>scope</key>
 			<string>keyword, keyword.control</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9d3293</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variables</string>
 			<key>scope</key>
 			<string>variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f0523f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Functions</string>
 			<key>scope</key>
 			<string>entity.name.function, meta.require, support.function.any-method</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0068b3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Classes</string>
 			<key>scope</key>
 			<string>meta.class, support.class, entity.name.class, entity.name.type.class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Methods</string>
 			<key>scope</key>
 			<string>keyword.other.special-method</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0068b3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9d3293</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Support</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#41c4dd</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Strings, Inherited Class</string>
 			<key>scope</key>
 			<string>string, constant.other.symbol, entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8dc63f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Integers</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Floats</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Boolean</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Constants</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tags</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f0523f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Attributes</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Attribute IDs</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name.id, punctuation.definition.entity</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0068b3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Selector</string>
 			<key>scope</key>
 			<string>meta.selector</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9d3293</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Values</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Headings</string>
 			<key>scope</key>
 			<string>markup.heading punctuation.definition.heading, entity.name.section</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#0068b3</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Units</string>
 			<key>scope</key>
 			<string>keyword.other.unit</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bold</string>
 			<key>scope</key>
 			<string>markup.bold, punctuation.definition.bold</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Italic</string>
 			<key>scope</key>
 			<string>markup.italic, punctuation.definition.italic</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#9d3293</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Code</string>
 			<key>scope</key>
 			<string>markup.raw.inline</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8dc63f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Link Text</string>
 			<key>scope</key>
 			<string>string.other.link</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f0523f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Link Url</string>
 			<key>scope</key>
 			<string>meta.link</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Lists</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f0523f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Quotes</string>
 			<key>scope</key>
 			<string>markup.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f89829</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Separator</string>
 			<key>scope</key>
 			<string>meta.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#e0e0e0</string>
 				<key>foreground</key>
 				<string>#303030</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#8dc63f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#f0523f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9d3293</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Colors</string>
 			<key>scope</key>
 			<string>constant.other.color</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#41c4dd</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Regular Expressions</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#41c4dd</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Escape Characters</string>
 			<key>scope</key>
 			<string>constant.character.escape</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#41c4dd</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Embedded</string>
 			<key>scope</key>
 			<string>punctuation.section.embedded, variable.interpolation</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#cf7019</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid.illegal</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#f0523f</string>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>815c1f18-f665-4938-93d0-74a8587e1686</string>
 </dict>
 </plist>
--- a/sublime_themes/subway-moscow.tmTheme
+++ b/sublime_themes/subway-moscow.tmTheme
@ -0,0 +1,505 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>author</key>
 	<string>Jan T. Sott</string>
 	<key>name</key>
 	<string>Subway: Moscow</string>
 	<key>comment</key>
 	<string>https:&#x2f;&#x2f;github.com&#x2f;idleberg&#x2f;Subway.tmTheme</string>
 	<key>semanticClass</key>
 	<string>theme.light.subway:_moscow</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>gutterSettings</key>
 	<dict>
 		<key>background</key>
 		<string>#ffffff</string>
 		<key>divider</key>
 		<string>#ffffff</string>
 		<key>foreground</key>
 		<string>#545052</string>
 		<key>selectionBackground</key>
 		<string>#ffffff</string>
 		<key>selectionForeground</key>
 		<string>#c9c9c9</string>
 	</dict>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#ffffff</string>
 				<key>caret</key>
 				<string>#545052</string>
 				<key>foreground</key>
 				<string>#545052</string>
 				<key>invisibles</key>
 				<string>#dddddc</string>
 				<key>lineHighlight</key>
 				<string>#dddddc</string>
 				<key>selection</key>
 				<string>#dddddc</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Text</string>
 			<key>scope</key>
 			<string>variable.parameter.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#545052</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comments</string>
 			<key>scope</key>
 			<string>comment, punctuation.definition.comment</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#b3b2b2</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Punctuation</string>
 			<key>scope</key>
 			<string>punctuation.definition.string, punctuation.definition.variable, punctuation.definition.string, punctuation.definition.parameters, punctuation.definition.string, punctuation.definition.array</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#545052</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Delimiters</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#545052</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Operators</string>
 			<key>scope</key>
 			<string>keyword.operator</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#545052</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keywords</string>
 			<key>scope</key>
 			<string>keyword, keyword.control</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#b41e8e</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variables</string>
 			<key>scope</key>
 			<string>variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ed1c24</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Functions</string>
 			<key>scope</key>
 			<string>entity.name.function, meta.require, support.function.any-method</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#00529f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Classes</string>
 			<key>scope</key>
 			<string>meta.class, support.class, entity.name.class, entity.name.type.class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Methods</string>
 			<key>scope</key>
 			<string>keyword.other.special-method</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#00529f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storage</string>
 			<key>scope</key>
 			<string>storage</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#b41e8e</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Support</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0092b9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Strings, Inherited Class</string>
 			<key>scope</key>
 			<string>string, constant.other.symbol, entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#009854</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Integers</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Floats</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Boolean</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Constants</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Tags</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ed1c24</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Attributes</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Attribute IDs</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name.id, punctuation.definition.entity</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#00529f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Selector</string>
 			<key>scope</key>
 			<string>meta.selector</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#b41e8e</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Values</string>
 			<key>scope</key>
 			<string>none</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Headings</string>
 			<key>scope</key>
 			<string>markup.heading punctuation.definition.heading, entity.name.section</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#00529f</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Units</string>
 			<key>scope</key>
 			<string>keyword.other.unit</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Bold</string>
 			<key>scope</key>
 			<string>markup.bold, punctuation.definition.bold</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Italic</string>
 			<key>scope</key>
 			<string>markup.italic, punctuation.definition.italic</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
 				<string>#b41e8e</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Code</string>
 			<key>scope</key>
 			<string>markup.raw.inline</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#009854</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Link Text</string>
 			<key>scope</key>
 			<string>string.other.link</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ed1c24</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Link Url</string>
 			<key>scope</key>
 			<string>meta.link</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Lists</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ed1c24</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Quotes</string>
 			<key>scope</key>
 			<string>markup.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#fbaa33</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Separator</string>
 			<key>scope</key>
 			<string>meta.separator</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#dddddc</string>
 				<key>foreground</key>
 				<string>#545052</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inserted</string>
 			<key>scope</key>
 			<string>markup.inserted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#009854</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Deleted</string>
 			<key>scope</key>
 			<string>markup.deleted</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ed1c24</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Changed</string>
 			<key>scope</key>
 			<string>markup.changed</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#b41e8e</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Colors</string>
 			<key>scope</key>
 			<string>constant.other.color</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0092b9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Regular Expressions</string>
 			<key>scope</key>
 			<string>string.regexp</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0092b9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Escape Characters</string>
 			<key>scope</key>
 			<string>constant.character.escape</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#0092b9</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Embedded</string>
 			<key>scope</key>
 			<string>punctuation.section.embedded, variable.interpolation</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#745d32</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid.illegal</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#ed1c24</string>
 				<key>foreground</key>
 				<string>#ffffff</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>f1b32cf4-8979-4a67-b2ca-fbc8f3dcaec4</string>
 </dict>
 </plist>
--- a/sublime_themes/visual-studio-dark.tmTheme
+++ b/sublime_themes/visual-studio-dark.tmTheme
@ -0,0 +1,720 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!-- Generated by: TmTheme-Editor                 -->
 <!-- ============================================ -->
 <!-- app:  http://tmtheme-editor.herokuapp.com    -->
 <!-- code: https://github.com/aziz/tmTheme-Editor -->
 <plist version="1.0">
 <dict>
 	<key>name</key>
 	<string>Visual Studio Dark</string>
 	<key>author</key>
 	<string>Niklas Mollenhauer</string>
 	<key>settings</key>
 	<array>
 		<dict>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#1E1E1E</string>
 				<key>caret</key>
 				<string>#DCDCDC</string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 				<key>invisibles</key>
 				<string>#FFFFFF40</string>
 				<key>lineHighlight</key>
 				<string>#0F0F0F</string>
 				<key>selection</key>
 				<string>#264F78</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comment</string>
 			<key>scope</key>
 			<string>comment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#608B4E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Variable</string>
 			<key>scope</key>
 			<string>variable</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Keyword</string>
 			<key>scope</key>
 			<string>keyword</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Comparision Operator</string>
 			<key>scope</key>
 			<string>keyword.operator.comparison</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Assignment Operator</string>
 			<key>scope</key>
 			<string>keyword.operator.assignment</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Arithmetic Operator</string>
 			<key>scope</key>
 			<string>keyword.operator.arithmetic</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Number</string>
 			<key>scope</key>
 			<string>constant.numeric</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#B5CEA8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>User-defined constant</string>
 			<key>scope</key>
 			<string>constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#B4CEA8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Built-in constant</string>
 			<key>scope</key>
 			<string>constant.language</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Boolean</string>
 			<key>scope</key>
 			<string>constant.language.boolean</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String</string>
 			<key>scope</key>
 			<string>string</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#D69D85</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>String interpolation</string>
 			<key>scope</key>
 			<string>constant.character.escape, string source</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#E3BBAB</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Preprocessor line</string>
 			<key>scope</key>
 			<string>meta.preprocessor</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#9B9B9B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Preprocessor directive</string>
 			<key>scope</key>
 			<string>keyword.control.import</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#9B9B9B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function name</string>
 			<key>scope</key>
 			<string>entity.name.function, keyword.other.name-of-parameter.objc</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
 			<string>entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#4EC9B0</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Type name</string>
 			<key>scope</key>
 			<string>storage.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Type modifier</string>
 			<key>scope</key>
 			<string>storage.modifier</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Inherited class name</string>
 			<key>scope</key>
 			<string>entity.other.inherited-class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#4EC9B0</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function parameter</string>
 			<key>scope</key>
 			<string>variable.parameter</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Function argument and result types</string>
 			<key>scope</key>
 			<string>storage.type.method</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#70727E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Section</string>
 			<key>scope</key>
 			<string>meta.section entity.name.section, declaration.section entity.name.section</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library function</string>
 			<key>scope</key>
 			<string>support.function</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library object</string>
 			<key>scope</key>
 			<string>support.class, support.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library constant</string>
 			<key>scope</key>
 			<string>support.constant</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#B5CEA8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Library variable</string>
 			<key>scope</key>
 			<string>support.variable</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>JS: Operator</string>
 			<key>scope</key>
 			<string>keyword.operator.js</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#687687</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid</string>
 			<key>scope</key>
 			<string>invalid</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#ff3333</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Invalid trailing whitespace</string>
 			<key>scope</key>
 			<string>invalid.deprecated.trailing-whitespace</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#ff3333</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Embedded source</string>
 			<key>scope</key>
 			<string>text source, string.unquoted</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#282828</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup XML declaration</string>
 			<key>scope</key>
 			<string>meta.xml-processing, declaration.xml-processing</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#68685B</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup DOCTYPE</string>
 			<key>scope</key>
 			<string>meta.doctype, declaration.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#808080</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup DTD</string>
 			<key>scope</key>
 			<string>meta.doctype.DTD, declaration.doctype.DTD</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup tag</string>
 			<key>scope</key>
 			<string>meta.tag, declaration.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#808080</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup name of tag</string>
 			<key>scope</key>
 			<string>entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup tag attribute</string>
 			<key>scope</key>
 			<string>entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#92CAF4</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Attribute Value</string>
 			<key>scope</key>
 			<string>string.quoted.double.xml, string.quoted.double.html</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#C8C8C8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Heading</string>
 			<key>scope</key>
 			<string>markup.heading</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#569CD6</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: Quote</string>
 			<key>scope</key>
 			<string>markup.quote</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Markup: List</string>
 			<key>scope</key>
 			<string>markup.list</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#DCDCDC</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css tag-name</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.name.tag</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#D7BA7D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css:pseudo-class</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.tag.pseudo-class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#D7BA7D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css#id</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.id</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#D7BA7D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css.class</string>
 			<key>scope</key>
 			<string>meta.selector.css entity.other.attribute-name.class</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#D7BA7D</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css property-name:</string>
 			<key>scope</key>
 			<string>support.type.property-name.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#9CDCFE</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css property-value;</string>
 			<key>scope</key>
 			<string>meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#C8C8C8</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>§ css @at-rule</string>
 			<key>scope</key>
 			<string>meta.preprocessor.at-rule keyword.control.at-rule</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#87CEFA</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>C#: XML Comment Tags</string>
 			<key>scope</key>
 			<string>source.cs comment.block.documentation.source.cs meta.tag.xml, source.cs comment.block.documentation.source.cs meta.tag.xml entity.name.tag.localname.xml, source.cs comment.block.documentation.source.cs meta.tag.xml entity.other.attribute-name</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#608B4E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>GitGutter deleted</string>
 			<key>scope</key>
 			<string>markup.deleted.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#F92672</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>GitGutter inserted</string>
 			<key>scope</key>
 			<string>markup.inserted.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#A6E22E</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>GitGutter changed</string>
 			<key>scope</key>
 			<string>markup.changed.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#967EFB</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>GitGutter ignored</string>
 			<key>scope</key>
 			<string>markup.ignored.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#565656</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>GitGutter untracked</string>
 			<key>scope</key>
 			<string>markup.untracked.git_gutter</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#565656</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Git Modified Line</string>
 			<key>scope</key>
 			<string>git.changes.x</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#272852</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Git Added Line</string>
 			<key>scope</key>
 			<string>git.changes.+</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#275822</string>
 			</dict>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Git Remove Line</string>
 			<key>scope</key>
 			<string>git.changes.-</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
 				<string>#A72822</string>
 			</dict>
 		</dict>
 	</array>
 	<key>uuid</key>
 	<string>2fd1a8f9-ddfd-11e2-a28f-0800200c9a66</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
 	<key>semanticClass</key>
 	<string>theme.dark.visual_studio_dark</string>
 </dict>
 </plist>
--- a/test_site/content/posts/with-assets/with.js
+++ b/test_site/content/posts/with-assets/with.js
@ -0,0 +1 @@