diff --git a/Gemfile b/Gemfile
index 70f8d954..263d2040 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,26 @@
 source "https://rubygems.org"
 
-# Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
-gem "github-pages", group: :jekyll_plugins
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 3.8.5"
 
-# Plugins
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.0"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
 group :jekyll_plugins do
-  # example: gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-sitemap", "~> 1.4"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -13,4 +28,3 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
-
diff --git a/Gemfile.lock b/Gemfile.lock
index 2dce18a7..5c921ba1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,89 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    execjs (2.7.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (198)
-      activesupport (= 4.2.11.1)
-      github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
-      jekyll-avatar (= 0.6.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.11.0)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.4.1)
-      jekyll-optional-front-matter (= 0.3.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.3.1)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
-      jekyll-sitemap (= 1.2.0)
-      jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.2)
-      kramdown (= 1.17.0)
-      liquid (= 4.0.0)
-      listen (= 3.1.5)
-      mercenary (~> 0.3)
-      minima (= 2.5.0)
-      nokogiri (>= 1.8.5, < 2.0)
-      rouge (= 2.2.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.16.1)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (~> 3.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -100,97 +27,16 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
-      rouge (~> 2)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
     jekyll-feed (0.11.0)
       jekyll (~> 3.3)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.6.0)
-      jekyll (~> 3.3)
-    jekyll-remote-theme (0.3.1)
-      jekyll (~> 3.5)
-      rubyzip (>= 1.2.1, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
-      jekyll (~> 3.5)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.2)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
     kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -198,17 +44,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.4.0)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    multipart-post (2.1.1)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
@@ -216,34 +55,23 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
-    ruby-enum (0.7.2)
-      i18n
     ruby_dep (1.5.0)
-    rubyzip (2.0.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  jekyll (~> 3.8.5)
+  jekyll-feed (~> 0.6)
+  jekyll-sitemap (~> 1.4)
+  minima (~> 2.0)
   tzinfo-data
 
 BUNDLED WITH
-   2.0.1
+   2.1.4
diff --git a/_config.yml b/_config.yml
index 25a9c243..887f08df 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,6 +3,7 @@ name: PrivacyTools
 description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance.
 url: "https://www.privacytools.io"
 production_url: "https://www.privacytools.io"
+pull_cdn: "https://cdn.privacytools.io"
 sass:
   style: compressed
 plugins:
diff --git a/_includes/card.html b/_includes/card.html
index ec676c84..8765dd38 100644
--- a/_includes/card.html
+++ b/_includes/card.html
@@ -56,7 +56,7 @@
                 </a>
                 {% endif %}
                 {% if include.tor %}
-                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
+                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/layout/tor.png" width="35" height="35"></a>
                 {% endif %}
 
                 {% if include.git %}
diff --git a/_includes/cardv2.html b/_includes/cardv2.html
index cd270fa5..933052ad 100644
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@@ -29,7 +29,7 @@
   <div class="card-body">
     <p class="card-text">
       <img
-        src="{{include.image}}"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}{{include.image}}"
         {% if include.image-dark %}
         data-theme-src="{{include.image-dark}}"
         {% endif %}
diff --git a/_includes/head.html b/_includes/head.html
index 45e6702c..afb3924c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,6 +6,8 @@
   <meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
   <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
   <link rel="canonical" href="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
+  <link rel="preconnect" href="https://cdn.privacytools.io/" crossorigin>
+  <link rel="dns-prefetch" href="https://cdn.privacytools.io/">
 
   <!-- title -->
   {% if page.title %}
@@ -48,18 +50,18 @@
   {% endif %}
 
   <!-- icons -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/png/favicons/apple-touch-icon.png?v=2">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/png/favicons/favicon-32x32.png?v=2">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/png/favicons/favicon-16x16.png?v=2">
-  <link rel="manifest" href="/assets/img/png/favicons/site.webmanifest?v=2">
-  <link rel="mask-icon" href="/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
-  <link rel="shortcut icon" href="/assets/img/png/favicons/favicon.ico?v=2">
+  <link rel="apple-touch-icon" sizes="180x180" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/apple-touch-icon.png?v=2">
+  <link rel="icon" type="image/png" sizes="32x32" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/favicon-32x32.png?v=2">
+  <link rel="icon" type="image/png" sizes="16x16" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/favicon-16x16.png?v=2">
+  <link rel="manifest" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/site.webmanifest?v=2">
+  <link rel="mask-icon" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
+  <link rel="shortcut icon" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/favicon.ico?v=2">
   <meta name="msapplication-TileColor" content="#3498db">
