diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index be7c6aa6..f60cd2d5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1 +1,28 @@
-Please refer to the **Contributing** and **Contributing Guidelines** sections of our [readme](https://github.com/privacytoolsIO/privacytools.io/blob/master/README.md) for the most up-to-date guidelines. Thank you.
+# Contributing Guidelines
+
+Please read this before contributing.
+
+## Rules
+
+- Be nice and respectful.
+- English only.
+- Be constructive.
+
+## Quality over Quantity
+
+We're trying to keep it simple and promote the best tools, not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://privacytoolsio.github.io/privacytools.io/#im))
+
+## Software Criteria
+
+- Open Source
+- Cross-platform
+- Easy to use
+- Privacy respecting
+
+There can be exceptions if no software is available that meet the criteria.
+
+## Images
+
+- Provider logos should be exactly 200 x 70 ([example](https://www.privacytools.io/assets/img/provider/AirVPN.gif))
+- Tool logos should be exactly 120 x 120 ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png))
+
diff --git a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
new file mode 100644
index 00000000..e39e885e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
@@ -0,0 +1,12 @@
+---
+name: "🆕 Software Suggestion"
+about: Suggest new software that enhances privacy.
+---
+
+## Basic Information
+
+**Name:**
+**Category:**
+**URL:**
+
+## Description
diff --git a/.github/ISSUE_TEMPLATE/2_Software_Removal.md b/.github/ISSUE_TEMPLATE/2_Software_Removal.md
new file mode 100644
index 00000000..bfb48950
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_Software_Removal.md
@@ -0,0 +1,7 @@
+---
+name: "❌ Software Removal"
+about: Suggest the removal of outdated, insecure, or otherwise bad software.
+---
+
+## Description
+
diff --git a/.github/ISSUE_TEMPLATE/3_Discussion.md b/.github/ISSUE_TEMPLATE/3_Discussion.md
new file mode 100644
index 00000000..3c35cf8e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_Discussion.md
@@ -0,0 +1,6 @@
+---
+name: "💬 Discussion"
+about: Discuss the website or any mentioned software in general.
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/4_Feature.md b/.github/ISSUE_TEMPLATE/4_Feature.md
new file mode 100644
index 00000000..df9ddf22
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4_Feature.md
@@ -0,0 +1,7 @@
+---
+name: "✨ Feature Suggestion"
+about: Suggest a new feature for the website.
+---
+
+## Description:
+
diff --git a/.github/ISSUE_TEMPLATE/5_Website_Issues.md b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
new file mode 100644
index 00000000..d00bb0f4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
@@ -0,0 +1,12 @@
+---
+name: "🌐 Website Issues"
+about: Report issues with the website.
+---
+
+## Description
+
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 90ea4e33..e2c31e15 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-
+
## Description
diff --git a/README.md b/README.md
index 2602deef..e3f2af9a 100644
--- a/README.md
+++ b/README.md
@@ -8,39 +8,14 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. We are also using [/r/privacy](https://www.reddit.com/r/privacy). Thank you for participating.
-You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Thank you.
+You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
## Building
-1. Install Ruby
-2. `bundle install`
-3. `bundle exec jekyll serve` # Live refresh.
-# Contributing Guidelines
-Please read this before contributing.
-
-## Rules
-
-- Be nice and respectful.
-- English only.
-- Be constructive.
-
-## Quality over Quantity
-
-We're trying to keep it simple and promote the best tools, not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://privacytoolsio.github.io/privacytools.io/#im))
-
-## Software Criteria
-
-- Open Source
-- Cross-platform
-- Easy to use
-- Privacy respecting
-
-There can be exceptions if no software is available that meet the criteria.
-
-## Images
-
-- Provider logos should be exactly 200 x 70 ([example](https://www.privacytools.io/assets/img/provider/AirVPN.gif))
-- Tool logos should be exactly 120 x 120 ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png))
+1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
+1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
+1. Run `bundle install` to install the required dependencies.
+1. Use `bundle exec jekyll build` to build the website. The output can be found in the `_site` directory. Live preview is also possible by running `bundle exec jekyll serve`
# Support privacytools.io
diff --git a/_includes/index.html b/_includes/index.html
index 705465f2..dd09a2d7 100644
--- a/_includes/index.html
+++ b/_includes/index.html
@@ -129,7 +129,6 @@
Belgium *
Finland *
New Zealand (unclear)
- Sweden (proposed)
The Netherlands *
United States (see related information)
@@ -143,6 +142,7 @@
Czech Republic
Germany
Poland
+ Sweden (proposed)
'
%}
@@ -1514,13 +1514,13 @@
{% include components/card.html color="primary"
- title="KeePass / KeePassX - Local"
+ title="KeePass / KeePassXC - Local"
image="/assets/img/tools/KeePass.png"
url="http://keepass.info/download.html"
website="keepass.info"
footer="OS: Windows, macOS, Linux, iOS, Android, BSD."
description='KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one
- master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: KeePassX (not regularly updated) and KeePassXC.'
+ master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: KeePassXC with official native cross-platform support for Windows/macOS/Linux.'
%}
{% include components/card.html color="warning"
@@ -2229,6 +2229,9 @@ This tool uses some known methods that attempt to disable major tracking feature
Reset The Net - Privacy Pack - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.
Security First - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.
Block Cloudflare MiTM Attack - Firefox add-on to detect and block corporate MITM attack.
+ Osalt - A directroy to help you find open source alternatives to proprietary tools.
+ AlternativeTo - A directry to help find alternatives to other software, with the option to only show open source software
+ Note: Just being open source does not make software secure!
Spread the word and help your friends