diff --git a/public/data/logos.json b/public/data/logos.json
index 4e0e861..5e45079 100644
--- a/public/data/logos.json
+++ b/public/data/logos.json
@@ -554,6 +554,138 @@
       }
     }
   },
+  {
+    "name": "Matter",
+    "path": "logos/matter.svg",
+    "format": "SVG",
+    "disable": false,
+    "brand": "Matter",
+    "tags": [
+      "IoT",
+      "Smart Home"
+    ],
+    "colors": {
+      "dark_grey": "#524643",
+      "white": "#ffffff",
+      "black": "#000000"
+    },
+    "targets": {
+      "main": "#logo"
+    },
+    "sets": {
+      "dark_grey": {
+        "main": "dark_grey"
+      },
+      "white": {
+        "main": "white"
+      },
+      "black": {
+        "main": "black"
+      }
+    }
+  },
+  {
+    "name": "Matter",
+    "path": "logos/matter-icon.svg",
+    "format": "SVG",
+    "disable": false,
+    "brand": "Matter",
+    "tags": [
+      "IoT",
+      "Smart Home"
+    ],
+    "colors": {
+      "dark_grey": "#524643",
+      "white": "#ffffff",
+      "black": "#000000"
+    },
+    "targets": {
+      "main": "#logo"
+    },
+    "sets": {
+      "dark_grey": {
+        "main": "dark_grey"
+      },
+      "white": {
+        "main": "white"
+      },
+      "black": {
+        "main": "black"
+      }
+    }
+  },
+  {
+    "name": "Mattermost",
+    "path": "logos/mattermost-icon.svg",
+    "format": "SVG",
+    "disable": false,
+    "tags": [
+      "Selfhosted",
+      "Communication",
+      "Video Conferencing",
+      "Office Suite"
+    ],
+    "colors": {
+      "denim": "#1e325c",
+      "blue": "#0058cc",
+      "white": "#ffffff",
+      "black": "#000000"
+    },
+    "brand": "Mattermost",
+    "targets": {
+      "main": "path"
+    },
+    "sets": {
+      "denim": {
+        "main": "denim"
+      },
+      "blue": {
+        "main": "blue"
+      },
+      "white": {
+        "main": "white"
+      },
+      "black": {
+        "main": "black"
+      }
+    }
+  },
+  {
+    "name": "Mattermost",
+    "path": "logos/mattermost-line.svg",
+    "format": "SVG",
+    "disable": false,
+    "tags": [
+      "Selfhosted",
+      "Communication",
+      "Video Conferencing",
+      "Office Suite"
+    ],
+    "colors": {
+      "denim": "#1e325c",
+      "blue": "#0058cc",
+      "white": "#ffffff",
+      "black": "#000000"
+    },
+    "brand": "Mattermost",
+    "targets": {
+      "main": "path"
+    },
+    "sets": {
+      "denim": {
+        "main": "denim"
+      },
+      "blue": {
+        "main": "blue"
+      },
+      "white": {
+        "main": "white"
+      },
+      "black": {
+        "main": "black"
+      }
+    }
+  },
   {
     "name": "Messenger",
     "path": "logos/facebook-messenger.svg",
@@ -1313,15 +1445,27 @@
       "Office Suite"
     ],
     "colors": {
-      "denim": "#1e325c"
+      "denim": "#1e325c",
+      "blue": "#0058cc",
+      "white": "#ffffff",
+      "black": "#000000"
     },
     "brand": "Mattermost",
     "targets": {
       "main": "g"
     },
     "sets": {
-      "set_1": {
+      "denim": {
         "main": "denim"
+      },
+      "blue": {
+        "main": "blue"
+      },
+      "white": {
+        "main": "white"
+      },
+      "black": {
+        "main": "black"
       }
     }
   },
@@ -1512,6 +1656,13 @@
       "Smart Home"
     ]
   },
