diff --git a/index.html b/index.html
index a3fccdf..3520867 100644
--- a/index.html
+++ b/index.html
@@ -90,12 +90,12 @@
             <div class="answer">
                 <strong>EDC</strong>
                 <ul>
-                    <li><a href="http://amzn.to/2E11rKJ">Archer 1A V3 torch</a></li>
-                    <li><a href="http://amzn.to/2fDJDpc">Garmin Fēnix 3 HR</a> watch</li>
-                    <li><a href="https://amzn.to/2LCHxvk">Google Pixel 4a</a> mobile phone</li>
+                    <li><a href="https://thrunite.com/archer-1a-v3/">Archer 1A V3 torch</a></li>
+                    <li><a href="https://buy.garmin.com/en-GB/GB/p/545480">Garmin Fēnix 3 HR</a> watch</li>
+                    <li><a href="https://store.google.com/product/pixel_4a">Google Pixel 4a</a> mobile phone</li>
                     <li><a href="https://ridgewallet.co.uk/collections/all-wallets">Ridge wallet</a></li>
-                    <li><a href="http://amzn.to/1ZxXSRr">Leatherman Squirt PS4</a> pocket knife</li>
-                    <li><a href="http://amzn.to/1ZxXJgF">Orbitkey</a></li>
+                    <li><a href="https://www.leatherman.co.uk/products/leatherman-squirt-ps4-keychain-multi-tool-black">Leatherman Squirt PS4</a> pocket knife</li>
+                    <li><a href="https://www.orbitkey.eu/pages/orbitkey-features">Orbitkey</a></li>
                     <li><a href="https://www.knivesandtools.co.uk/en/pt/-benchmade-mini-griptilian-556-s30v-pocket-knife-mel-pardue-design.htm">Benchmade Mini-Griptilian 556-S30VC</a></li>
                     </li>
                 </ul>
@@ -103,11 +103,11 @@
 
                 <strong>Roaming</strong>
                 <ul>
-                    <li><a href="http://amzn.eu/dQjF25T">5th generation Kindle</a></li>
-                    <li><a href="https://amzn.to/2LWjXJS">AfterShokz Aeropex</a> headphones</li>
-                    <li><a href="https://amzn.to/3dRnG3V">EC Technology 8-Port 60W 12A USB Charger</a></li>
-                    <li><a href="http://amzn.to/2a75Iy4">Hiplok V150</a> bike lock</li>
-                    <li><a href="https://amzn.to/2MlH0t6">Overboard Pro-Light</a> backpack</li>
+                    <li><a href="https://www.amazon.co.uk/D01100-Kindle-5th-Generation/dp/B007TKK5SG">5th generation Kindle</a></li>
+                    <li><a href="https://aftershokz.co.uk/products/aeropex">AfterShokz Aeropex</a> headphones</li>
+                    <li><a href="https://www.amazon.co.uk/dp/B07QY77N4B">EC Technology 8-Port 60W 12A USB Charger</a></li>
+                    <li><a href="https://hiplok.com/product/hiplok-original/">Hiplok V150</a> bike lock</li>
+                    <li><a href="https://www.over-board.co.uk/products/ultra-light-pro-sports-waterproof-backpack-20ltr-black">Overboard Pro-Light</a> backpack</li>
                     <li><a href="https://www.kickstarter.com/projects/pedale88/crono-low-maintenance-belt-drive-lifestyle-bicycle">Pedale88 Crono-S</a> bike (single-speed)</li>
                 </ul>
                 <br />
@@ -115,13 +115,13 @@
                 <strong>Home</strong>
                 <ul>
                     <li><a href="https://dell.com/tc/business/p/precision-t7610-workstation/pd">Dell Precision T7610 Workstation</a></li>
-                    <li><a href="http://amzn.to/202xHil">Mid-2016 13" Macbook Pro Retina</a> laptop</li>
-                    <li><a href="https://amzn.to/3dNFoW7">Linksys WRT1900ACS</a>, open-source ready router</li>
-                    <li><a href="http://amzn.to/1ZxZN8t">Logitech Harmony 600</a> universal remote</li>
-                    <li><a href="https://amzn.to/2WLZKqs">Raspberry Pi 3</a></li>
-                    <li><a href="https://amzn.to/30jxm1n">Roku Express</a></li>
-                    <li><a href="http://www.amazon.co.uk/dp/B001W3QUXK">Samsung Series 8 LED TV</a></li>
-                    <li><a href="http://amzn.to/202zc0a">Sonos</a> <a href="http://amzn.to/202zdB3">speakers</a></li>
+                    <li><a href="https://support.apple.com/kb/SP747">Mid-2016 13" Macbook Pro Retina</a> laptop</li>
+                    <li><a href="https://www.linksys.com/gb/support-product?pid=01t34000003qSgQAAU">Linksys WRT1900ACS</a>, open-source ready router</li>
+                    <li><a href="https://support.myharmony.com/en-us/600">Logitech Harmony 600</a> universal remote</li>
+                    <li><a href="https://www.raspberrypi.org/products/raspberry-pi-3-model-b/">Raspberry Pi 3</a></li>
+                    <li><a href="https://www.roku.com/en-gb/products/roku-express">Roku Express</a></li>
+                    <li><a href="https://www.samsung.com/uk/support/model/UE40B8000XWXXC/">Samsung Series 8 LED TV</a> (UE40B8000)</li>
+                    <li><a href="https://www.amazon.co.uk/dp/B002RL9KZG">Sonos</a> <a href="https://www.amazon.co.uk/dp/B00FMS1KJK">speakers</a></li>
                 </ul>
                 <br />