diff --git a/index.html b/index.html
index a8a4515c..9c9194c1 100644
--- a/index.html
+++ b/index.html
@@ -681,7 +681,7 @@
 							</a>
 							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expyuzz4wqqyqhjn.onion. Requires specific software to access: torproject.org" href="http://expyuzz4wqqyqhjn.onion"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
-						<p>OS: Windows, Mac, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a></p>
+						<p>OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a></p>
 					</div>
 				</div>
 			</div>
@@ -700,7 +700,7 @@
 								<button type="button" class="btn btn-info">Download: firefox.com</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android, BSD.</p>
+						<p>OS: Windows, macOS, Linux, Android, iOS, BSD.</p>
 					</div>
 				</div>
 			</div>
@@ -718,7 +718,7 @@
 								<button type="button" class="btn btn-warning">Download: brave.com</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android, iOS.</p>
+						<p>OS: Windows, macOS, Linux, Android, iOS.</p>
 					</div>
 				</div>
 			</div>
@@ -732,7 +732,7 @@
 <div class="panel-body">
 <p><img src="img/tools/IceCat.png" align="right" style="margin-left:5px;">GNU IceCat is a good choice for privacy related matters. It is a free software rebranding of the Mozilla Firefox web browser distributed by the GNU Project. IceCat comes with pre-installed privacy add-ons.</p>
 <p><a href="http://www.gnu.org/software/gnuzilla/"><button type="button" class="btn btn-info">Download: www.gnu.org</button></a></p>
-<p>OS: Windows, Mac, Linux, Android.</p>
+<p>OS: Windows, macOS, Linux, Android.</p>
 </div>
 </div>
 </div>
@@ -1337,7 +1337,7 @@
 								<button type="button" class="btn btn-success">Website: mozilla.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, BSD.</p>
+						<p>OS: Windows, macOS, Linux, BSD.</p>
 					</div>
 				</div>
 			</div>
@@ -1355,7 +1355,7 @@
 								<button type="button" class="btn btn-info">Website: claws-mail.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, BSD, Solaris, Unix.</p>
+						<p>OS: Windows, macOS, Linux, BSD, Solaris, Unix.</p>
 					</div>
 				</div>
 			</div>
@@ -1381,7 +1381,7 @@
 		<h3>Worth Mentioning</h3>
 		<ul>
 			<li><a href="https://github.com/k9mail/k-9/releases">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
-			<li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for Mac OS X.</a></li>
+			<li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for macOS.</a></li>
 			<li><a href="https://www.mailpile.is/">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
 		</ul>
 
@@ -1404,7 +1404,7 @@
 								<button type="button" class="btn btn-success">Website: i2pbote.xyz</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android, BSD / Solaris.</p>
+						<p>OS: Windows, macOS, Linux, Android, BSD / Solaris.</p>
 					</div>
 				</div>
 			</div>
@@ -1422,7 +1422,7 @@
 								<button type="button" class="btn btn-info">Website: bitmessage.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1439,7 +1439,7 @@
 								<button type="button" class="btn btn-warning">Website: retroshare.net</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1604,7 +1604,7 @@
 								<button type="button" class="btn btn-warning">Download: ricochet.im</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1613,7 +1613,7 @@
 		<h3>Worth Mentioning</h3>
 		<ul>
    			<li><a href="https://www.chatsecure.org">ChatSecure</a> - ChatSecure is a free and open source messaging app that features OTR encryption over XMPP. </li>
-			<li><a href="https://crypto.cat/">Cryptocat</a> - Encrypted open source messenger. Supports file sharing and multiple devices. Available for Windows, Linux and Mac.</li>
+			<li><a href="https://crypto.cat/">Cryptocat</a> - Encrypted open source messenger. Supports file sharing and multiple devices. Available for Windows, Linux and macOS.</li>
 			<li><a href="http://kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
 			<li><a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations">Conversations</a> - An open source Jabber/XMPP client for Android 4.0+ smart phones. Supports end-to-end encryption with either OMEMO, OTR or openPGP.</li>
 			<li><a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging#Client_support">List of OTR Clients - Wikipedia</a></li>
@@ -1690,7 +1690,7 @@
 								<button type="button" class="btn btn-warning">Download: linphone.org</button>
 							</a>
 						</p>
-						<p>OS: iOS, Android, Windows Phone, Linux, Windows, Mac, Browser (Web)</p>
+						<p>OS: iOS, Android, Windows Phone, Linux, Windows, macOS, Browser (Web)</p>
 					</div>
 				</div>
 			</div>