-  <meta name="msapplication-config" content="/assets/img/png/favicons/browserconfig.xml?v=2">
+  <meta name="msapplication-config" content="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/browserconfig.xml?v=2">
   <meta name="theme-color" content="#ffffff">
 
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=9" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
+  <link href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/css/style.css?v=9" rel="stylesheet" integrity="sha384-qBP5Bbk7h5voX7+I9CM6Vy0HQpm+PWHRXZy2Ut/52+S3WmuBw3YWNyoeI/QRGWv4" crossorigin="anonymous">
+  <link id="dark-css" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)" integrity="sha384-V2UIGW0+AbgQZL/bmWAM8pRXghNGm/IvTD/yeSAsMLpsz3D+0MnYvKZ7h6Udng9x" crossorigin="anonymous">
 </head>
diff --git a/_includes/nav.html b/_includes/nav.html
index a649fe92..554d4978 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -2,7 +2,7 @@
   <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
     <div class="w-50">
       <a id="nav-home-mobile" class="nav-anchor" href="/">
-        <img src="/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
+        <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
       </a>
     </div>
     <input type="checkbox" id="nav-toggle" checked />
diff --git a/_includes/scripts.html b/_includes/scripts.html
index d5e84077..864b14df 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -1,8 +1,8 @@
-<script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
-<script src="/assets/js/popper.min.js?v=4"></script>
-<script src="/assets/js/bootstrap.min.js?v=4"></script>
-<script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=5"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/jquery-3.3.1.min.js?v=4" integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/popper.min.js?v=4" integrity="sha384-yipEjruz9xikSpiIi+F8+G+OvmOYvx/hY06pr3eA26265pJ8+Lbc3sZ2uBgBG7b7" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/bootstrap.min.js?v=4" integrity="sha384-uz42m69OOLo5hnP147/k7qYaV16ebylNguXL8G7Z/iBMtapgaUSOwgo/9MopjS46" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/sortable.min.js?v=4" integrity="sha384-tukxl0r6OP6AB7mHv3RINgYu4i6IvHr1bdnypIcYez2WQzZKq08BXyFEZCW//Juc" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/main.js?v=5" integrity="sha384-7Cn7Co5qrN1jU/2wfO5Kn0M/FR/UtrkM1+rLAEIUteTqmzgMPLXjm9H2c5NsnSxp" crossorigin="anonymous"></script>
 
 <!--
   Matomo is the leading open-source analytics platform:
diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html
index 598cd1f5..25f52d6d 100644
--- a/_includes/sections/android-addons.html
+++ b/_includes/sections/android-addons.html
@@ -4,7 +4,7 @@
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/png/3rd-party/netguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/3rd-party/netguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
     <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
@@ -14,7 +14,7 @@
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/svg/3rd-party/orbot.svg" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/orbot.svg" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
     </div>
     <div class="col">
     <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index f5659e4b..01297f8a 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -9,7 +9,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/protonmail.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/protonmail.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -47,7 +47,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/mailboxorg.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mailboxorg.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -84,7 +84,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/posteo.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/posteo.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -120,7 +120,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/soverin.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/soverin.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -156,8 +156,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/disroot.svg"
-        data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/disroot.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/disroot-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -193,8 +193,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/tutanota.svg"
-        data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/tutanota.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/tutanota-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -235,8 +235,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/startmail.svg"
-        data-theme-src="/assets/img/svg/3rd-party/startmail-dark.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/startmail.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/startmail-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
diff --git a/_includes/sections/fourteen-eyes.html b/_includes/sections/fourteen-eyes.html
index 5b4c6e67..c56398d7 100644
--- a/_includes/sections/fourteen-eyes.html
+++ b/_includes/sections/fourteen-eyes.html
@@ -1,6 +1,6 @@
 <h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> Global Mass Surveillance - The Fourteen Eyes</h1>
 
-<img src="/assets/img/svg/layout/ukusa.svg" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/ukusa.svg" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
 
 <p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes); however, Five Eyes and third-party countries can and do spy on each other.</p>
 
diff --git a/_includes/sections/header.html b/_includes/sections/header.html
index aa09eb1f..27fb562e 100644
--- a/_includes/sections/header.html
+++ b/_includes/sections/header.html
@@ -5,9 +5,9 @@
 <div class="jumbotron p-5">
   <h1 class="display-4">
     <a href="{{ site.production_url }}" title="{{ site.name }}">
-      <img class="img-fluid d-none d-sm-block" src="/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
+      <img class="img-fluid d-none d-sm-block" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
       <div class="text-center">
-        <img class="img-fluid d-sm-none" src="/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
+        <img class="img-fluid d-sm-none" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
       </div>
     </a>
   </h1>
