diff --git a/boards/images/beaglebone-ai-64.png b/boards/images/beaglebone-ai-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b45bf238856e5dbaab92fd62999f3cbeb0715fc
Binary files /dev/null and b/boards/images/beaglebone-ai-64.png differ
diff --git a/boards/images/beaglebone-ai-64.webp b/boards/images/beaglebone-ai-64.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5e2839dfa5867908b42aa28351693d76a5ec7e13
Binary files /dev/null and b/boards/images/beaglebone-ai-64.webp differ
diff --git a/boards/images/beaglebone-ai.png b/boards/images/beaglebone-ai.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c40c195ff5e1eecb55e8a82a225812194087afb
Binary files /dev/null and b/boards/images/beaglebone-ai.png differ
diff --git a/boards/images/beaglebone-ai.webp b/boards/images/beaglebone-ai.webp
index 00070259a2c6df561c6696a85fa81c75091983c3..bbee65fcbfd5587c35bda27e047789a7ccc288be 100644
Binary files a/boards/images/beaglebone-ai.webp and b/boards/images/beaglebone-ai.webp differ
diff --git a/boards/images/beaglebone-black.png b/boards/images/beaglebone-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02cdf9a3644358c43db2820c4e5225e7ed0d534
Binary files /dev/null and b/boards/images/beaglebone-black.png differ
diff --git a/boards/images/beaglebone-black.webp b/boards/images/beaglebone-black.webp
new file mode 100644
index 0000000000000000000000000000000000000000..95c14a2297fbb67f4d6eae7fd5573ce35377418e
Binary files /dev/null and b/boards/images/beaglebone-black.webp differ
diff --git a/boards/images/beaglebone-blue.png b/boards/images/beaglebone-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d1c990db4e248b97f82191a3020d964fceeef23
Binary files /dev/null and b/boards/images/beaglebone-blue.png differ
diff --git a/boards/images/beaglebone-blue.webp b/boards/images/beaglebone-blue.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8c6002987675fd4e9dcd9391570f1e46539d238d
Binary files /dev/null and b/boards/images/beaglebone-blue.webp differ
diff --git a/boards/images/beagleconnect-freedom.png b/boards/images/beagleconnect-freedom.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b9f0fd011e94af0de8ba3a7c191557abb4c5096
Binary files /dev/null and b/boards/images/beagleconnect-freedom.png differ
diff --git a/boards/images/beagleconnect-freedom.webp b/boards/images/beagleconnect-freedom.webp
new file mode 100644
index 0000000000000000000000000000000000000000..be1616eefd990d987b4006916ef650435fd724f6
Binary files /dev/null and b/boards/images/beagleconnect-freedom.webp differ
diff --git a/boards/images/beagleplay.png b/boards/images/beagleplay.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f99dd2bee1786e982908f1ee44e231d9c11a506
Binary files /dev/null and b/boards/images/beagleplay.png differ
diff --git a/boards/images/beagleplay.webp b/boards/images/beagleplay.webp
new file mode 100644
index 0000000000000000000000000000000000000000..664cbe36ba502bbe3234e409a5a4c1b1baa1ceb6
Binary files /dev/null and b/boards/images/beagleplay.webp differ
diff --git a/boards/images/beaglev-ahead.png b/boards/images/beaglev-ahead.png
new file mode 100644
index 0000000000000000000000000000000000000000..a93bc60b986f7611bef6785e95c46a53e5d2c875
Binary files /dev/null and b/boards/images/beaglev-ahead.png differ
diff --git a/boards/images/beaglev-ahead.webp b/boards/images/beaglev-ahead.webp
new file mode 100644
index 0000000000000000000000000000000000000000..06322ded7e999c8684880c605f11fe32b33019d1
Binary files /dev/null and b/boards/images/beaglev-ahead.webp differ
diff --git a/boards/images/beaglev-fire.png b/boards/images/beaglev-fire.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c2faa592402b428221104bb6b8059a361963000
Binary files /dev/null and b/boards/images/beaglev-fire.png differ
diff --git a/boards/images/beaglev-fire.webp b/boards/images/beaglev-fire.webp
new file mode 100644
index 0000000000000000000000000000000000000000..12ae74f715ea5e55ab7092365d140481d4061922
Binary files /dev/null and b/boards/images/beaglev-fire.webp differ
diff --git a/boards/images/45-front.png b/boards/images/old/45-front.png
similarity index 100%
rename from boards/images/45-front.png
rename to boards/images/old/45-front.png
diff --git a/boards/images/BBwhite.jpg b/boards/images/old/BBwhite.jpg
similarity index 100%
rename from boards/images/BBwhite.jpg
rename to boards/images/old/BBwhite.jpg
diff --git a/boards/images/BeagleBoneBlackWireless-Angled-400x268.png b/boards/images/old/BeagleBoneBlackWireless-Angled-400x268.png
similarity index 100%
rename from boards/images/BeagleBoneBlackWireless-Angled-400x268.png
rename to boards/images/old/BeagleBoneBlackWireless-Angled-400x268.png
diff --git a/boards/images/bb-industrial-400x356.png b/boards/images/old/bb-industrial-400x356.png
similarity index 100%
rename from boards/images/bb-industrial-400x356.png
rename to boards/images/old/bb-industrial-400x356.png
diff --git a/boards/images/beaglebone-ai-400x208.png b/boards/images/old/beaglebone-ai-400x208.png
similarity index 100%
rename from boards/images/beaglebone-ai-400x208.png
rename to boards/images/old/beaglebone-ai-400x208.png
diff --git a/boards/images/beaglebone-ai-64-400x.jpg b/boards/images/old/beaglebone-ai-64-400x.jpg
similarity index 100%
rename from boards/images/beaglebone-ai-64-400x.jpg
rename to boards/images/old/beaglebone-ai-64-400x.jpg
diff --git a/boards/images/beaglebone-ai-64-400x.webp b/boards/images/old/beaglebone-ai-64-400x.webp
similarity index 100%
rename from boards/images/beaglebone-ai-64-400x.webp
rename to boards/images/old/beaglebone-ai-64-400x.webp
diff --git a/boards/images/old/beaglebone-ai.webp b/boards/images/old/beaglebone-ai.webp
new file mode 100644
index 0000000000000000000000000000000000000000..00070259a2c6df561c6696a85fa81c75091983c3
Binary files /dev/null and b/boards/images/old/beaglebone-ai.webp differ
diff --git a/boards/images/beaglebone-black-400x400.png b/boards/images/old/beaglebone-black-400x400.png
similarity index 100%
rename from boards/images/beaglebone-black-400x400.png
rename to boards/images/old/beaglebone-black-400x400.png
diff --git a/boards/images/beaglebone-blue-400x279.png b/boards/images/old/beaglebone-blue-400x279.png
similarity index 100%
rename from boards/images/beaglebone-blue-400x279.png
rename to boards/images/old/beaglebone-blue-400x279.png
diff --git a/boards/images/pocketBeagle-hero-hand-400x222.png b/boards/images/old/pocketBeagle-hero-hand-400x222.png
similarity index 100%
rename from boards/images/pocketBeagle-hero-hand-400x222.png
rename to boards/images/old/pocketBeagle-hero-hand-400x222.png
diff --git a/boards/images/pocketbeagle.png b/boards/images/pocketbeagle.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc197b813d51e2fe1f5ae550160dcdca2c66707b
Binary files /dev/null and b/boards/images/pocketbeagle.png differ
diff --git a/boards/images/pocketbeagle.webp b/boards/images/pocketbeagle.webp
new file mode 100644
index 0000000000000000000000000000000000000000..15a40a5a99289f3f5dd0f62c1223000440e01b96
Binary files /dev/null and b/boards/images/pocketbeagle.webp differ
diff --git a/boards/index.rst b/boards/index.rst
index 61d5638281fde4200aea147ac976f866f3a319dd..6f2587704395fb1ef0adc06fa64414b4fc09f50d 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. _boards:
 
 Boards
