diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 280948f4..f46c8c4c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,39 +1,37 @@
 <!--
-### Free SaaS Offering Submission
+ ### Free SaaS Offering Submission
 
-Thank you for contributing to this list. This list is for **SaaS**
-services that offer a **free tier** to help developers evaluate and
-build something that users can later use and get support for.
+ Thank you for contributing to this list. This list is for **SaaS**
+ services that offer a **free tier** to help developers evaluate and
+ build something that users can later use and get support for.
 
-The focus of this list is quite broad but we try to keep things
-limited to that which infrastructure developers, like DevOps Practitioners,
-would find useful.
+ The focus of this list is quite broad but we try to keep things
+ limited to that which infrastructure developers, like DevOps Practitioners,
+ would find useful.
 
-This list is the result of more than a thousand people contributing
-to make something useful, we appreciate your efforts.
+ This list is the result of more than a thousand people contributing
+ to make something useful, we appreciate your efforts.
 
-### Code of Conduct
+ ### Code of Conduct
 
-We are not here to argue with you. If you are argumentative, abusive,
-lie or missrepresent your service or are otherwise anti-social we will
-block you.
+ We are not here to argue with you. If you are argumentative, abusive,
+ lie or missrepresent your service or are otherwise anti-social we will
+ block you.
 
-### Services we do not accept
-
-  * cPanel like PHP+MySQL hosting services.
-  * Free dns services that are generic frontends to cloudflare or similar
-  * Services that are verbatim copy pastes of others while adding no value
+ ### Services we do not accept
 
+   * cPanel like PHP + MySQL hosting services.
+   * Free dns services that are generic frontends to CloudFlare or similar
+   * Services that are verbatim copy pastes of others while adding no value
 -->
 
-### New Submission Check List
+## Requirements
 
-<!-- Only for new submissions -->
+<!-- This is only for new submissions -->
+<!-- Please ensure your submission ticks all of the requirements -->
 
-Please ensure your submission ticks all of these boxes:
-
- - [ ] This is Software as a Service not self hosted
- - [ ] It has a free tier not just a free trial
- - [ ] The submission mentions what is free
- - [ ] The submission is not already present in the list
- - [ ] The service has contact details of those running it and a privacy policy
+ * [ ] This is Software as a Service not self hosted
+ * [ ] It has a free tier not just a free trial
+ * [ ] The submission mentions what is free
+ * [ ] The submission is not already present in the list
+ * [ ] The service has contact details of those running it and a privacy policy
diff --git a/README.md b/README.md
index e4d4c5e3..b1cd2c0a 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ This list is the result of Pull Requests, reviews, ideas and work done by 1100+
 
 **NOTE**: This list is only for as-a-Service offerings, not for self-hosted software. For a service to be eligible it has to offer a free tier and not just a free trial. If the free tier is time-bucketed it has to be for at least a year. We also consider the free tier from a security perspective, so SSO is fine but I will not accept services that restrict TLS to paid-only tiers.
 
