diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74aa1bb18..673b3ae9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 80
     steps:
+      - name: Setup git config
+        run: |
+          git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config --global user.name "$GITHUB_ACTOR"
       - name: Checkout main branch
         uses: actions/checkout@v3
       - name: Setup ruby
@@ -49,34 +53,36 @@ jobs:
           echo "Dependencies: "
           npm list --depth=0 || echo ""
       - name: Run node build
-        run: npm run build -- --buildLocation='server' --skipJekyll='true'
+        run: npm run build -- --buildLocation='server'
       - name: Create build.json
         run: |
           export TZ=UTC date
-          timestamp_utc=$(date +%FT%TZ)
-          export TZ=America/Los_Angeles date
-          timestamp_pst=$(date +%FT%TZ)
+          timestamp=$(date +%FT%TZ)
           temp_build_json=$(cat @output/build/build.json)
 
           echo account: $GITHUB_ACTOR
           echo repo: $GITHUB_REPOSITORY
-          echo timestamp_utc: $timestamp_utc
-          echo timestamp_pst: $timestamp_pst
+          echo timestamp: $timestamp
           echo build.json: $temp_build_json
 
           build_log_path="@output/build/build.json"
-          sed "s/%TIMESTAMP_UTC_GHP%/$timestamp_utc/g" $build_log_path > "$build_log_path"-temp && mv "$build_log_path"-temp $build_log_path
-          sed "s/%TIMESTAMP_PST_GHP%/$timestamp_pst/g" $build_log_path > "$build_log_path"-temp && mv "$build_log_path"-temp $build_log_path
+          sed "s/%GHP_TIMESTAMP%/$timestamp/g" $build_log_path > "$build_log_path"-temp && mv "$build_log_path"-temp $build_log_path
 
           sed -n '1h;1!H;${;g;s/GEN>>>.*<<<GEN/<REDACTED FOR LIVE PUBLISH>/g;p;}' .gitignore > .gitignore
-      - name: Build Jekyll
-        uses: helaili/jekyll-action@v2
-        env:
-          JEKYLL_PAT: ${{ secrets.GH_TOKEN }}
-      - name: Purge CloudFlare Cache
+      - name: Delete gh-pages branch
+        uses: dawidd6/action-delete-branch@v3
+        with:
+          github_token: ${{ secrets.GH_TOKEN }}
+          branches: gh-pages
+      - name: Deploy to gh-pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GH_TOKEN }}
+          publish_dir: ./_site
+      - name: Purge CloudFlare cache
         run: npm run cloudflare:purge
-      - name: Purge Artifacts
+      - name: Purge artifacts
         uses: kolpav/purge-artifacts-action@v1
         with:
           token: ${{ secrets.GH_TOKEN }}
-          expire-in: 0 # Set this to 0 to delete all artifacts          
+          expire-in: 0 # Set this to 0 to delete all artifacts
diff --git a/Gemfile b/Gemfile
index 3e97b9182..9e87cde03 100755
--- a/Gemfile
+++ b/Gemfile
@@ -12,12 +12,12 @@ gem "jekyll", "~> 4.2.0"
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  # MASTER PLUGINS
-  # gem "jekyll-feed", "~> 0.6"
+  # Master Plugins
   gem "jekyll-paginate-v2"
   gem "jekyll-liquify"
   gem "jekyll-truthyfalsy"