@@ -1731,7 +1731,7 @@
 							</a>
 							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://elx57ue5uyfplgva.onion/. Requires specific software to access: torproject.org" href="http://elx57ue5uyfplgva.onion/"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1783,7 +1783,7 @@
 								<button type="button" class="btn btn-success">Website: seafile.com</button>
 							</a>
 						</p>
-						<p>Client OS: Windows, Mac, Linux, iOS, Android. Server: Linux, Raspberry Pi, Windows.</p>
+						<p>Client OS: Windows, macOS, Linux, iOS, Android. Server: Linux, Raspberry Pi, Windows.</p>
 					</div>
 				</div>
 			</div>
@@ -1801,7 +1801,7 @@
 								<button type="button" class="btn btn-info">Website: nextcloud.com</button>
 							</a>
 						</p>
-						<p>Client OS: Windows, Mac, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux.</p>
+						<p>Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1819,7 +1819,7 @@
 								<button type="button" class="btn btn-warning">Website: leastauthority.com</button>
 							</a>
 						</p>
-						<p>OS: <a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Installation">Linux</a>, <a href="https://tahoe-lafs.org/trac/tahoe-lafs/browser/trunk/docs/quickstart.rst"> Windows, Mac, OpenSolaris, BSD.</a> (Installation for advanced users)</p>
+						<p>OS: <a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Installation">Linux</a>, <a href="https://tahoe-lafs.org/trac/tahoe-lafs/browser/trunk/docs/quickstart.rst"> Windows, macOS, OpenSolaris, BSD.</a> (Installation for advanced users)</p>
 					</div>
 				</div>
 			</div>
@@ -1857,7 +1857,7 @@
 								<button type="button" class="btn btn-success">Website: seafile.com</button>
 							</a>
 						</p>
-						<p>Client OS: Windows, Mac, Linux, iOS, Android. Server: Linux, Raspberry Pi, Windows.</p>
+						<p>Client OS: Windows, macOS, Linux, iOS, Android. Server: Linux, Raspberry Pi, Windows.</p>
 					</div>
 				</div>
 			</div>
@@ -1874,7 +1874,7 @@
 								<button type="button" class="btn btn-info">Website: pydio.com</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, iOS, Android.</p>
+						<p>OS: Windows, macOS, Linux, iOS, Android.</p>
 					</div>
 				</div>
 			</div>
@@ -1891,7 +1891,7 @@
 								<button type="button" class="btn btn-warning">Website: tahoe-lafs.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1921,7 +1921,7 @@
 								<button type="button" class="btn btn-success">Website: sparkleshare.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1938,7 +1938,7 @@
 								<button type="button" class="btn btn-info">Website: syncany.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -1955,7 +1955,7 @@
 								<button type="button" class="btn btn-warning">Website: syncthing.net</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android, BSD, Solaris.</p>
+						<p>OS: Windows, macOS, Linux, Android, BSD, Solaris.</p>
 					</div>
 				</div>
 			</div>
@@ -1991,7 +1991,7 @@
 								<button type="button" class="btn btn-success">Website: masterpasswordapp.com</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, iOS, Android, Web.</p>
+						<p>OS: Windows, macOS, Linux, iOS, Android, Web.</p>
 					</div>
 				</div>
 			</div>
@@ -2009,7 +2009,7 @@
 								<button type="button" class="btn btn-info">Website: keepass.info</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, iOS, Android, BSD.</p>
+						<p>OS: Windows, macOS, Linux, iOS, Android, BSD.</p>
 					</div>
 				</div>
 			</div>
@@ -2027,7 +2027,7 @@
 								<button type="button" class="btn btn-warning">Website: lesspass.com</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android</p>
+						<p>OS: Windows, macOS, Linux, Android</p>
 					</div>
 				</div>
 			</div>
@@ -2076,7 +2076,7 @@
 								<button type="button" class="btn btn-success">Website: nextcloud.com</button>
 							</a>
 						</p>
-						<p>Client OS: Windows, Mac, Linux, BSD, Unix, iOS, Android, Fire OS. Server OS: Linux.</p>
+						<p>Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server OS: Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -2233,7 +2233,7 @@
 								<button type="button" class="btn btn-success">Website: veracrypt.fr</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -2245,7 +2245,7 @@
 					<div class="panel-body">
 						<p><img src="img/tools/GnuPG.png" alt="GnuPG" align="right" style="margin-left:5px;">GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification
 							of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German
-							government. <a href="https://gpgtools.org/">GPGTools for Mac OS X.</a></p>
+							government. <a href="https://gpgtools.org/">GPGTools for macOS.</a></p>
 						<p>
 							<a href="https://www.gnupg.org/">
 								<button type="button" class="btn btn-info">Website: gnupg.org</button>
@@ -2254,7 +2254,7 @@
 								<button type="button" class="btn btn-default">Tutorial</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android, BSD.</p>
