diff --git a/.travis.yml b/.travis.yml
index 63259cb..3ef4846 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,23 +14,5 @@ install:
 # Compile the site
 script:
   - hugo
-
-# Deploy the site - this hook comes from Travis integration
-deploy:
-  # The output of our static site
-  local_dir: public
-  # The repository we are deploying to
-  repo: MoonsideGames/moonsidegames.github.io
-  # The branch we are pushing the static repository
-  target_branch: master
-  # Information to use in the commit
-  email: evan@moonside.games
-  name: "Evan Hemsley"
-  provider: pages
-  # Recommended setting
-  skip_cleanup: true
-  # Set in Travis CI dashboard
-  github_token: $GITHUB_TOKEN
-  keep_history: true
-  on:
-    branch: master
+  - npm install -g gh-pages
+  - gh-pages --dist public --dest docs/encompass --repo https://x-access-token:${GITHUB_TOKEN}@github.com/MoonsideGames/moonsidegames.github.io.git --branch master
diff --git a/config.toml b/config.toml
index e2cf93b..aaeb0ac 100644
--- a/config.toml
+++ b/config.toml
@@ -1,5 +1,5 @@
 baseURL = "https://moonsidegames.github.io/docs/encompass/"
-publishDir = "public/docs/encompass"
+publishDir = "public"
 languageCode = "en-US"
 title = "Encompass Docs"
 theme = ["hugo-notice", "hugo-theme-learn"]
diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html
index b2ec0ca..4700231 100644
--- a/layouts/partials/logo.html
+++ b/layouts/partials/logo.html
@@ -1 +1 @@
-<a href="/index.html"><img src="/images/logo-and-text.png" width="200"></a>
+<a href="{{ $.Site.BaseURL }}"><img src="{{ $.Site.BaseURL }}/images/logo-and-text.png" width="200"></a>