diff --git a/README.md b/README.md
index fb036e05c..f7dcd6e33 100644
--- a/README.md
+++ b/README.md
@@ -585,10 +585,10 @@ SOFTWARE.
 [plex-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [plex-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [plex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/ff23320
-[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/ff23320/README.md
+[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/f64689d
+[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/f64689d/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
-[ssh-version-shield]: https://img.shields.io/badge/version-ff23320-blue.svg
+[ssh-version-shield]: https://img.shields.io/badge/version-f64689d-blue.svg
 [ssh-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/ssh-armhf.svg
 [ssh-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [ssh-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 9518d3a1a..0755ab5e5 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,81 +1,96 @@
 # Changelog since v2.5.0
 
-2018/07/08 17:23 UTC - [ff23320](https://github.com/hassio-addons/addon-ssh/commit/ff23320f87aa3710bf3d07ac80f4a12106e68f83) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [f64689d](https://github.com/hassio-addons/addon-ssh/commit/f64689d504b302e6338df82c746e2a673fd9c478) by [@frenck](https://github.com/frenck)
+> :tractor: :hammer: Rewrite add-on to include both SSH and Web Terminal 
+
+2018/07/15 21:23 UTC - [2aac7f6](https://github.com/hassio-addons/addon-ssh/commit/2aac7f6ff5655b5a6343b610c9ea974427fe48f3) by [@frenck](https://github.com/frenck)
+> :sparkles: Adds ack 
+
+2018/07/15 21:23 UTC - [180f119](https://github.com/hassio-addons/addon-ssh/commit/180f119de70849499f9be1cf97c73572b0f6c8be) by [@frenck](https://github.com/frenck)
+> :arrow_up: Upgrades base image to v2.0.1 
+
+2018/07/15 21:23 UTC - [9d20f17](https://github.com/hassio-addons/addon-ssh/commit/9d20f17f1f02b14d0247fda07a6bcc7fe8a19461) by [@frenck](https://github.com/frenck)
+> :shirt: Fixes Hadolint warning 
+
+2018/07/15 21:23 UTC - [794809b](https://github.com/hassio-addons/addon-ssh/commit/794809b572fa8f6947ab46f6cd545903586284ed) by [@frenck](https://github.com/frenck)
+> :hammer: Initial addition of ttyd 
+
+2018/07/15 21:23 UTC - [ff23320](https://github.com/hassio-addons/addon-ssh/commit/ff23320f87aa3710bf3d07ac80f4a12106e68f83) by [@frenck](https://github.com/frenck)
 > :sparkles: Adds ZSH Syntax Highlighting
 
 Closes #21 
 
-2018/07/08 17:23 UTC - [640047a](https://github.com/hassio-addons/addon-ssh/commit/640047af7eb559420d2289366a4082dd7a3e02ec) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [640047a](https://github.com/hassio-addons/addon-ssh/commit/640047af7eb559420d2289366a4082dd7a3e02ec) by [@frenck](https://github.com/frenck)
 > :sparkles: Adds ZSH Autosuggestions
 
 Closes #22 
 
-2018/07/08 17:23 UTC - [0a18c07](https://github.com/hassio-addons/addon-ssh/commit/0a18c0738f39162e5e3c90647ec3c2af0dac4f49) by [@ndarilek](https://github.com/ndarilek)
+2018/07/15 21:23 UTC - [0a18c07](https://github.com/hassio-addons/addon-ssh/commit/0a18c0738f39162e5e3c90647ec3c2af0dac4f49) by [@ndarilek](https://github.com/ndarilek)
 > :sparkles: Adds support for audio and UART devices 
 
-2018/07/08 17:23 UTC - [249d08c](https://github.com/hassio-addons/addon-ssh/commit/249d08c10e78a8e3791119d092cbe07bba7247c6) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [249d08c](https://github.com/hassio-addons/addon-ssh/commit/249d08c10e78a8e3791119d092cbe07bba7247c6) by [@frenck](https://github.com/frenck)
 > :sparkles: Adds syntax highlighting in Nano 
 
-2018/07/08 17:23 UTC - [6e29bcd](https://github.com/hassio-addons/addon-ssh/commit/6e29bcd8f44a764cd8e56698119b1edd5848693d) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [6e29bcd](https://github.com/hassio-addons/addon-ssh/commit/6e29bcd8f44a764cd8e56698119b1edd5848693d) by [@frenck](https://github.com/frenck)
 > :art: Updates Hass.io ASCII art in MOTD 
 
-2018/07/08 17:23 UTC - [08aee52](https://github.com/hassio-addons/addon-ssh/commit/08aee520ab82bfd51c562558c4f0386a75fa6bcf) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [08aee52](https://github.com/hassio-addons/addon-ssh/commit/08aee520ab82bfd51c562558c4f0386a75fa6bcf) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades Hadolint to latest version 
 
-2018/07/08 17:23 UTC - [7640b73](https://github.com/hassio-addons/addon-ssh/commit/7640b73764dcd939a76cd94a61ff22d9d7fb5f16) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [7640b73](https://github.com/hassio-addons/addon-ssh/commit/7640b73764dcd939a76cd94a61ff22d9d7fb5f16) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades zsh to 5.5.1-r0 
 
-2018/07/08 17:23 UTC - [b42034b](https://github.com/hassio-addons/addon-ssh/commit/b42034b4c551070498cbd21dfed7d0e7028847ea) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [b42034b](https://github.com/hassio-addons/addon-ssh/commit/b42034b4c551070498cbd21dfed7d0e7028847ea) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades zip to 3.0-r5 
 
-2018/07/08 17:23 UTC - [f5fda2c](https://github.com/hassio-addons/addon-ssh/commit/f5fda2c41e91edbc8013a1542046dd28a993b0b2) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [f5fda2c](https://github.com/hassio-addons/addon-ssh/commit/f5fda2c41e91edbc8013a1542046dd28a993b0b2) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades vim to 8.1.0115-r0 
 
-2018/07/08 17:23 UTC - [ca92cde](https://github.com/hassio-addons/addon-ssh/commit/ca92cdef62e04557a1aea6854442ac98efd7a8d8) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [ca92cde](https://github.com/hassio-addons/addon-ssh/commit/ca92cdef62e04557a1aea6854442ac98efd7a8d8) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades tmux to 2.7-r0 
 
-2018/07/08 17:23 UTC - [15bb550](https://github.com/hassio-addons/addon-ssh/commit/15bb5504266ca7c1307d2061ca16f16640f8efb1) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [15bb550](https://github.com/hassio-addons/addon-ssh/commit/15bb5504266ca7c1307d2061ca16f16640f8efb1) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades sudo to 1.8.23-r2 
 
-2018/07/08 17:23 UTC - [3acd5af](https://github.com/hassio-addons/addon-ssh/commit/3acd5afba2a7aa6f0508240d28208de068908759) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [3acd5af](https://github.com/hassio-addons/addon-ssh/commit/3acd5afba2a7aa6f0508240d28208de068908759) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades sqlite to 3.24.0-r0 
 
-2018/07/08 17:23 UTC - [3b3f1e5](https://github.com/hassio-addons/addon-ssh/commit/3b3f1e5c0148659099759113a2d0d5a9082890e0) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [3b3f1e5](https://github.com/hassio-addons/addon-ssh/commit/3b3f1e5c0148659099759113a2d0d5a9082890e0) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades rsync to 3.1.3-r1 
 
-2018/07/08 17:23 UTC - [44a1752](https://github.com/hassio-addons/addon-ssh/commit/44a1752db6e34edbb758666533caf105d35b6f86) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [44a1752](https://github.com/hassio-addons/addon-ssh/commit/44a1752db6e34edbb758666533caf105d35b6f86) by [@frenck](https://github.com/frenck)
 > :arrow_up: Uprades openssl to 1.0.2o-r1 
 
-2018/07/08 17:23 UTC - [9da9386](https://github.com/hassio-addons/addon-ssh/commit/9da9386451df082b2110f13c289f25fd8877081e) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [9da9386](https://github.com/hassio-addons/addon-ssh/commit/9da9386451df082b2110f13c289f25fd8877081e) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades openssh to 7.7_p1-r2 
 
-2018/07/08 17:23 UTC - [3a49fc1](https://github.com/hassio-addons/addon-ssh/commit/3a49fc182a65fd3732c992c477a540650bdfeb44) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [3a49fc1](https://github.com/hassio-addons/addon-ssh/commit/3a49fc182a65fd3732c992c477a540650bdfeb44) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades nmap to 7.70-r1 
 
-2018/07/08 17:23 UTC - [8a031bd](https://github.com/hassio-addons/addon-ssh/commit/8a031bd099d586b537f897e310e8adaf5da7cfa6) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [8a031bd](https://github.com/hassio-addons/addon-ssh/commit/8a031bd099d586b537f897e310e8adaf5da7cfa6) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades net-tools to 1.60_git20140218-r2 
 
-2018/07/08 17:23 UTC - [b80a4bb](https://github.com/hassio-addons/addon-ssh/commit/b80a4bbd0a851db376d7d818cd6cf04792b99819) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [b80a4bb](https://github.com/hassio-addons/addon-ssh/commit/b80a4bbd0a851db376d7d818cd6cf04792b99819) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades ncurses to 6.1-r0 
 
-2018/07/08 17:23 UTC - [44d3833](https://github.com/hassio-addons/addon-ssh/commit/44d3833ebaa1ebfba1e0687cca1c48fb6e015317) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [44d3833](https://github.com/hassio-addons/addon-ssh/commit/44d3833ebaa1ebfba1e0687cca1c48fb6e015317) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades nano to 2.9.8-r0 
 
-2018/07/08 17:23 UTC - [edd0234](https://github.com/hassio-addons/addon-ssh/commit/edd0234e744c242bd2ff67b9ec38ec906e178d60) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [edd0234](https://github.com/hassio-addons/addon-ssh/commit/edd0234e744c242bd2ff67b9ec38ec906e178d60) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades mosquitto-clients to 1.4.15-r3 
 
-2018/07/08 17:23 UTC - [d47ab5f](https://github.com/hassio-addons/addon-ssh/commit/d47ab5f39c5c53d4c1228ae2e3afcd2099dab1e9) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [d47ab5f](https://github.com/hassio-addons/addon-ssh/commit/d47ab5f39c5c53d4c1228ae2e3afcd2099dab1e9) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades mariadb-client to 10.2.15-r0 
 
-2018/07/08 17:23 UTC - [644af81](https://github.com/hassio-addons/addon-ssh/commit/644af819470fb6fc4064c31d60947489ad763844) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [644af81](https://github.com/hassio-addons/addon-ssh/commit/644af819470fb6fc4064c31d60947489ad763844) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades libxml2-utils 2.9.8-r0 
 
-2018/07/08 17:23 UTC - [216d3da](https://github.com/hassio-addons/addon-ssh/commit/216d3daaa01fb3b050fd58e9d8deb190f151fa9e) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [216d3da](https://github.com/hassio-addons/addon-ssh/commit/216d3daaa01fb3b050fd58e9d8deb190f151fa9e) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades git to 2.18.0-r0 
 
-2018/07/08 17:23 UTC - [89e940f](https://github.com/hassio-addons/addon-ssh/commit/89e940f7ad9e28572f28c8ee8ba80cd159e60b1e) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [89e940f](https://github.com/hassio-addons/addon-ssh/commit/89e940f7ad9e28572f28c8ee8ba80cd159e60b1e) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades bind-tools to 9.12.1_p2-r0 
 
-2018/07/08 17:23 UTC - [9fd2ade](https://github.com/hassio-addons/addon-ssh/commit/9fd2ade736f3a53af5e83155d45ea6f19d113f6b) by [@frenck](https://github.com/frenck)
+2018/07/15 21:23 UTC - [9fd2ade](https://github.com/hassio-addons/addon-ssh/commit/9fd2ade736f3a53af5e83155d45ea6f19d113f6b) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades base image to v2.0.0 
 
diff --git a/ssh/README.md b/ssh/README.md
index c448f1d16..b4bf59251 100644
--- a/ssh/README.md
+++ b/ssh/README.md
@@ -75,7 +75,7 @@ If you are more interested in stable releases of our add-ons:
 [buymeacoffee]: https://www.buymeacoffee.com/frenck
 [discord-shield]: https://img.shields.io/discord/330944238910963714.svg
 [discord]: https://discord.gg/c5DvZ4e
-[docs]: https://github.com/hassio-addons/addon-ssh/blob/ff23320/README.md
+[docs]: https://github.com/hassio-addons/addon-ssh/blob/f64689d/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck
 [hass-ssh]: https://home-assistant.io/addons/ssh/
@@ -83,8 +83,8 @@ If you are more interested in stable releases of our add-ons:
 [ohmyzsh]: http://ohmyz.sh/
 [openssh]: https://www.openssh.com/
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-ff23320-blue.svg
-[release]: https://github.com/hassio-addons/addon-ssh/tree/ff23320
+[release-shield]: https://img.shields.io/badge/version-f64689d-blue.svg
+[release]: https://github.com/hassio-addons/addon-ssh/tree/f64689d
 [ssh-audit-image]: https://github.com/hassio-addons/addon-ssh/raw/master/images/ssh-audit.png
 [ssh-audit]: https://github.com/arthepsy/ssh-audit
 [zsh]: https://en.wikipedia.org/wiki/Z_shell
\ No newline at end of file
diff --git a/ssh/config.json b/ssh/config.json
index 03a38b812..1b249827f 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,9 +1,10 @@
 {
-  "name": "SSH - Secure Shell",
-  "version": "ff23320",
+  "name": "SSH & Web Terminal",
+  "version": "f64689d",
   "slug": "ssh",
   "description": "Allows SSH connections to your Home Assistant instance",
   "url": "https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck",
+  "webui": "http://[HOST]:[PORT:7681]",
   "startup": "services",
   "arch": [
     "aarch64",
@@ -26,31 +27,57 @@
   ],
   "options": {
     "log_level": "info",
-    "port": 22,
-    "username": "hassio",
-    "password": "",
-    "authorized_keys": [],
-    "sftp": false,
-    "compatibility_mode": false,
-    "allow_agent_forwarding": false,
-    "allow_remote_port_forwarding": false,
-    "allow_tcp_forwarding": false,
+    "ssh": {
+      "enable": true,
+      "port": 22,
+      "username": "hassio",
+      "password": "",
+      "authorized_keys": [],
+      "sftp": false,
+      "compatibility_mode": false,
+      "allow_agent_forwarding": false,
+      "allow_remote_port_forwarding": false,
+      "allow_tcp_forwarding": false
+    },
+    "web": {
+      "enable": true,
+      "port": 7681,
+      "username": "hassio",
+      "password": "",
+      "ssl": false,
+      "certfile": "fullchain.pem",
+      "keyfile": "privkey.pem"
+    },
+    "share_sessions": true,
     "packages": [],
     "init_commands": []
   },
   "schema": {
     "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
-    "port": "port",
-    "username": "str",
-    "password": "str",
-    "authorized_keys": [
-      "str"
-    ],
-    "sftp": "bool",
-    "compatibility_mode": "bool",
-    "allow_agent_forwarding": "bool",
-    "allow_remote_port_forwarding": "bool",
-    "allow_tcp_forwarding": "bool",
+    "ssh": {
+      "enable": "bool",
+      "port": "port",
+      "username": "str",
+      "password": "str",
+      "authorized_keys": [
+        "str"
+      ],
+      "sftp": "bool",
+      "compatibility_mode": "bool",
+      "allow_agent_forwarding": "bool",
+      "allow_remote_port_forwarding": "bool",
+      "allow_tcp_forwarding": "bool"
+    },
+    "web": {
+      "enable": "bool",
+      "port": "port",
+      "username": "str",
+      "password": "str",
+      "ssl": "bool",
+      "certfile": "str",
+      "keyfile": "str"
+    },
+    "share_sessions": "bool",
     "packages": [
       "str"
     ],