-Table of Contents
-=================
+# Table of Contents
 
    * [Major Cloud Providers' Always-Free Limits](#major-cloud-providers)
    * [Cloud management solutions](#cloud-management-solutions)
diff --git a/index.html b/index.html
index 9cb2320d..d1a78f98 100644
--- a/index.html
+++ b/index.html
@@ -1,61 +1,77 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <meta charset="UTF-8">
-  <title>Free for developers</title>
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css">
-  <link 
-      rel="stylesheet"
-      href="//cdn.jsdelivr.net/npm/docsify-darklight-theme@latest/dist/style.min.css"
-      title="docsify-darklight-theme"
-      type="text/css"
-  />
-  <link rel="icon" href="logo.webp" type="image/gif" sizes="16x16">
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-DLYKZXPL9J"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
+  <head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta charset="UTF-8">
 
-  gtag('config', 'G-DLYKZXPL9J');
-</script>
+    <!-- HTML Meta Tags -->
+    <title>Free for Developers</title>
+    <meta name="description" content="Developers and Open Source authors now have a massive amount of services offering free tiers, but it can be hard to find them all to make informed decisions.">
 
-</head>
-<body>
-  <noscript>This page requires JavaScript to work, please enable it or just read it on <a href="https://github.com/ripienaar/free-for-dev">Here</a>.</noscript>
-  <div id="app">Loading...</div>
-  <script>
-    window.$docsify = {
-      name: 'Free for developers',
-      repo: 'ripienaar/free-for-dev',
-      search: ['/'],
-      darklightTheme: {
-        siteFont : 'Source Sans Pro, Helvetica Neue',
-        defaultTheme : 'light',
-        codeFontFamily : 'Roboto Mono, Monaco, courier, monospace',
-        bodyFontSize: '15px',
+    <!-- Google / Search Engine Tags -->
+    <meta itemprop="name" content="Free for Developers">
+    <meta itemprop="description" content="Developers and Open Source authors now have a massive amount of services offering free tiers, but it can be hard to find them all to make informed decisions.">
+    <meta itemprop="image" content="https://raw.githubusercontent.com/ripienaar/free-for-dev/master/logo.webp">
+
+    <!-- Facebook Meta Tags -->
+    <meta property="og:url" content="https://free-for.dev">
+    <meta property="og:type" content="website">
+    <meta property="og:title" content="Free for Developers">
+    <meta property="og:description" content="Developers and Open Source authors now have a massive amount of services offering free tiers, but it can be hard to find them all to make informed decisions.">
+    <meta property="og:image" content="https://raw.githubusercontent.com/ripienaar/free-for-dev/master/logo.webp">
+
+    <!-- Twitter Meta Tags -->
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:title" content="Free for Developers">
+    <meta name="twitter:description" content="Developers and Open Source authors now have a massive amount of services offering free tiers, but it can be hard to find them all to make informed decisions.">
+    <meta name="twitter:image" content="https://raw.githubusercontent.com/ripienaar/free-for-dev/master/logo.webp">
+
+    <!-- Stylesheets -->
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css">
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify-darklight-theme@latest/dist/style.min.css" title="docsify-darklight-theme" type="text/css">
+
+    <!-- Favicon -->
+    <link rel="icon" href="logo.webp" type="image/gif">
+
+    <!-- Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-DLYKZXPL9J"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'G-DLYKZXPL9J');
+    </script>
+  </head>
+
+  <body>
+    <noscript>This page requires JavaScript to work, please enable it or read <a href="https://github.com/ripienaar/free-for-dev">here</a>.</noscript>
+
+    <div id="app">Loading...</div>
+
+    <script>
+      window.$docsify = {
+        name: "Free for Developers",
+        repo: "ripienaar/free-for-dev",
+        search: ["/"],
+        darklightTheme: {
+          siteFont : "Source Sans Pro, Helvetica Neue",
+          defaultTheme : "light",
+          codeFontFamily : "Roboto Mono, Monaco, courier, monospace",
+          bodyFontSize: "15px"
+        }
       }
-    }
-  </script>
-  <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script>
-  <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/search.min.js"></script>
-  <script 
-      src="//cdn.jsdelivr.net/npm/docsify-darklight-theme@latest/dist/index.min.js"
-      type="text/javascript">
-  </script>
-  <style>
-    a[href="#/?id=%f0%9f%aa%90-deta-the-free-cloud-for-hackers"] {
-      color: rgb(233, 105, 0) !important;
-      font-weight: bold !important;
-    }
+    </script>
 
-    blockquote:first-of-type {
-      background-color: rgba(235, 248, 242, 0.363);
+    <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script>
+    <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/search.min.js"></script>
+    <script src="//cdn.jsdelivr.net/npm/docsify-darklight-theme@latest/dist/index.min.js" type="text/javascript"></script>
 
-    }
-  </style>
-</body>
+    <style>
+      blockquote:first-of-type {
+        background-color: rgba(235, 248, 242, 0.363);
+      }
+    </style>
+  </body>
 </html>
