diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html
new file mode 100644
index 00000000..96c72e51
--- /dev/null
+++ b/_includes/sections/productivity-tools.html
@@ -0,0 +1,40 @@
+<h1 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h1>
+
+<div class="row mb-2">
+
+  {% include card.html color="success"
+  title="Etherpad"
+  image="assets/img/tools/Etherpad.png"
+  url="http://etherpad.org/"
+  footer="OS: Windows, macOS, Linux."
+  description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc."
+  %}
+
+  {% include card.html color="primary"
+  title="Write.as"
+  image="assets/img/tools/WriteAs.png"
+  url="https://write.as/"
+  tor="http://writeas7pm7rcdqg.onion"
+  footer="OS: Windows, macOS, Linux, Android, iOS, Chrome OS, Web."
+  description="Write.as is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
+  %}
+
+  {% include card.html color="warning"
+  title="ProtectedText"
+  image="assets/img/tools/ProtectedText.png"
+  url="https://www.protectedtext.com/"
+  footer="OS: All Browsers."
+  description="ProtectedText is an open source web application. It encrypts and decrypts text in the browser, and password (or its hash) is never sent to the server - so that text can't be decrypted even if requested by authorities. No cookies, no sessions, no registration, no users tracking."
+  %}
+
+</div>
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
+  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
+  <li><a href="https://disroot.org/">disroot.org</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, which is free and OpenSource. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite</li>
+</ul>
diff --git a/index.html b/index.html
index 5e563c14..1e98be39 100644
--- a/index.html
+++ b/index.html
@@ -61,44 +61,8 @@ layout: default
 
   {% include sections/paste-services.html %}
 
-  <h1 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h1>
-  <div class="row mb-2">
+  {% include sections/productivity-tools.html %}
 
-    {% include card.html color="success"
-    title="Etherpad"
-    image="assets/img/tools/Etherpad.png"
-    url="http://etherpad.org/"
-    footer="OS: Windows, macOS, Linux."
-    description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc."
-    %}
-
-    {% include card.html color="primary"
-    title="Write.as"
-    image="assets/img/tools/WriteAs.png"
-    url="https://write.as/"
-    tor="http://writeas7pm7rcdqg.onion"
-    footer="OS: Windows, macOS, Linux, Android, iOS, Chrome OS, Web."
-    description="Write.as is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
-    %}
-
-    {% include card.html color="warning"
-    title="ProtectedText"
-    image="assets/img/tools/ProtectedText.png"
-    url="https://www.protectedtext.com/"
-    footer="OS: All Browsers."
-    description="ProtectedText is an open source web application. It encrypts and decrypts text in the browser, and password (or its hash) is never sent to the server - so that text can't be decrypted even if requested by authorities. No cookies, no sessions, no registration, no users tracking."
-    %}
-
-  </div>
-
-  <h3>Worth Mentioning</h3>
-  <ul>
-    <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
-    <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-    <li><a href="https://disroot.org/">disroot.org</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-    <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, which is free and OpenSource. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-    <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite</li>
-  </ul>
   <h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
   <div class="alert alert-warning" role="alert">
     <strong>If you are currently using a operating system like Microsoft Windows or Apple macOS, you should pick an alternative here.</strong>