diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 4c8e7189..7fee5078 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,31 +1,31 @@
 <h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
 
-<div class="row mb-2">
+{% 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 card.html color="success"
-  title="OpenNIC - Service"
-  image="/assets/img/tools/OpenNIC.png"
-  url="https://www.opennic.org/"
-  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."
-  %}
+{% 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 card.html color="primary"
-  title="Njalla - Domain Registration"
-  image="/assets/img/provider/Njalla.png"
-  url="https://njal.la/"
-  tor="http://njalladnspotetti.onion"
-  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."
-  %}
-
-  {% include card.html color="warning"
-  title="DNSCrypt - Tool"
-  image="/assets/img/tools/DNSCrypt.png"
-  url="https://dnscrypt.info/"
-  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."
-  %}
-
-
-</div>
+{% 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"
+%}
 
 <h3>Worth Mentioning</h3>
 
@@ -33,4 +33,4 @@
   <li><a href="https://github.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
   <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
   <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server for the Raspberry Pi.  Blocks advertising and tracking domains for all devices on your network.</li>
-</ul>
+</ul>
\ No newline at end of file