diff --git a/index.html b/index.html
index e68bca2..d20577c 100644
--- a/index.html
+++ b/index.html
@@ -112,6 +112,7 @@
 
                 <strong>Home</strong>
                 <ul>
+                    <li><a href="https://amzn.to/3dNFoW7" target="_blank">Linksys WRT1900ACS</a>, open-source ready router</li>
                     <li><a href="http://amzn.to/202xHil" target="_blank">Mid-2016 13" Macbook Pro Retina</a> laptop</li>
                     <li><a href="https://amzn.to/2WLZKqs" target="_blank">Raspberry Pi</a></li>
                     <li><a href="https://amzn.to/30jxm1n" target="_blank">Roku Express</a></li>
@@ -135,25 +136,23 @@
             <div class="answer">
                 <strong>OS</strong>
                 <ul>
-                    <li><a href="https://www.centos.org/" target="_blank">CentOS</a> for servers</li>
-                    <li><a href="https://www.ubuntu.com/engage/19-04-webinar" target="_blank">Ubuntu 19.04</a> for desktops</li>
-                    <li><a href="https://en.wikipedia.org/wiki/MacOS_Sierra" target="_blank">Mac OS X Sierra</a> for non-Linux Macs</li>
+                    <li><a href="https://openwrt.org/" target="_blank">OpenWRT</a> on the router</li>
+                    <li><a href="https://ubuntu.com/blog/ubuntu-20-04-lts-arrives" target="_blank">Ubuntu 20.04</a> for the laptop and server</li>
+                    <li><a href="https://zfsonlinux.org/" target="_blank">ZFS on Linux</a> on the main server</li>
                     <li><a href="https://www.android.com/" target="_blank">Android</a> for mobile phones</li>
-
                 </ul>
                 <br />
 
                 <strong>Apps</strong>
                 <ul>
                     <li><a href="https://www.wireguard.com/" target="_blank">WireGuard</a> VPN software</li>
-                    <li><a href="https://getsync.com/" target="_blank">Resilio</a> for BitTorrent-based file synchronisation</li>
-                    <li><a href="https://matrix.org/" target="_blank">Matrix</a>, a self-hosted, secure chat server</li>
-                    <li><a href="https://asciimoo.github.io/searx/" target="_blank">Searx</a>, a self-hosted, meta search engine</li>
+                    <li><a href="https://matrix.org/" target="_blank">Matrix</a>, a self-hosted secure chat server</li>
+                    <li><a href="https://asciimoo.github.io/searx/" target="_blank">Searx</a>, a self-hosted meta search engine</li>
                     <li><a href="https://www.ansible.com/" target="_blank">Ansible</a> for automated <a href="https://github.com/scottwallacesh/dotfiles" target="_blank">desktop builds</a></li>
                     <li><a href="https://www.mozilla.org/en-US/firefox/" target="_blank">Mozilla Firefox</a> browser</li>
-                    <li><a href="https://www.enpass.io/" target="_blank">Enpass</a> password manager</li>
+                    <li><a href="https://bitwarden.com/" target="_blank">BitWarden</a>, a self-hosted password manager</li>
                     <li><a href="https://pi-hole.net/" target="_blank">Pi-hole</a> to block ads</li>
-                    <li><a href="https://code.visualstudio.com/" target="_blank">Visual Studio Code</a> IDE</li>
+                    <li><a href="https://vscodium.com/" target="_blank">VSCodium, a FLOSS Visual Studio Code variant</a> IDE</li>
                 </ul>
                 <br />
 
@@ -176,6 +175,7 @@
                     <li><a href="https://www.plex.tv/" target="_blank">Plex Media Server</a></li>
                     <li><a href="https://sonarr.tv/" target="_blank">Sonarr</a></li>
                     <li><a href="https://radarr.video/" target="_blank">Radarr</a></li>
+                    <li><a href="https://lidarr.audio/" target="_blank">Lidarr</a></li>
                     <li><a href="https://github.com/Jackett/Jackett" target="_blank">Jackett</a></li>
                 </ul>
                 <br />
@@ -193,8 +193,6 @@
             <div class="question">What would be your dream setup?</div>
 
             <div class="answer">A simple, light but fast computer that has access to the Internet from anywhere and acts as a WiFi-hotspot, even when closed. My mobile phone would be a combination of a <a href="http://en.wikipedia.org/wiki/Personal_area_network" target="_blank">PAN</a>, the laptop and my watch. All powered with <a href="http://www.pocket-lint.com/news/130380-future-batteries-coming-soon-charge-in-seconds-last-months-and-power-over-the-air" target="_blank">super-futuristic batteries</a> that don't require charging as we know it today.. I'd also really love there to be a single movie and TV streaming service that provided all the world's content to anyone with a subscription and Internet access.</div>
-
-            <div class="answer">I'd also love an adjustable height desk such as the <a href="http://www.geekdesk.com/" target="_blank">Geek Desk</a>.</div>
         </div>
         <div id="footer">Format taken from <a href="http://usesthis.com/" target="_blank">Uses This</a></div>
     </div>