diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 6e736080..10ab1412 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,30 +1,37 @@
 <h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
 
-{% include cardv2.html
-title="OpenNIC - Service"
-image="/assets/img/tools/OpenNIC.png"
-description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
-website="https://www.opennic.org/"
-forum="https://forum.privacytools.io/t/discussion-opennic/338"
-github="https://github.com/OpenNIC"
+{%
+  include cardv2.html
+  title="OpenNIC - Service"
+  image="/assets/img/tools/OpenNIC.png"
+  description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
+  website="https://www.opennic.org/"
+  forum="https://forum.privacytools.io/t/discussion-opennic/338"
+  github="https://github.com/OpenNIC"
 %}
 
-{% include cardv2.html
-title="Njalla - Domain Registration"
-image="/assets/img/provider/Njalla.png"
-description="Njalla only needs your email or jabber address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
-website="https://njal.la/"
-tor="http://njalladnspotetti.onion"
-forum="https://forum.privacytools.io/t/discussion-njalla/339"
+{%
+  include cardv2.html
+  title="Njalla - Domain Registration"
+  image="/assets/img/provider/Njalla.png"
+  description="Njalla only needs your email or XMPP address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
+  website="https://njal.la/"
+  tor="http://njalladnspotetti.onion"
+  forum="https://forum.privacytools.io/t/discussion-njalla/339"
 %}
 
-{% include cardv2.html
-title="DNSCrypt - Tool"
-image="/assets/img/tools/DNSCrypt.png"
-description="A protocol for securing communications between a client and a DNS resolver. The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography and is very similar to DNSCurve, but focuses on securing communications between a client and its first-level resolver."
-website="https://dnscrypt.info/"
-forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
-github="https://github.com/jedisct1/dnscrypt-proxy"
+{%
+  include cardv2.html
+  title="DNSCrypt-Proxy - Tool"
+  image="/assets/img/tools/DNSCrypt-Proxy.png"
+  description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
+  website="https://github.com/jedisct1/dnscrypt-proxy/"
+  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+  github="https://github.com/jedisct1/dnscrypt-proxy/"
+  linux=""
+  mac=""
+  android=""
+  ios=""
 %}
 
 <h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
diff --git a/assets/img/tools/DNSCrypt-Proxy.png b/assets/img/tools/DNSCrypt-Proxy.png
new file mode 100644
index 00000000..ce6a09fc
Binary files /dev/null and b/assets/img/tools/DNSCrypt-Proxy.png differ
diff --git a/assets/img/tools/DNSCrypt.png b/assets/img/tools/DNSCrypt.png
deleted file mode 100644
index 5d51ca0e..00000000
Binary files a/assets/img/tools/DNSCrypt.png and /dev/null differ
diff --git a/source_code.md b/source_code.md
index 4658e1c9..a4f540a2 100644
--- a/source_code.md
+++ b/source_code.md
@@ -275,15 +275,11 @@ Raddle: https://gitlab.com/postmill
 
 ## Domain Name System (DNS)
 
+OpenNic: https://github.com/opennic/
+
 Njalla: Non-free/Proprietary Software
 
-DNSCrypt: https://github.com/dnscrypt
-
-DNSCrypt-proxy: https://github.com/jedisct1/dnscrypt-proxy/
-
-OpenNic: https://github.com/opennic/ (mostly)
-
-Webpage: https://github.com/opennic/opennic-web
+DNSCrypt-Proxy: https://github.com/jedisct1/dnscrypt-proxy/
 
 ### Worth Mentioning