diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1f934999..6c84af3d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,22 +76,23 @@ Please respect the rules below when editing the file.
 
 ### Format
 
-| Column         | Description                                                             | Example / valid values
-|----------------|-------------------------------------------------------------------------|-----------------------
-| name           | The tool name that appears in the tools list                            | `"Example Sim"`
-| license        | License (commercial or [OSI approved](https://opensource.org/licenses)) | `"commercial"`, `"osi"`
-| url            | Link to the tool's homepage                                             | `"https://example.com/example-sim/"`
-| logo           | filename of the tool's logo (or company's logo)                         | `"example-sim.svg"`
-| vendor         | Name of the tool vendor                                                 | `"Example Company"`
-| vendorURL      | Link to the vendor's homepage                                           | `"https://example.com/"`
-| examplesURL    | Link to the tool's example FMUs and compatibility information           | `"https://github.com/example/example-sim/"`
-| description    | A [description](#tool-description) of the tool                          | `"Run simulations in the cloud in real time"`
-| features       | Reserved for future use                                                 | `[]`
-| platforms      | Supported platforms                                                     | `["macOS", "Linux", "Windows"]`
-| interfaces     | Supported interfaces                                                    | `["GUI", "CLI", "library"]`
-| fmiVersions    | Supported FMI versions                                                  | `["1.0", "2.0", "3.0"]`
-| fmuExport      | Supported interface types for FMU export                                | `["CS", "ME", "SE"]`
-| fmuImport      | Supported interface types for FMU import                                | `["CS", "ME", "SE"]`
+| Column           | Description                                                             | Example / valid values
+|------------------|-------------------------------------------------------------------------|-----------------------
+| name             | The tool name that appears in the tools list                            | `"Example Sim"`
+| license          | License (commercial or [OSI approved](https://opensource.org/licenses)) | `"commercial"`, `"osi"`
+| url              | Link to the tool's homepage                                             | `"https://example.com/example-sim/"`
+| logo             | filename of the tool's logo (or company's logo)                         | `"example-sim.svg"`
+| vendor           | Name of the tool vendor                                                 | `"Example Company"`
+| vendorURL        | Link to the vendor's homepage                                           | `"https://example.com/"`
+| examplesURL      | Link to the tool's example FMUs and compatibility information           | `"https://github.com/example/example-sim/"`
+| description      | A [description](#tool-description) of the tool                          | `"Run simulations in the cloud in real time"`
+| features         | Reserved for future use                                                 | `[]`
+| platforms        | Supported platforms                                                     | `["macOS", "Linux", "Windows"]`
+| interfaces       | Supported interfaces                                                    | `["GUI", "CLI", "library"]`
+| fmiVersions      | Supported FMI versions                                                  | `["1.0", "2.0", "3.0"]`
+| fmuExport        | Supported interface types for FMU export                                | `["CS", "ME", "SE"]`
+| fmuImport        | Supported interface types for FMU import                                | `["CS", "ME", "SE"]`
+| layeredStandards | Supported layered standards                                             | `["BUS", "XCP"]`
 
 Example:
 
@@ -123,6 +124,9 @@ Example:
     ],
     "fmuImport": [
         "CS"
+    ],
+    "layeredStandards": [
+        "BUS"
     ]
 }
 ```
diff --git a/content/tools.html b/content/tools.html
index 12300cf1..a2898408 100644
--- a/content/tools.html
+++ b/content/tools.html
@@ -4,15 +4,15 @@
 
 <div id="app">
 
-  <div class="row justify-content-center">
+  <div class="row justify-content-center gy-3">
     <div class="col-auto">
       <div class="row">
         <label class="form-label text-center">FMI Version</label>
       </div>
       <div class="btn-group" role="group">
-        <button type="button" @click="showFMI1 = !showFMI1" class="btn btn-secondary" v-bind:class="{ 'active': showFMI1}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI 1.0">1.0</button>
-        <button type="button" @click="showFMI2 = !showFMI2" class="btn btn-secondary" v-bind:class="{ 'active': showFMI2}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI 2.0">2.0</button>
-        <button type="button" @click="showFMI3 = !showFMI3" class="btn btn-secondary" v-bind:class="{ 'active': showFMI3}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI 3.0">3.0</button>
+        <button type="button" @click="showFMI1 = !showFMI1" class="btn btn-secondary" v-bind:class="{'active': showFMI1}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI 1.0">1.0</button>
+        <button type="button" @click="showFMI2 = !showFMI2" class="btn btn-secondary" v-bind:class="{'active': showFMI2}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI 2.0">2.0</button>
+        <button type="button" @click="showFMI3 = !showFMI3" class="btn btn-secondary" v-bind:class="{'active': showFMI3}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI 3.0">3.0</button>
       </div>
     </div>
     <div class="col-auto">
@@ -20,9 +20,9 @@
         <label class="form-label text-center">Import</label>
       </div>
       <div class="btn-group ml-3" role="group">
-        <button type="button" @click="showCSImport = !showCSImport" class="btn btn-secondary" v-bind:class="{ 'active': showCSImport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Co-Simulation import">CS</button>
-        <button type="button" @click="showMEImport = !showMEImport" class="btn btn-secondary" v-bind:class="{ 'active': showMEImport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Model Exchange import">ME</button>
-        <button type="button" @click="showSEImport = !showSEImport" class="btn btn-secondary" v-bind:class="{ 'active': showSEImport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Scheduled Execution import">SE</button>
+        <button type="button" @click="showCSImport = !showCSImport" class="btn btn-secondary" v-bind:class="{'active': showCSImport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Co-Simulation import">CS</button>
+        <button type="button" @click="showMEImport = !showMEImport" class="btn btn-secondary" v-bind:class="{'active': showMEImport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Model Exchange import">ME</button>
+        <button type="button" @click="showSEImport = !showSEImport" class="btn btn-secondary" v-bind:class="{'active': showSEImport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Scheduled Execution import">SE</button>
       </div>
     </div>
     <div class="col-auto">
@@ -30,9 +30,9 @@
         <label class="form-label text-center">Export</label>
       </div>
       <div class="btn-group ml-3" role="group">
-        <button id="btn-commercial" type="button" @click="showCSExport = !showCSExport" class="btn btn-secondary" v-bind:class="{ 'active': showCSExport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Co-Simulation export">CS</button>
-        <button id="btn-opensource" type="button" @click="showMEExport = !showMEExport" class="btn btn-secondary" v-bind:class="{ 'active': showMEExport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Model Exchange export">ME</button>
-        <button id="btn-opensource" type="button" @click="showSEExport = !showSEExport" class="btn btn-secondary" v-bind:class="{ 'active': showSEExport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Scheduled Execution export">SE</button>
+        <button id="btn-commercial" type="button" @click="showCSExport = !showCSExport" class="btn btn-secondary" v-bind:class="{'active': showCSExport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Co-Simulation export">CS</button>
+        <button id="btn-opensource" type="button" @click="showMEExport = !showMEExport" class="btn btn-secondary" v-bind:class="{'active': showMEExport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Model Exchange export">ME</button>
+        <button id="btn-opensource" type="button" @click="showSEExport = !showSEExport" class="btn btn-secondary" v-bind:class="{'active': showSEExport}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Scheduled Execution export">SE</button>
       </div>
     </div>
     <div class="col-auto">
@@ -40,10 +40,10 @@
         <label class="form-label text-center">Platform</label>
       </div>
       <div class="btn-group" role="group">
-        <button id="btn-windows" type="button" @click="showWindows = !showWindows" class="btn btn-secondary" v-bind:class="{ 'active': showWindows}"  data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Windows"><i class="fab fa-windows"></i></button>
-        <button id="btn-linux" type="button" @click="showLinux = !showLinux" class="btn btn-secondary" v-bind:class="{ 'active': showLinux}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Linux"><i class="fab fa-linux"></i></button>
-        <button id="btn-macos" type="button" @click="showMac = !showMac" class="btn btn-secondary" v-bind:class="{ 'active': showMac}"  data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="macOS"><i class="fab fa-apple"></i></button>
-        <button id="btn-source-code" type="button" @click="showSourceCode = !showSourceCode" class="btn btn-secondary" v-bind:class="{ 'active': showSourceCode}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Source Code"><i class="fa-solid fa-c"></i></button>
+        <button id="btn-windows" type="button" @click="showWindows = !showWindows" class="btn btn-secondary" v-bind:class="{'active': showWindows}"  data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Windows"><i class="fab fa-windows"></i></button>
+        <button id="btn-linux" type="button" @click="showLinux = !showLinux" class="btn btn-secondary" v-bind:class="{'active': showLinux}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Linux"><i class="fab fa-linux"></i></button>
+        <button id="btn-macos" type="button" @click="showMac = !showMac" class="btn btn-secondary" v-bind:class="{'active': showMac}"  data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="macOS"><i class="fab fa-apple"></i></button>
+        <button id="btn-source-code" type="button" @click="showSourceCode = !showSourceCode" class="btn btn-secondary" v-bind:class="{'active': showSourceCode}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Source Code"><i class="fa-solid fa-c"></i></button>
       </div>
     </div>
     <div class="col-auto">
@@ -60,9 +60,20 @@
         <label class="form-label text-center">Interface</label>
       </div>
       <div class="btn-group ml-3" role="group">
-        <button id="btn-commercial" type="button" @click="showGUI = !showGUI" class="btn btn-secondary" v-bind:class="{ 'active': showGUI}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Graphical User Interface"><i class="fa-solid fa-window-maximize"></i></button>
-        <button id="btn-opensource" type="button" @click="showCLI = !showCLI" class="btn btn-secondary" v-bind:class="{ 'active': showCLI}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Command Line Interface / scriptable"><i class="fa-solid fa-terminal"></i></button>
-        <button id="btn-opensource" type="button" @click="showLibrary = !showLibrary" class="btn btn-secondary" v-bind:class="{ 'active': showLibrary}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Library / Plug-in"><i class="fa-solid fa-file-code"></i></button>
+        <button id="btn-commercial" type="button" @click="showGUI = !showGUI" class="btn btn-secondary" v-bind:class="{'active': showGUI}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Graphical User Interface"><i class="fa-solid fa-window-maximize"></i></button>
+        <button id="btn-opensource" type="button" @click="showCLI = !showCLI" class="btn btn-secondary" v-bind:class="{'active': showCLI}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Command Line Interface / scriptable"><i class="fa-solid fa-terminal"></i></button>
+        <button id="btn-opensource" type="button" @click="showLibrary = !showLibrary" class="btn btn-secondary" v-bind:class="{'active': showLibrary}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Library / Plug-in"><i class="fa-solid fa-file-code"></i></button>
+      </div>
+    </div>
+    <div class="col-auto">
+      <div class="row">
+        <label class="form-label text-center">Layered Standards</label>
+      </div>
+      <div class="btn-group ml-3" role="group">
+        <button id="btn-bus" type="button" @click="showBUS = !showBUS" class="btn btn-secondary" v-bind:class="{'active': showBUS}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI-LS-BUS">BUS</button>
+        <button id="btn-ref" type="button" @click="showREF = !showREF" class="btn btn-secondary" v-bind:class="{'active': showREF}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI-LS-REF">REF</button>
+        <button id="btn-struct" type="button" @click="showStruct = !showStruct" class="btn btn-secondary" v-bind:class="{'active': showStruct}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI-LS-Struct">Struct</button>
+        <button id="btn-xcp" type="button" @click="showXCP = !showXCP" class="btn btn-secondary" v-bind:class="{'active': showXCP}" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="FMI-LS-XCP">XCP</button>
       </div>
     </div>
     <div class="col-auto">
@@ -157,6 +168,10 @@
         showGUI: false,
         showCLI: false,
         showLibrary: false,
+        showBUS: false,
+        showREF: false,
+        showStruct: false,
+        showXCP: false,
         search: "",
         tools: []
       }
@@ -227,6 +242,11 @@
           if (self.showCLI     && !listContains(tool.interfaces, 'CLI'))     return false;
           if (self.showLibrary && !listContains(tool.interfaces, 'library')) return false;
 
+          if (self.showBUS    && !listContains(tool.layeredStandards, 'BUS'))    return false;
+          if (self.showREF    && !listContains(tool.layeredStandards, 'REF'))    return false;
+          if (self.showStruct && !listContains(tool.layeredStandards, 'Struct')) return false;
+          if (self.showXCP    && !listContains(tool.layeredStandards, 'XCP'))    return false;
+
           return containsLowerCase(tool.name, this.search) || containsLowerCase(tool.vendor, this.search) || containsLowerCase(tool.description, this.search);
         })
       }
diff --git a/static/assets/tools.json b/static/assets/tools.json
index 141c77fb..d8e346f9 100644
--- a/static/assets/tools.json
+++ b/static/assets/tools.json
@@ -384,6 +384,9 @@
         "fmuImport": [
             "CS",
             "ME"
+        ],
+        "layeredStandards": [
+            "BUS"
         ]
     },
     {
@@ -754,6 +757,9 @@
         "interfaces": [
             "GUI",
             "CLI"
+        ],
+        "layeredStandards": [
+            "BUS"
         ]
     },
     {
@@ -779,6 +785,9 @@
         "interfaces": [
             "GUI",
             "CLI"
+        ],
+        "layeredStandards": [
+            "XCP"
         ]
     },    
     {
@@ -1314,6 +1323,9 @@
         "fmuExport": [],
         "fmuImport": [
             "CS"
+        ],
+        "layeredStandards": [
+            "XCP"
         ]
     },
     {
@@ -1429,7 +1441,11 @@
         "fmuExport": [
             "CS"
         ],
-        "fmuImport": []
+        "fmuImport": [],
+        "layeredStandards": [
+            "BUS",
+            "XCP"
+        ]
     },
     {
         "name": "TargetLink",
@@ -1479,6 +1495,10 @@
         "fmuExport": [],
         "fmuImport": [
             "CS"
+        ],
+        "layeredStandards": [
+            "BUS",
+            "XCP"
         ]
     },
     {
@@ -2004,6 +2024,9 @@
             "CS",
             "ME",
             "SE"
+        ],
+        "layeredStandards": [
+            "XCP"
         ]
     },
     {
@@ -2735,7 +2758,7 @@
     },
     {
         "name": "mcp-fmi",
-        "license": "MIT",
+        "license": "osi",
         "url": "https://github.com/Novia-RDI-Seafaring/mcp-fmi",
         "logo": "mcp_fmi_logo.png",
         "vendor": "Novia University of Applied Sciences",
@@ -3205,6 +3228,9 @@
         "fmuExport": [],
         "fmuImport": [
             "CS"
+        ],
+        "layeredStandards": [
+            "XCP"
         ]
     },
     {
@@ -3227,6 +3253,9 @@
         "fmuExport": [],
         "fmuImport": [
             "CS"
+        ],
+        "layeredStandards": [
+            "XCP"
         ]
     },
     {
@@ -3524,6 +3553,10 @@
         "fmuImport": [
             "CS",
             "ME"
+        ],
+        "layeredStandards": [
+            "BUS",
+            "XCP"
         ]
     },
     {
@@ -5040,6 +5073,9 @@
         ],
         "fmuImport": [
             "CS"
+        ],
+        "layeredStandards": [
+            "BUS"
         ]
     },
     {
@@ -5630,7 +5666,7 @@
     },
     {
         "name": "MLFMU",
-        "license": "BSD-3",
+        "license": "osi",
         "url": "https://pypi.org/project/mlfmu/",
         "logo": "mlfmu_logo_v1.svg",
         "vendor": "DNV",
@@ -5905,7 +5941,10 @@
         "fmuExport": [
             "CS"
         ],
-        "fmuImport": []
+        "fmuImport": [],
+        "layeredStandards": [
+            "BUS"
+        ]
     },
     {
         "name": "iSuite 25",
@@ -5934,7 +5973,7 @@
     },
     {
         "name":  "fmu-forge",
-        "license": "BSD-3-Clause",
+        "license": "osi",
         "url": "https://github.com/projectchrono/fmu-forge",
         "logo": "fmu-forge.png",
         "vendor": "Project Chrono",
@@ -5950,7 +5989,7 @@
     },
     {
         "name": "chrono",
-        "license": "BSD-3-Clause",
+        "license": "osi",
         "url": "https://github.com/projectchrono/chrono",
         "logo": "Chrono.png",
         "vendor": "Project Chrono",