+						<p>OS: Windows, macOS, Linux, Android, BSD.</p>
 					</div>
 				</div>
 			</div>
@@ -2266,7 +2266,7 @@
 					<div class="panel-body">
 						<p><img src="img/tools/PeaZip.png" alt="PeaZip" align="right" style="margin-left:5px;">PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume
 							split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).</p>
-						<p><strong>Mac alternative:</strong> <a href="http://www.kekaosx.com/">Keka</a> is a free file archiver.</p>
+						<p><strong>macOS alternative:</strong> <a href="http://www.kekaosx.com/">Keka</a> is a free file archiver.</p>
 						<p>
 							<a href="http://www.peazip.org/">
 								<button type="button" class="btn btn-warning">Website: peazip.org</button>
@@ -2282,7 +2282,7 @@
 		<ul>
 			<li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
 			<li><a href="https://minilock.io/">miniLock</a> - Browser plugin for Google Chrome / Chromium to encrypt files using a secret passphrase. Easy to use. From the developer of Cryptocat.</li>
-			<li><a href="https://www.aescrypt.com/">AES Crypt</a> - Using a powerful 256-bit encryption algorithm, AES Crypt can safely secure your most sensitive files. For Windows, Mac, Linux and Android.</li>
+			<li><a href="https://www.aescrypt.com/">AES Crypt</a> - Using a powerful 256-bit encryption algorithm, AES Crypt can safely secure your most sensitive files. For Windows, macOS, Linux and Android.</li>
 			<li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
             <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.
 		</ul>
@@ -2309,7 +2309,7 @@
 							</a>
 							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expyuzz4wqqyqhjn.onion. Requires specific software to access: torproject.org" href="http://expyuzz4wqqyqhjn.onion"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
-						<p>OS: Windows, Mac, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a></p>
+						<p>OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a></p>
 					</div>
 				</div>
 			</div>
@@ -2327,7 +2327,7 @@
 								<button type="button" class="btn btn-info">Website: geti2p.net</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android, BSD / Solaris.</p>
+						<p>OS: Windows, macOS, Linux, Android, BSD / Solaris.</p>
 					</div>
 				</div>
 			</div>
@@ -2348,7 +2348,7 @@
 								<button type="button" class="btn btn-warning">Website: freenetproject.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -2470,7 +2470,7 @@
 						<p>
 							<b> Please refrain from using DNSCrypt until further notice (DNSCrypt v2 in development, no official website yet). </b>
 						</p>
-						<p>OS: Windows, Mac, Linux, iOS with Jailbreak.</p>
+						<p>OS: Windows, macOS, Linux, iOS with Jailbreak.</p>
 					</div>
 				</div>
 			</div>
@@ -2524,7 +2524,7 @@
 								<button type="button" class="btn btn-success">Website: laverna.cc</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Web.</p>
+						<p>OS: Windows, macOS, Linux, Web.</p>
 					</div>
 				</div>
 			</div>
@@ -2541,7 +2541,7 @@
 								<button type="button" class="btn btn-info">Website: turtlapp.com</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux, Android.</p>
+						<p>OS: Windows, macOS, Linux, Android.</p>
 					</div>
 				</div>
 			</div>
@@ -2558,7 +2558,7 @@
                                 <button type="button" class="btn btn-warning">Website: standardnotes.org</button>
                             </a>
                         </p>
-                        <p>OS: Windows, Mac, Linux, iOS, Android, Web.</p>
+                        <p>OS: Windows, macOS, Linux, iOS, Android, Web.</p>
                     </div>
                 </div>
             </div>
@@ -2640,7 +2640,7 @@
 								<button type="button" class="btn btn-success">Website: etherpad.org</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, Linux.</p>
+						<p>OS: Windows, macOS, Linux.</p>
 					</div>
 				</div>
 			</div>
@@ -2657,7 +2657,7 @@
 								<button type="button" class="btn btn-info">Website: ethercalc.net</button>
 							</a>
 						</p>
-						<p>OS: Windows, Mac, GNU/Linux, FreeBSD, Browser.</p>
+						<p>OS: Windows, macOS, GNU/Linux, FreeBSD, Browser.</p>
 					</div>
 				</div>
 			</div>
@@ -2693,7 +2693,7 @@
 			<h1><a href="#os" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> PC Operating Systems</h1>
 		</div>
 		<div class="alert alert-warning" role="alert">
-			<strong>If you are currently using a operating system like Microsoft Windows or Apple Mac OS X you should pick an alternative here.</strong>
+			<strong>If you are currently using a operating system like Microsoft Windows or Apple macOS you should pick an alternative here.</strong>
 		</div>
 		<div class="row">
 			<div class="col-sm-4">