diff --git a/_includes/scripts.html b/_includes/scripts.html
index 2a6cb563..cdc7e515 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
+{% include sections/header.html %}
+{% include sections/resources.html %}
+{% include sections/quotes.html %}
+{% include sections/warrant-canary.html %}
+{% include sections/privacy-resources.html %}
+{% include sections/participate.html %}
diff --git a/pages/browsers.html b/pages/browsers.html
new file mode 100644
index 00000000..17f98cec
--- /dev/null
+++ b/pages/browsers.html
@@ -0,0 +1,16 @@
+---
+layout: page
+permalink: /browsers/
+title: "Web Browsers"
+description: "These are our current web browser recommendations and some tweaks you can use to preserve your privacy."
+---
+
+{% include sections/browser-recommendation.html %}
+
+{% include sections/browser-fingerprint.html %}
+
+{% include sections/browser-webrtc.html %}
+
+{% include sections/browser-addons.html %}
+
+{% include sections/browser-tweaks.html %}
diff --git a/pages/os.html b/pages/os.html
new file mode 100644
index 00000000..924ebc33
--- /dev/null
+++ b/pages/os.html
@@ -0,0 +1,18 @@
+---
+layout: page
+permalink: /operating-systems/
+title: "Operating Systems"
+description: "Even your own computer could be compromising your privacy. Discover our recommended OS choices for all the devices you use."
+---
+
+{% include sections/operating-systems.html %}
+
+{% include sections/live-operating-systems.html %}
+
+{% include sections/mobile-operating-systems.html %}
+
+{% include sections/android-addons.html %}
+
+{% include sections/router-firmware.html %}
+
+{% include sections/windows10.html %}
diff --git a/pages/providers.html b/pages/providers.html
new file mode 100644
index 00000000..19fd31ad
--- /dev/null
+++ b/pages/providers.html
@@ -0,0 +1,27 @@
+---
+layout: page
+permalink: /providers/
+title: "Providers"
+description: "There's a ton of people providing services online. Discover which ones you should avoid and our recommendations for a variety of services."
+---
+
+{% include sections/fourteen-eyes.html %}
+
+{% include sections/key-disclosure-law.html %}
+
+
Services
+
+
Click on whatever service you need to view our recommendations.
diff --git a/pages/providers/dns.html b/pages/providers/dns.html
new file mode 100644
index 00000000..a04f2fc1
--- /dev/null
+++ b/pages/providers/dns.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/dns/
+title: "DNS"
+description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers."
+---
+
+{% include sections/dns.html %}
diff --git a/pages/providers/email.html b/pages/providers/email.html
new file mode 100644
index 00000000..b05f5785
--- /dev/null
+++ b/pages/providers/email.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/email/
+title: "Email"
+description: "Find an email provider that will keep your privacy in mind. Don't settle for ad-supported platforms."
+---
+
+{% include sections/email-providers.html %}
diff --git a/pages/providers/hosting.html b/pages/providers/hosting.html
new file mode 100644
index 00000000..29d1d407
--- /dev/null
+++ b/pages/providers/hosting.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/hosting/
+title: "Web Hosting"
+description: "Find a web hosting provider that won't track your visitors or give into government data requests."
+---
+
+{% include sections/hosting-provider.html %}
diff --git a/pages/providers/paste.html b/pages/providers/paste.html
new file mode 100644
index 00000000..e312623b
--- /dev/null
+++ b/pages/providers/paste.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/paste/
+title: "Paste"
+description: "Find a pastebin provider that won't read your content to share sensitive code or other information."
+---
+
+{% include sections/paste-services.html %}
diff --git a/pages/providers/search-engines.html b/pages/providers/search-engines.html
new file mode 100644
index 00000000..f466421a
--- /dev/null
+++ b/pages/providers/search-engines.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/search-engines/
+title: "Search Engines"
+description: "Find a search engine that doesn't track your queries or build an advertising profile based on your searches."
+---
+
+{% include sections/search-engines.html %}
diff --git a/pages/providers/social-networks.html b/pages/providers/social-networks.html
new file mode 100644
index 00000000..b9ef5d77
--- /dev/null
+++ b/pages/providers/social-networks.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/social-networks/
+title: "Social Networks"
+description: "Find a social network that doesn't pry into your data or monetize your profile."
+---
+
+{% include sections/social-networks.html %}
diff --git a/pages/providers/storage.html b/pages/providers/storage.html
new file mode 100644
index 00000000..a71ec8dc
--- /dev/null
+++ b/pages/providers/storage.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/cloud-storage/
+title: "Cloud Storage"
+description: "Find a cloud storage provider that won't look through your files."
+---
+
+{% include sections/cloud-storage.html %}
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html
new file mode 100644
index 00000000..8f2e9f9e
--- /dev/null
+++ b/pages/providers/vpn.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/vpn/
+title: "VPN Providers"
+description: "Find a no-logging VPN operator who isn't out to sell or read your web traffic."
+---
+
+{% include sections/vpn.html %}
diff --git a/pages/services.html b/pages/services.html
new file mode 100644
index 00000000..c2c0c574
--- /dev/null
+++ b/pages/services.html
@@ -0,0 +1,18 @@
+---
+layout: page
+permalink: /services/
+title: "Services from privacytools.io"
+description: "The privacytools.io team is proud to introduce a suite of privacy-centric online services to connect you with other privacy-minded individuals and stay safe and secure online. No advertisers, no Google Analytics, no tracking, no third party requests of any kind."
+---
+
+
We currently have the following free-to-use services online now.
More services are on the way! If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask! And of course, if you like our services, please consider donating to support our server costs, any donation helps!
diff --git a/pages/software.html b/pages/software.html
new file mode 100644
index 00000000..4386be18
--- /dev/null
+++ b/pages/software.html
@@ -0,0 +1,26 @@
+---
+layout: page
+permalink: /software/
+title: "Software"
+description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure."
+---
+
+
Click on whatever software you need to view our recommendations.
diff --git a/pages/software/cal-card.html b/pages/software/cal-card.html
new file mode 100644
index 00000000..d102b7e7
--- /dev/null
+++ b/pages/software/cal-card.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/calendar-contacts/
+title: "Calendar/Contacts Sync Tools"
+description: "Discover free, open source, and secure ways to sync your contacts and calendars across your devices."
+---
+
+{% include sections/calendar-contacts-sync.html %}
diff --git a/pages/software/cloud.html b/pages/software/cloud.html
new file mode 100644
index 00000000..a5b35e20
--- /dev/null
+++ b/pages/software/cloud.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/cloud/
+title: "Self Hosted \"Cloud\""
+description: "Discover how to securely and privately self-host your cloud with open source software."
+---
+
+{% include sections/selfhosted-cloud.html %}
diff --git a/pages/software/email.html b/pages/software/email.html
new file mode 100644
index 00000000..57e1f3a7
--- /dev/null
+++ b/pages/software/email.html
@@ -0,0 +1,10 @@
+---
+layout: page
+permalink: /software/email/
+title: "Email Clients"
+description: "Discover free, open source, and secure ways email clients, and some email alternatives you may not have considered."
+---
+
+{% include sections/email-clients.html %}
+
+{% include sections/email-alternatives.html %}
diff --git a/pages/software/encryption.html b/pages/software/encryption.html
new file mode 100644
index 00000000..028ea587
--- /dev/null
+++ b/pages/software/encryption.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/encryption-tools/
+title: "Encryption Tools"
+description: "Discover free, open source, and secure ways to encrypt your sensitive data to keep it from prying eyes."
+---
+
+{% include sections/file-encryption.html %}
diff --git a/pages/software/file-sharing.html b/pages/software/file-sharing.html
new file mode 100644
index 00000000..cd3e83db
--- /dev/null
+++ b/pages/software/file-sharing.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/file-sharing/
+title: "File Sharing"
+description: "Discover how to share your files with your friends and family or anonymously, without a middleman."
+---
+
+{% include sections/file-sharing.html %}
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html
new file mode 100644
index 00000000..61d260aa
--- /dev/null
+++ b/pages/software/file-sync.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/file-sync/
+title: "File Sync Tools"
+description: "Discover free, open source, and secure ways to sync your files across your devices."
+---
+
+{% include sections/file-sync.html %}
diff --git a/pages/software/im.html b/pages/software/im.html
new file mode 100644
index 00000000..a7d77066
--- /dev/null
+++ b/pages/software/im.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/im/
+title: "Instant Messaging"
+description: "Discover secure and private ways to message others online without letting any third parties read your messages."
+---
+
+{% include sections/instant-messenger.html %}
diff --git a/pages/software/networks.html b/pages/software/networks.html
new file mode 100644
index 00000000..882cbbb7
--- /dev/null
+++ b/pages/software/networks.html
@@ -0,0 +1,9 @@
+---
+layout: page
+permalink: /software/networks/
+title: "Self-Contained Networks"
+description: "If you are currently browsing clearnet and want to access the dark web, this section is for you."
+hidedesc: true
+---
+
+{% include sections/self-contained-networks.html %}
diff --git a/pages/software/notebooks.html b/pages/software/notebooks.html
new file mode 100644
index 00000000..e883fe0f
--- /dev/null
+++ b/pages/software/notebooks.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/notebooks/
+title: "Notebooks"
+description: "Keep track of your notes and journalings without giving them to a third-party."
+---
+
+{% include sections/notebooks.html %}
diff --git a/pages/software/passwords.html b/pages/software/passwords.html
new file mode 100644
index 00000000..eeed2e5f
--- /dev/null
+++ b/pages/software/passwords.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/passwords/
+title: "Password Managers"
+description: "Stay safe and secure online with an encrypted and open-source password manager."
+---
+
+{% include sections/password-managers.html %}
diff --git a/pages/software/productivity.html b/pages/software/productivity.html
new file mode 100644
index 00000000..d9f2f913
--- /dev/null
+++ b/pages/software/productivity.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/productivity/
+title: "Productivity Tools"
+description: "Get working and collaborating without sharing your documents with a middleman or trusting a cloud provider."
+---
+
+{% include sections/productivity-tools.html %}
diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html
new file mode 100644
index 00000000..f2b9e575
--- /dev/null
+++ b/pages/software/video-voice.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/voip/
+title: "VoIP"
+description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
+---
+
+{% include sections/voice-video-messenger.html %}
diff --git a/privacy-policy.html b/privacy-policy.html
index dc164949..a0a5b32f 100644
--- a/privacy-policy.html
+++ b/privacy-policy.html
@@ -1,13 +1,9 @@
---
-layout: default
-active_page: privacy_policy
+layout: page
+permalink: /privacy-policy/
+title: "Privacy Policy"
+description: "This Privacy Policy explains what information privacytoolsIO and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
---
-
-
-
Privacy Policy
-
This Privacy Policy explains what information privacytoolsIO and its related entities collect about its users,
- what we do with that information, and how we handle the content you place in our products and services.
