diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 0b802dc9..bb76fdf9 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,30 +1,37 @@
Domain Name System (DNS)
-{% 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 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="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 - Local DNS Server"
+ image=""
+ description="DNSCrypt-Proxy is a command-line proxy that bridges applications expecting regular DNS with servers supporting encrypted DNS (DNSCrypt and DNS over HTTPS). Can also display the DNS activity, cache results to improve speed, and locally block unwanted content."
+ website="https://github.com/jedisct1/dnscrypt-proxy/"
+ forum="TODO"
+ github="https://github.com/jedisct1/dnscrypt-proxy/"
+ linux="https://github.com/jedisct1/dnscrypt-proxy/wiki/installation"
+ mac="https://github.com/jedisct1/dnscrypt-proxy/wiki/installation"
+ android="https://github.com/jedisct1/dnscrypt-proxy/wiki/installation"
+ ios="https://github.com/jedisct1/dnscrypt-proxy/wiki/installation"
%}
Encrypted ICANN DNS Providers
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