@@ -41,15 +39,17 @@ started.
    :maxdepth: 1
    :hidden:
 
-   /boards/beaglebone/index
+   /boards/beagleplay/index
+   /boards/beaglebone/ai-64/index
+   /boards/beaglebone/ai/index
    /boards/beaglebone/black/index
    /boards/beaglebone/blue/index
-   /boards/beaglebone/ai/index
-   /boards/beaglebone/ai-64/index
-   /boards/pocketbeagle/original/index
+   /boards/beaglebone/index
    /boards/beaglev/ahead/index
    /boards/beaglev/fire/index
-   /boards/capes/index
-   /boards/beagleconnect/index
+   /boards/pocketbeagle/original/index
+   /boards/beagleconnect/freedom/index
    /boards/beagleboard/index
+   /boards/capes/index
+   /boards/terms-and-conditions
 
diff --git a/conf.py b/conf.py
index c4200e8190b8b69fe8cb0c8a269eb50fd3d71d5b..a32fe860cd442ec7e16a1f1729f84b0a4072e964 100644
--- a/conf.py
+++ b/conf.py
@@ -123,13 +123,13 @@ html_theme_options = {
         },
         {
             "name": "Discord",
-            "url": "https://bbb.io/gsocchat",
+            "url": "https://bbb.io/discord",
             "icon": "fa-brands fa-discord",
             "attributes": {"target": "_blank"},
         },
         {
             "name": "Forum",
-            "url": "https://bbb.io/gsocml",
+            "url": "https://forum.beagleboard.org/",
             "icon": "fa-brands fa-discourse",
             "attributes": {"target": "_blank"},
         },