diff --git a/_includes/sections/key-disclosure-law.html b/_includes/sections/key-disclosure-law.html
index 40b36dbb..9b67ce8b 100644
--- a/_includes/sections/key-disclosure-law.html
+++ b/_includes/sections/key-disclosure-law.html
@@ -67,7 +67,7 @@
 
 <h3 id="usa" class="anchor">Why is it not recommended to choose a US-based service?</h3>
 
-<img src="/assets/img/svg/layout/great_seal_of_the_united_states_obverse.svg" width="200" height="200" class="img-fluid float-right ml-3" alt="USA">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/great_seal_of_the_united_states_obverse.svg" width="200" height="200" class="img-fluid float-right ml-3" alt="USA">
 
 <p>Services based in the United States are not recommended because of the country's surveillance programs and use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) with accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
 
diff --git a/_includes/sections/quotes.html b/_includes/sections/quotes.html
index 49f8bcb5..a83aed6d 100644
--- a/_includes/sections/quotes.html
+++ b/_includes/sections/quotes.html
@@ -2,7 +2,7 @@
   <h1>Privacy? I don't have anything to hide.</h1>
 </div>
 <blockquote class="blockquote">
-  <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/png/layout/glenn_greenwald.png" width="170px" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
+  <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/layout/glenn_greenwald.png" width="170px" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
   Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a
   pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I
   want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." <strong>Not a single person has taken me up on that offer.</strong></p>
diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html
index 2d765027..2d1a5e5f 100644
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@@ -9,8 +9,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="/assets/img/svg/3rd-party/mullvad.svg"
-        data-theme-src="/assets/img/svg/3rd-party/mullvad-dark.svg"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mullvad.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mullvad-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -48,7 +48,7 @@
   </div>
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
     </div>
     <div class="col">
     <h2 id="protonvpn" class="anchor">
@@ -77,7 +77,7 @@
   </div>
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
     </div>
     <div class="col">
     <h2 id="ivpn" class="anchor">
diff --git a/_includes/sections/warrant-canary.html b/_includes/sections/warrant-canary.html
index d5cf761e..eb96b257 100644
--- a/_includes/sections/warrant-canary.html
+++ b/_includes/sections/warrant-canary.html
@@ -1,6 +1,6 @@
 <h1 id="wc" class="anchor"><a href="#wc"><i class="fas fa-link anchor-icon"></i></a> What is a warrant canary?</h1>
 
-<img src="/assets/img/svg/layout/warrant_canary_example.svg" width="450px" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/warrant_canary_example.svg" width="450px" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
 
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 
diff --git a/_includes/sections/windows10.html b/_includes/sections/windows10.html
index 5717ded8..5fd9482e 100644
--- a/_includes/sections/windows10.html
+++ b/_includes/sections/windows10.html
@@ -4,7 +4,7 @@
   <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>
 
-<img src="/assets/img/svg/layout/windows_privacy.svg" width="367" height="369" class="img-fluid float-right ml-3" alt="Windows 10 Privacy">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/windows_privacy.svg" width="367" height="369" class="img-fluid float-right ml-3" alt="Windows 10 Privacy">
 
 <ol>
   <li><strong>Data syncing is by default enabled.</strong>
diff --git a/_includes/sponsors/gold.html b/_includes/sponsors/gold.html
index 842e3c0a..34f10aa5 100644
--- a/_includes/sponsors/gold.html
+++ b/_includes/sponsors/gold.html
@@ -1,8 +1,8 @@
 <div class="d-flex flex-wrap justify-content-center">
   <a class="m-3" href="https://safing.io" target="_blank" rel="noreferrer">
     <img
-      src="/assets/img/svg/3rd-party/sponsors/safing.svg"
-      data-theme-src="/assets/img/svg/3rd-party/sponsors/safing-dark.svg"
+      src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/sponsors/safing.svg"
+      data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/sponsors/safing-dark.svg"
       width="210rem"
       title="Safing Privacy Network - Launching on Kickstarter January 2nd, 2020"
       alt="Safing Privacy Network - Safing.io Logo" />
diff --git a/_layouts/minimal.html b/_layouts/minimal.html
index 470aa55f..e8a5a90e 100644
--- a/_layouts/minimal.html
+++ b/_layouts/minimal.html
@@ -2,7 +2,7 @@
 <html lang="en">
 {% include head.html %}
 <body data-spy="scroll" data-target="#navbar">
-  <script src="/assets/js/applytheme.js?v=1"></script>
+  <script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/applytheme.js?v=1"></script>
   <header>
   {% include nav.html %}
   <div id="top" class="py-4"></div>
diff --git a/assets/img/png/favicons/browserconfig.xml b/assets/img/png/favicons/browserconfig.xml
index aff3f9ce..184f8abc 100644
--- a/assets/img/png/favicons/browserconfig.xml
+++ b/assets/img/png/favicons/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/assets/img/png/favicons/mstile-150x150.png"/>
+            <square150x150logo src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/mstile-150x150.png"/>
             <TileColor>#3498db</TileColor>
         </tile>
     </msapplication>
