diff --git a/.rubocop.yml b/.rubocop.yml
index fca3b19..4b122f8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Exclude:
     - _site/**/*
     - vendor/**/*
diff --git a/.travis.yml b/.travis.yml
index 0b42a5e..2caf39f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,16 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.5.3
 
 addons:
   apt:
     packages:
     - libcurl4-openssl-dev
 
+before_install:
+  - gem update --system
+
 branches:
   only:
     - gh-pages
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 592b0d5..4ad2b89 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,34 +2,36 @@
 
 We love Pull Requests! Your contributions help make ChooseALicense.com great.
 
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md).
+
 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
 ## Getting Started
 
 So you want to contribute to ChooseALicense. Great! We welcome any help we can
 get. But first, please make sure you understand what
-[this site is all about](http://choosealicense.com/about). It’s not a comprehensive list of all possible licenses.
+[this site is all about](https://choosealicense.com/about). It’s not a comprehensive list of all possible licenses.
 
 ## Adding a license
 
-Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <http://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site:
+Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <https://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](https://choosealicense.com/appendix/) on the site:
 
 1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license).
 2. The license must be listed on one of the following approved lists of licenses:
    * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical)
    * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*)
-   * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code)
-3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license
-4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license
+   * [Open Definition's list of conformant licenses](https://opendefinition.org/licenses/) (non-code)
+3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license.
+4. 3 notable projects using the license must be identified. These must have straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license.
 
 If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition:
 
-* Is the license already cataloged? See <http://choosealicense.com/appendix/> for a list of all of the licenses known by the site.
+* Is the license already cataloged? See <https://choosealicense.com/appendix/> for a list of all of the licenses known by the site.
 * Licenses live in the `/_licenses` folder.
 * The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`)
 * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included.
 * The text of the license should be wrapped to a 78 character width.
-* The text of the license should match the corresponding text found at https://spdx.org/licenses/
+* The text of the license should match the corresponding text found in [spdx/license-list-data](https://github.com/spdx/license-list-data/blob/master/text/). If there are errors there, please fix them in [spdx/license-list-XML](https://github.com/spdx/license-list-XML) (from which the plain text version is generated) so as to minimize license text variation and make it easier for choosealicense.com to eventually consume license texts directly from SPDX.
 * The body of the file should be the text of the license in plain text.
 
 ## Making Changes
@@ -43,8 +45,6 @@ find it in the GitHub repository. Then click the `Edit` button. Make your
 changes, type in a commit message, and click the `Propose File Change` button.
 That’s it!
 
-You will be asked to sign the [GitHub Contributor License Agreement](https://cla.github.com/) for this project when you make your first pull request. 
-
 For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](/README.md).
 
 ## Testing
diff --git a/Gemfile b/Gemfile
index c92472d..6677662 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ end
 group :test do
   gem 'html-proofer', '~> 3.0'
   gem 'licensee'
-  gem 'nokogiri'
   gem 'rake'
   gem 'rspec'
   gem 'rubocop'
diff --git a/LICENSE.md b/LICENSE.md
index a08a18f..4b26f77 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017 GitHub, Inc. and contributors
+Copyright (c) 2013-2018 GitHub, Inc. and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 87c5bb6..7b6b860 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,15 @@
-# Choosealicense.com
+**[ChooseALicense.com](https://choosealicense.com)** aims to provide **accurate**, **non-judgmental**, and **understandable** information about popular **open source licenses** in order to **help people make informed decisions** about the projects they start, maintain, contribute to, and use.
 
 [![Build Status](https://travis-ci.org/github/choosealicense.com.svg?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com)
 
-Like a Choose Your Own Adventure site, but only much less interesting.
+We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with a [Jekyll collection](https://jekyllrb.com/docs/collections/) (in `_licenses`). The catalog is used to render [ChooseALicense.com](https://choosealicense.com) and is regularly vendored into [Licensee](https://github.com/benbalter/licensee), which GitHub uses to provide a [license chooser and license detection](https://help.github.com/articles/adding-a-license-to-a-repository/), a [licenses API](https://developer.github.com/v3/licenses/), and to [display license descriptions and metadata](https://github.com/blog/2335-open-source-license-descriptions-and-metadata).
 
-## Intro
+## Goals
 
-A lot of repositories on GitHub.com don't have a license. GitHub provides a license chooser, but if you don't know anything about licenses, how are you supposed to make an informed decision?
-
-[ChooseALicense.com](http://www.choosealicense.com "Choose A Licence website") is designed to help people make an informed decision about licenses by demystifying license choices through non-judgmental guidance.
-
-## Immediate Goals
-
-* Non-judgmental. Our goal is to help you find a license that meets *your* goals.
-* Well designed, but that goes without saying.
-* The homepage should have just enough to help 99% of folks make a decision.
-* For the 1%, the site will contain a list of licenses common to specific communities and situations.
+* Be accurate, non-judgmental, and understandable. Our goal is to help you find a license that meets *your* goals.
+* The homepage should have just enough to help most folks make a decision about what license to use for a project they contribute to.
+* For the rest, the site will contain additional information about licenses common to specific communities and situations.
+* Collaborate with and reinforce other licensing best practices and standards projects.
 * Not comprehensive. Seems like an odd goal, but there are a bajillion licenses out there. We're going to have to filter that down to a small list of those that matter.
 
 ## Run It On Your Machine
@@ -39,9 +33,8 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 
 #### Required fields
 
-* `title` - The license full name specified by http://spdx.org/licenses/
-* `spdx-id` - Short identifier specified by http://spdx.org/licenses/
-* `source` - The URL to the license source text
+* `title` - The license full name specified by https://spdx.org/licenses/
+* `spdx-id` - Short identifier specified by https://spdx.org/licenses/
 * `description` - A human-readable description of the license
 * `how` - Instructions on how to implement the license
 * `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`
@@ -52,7 +45,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 #### Optional fields
 
 * `featured` - Whether the license should be featured on the main page (defaults to false)
-* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
+* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
 * `nickname` - Customary short name if applicable (e.g, GPLv3)
 * `note` - Additional information about the licenses
 * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs
@@ -69,6 +62,7 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us
 * `project` - The repository name
 * `description` - The description of the repository
 * `year` - The current year
+* `projecturl` - The repository URL or other project website
 
 ## License properties
 
@@ -103,4 +97,4 @@ The license properties (rules) are stored as a bulleted list within the licenses
 
 ## License
 
-The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php).
+The content of this project itself is licensed under the [Creative Commons Attribution 3.0 Unported license](https://creativecommons.org/licenses/by/3.0/), and the underlying source code used to format and display that content is licensed under the [MIT license](LICENSE.md).
diff --git a/Rakefile b/Rakefile
index 360bfdf..42c56e3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,6 +16,7 @@ task :test do
                               check_html: true,
                               validation: { ignore_script_embeds: true },
                               url_swap: { %r{https://choosealicense.com} => '' },
+                              hydra: { max_concurrency: 10 },
                               check_img_http: true).run
 end
 
diff --git a/_config.yml b/_config.yml
index 004f14b..dffa752 100644
--- a/_config.yml
+++ b/_config.yml
@@ -34,12 +34,14 @@ exclude:
   - tests
   - assets/vendor/selectivizr/tests
   - assets/vendor/clipboard/test
+  - assets/vendor/*/README.*
 
 plugins:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-seo-tag
   - jekyll-coffeescript
+  - jekyll-github-metadata # For 'Improve this page' links
 
 sass:
     style: :compressed
diff --git a/_data/fields.yml b/_data/fields.yml
index 0b5f45d..4e55d42 100644
--- a/_data/fields.yml
+++ b/_data/fields.yml
@@ -21,3 +21,6 @@
 
 - name: year
   description: The current year
+
+- name: projecturl
+  description: The repository URL or other project website
diff --git a/_data/meta.yml b/_data/meta.yml
index 6e6de7b..2a58872 100644
--- a/_data/meta.yml
+++ b/_data/meta.yml
@@ -2,15 +2,11 @@
 # The available fields are:
 
 - name: title
-  description: The license full name specified by http://spdx.org/licenses/
+  description: The license full name specified by https://spdx.org/licenses/
   required: true
 
 - name: spdx-id
-  description: Short identifier specified by http://spdx.org/licenses/
-  required: true
-
-- name: source
-  description: The URL to the license source text
+  description: Short identifier specified by https://spdx.org/licenses/
   required: true
 
 - name: description
@@ -44,7 +40,7 @@
   required: false
 
 - name: hidden
-  description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
+  description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
   required: false
 
 - name: nickname
diff --git a/_includes/footer.html b/_includes/footer.html
index 219b381..6a16215 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,6 +2,7 @@
         <nav>
           <a href="/about/">About</a>
           <a href="/terms-of-service/">Terms of Service</a>
+          {% github_edit_link "Help improve this page" %}
         </nav>
         <p>
           The content of this site is licensed under the <a href="https://creativecommons.org/licenses/by/3.0/">
@@ -20,6 +21,16 @@
     <script src="/assets/vendor/clipboard/dist/clipboard.min.js"></script>
     <script>
       window.annotations = {{ site.data.rules | jsonify }};
+      {% if page.collection == "licenses" %}
+      window.licenses = [
+        {% for license in site.licenses %}        
+          {
+            "title": "{{ license.title | escape  }}",
+            "spdx_id": "{{ license.spdx-id | escape  }}"
+          }{% unless forloop.last %},{% endunless %}
+        {% endfor %}
+      ];
+      {% endif %}
     </script>
     <script src="/assets/js/app.js"></script>
     {% endif %}
diff --git a/_includes/header.html b/_includes/header.html
index 0d68595..06ee4e0 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Chivo:900">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Chivo:900">
     <link rel="stylesheet" href="/assets/css/application.css?v={{ site.github.build_revision }}">
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <!--[if lt IE 9]>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 9b4bacc..e51b48e 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,30 +1,42 @@
 <div class="sidebar">
 
   <a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a>
-    
+  <h3 id="suggest-this-license">Suggest this license</h3>
+  <div class="repository-suggestion">    
+    <p>Make a pull request to suggest this license for a project that is <a href="/no-permission/">not licensed</a>. Please be polite: see if a license has already been suggested, try to suggest a license fitting for the project's <a href="/community/">community</a>, and keep your communication with project maintainers friendly.</p>
+    <div class="input-wrapper">
+      <input type="text" data-license-id="{{ page.spdx-id }}" placeholder="Enter GitHub repository URL" id="repository-url" title="status" />
+      <div class="status-indicator"></div>
+    </div>
+  </div>
+
   <div class="how-to-apply">
     <h3>How to apply this license</h3>
     <p>
       {{ page.how | markdownify | remove: '<p>' | remove: '</p>' }}
     </p>
+    <div class="note">
+    <h4>Optional steps</h4>
     {% if page.note %}
-    <p class="note">
-      <strong>Note: </strong> {{ page.note | markdownify | remove: '<p>' | remove: '</p>' }}
+    <p>
+      {{ page.note | markdownify | remove: '<p>' | remove: '</p>' }}
     </p>
     {% endif %}
     {% assign xgpl = false %}
     {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %}
-    <p class="note"><strong>Optional: </strong> Add <strong><code>{{ page.spdx-id }}</code>{% if xgpl %}+{% endif %}</strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="http://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="http://doc.crates.io/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
+    <p>Add <strong><code>{{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}</code></strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}-only</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="https://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
+    {% if page.spdx-id contains 'GPL-2' %}
+    <p>If you would like your project to adopt the GPL-3.0's cure provision, add the <a href="https://github.com/gplcc/gplcc/blob/master/Project/COMMITMENT">text</a> of the <a href="https://gplcc.github.io/gplcc/">GPL Cooperation Commitment</a> to a file named <code>COMMITMENT</code> in the same directory as your {{ page.spdx-id }} license file.</p>
+    {% endif %}
+    </div>
   </div>
 
-  {% if page.source %}
   <div class="source">
-    <a href="{{ page.source }}">
+    <a href="https://spdx.org/licenses/{{ page.spdx-id }}.html">
       <span class="license-sprite"></span>
       Source
     </a>
   </div>
-  {% endif %}
 
   {% if page.using %}
   <div class="projects-with-license">
diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt
index 37f08f9..07ec7a1 100644
--- a/_licenses/afl-3.0.txt
+++ b/_licenses/afl-3.0.txt
@@ -1,7 +1,6 @@
 ---
 title: Academic Free License v3.0
 spdx-id: AFL-3.0
-source: https://opensource.org/licenses/afl-3.0
 
 description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author.
 
diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt
index 8369752..433632c 100644
--- a/_licenses/agpl-3.0.txt
+++ b/_licenses/agpl-3.0.txt
@@ -3,7 +3,6 @@ title: GNU Affero General Public License v3.0
 spdx-id: AGPL-3.0
 nickname: GNU AGPLv3
 redirect_from: /licenses/agpl/
-source: https://www.gnu.org/licenses/agpl-3.0.txt
 hidden: false
 
 description: Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.
@@ -37,7 +36,7 @@ limitations:
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -679,7 +678,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -694,4 +693,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt
index bcd63fa..5f49c78 100644
--- a/_licenses/apache-2.0.txt
+++ b/_licenses/apache-2.0.txt
@@ -2,7 +2,6 @@
 title: Apache License 2.0
 spdx-id: Apache-2.0
 redirect_from: /licenses/apache/
-source: https://www.apache.org/licenses/LICENSE-2.0.html
 featured: true
 hidden: false
 
@@ -13,8 +12,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
 
 using:
-  - Elasticsearch: https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
   - Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE
+  - PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE
   - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt
 
 permissions:
diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt
index 8b84ce1..043e5e8 100644
--- a/_licenses/artistic-2.0.txt
+++ b/_licenses/artistic-2.0.txt
@@ -2,7 +2,6 @@
 title: Artistic License 2.0
 spdx-id: Artistic-2.0
 redirect_from: /licenses/artistic/
-source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
 
 description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version.
 
diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt
index 524d663..d7b985a 100644
--- a/_licenses/bsd-2-clause.txt
+++ b/_licenses/bsd-2-clause.txt
@@ -1,8 +1,7 @@
 ---
-title: BSD 2-clause "Simplified" License
+title: BSD 2-Clause "Simplified" License
 spdx-id: BSD-2-Clause
 redirect_from: /licenses/bsd/
-source: https://opensource.org/licenses/BSD-2-Clause
 hidden: false
 
 description: A permissive license that comes in two variants, the <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause/">BSD 3-Clause</a>. Both have very minute differences to the MIT license.
@@ -10,6 +9,9 @@ description: A permissive license that comes in two variants, the <a href="/lice
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
 
 using:
+  - go-redis: https://github.com/go-redis/redis/blob/master/LICENSE
+  - Homebrew: https://github.com/Homebrew/brew/blob/master/LICENSE.txt
+  - Pony: https://github.com/ponylang/ponyc/blob/master/LICENSE
 
 permissions:
   - commercial-use
@@ -34,12 +36,12 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt
index 1fd8552..e8a464b 100644
--- a/_licenses/bsd-3-clause-clear.txt
+++ b/_licenses/bsd-3-clause-clear.txt
@@ -1,7 +1,6 @@
 ---
-title: BSD 3-clause Clear License
+title: BSD 3-Clause Clear License
 spdx-id: BSD-3-Clause-Clear
-source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
 
 description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> that explicitly does not grant any patent rights.
 
diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt
index e644905..08994de 100644
--- a/_licenses/bsd-3-clause.txt
+++ b/_licenses/bsd-3-clause.txt
@@ -1,7 +1,6 @@
 ---
-title: BSD 3-clause "New" or "Revised" License
+title: BSD 3-Clause "New" or "Revised" License
 spdx-id: BSD-3-Clause
-source: https://opensource.org/licenses/BSD-3-Clause
 hidden: false
 
 description: A permissive license similar to the <a href="/licenses/bsd-2-clause/">BSD 2-Clause License</a>, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent.
@@ -9,6 +8,9 @@ description: A permissive license similar to the <a href="/licenses/bsd-2-clause
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.
 
 using:
+  - d3: https://github.com/d3/d3/blob/master/LICENSE
+  - LevelDB: https://github.com/google/leveldb/blob/master/LICENSE
+  - Quill: https://github.com/quilljs/quill/blob/develop/LICENSE
 
 permissions:
   - commercial-use
@@ -33,16 +35,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt
index cbc71b2..e595a5c 100644
--- a/_licenses/bsl-1.0.txt
+++ b/_licenses/bsl-1.0.txt
@@ -1,13 +1,12 @@
 ---
 title: Boost Software License 1.0
 spdx-id: BSL-1.0
-source: https://opensource.org/licenses/BSL-1.0
 
 description: A simple permissive license only requiring preservation of copyright and license notices for source (and not binary) distribution. Licensed works, modifications, and larger works may be distributed under different terms and without source code.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
 
-note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](http://www.boost.org/users/license.html#FAQ).
+note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](https://www.boost.org/users/license.html#FAQ).
 
 using:
 
diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt
index 35beda5..52233ed 100644
--- a/_licenses/cc-by-4.0.txt
+++ b/_licenses/cc-by-4.0.txt
@@ -1,7 +1,6 @@
 ---
-title: Creative Commons Attribution 4.0
+title: Creative Commons Attribution 4.0 International
 spdx-id: CC-BY-4.0
-source: https://creativecommons.org/licenses/by/4.0/legalcode.txt
 
 description: Permits almost any use subject to providing credit and license notice. Frequently used for media assets and educational materials. The most common license for Open Access scientific publications. Not recommended for software.
 
diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt
index ec3451d..21afff8 100644
--- a/_licenses/cc-by-sa-4.0.txt
+++ b/_licenses/cc-by-sa-4.0.txt
@@ -1,7 +1,6 @@
 ---
-title: Creative Commons Attribution Share Alike 4.0
+title: Creative Commons Attribution Share Alike 4.0 International
 spdx-id: CC-BY-SA-4.0
-source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
 
 description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> but requires derivatives be distributed under the same or a similar, <a href="https://creativecommons.org/compatiblelicenses/">compatible</a> license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software.
 
diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt
index 73d9655..81b345d 100644
--- a/_licenses/cc0-1.0.txt
+++ b/_licenses/cc0-1.0.txt
@@ -2,9 +2,8 @@
 title: Creative Commons Zero v1.0 Universal
 spdx-id: CC0-1.0
 redirect_from: /licenses/cc0/
-source: https://creativecommons.org/publicdomain/zero/1.0/
 
-description: The <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
+description: The <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the CC0 into the file.
 
diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt
index 2b0be47..fc2ad2c 100644
--- a/_licenses/ecl-2.0.txt
+++ b/_licenses/ecl-2.0.txt
@@ -1,7 +1,6 @@
 ---
 title: Educational Community License v2.0
 spdx-id: ECL-2.0
-source: https://opensource.org/licenses/ECL-2.0
 
 description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license.
 
@@ -12,7 +11,7 @@ note: The Apereo Foundation recommends taking the additional step of adding a bo
 using:
   - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE
   - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE
-  - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE
+  - Opencast: https://github.com/opencast/opencast/blob/develop/LICENSE
 
 permissions:
   - commercial-use
diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt
index b8dadda..2495b09 100644
--- a/_licenses/epl-1.0.txt
+++ b/_licenses/epl-1.0.txt
@@ -1,16 +1,13 @@
 ---
 title: Eclipse Public License 1.0
 spdx-id: EPL-1.0
-redirect_from: /licenses/eclipse/
-source: https://www.eclipse.org/legal/epl-v10.html
-hidden: false
 
 description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
 
 using:
-  - Eclipse Che: https://github.com/eclipse/che/blob/master/LICENSE
+  - Eclipse hawkBit: https://github.com/eclipse/hawkbit/blob/master/LICENSE
   - JUnit: https://github.com/junit-team/junit4/blob/master/LICENSE-junit.txt
   - openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE
 
diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt
new file mode 100644
index 0000000..c6aab5f
--- /dev/null
+++ b/_licenses/epl-2.0.txt
@@ -0,0 +1,310 @@
+---
+title: Eclipse Public License 2.0
+spdx-id: EPL-2.0
+redirect_from: /licenses/eclipse/
+hidden: false
+
+description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones.
+
+how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
+
+using:
+  - Eclipse Ditto: https://github.com/eclipse/ditto/blob/master/LICENSE
+  - Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE
+  - SUMO: https://github.com/eclipse/sumo/blob/master/LICENSE
+
+permissions:
+  - commercial-use
+  - distribution
+  - modifications
+  - patent-use
+  - private-use
+
+conditions:
+  - disclose-source
+  - include-copyright
+  - same-license
+
+limitations:
+  - liability
+  - warranty
+
+---
+
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt
index 6f679ab..b2512b7 100644
--- a/_licenses/eupl-1.1.txt
+++ b/_licenses/eupl-1.1.txt
@@ -2,7 +2,6 @@
 title: European Union Public License 1.1
 spdx-id: EUPL-1.1
 redirect_from: /licenses/eupl-v1.1/
-source: https://joinup.ec.europa.eu/page/eupl-text-11-12
 
 description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union.
 
diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt
new file mode 100644
index 0000000..7413aef
--- /dev/null
+++ b/_licenses/eupl-1.2.txt
@@ -0,0 +1,308 @@
+---
+title: European Union Public License 1.2
+spdx-id: EUPL-1.2
+
+description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union.
+
+how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment.
+
+using:
+  - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE
+  - WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE
+  - ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE
+
+permissions:
+  - commercial-use
+  - modifications
+  - distribution
+  - patent-use
+  - private-use
+
+conditions:
+  - include-copyright
+  - disclose-source
+  - document-changes
+  - network-use-disclose
+  - same-license
+
+limitations:
+  - liability
+  - trademark-use
+  - warranty
+
+---
+
+European Union Public Licence
+V. 1.2
+
+EUPL © the European Union 2007, 2016
+
+This European Union Public Licence (the ‘EUPL’) applies to the Work (as
+defined below) which is provided under the terms of this Licence. Any use of
+the Work, other than as authorised under this Licence is prohibited (to the
+extent such use is covered by a right of the copyright holder of the Work).
+
+The Work is provided under the terms of this Licence when the Licensor (as
+defined below) has placed the following notice immediately following the
+copyright notice for the Work: “Licensed under the EUPL”, or has expressed by
+any other means his willingness to license under the EUPL.
+
+1. Definitions
+
+In this Licence, the following terms have the following meaning:
+— ‘The Licence’: this Licence.
+— ‘The Original Work’: the work or software distributed or communicated by the
+  ‘Licensor under this Licence, available as Source Code and also as
+  ‘Executable Code as the case may be.
+— ‘Derivative Works’: the works or software that could be created by the
+  ‘Licensee, based upon the Original Work or modifications thereof. This
+  ‘Licence does not define the extent of modification or dependence on the
+  ‘Original Work required in order to classify a work as a Derivative Work;
+  ‘this extent is determined by copyright law applicable in the country
+  ‘mentioned in Article 15.
+— ‘The Work’: the Original Work or its Derivative Works.
+— ‘The Source Code’: the human-readable form of the Work which is the most
+  convenient for people to study and modify.
+
+— ‘The Executable Code’: any code which has generally been compiled and which
+  is meant to be interpreted by a computer as a program.
+— ‘The Licensor’: the natural or legal person that distributes or communicates
+  the Work under the Licence.
+— ‘Contributor(s)’: any natural or legal person who modifies the Work under
+  the Licence, or otherwise contributes to the creation of a Derivative Work.
+— ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
+  the Work under the terms of the Licence.
+— ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
+  renting, distributing, communicating, transmitting, or otherwise making
+  available, online or offline, copies of the Work or providing access to its
+  essential functionalities at the disposal of any other natural or legal
+  person.
+
+2. Scope of the rights granted by the Licence
+
+The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+sublicensable licence to do the following, for the duration of copyright
+vested in the Original Work:
+
+— use the Work in any circumstance and for all usage,
+— reproduce the Work,
+— modify the Work, and make Derivative Works based upon the Work,
+— communicate to the public, including the right to make available or display
+  the Work or copies thereof to the public and perform publicly, as the case
+  may be, the Work,
+— distribute the Work or copies thereof,
+— lend and rent the Work or copies thereof,
+— sublicense rights in the Work or copies thereof.
+
+Those rights can be exercised on any media, supports and formats, whether now
+known or later invented, as far as the applicable law permits so.
+
+In the countries where moral rights apply, the Licensor waives his right to
+exercise his moral right to the extent allowed by law in order to make
+effective the licence of the economic rights here above listed.
+
+The Licensor grants to the Licensee royalty-free, non-exclusive usage rights
+to any patents held by the Licensor, to the extent necessary to make use of
+the rights granted on the Work under this Licence.
+
+3. Communication of the Source Code
+
+The Licensor may provide the Work either in its Source Code form, or as
+Executable Code. If the Work is provided as Executable Code, the Licensor
+provides in addition a machine-readable copy of the Source Code of the Work
+along with each copy of the Work that the Licensor distributes or indicates,
+in a notice following the copyright notice attached to the Work, a repository
+where the Source Code is easily and freely accessible for as long as the
+Licensor continues to distribute or communicate the Work.
+
+4. Limitations on copyright
+
+Nothing in this Licence is intended to deprive the Licensee of the benefits
+from any exception or limitation to the exclusive rights of the rights owners
+in the Work, of the exhaustion of those rights or of other applicable
+limitations thereto.
+
+5. Obligations of the Licensee
+
+The grant of the rights mentioned above is subject to some restrictions and
+obligations imposed on the Licensee. Those obligations are the following:
+
+Attribution right: The Licensee shall keep intact all copyright, patent or
+trademarks notices and all notices that refer to the Licence and to the
+disclaimer of warranties. The Licensee must include a copy of such notices and
+a copy of the Licence with every copy of the Work he/she distributes or
+communicates. The Licensee must cause any Derivative Work to carry prominent
+notices stating that the Work has been modified and the date of modification.
+
+Copyleft clause: If the Licensee distributes or communicates copies of the
+Original Works or Derivative Works, this Distribution or Communication will be
+done under the terms of this Licence or of a later version of this Licence
+unless the Original Work is expressly distributed only under this version of
+the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee
+(becoming Licensor) cannot offer or impose any additional terms or conditions
+on the Work or Derivative Work that alter or restrict the terms of the
+Licence.
+
+Compatibility clause: If the Licensee Distributes or Communicates Derivative
+Works or copies thereof based upon both the Work and another work licensed
+under a Compatible Licence, this Distribution or Communication can be done
+under the terms of this Compatible Licence. For the sake of this clause,
+‘Compatible Licence’ refers to the licences listed in the appendix attached to
+this Licence. Should the Licensee's obligations under the Compatible Licence
+conflict with his/her obligations under this Licence, the obligations of the
+Compatible Licence shall prevail.
+
+Provision of Source Code: When distributing or communicating copies of the
+Work, the Licensee will provide a machine-readable copy of the Source Code or
+indicate a repository where this Source will be easily and freely available
+for as long as the Licensee continues to distribute or communicate the Work.
+
+Legal Protection: This Licence does not grant permission to use the trade
+names, trademarks, service marks, or names of the Licensor, except as required
+for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the copyright notice.
+
+6. Chain of Authorship
+
+The original Licensor warrants that the copyright in the Original Work granted
+hereunder is owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each Contributor warrants that the copyright in the modifications he/she
+brings to the Work are owned by him/her or licensed to him/her and that he/she
+has the power and authority to grant the Licence.
+
+Each time You accept the Licence, the original Licensor and subsequent
+Contributors grant You a licence to their contributions to the Work, under the
+terms of this Licence.
+
+7. Disclaimer of Warranty
+
+The Work is a work in progress, which is continuously improved by numerous
+Contributors. It is not a finished work and may therefore contain defects or
+‘bugs’ inherent to this type of development.
+
+For the above reason, the Work is provided under the Licence on an ‘as is’
+basis and without warranties of any kind concerning the Work, including
+without limitation merchantability, fitness for a particular purpose, absence
+of defects or errors, accuracy, non-infringement of intellectual property
+rights other than copyright as stated in Article 6 of this Licence.
+
+This disclaimer of warranty is an essential part of the Licence and a
+condition for the grant of any rights to the Work.
+
+8. Disclaimer of Liability
+
+Except in the cases of wilful misconduct or damages directly caused to natural
+persons, the Licensor will in no event be liable for any direct or indirect,
+material or moral, damages of any kind, arising out of the Licence or of the
+use of the Work, including without limitation, damages for loss of goodwill,
+work stoppage, computer failure or malfunction, loss of data or any commercial
+damage, even if the Licensor has been advised of the possibility of such
+damage. However, the Licensor will be liable under statutory product liability
+laws as far such laws apply to the Work.
+
+9. Additional agreements
+
+While distributing the Work, You may choose to conclude an additional
+agreement, defining obligations or services consistent with this Licence.
+However, if accepting obligations, You may act only on your own behalf and on
+your sole responsibility, not on behalf of the original Licensor or any other
+Contributor, and only if You agree to indemnify, defend, and hold each
+Contributor harmless for any liability incurred by, or claims asserted against
+such Contributor by the fact You have accepted any warranty or additional
+liability.
+
+10. Acceptance of the Licence
+
+The provisions of this Licence can be accepted by clicking on an icon ‘I
+agree’ placed under the bottom of a window displaying the text of this Licence
+or by affirming consent in any other similar way, in accordance with the rules
+of applicable law. Clicking on that icon indicates your clear and irrevocable
+acceptance of this Licence and all of its terms and conditions.
+
+Similarly, you irrevocably accept this Licence and all of its terms and
+conditions by exercising any rights granted to You by Article 2 of this
+Licence, such as the use of the Work, the creation by You of a Derivative Work
+or the Distribution or Communication by You of the Work or copies thereof.
+
+11. Information to the public
+
+In case of any Distribution or Communication of the Work by means of
+electronic communication by You (for example, by offering to download the Work
+from a remote location) the distribution channel or media (for example, a
+website) must at least provide to the public the information requested by the
+applicable law regarding the Licensor, the Licence and the way it may be
+accessible, concluded, stored and reproduced by the Licensee.
+
+12. Termination of the Licence
+
+The Licence and the rights granted hereunder will terminate automatically upon
+any breach by the Licensee of the terms of the Licence. Such a termination
+will not terminate the licences of any person who has received the Work from
+the Licensee under the Licence, provided such persons remain in full
+compliance with the Licence.
+
+13. Miscellaneous
+
+Without prejudice of Article 9 above, the Licence represents the complete
+agreement between the Parties as to the Work.
+
+If any provision of the Licence is invalid or unenforceable under applicable
+law, this will not affect the validity or enforceability of the Licence as a
+whole. Such provision will be construed or reformed so as necessary to make it
+valid and enforceable.
+
+The European Commission may publish other linguistic versions or new versions
+of this Licence or updated versions of the Appendix, so far this is required
+and reasonable, without reducing the scope of the rights granted by the
+Licence. New versions of the Licence will be published with a unique version
+number.
+
+All linguistic versions of this Licence, approved by the European Commission,
+have identical value. Parties can take advantage of the linguistic version of
+their choice.
+
+14. Jurisdiction
+
+Without prejudice to specific agreement between parties,
+— any litigation resulting from the interpretation of this License, arising
+  between the European Union institutions, bodies, offices or agencies, as a
+  Licensor, and any Licensee, will be subject to the jurisdiction of the Court
+  of Justice of the European Union, as laid down in article 272 of the Treaty
+  on the Functioning of the European Union,
+— any litigation arising between other parties and resulting from the
+  interpretation of this License, will be subject to the exclusive
+  jurisdiction of the competent court where the Licensor resides or conducts
+  its primary business.
+
+15. Applicable Law
+
+Without prejudice to specific agreement between parties,
+— this Licence shall be governed by the law of the European Union Member State
+  where the Licensor has his seat, resides or has his registered office,
+— this licence shall be governed by Belgian law if the Licensor has no seat,
+  residence or registered office inside a European Union Member State.
+
+Appendix
+
+‘Compatible Licences’ according to Article 5 EUPL are:
+— GNU General Public License (GPL) v. 2, v. 3
+— GNU Affero General Public License (AGPL) v. 3
+— Open Software License (OSL) v. 2.1, v. 3.0
+— Eclipse Public License (EPL) v. 1.0
+— CeCILL v. 2.0, v. 2.1
+— Mozilla Public Licence (MPL) v. 2
+— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
+  works other than software
+— European Union Public Licence (EUPL) v. 1.1, v. 1.2
+— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or
+  Strong Reciprocity (LiLiQ-R+)
+
+— The European Commission may update this Appendix to later versions of the
+  above licences without producing a new version of the EUPL, as long as they
+  provide the rights granted in Article 2 of this Licence and protect the
+  covered Source Code from exclusive appropriation.
+— All other changes or additions to this Appendix require the production of a
+  new EUPL version.
diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt
index 6f0d042..36797f2 100644
--- a/_licenses/gpl-2.0.txt
+++ b/_licenses/gpl-2.0.txt
@@ -3,7 +3,6 @@ title: GNU General Public License v2.0
 spdx-id: GPL-2.0
 nickname: GNU GPLv2
 redirect_from: /licenses/gpl-v2/
-source: https://www.gnu.org/licenses/gpl-2.0.txt
 hidden: false
 
 description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. There are multiple variants of the GNU GPL, each with different requirements.
diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt
index 6011db0..2e93005 100644
--- a/_licenses/gpl-3.0.txt
+++ b/_licenses/gpl-3.0.txt
@@ -3,13 +3,12 @@ title: GNU General Public License v3.0
 spdx-id: GPL-3.0
 nickname: GNU GPLv3
 redirect_from: /licenses/gpl-v3/
-source: https://www.gnu.org/licenses/gpl-3.0.txt
 featured: true
 hidden: false
 
 description: Permissions of this strong copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights.
 
-how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
+how: Create a text file in the root of your source code, typically named COPYING (a GNU convention), LICENSE or LICENSE.txt. Then copy the text of the license into that file.
 
 note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.
 
@@ -40,7 +39,7 @@ limitations:
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -684,7 +683,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -703,11 +702,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/_licenses/isc.txt b/_licenses/isc.txt
index 8e34275..47de91a 100644
--- a/_licenses/isc.txt
+++ b/_licenses/isc.txt
@@ -1,7 +1,6 @@
 ---
 title: ISC License
 spdx-id: ISC
-source: https://opensource.org/licenses/isc-license
 
 description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/mit/">MIT</a> licenses, removing some language that is no longer necessary.
 
diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt
index 88fb2d3..6ffdad8 100644
--- a/_licenses/lgpl-2.1.txt
+++ b/_licenses/lgpl-2.1.txt
@@ -3,7 +3,6 @@ title: GNU Lesser General Public License v2.1
 spdx-id: LGPL-2.1
 nickname: GNU LGPLv2.1
 redirect_from: /licenses/lgpl-v2.1/
-source: https://www.gnu.org/licenses/lgpl-2.1.txt
 hidden: false
 
 description: Primarily used for software libraries, the GNU LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. There are two commonly used versions of the GNU LGPL.
diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt
index f14e7f1..e27c333 100644
--- a/_licenses/lgpl-3.0.txt
+++ b/_licenses/lgpl-3.0.txt
@@ -3,12 +3,11 @@ title: GNU Lesser General Public License v3.0
 spdx-id: LGPL-3.0
 nickname: GNU LGPLv3
 redirect_from: /licenses/lgpl-v3/
-source: https://www.gnu.org/licenses/lgpl-3.0.txt
 hidden: false
 
 description: Permissions of this copyleft license are conditioned on making available complete source code of licensed works and modifications under the same license or the GNU GPLv3. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work through interfaces provided by the licensed work may be distributed under different terms and without source code for the larger work.
 
-how: This license is an additional set of permissions to the <a href="/licenses/gpl-3.0">GNU GPLv3</a> license. Follow the instructions to apply the GNU GPLv3. Then add a separate file named COPYING.LESSER in the root of your source code and copy the text.
+how: This license is an additional set of permissions to the <a href="/licenses/gpl-3.0">GNU GPLv3</a> license. Follow the instructions to apply the GNU GPLv3, in the root of your source code. Then add another file named COPYING.LESSER and copy the text.
 
 note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the <a href="/licenses/gpl-3.0">GNU GPLv3 license</a>. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3.
 
@@ -36,7 +35,7 @@ limitations:
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt
index 984bf3b..97d51e7 100644
--- a/_licenses/lppl-1.3c.txt
+++ b/_licenses/lppl-1.3c.txt
@@ -1,7 +1,6 @@
 ---
 title: LaTeX Project Public License v1.3c
 spdx-id: LPPL-1.3c
-source: https://latex-project.org/lppl/lppl-1-3c.html
 
 description: The LaTeX Project Public License (LPPL) is the primary license under which the LaTeX kernel and the base LaTeX packages are distributed.
 
diff --git a/_licenses/mit.txt b/_licenses/mit.txt
index 5104ab2..2fd72e4 100644
--- a/_licenses/mit.txt
+++ b/_licenses/mit.txt
@@ -1,7 +1,6 @@
 ---
 title: MIT License
 spdx-id: MIT
-source: https://opensource.org/licenses/MIT
 featured: true
 hidden: false
 
diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt
index 934af1f..dd31d6a 100644
--- a/_licenses/mpl-2.0.txt
+++ b/_licenses/mpl-2.0.txt
@@ -2,7 +2,6 @@
 title: Mozilla Public License 2.0
 spdx-id: MPL-2.0
 redirect_from: /licenses/mozilla/
-source: https://www.mozilla.org/media/MPL/2.0/index.txt
 hidden: false
 
 description: Permissions of this weak copyleft license are conditioned on making available source code of licensed files and modifications of those files under the same license (or in certain cases, one of the GNU licenses). Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work may be distributed under different terms and without source code for files added in the larger work.
diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt
index 472fd95..951572e 100644
--- a/_licenses/ms-pl.txt
+++ b/_licenses/ms-pl.txt
@@ -1,7 +1,6 @@
 ---
 title: Microsoft Public License
 spdx-id: MS-PL
-source: https://opensource.org/licenses/ms-pl
 
 description: An open source license with a patent grant.
 
diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt
index e015f13..d139ee8 100644
--- a/_licenses/ms-rl.txt
+++ b/_licenses/ms-rl.txt
@@ -1,7 +1,6 @@
 ---
 title: Microsoft Reciprocal License
 spdx-id: MS-RL
-source: https://opensource.org/licenses/ms-rl
 
 description: An open source license with a patent grant similar to the <a href="/licenses/ms-pl/">Microsoft Public License</a>, with the additional condition that any source code for any derived file be provided under this license.
 
diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt
index ce26d43..9f1dab9 100644
--- a/_licenses/ncsa.txt
+++ b/_licenses/ncsa.txt
@@ -2,7 +2,6 @@
 title: University of Illinois/NCSA Open Source License
 spdx-id: NCSA
 nickname: UIUC/NCSA
-source: https://opensource.org/licenses/NCSA
 
 description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the <a href="/licenses/mit/">MIT/X11 license</a>  and the <a href="/licenses/bsd-3-clause/">BSD 3-clause License</a>. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibition of using the names of the authors or the project organization to promote or endorse derived products.
 
@@ -32,9 +31,9 @@ University of Illinois/NCSA Open Source License
 
 Copyright (c) [year] [fullname]. All rights reserved. 
 
-Developed by: [fullname] 
-              [project] 
-              [project_url]
+Developed by: [project] 
+              [fullname] 
+              [projecturl]
                   
 Permission is hereby granted, free of charge, to any person 
 obtaining a copy of this software and associated documentation files 
diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt
index 594696f..066a30f 100644
--- a/_licenses/ofl-1.1.txt
+++ b/_licenses/ofl-1.1.txt
@@ -2,7 +2,6 @@
 title: SIL Open Font License 1.1
 spdx-id: OFL-1.1
 redirect_from: /licenses/ofl/
-source: http://scripts.sil.org/OFL_web
 
 description: The Open Font License (OFL) is maintained by SIL International. It attempts to be a compromise between the values of the free software and typeface design communities. It is used for almost all open source font projects, including those by Adobe, Google and Mozilla.
 
diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt
index d973ace..4533ce3 100644
--- a/_licenses/osl-3.0.txt
+++ b/_licenses/osl-3.0.txt
@@ -1,13 +1,12 @@
 ---
 title: Open Software License 3.0
 spdx-id: OSL-3.0
-source: https://opensource.org/licenses/OSL-3.0
 
 description: OSL 3.0 is a copyleft license that does not require reciprocal licensing on linked works. It also provides an express grant of patent rights from contributors to users, with a termination clause triggered if a user files a patent infringement lawsuit.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under OSL 3.0 must also include the notice "Licensed under the Open Software License version 3.0" adjacent to the copyright notice.
 
-note: OSL 3.0's author has <a href="http://rosenlaw.com/OSL3.0-explained.htm">provided an explanation</a> behind the creation of the license.
+note: OSL 3.0's author has <a href="https://rosenlaw.com/OSL3.0-explained.htm">provided an explanation</a> behind the creation of the license.
 
 using:
   - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt
diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt
index 67e90d7..9b74302 100644
--- a/_licenses/postgresql.txt
+++ b/_licenses/postgresql.txt
@@ -1,16 +1,15 @@
 ---
 title: PostgreSQL License
 spdx-id: PostgreSQL
-source: https://opensource.org/licenses/PostgreSQL
 
 description: A very short, BSD-style license, used specifically for PostgreSQL.  
 
 how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution.
 
 using:
-  - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE
+  - pgBadger: https://github.com/darold/pgbadger/blob/master/LICENSE
   - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE
-  - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt
+  - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE
 
 permissions:
   - commercial-use
@@ -27,7 +26,7 @@ limitations:
 
 ---
 
-PostgreSQL Licence
+PostgreSQL License
 
 Copyright (c) [year], [fullname]
 
diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt
index db18a75..e6a8ae9 100644
--- a/_licenses/unlicense.txt
+++ b/_licenses/unlicense.txt
@@ -1,7 +1,6 @@
 ---
 title: The Unlicense
 spdx-id: Unlicense
-source: https://unlicense.org/UNLICENSE
 hidden: false
 
 description: A license with no conditions whatsoever which dedicates works to the public domain. Unlicensed works, modifications, and larger works may be distributed under different terms and without source code.
diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt
new file mode 100644
index 0000000..6cd2b5a
--- /dev/null
+++ b/_licenses/upl-1.0.txt
@@ -0,0 +1,66 @@
+---
+title: Universal Permissive License v1.0
+spdx-id: UPL-1.0
+
+description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license.  Includes an express grant of patent rights.  Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement.
+
+how: Insert the license or a link to it along with a copyright notice into your source file(s), and/or create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license and your copyright notice into the file.
+
+note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/.
+
+using:
+  - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE.txt
+  - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE
+  - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes/blob/master/LICENSE
+
+permissions:
+  - commercial-use
+  - modifications
+  - distribution
+  - patent-use
+  - private-use
+
+conditions:
+  - include-copyright
+
+limitations:
+  - liability
+  - warranty
+
+---
+
+Copyright (c) [year] [fullname]
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associate documentation and/or data
+(collectively the "Software"), free of charge and under any and all copyright
+rights in the Software, and any and all patent rights owned or freely
+licensable by each licensor hereunder covering either (i) the unmodified
+Software as contributed to or provided by such licensor, or (ii) the Larger
+Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a “Larger Work” to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at
+a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt
index 2a23d0a..bbe5160 100644
--- a/_licenses/wtfpl.txt
+++ b/_licenses/wtfpl.txt
@@ -1,7 +1,6 @@
 ---
 title: "Do What The F*ck You Want To Public License"
 spdx-id: WTFPL
-source: http://www.wtfpl.net/txt/copying/
 
 description: The easiest license out there. It gives the user permissions to do whatever they want with your code.
 
diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt
index 1022261..0be8fd0 100644
--- a/_licenses/zlib.txt
+++ b/_licenses/zlib.txt
@@ -1,7 +1,6 @@
 ---
 title: zlib License
 spdx-id: Zlib
-source: https://opensource.org/licenses/Zlib
 
 description: A short permissive license, compatible with GPL. Requires altered source versions to be documented as such.
 
diff --git a/about.md b/about.md
index a99a430..f782480 100644
--- a/about.md
+++ b/about.md
@@ -10,9 +10,9 @@ If you already know what you're doing and have a license you prefer to use, that
 
 ## Not comprehensive
 
-This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the [homepage](/), we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/), and have a page about [licenses for non-software projects](/non-software/).
+This site is not a comprehensive directory of open source licenses. On the [homepage](/), we break it down into just two licenses. The vast majority of projects will likely be fine choosing from one of these two. Just in case you have specific needs not covered by those two, we also highlight a [few other licenses to consider](/licenses/), and have a page about [licenses for non-software projects](/non-software/).
 
-See our [appendix](/appendix) for a table of all of the licenses cataloged in the choosealicense.com repository and the links below for *even more licenses* that you **do not** need to learn about when choosing a license for your project.
+See our [appendix](/appendix/) for a table of all of the licenses cataloged in the choosealicense.com repository and the links below for *even more licenses* that you **do not** need to learn about when choosing a license for your project.
 
 ### Additional resources
 
@@ -20,8 +20,6 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th
 
 * Open Source Initiative's FAQ on [Which Open Source license should I choose to release my software under?](https://opensource.org/faq#which-license)
 * Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html)
-* [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/)
-* [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan
 * [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues
 
 ## Help us improve it
diff --git a/assets/css/application.scss b/assets/css/application.scss
index 8ced3ad..e462748 100644
--- a/assets/css/application.scss
+++ b/assets/css/application.scss
@@ -125,6 +125,10 @@ strong {
   width: 220px;
 }
 
+.situations .existing {
+  margin-top: 16px;
+}
+
 .situations .whatever {
   margin-top: 16px;
 }
@@ -143,9 +147,9 @@ strong {
   display: inline-block;
 }
 
-.three-arrows { background-position: 0 0;      width: 72px; height: 57px; }
-.lightbulb    { background-position: 0 -57px;  width: 43px; height: 72px; }
-.circular     { background-position: 0 -129px; width: 72px; height: 69px; }
+.three-arrows { background-position: 0 0;      width: 72px; height: 56px; }
+.community    { background-position: 0 -57px;  width: 72px; height: 56px; }
+.circular     { background-position: 0 -115px; width: 72px; height: 68px; }
 
 
 .license-overview {
@@ -290,6 +294,43 @@ strong {
   width: 100%;
 }
 
+.sidebar input#repository-url {
+  width: 100%;
+  padding: 5px 20px 5px 10px;
+  box-sizing: border-box;
+  margin-right: 12px;
+}
+
+.input-wrapper {
+  position: relative;
+}
+
+.input-wrapper .status-indicator {
+  position: absolute;
+  right: 5px;
+  top: 6px;
+  height: 8px;
+  width: 8px;
+  border-radius: 50%;
+  background: #fff;
+  animation: none;
+  border: 4px solid #ddd;  
+}
+
+.input-wrapper .status-indicator.fetching {  
+  border-right-color: transparent;
+  animation: rotate 0.8s infinite linear;
+}
+
+.input-wrapper .status-indicator.error {  
+  border: 4px solid #c6403d;  
+}
+
+@keyframes rotate {
+  0%    { transform: rotate(0deg); }
+  100%  { transform: rotate(360deg); }
+}
+
 .note {
   color: #687072;
 }
@@ -382,7 +423,9 @@ strong {
 
 .qtip-conditions,
 .qtip-permissions,
-.qtip-limitations {
+.qtip-limitations,
+.qtip-fetching,
+.qtip-error {
   font-size: 12px;
   line-height: 1.3;
 }
@@ -398,23 +441,27 @@ strong {
   color: #fff;
 }
 
+.qtip-fetching,
 .qtip-permissions {
   background-color: #d8f4d7;
   border-color: #3dc637;
   color: #298625;
 }
 
+.qtip-fetching .qtip-titlebar,
 .qtip-permissions .qtip-titlebar {
   background-color: #3dc637;
   color: #fff;
 }
 
+.qtip-error,
 .qtip-limitations {
   background-color: #f4d9d8;
   border-color: #c6403d;
   color: #812a28;
 }
 
+.qtip-error .qtip-titlebar,
 .qtip-limitations .qtip-titlebar {
   background-color: #c6403d;
   color: #fff;
@@ -438,12 +485,12 @@ strong {
  only screen and (-o-min-device-pixel-ratio: 200/100),
  only screen and (min-device-pixel-ratio: 2.0) {
   .three-arrows,
-  .lightbulb,
+  .community,
   .circular {
     background-image: url(../img/home-sprite@2x.png);
-    -webkit-background-size: 72px 198px;
-    -moz-background-size: 72px 198px;
-    background-size: 72px 198px;
+    -webkit-background-size: 72px 182px;
+    -moz-background-size: 72px 182px;
+    background-size: 72px 182px;
   }
 
   .license-sprite {
diff --git a/assets/img/home-sprite.png b/assets/img/home-sprite.png
index f9390ea..64e489f 100644
Binary files a/assets/img/home-sprite.png and b/assets/img/home-sprite.png differ
diff --git a/assets/img/home-sprite@2x.png b/assets/img/home-sprite@2x.png
index eaf6d51..1107696 100644
Binary files a/assets/img/home-sprite@2x.png and b/assets/img/home-sprite@2x.png differ
diff --git a/assets/js/app.coffee b/assets/js/app.coffee
index 2141598..d9b0778 100644
--- a/assets/js/app.coffee
+++ b/assets/js/app.coffee
@@ -31,6 +31,7 @@ class Choosealicense
   constructor: ->
     @initTooltips()
     @initClipboard()
+    @initLicenseSuggestion()
 
   # Init tooltip action
   initTooltips: ->
@@ -70,6 +71,111 @@ class Choosealicense
   # Post-copy user feedback callback
   clipboardComplete: (client, args) ->
     @textContent = "Copied!"
+  
+  # Initializes the repository suggestion feature
+  initLicenseSuggestion: ->
+    inputEl = $("#repository-url")
+    licenseId = inputEl.attr("data-license-id")
+    statusIndicator = $(".status-indicator")
+    new LicenseSuggestion(inputEl, licenseId, statusIndicator)
 
+class LicenseSuggestion
+  constructor: (@inputEl, @licenseId, @statusIndicator) ->
+    @setupTooltips()
+    @bindEventHandlers()
+  
+  # Initializes tooltips on the input element
+  setupTooltips: =>
+    @inputEl.qtip
+      content:
+        text: false
+        title:
+          text: "message"
+      show: false
+      hide: false
+      position:
+        my: "top center"
+        at: "bottom center"
+      style:
+        classes: "qtip-shadow"
+  
+  # Main event handlers for user input
+  bindEventHandlers: =>    
+    @inputEl.on "input", (event) =>
+      @setStatus ""
+    .on "keyup", (event) =>            
+      if event.keyCode == 13 and event.target.value
+        # Validate the user input first
+        try
+          repositoryFullName = @parseUserInput event.target.value
+        catch
+          @setStatus "Error", "Invalid URL."
+          return
+        
+        @setStatus "Fetching"        
+        @fetchInfoFromGithubAPI repositoryFullName, (err, repositoryInfo=null) =>
+          if (err)
+            @setStatus "Error", err.message
+            return
+          if repositoryInfo.license # The repository already has a license
+            license = repositoryInfo.license
+            @setStatus "Error", @repositoryLicense repositoryFullName, license
+          else # The repository is not licensed
+            licenseUrl = encodeURIComponent "https://github.com/#{repositoryFullName}/community/license/new?template=#{@licenseId}"
+            # Provide the chance to the user log-in, since the URL to suggest a license is restricted
+            window.location.href = "https://github.com/login?return_to=#{licenseUrl}"
+            @setStatus ""
+            @inputEl.val("")
+
+  # Try to extract the repository full name from the user input
+  parseUserInput: (userInput) ->
+    repository = /https?:\/\/github\.com\/(.*?)\/(.+)(\.git)?$/.exec userInput
+    [_, username, project] = repository
+    project = project
+      .split /\/|\.git/
+      .filter (str) -> str
+      .slice 0, 1
+      .join ""
+    return username + '/' + project
+  
+  # Displays an indicator and tooltips to the user about the current status
+  setStatus: (status="", message="") =>
+    statusClass = status.toLowerCase()
+    displayQtip = (status, message) =>
+      @inputEl.qtip("api")
+        .set("content.text", message)
+        .set("content.title", status)
+        .set("style.classes", "qtip-shadow qtip-#{statusClass}")
+        .show()
+
+    switch status
+      when "Fetching"
+        @statusIndicator.removeClass('error').addClass(statusClass)
+      when "Error"
+        @statusIndicator.removeClass('fetching').addClass(statusClass)
+        displayQtip status, message
+      else
+        @inputEl.qtip("api").hide()
+        @statusIndicator.removeClass('fetching error')
+  
+  # Fetches information about a repository from the Github API
+  fetchInfoFromGithubAPI: (repositoryFullName, callback) ->
+    $.getJSON "https://api.github.com/repos/"+repositoryFullName, (info) ->
+      callback null, info
+    .fail (e) -> 
+      if e.status == 404
+        callback new Error "Repository <b>#{repositoryFullName}</b> not found."
+      else
+        callback new Error "Network error when trying to get information about <b>#{repositoryFullName}</b>."
+  
+  # Generates a message showing that a repository is already licensed
+  repositoryLicense: (repositoryFullName, license) ->
+    foundLicense = window.licenses.find (lic) -> lic.spdx_id == license.spdx_id
+    if foundLicense # Links the license to its page on this site
+      "The repository <b> #{repositoryFullName}</b> is already licensed under the 
+        <a href='/licenses/#{foundLicense.spdx_id.toLowerCase()}'><b>#{foundLicense.title}</b></a>."
+    else
+      "The repository <b> #{repositoryFullName}</b> is already licensed."
+    
 $ ->
   new Choosealicense()
diff --git a/community.md b/community.md
new file mode 100644
index 0000000..c1dbe82
--- /dev/null
+++ b/community.md
@@ -0,0 +1,24 @@
+---
+layout: default
+permalink: /community/
+redirect_from: /existing/
+title: Existing projects and communities
+---
+
+If you're contributing to or extending an existing project, it's almost always easiest to continue using that project's license. Look for a file called `LICENSE` or `COPYING`, or a notice in the project's `README` to find out what that license is. If you can't find a license, [ask](/no-permission/#for-users).
+
+Depending on how you're building on an existing project and what its license is, using the existing project's license for your own might not just be the easiest thing to do, but a condition on which your permission to build on the existing project rests: see the "same license" condition of [some licenses](/licenses/).
+
+Some communities have strong preferences for particular licenses. If you want to participate in one of these, it will be easier to use the preferred license even if you're starting a brand new project with no existing dependencies. Examples:
+
+{: .bullets}
+
+* [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
+* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) dictates [Apache License 2.0](/licenses/apache-2.0/) by default
+* [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
+* [NPM packages](https://libraries.io/search?platforms=NPM) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses
+* [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/)
+* [Rust](https://rust-lang-nursery.github.io/api-guidelines/necessities.html#crate-and-its-dependencies-have-a-permissive-license-c-permissive) crates are overwhelmingly licensed under both [MIT](/licenses/mit/) and [Apache License 2.0](/licenses/apache-2.0/)
+* [WordPress](https://wordpress.org/about/license/) plugins and themes must be [GNU GPLv2](/licenses/gpl-2.0/) (or later)
+
+Communities come in all shapes and sizes, and more than one might be pertinent (e.g., [your company](https://opensource.guide/legal/#what-does-my-companys-legal-team-need-to-know)). The examples above are *very* well established. If the community you see your project as a part of doesn't have set-in-stone licensing traditions, or you don't see your project as part of any particular community, that's just fine: [make your own choice of an open source license](/).
diff --git a/existing.md b/existing.md
deleted file mode 100644
index e6c6dc0..0000000
--- a/existing.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-layout: default
-permalink: /existing/
-title: Existing projects and communities
----
-
-If you're contributing to or extending an existing project, it's almost always easiest to continue using that project's license. Look for a file called `LICENSE` or `COPYING`, or a notice in the project's `README` to find out what that license is. If you can't find a license, [ask](/no-license/#for-users).
-
-Depending on how you're building on an existing project and what its license is, using the existing project's license for your own might not just be the easiest thing to do, but a condition on which your permission to build on the existing project rests: see the "same license" condition of [some licenses](/licenses/).
-
-Some communities have strong preferences for particular licenses. If you want to participate in one of these, it will be easier to use the preferred license even if you're starting a brand new project with no existing dependencies. A few examples:
-
-{: .bullets}
-
-* [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
-* [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
-* [OpenBSD](https://www.openbsd.org/policy.html) prefers [ISC](/licenses/isc/)
-
-Communities come in all shapes and sizes. The examples above are *very* well established. If the community you see your project as a part of doesn't have set-in-stone licensing traditions, or you don't see your project as part of any particular community, that's just fine: [make your own choice of an open source license](/).
diff --git a/index.html b/index.html
index 8f70441..f3d2477 100644
--- a/index.html
+++ b/index.html
@@ -6,43 +6,45 @@ title: Choose an open source license
 permalink: /
 ---
 
+<p>An open source license protects contributors and users. Businesses and savvy developers won’t touch a project without this protection.</p>
+
 <h2>
   <span>{</span>
   Which of the following best describes your situation?
   <span>}</span>
 </h2>
 <ul class="triptych situations clearfix">
+  <li class="existing">
+    <a href="community/">
+      <span class="triptych-sprite community"></span>
+      <h3>I need to work in a community.</h3>
+    </a>
+    <p>
+      Use the <a href="community/">license preferred by the community</a> you’re contributing to or depending on. Your project will fit right in.
+    </p>
+    <p>
+      If you have a dependency that doesn’t have a license, ask its maintainers to <a href="no-permission/#for-users">add a license</a>.
+    </p>
+  </li>
   <li class="whatever">
-    <a href="licenses/mit">
+    <a href="licenses/mit/">
       <span class="triptych-sprite three-arrows"></span>
       <h3>I want it simple and permissive.</h3>
     </a>
     <p>
-      The <a href="licenses/mit">MIT License</a> is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable.
+      The <a href="licenses/mit/">MIT License</a> is short and to the point. It lets people do almost anything they want with your project, including to make and distribute closed source versions.
     </p>
     <p>
       {% include using-sentence.html license-id="mit" %}
     </p>
   </li>
-  <li class="patents">
-    <a href="licenses/apache-2.0/">
-      <span class="triptych-sprite lightbulb"></span>
-      <h3>I’m concerned about patents.</h3>
-    </a>
-    <p>
-      The <a href="licenses/apache-2.0/">Apache License 2.0</a> is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
-    </p>
-    <p>
-      {% include using-sentence.html license-id="apache-2.0" %}
-    </p>
-  </li>
   <li class="copyleft">
     <a href="licenses/gpl-3.0/">
       <span class="triptych-sprite circular"></span>
       <h3>I care about sharing improvements.</h3>
     </a>
     <p>
-      The <a href="licenses/gpl-3.0/">GNU GPLv3</a> is a copyleft license that requires anyone who distributes your code or a derivative work to make the source available under the same terms, and also provides an express grant of patent rights from contributors to users.
+      The <a href="licenses/gpl-3.0/">GNU GPLv3</a> also lets people do almost anything they want with your project, <em>except</em> to distribute closed source versions.
     </p>
     <p>
       {% include using-sentence.html license-id="gpl-3.0" %}
@@ -58,19 +60,19 @@ permalink: /
   <li>
     <h3>My project isn’t software.</h3>
     <p>
-      <a href="non-software">There are licenses for that</a>.
+      <a href="non-software/">There are licenses for that</a>.
     </p>
   </li>
   <li>
     <h3>I want more choices.</h3>
     <p>
-      <a href="licenses">More licenses are available</a>.
+      <a href="licenses/">More licenses are available</a>.
     </p>
   </li>
   <li>
     <h3>I don’t want to choose a license.</h3>
     <p>
-      <a href="no-license">You don’t have to</a>.
+      <a href="no-permission/">Here’s what happens if you don’t</a>.
     </p>
   </li>
 </ul>
diff --git a/licenses.html b/licenses.html
index dcd3655..4a2bf68 100644
--- a/licenses.html
+++ b/licenses.html
@@ -5,7 +5,7 @@ class: license-types
 title: Licenses
 ---
 
-<p>Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the <a href="/">home page</a> (GNU GPLv3, Apache License 2.0, and MIT License) fall within this spectrum.</p>
+<p>Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the <a href="/">home page</a> (GNU GPLv3 and MIT) fall within this spectrum.</p>
 <p style="font-size:small; margin-bottom: 40px">If you were looking for a reference table of all of the licenses on choosealicense.com, see the <a href="/appendix">appendix</a>.</p>
 
 {% include license-overview.html license-id="agpl-3.0" %}
diff --git a/no-license.md b/no-permission.md
similarity index 70%
rename from no-license.md
rename to no-permission.md
index 688f1d2..f4a1c23 100644
--- a/no-license.md
+++ b/no-permission.md
@@ -1,12 +1,14 @@
 ---
 layout: default
-permalink: no-license/
-redirect_from: /licenses/no-license/
+permalink: no-permission/
+redirect_from:
+  - /no-license/
+  - /licenses/no-license/
 title: No License
 description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law."
 ---
 
-When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can use, copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), “nobody” starts including you.
+When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), “nobody” starts including you.
 
 Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service), by which you allow others to view and fork your repository. Others may not need your permission if [limitations and exceptions to copyright](https://en.wikipedia.org/wiki/Limitations_and_exceptions_to_copyright) apply to their particular situation. Neither site terms nor jurisdiction-specific copyright limitations are sufficient for the kinds of collaboration that people usually seek on a public code host, such as experimentation, modification, and sharing as fostered by an open source license.
 
@@ -20,8 +22,8 @@ If you find software that doesn't have a license, that generally means you have
 
 Your options:
 
-**Ask the maintainers nicely to add a license.** Unless the software includes strong indications to the contrary, lack of a license is probably an oversight. If the software is hosted on a site like GitHub, open an issue requesting a license and include a link to this site, or if you're bold and it's fairly obvious what license is most appropriate, open a pull request to add a license.
+{: .bullets}
 
-**Don't use the software.** Find or create an alternative that is under an open source license.
-
-**Negotiate a private license.** Bring your lawyer.
+- **Ask the maintainers nicely to add a license.** Unless the software includes strong indications to the contrary, lack of a license is probably an oversight. If the software is hosted on a site like GitHub, open an issue requesting a license and include a link to this site. If you're bold and it's fairly obvious what license is most appropriate, open a pull request to add a license – see "suggest this license" in the sidebar of the page for each license on this site (e.g., [MIT](/licenses/mit/#suggest-this-license)).
+- **Don't use the software.** Find or create an alternative that is under an open source license.
+- **Negotiate a private license.** Bring your lawyer.
diff --git a/non-software.md b/non-software.md
index 091fa22..ac245df 100644
--- a/non-software.md
+++ b/non-software.md
@@ -8,7 +8,7 @@ Open source software licenses can be used for non-software works, and often are
 
 ### Data, media, etc.
 
-[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](http://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that CC-BY-4.0 and CC-BY-SA-4.0 should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software).
+[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that CC-BY-4.0 and CC-BY-SA-4.0 should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software).
 
 ### Documentation
 
diff --git a/script/check-approval b/script/check-approval
index 6b491db..5312766 100755
--- a/script/check-approval
+++ b/script/check-approval
@@ -11,9 +11,7 @@ require 'colored'
 require 'fuzzy_match'
 
 # Display usage instructions
-if ARGV.count != 1
-  puts File.open(__FILE__).read.scan(/^# .*/)[0...3].join("\n").gsub(/^# /, '')
-end
+puts File.open(__FILE__).read.scan(/^# .*/)[0...3].join("\n").gsub(/^# /, '') if ARGV.count != 1
 
 class TrueClass
   def to_s
@@ -52,6 +50,7 @@ approvals.each do |approver, licenses|
   rows << ["#{approver} approved", licenses.include?(license)]
 end
 
+license_ids = licenses.map { |l| l['id'] }
 current = license_ids.include?(license)
 rows << ['Current license', current]
 
diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb
index 0b316bd..b1c282b 100644
--- a/spec/license_bom_spec.rb
+++ b/spec/license_bom_spec.rb
@@ -7,7 +7,7 @@ describe 'byte order marks' do
     context "the #{File.basename(file, '.txt')} license" do
       it 'does not begin with a byte order mark' do
         bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF")
-        msg = 'License file begins with a Byte Order Mark. See http://stackoverflow.com/a/1068700.'
+        msg = 'License file begins with a Byte Order Mark. See https://stackoverflow.com/a/1068700.'
         expect(bom).to eql(false), msg
       end
     end
diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb
new file mode 100644
index 0000000..4856f35
--- /dev/null
+++ b/spec/license_fields_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'license fillable fields' do
+  licenses.each do |license|
+    context "The #{license['title']} license" do
+      it 'should only contain supported fillable fields' do
+        matches = license['content'][1, 1000].scan(/\s+\[([a-z_]+)\]/)
+        extra_fields = matches.flatten - (fields.map { |f| f['name'] })
+        expect(extra_fields).to be_empty
+      end
+    end
+  end
+end
diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb
index 37a123e..09bf62c 100644
--- a/spec/license_meta_spec.rb
+++ b/spec/license_meta_spec.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'licensee'
 require 'spec_helper'
 
 describe 'license meta' do
@@ -27,8 +26,6 @@ describe 'license meta' do
           'afl-3.0',
           'agpl-3.0',
           'artistic-2.0',
-          'bsd-2-clause',
-          'bsd-3-clause',
           'bsd-3-clause-clear',
           'bsl-1.0',
           'cc0-1.0',
@@ -49,28 +46,17 @@ describe 'license meta' do
       end
 
       context 'licensee detects using examples' do
-        module Licensee
-          class License
-            class << self
-              def license_dir
-                dir = ::File.dirname(__FILE__)
-                ::File.expand_path '../_licenses', dir
-              end
-            end
-          end
-        end
-
         slug = license['slug']
 
         examples.each do |example|
           example_url = example.values[0]
 
           context "the #{example_url} URL" do
-            let(:content)  { open(example_url).read }
+            let(:content)  { OpenURI.open_uri(example_url).read }
             let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license }
 
             if example_url.start_with?('https://github.com/')
-              example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2')
+              example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w\.-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2')
             elsif example_url.start_with?('https://git.savannah.gnu.org/', 'https://git.gnome.org/')
               example_url.gsub!(%r{/tree/}, '/plain/')
             elsif example_url.start_with?('https://bitbucket.org/')
diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb
index adf631f..8ef6725 100644
--- a/spec/license_shown_spec.rb
+++ b/spec/license_shown_spec.rb
@@ -10,7 +10,7 @@ describe 'shown licenses' do
     apache-2.0
     bsd-2-clause
     bsd-3-clause
-    epl-1.0
+    epl-2.0
     gpl-2.0
     gpl-3.0
     lgpl-2.1
diff --git a/spec/self_license_spec.rb b/spec/self_license_spec.rb
new file mode 100644
index 0000000..83fe270
--- /dev/null
+++ b/spec/self_license_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+context 'licensee detects this project' do
+  let(:detected) { Licensee.project('.').license }
+
+  it 'license as MIT' do
+    expect(detected.key).to eq('mit')
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4070ccf..192d00e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,8 @@
 
 require 'jekyll'
 require 'json'
+require 'licensee'
 require 'open-uri'
-require 'nokogiri'
 
 module SpecHelper
   class << self
@@ -71,8 +71,13 @@ def rule?(tag, group)
 end
 
 def spdx_list
-  url = 'https://raw.githubusercontent.com/sindresorhus/spdx-license-list/master/spdx.json'
-  SpecHelper.spdx ||= JSON.parse(open(url).read)
+  SpecHelper.spdx ||= begin
+    url = 'https://spdx.org/licenses/licenses.json'
+    list = JSON.parse(OpenURI.open_uri(url).read)['licenses']
+    list.each_with_object({}) do |values, memo|
+      memo[values['licenseId']] = values
+    end
+  end
 end
 
 def spdx_ids
@@ -80,13 +85,13 @@ def spdx_ids
 end
 
 def find_spdx(license)
-  spdx_list.find { |name, _properties| name == license }
+  spdx_list.find { |name, _properties| name.casecmp(license).zero? }
 end
 
 def osi_approved_licenses
   SpecHelper.osi_approved_licenses ||= begin
     licenses = {}
-    list = spdx_list.select { |_id, meta| meta['osiApproved'] }
+    list = spdx_list.select { |_id, meta| meta['isOsiApproved'] }
     list.each do |id, meta|
       licenses[id.downcase] = meta['name']
     end
@@ -96,31 +101,24 @@ end
 
 def fsf_approved_licenses
   SpecHelper.fsf_approved_licenses ||= begin
-    url = 'https://www.gnu.org/licenses/license-list.en.html'
-    doc = Nokogiri::HTML(open(url).read)
-    list = doc.css('.green dt')
+    url = 'https://wking.github.io/fsf-api/licenses-full.json'
+    object = JSON.parse(OpenURI.open_uri(url).read)
     licenses = {}
-    list.each do |license|
-      a = license.css('a').find { |link| !link.text.nil? && !link.text.empty? && link.attr('id') }
-      next if a.nil?
-      id = a.attr('id').downcase
-      name = a.text.strip
-      licenses[id] = name
-    end
+    object['licenses'].each_value do |meta|
+      next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre')
 
-    # FSF approved the Clear BSD, but doesn't use its SPDX ID or Name
-    if licenses.keys.include? 'clearbsd'
-      licenses['bsd-3-clause-clear'] = licenses['clearbsd']
+      meta['identifiers']['spdx'].each do |identifier|
+        licenses[identifier.downcase] = meta['name']
+      end
     end
-
     licenses
   end
 end
 
 def od_approved_licenses
   SpecHelper.od_approved_licenses ||= begin
-    url = 'http://licenses.opendefinition.org/licenses/groups/od.json'
-    data = open(url).read
+    url = 'https://licenses.opendefinition.org/licenses/groups/od.json'
+    data = OpenURI.open_uri(url).read
     data = JSON.parse(data)
     licenses = {}
     data.each do |id, meta|
@@ -133,3 +131,14 @@ end
 def approved_licenses
   (osi_approved_licenses.keys + fsf_approved_licenses.keys + od_approved_licenses.keys).flatten.uniq.sort
 end
+
+module Licensee
+  class License
+    class << self
+      def license_dir
+        dir = ::File.dirname(__FILE__)
+        ::File.expand_path '../_licenses', dir
+      end
+    end
+  end
+end