diff --git a/README.md b/README.md
index 05a3ffb..8686f1d 100644
--- a/README.md
+++ b/README.md
@@ -29,21 +29,23 @@ Then to run:
 
 ## Tools
 
-File types(100) | Tools(56)
+File types(103) | Tools(63)
 ----------:| -----
 .* | [contents](http://pygments.org/) • [metadata](https://github.com/ahamilton/eris) • [git_diff](https://git-scm.com/docs/git-diff) • [git_blame](https://git-scm.com/docs/git-blame) • [git_log](https://git-scm.com/docs/git-log)
-.py | [python_syntax](https://en.wikipedia.org/wiki/Python_syntax_and_semantics) • [python_unittests](https://docs.python.org/3/library/unittest.html) • [pytest](https://docs.pytest.org/en/latest/) • [pydoc](https://docs.python.org/3/library/pydoc.html) • [mypy](http://mypy-lang.org/) • [python_coverage](https://coverage.readthedocs.io/) • [pycodestyle](http://pycodestyle.pycqa.org/en/latest/) • [pyflakes](https://pypi.org/project/pyflakes/) • [pylint](https://www.pylint.org/) • [python_gut](https://github.com/ahamilton/eris) • [python_mccabe](https://pypi.org/project/mccabe/) • [bandit](https://pypi.org/project/bandit/)
+.py | [python_syntax](https://en.wikipedia.org/wiki/Python_syntax_and_semantics) • [python_unittests](https://docs.python.org/3/library/unittest.html) • [pytest](https://docs.pytest.org/en/latest/) • [pydoc](https://docs.python.org/3/library/pydoc.html) • [mypy](http://mypy-lang.org/) • [python_coverage](https://coverage.readthedocs.io/) • [pycodestyle](http://pycodestyle.pycqa.org/en/latest/) • [pyflakes](https://pypi.org/project/pyflakes/) • [pylint](https://www.pylint.org/) • [python_gut](https://github.com/ahamilton/eris) • [python_mccabe](https://pypi.org/project/mccabe/) • [bandit](https://pypi.org/project/bandit/) • [black](https://github.com/psf/black) • [isort](https://pycqa.github.io/isort/)
 .pl .pm .t | [perl_syntax](https://en.wikipedia.org/wiki/Perl) • [perldoc](http://perldoc.perl.org/)
 .p6 .pm6 | [perl6_syntax](https://rakudo.org/)
 .pod .pod6 | [perldoc](http://perldoc.perl.org/)
 .c .h | [c_syntax_gcc](https://gcc.gnu.org/) • [cppcheck](http://sourceforge.net/p/cppcheck/wiki/Home/)
 .cc .cpp .hpp | [cpp_syntax_gcc](https://gcc.gnu.org/) • [cppcheck](http://sourceforge.net/p/cppcheck/wiki/Home/)
-.rb | [ruby_syntax](http://www.ruby-lang.org/)
+.rb | [ruby_syntax](http://www.ruby-lang.org/) • [rubocop](https://rubocop.org/)
+.rs | [rustfmt](https://github.com/rust-lang/rustfmt) • [clippy](https://github.com/rust-lang/rust-clippy)
 .lua | [lua_syntax](http://www.lua.org) • [lua_check](https://github.com/mpeterv/luacheck)
-.js | [js_syntax](http://nodejs.org/)
+.js .ts | [js_syntax](http://nodejs.org/) • [typescript_check](https://www.typescriptlang.org/)
 .php | [php8_syntax](https://en.wikipedia.org/wiki/PHP)
 .go | [go_vet](https://github.com/golang/go) • [godoc](https://github.com/golang/go)
 .bash .sh .dash .ksh | [shellcheck](https://www.shellcheck.net/)
+.wat | [wat_syntax_check](https://github.com/WebAssembly/wabt)
 .wasm | [wasm_validate](https://github.com/WebAssembly/wabt) • [wasm_objdump](https://github.com/WebAssembly/wabt)
 .pdf | [pdf2txt](https://github.com/pdfminer/pdfminer.six)
 .html .htm | [html_syntax](https://www.html-tidy.org/) • [html2text](http://www.mbayer.de/html2text/) • [elinks](http://elinks.cz/)
diff --git a/eris/tools.toml b/eris/tools.toml
index c8897f4..a8b8621 100644
--- a/eris/tools.toml
+++ b/eris/tools.toml
@@ -3,19 +3,21 @@
 tools_for_extensions = [
    [["py"], ["python_syntax", "python_unittests", "pytest", "pydoc", "mypy",
              "python_coverage", "pycodestyle", "pyflakes",
-	     "pylint", "python_gut", "python_mccabe", "bandit"]],
+	     "pylint", "python_gut", "python_mccabe", "bandit", "black", "isort"]],
 #    [["pyc"], ["pydisasm"]],
    [["pl", "pm", "t"], ["perl_syntax", "perldoc"]],
    [["p6", "pm6"], ["perl6_syntax"]],
    [["pod", "pod6"], ["perldoc"]],
    [["c", "h"], ["c_syntax_gcc", "cppcheck"]],
    [["cc", "cpp", "hpp"], ["cpp_syntax_gcc", "cppcheck"]],
-   [["rb"], ["ruby_syntax"]],
+   [["rb"], ["ruby_syntax", "rubocop"]],
+   [["rs"], ["rustfmt", "clippy"]],
    [["lua"], ["lua_syntax", "lua_check"]],
-   [["js"], ["js_syntax"]],
+   [["js", "ts"], ["js_syntax", "typescript_check"]],
    [["php"], ["php8_syntax"]],
    [["go"], ["go_vet", "godoc"]],
    [["bash", "sh", "dash", "ksh"], ["shellcheck"]],
+   [["wat"], ["wat_syntax_check"]],
    [["wasm"], ["wasm_validate", "wasm_objdump"]],
    [["pdf"], ["pdf2txt"]],
    [["html", "htm"], ["html_syntax", "html2text", "elinks"]],
@@ -78,6 +80,18 @@ tools_for_extensions = [
   has_color = true
   timeout = 60
 
+[black]
+  dependencies = ["black"]
+  url = "https://github.com/psf/black"
+  command = "black --check --diff --color"
+  has_color = true
+
+[isort]
+  dependencies = ["python3-isort", "python3-colorama"]
+  url = "https://pycqa.github.io/isort/"
+  command = "isort --check-only --diff --color"
+  has_color = true
+
 [perl_syntax]
   dependencies = ["perl"]
   url = "https://en.wikipedia.org/wiki/Perl"
@@ -223,6 +237,24 @@ tools_for_extensions = [
   url = "http://www.ruby-lang.org/"
   command = "ruby -c"
 
+[rubocop]
+  dependencies = ["rubocop"]
+  url = "https://rubocop.org/"
+  command = "rubocop --color --fail-level autocorrect --display-style-guide"
+  has_color = true
+
+[rustfmt]
+  dependencies = ["rustfmt"]
+  url = "https://github.com/rust-lang/rustfmt"
+  command = "cargo fmt --check -- --color always"
+  has_color = true
+
+[clippy]
+  dependencies = ["rust-clippy"]
+  url = "https://github.com/rust-lang/rust-clippy"
+  command = "rustc -Awarnings -Dclippy::all"
+  has_color = true
+
 [lua_syntax]
   dependencies = ["lua5.3"]
   url = "http://www.lua.org"
@@ -233,6 +265,12 @@ tools_for_extensions = [
   url = "http://nodejs.org/"
   command = "node --check"
 
+[typescript_check]
+  dependencies = ["node-typescript"]
+  url = "https://www.typescriptlang.org/"
+  command = "tsc --pretty --noEmit"
+  has_color = true
+
 [lua_check]
   dependencies = ["lua-check"]
   url = "https://github.com/mpeterv/luacheck"
@@ -244,6 +282,11 @@ tools_for_extensions = [
   url = "https://github.com/golang/go"
   command = "go vet"
 
+[wat_syntax_check]
+  dependencies = ["wabt"]
+  url = "https://github.com/WebAssembly/wabt"
+  command = "wat2wasm --check-only"
+
 [wasm_validate]
   dependencies = ["wabt"]
   url = "https://github.com/WebAssembly/wabt"