diff --git a/Gemfile b/Gemfile
index 7bad5f9..3098d62 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,34 +1,11 @@
 source "https://rubygems.org"
 
-# 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.7"
-
-# 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
+gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed"
+  gem "jekyll-optional-front-matter"
 end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-# and associated library.
-install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-  gem "tzinfo", "~> 1.2"
-  gem "tzinfo-data"
-end
-
-# Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
-
diff --git a/Gemfile.lock b/Gemfile.lock
index 08307cc..05d8f10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,80 +1,261 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.0.3.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.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.7)
+    dnsruby (1.61.4)
+      simpleidn (~> 0.1)
     em-websocket (0.5.2)
       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 (1.0.1)
+      multipart-post (>= 1.2, < 3)
     ffi (1.13.1)
     forwardable-extended (2.6.0)
+    gemoji (3.0.1)
+    github-pages (208)
+      github-pages-health-check (= 1.16.1)
+      jekyll (= 3.9.0)
+      jekyll-avatar (= 0.7.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.1.6)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.15.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.13.0)
+      jekyll-mentions (= 1.6.0)
+      jekyll-optional-front-matter (= 0.3.2)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.3.0)
+      jekyll-redirect-from (= 0.16.0)
+      jekyll-relative-links (= 0.6.1)
+      jekyll-remote-theme (= 0.4.2)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.6.1)
+      jekyll-sitemap (= 1.4.0)
+      jekyll-swiss (= 1.0.0)
+      jekyll-theme-architect (= 0.1.1)
+      jekyll-theme-cayman (= 0.1.1)
+      jekyll-theme-dinky (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.2)
+      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.4)
+      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.3)
+      jemoji (= 0.12.0)
+      kramdown (= 2.3.0)
+      kramdown-parser-gfm (= 1.1.0)
+      liquid (= 4.0.3)
+      mercenary (~> 0.3)
+      minima (= 2.5.1)
+      nokogiri (>= 1.10.4, < 2.0)
+      rouge (= 3.23.0)
+      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.14.0)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.7)
+    jekyll (3.9.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (>= 1.17, < 3)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
+    jekyll-avatar (0.7.0)
+      jekyll (>= 3.0, < 5.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.6)
+      commonmarker (~> 0.17.6)
+      jekyll-commonmark (~> 1.2)
+      rouge (>= 2.0, < 4.0)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
     jekyll-feed (0.15.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.6.0)
+      html-pipeline (~> 2.3)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-optional-front-matter (0.3.2)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.3.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-relative-links (0.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-remote-theme (0.4.2)
+      addressable (~> 2.0)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
       jekyll (>= 3.3, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-swiss (1.0.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.2)
+      jekyll (> 3.5, < 5.0)
+      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.4)
+      jekyll (> 3.5, < 5.0)
+      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.3)
+      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    jemoji (0.12.0)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0, < 5.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
+    mini_portile2 (2.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
+    minitest (5.14.2)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
+    public_suffix (3.1.1)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rexml (3.2.4)
     rouge (3.23.0)
+    ruby-enum (0.8.0)
+      i18n
+    rubyzip (2.3.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)
+    simpleidn (0.1.1)
+      unf (~> 0.1.4)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
-      tzinfo (>= 1.0.0)
-    wdm (0.1.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.8.7)
-  jekyll-feed (~> 0.6)
-  minima (~> 2.0)
-  tzinfo (~> 1.2)
-  tzinfo-data
-  wdm (~> 0.1.0)
+  github-pages
+  jekyll-feed
+  jekyll-optional-front-matter
 
 BUNDLED WITH
    1.16.6
diff --git a/Makefile b/Makefile
index be831be..aeaee16 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ static:
 
 .PHONY: serve
 serve:
-	@bundle exec jekyll serve --drafts --watch --port 4000
+	@bundle exec jekyll serve --drafts --watch --port 8000
 
 .PHONY: toc
 toc:
diff --git a/README.md b/README.md
index 381c827..9869534 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 ---
 <div align="center">
   <a href="https://github.com/sindresorhus/awesome#readme"><img src="https://awesome.re/badge-flat.svg" /></a><br>
-  <img width="400" src="django-logo.svg" alt="Django logo">
+  <img width="400" src="./assets/django-logo.svg" alt="Django logo">
 </div>
 
 # Awesome Django
@@ -17,51 +17,49 @@ Please consider supporting Django by making a donation to the [Django Software F
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
-- [Awesome Django](#awesome-django)
-  - [Contents](#contents)
-  - [Third-Party Packages](#third-party-packages)
-    - [Admin](#admin)
-    - [APIs](#apis)
-    - [Async](#async)
-    - [Commands](#commands)
-    - [Configuration](#configuration)
-    - [Content Management Systems](#content-management-systems)
-    - [ECommerce](#ecommerce)
-    - [Editors](#editors)
-    - [Files/Images](#filesimages)
-    - [Forms](#forms)
-    - [General](#general)
-    - [Logging](#logging)
-    - [Models](#models)
-    - [Performance](#performance)
-    - [Search](#search)
-    - [Security](#security)
-    - [Static Assets](#static-assets)
-    - [Task Queues](#task-queues)
-    - [Testing](#testing)
-    - [URLs](#urls)
-    - [Users](#users)
-    - [Views](#views)
-  - [Python Packages](#python-packages)
-  - [Resources](#resources)
-    - [Official Resources](#official-resources)
-    - [Educational](#educational)
-    - [Community](#community)
-    - [Conferences](#conferences)
-    - [Newsletters](#newsletters)
-    - [Podcasts](#podcasts)
-    - [Books](#books)
-  - [Hosting](#hosting)
-    - [PaaS (Platforms-as-a-Service)](#paas-platforms-as-a-service)
-    - [IaaS (Infrastructure-as-a-Service)](#iaas-infrastructure-as-a-service)
-  - [Projects](#projects)
-    - [Boilerplate](#boilerplate)
-    - [Open Source Projects](#open-source-projects)
-  - [Django REST Framework](#django-rest-framework)
-    - [DRF Resources](#drf-resources)
-    - [DRF Tutorials](#drf-tutorials)
-  - [Wagtail](#wagtail)
-    - [Wagtail Resources](#wagtail-resources)
+- [Third-Party Packages](#third-party-packages)
+  - [Admin](#admin)
+  - [APIs](#apis)
+  - [Async](#async)
+  - [Commands](#commands)
+  - [Configuration](#configuration)
+  - [Content Management Systems](#content-management-systems)
+  - [ECommerce](#ecommerce)
+  - [Editors](#editors)
+  - [Files/Images](#filesimages)
+  - [Forms](#forms)
+  - [General](#general)
+  - [Logging](#logging)
+  - [Models](#models)
+  - [Performance](#performance)
+  - [Search](#search)
+  - [Security](#security)
+  - [Static Assets](#static-assets)
+  - [Task Queues](#task-queues)
+  - [Testing](#testing)
+  - [URLs](#urls)
+  - [Users](#users)
+  - [Views](#views)
+- [Python Packages](#python-packages)
+- [Resources](#resources)
+  - [Official Resources](#official-resources)
+  - [Educational](#educational)
+  - [Community](#community)
+  - [Conferences](#conferences)
+  - [Newsletters](#newsletters)
+  - [Podcasts](#podcasts)
+  - [Books](#books)
+- [Hosting](#hosting)
+  - [PaaS (Platforms-as-a-Service)](#paas-platforms-as-a-service)
+  - [IaaS (Infrastructure-as-a-Service)](#iaas-infrastructure-as-a-service)
+- [Projects](#projects)
+  - [Boilerplate](#boilerplate)
+  - [Open Source Projects](#open-source-projects)
+- [Django REST Framework](#django-rest-framework)
+  - [DRF Resources](#drf-resources)
+  - [DRF Tutorials](#drf-tutorials)
+- [Wagtail](#wagtail)
+  - [Wagtail Resources](#wagtail-resources)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!--lint enable awesome-toc-->
diff --git a/_config.yml b/_config.yml
index 2b6fe1f..046bc64 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,12 +10,12 @@ url: "https://awesome-django.org" # the base hostname & protocol for your site,
 markdown: kramdown
 plugins:
   - jekyll-feed
+  - jekyll-optional-front-matter
 include:
   - README.md
 exclude:
   - "*.md"
-  - Gemfile
-  - Gemfile.lock
+  - Gemfile*
   - LICENSE
   - Makefile
   - postcss.config.js
@@ -26,7 +26,7 @@ defaults:
       path: "" # an empty string here means all files in the project
     values:
       layout: "default"
-    scope:
+  - scope:
       path: "README.md"
     values:
       permalink: "/"
diff --git a/django-logo.svg b/assets/django-logo.svg
similarity index 100%
rename from django-logo.svg
rename to assets/django-logo.svg