diff --git a/.forestry/settings.yml b/.forestry/settings.yml
index 86e4aba..1be532f 100755
--- a/.forestry/settings.yml
+++ b/.forestry/settings.yml
@@ -39,17 +39,12 @@ public_path: "/uploads"
 front_matter_path: ''
 use_front_matter_path: false
 file_template: ":year:/:month:/:day:/:filename:"
-instant_preview: true
 build:
-  preview_command: bundle exec jekyll build --drafts --unpublished --future -d _site
-  publish_command: bundle exec jekyll build -d _site
   preview_env:
   - JEKYLL_ENV=staging
-  publish_env:
-  - JEKYLL_ENV=production
   preview_output_directory: _site
-  output_directory: _site
-  instant_preview_command: bundle exec jekyll serve --drafts --unpublished --future
-    --port 8080 --host 0.0.0.0 -d _site
+  install_dependencies_command: bundle install --path vendor/bundle
   preview_docker_image: forestryio/ruby:2.6
   mount_path: "/srv"
+  instant_preview_command: bundle exec jekyll serve --drafts --unpublished --future
+    --port 8080 --host 0.0.0.0 -d _site
diff --git a/.gitignore b/.gitignore
index 9a5311c..e142abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 _site/
 .sass-cache/
+.jekyll-cache/
 .DS_Store
-*/.DS_Store
\ No newline at end of file
+*/.DS_Store
diff --git a/Gemfile b/Gemfile
index e97d6de..134eef5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 3.6.3"
+gem "jekyll", "~> 4.0"
 
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed"
   gem "jekyll-menus"
   gem "jekyll-tagging"
   gem "jekyll-archives"
diff --git a/Gemfile.lock b/Gemfile.lock
index 69e732b..aa5250a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,67 +1,81 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
-    ffi (1.9.25)
+    concurrent-ruby (1.1.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
-    jekyll (3.6.3)
+    http_parser.rb (0.6.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.0.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.14)
+      em-websocket (~> 0.5)
+      i18n (>= 0.9.5, < 2)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 3)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-archives (2.1.1)
-      jekyll (>= 2.4)
-    jekyll-feed (0.9.2)
-      jekyll (~> 3.3)
-    jekyll-menus (0.6.0)
-      jekyll (~> 3.1)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+      terminal-table (~> 1.8)
+    jekyll-archives (2.2.1)
+      jekyll (>= 3.6, < 5.0)
+    jekyll-feed (0.12.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-menus (0.6.1)
+      jekyll (>= 3.6, < 5.0)
+    jekyll-sass-converter (2.0.0)
+      sassc (> 2.0.1, < 3.0)
     jekyll-tagging (1.1.0)
       nuggets
-    jekyll-watch (1.5.1)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.1)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    nuggets (1.5.0)
-    pathutil (0.16.1)
+    nuggets (1.6.0)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (2.2.1)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.9.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.6.0)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    safe_yaml (1.0.5)
+    sassc (2.1.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.6.3)
+  jekyll (~> 4.0)
   jekyll-archives
-  jekyll-feed (~> 0.6)
+  jekyll-feed
   jekyll-menus
   jekyll-tagging
   tzinfo-data
 
 BUNDLED WITH
-   1.16.2
+   2.0.2
diff --git a/_config.yml b/_config.yml
index 0f5e232..aadf446 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,6 @@
 title: Belkirk College of Engineering
 short_title: Belkirk
-description: Belkirk Demo Site for Forestry.io
+description: Jekyll demo for Forestry CMS
 baseurl:
 permalink: "/:path/"
 defaults:
@@ -27,7 +27,7 @@ collections:
 jekyll-archives:
   enabled: all
   layout: "archive"
-gems:
+plugins:
   - jekyll-menus
   - jekyll-feed
   - jekyll-archives