diff --git a/source/green/index.html b/source/green/index.html
index 6b5a35a189c..f5fac3f5a02 100644
--- a/source/green/index.html
+++ b/source/green/index.html
@@ -2314,7 +2314,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇺🇸</div>
             <div>ameriDroid</div>
-            <div>Located in USA</div>
+            <div>Shipping from the USA</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2332,7 +2332,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇬🇧</div>
             <div>Everything Smart Technology</div>
-            <div>Located in the United Kingdom</div>
+            <div>Shipping from the United Kingdom</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2350,7 +2350,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇩🇪</div>
             <div>mediarath</div>
-            <div>Located in Germany</div>
+            <div>Shipping from Germany</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2368,7 +2368,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇸🇪</div>
             <div>m.nu</div>
-            <div>Located in Sweden</div>
+            <div>Shipping from Sweden</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2386,7 +2386,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇩🇰</div>
             <div>RaspberryPi.dk</div>
-            <div>Located in Denmark.</div>
+            <div>Shipping from Denmark</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2404,7 +2404,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇨🇳</div>
             <div>Seeed Studio</div>
-            <div>Located in China.</div>
+            <div>Shipping from China, US and Germany</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2422,7 +2422,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇸🇰</div>
             <div>SmarterHOME</div>
-            <div>Located in Slovakia</div>
+            <div>Shipping from Slovakia</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2440,7 +2440,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇦🇺</div>
             <div>Smart Guys</div>
-            <div>Located in Australia</div>
+            <div>Shipping from Australia</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2458,7 +2458,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇨🇭</div>
             <div>Swiss-Domotique</div>
-            <div>Located in Switzerland</div>
+            <div>Shipping from Switzerland</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -2476,7 +2476,7 @@ frontpage_image: /images/frontpage/green-frontpage.png
           <div>
             <div>🇬🇧</div>
             <div>The Pi Hut</div>
-            <div>Located in the United Kingdom</div>
+            <div>Shipping from the United Kingdom</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
diff --git a/source/skyconnect/index.html b/source/skyconnect/index.html
index 4675b437705..e9240efe018 100644
--- a/source/skyconnect/index.html
+++ b/source/skyconnect/index.html
@@ -267,7 +267,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇨🇿</div>
             <div>ALZA</div>
-            <div>Located in the Czech Republic</div>
+            <div>Shipping from the Czech Republic</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -282,7 +282,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇺🇸</div>
             <div>ameriDroid</div>
-            <div>Located in USA</div>
+            <div>Shipping from the USA</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -300,7 +300,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇵🇱</div>
             <div>Botland</div>
-            <div>Located in Poland</div>
+            <div>Shipping from Poland</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -318,7 +318,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇬🇧</div>
             <div>Everything Smart Technology</div>
-            <div>Located in the United Kingdom</div>
+            <div>Shipping from the United Kingdom</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -336,7 +336,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇭🇺</div>
             <div>eWeLink device store</div>
-            <div>Located in Hungary</div>
+            <div>Shipping from Hungary</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -354,7 +354,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇳🇱</div>
             <div>HAshop</div>
-            <div>Located in the Netherlands</div>
+            <div>Shipping from the Netherlands</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -372,7 +372,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇩🇪</div>
             <div>mediarath</div>
-            <div>Located in Germany</div>
+            <div>Shipping from Germany</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -390,7 +390,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇸🇪</div>
             <div>m.nu</div>
-            <div>Located in Sweden</div>
+            <div>Shipping from Sweden</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -408,7 +408,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇭🇺</div>
             <div>OkosOtthon Bolt</div>
-            <div>Located in Hungary</div>
+            <div>Shipping from Hungary</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -426,7 +426,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇩🇰</div>
             <div>RaspberryPi.dk</div>
-            <div>Located in Denmark</div>
+            <div>Shipping from Denmark</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -444,7 +444,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇳🇱</div>
             <div>Robbshop</div>
-            <div>Located in the Netherlands</div>
+            <div>Shipping from the Netherlands</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -462,7 +462,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇨🇳</div>
             <div>Seeed Studio</div>
-            <div>Located in China</div>
+            <div>Shipping from China, US and Germany</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -480,7 +480,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇸🇰</div>
             <div>SmarterHOME</div>
-            <div>Located in Slovakia</div>
+            <div>Shipping from Slovakia</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -498,7 +498,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇦🇺</div>
             <div>Smart Guys</div>
-            <div>Located in Australia</div>
+            <div>Shipping from Australia</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -516,7 +516,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇨🇭</div>
             <div>Swiss-Domotique</div>
-            <div>Located in Switzerland</div>
+            <div>Shipping from Switzerland</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -534,7 +534,7 @@ frontpage_image: /images/skyconnect/skyconnect-cover.png
           <div>
             <div>🇬🇧</div>
             <div>The Pi Hut</div>
-            <div>Located in the United Kingdom</div>
+            <div>Shipping from the United Kingdom</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
diff --git a/source/yellow/index.html b/source/yellow/index.html
index 120db5e9230..753e97dd6c3 100644
--- a/source/yellow/index.html
+++ b/source/yellow/index.html
@@ -355,7 +355,7 @@ frontpage_image: /images/frontpage/yellow-frontpage.jpg
           <div>
             <div>🇺🇸</div>
             <div>ameriDroid</div>
-            <div>Located in USA. Yellow Standard only.</div>
+            <div>Shipping from the USA. Yellow Standard only.</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -370,7 +370,7 @@ frontpage_image: /images/frontpage/yellow-frontpage.jpg
           <div>
             <div>🇺🇸</div>
             <div>Crowd Supply</div>
-            <div>Located in USA</div>
+            <div>Shipping from the USA.</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -388,7 +388,7 @@ frontpage_image: /images/frontpage/yellow-frontpage.jpg
           <div>
             <div>🇸🇪</div>
             <div>m.nu</div>
-            <div>Located in Sweden. Yellow Standard only.</div>
+            <div>Shipping from Sweden. Yellow Standard only.</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -406,7 +406,7 @@ frontpage_image: /images/frontpage/yellow-frontpage.jpg
           <div>
             <div>🇩🇰</div>
             <div>RaspberryPi.dk</div>
-            <div>Located in Denmark. Also sells CM4 modules.</div>
+            <div>Shipping from Denmark. Also sells CM4 modules.</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path
@@ -424,7 +424,7 @@ frontpage_image: /images/frontpage/yellow-frontpage.jpg
           <div>
             <div>🇨🇳</div>
             <div>Seeed Studio</div>
-            <div>Located in China. Also sells CM4 modules.</div>
+            <div>Shipping from China, US and Germany. Also sells CM4 modules.</div>
           </div>
           <svg width="24" height="24" viewBox="0 0 24 24">
             <path