diff --git a/_includes/nav.html b/_includes/nav.html
index a41e2aea..35f5577e 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -68,11 +68,11 @@
             <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
+            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> File Sync</a>
             <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
             <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
             <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> Secure File Sync</a>
             <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
             <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a>
           </span>
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index e7a8fd77..6dea5561 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -1,24 +1,36 @@
-<h1 id="sync" class="anchor"><a href="#sync"><i class="fas fa-link anchor-icon"></i></a> Secure File Sync Software</h1>
+<h1 id="sync" class="anchor">
+  <a href="#sync">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>
+  File Sync
+</h1>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
-  title="SparkleShare"
-  image="/assets/img/tools/SparkleShare.png"
-  url="https://sparkleshare.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
-  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-  %}    {% include card.html color="primary"
+{%
+  include cardv2.html
   title="Syncthing"
   image="/assets/img/tools/Syncthing.png"
-  url="https://syncthing.net/"
-  footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
-  description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
-  choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
-  %}
+  description="<strong>Syncthing</strong> replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+  website="https://syncthing.net/"
+  forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
+  github="https://github.com/syncthing?type=source"
+  windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  mac="https://github.com/syncthing/syncthing-macos/releases/latest"
+  fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
+  googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
+%}
 
-</div>
+{%
+  include cardv2.html
+  title="SparkleShare"
+  image="/assets/img/tools/SparkleShare.png"
+  description="<strong>SparkleShare</strong> creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
+  website="https://sparkleshare.org/"
+  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
+  github="https://github.com/hbons/SparkleShare"
+  linux="https://www.sparkleshare.org/"
+  mac="https://github.com/hbons/SparkleShare/releases/"
+%}
 
 <h3>Worth Mentioning</h3>
 
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html
index 61d260aa..29702b93 100644
--- a/pages/software/file-sync.html
+++ b/pages/software/file-sync.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 permalink: /software/file-sync/
-title: "File Sync Tools"
+title: "File Sync"
 description: "Discover free, open source, and secure ways to sync your files across your devices."
 ---
 
diff --git a/source_code.md b/source_code.md
index 8f84fb76..ba1495ec 100644
--- a/source_code.md
+++ b/source_code.md
@@ -185,13 +185,14 @@ Magic Wormhole: https://github.com/warner/magic-wormhole
 [WIP]
 
 ## Secure File Sync Software
- SparkleShare: https://www.github.com/hbons/SparkleShare/
 
- Syncthing: https://github.com/syncthing/syncthing
+SparkleShare: https://github.com/hbons/SparkleShare/
 
-   Worth Mentioning
-.
-    git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
+Syncthing: https://github.com/syncthing/syncthing
+
+### Worth Mentioning
+
+- git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
 
 ## Password Manager Software