diff --git a/src/templates/gengar/Gengar.js b/src/templates/gengar/Gengar.js
index faf56ba2..12051cf9 100644
--- a/src/templates/gengar/Gengar.js
+++ b/src/templates/gengar/Gengar.js
@@ -30,7 +30,7 @@ const Gengar = () => {
     </div>
   );
 
-  const ContactItem = ({ icon, value }) =>
+  const ContactItem = ({ icon, value, link = '#' }) =>
     value && (
       <div className="flex items-center mb-3">
         <div
@@ -44,7 +44,9 @@ const Gengar = () => {
             {icon}
           </i>
         </div>
-        <span className="text-sm font-medium break-all">{value}</span>
+        <a href={link}>
+          <span className="text-sm font-medium break-all">{value}</span>
+        </a>
       </div>
     );
 
@@ -237,9 +239,17 @@ const Gengar = () => {
 
           <hr className="w-1/4 my-5 opacity-50" />
 
-          <ContactItem icon="phone" value={data.profile.phone} />
-          <ContactItem icon="alternate_email" value={data.profile.email} />
-          <ContactItem icon="language" value={data.profile.website} />
+          <ContactItem icon="phone" value={data.profile.phone} link={`tel:${data.profile.phone}`} />
+          <ContactItem
+            icon="alternate_email"
+            value={data.profile.email}
+            link={`mailto:${data.profile.email}`}
+          />
+          <ContactItem
+            icon="language"
+            value={data.profile.website}
+            link={`http://${data.profile.website}`}
+          />
           <ContactItem icon="location_on" value={data.profile.address.line3} />
         </div>
 
@@ -258,16 +268,12 @@ const Gengar = () => {
           <Skills />
           <Languages />
           <Education />
+          <Certifications />
         </div>
 
         <div className="col-span-8 px-6 py-8">
           <Work />
-
-          <div className="grid grid-cols-2 gap-6">
-            <Awards />
-            <Certifications />
-          </div>
-
+          <Awards />
           <References />
         </div>
       </div>
diff --git a/src/templates/gengar/preview.png b/src/templates/gengar/preview.png
index 65f30253..486c7180 100644
Binary files a/src/templates/gengar/preview.png and b/src/templates/gengar/preview.png differ
diff --git a/src/templates/onyx/Onyx.js b/src/templates/onyx/Onyx.js
index f13376c3..c41aa2b4 100644
--- a/src/templates/onyx/Onyx.js
+++ b/src/templates/onyx/Onyx.js
@@ -33,13 +33,15 @@ const Onyx = () => {
     </div>
   );
 
-  const ContactItem = ({ icon, value }) =>
+  const ContactItem = ({ icon, value, link = '#' }) =>
     value && (
       <div className="flex items-center my-3">
         <span className="material-icons text-lg mr-2" style={{ color: theme.colors.accent }}>
           {icon}
         </span>
-        <span className="font-medium break-all">{value}</span>
+        <a href={link}>
+          <span className="font-medium break-all">{value}</span>
+        </a>
       </div>
     );
 
@@ -230,9 +232,17 @@ const Onyx = () => {
         </div>
 
         <div className="col-span-1 text-xs">
-          <ContactItem icon="phone" value={data.profile.phone} />
-          <ContactItem icon="language" value={data.profile.website} />
-          <ContactItem icon="alternate_email" value={data.profile.email} />
+          <ContactItem icon="phone" value={data.profile.phone} link={`tel:${data.profile.phone}`} />
+          <ContactItem
+            icon="language"
+            value={data.profile.website}
+            link={`http://${data.profile.website}`}
+          />
+          <ContactItem
+            icon="alternate_email"
+            value={data.profile.email}
+            link={`mailto:${data.profile.email}`}
+          />
         </div>
       </div>
 
diff --git a/src/templates/onyx/preview.png b/src/templates/onyx/preview.png
index 443d87e5..5d586f10 100644
Binary files a/src/templates/onyx/preview.png and b/src/templates/onyx/preview.png differ
diff --git a/src/templates/pikachu/Pikachu.js b/src/templates/pikachu/Pikachu.js
index 659a2720..ec137718 100644
--- a/src/templates/pikachu/Pikachu.js
+++ b/src/templates/pikachu/Pikachu.js
@@ -37,13 +37,15 @@ const Pikachu = () => {
     </div>
   );
 
-  const ContactItem = ({ icon, value }) =>
+  const ContactItem = ({ icon, value, link = '#' }) =>
     value && (
       <div className="flex items-center my-3">
         <span className="material-icons text-lg mr-2" style={{ color: theme.colors.accent }}>
           {icon}
         </span>
-        <span className="font-medium break-all">{value}</span>
+        <a href={link}>
+          <span className="font-medium break-all">{value}</span>
+        </a>
       </div>
     );
 
@@ -227,14 +229,27 @@ const Pikachu = () => {
 
         <div className="col-span-4 overflow-hidden">
           <div className="text-sm mb-6">
-            <ContactItem icon="phone" value={data.profile.phone} />
-            <ContactItem icon="language" value={data.profile.website} />
-            <ContactItem icon="alternate_email" value={data.profile.email} />
+            <ContactItem
+              icon="phone"
+              value={data.profile.phone}
+              link={`tel:${data.profile.phone}`}
+            />
+            <ContactItem
+              icon="language"
+              value={data.profile.website}
+              link={`http://${data.profile.website}`}
+            />
+            <ContactItem
+              icon="alternate_email"
+              value={data.profile.email}
+              link={`mailto:${data.profile.email}`}
+            />
             <ContactItem icon="location_on" value={data.profile.address.line3} />
           </div>
 
           <Skills />
           <Languages />
+          <Certifications />
           <Extras />
         </div>
 
@@ -242,7 +257,6 @@ const Pikachu = () => {
           <Work />
           <Education />
           <Awards />
-          <Certifications />
           <References />
         </div>
       </div>
diff --git a/src/templates/pikachu/preview.png b/src/templates/pikachu/preview.png
index f1f37e2e..46e7e422 100644
Binary files a/src/templates/pikachu/preview.png and b/src/templates/pikachu/preview.png differ