diff --git a/index.html b/index.html
index ad92da8a..7418e1bb 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-<script src="/assets/js/redirects.js"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/redirects.js"></script>
 {% include sections/header.html %}
 {% include sections/resources.html %}
 
diff --git a/nginx/010-headers.conf b/nginx/010-headers.conf
index 9713656a..d0a2f493 100644
--- a/nginx/010-headers.conf
+++ b/nginx/010-headers.conf
@@ -1,7 +1,7 @@
 add_header X-Frame-Options DENY always;
 add_header X-XSS-Protection "1; mode=block" always;
 add_header X-Content-Type-Options nosniff always;
-add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://stats.privacytools.io; style-src 'self'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; base-uri 'none'; form-action 'self' https://search.privacytools.io; frame-ancestors 'none'; manifest-src 'self';" always;
+add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://cdn.privacytools.io https://stats.privacytools.io; style-src 'self' https://cdn.privacytools.io; img-src 'self' https://cdn.privacytools.io data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self' https://cdn.privacytools.io; base-uri 'none'; form-action 'self' https://search.privacytools.io; frame-ancestors 'none'; manifest-src 'self' https://cdn.privacytools.io;" always;
 add_header 'Access-Control-Allow-Origin' '*';
 add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload";
 add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1';
diff --git a/pages/donate.html b/pages/donate.html
index 9ffe5f28..ece1252b 100644
--- a/pages/donate.html
+++ b/pages/donate.html
@@ -8,7 +8,7 @@ permalink: /donate/
     <div class="mx-auto text-center">
       <div class="mt-4 mb-4">
         <a href="{{ site.production_url }}">
-          <img class="img-fluid" src="/assets/img/svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
+          <img class="img-fluid" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
         </a>
       </div>
 
diff --git a/pages/providers/email.html b/pages/providers/email.html
index 3fb50be1..85918080 100644
--- a/pages/providers/email.html
+++ b/pages/providers/email.html
@@ -217,15 +217,15 @@ description: "Find a secure email provider that will keep your privacy in mind.
 <h1 id="cloaking" class="anchor"><a href="#cloaking"><i class="fas fa-link anchor-icon"></i></a> Email cloaking services</h1>
 <div class="container">
   <a href="https://anonaddy.com">
-    <img src="/assets/img/svg/3rd-party/anonaddy.svg"
-        data-theme-src="/assets/img/svg/3rd-party/anonaddy-dark.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/anonaddy.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/anonaddy-dark.svg"
          width="180rem" class="img-fluid float-left mr-3"
          alt="AnonAddy">
   </a>
   <br>
   <p><strong><a href="https://anonaddy.com">AnonAddy</a></strong> lets users create aliases that forward to their email address. Can be self-hosted. <a href="https://github.com/anonaddy/anonaddy">Source code on GitHub</a>.</p>
   <a href="https://simplelogin.io">
-    <img src="/assets/img/svg/3rd-party/simplelogin.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/simplelogin.svg"
          width="180rem" class="img-fluid float-left mr-3"
          alt="SimpleLogin">
   </a>
@@ -238,14 +238,14 @@ description: "Find a secure email provider that will keep your privacy in mind.
   <p>Advanced users may consider setting up their own email server. Mailservers require attention and continuous maintenance in order to keep things secure and mail delivery reliable.</p>
   <h3>Combined software solutions</h3>
   <a href="https://mailinabox.email/">
-    <img src="/assets/img/svg/3rd-party/mail-in-a-box.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mail-in-a-box.svg"
          width="80rem" class="img-fluid float-left mr-3"
          alt="Mail-in-a-Box">
   </a>
   <br>
   <p><strong><a href="https://mailinabox.email">Mail-in-a-Box</a></strong> is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.</p>
   <a href="https://mailcow.email/">
-    <img src="/assets/img/svg/3rd-party/mailcow.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mailcow.svg"
          width="80rem" class="img-fluid float-left mr-3"
          alt="Mailcow">
   </a>
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html
index affd07bd..460c2f36 100644
--- a/pages/providers/vpn.html
+++ b/pages/providers/vpn.html
@@ -272,7 +272,7 @@ breadcrumb: "VPN"
       <h3>Related Videos</h3>
         <a href="https://invidio.us/watch?v=WVDQEoe6ZWY" target="_blank">
           <img
-            src="/assets/img/png/layout/this-video-is-sponsored-by-vpn.png"
+            src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/layout/this-video-is-sponsored-by-vpn.png"
             class="img-fluid float-left mr-3"
             alt="This Video Is Sponsored By censored VPN">
         </a>