diff --git a/Dockerfile b/Dockerfile
index 577255a1ddc4b172a0609c5f2c54a57fece8e609..516c8ac669780434c24cff27f496b810d19ebc79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN echo "Adding system components" && \
 
 ADD bin/* /usr/local/bin/
 
-RUN echo "Setup MdShow" && \
+RUN echo "Setup mdshow" && \
     mdshow setup && \
     ln -s /opt/mdshow/reveal.js/node_modules/gulp/bin/gulp.js /usr/bin/gulp && \
     mkdir -p /opt/mdshow/theme && \
@@ -40,5 +40,6 @@ RUN echo "Setup MdShow" && \
     rm -rf /root/.npm && \
     echo "Completed"
 
+WORKDIR /mdshow
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["/bin/bash"]
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 9c6fa052d82519ded4e230c689cf5cc8a99ab58a..5cfa123085644e7fdddc810b52d75ce32fc4afc9 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 set -e
+set -u
 
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
diff --git a/bin/mdshow b/bin/mdshow
index 23bde4393e758935d372fde4fab9590316f0dc79..20dc0015a1c4ea2eae534a5aba0d8395d38c4ba4 100755
--- a/bin/mdshow
+++ b/bin/mdshow
@@ -7,7 +7,9 @@
 
 SHELL := /bin/bash
 
-MDSHOW_CONFIG = /opt/mdshow
+CONFIG_PATH = ${HOME}/.config
+MDSHOW_CONFIG = $(CONFIG_PATH)/mdshow
+
 SLIDES = slides.md
 BUILD_DIR = .build_$(basename $(SLIDES))
 PORT = 3000
diff --git a/mdshow b/mdshow
index e4dab78b1da80ea15c5f9178f3a4935cf4d67021..f9ca99cd516b906b6bf3b8b6344e8c80fdb633e2 100755
--- a/mdshow
+++ b/mdshow
@@ -4,4 +4,4 @@ if [[ -n $MDSHOW_THEME_PATH ]]; then
   THEME=--volume=${MDSHOW_THEME_PATH}:/opt/mdshow/theme/$(basename ${MDSHOW_THEME_PATH})
 fi
 
-docker run --user=$(id -u) --rm -it --net=host ${THEME} --volume=$(pwd):/mdshow --workdir=/mdshow registry.lakedrops.com/docker/mdshow mdshow $@
+docker run --user=$(id -u) --rm -it --net=host ${THEME} --volume=$(pwd):/mdshow registry.lakedrops.com/docker/mdshow mdshow CONFIG_PATH=/opt $@