diff --git a/Makefile b/Makefile
index 01e2c56e..2ec5ecf0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,11 @@ run:
 	npm install
 	npm run
 
+# Get the IP ADDRESS
+DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
+HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
+HUGO_BIND_IP=0.0.0.0
+
 # import the existing docs build cmds from docker/docker
 DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
 DOCSPORT := 8000
@@ -13,7 +18,9 @@ DOCKER_DOCS_IMAGE := kitematic-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
 DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT)
 
 docs: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" mkdocs serve
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)"  \
+		hugo server \
+			--port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
 
 docs-shell: docs-build
 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
diff --git a/docs/Dockerfile b/docs/Dockerfile
index b42ddbd8..06dd3ad2 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -8,6 +8,7 @@ RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content
 RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/opensource
 RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
+RUN svn checkout https://github.com/docker/toolbox/trunk/docs /docs/content/toolbox
 
 ENV PROJECT=kitematic
 # To get the git info for this repo
diff --git a/docs/faq.md b/docs/faq.md
index 3b9cd4cf..8a0a840e 100755
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -4,7 +4,7 @@ title = "Frequently Asked Questions"
 description = "Documentation covering common questions users have about Kitematic"
 keywords = ["docker, documentation, about, technology, kitematic,  gui"]
 [menu.main]
-parent="smn_workw_kitematic"
+parent="toolbox_kitematic"
 weight=5
 +++
 <![end-metadata]-->
diff --git a/docs/index.md b/docs/index.md
index 9190f564..7cf9ec44 100755
--- a/docs/index.md
+++ b/docs/index.md
@@ -4,7 +4,8 @@ title = "Kitematic"
 description = "Documentation that provides an overview of Kitematic and installation instructions"
 keywords = ["docker, documentation, about, technology, kitematic,  gui"]
 [menu.main]
-parent="mn_install"
+identifier="toolbox_kitematic"
+parent="workw_toolbox"
 weight=2
 +++
 <![end-metadata]-->
diff --git a/docs/known-issues.md b/docs/known-issues.md
index a12c9bbe..b69b1c5a 100755
--- a/docs/known-issues.md
+++ b/docs/known-issues.md
@@ -4,7 +4,7 @@ title = "Known Issues"
 description = "Information about known issues in Kitematic"
 keywords = ["docker, documentation, about, technology, kitematic,  gui"]
 [menu.main]
-parent="smn_workw_kitematic"
+parent="toolbox_kitematic"
 weight=5
 +++
 <![end-metadata]-->
diff --git a/docs/minecraft-server.md b/docs/minecraft-server.md
index 2c4d089b..433b0f0d 100755
--- a/docs/minecraft-server.md
+++ b/docs/minecraft-server.md
@@ -4,7 +4,7 @@ title = "Set up a Minecraft Server"
 description = "Tutorial demonstrating the setup of a Minecraft server using Docker and Kitematic"
 keywords = ["docker, documentation, about, technology, kitematic, gui, minecraft,  tutorial"]
 [menu.main]
-parent="smn_workw_kitematic"
+parent="toolbox_kitematic"
 weight=2
 +++
 <![end-metadata]-->
diff --git a/docs/nginx-web-server.md b/docs/nginx-web-server.md
index 7121c4fd..7c1199a5 100755
--- a/docs/nginx-web-server.md
+++ b/docs/nginx-web-server.md
@@ -4,7 +4,7 @@ title = "Set up an Nginx web server"
 description = "Tutorial demonstrating the setup of an Nginx web server using Docker and Kitematic"
 keywords = ["docker, documentation, about, technology, kitematic, gui, nginx,  tutorial"]
 [menu.main]
-parent="smn_workw_kitematic"
+parent="toolbox_kitematic"
 weight=1
 +++
 <![end-metadata]-->
diff --git a/docs/rethinkdb-dev-database.md b/docs/rethinkdb-dev-database.md
index 620cb8f1..d571a121 100755
--- a/docs/rethinkdb-dev-database.md
+++ b/docs/rethinkdb-dev-database.md
@@ -4,7 +4,7 @@ title = "Creating a Local RethinkDB Database for Development"
 description = "Tutorial demonstrating the setup of an RethinkDB database for development"
 keywords = ["docker, documentation, about, technology, kitematic, gui, rethink,  tutorial"]
 [menu.main]
-parent="smn_workw_kitematic"
+parent="toolbox_kitematic"
 weight=3
 +++
 <![end-metadata]-->
diff --git a/docs/userguide.md b/docs/userguide.md
index 4943e455..01792cc5 100755
--- a/docs/userguide.md
+++ b/docs/userguide.md
@@ -4,7 +4,7 @@ title = "Kitematic User Guide: Intro & Overview"
 description = "Documentation that provides an overview of Kitematic and installation instructions"
 keywords = ["docker, documentation, about, technology, kitematic, gui"]
 [menu.main]
-parent="smn_workw_kitematic"
+parent="toolbox_kitematic"
 +++
 <![end-metadata]-->