diff --git a/404.html b/404.html
new file mode 100644
index 00000000..e5cc7b25
--- /dev/null
+++ b/404.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+<div class="container text-center">
+  <div class="position-absolute top-50 start-50 translate-middle">
+    <h1 class="display-1">404</h1>
+    <p><strong>We couldn't find that :(</strong></p>
+    <p>Maybe you were looking for one of these pages?</p>
+    <div class="row">
+      <div class="col">
+        <ul class="list-unstyled">
+          <li><i class="fas fa-home"></i> <a href="/">Back to our Homepage</a></li>
+          <li><i class="fas fa-server"></i> <a href="/providers/">Privacy Focused Service Providers</a></li>
+          <li><i class="fas fa-compass"></i> <a href="/browsers/">Privacy Protecting Web Browsers</a></li>
+          <li><i class="fas fa-window-restore"></i> <a href="/software/">Privacy-Centric Software</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+  <div class="position-absolute bottom-0 start-50 translate-middle-x">
+    <p class="text-danger text-center"><i class="fas fa-exclamation-circle"></i> If you believe you reached this page in error, please <a href="/contact/">contact us</a>!</p>
+  </div>
+</div>
diff --git a/Gemfile b/Gemfile
index 44885381..73c34c22 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ gem "jekyll", "~> 4.2"
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.6"
   gem "jekyll-brotli", "~> 2.3"
+  gem "jekyll-sitemap", "~> 1.4"
 end
 
 # Jekyll 3.9.0 now requires this explicitly installed, apparently
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c04f588..ac5d9158 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,6 +37,8 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (2.3.1)
@@ -71,6 +73,7 @@ DEPENDENCIES
   jekyll (~> 4.2)
   jekyll-brotli (~> 2.3)
   jekyll-feed (~> 0.6)
+  jekyll-sitemap (~> 1.4)
   kramdown-parser-gfm (~> 1.1)
   tzinfo-data
   webrick (~> 1.7)
diff --git a/_config.yml b/_config.yml
index 88f47c84..92ea08d1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,13 +1,13 @@
 title: Privacy Guides
 email: jonah@privacyguides.org
 description: >- # this means to ignore newlines until "baseurl:"
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
+  Massive organizations are monitoring your online activities.
+  Privacy Guides is your central privacy and security resource to protect yourself online.
 baseurl: "" # the subpath of your site, e.g. /blog
 url: "https://www.privacyguides.org" # the base hostname & protocol for your site, e.g. http://example.com
 sass:
     sass_dir: _sass
+permalink: pretty
 excerpt_separator: <!--more-->
 collections_dir: collections
 collections:
@@ -33,4 +33,5 @@ kramdown:
 plugins:
   - jekyll-feed
   - jekyll-brotli
+  - jekyll-sitemap
 exclude: [privacytools.io/]
diff --git a/_includes/head.html b/_includes/head.html
index 203c6dd8..becfc161 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="keywords" content="privacy, anonymity, privacy guides, surveillance, encryption">
   <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
-  <link rel="canonical" href="{{ page.permalink | prepend: site.url | replace:'index.html','' }}">
+  <link rel="canonical" href="{{ page.url | prepend: site.url | replace:'index.html','' }}">
 
   <!-- title -->
   {% if page.title %}
@@ -16,7 +16,7 @@
   <meta property="og:title" content="{{ site.title | escape }}" />
   {% endif %}
   <meta property="og:type" content="website" />
-  <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
+  <meta property="og:url" content="{{ page.url | prepend: site.url }}" />
   <meta property="og:description" content="{% if page.description %}{{ page.description | escape }}{% else %}{{ site.description | escape }}{% endif %}"/>
   <meta property="og:locale" content="en_US" />
   <meta property="og:site_name" content="{{ site.title | escape }}" />
@@ -36,5 +36,5 @@
   <!-- CSS stylesheets -->
   <link href="/assets/css/app.css?v=20210506" rel="stylesheet">
   <link href="/assets/fonts/vendor/fontawesome/css/all.min.css?v=6.0.0-beta1" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=20210506" rel="stylesheet" media="(prefers-color-scheme: dark)">
+  <!--<link id="dark-css" href="/assets/css/dark.css?v=20210506" rel="stylesheet" media="(prefers-color-scheme: dark)">-->
 </head>