-  # PROJECT PLUGINS
+
+  # Project Plugins
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/_config.yml b/_config.yml
index 9aa988a48..2971dbec7 100755
--- a/_config.yml
+++ b/_config.yml
@@ -216,7 +216,7 @@ settings:
       exitPopup: {
         enabled: true,
         config: {
-          timeout: 3600000,
+          timeout: 1000 * 60 * 60 * 4,
           handler: null,
           title: 'Special Offer!',
           message: 'Get 15% off your purchase of our <strong>Premium plans</strong>. <br><br> Get access to all features and unlimited usage.',
diff --git a/_includes/master/global/foot.html b/_includes/master/global/foot.html
index a4893cd7a..34c7512a6 100644
--- a/_includes/master/global/foot.html
+++ b/_includes/master/global/foot.html
@@ -1,13 +1,13 @@
 {%- if page.layout contains 'post' and page.post.id != null and page.post.id != '' -%}
-  {% assign page_is_post = true %}
+  {% assign page-is-post = true %}
 {% else %}
-  {% assign page_is_post = false %}
+  {% assign page-is-post = false %}
 {% endif %}
 
 {%- if page.member.name != null and page.member.name != '' -%}
-  {% assign page_is_team_member = true %}
+  {% assign page-is-team-member = true %}
 {% else %}
-  {% assign page_is_team_member = false %}
+  {% assign page-is-team-member = false %}
 {% endif %}
 
 <!-- Initialize GA -->
@@ -108,13 +108,13 @@ <h5 class="modal-title">
 {% elsif site.settings.include-script-bundle == false %}
 {% else %}
   {%- if page.settings.include-script-bundle-optimization != null -%}
-    {% assign bundle_optimization = page.settings.include-script-bundle-optimization %}
+    {% assign bundle-optimization = page.settings.include-script-bundle-optimization %}
   {%- elsif site.settings.include-script-bundle-optimization == null -%}
-    {% assign bundle_optimization = 'async' %}
+    {% assign bundle-optimization = 'async' %}
   {%- else -%}
-    {% assign bundle_optimization = site.settings.include-script-bundle-optimization %}
+    {% assign bundle-optimization = site.settings.include-script-bundle-optimization %}
   {% endif %}
-  <script type="text/javascript" src="{{ site.url }}/assets/js/main.js?cb={{ site.time | date: '%s' }}" {{ bundle_optimization }}></script>
+  <script type="text/javascript" src="{{ site.url }}/assets/js/main.js?cb={{ site.time | date: '%s' }}" {{ bundle-optimization }}></script>
 {% endif %}
 
 <!-- TODO: FIX THIS -->
@@ -124,34 +124,34 @@ <h5 class="modal-title">
 {% elsif site.settings.include-script-core == false %}
 {% else %}
   {%- if page.settings.include-script-core-optimization != null -%}
-    {% assign core_optimization = page.settings.include-script-core-optimization %}
+    {% assign core-optimization = page.settings.include-script-core-optimization %}
   {%- elsif site.settings.include-script-core-optimization == null -%}
-    {% assign core_optimization = 'async' %}
+    {% assign core-optimization = 'async' %}
   {%- else -%}
-    {% assign core_optimization = site.settings.include-script-core-optimization %}
+    {% assign core-optimization = site.settings.include-script-core-optimization %}
   {% endif %}
-  <!-- <script type="text/javascript" src="{{ site.url }}/assets/js/base.js?cb={{ site.time | date: '%s' }}" {{ core_optimization }}></script> -->
+  <!-- <script type="text/javascript" src="{{ site.url }}/assets/js/base.js?cb={{ site.time | date: '%s' }}" {{ core-optimization }}></script> -->
 {% endif %}
 
 <!-- TODO: FIX THIS -->
 <!-- Script - Slapform -->
 {%- if page.settings.include-script-slapform == true -%}
-  {% assign slapform_include = true %}
+  {% assign slapform-include = true %}
 {% elsif layout.settings.include-script-slapform == true %}
-  {% assign slapform_include = true %}
+  {% assign slapform-include = true %}
 {% elsif site.settings.include-script-slapform == true %}
-  {% assign slapform_include = true %}
+  {% assign slapform-include = true %}
   {% else %}
   {%- if page.settings.include-script-slapform-optimization != null -%}
-    {% assign slapform_optimization = page.settings.include-script-slapform-optimization %}
+    {% assign slapform-optimization = page.settings.include-script-slapform-optimization %}
   {%- elsif site.settings.include-script-slapform-optimization == null -%}
-    {% assign slapform_optimization = 'async' %}
+    {% assign slapform-optimization = 'async' %}
   {%- else -%}
-    {% assign slapform_optimization = site.settings.include-script-slapform-optimization %}
+    {% assign slapform-optimization = site.settings.include-script-slapform-optimization %}
   {% endif %}
 {% endif %}
-{%- if slapform_include == true -%}
-  <!-- <script type="text/javascript" src={{ site.url }}/assets/js/slapform-processor.js?cb={{ site.time | date: '%s' }}" {{ slapform_optimization }}></script> -->
+{%- if slapform-include == true -%}
+  <!-- <script type="text/javascript" src={{ site.url }}/assets/js/slapform-processor.js?cb={{ site.time | date: '%s' }}" {{ slapform-optimization }}></script> -->
 {% endif %}
 
 <!-- Script - Bundle -->
@@ -232,26 +232,26 @@ <h5 class="modal-title">
 {% endif %}
 
 <!-- Script - Social Share Kit Script -->
-{% assign include_socialsharekitscript = false %}
-{%- if page_is_post == true -%}
+{% assign include-socialsharekitscript = false %}
+{%- if page-is-post == true -%}
   {%- if page.settings.include-socialsharekit == false -%}
-    {% assign include_socialsharekitscript = false %}
+    {% assign include-socialsharekitscript = false %}
   {%- elsif layout.settings.include-socialsharekit == false -%}
-    {% assign include_socialsharekitscript = false %}
+    {% assign include-socialsharekitscript = false %}
   {%- elsif site.settings.include-socialsharekit == false -%}
-    {% assign include_socialsharekitscript = false %}
+    {% assign include-socialsharekitscript = false %}
   {%- else -%}
-    {% assign include_socialsharekitscript = true %}
+    {% assign include-socialsharekitscript = true %}
   {%- endif -%}
 {%- else -%}
   {%- if page.settings.include-socialsharekit == true -%}
-    {% assign include_socialsharekitscript = true %}
+    {% assign include-socialsharekitscript = true %}
   {%- elsif layout.settings.include-socialsharekit == true -%}
-    {% assign include_socialsharekitscript = true %}
+    {% assign include-socialsharekitscript = true %}
   {%- endif -%}
 {%- endif -%}
 
-{% if include_socialsharekitscript == true %}
+{% if include-socialsharekitscript == true %}
   <script defer type="text/javascript">
     {% include /master/assets/scripts/social-share-kit.js %}
 
@@ -275,12 +275,12 @@ <h5 class="modal-title">
 {% else %}
   {% assign breadcrumbs = page.permalink | split: "/" %}
   {% assign breadcrumbs = page.url | split: "/" %}
-  {% assign breadcrumbs_size = breadcrumbs | size | minus: 1 %}
+  {% assign breadcrumbs-size = breadcrumbs | size | minus: 1 %}
   {% assign breadcrumb-url = site.url %}
 
   <script id="uj-breadcrumbs-json" type="application/ld+json">
     {
-      {%- if breadcrumbs_size > -1 -%}
+      {%- if breadcrumbs-size > -1 -%}
         "@context": "https://schema.org",
         "@type": "BreadcrumbList",
         "name": "{{ site.brand.name }}",
@@ -319,78 +319,78 @@ <h5 class="modal-title">
       "description": "{{ site.brand.description }}",
       "logo": "{%- if site.brand.logo-image contains '://' %}{%- else %}{{ site.url }}/assets/images/og{%- endif -%}{{ site.brand.logo-image }}",
       "sameAs": [
-        {%- assign facebook_truthy = site.socials.facebook | istruthy -%}
-        {%- if facebook_truthy -%}
+        {%- assign facebook-truthy = site.socials.facebook | istruthy -%}
+        {%- if facebook-truthy -%}
         "https://www.facebook.com/{{ site.socials.facebook }}/",
         {%- endif -%}
 
-        {%- assign twitter_truthy = site.socials.twitter | istruthy -%}
-        {%- if twitter_truthy -%}
+        {%- assign twitter-truthy = site.socials.twitter | istruthy -%}
+        {%- if twitter-truthy -%}
         "https://twitter.com/{{ site.socials.twitter }}",
         {%- endif -%}
 
-        {%- assign linkedin_truthy = site.socials.linkedin | istruthy -%}
-        {%- if linkedin_truthy -%}
+        {%- assign linkedin-truthy = site.socials.linkedin | istruthy -%}
+        {%- if linkedin-truthy -%}
         "https://www.linkedin.com/company/{{ site.socials.linkedin }}",
         {%- endif -%}
 
-        {%- assign youtube_truthy = site.socials.youtube | istruthy -%}
-        {%- if youtube_truthy -%}
+        {%- assign youtube-truthy = site.socials.youtube | istruthy -%}
+        {%- if youtube-truthy -%}
         "https://www.youtube.com/c/{{ site.socials.youtube }}",
         {%- endif -%}
 
-        {%- assign instagram_truthy = site.socials.instagram | istruthy -%}
-        {%- if instagram_truthy -%}
+        {%- assign instagram-truthy = site.socials.instagram | istruthy -%}
+        {%- if instagram-truthy -%}
         "https://www.instagram.com/{{ site.socials.instagram }}/",
         {%- endif -%}
 
-        {%- assign tumblr_truthy = site.socials.tumblr | istruthy -%}
-        {%- if tumblr_truthy -%}
+        {%- assign tumblr-truthy = site.socials.tumblr | istruthy -%}
+        {%- if tumblr-truthy -%}
         "https://{{ site.socials.tumblr }}.tumblr.com/",
         {%- endif -%}
 
-        {%- assign slack_truthy = site.socials.slack | istruthy -%}
-        {%- if slack_truthy -%}
+        {%- assign slack-truthy = site.socials.slack | istruthy -%}
+        {%- if slack-truthy -%}
         "https://{{ site.socials.slack }}.slack.com/",
         {%- endif -%}
 
-        {%- assign discord_truthy = site.socials.discord | istruthy -%}
-        {%- if discord_truthy -%}
+        {%- assign discord-truthy = site.socials.discord | istruthy -%}
+        {%- if discord-truthy -%}
         "https://discord.gg/{{ site.socials.discord }}",
         {%- endif -%}
 
-        {%- assign github_truthy = site.socials.github | istruthy -%}
-        {%- if github_truthy -%}
+        {%- assign github-truthy = site.socials.github | istruthy -%}
+        {%- if github-truthy -%}
         "https://github.com/{{ site.socials.github }}",
         {%- endif -%}
 
-        {%- assign dev_truthy = site.socials.dev | istruthy -%}
-        {%- if dev_truthy -%}
+        {%- assign dev-truthy = site.socials.dev | istruthy -%}
+        {%- if dev-truthy -%}
         "https://dev.to/{{ site.socials.dev }}",
         {%- endif -%}
 
-        {%- assign tiktok_truthy = site.socials.tiktok | istruthy -%}
-        {%- if tiktok_truthy -%}
+        {%- assign tiktok-truthy = site.socials.tiktok | istruthy -%}
+        {%- if tiktok-truthy -%}
         "https://www.tiktok.com/@{{ site.socials.tiktok }}",
         {%- endif -%}
 
-        {%- assign twitch_truthy = site.socials.twitch | istruthy -%}
-        {%- if twitch_truthy -%}
+        {%- assign twitch-truthy = site.socials.twitch | istruthy -%}
+        {%- if twitch-truthy -%}
         "https://www.twitch.tv/{{ site.socials.twitch }}",
         {%- endif -%}
 
-        {%- assign soundcloud_truthy = site.socials.soundcloud | istruthy -%}
-        {%- if soundcloud_truthy -%}
+        {%- assign soundcloud-truthy = site.socials.soundcloud | istruthy -%}
+        {%- if soundcloud-truthy -%}
         "https://soundcloud.com/{{ site.socials.soundcloud }}",
         {%- endif -%}
 
-        {%- assign spotify_truthy = site.socials.spotify | istruthy -%}
-        {%- if spotify_truthy -%}
+        {%- assign spotify-truthy = site.socials.spotify | istruthy -%}
+        {%- if spotify-truthy -%}
         "https://open.spotify.com/artist/{{ site.socials.spotify }}",
         {%- endif -%}
 
-        {%- assign mixcloud_truthy = site.socials.mixcloud | istruthy -%}
-        {%- if mixcloud_truthy -%}
+        {%- assign mixcloud-truthy = site.socials.mixcloud | istruthy -%}
+        {%- if mixcloud-truthy -%}
         "https://www.mixcloud.com/{{ site.socials.mixcloud }}/",
         {%- endif -%}
 
@@ -427,7 +427,7 @@ <h5 class="modal-title">
 {% endif %}
 
 <!-- Schema - BlogPosting -->
-{%- if page_is_post == true -%}
+{%- if page-is-post == true -%}
   <script id="uj-blogposting-json" type="application/ld+json">
     {
       "@context": "http://schema.org",
@@ -457,7 +457,7 @@ <h5 class="modal-title">
 {% endif %}
 
 <!-- Schema - Person -->
-{%- if page_is_team_member == true -%}
+{%- if page-is-team-member == true -%}
   <script id="uj-person-json" type="application/ld+json">
     {
       "@context": "http://schema.org",
diff --git a/_includes/master/global/head.html b/_includes/master/global/head.html
index f9dcc6a0e..583e1c97a 100644
--- a/_includes/master/global/head.html
+++ b/_includes/master/global/head.html
@@ -1,9 +1,12 @@
 {% assign page-url-stripped = page.url | replace: 'index.html', '' %}
+{%- if page-url-stripped == '/' -%}
+  {% assign page-url-stripped = '' %}
+{% endif %}
 
 {%- if page.layout contains 'post' and page.post.id != null and page.post.id != '' -%}
-  {% assign page_is_post = true %}
+  {% assign page-is-post = true %}
 {% else %}
-  {% assign page_is_post = false %}
+  {% assign page-is-post = false %}
 {% endif %}
 
 
@@ -47,7 +50,7 @@
 <link rel="manifest" href="{{ site.url }}/manifest.json">
 
 <!-- Title -->
-{%- if page_is_post and page.post.title != null and page.post.title != '' -%}
+{%- if page-is-post and page.post.title != null and page.post.title != '' -%}
   {% assign page-title = page.post.title | liquify %}
 {%- elsif page.meta.title != null and page.meta.title != '' -%}
   {% assign page-title = page.meta.title | liquify %}
@@ -61,7 +64,7 @@
 <meta property="og:title" content="{{ page-title }}">
 
 <!-- Description -->
-{%- if page_is_post and page.post.excerpt != null and page.post.excerpt != '' -%}
+{%- if page-is-post and page.post.excerpt != null and page.post.excerpt != '' -%}
   {% assign page-description = page.post.excerpt | liquify %}
 {%- elsif page.meta.description != null and page.meta.description != '' -%}
   {% assign page-description = page.meta.description | liquify %}
@@ -75,7 +78,7 @@
 <meta property="og:description" content="{{ page-description }}">
 
 <!-- Image -->
-{%- if page_is_post and page.post.id != null and page.post.id != '' -%}
+{%- if page-is-post and page.post.id != null and page.post.id != '' -%}
   {% capture page-image %}{{ site.url }}/assets/images/blog/posts/post-{{ page.post.id }}/{{ page-url-stripped | split: '/' | last }}.jpg{% endcapture %}
 {%- elsif page.meta.og-image != null and page.meta.og-image != '' -%}
   {% capture page-image %}{%- if page.meta.og-image contains '://' -%}{%- else -%}{{ site.url }}/assets/images/og{%- endif -%}{{ page.meta.og-image }}{% endcapture %}
@@ -92,7 +95,7 @@
 
 <!-- OG: Facebook / Open Graph -->
 <meta property="og:url" content="{{ site.url }}{{ page-url-stripped }}">
-{%- if page_is_post -%}
+{%- if page-is-post -%}
   {% assign og-type = 'article' %}
 {%- else -%}
   {% assign og-type = 'website' %}
@@ -103,9 +106,9 @@
 <link href="{{ site.url }}/feeds/posts.xml" type="application/atom+xml" rel="alternate" title="{{ site.brand.name }} Feed">
 
 <!-- Language Tags -->
-<link rel="alternate" href="{{ site.url }}{{ page.url }}" hreflang="x-default">
-<link rel="alternate" href="{{ site.url }}{{ page.url }}" hreflang="en">
-<!-- <link rel="alternate" href="{{ site.url }}/es" hreflang="es"> -->
+<link rel="alternate" href="{{ site.url }}{{ page-url-stripped }}" hreflang="x-default">
+<link rel="alternate" href="{{ site.url }}{{ page-url-stripped }}" hreflang="en">
+<!-- <link rel="alternate" href="{{ site.url }}/es/{{ page-url-stripped }}" hreflang="es"> -->
 
 <!-- Performance Metrics -->
 {%- if page.settings.include-debug-performance == false -%}
@@ -124,7 +127,7 @@
   var Configuration = {
     page: {
       code: '{{ page.settings.page-code | default: page.meta.breadcrumb | default: page.post.breadcrumb | default: "" | liquify }}',
-      type: '{%- if page_is_post -%}post{%- elsif page.settings.page-type -%}{{ page.settings.page-type }}{%- else -%}general{%- endif -%}',
+      type: '{%- if page-is-post -%}post{%- elsif page.settings.page-type -%}{{ page.settings.page-type }}{%- else -%}general{%- endif -%}',
       breadcrumb: '{{ page.meta.breadcrumb | default: page.post.breadcrumb | liquify }}',
       settings: {{ page.settings.manager-configuration | default: layout.settings.manager-configuration | default: empty-braces }}
     },
@@ -168,17 +171,17 @@
 
 <!-- Favicon -->
 {%- if site.favicon.path != null and site.favicon.path != '' -%}
-  {% assign favicon_path = site.favicon.path %}
+  {% assign favicon-path = site.favicon.path %}
 {%- else -%}
-  {% assign favicon_path = site.url | append: '/assets/images/favicon' %}
+  {% assign favicon-path = site.url | append: '/assets/images/favicon' %}
 {%- endif -%}
-<link rel="apple-touch-icon" sizes="180x180" href="{{ favicon_path }}/apple-touch-icon.png?cb={{ site.time | date: '%s' }}">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ favicon_path }}/favicon-32x32.png?cb={{ site.time | date: '%s' }}">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ favicon_path }}/favicon-16x16.png?cb={{ site.time | date: '%s' }}">
-<link rel="mask-icon" href="{{ favicon_path }}/safari-pinned-tab.svg" color="{{ site.favicon.safari-pinned-tab }}">
-<link rel="shortcut icon" href="{{ favicon_path }}/favicon.ico?cb={{ site.time | date: '%s' }}">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ favicon-path }}/apple-touch-icon.png?cb={{ site.time | date: '%s' }}">
+<link rel="icon" type="image/png" sizes="32x32" href="{{ favicon-path }}/favicon-32x32.png?cb={{ site.time | date: '%s' }}">
+<link rel="icon" type="image/png" sizes="16x16" href="{{ favicon-path }}/favicon-16x16.png?cb={{ site.time | date: '%s' }}">
+<link rel="mask-icon" href="{{ favicon-path }}/safari-pinned-tab.svg" color="{{ site.favicon.safari-pinned-tab }}">
+<link rel="shortcut icon" href="{{ favicon-path }}/favicon.ico?cb={{ site.time | date: '%s' }}">
 <meta name="msapplication-TileColor" content="{{ site.favicon.msapp-tile-color }}">
-<meta name="msapplication-config" content="{{ favicon_path }}/browserconfig.xml?cb={{ site.time | date: '%s' }}">
+<meta name="msapplication-config" content="{{ favicon-path }}/browserconfig.xml?cb={{ site.time | date: '%s' }}">
 <meta name="theme-color" content="{{ site.favicon.theme-color }}">
 
 <!-- CSS - Defaults-->
@@ -208,26 +211,26 @@
 </style>
 
 <!-- CSS - Social Share Kit Style -->
-{% assign include_socialsharekitscript = false %}
-{%- if page_is_post -%}
+{% assign include-socialsharekitscript = false %}
+{%- if page-is-post -%}
   {%- if page.settings.include-socialsharekit == false -%}
-    {% assign include_socialsharekitscript = false %}
+    {% assign include-socialsharekitscript = false %}
   {%- elsif layout.settings.include-socialsharekit == false -%}
-    {% assign include_socialsharekitscript = false %}
+    {% assign include-socialsharekitscript = false %}
   {%- elsif site.settings.include-socialsharekit == false -%}
-    {% assign include_socialsharekitscript = false %}
+    {% assign include-socialsharekitscript = false %}
   {%- else -%}
-    {% assign include_socialsharekitscript = true %}
+    {% assign include-socialsharekitscript = true %}
   {%- endif -%}
 {%- else -%}
   {%- if page.settings.include-socialsharekit == true -%}
-    {% assign include_socialsharekitscript = true %}
+    {% assign include-socialsharekitscript = true %}
   {%- elsif layout.settings.include-socialsharekit == true -%}
-    {% assign include_socialsharekitscript = true %}
+    {% assign include-socialsharekitscript = true %}
   {%- endif -%}
 {%- endif -%}
 
-{% if include_socialsharekitscript == true %}
+{% if include-socialsharekitscript == true %}
   <style type="text/css" media="screen">
     {% include /master/assets/css/social-share-kit.css %}
   </style>
diff --git a/_includes/master/modules/engagement/social-share-kit.html b/_includes/master/modules/engagement/social-share-kit.html
index 05ceb0aef..73c76e7fa 100644
--- a/_includes/master/modules/engagement/social-share-kit.html
+++ b/_includes/master/modules/engagement/social-share-kit.html
@@ -1,13 +1,13 @@
 <!-- Module - Social Share Kit -->
 {%- if page.layout contains 'post' and page.settings.include-socialsharekit == false -%}
-  {% assign include_socialsharekitscript = false %}
+  {% assign include-socialsharekitscript = false %}
 {%- elsif page.layout contains 'post' or page.settings.include-socialsharekit != false -%}
-  {% assign include_socialsharekitscript = true %}
+  {% assign include-socialsharekitscript = true %}
 {%- else -%}
-  {% assign include_socialsharekitscript = false %}
+  {% assign include-socialsharekitscript = false %}
 {%- endif -%}
 
-{%- if include_socialsharekitscript == true -%}
+{%- if include-socialsharekitscript == true -%}
 
   {%- if include.size != null -%}
     {% assign ssk_size = include.size %}
diff --git a/_layouts/master/authentication/main.html b/_layouts/master/authentication/main.html
index 082affbf5..6e86922cd 100644
--- a/_layouts/master/authentication/main.html
+++ b/_layouts/master/authentication/main.html
@@ -128,15 +128,13 @@
 {% endcapture %}
 
 <main id="content" role="main" class="main">
-  <div class="position-fixed top-0 end-0 start-0 bg-img-start" style="height: 32rem; background-image: url(./assets/svg/components/card-6.svg);">
-    <!-- Shape -->
+  <!-- <div class="position-fixed top-0 end-0 start-0 bg-img-start" style="height: 32rem; background-image: url(./assets/svg/components/card-6.svg);">
     <div class="shape shape-bottom zi-1">
       <svg preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 1921 273">
         <polygon fill="#fff" points="0,273 1921,273 1921,0 " />
       </svg>
     </div>
-    <!-- End Shape -->
-  </div>
+  </div> -->
 
   <!-- Content -->
   <div class="container py-5 py-sm-7">
diff --git a/_layouts/master/global/default.html b/_layouts/master/global/default.html
index 6ae11d5da..72d94c14c 100644
--- a/_layouts/master/global/default.html
+++ b/_layouts/master/global/default.html
@@ -4,11 +4,13 @@
 <!DOCTYPE html>
 <html lang="en" {{ layout.html.attributes }} {{ page.html.attributes }}>
   <head>
+    <!-- Head -->
     {%- include /master/global/head.html -%}
   </head>
 
-  <body class="{{ layout.body.class }} {{ page.body.class }}">
+  <body class="{{ layout.body.class }} {{ page.body.class }}" {{ layout.body.attributes }} {{ page.body.attributes }}>
 
+    <!-- Header -->
     {%- if page.settings.include-app-header == false -%}
     {% elsif layout.settings.include-app-header == false %}
     {% elsif site.settings.include-app-header == false %}
@@ -16,10 +18,10 @@
       {%- include /app/elements/header.html -%}
     {% endif %}
 
-    <!-- CONTENT START -->
+    <!-- Content -->
     {{ content }}
-    <!-- CONTENT END -->
 
+    <!-- Footer -->
     {%- if page.settings.include-app-footer == false -%}
     {% elsif layout.settings.include-app-footer == false %}
     {% elsif site.settings.include-app-footer == false %}
@@ -27,6 +29,7 @@
       {%- include /app/elements/footer.html -%}
     {% endif %}
 
+    <!-- Foot -->
     {%- include /master/global/foot.html -%}
   </body>
 </html>
diff --git a/_layouts/master/placeholder/about.md b/_layouts/master/placeholder/about.md
index 290170e7e..118a2a319 100644
--- a/_layouts/master/placeholder/about.md
+++ b/_layouts/master/placeholder/about.md
@@ -16,7 +16,7 @@ Welcome to the world of {{ site.brand.name }} – a place where innovation, effi
 
 ## Our Story
 
-Founded in [insert year], {{ site.brand.name }} began with a simple idea: to create a digital solution that would streamline everyday tasks and empower users to achieve more. Since then, our journey has been one of constant growth and innovation.
+{{ site.brand.name }} began with a simple idea: to create a digital solution that would streamline everyday tasks and empower users to achieve more. Since then, our journey has been one of constant growth and innovation.
 
 From our humble beginnings as a small startup, we have grown into a global leader in our industry, trusted by millions of users worldwide. Despite our growth, we've always remained true to our core mission: to empower every individual and organization to achieve more.
 
diff --git a/_layouts/master/placeholder/legal/cookies.md b/_layouts/master/placeholder/legal/cookies.md
index aeed69d68..9c5567b48 100644
--- a/_layouts/master/placeholder/legal/cookies.md
+++ b/_layouts/master/placeholder/legal/cookies.md
@@ -9,6 +9,15 @@ meta:
   title: "Cookie Policy - {{ site.brand.name }}"
   description: "This cookie policy has been compiled to better serve those who are concerned with how their personal information is being used online."
   breadcrumb: "Cookie Policy"
+
+settings:
+  manager-configuration: "
+    {
+      exitPopup: {
+        enabled: false,
+      },
+    }
+  "
 ---
 Effective date: May 1, 2018
 
diff --git a/_layouts/master/placeholder/legal/privacy.md b/_layouts/master/placeholder/legal/privacy.md
index 874812354..c72d3f386 100644
--- a/_layouts/master/placeholder/legal/privacy.md
+++ b/_layouts/master/placeholder/legal/privacy.md
@@ -9,6 +9,15 @@ meta:
   title: "Privacy Policy - {{ site.brand.name }}"
   description: "This privacy policy has been compiled to better serve those who are concerned with how their personal information is being used online."
   breadcrumb: "Privacy Policy"
+
+settings:
+  manager-configuration: "
+    {
+      exitPopup: {
+        enabled: false,
+      },
+    }
+  "
 ---
 Effective date: May 1, 2018
 
diff --git a/_layouts/master/placeholder/legal/terms.md b/_layouts/master/placeholder/legal/terms.md
index 9ebd2fd69..6005cf580 100644
--- a/_layouts/master/placeholder/legal/terms.md
+++ b/_layouts/master/placeholder/legal/terms.md
@@ -9,6 +9,15 @@ meta:
   title: "Terms Of Service - {{ site.brand.name }}"
   description: "By accessing and using our products and services, you agree to comply with the Terms of Use listed here."
   breadcrumb: "Terms of Service"
+
+settings:
+  manager-configuration: "
+    {
+      exitPopup: {
+        enabled: false,
+      },
+    }
+  "
 ---
 {% capture brand %}{{ site.brand.name | liquify }}{% endcapture %}
 {% capture breadcrumb %}{{ page.meta.breadcrumb | default: layout.meta.breadcrumb | liquify }}{% endcapture %}
@@ -34,6 +43,11 @@ We reserve the right to collect overdue payments from you. You agree to pay all
 
 Please check the {{ breadcrumb }} whenever you use a {{ brand }} Product. If you are not a Subscriber, we will treat your continued use of a {{ brand }} Product as acceptance of these changes from their effective date (as shown above). If you are a Subscriber, we will treat the first renewal date of your subscription after the changes as your acceptance of the changes. If you do not agree with the changes you should cancel your subscription before the renewal date.
 
+## Registration and Access
+You must be at least 13 years old or the minimum age required in your country to consent to use our services. If you are under 18 you must have your parent or legal guardian’s permission to use our services.
+
+You must provide accurate and complete information to register for an account to use our services. You may not share your account credentials or make your account available to anyone else and are responsible for all activities that occur under your account. If you create an account or use our servides on behalf of another person or entity, you must have the authority to accept these terms on their behalf.
+
 ## Responsible Use and Conduct
 By visiting our website and accessing the information, resources, services, products, and tools that {{ brand }} provides, you agree to use these resources for the purposes intended as permitted by the Terms of Service and by applicable laws, regulations and generally accepted online practices or guidelines.
 
diff --git a/_websrc/gulp_tasks/master/_prefill.js b/_websrc/gulp_tasks/master/_prefill.js
index bf60f5baf..e9d743269 100644
--- a/_websrc/gulp_tasks/master/_prefill.js
+++ b/_websrc/gulp_tasks/master/_prefill.js
@@ -21,22 +21,8 @@ gulp.task('_prefill', () => {
 
       // all versions need these files to run properly
       {
-        await createFile(config.assets + config.assetsSubpath + '/sass/app/app.scss',
-          "/*" + "\n" +
-            "  assets/_src/sass/app/app.scss" + "\n" +
-          "*/" + "\n" +
-          "" + "\n" +
-          "/*" + "\n" +
-            "  CHARSET" + "\n" +
-          "*/" + "\n" +
-          "" + "\n" +
-          '@charset "UTF-8";' + "\n" +
-          "" + "\n" +
-          "/*" + "\n" +
-          "  IMPORTS" + "\n" +
-          "*/" + "\n" +
-          ""
-        )
+        await createFile(`${config.assets}${config.assetsSubpath}/sass/app/app.scss`, await readFile('./_websrc/templates/master/css/app-entry.scss'))
+
         await createFile('./_includes/app/global/head.html', '<!-- App Head Content -->');
         await createFile('./_includes/app/global/head-pre-bundle.html', '<!-- App Head Content (pre-bundle) -->');
 
@@ -51,16 +37,7 @@ gulp.task('_prefill', () => {
         await createFile('./_includes/app/misc/manifest.json', '');
         await createFile('./_includes/app/misc/robots.txt', '');
 
-        await createFile(config.assets + config.assetsSubpath + '/js/app/app.js',
-          "Manager.ready(function() {" + "\n" +
-            "  Manager.log('app.js fired Manager.ready()');" + "\n" +
-            "" + "\n" +
-            "  // Add additional logic here!" + "\n" +
-            "  // var theme = require('../theme/theme.js');" + "\n" +
-            "" + "\n" +
-          "});" + "\n" +
-          ""
-        )
+        await createFile(`${config.assets}${config.assetsSubpath}/js/app/app.js`, await readFile('./_websrc/templates/master/js/app-entry.js'))
 
         const pages = [
           '404',
@@ -83,32 +60,14 @@ gulp.task('_prefill', () => {
           await createPageIfNoExist(page);
         });
 
-        await createFile(config.assets + config.assetsSubpath + '/js/app/service-worker.js',
-          "// app service-worker.js code" + "\n" +
-          "if (typeof log === 'undefined') {" + "\n" +
-            "  var log = function() {};" + "\n" +
-          "}" + "\n" +
-          "log('app service-worker.js loaded: ', self.location.pathname);" + "\n" +
-          "" + "\n" +
-          "// Note: any importScripts(); are relative to the master-service-worker.js location" + "\n" +
-          "// importScripts('../../app/service-worker.js');" + "\n" +
-          ''
-        )
-        await createFile('_websrc/gulp_tasks/app/main.js',
-          "const gulp     = require('gulp');" + "\n" +
-          "const newer    = require('gulp-newer');" + "\n" +
-          "const through  = require('through2');" + "\n" +
-          "const argv     = require('yargs').argv;" + "\n" +
-          "const fetch    = require('node-fetch');" + "\n" +
-          "const tools    = new (require('../../libraries/tools.js'));" + "\n" +
-          "" + "\n" +
-          "gulp.task('sample', function() {" + "\n" +
-            "  // write your first task here!" + "\n" +
-            "  // then set up 'watch' tasks in the app.config.js" + "\n" +
-          "});" + "\n" +
-          ""
-        )
+        // Create app service-worker.js
+        await createFile(`${config.assets}${config.assetsSubpath}/js/app/service-worker.js`, await readFile('./_websrc/templates/master/js/app-service-worker.js'));
+
+        // Create app gulp task
+        await createFile('_websrc/gulp_tasks/app/main.js', await readFile('./_websrc/templates/master/js/app-gulp-task.js'))
 
+        // Create build-post.js
+        await createFile('_websrc/gulp_tasks/app/build-post.js', await readFile('./_websrc/templates/master/js/build-post.js'))
 
         // post
         // const posts = await listFiles('./_posts') || [];
@@ -135,20 +94,6 @@ gulp.task('_prefill', () => {
           }
         }
 
-        // await createFile(`blog/index.html`,
-        //   '---' + '\n' +
-        //   '### ALL PAGES ###' + '\n' +
-        //   'layout: master/blog/index' + '\n' +
-        //   '---' + '\n'
-        // );
-        //
-        // await createFile(`./team/index.html`,
-        //   '---' + '\n' +
-        //   '### ALL PAGES ###' + '\n' +
-        //   'layout: master/team/index' + '\n' +
-        //   '---' + '\n'
-        // );
-
         // Create base team member
         await createFile(`./_team/alex.md`, await readFile('./_websrc/templates/master/placeholder/team/alex.md'));
         await copyFile('./_websrc/templates/master/placeholder/team/alex.jpg', `./assets/_src/images/team/alex/profile.jpg`);
@@ -206,7 +151,6 @@ gulp.task('_prefill', () => {
         await createFile('./_websrc/gulp_tasks/app/.gitignore', gitignore_ph);
         await createFile('./pages/.gitignore', `* \n!@reference`);
 
-
         // POST
         await createFile('./_posts/.gitignore', gitignore_ph);
         await createFile('./_team/.gitignore', gitignore_ph);
@@ -215,7 +159,7 @@ gulp.task('_prefill', () => {
       // Only for non-server environment
       if (!tools.isServer) {
         await createFile('./@output/build/.gitignore', gitignore_ph);
-        await createFile('./special/master/misc/.gitignore', '/master-service-worker.js'+'\n'+'.gitignore'+'\n');
+        await createFile('./special/master/misc/.gitignore', '/master-service-worker.js\n.gitignore\n');
       } else {
         await jetpack.removeAsync('./special/master/pages/@reference')
         await createFile('./CNAME', new URL(_configYml.url).host);
diff --git a/_websrc/gulp_tasks/master/browsersync.js b/_websrc/gulp_tasks/master/browsersync.js
index 980a82911..f5994e76c 100644
--- a/_websrc/gulp_tasks/master/browsersync.js
+++ b/_websrc/gulp_tasks/master/browsersync.js
@@ -34,10 +34,14 @@ gulp.task('browsersync', async () => {
     server: {
       baseDir: config.jekyll.dest,
       middleware: async function (req, res, next) {
-        // console.log(`[Browsersync] Request ${req.url}`);
         const url = new URL(`http://localhost:4000${req.url}`);
         const pathname = url.pathname;
 
+        // If the file has no ext, log it
+        if (!path.extname(pathname)) {
+          console.log(`[Browsersync] Serving ${pathname}`);
+        }
+
         if (pathname.match(/_post.json/)) {
           const createPost = require('./create-post.js');
           const post = new createPost();
@@ -47,16 +51,20 @@ gulp.task('browsersync', async () => {
             res: res,
           })
         }
-
         // Check if the URL is missing a trailing slash and does not have an extension
         if (!pathname.endsWith('/') && !path.extname(pathname)) {
           const newURL = `${pathname}.html`;
-          console.log(`[Browsersync] Rewriting ${pathname} to ${newURL}`);
+          // console.log(`[Browsersync] Rewriting ${pathname} to ${newURL}`);
 
           // Rewrite it to serve the .html extension
           req.url = newURL;
         }
 
+        // Special case: Rewrite /blog/ to blog.html since Jekyll fucks it up locally
+        if (pathname === '/blog/') {
+          req.url = '/blog.html';
+        }
+
         next();
       }
     },
@@ -71,11 +79,11 @@ gulp.task('browsersync', async () => {
       setTimeout(function () {
         process.exit(1)
       }, 1);
-      return reject(new Error("To run the site on HTTPS you first need to execute: npm run create:cert"));
+      return reject(new Error('To run the site on HTTPS you first need to execute: npm run create:cert'));
     }
     settings.https = {
-      key: "./@output/.temp/certificate/localhost.key.pem",
-      cert: "./@output/.temp/certificate/localhost.cert.pem",
+      key: './@output/.temp/certificate/localhost.key.pem',
+      cert: './@output/.temp/certificate/localhost.cert.pem',
     }
   }
 
diff --git a/_websrc/gulp_tasks/master/build.js b/_websrc/gulp_tasks/master/build.js
index b1d913727..c563338f0 100644
--- a/_websrc/gulp_tasks/master/build.js
+++ b/_websrc/gulp_tasks/master/build.js
@@ -1,12 +1,12 @@
 const argv         = require('yargs').argv;
 const config       = require('../../master.config.js');
 const appGulpTasks = require('../../app.config.js');
-const fs           = require('fs-jetpack');
+const jetpack      = require('fs-jetpack');
 const cp           = require('child_process');
 const gulp         = require('gulp');
 const tools        = new (require('../../libraries/tools.js'));
 const JSON5        = require('json5');
-const _configYml   = require('js-yaml').load(fs.read('_config.yml'));
+const _configYml   = require('js-yaml').load(jetpack.read('_config.yml'));
 const Global       = require('../../libraries/global.js');
 
 config.tasks = Object.assign(config.tasks, appGulpTasks.tasks);
@@ -45,10 +45,11 @@ gulp.task('jekyll-build', async () => {
   await tools.poll(() => Global.get('prefillStatus') === 'done', { timeout: 120000 });
 
   // Other build tasks
+  // This part takes a while...
   await tools.poll(() => areTasksCompleted(), { timeout: 1000 * 60 * 3 });
 
   await tools.poll(() => {
-    return fs.exists('./assets/js/main.js') && fs.exists('./assets/css/main.css');
+    return jetpack.exists('./assets/js/main.js') && jetpack.exists('./assets/css/main.css');
   }, {timeout: 1000 * 60 * 3});
 
   // console.log('jekyll-build: precheck complete', new Date());
@@ -74,9 +75,8 @@ gulp.task('jekyll-build', async () => {
 
   // Create build log JSON
   try {
-    let buildJSON = JSON.parse(fs.read('@output/build/build.json'));
-    buildJSON['npm-build'].timestamp_utc = now({offset: 0});
-    buildJSON['npm-build'].timestamp_pst = now({offset: -7});
+    let buildJSON = JSON.parse(jetpack.read('@output/build/build.json'));
+    buildJSON['npm-build'].timestamp = new Date().toISOString();
 
     let info = await getGitInfo();
 
@@ -93,7 +93,7 @@ gulp.task('jekyll-build', async () => {
     // Set custom admin dashboard pages
     buildJSON['admin-dashboard'] = JSON5.parse(_configYml['admin-dashboard']);
 
-    fs.write('@output/build/build.json', JSON.stringify(buildJSON, null, 2));
+    jetpack.write('@output/build/build.json', JSON.stringify(buildJSON, null, 2));
   } catch (e) {
     console.error('Error updating build.json', e);
   }
@@ -105,6 +105,13 @@ gulp.task('jekyll-build', async () => {
 
   // Run Jekyll Build
   await tools.execute(`${jekyll} build --config ${jekyllConfig} --incremental`);
+
+  // Jekyll post-build
+  await postBuild();
+
+  // Run app post-build.js
+  await require('../app/build-post.js')();
+
   return Promise.resolve();
 });
 
@@ -125,40 +132,6 @@ gulp.task('test', build);
 /**
  * Helper functions
  */
-function now(options) {
-    options = options || {};
-    options.offset = options.offset || 0;
-
-    var date = new Date();
-    date.setHours(date.getHours() + options.offset);
-    var aaaa = date.getFullYear();
-    var gg = date.getDate();
-    var mm = (date.getMonth() + 1);
-
-    if (gg < 10)
-        gg = "0" + gg;
-
-    if (mm < 10)
-        mm = "0" + mm;
-
-    var cur_day = aaaa + "-" + mm + "-" + gg;
-
-    var hours = date.getHours()
-    var minutes = date.getMinutes()
-    var seconds = date.getSeconds();
-
-    if (hours < 10)
-        hours = "0" + hours;
-
-    if (minutes < 10)
-        minutes = "0" + minutes;
-
-    if (seconds < 10)
-        seconds = "0" + seconds;
-
-    return cur_day + "T" + hours + ":" + minutes + ":" + seconds + "Z";
-}
-
 async function getGitInfo() {
   return new Promise(function(resolve, reject) {
     var exec = require('child_process').exec;
@@ -179,3 +152,37 @@ async function getGitInfo() {
     });
   });
 }
+
+function postBuild() {
+  return new Promise(function(resolve, reject) {
+    // Move _site/blog/index.html to blog.html
+    if (!jetpack.exists('_site/blog.html') && jetpack.exists('_site/blog/index.html')) {
+      jetpack.move('_site/blog/index.html', '_site/blog.html');
+    }
+
+    // Fix things in blog.html file that get messed up during the move
+    jetpack.write('_site/blog.html',
+      jetpack.read('_site/blog.html')
+        // Blog
+        .replace(/(\/blog\/|\/blog\/index.html)"/g, '/blog"')
+        // BreadcrumbList
+        .replace(/"name": "index.html"/g, '"name": "home"')
+    );
+
+    // Create temporary local blog since local Jekyll hates it for some reason
+    if (!tools.isServer) {
+      jetpack.copy('_site/blog.html', '_site/blog-local.html');
+    }
+
+    // Fix sitemap.xml
+    const sitemap = jetpack.read('_site/sitemap.xml');
+    if (sitemap) {
+      jetpack.write('_site/sitemap.xml',
+        sitemap
+          .replace(/\/blog\/index.html/g, '/blog')
+      );
+    }
+
+    return resolve();
+  });
+}
diff --git a/_websrc/gulp_tasks/master/watch.js b/_websrc/gulp_tasks/master/watch.js
index b06891ddf..e44fe7d28 100644
--- a/_websrc/gulp_tasks/master/watch.js
+++ b/_websrc/gulp_tasks/master/watch.js
@@ -50,6 +50,7 @@ gulp.task('watch', async () => {
       './**/*.html',
       './**/*.md',
       './**/*.markdown',
+      './**/*.jekyll',
       './**/*.js',
       './**/*.json',
       `${config.jekyll.data}/**/*`,
diff --git a/_websrc/templates/master/css/app-entry.scss b/_websrc/templates/master/css/app-entry.scss
new file mode 100644
index 000000000..76604ced0
--- /dev/null
+++ b/_websrc/templates/master/css/app-entry.scss
@@ -0,0 +1,13 @@
+/*
+  assets/_src/sass/app/app.scss
+*/
+
+/*
+  CHARSET
+*/
+
+@charset "UTF-8";
+
+/*
+  IMPORTS
+*/
diff --git a/_websrc/templates/master/js/app-entry.js b/_websrc/templates/master/js/app-entry.js
new file mode 100644
index 000000000..5f1b71222
--- /dev/null
+++ b/_websrc/templates/master/js/app-entry.js
@@ -0,0 +1,6 @@
+Manager.ready(function() {
+  Manager.log('app.js fired Manager.ready()');
+
+  // Add additional logic here!
+  // var theme = require('../theme/theme.js');
+});
diff --git a/_websrc/templates/master/js/app-gulp-task.js b/_websrc/templates/master/js/app-gulp-task.js
new file mode 100644
index 000000000..2f316184f
--- /dev/null
+++ b/_websrc/templates/master/js/app-gulp-task.js
@@ -0,0 +1,11 @@
+const gulp     = require('gulp');
+const newer    = require('gulp-newer');
+const through  = require('through2');
+const argv     = require('yargs').argv;
+const fetch    = require('node-fetch');
+const tools    = new (require('../../libraries/tools.js'));
+
+gulp.task('sample', function() {
+  // write your first task here!
+  // then set up 'watch' tasks in the app.config.js
+});
diff --git a/_websrc/templates/master/js/app-service-worker.js b/_websrc/templates/master/js/app-service-worker.js
new file mode 100644
index 000000000..91e6308a5
--- /dev/null
+++ b/_websrc/templates/master/js/app-service-worker.js
@@ -0,0 +1,8 @@
+// app service-worker.js code
+if (typeof log === 'undefined') {
+  var log = function() {};
+}
+log('app service-worker.js loaded: ', self.location.pathname);
+
+// Note: any importScripts(); are relative to the master-service-worker.js location
+// importScripts('../../app/service-worker.js');
diff --git a/_websrc/templates/master/js/build-post.js b/_websrc/templates/master/js/build-post.js
new file mode 100644
index 000000000..505be9ca7
--- /dev/null
+++ b/_websrc/templates/master/js/build-post.js
@@ -0,0 +1,12 @@
+// Libraries
+// ...
+
+// Module
+module.exports = function () {
+  return new Promise(function(resolve, reject) {
+
+    // ...
+
+    return resolve();
+  });
+}
diff --git a/_websrc/templates/master/output/build/build.json b/_websrc/templates/master/output/build/build.json
index 08bd78803..f186f9e57 100644
--- a/_websrc/templates/master/output/build/build.json
+++ b/_websrc/templates/master/output/build/build.json
@@ -5,12 +5,10 @@
     "name": "%REPO_NAME%"
   },
   "npm-build": {
-    "timestamp_utc": "%TIMESTAMP_UTC_NPM%",
-    "timestamp_pst": "%TIMESTAMP_PST_NPM%"
+    "timestamp": "%NPM_TIMESTAMP%"
   },
   "gh-pages-push": {
-    "timestamp_utc": "%TIMESTAMP_UTC_GHP%",
-    "timestamp_pst": "%TIMESTAMP_PST_GHP%"
+    "timestamp": "%GHP_TIMESTAMP%"
   },
   "packages": {
     "web-manager": "%VERSION_WEB_MANAGER%"
diff --git a/assets/_src/js/master/core.js b/assets/_src/js/master/core.js
index b287b367a..dffdc22cf 100755
--- a/assets/_src/js/master/core.js
+++ b/assets/_src/js/master/core.js
@@ -10,6 +10,9 @@ if (url.includes('/pricing')) {
   dom.loadScript({src: 'https://cdn.itwcreativeworks.com/assets/general/js/download-page-handler/index.js'})
 } else if (url.includes('/browser-extension') || url.includes('/extension')) {
   dom.loadScript({src: 'https://cdn.itwcreativeworks.com/assets/general/js/browser-extension-page-handler/index.js'})
+} else if (window.location.pathname.endsWith('.html')) {
+  // Redirect and remove .html
+  window.location.pathname = window.location.pathname.replace('.html', '');
 }
 
 // Load Slapform
@@ -40,6 +43,7 @@ if (auth && auth.uid && auth.email) {
   setupTracking(auth);
 }
 
+// Save user auth data
 Manager.auth().ready(function (user) {
   setupTracking(user);
 
diff --git a/package.json b/package.json
index ccf319a3c..21882a6ac 100755
--- a/package.json
+++ b/package.json
@@ -86,9 +86,10 @@
     "through2": "4.0.2",
     "ultimate-jekyll-poster": "0.0.15",
     "vinyl-named": "1.1.0",
-    "web-manager": "3.2.16",
+    "web-manager": "3.2.17",
     "webpack": "5.88.0",
     "webpack-stream": "6.1.2",
+    "wonderful-fetch": "1.0.1",
     "yargs": "16.2.0",
     "zzzzzzzzzz": "9.9.9"
   }
diff --git a/special/master/misc/sitemap.xml b/special/master/misc/sitemap.xml
index 4ef7e6c50..e3e3727d8 100644
--- a/special/master/misc/sitemap.xml
+++ b/special/master/misc/sitemap.xml
@@ -9,7 +9,7 @@ sitemap:
   {% assign pages = site.pages %}
   {% assign posts = site.posts %}
   {% assign data = pages | concat: posts %}
-  {% assign default_time = site.time | date_to_xmlschema %}
+  {% assign default-time = site.time | date_to_xmlschema %}
 
   {%- if site.sitemap.enable != false -%}
     {% for page in data %}
@@ -23,10 +23,14 @@ sitemap:
       {%- endif -%}
 
       <url>
-        <loc>{{ site.url }}{{ page.url }}</loc>
+        {%- if page.url == '/' -%}
+          <loc>{{ site.url }}</loc>
+        {%- else -%}
+          <loc>{{ site.url }}{{ page.url }}</loc>
+        {%- endif -%}
 
         {%- if page.sitemap.lastmod == null -%}
-          <lastmod>{{ default_time }}</lastmod>
+          <lastmod>{{ default-time }}</lastmod>
         {%- else -%}
           <lastmod>{{ page.sitemap.lastmod | date_to_xmlschema }}</lastmod>
         {%- endif -%}
diff --git a/special/master/pages/feedback/feedback.html b/special/master/pages/feedback/feedback.html
index 1444d598b..fa33fc775 100644
--- a/special/master/pages/feedback/feedback.html
+++ b/special/master/pages/feedback/feedback.html
@@ -146,15 +146,13 @@
   index: false
 ---
 <main id="content" role="main" class="main">
-  <div class="position-fixed top-0 end-0 start-0 bg-img-start" style="height: 32rem; background-image: url(./assets/svg/components/card-6.svg);">
-    <!-- Shape -->
+  <!-- <div class="position-fixed top-0 end-0 start-0 bg-img-start" style="height: 32rem; background-image: url(./assets/svg/components/card-6.svg);">
     <div class="shape shape-bottom zi-1">
       <svg preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 1921 273">
         <polygon fill="#fff" points="0,273 1921,273 1921,0 " />
       </svg>
     </div>
-    <!-- End Shape -->
-  </div>
+  </div> -->
 
   <!-- Content -->
   <div class="container py-5 py-sm-7">
diff --git a/special/master/pages/tools/tools.html b/special/master/pages/tools/tools.html
index d64f1fcc2..7193208b3 100644
--- a/special/master/pages/tools/tools.html
+++ b/special/master/pages/tools/tools.html
@@ -86,15 +86,13 @@
   index: false
 ---
 <main id="content" role="main" class="main">
-  <div class="position-fixed top-0 end-0 start-0 bg-img-start" style="height: 32rem; background-image: url(./assets/svg/components/card-6.svg);">
-    <!-- Shape -->
+  <!-- <div class="position-fixed top-0 end-0 start-0 bg-img-start" style="height: 32rem; background-image: url(./assets/svg/components/card-6.svg);">
     <div class="shape shape-bottom zi-1">
       <svg preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 1921 273">
         <polygon fill="#fff" points="0,273 1921,273 1921,0 " />
       </svg>
     </div>
-    <!-- End Shape -->
-  </div>
+  </div> -->
 
   <!-- Content -->
   <div class="container py-5 py-sm-7">