+  {
+    "name": "Thread",
+    "path": "logos/thread-net.svg",
+    "format": "SVG",
+    "disable": false,
+    "brand": "Thread"
+  },
   {
     "name": "Traefik Logo",
     "path": "logos/traefik-logo.svg",
diff --git a/public/global.css b/public/global.css
index 4a7872f..7ad77e5 100644
--- a/public/global.css
+++ b/public/global.css
@@ -14,6 +14,7 @@
   --color-card: var(--card-background);
   --color-accent: var(--primary-color);
   --color-accent-hover: var(--primary-color-hover);
+  --color-default-fill: #c8aca5;
 }
 
 /* Dark theme overrides - using both media query and class-based approach */
@@ -45,6 +46,7 @@
   --color-text: #333333;
   --color-border: #ddd;
   --color-accent: var(--primary-color);
+  --color-default-fill: #524643;
 }
 
 * {
@@ -116,7 +118,7 @@ button:hover {
   background: var(--color-accent);
   color: var(--white);
   font-weight: bold;
-  outline: 2px solid var(--color-border);
+  /* outline: 2px solid var(--color-border); */
 }
 
 .copy-btn,
@@ -355,7 +357,7 @@ div.logo-image img {
   max-height: 100%;
   display: block;
   object-fit: contain;
-  color: var(--color-text);
+  color: var(--color-default-fill);
 }
 
 /* Modal styles */
diff --git a/public/logos/matter-icon.svg b/public/logos/matter-icon.svg
new file mode 100644
index 0000000..f0250c0
--- /dev/null
+++ b/public/logos/matter-icon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 256 251">
+    <path fill="currentColor" id="logo"
+        d="M76.02 64.287a82.3 82.3 0 0 0 37.215 17.077V8.556L128.064 0l14.816 8.556v72.808a82.4 82.4 0 0 0 37.228-17.077l26.92 15.57c-43.782 43.316-114.274 43.316-158.056 0zm32.717 185.928C124.35 190.623 89.072 129.57 29.645 113.34v31.152a82.4 82.4 0 0 1 33.413 23.686L0 204.582v17.124l14.828 8.51l63.047-36.404a82.3 82.3 0 0 1 3.814 40.774zM226.413 113.34c-59.395 16.266-94.634 77.305-79.023 136.875l26.979-15.582a82.4 82.4 0 0 1 3.814-40.775l63 36.358L256 221.66v-17.078l-63.058-36.404a82.5 82.5 0 0 1 33.413-23.686z" />
+</svg>
diff --git a/public/logos/matter.svg b/public/logos/matter.svg
new file mode 100644
index 0000000..a6add94
--- /dev/null
+++ b/public/logos/matter.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 512 110">
+    <path fill="currentColor" id="logo"
+        d="M33.367 28.217A36.1 36.1 0 0 0 49.7 35.713V3.755L56.21 0l6.503 3.755v31.958a36.2 36.2 0 0 0 16.34-7.496l11.816 6.834c-19.217 19.012-50.157 19.012-69.374 0zm14.36 81.607c6.853-26.156-8.632-52.953-34.715-60.077v13.674a36.16 36.16 0 0 1 14.665 10.396L0 89.795v7.516l6.508 3.735l27.673-15.978a36.1 36.1 0 0 1 1.674 17.897zm51.65-60.077c-26.07 7.14-41.537 33.93-34.684 60.077l11.841-6.839a36.2 36.2 0 0 1 1.674-17.897l27.652 15.958l6.504-3.755v-7.496L84.686 73.817A36.2 36.2 0 0 1 99.352 63.42zm215.853-3.974V35.05h6.417v54.744h-6.417V79.11a25.95 25.95 0 0 1-22.054 11.8c-15.575-.208-28.091-12.892-28.091-28.468s12.516-28.26 28.09-28.469a25.95 25.95 0 0 1 22.055 11.8m-22.054-5.404c-12.18 0-22.055 9.874-22.055 22.054s9.874 22.055 22.055 22.055a22.03 22.03 0 0 0 22.054-22.055c0-12.18-9.874-22.054-22.054-22.054m97.29-24.009l-6.411 3.68v15.01H351.44V16.36l-6.412 3.678V35.05h-8.605v6.178h8.605v36.053a12.386 12.386 0 0 0 12.437 12.513h9.542v-6.411h-9.542a6.107 6.107 0 0 1-6.025-6.023V41.229h32.614v36.053a12.366 12.366 0 0 0 12.355 12.513h9.623v-6.411h-9.623a6.107 6.107 0 0 1-5.943-6.025V41.23h15.566v-6.18h-15.567zM244.69 57.34v32.455h6.412V57.34c0-13.638-10.467-23.409-23.408-23.409c-8.37 0-15.994 4.3-20.217 13.063c-4.3-8.681-11.847-13.063-20.136-13.063c-12.915 0-23.408 9.745-23.408 23.409v32.455h6.416V57.34c0-10.096 7.598-16.971 16.971-16.971s17.027 6.875 17.027 16.97v32.456h6.412V57.34c0-10.096 7.597-16.971 16.97-16.971c9.374 0 16.961 6.875 16.961 16.97m264.888-16.971H512v-6.412h-2.422c-12.915 0-23.408 9.745-23.408 23.408V89.82h6.417V57.34c.02-9.996 7.466-16.833 16.71-16.97zm-65.382-6.062c15.42 0 28.006 12.267 28.458 27.624l.01.492c0 .626-.081 1.333-.081 1.96h-50.745c1.018 11.276 10.89 20.095 23.688 20.095c7.898 0 14.152-3.359 18.223-8.524l5.628 3.206c-5.241 7.124-13.607 11.734-23.85 11.734c-17.053 0-29.8-12.747-29.8-28.496c.208-15.575 12.893-28.091 28.469-28.091m-.003 6.062c-10.686 0-19.988 7.658-22.024 17.836h44.048c-2.036-10.178-11.338-17.836-22.024-17.836" />
+</svg>
diff --git a/public/logos/mattermost-icon.svg b/public/logos/mattermost-icon.svg
new file mode 100644
index 0000000..07f8753
--- /dev/null
+++ b/public/logos/mattermost-icon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 256 256">
+    <path fill="currentColor"
+        d="M6.791 86.965C25.235 32.482 76.783-1.432 131.421.046L113.91 20.74C81.496 26.6 53.507 48.735 42.507 81.23c-16.366 48.347 11.066 101.317 61.272 118.315c50.207 16.994 104.174-8.421 120.54-56.766c10.965-32.387 2.27-66.847-19.756-91.18l-1.346-27.169c44.154 32.048 64.406 90.205 45.991 144.6c-22.662 66.941-95.298 102.837-162.24 80.176c-66.94-22.662-102.837-95.299-80.177-162.24m158.394-75.041a2.96 2.96 0 0 1 2.137-.098a2.97 2.97 0 0 1 1.614 1.334l.072.116l.064.134c.168.321.311.69.378 1.141c.132.89.192 2.985.216 5.13l.005.585c.006.683.009 1.36.01 1.994v.532c-.002 1.735-.017 3.035-.017 3.035l.503 18.933l.744 21.855l.927 37.98v.083l.001.045v.121c-.007 2.17-.452 18.049-11.717 29.085c-12.112 11.866-26.99 10.78-36.67 7.504c-9.68-3.278-22.158-11.453-24.572-28.237c-2.052-14.266 5.533-26.257 7.854-29.533l.155-.217c.316-.438.5-.668.5-.668l23.808-29.606l13.868-16.91l11.9-14.734s1.75-2.345 3.551-4.653l.36-.46a111 111 0 0 1 1.718-2.141l.305-.366c.444-.527.82-.952 1.085-1.208c.308-.3.625-.494.935-.645l.227-.116Z" />
+</svg>
diff --git a/public/logos/mattermost-line.svg b/public/logos/mattermost-line.svg
new file mode 100644
index 0000000..bf49d26
--- /dev/null
+++ b/public/logos/mattermost-line.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 512 85">
+    <path fill="currentColor"
+        d="m42.642.004l.538.011l-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874c-5.378 15.885 3.635 33.29 20.131 38.874s34.228-2.767 39.605-18.651c3.55-10.487.828-21.636-6.179-29.61l-.312-.349l-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51c-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574C8.23 10.852 24.89-.247 42.641.004M190.4 28.314q8.331 0 13.017 4.006q4.686 4.005 4.686 12.815v24.03q-2.805.882-6.81 1.683q-4.004.8-9.05.8q-4.085 0-7.49-.72t-5.846-2.403a11.3 11.3 0 0 1-3.767-4.325q-1.32-2.644-1.32-6.489t1.641-6.448a12.66 12.66 0 0 1 4.245-4.165q2.604-1.562 5.808-2.243a30.7 30.7 0 0 1 6.408-.68q2.323 0 5.127.24v-.962q0-1.921-.641-3.124a4.8 4.8 0 0 0-1.762-1.881q-1.123-.682-2.763-.922a25 25 0 0 0-3.646-.24q-4.325 0-9.21 1.682q-1.124-2.084-1.683-3.926q-.56-1.841-.561-4.406q3.525-1.2 7.048-1.76q3.525-.562 6.569-.562m-30.328-12.202q3.297 0 6.334.483l2.95 54.57q-3.296.484-6.247.484a35 35 0 0 1-5.813-.483l-1.563-39.455l-12.67 27.27q-1.214.161-2.517.281q-1.3.12-2.603.12q-1.127.001-2.255-.08a19 19 0 0 1-2.344-.322l-11.8-27.835l-1.215 40.02q-2.777.484-5.381.484q-2.776 0-5.727-.483l2.43-54.57a48.5 48.5 0 0 1 6.681-.484q3.385 0 6.682.483l14.319 29.718l14.751-29.718q2.69-.483 5.988-.483m130.834 12.202q4.325 0 7.689 1.522t5.727 4.166q2.364 2.642 3.566 6.287q1.2 3.645 1.2 7.81q0 1.523-.12 3.005q-.12 1.48-.28 2.363h-26.594q.321 4.805 3.365 6.968t8.01 2.163q2.723 0 5.567-.522a31.6 31.6 0 0 0 5.407-1.48q.882 1.601 1.522 3.844t.72 4.806q-6.247 2.403-14.098 2.403q-5.766 0-9.892-1.602t-6.728-4.446q-2.604-2.842-3.845-6.769q-1.241-3.924-1.24-8.57q-.001-4.565 1.28-8.57q1.28-4.007 3.805-6.97q2.523-2.964 6.248-4.686t8.69-1.722m136.092 0q5.045 0 8.81 1.682q3.764 1.684 6.25 4.606q2.481 2.925 3.684 6.929q1.2 4.005 1.201 8.57q0 4.567-1.201 8.491q-1.203 3.926-3.685 6.848q-2.485 2.925-6.249 4.567q-3.764 1.641-8.81 1.642q-5.048 0-8.77-1.642q-3.726-1.641-6.17-4.567q-2.442-2.922-3.684-6.848t-1.241-8.49q0-4.567 1.241-8.571q1.242-4.005 3.685-6.929q2.442-2.923 6.168-4.606q3.724-1.681 8.77-1.682m41.277 0q3.123 0 6.167.561q3.044.56 6.168 1.682a22 22 0 0 1-.802 4.325q-.64 2.243-1.52 3.926a32 32 0 0 0-4.247-1.402q-2.322-.6-4.885-.601q-2.723 0-4.246.841q-1.522.84-1.521 2.683q0 1.763 1.08 2.484q1.082.721 3.084 1.361l4.566 1.363q2.244.64 4.045 1.561q1.802.922 3.084 2.283q1.282 1.363 2.002 3.364q.722 2.003.722 4.886q0 2.965-1.242 5.527q-1.242 2.565-3.604 4.445q-2.364 1.884-5.728 2.964q-3.364 1.082-7.61 1.082q-1.922 0-3.523-.12a28 28 0 0 1-3.084-.4a36 36 0 0 1-2.924-.681a36 36 0 0 1-3.124-1.042q.16-2.164.76-4.365a27.5 27.5 0 0 1 1.563-4.286q2.644 1.042 5.007 1.562q2.363.521 4.926.521q1.121 0 2.442-.2a9 9 0 0 0 2.444-.72a5.8 5.8 0 0 0 1.882-1.363q.761-.84.76-2.203q0-1.922-1.16-2.764q-1.164-.841-3.244-1.481l-4.967-1.442q-4.486-1.282-7.008-3.805q-2.524-2.523-2.524-7.57q0-6.086 4.365-9.531t11.896-3.445M256.952 17.18v12.095h9.693q.24 1.201.32 2.163t.08 2.003q0 1.12-.08 2.162a22 22 0 0 1-.32 2.323h-9.693v16.261q0 2.483.402 4.005q.4 1.52 1.16 2.404a3.83 3.83 0 0 0 1.883 1.2q1.122.321 2.643.321q1.203 0 2.364-.2t2.042-.36q.56 1.52.8 3.163q.242 1.643.242 2.924q0 .881-.04 1.483q-.04.6-.12 1.16q-3.685.882-7.61.88q-7.29 0-11.134-3.402q-3.846-3.406-3.846-11.095V37.926h-5.206l-.401-1.602l14.98-19.144zm-30.052 0v12.095h9.692q.24 1.201.321 2.163q.078.961.079 2.003q0 1.12-.079 2.162a22 22 0 0 1-.321 2.323H226.9v16.261q0 2.483.401 4.005q.4 1.52 1.16 2.404a3.83 3.83 0 0 0 1.883 1.2q1.123.321 2.643.321q1.202 0 2.364-.2t2.042-.36a15.7 15.7 0 0 1 .802 3.163q.24 1.643.24 2.924q0 .881-.04 1.483q-.04.6-.121 1.16a32.6 32.6 0 0 1-7.609.88q-7.29 0-11.134-3.402q-3.845-3.406-3.845-11.095V37.926h-5.207l-.4-1.602l14.979-19.144zm107.84 11.614q.801 0 1.842.081q1.04.08 1.522.24q.16.801.24 1.842q.081 1.041.08 2.164q0 1.36-.12 2.963a21 21 0 0 1-.44 3.043q-.882-.16-1.962-.16h-1.322q-1.362 0-3.045.28q-1.68.282-3.204 1.484q-1.522 1.2-2.522 3.604q-1.002 2.403-1.002 6.729v19.705q-1.441.239-2.884.319q-1.44.08-2.803.08t-2.764-.08a30 30 0 0 1-2.923-.32V29.276q1.201-.24 2.282-.36q1.082-.12 2.364-.12q1.203 0 2.362.16q1.163.16 2.283.4q.241.401.441 1.162q.2.762.361 1.602t.28 1.683l.2 1.401q1.764-2.483 4.325-4.445q2.565-1.964 6.408-1.964m55.395-.48q7.05 0 10.373 3.886q3.324 3.884 3.324 12.135v26.353q-2.883.48-5.687.48t-5.686-.48v-23.39q0-4.326-1.083-6.647q-1.08-2.325-4.365-2.324q-1.362 0-2.682.4q-1.324.4-2.404 1.482q-1.08 1.08-1.763 3.045c-.454 1.306-.68 3.004-.68 5.085v22.349q-2.885.48-5.688.48t-5.688-.48v-23.39q0-4.326-1.08-6.647q-1.082-2.325-4.366-2.324q-1.36 0-2.724.4q-1.36.4-2.443 1.562q-1.081 1.161-1.721 3.245q-.642 2.081-.642 5.446v21.708q-2.883.48-5.687.48q-2.803 0-5.686-.48V29.275q1.12-.24 2.242-.36t2.484-.12a21 21 0 0 1 2.402.12q1.042.12 2.163.36q.24.401.44 1.162t.361 1.602t.28 1.642t.201 1.361q.64-1.2 1.682-2.403q1.041-1.2 2.483-2.162a13.5 13.5 0 0 1 3.244-1.562q1.802-.6 4.045-.601q9.692 0 12.416 7.37q1.6-2.965 4.526-5.167q2.923-2.203 7.41-2.203m110.33-11.134v12.095h9.692q.24 1.201.321 2.163q.08.961.08 2.003a28 28 0 0 1-.08 2.162a22 22 0 0 1-.32 2.323h-9.692v16.261q0 2.483.4 4.005q.4 1.52 1.161 2.404a3.83 3.83 0 0 0 1.883 1.2q1.122.321 2.643.321q1.2 0 2.364-.2q1.16-.2 2.041-.36q.563 1.52.801 3.163q.242 1.643.24 2.924q.001.881-.04 1.483q-.038.6-.119 1.16q-3.683.882-7.61.88q-7.289 0-11.134-3.402q-3.845-3.406-3.845-11.095V37.926h-5.206l-.401-1.602l14.979-19.144zm-73.467 20.025q-4.406 0-6.368 3.325q-1.965 3.324-1.964 9.572q0 6.248 1.964 9.572q1.962 3.324 6.368 3.324q4.486 0 6.447-3.324q1.963-3.324 1.963-9.572t-1.963-9.572q-1.961-3.325-6.447-3.325M192.963 51.304q-3.924 0-6.208 1.401q-2.283 1.402-2.283 4.526q0 2.083.882 3.204q.881 1.121 2.122 1.641a8.7 8.7 0 0 0 2.643.642q1.404.12 2.443.12q1.203 0 2.403-.2q1.202-.2 2.084-.361V51.704q-.961-.16-2.084-.28q-1.12-.12-2.002-.12M54.976 3.885c.195.067.353.19.467.343l.063.096l.024.038l.02.044c.056.106.103.226.125.375c.04.271.06.882.07 1.53l.003.392l.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222l.244 7.18l.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553c-3.98 3.9-8.868 3.542-12.048 2.466c-3.18-1.077-7.28-3.763-8.074-9.278c-.778-5.41 2.663-9.825 2.793-9.99l.003-.004l7.823-9.728l4.556-5.555l3.91-4.842s1.795-2.404 2.306-2.9q.102-.097.205-.157l.102-.055l.075-.038l.013-.005a.97.97 0 0 1 .702-.033m235.77 33.08q-4.006 0-6.088 2.243t-2.483 6.329h16.18q-.16-3.846-2.123-6.208q-1.962-2.365-5.487-2.365" />
+</svg>
diff --git a/public/logos/thread-net.svg b/public/logos/thread-net.svg
new file mode 100644
index 0000000..483b8e7
--- /dev/null
+++ b/public/logos/thread-net.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24">
+    <path fill="currentColor"
+        d="M16.259 8.754a1.094 1.094 0 0 0-2.188 0v1.094h1.093a1.1 1.1 0 0 0 1.095-1.094m5.481 1.207a9.95 9.95 0 1 0-9.831 11.959v-9.91H8.661a1.751 1.751 0 0 0 0 3.5v2.162a3.913 3.913 0 1 1 0-7.826h3.248V8.754a3.256 3.256 0 1 1 3.256 3.256h-1.094v9.7A9.92 9.92 0 0 0 21.74 9.961" />
+</svg>