diff --git a/index.rst b/index.rst
index ab72dcde01a45782843e95f69317881cc566233b..d3456add3dca54474b59dc18f15536d85aa08f2d 100644
--- a/index.rst
+++ b/index.rst
@@ -66,7 +66,7 @@ from source using appropriate design tools.
       **BeaglePlay®**
       ^^^
 
-      .. image:: boards/beagleplay/images/product-pictures/45front.*
+      .. image:: boards/images/beagleplay.*
          :align: center
       +++
 
@@ -80,7 +80,7 @@ from source using appropriate design tools.
       **BeagleConnectâ„¢ Freedom**
       ^^^
 
-      .. image:: boards/beagleconnect/freedom/media/product-pictures/bcf-front1.*
+      .. image:: boards/images/beagleconnect-freedom.*
          :align: center
       +++
 
@@ -94,7 +94,7 @@ from source using appropriate design tools.
       **BeagleBone® AI-64**
       ^^^
 
-      .. image:: boards/images/beaglebone-ai-64-400x.*
+      .. image:: boards/images/beaglebone-ai-64.*
          :align: center
       +++
 
@@ -109,7 +109,7 @@ from source using appropriate design tools.
       **BeagleV®-Fire**
       ^^^
 
-      .. image:: boards/beaglev/fire/media/product-pictures/bvf-45front.*
+      .. image:: boards/images/beaglev-fire.*
          :align: center
       +++
 
@@ -123,7 +123,7 @@ from source using appropriate design tools.
       **BeagleV®-Ahead**
       ^^^
 
-      .. image:: boards/beaglev/ahead/media/product-pictures/bva-45front.*
+      .. image:: boards/images/beaglev-ahead.*
          :align: center
       +++
 
@@ -137,7 +137,7 @@ from source using appropriate design tools.
       **BeagleBone® Black**
       ^^^
 
-      .. image:: boards/images/beaglebone-black-400x400.png
+      .. image:: boards/images/beaglebone-black.*
          :align: center
       +++
 
@@ -146,35 +146,6 @@ from source using appropriate design tools.
       credit card sized with over a decade of support, software and 
       materials behind it making it ready for any application.
 
-   .. grid-item-card:: 
-      :link: beagleboneblack-home
-      :link-type: ref
-
-      **BeagleBone® Black Industrial**
-      ^^^
-
-      .. image:: boards/images/bb-industrial-400x356.png
-         :align: center
-      +++
-
-      Answer the need for an industrial rated single board computer with extended 
-      temperature range with the same functionality as the popular BeagleBone Black®
-
-   .. grid-item-card:: 
-      :link: beagleboneblack-home
-      :link-type: ref
-
-      **BeagleBone® Black Wireless**
-      ^^^
-
-      .. image:: boards/images/BeagleBoneBlackWireless-Angled-400x268.png
-         :align: center
-      +++
-
-      With built-in 802.11 b/g/n 2.4GHz Wi-Fi and Bluetooth wireless networking capability, 
-      the popular open source BeagleBone® Black computer goes anywhere. Take your IoT and 
-      IIoT projects to the next level with a full Linux computer the size of a mint tin.
-
    .. grid-item-card:: 
       :link: bbai-home
       :link-type: ref
@@ -182,7 +153,7 @@ from source using appropriate design tools.
       **BeagleBone® AI**
       ^^^
 
-      .. image:: boards/images/beaglebone-ai-400x208.png
+      .. image:: boards/images/beaglebone-ai.*
          :align: center
       +++
 
@@ -197,7 +168,7 @@ from source using appropriate design tools.
       **PocketBeagle®**
       ^^^
 
-      .. image:: boards/images/pocketBeagle-hero-hand-400x222.png
+      .. image:: boards/images/pocketbeagle.*
          :align: center
       +++
 
@@ -212,7 +183,7 @@ from source using appropriate design tools.
       **BeagleBone® Blue**
       ^^^
 
-      .. image:: boards/images/beaglebone-blue-400x279.png
+      .. image:: boards/images/beaglebone-blue.*
          :align: center
       +++