diff --git a/README.md b/README.md
index 139827c..0745d67 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![PyPI Downloads - Monthly](https://static.pepy.tech/badge/robotframework-dashboard/month)](https://pepy.tech/projects/robotframework-dashboard)
 [![License](https://img.shields.io/pypi/l/robotframework-dashboard?cacheSeconds=600)](LICENSE)
 
-Before reading anything else here is a [Fully Functioning Dashboard](https://timdegroot1996.github.io/robotframework-dashboard/example/robot_dashboard.html) you can checkout right away!
+Before reading anything else here is a [Fully Functioning Dashboard](https://marketsquare.github.io/robotframework-dashboard/example/robot_dashboard.html) you can checkout right away!
 
 ## 🎯 Overview
 
@@ -47,21 +47,21 @@ pip install robotframework-dashboard[all]
 …and many more advanced features to help you visualize, analyze, and manage your Robot Framework test results with ease!
 
 ## 📖 Read the Docs
-For detailed usage instructions, advanced examples, and full documentation, visit the [official robotdashboard docs](https://timdegroot1996.github.io/robotframework-dashboard/)!
+For detailed usage instructions, advanced examples, and full documentation, visit the [official robotdashboard docs](https://marketsquare.github.io/robotframework-dashboard/)!
 
 ### Quick Links
-- 🚀 [**Getting Started**](https://timdegroot1996.github.io/robotframework-dashboard/getting-started.html) - Quick setup instructions to install Robot Framework and RobotFramework Dashboard, and verify it is working.
-- 📦 [**Installation & Version Info**](https://timdegroot1996.github.io/robotframework-dashboard/installation-version-info.html) - Install the dashboard via pip, check Python and Robot Framework requirements, and view version information.
-- 💻 [**Basic Command Line Interface (CLI)**](https://timdegroot1996.github.io/robotframework-dashboard/basic-command-line-interface-cli.html) - Manage your test results database, add output XML files, remove runs, and generate dashboards directly from the command line.
-- ⚡ [**Advanced CLI & Examples**](https://timdegroot1996.github.io/robotframework-dashboard/advanced-cli-examples.html) - Advanced usage examples including combined commands, tagging strategies, aliases, batch imports, message configuration, and performance tips.
-- 🗂️ [**Tabs / Pages**](https://timdegroot1996.github.io/robotframework-dashboard/tabs-pages.html) - Explore the dashboard's interactive pages including Overview, Dashboard, Compare, and detailed suite/test/keyword views.
-- 📊 [**Graphs & Tables**](https://timdegroot1996.github.io/robotframework-dashboard/graphs-tables.html) - View and filter detailed statistics for runs, suites, tests, and keywords using charts, tables, and summary visualizations.
-- 🔍 [**Filtering**](https://timdegroot1996.github.io/robotframework-dashboard/filtering.html) - Apply filters to analyze trends in your test data and highlight specific tags, amounts or datetime ranges.
-- 🎨 [**Customization**](https://timdegroot1996.github.io/robotframework-dashboard/customization.html) - Customize dashboard sections, graph layouts, and visualizations to suit your workflow.
-- ⚙️ [**Settings**](https://timdegroot1996.github.io/robotframework-dashboard/settings.html) - Configure dashboard preferences including themes, default views, graph options, and save your settings for consistent team-wide use.
-- 🖥️ [**Dashboard Server**](https://timdegroot1996.github.io/robotframework-dashboard/dashboard-server.html) - Host the dashboard for multi-user access, programmatic updates, and remote server integration.
-- 🗄️ [**Custom Database Class**](https://timdegroot1996.github.io/robotframework-dashboard/custom-database-class.html) - Extend or replace the default database backend to suit your storage needs, including SQLite, MySQL, or custom implementations.
-- 🔔 [**Listener Integration**](https://timdegroot1996.github.io/robotframework-dashboard/listener-integration.html) - Use a listener to automatically push test results to the dashboard for every executed run, integrating seamlessly into CI/CD pipelines.
+- 🚀 [**Getting Started**](https://marketsquare.github.io/robotframework-dashboard/getting-started.html) - Quick setup instructions to install Robot Framework and RobotFramework Dashboard, and verify it is working.
+- 📦 [**Installation & Version Info**](https://marketsquare.github.io/robotframework-dashboard/installation-version-info.html) - Install the dashboard via pip, check Python and Robot Framework requirements, and view version information.
+- 💻 [**Basic Command Line Interface (CLI)**](https://marketsquare.github.io/robotframework-dashboard/basic-command-line-interface-cli.html) - Manage your test results database, add output XML files, remove runs, and generate dashboards directly from the command line.
+- ⚡ [**Advanced CLI & Examples**](https://marketsquare.github.io/robotframework-dashboard/advanced-cli-examples.html) - Advanced usage examples including combined commands, tagging strategies, aliases, batch imports, message configuration, and performance tips.
+- 🗂️ [**Tabs / Pages**](https://marketsquare.github.io/robotframework-dashboard/tabs-pages.html) - Explore the dashboard's interactive pages including Overview, Dashboard, Compare, and detailed suite/test/keyword views.
+- 📊 [**Graphs & Tables**](https://marketsquare.github.io/robotframework-dashboard/graphs-tables.html) - View and filter detailed statistics for runs, suites, tests, and keywords using charts, tables, and summary visualizations.
+- 🔍 [**Filtering**](https://marketsquare.github.io/robotframework-dashboard/filtering.html) - Apply filters to analyze trends in your test data and highlight specific tags, amounts or datetime ranges.
+- 🎨 [**Customization**](https://marketsquare.github.io/robotframework-dashboard/customization.html) - Customize dashboard sections, graph layouts, and visualizations to suit your workflow.
+- ⚙️ [**Settings**](https://marketsquare.github.io/robotframework-dashboard/settings.html) - Configure dashboard preferences including themes, default views, graph options, and save your settings for consistent team-wide use.
+- 🖥️ [**Dashboard Server**](https://marketsquare.github.io/robotframework-dashboard/dashboard-server.html) - Host the dashboard for multi-user access, programmatic updates, and remote server integration.
+- 🗄️ [**Custom Database Class**](https://marketsquare.github.io/robotframework-dashboard/custom-database-class.html) - Extend or replace the default database backend to suit your storage needs, including SQLite, MySQL, or custom implementations.
+- 🔔 [**Listener Integration**](https://marketsquare.github.io/robotframework-dashboard/listener-integration.html) - Use a listener to automatically push test results to the dashboard for every executed run, integrating seamlessly into CI/CD pipelines.
 
 
 ## 🛠️ Contributions
@@ -73,7 +73,7 @@ Special thanks to the following companies for sponsoring in one form or another!
 - [TDT](https://tdt.de/)
 
 And many thanks to the following people for contributing to the project with feedback, features or just general guidance!
-- [Mark Moberts](https://github.com/MobyNL) maintainer of the [robotframework-mitmlibrary](https://github.com/MobyNL/robotframework-mitmlibrary) and [Awesome Robot Framework](https://github.com/MarketSquare/awesome-robotframework)
+- [Mark Moberts](https://github.com/MobyNL) maintainer of the [robotframework-mitmlibrary](https://github.com/MobyNL/robotframework-mitmlibrary) and [Awesome Robot Framework](https://github.com/marketsquare/awesome-robotframework)
 - [Jurgen Alebregtse](https://github.com/alebr001) maintainer of [robotframework-realtimeresults](https://github.com/alebr001/robotframework-realtimeresults)
 - [Elias Haberl](https://github.com/HuntTheSun)
 - [Pekka Klarck](https://github.com/pekkaklarck) maintainer of [Robot Framework](https://github.com/robotframework/robotframework)
diff --git a/atest/resources/cli_output/help.txt b/atest/resources/cli_output/help.txt
index f93255b..1f387fb 100644
--- a/atest/resources/cli_output/help.txt
+++ b/atest/resources/cli_output/help.txt
@@ -162,4 +162,4 @@ options:
                           • '--server 0.0.0.0:8080' -> custom host/port
                           • '--server 0.0.0.0:8080:admin:secret' -> custom host/port and admin username/password
 
-For full documentation, visit: https://timdegroot1996.github.io/robotframework-dashboard/
\ No newline at end of file
+For full documentation, visit: https://marketsquare.github.io/robotframework-dashboard/
\ No newline at end of file
diff --git a/atest/resources/cli_output/version.txt b/atest/resources/cli_output/version.txt
index a0265a9..7ce24ee 100644
--- a/atest/resources/cli_output/version.txt
+++ b/atest/resources/cli_output/version.txt
@@ -6,4 +6,4 @@
 |_| \_\\___/|____/ \___/ |_| |____/_/   \_|____/|_| |_|____/ \___/_/   \_|_| \_|____/ 
 
 ======================================================================================
-Robotdashboard 1.6.1
\ No newline at end of file
+Robotdashboard 1.6.2
\ No newline at end of file
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index aeba1d6..56b2030 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -16,7 +16,7 @@ export default defineConfig({
     ["title", {}, "RobotFramework Dashboard | Visualize and Analyze Test Results"],
     ["meta", { name: "description", content: "Interactive dashboard to visualize, analyze, and customize Robot Framework test results with charts, and tables" }],
     ["meta", { name: "keywords", content: "dashboard, analysis, robot-framework, html-report, robotframework, robotframework-dashboard" }],
-    ["link", { rel: "canonical", href: "https://timdegroot1996.github.io/robotframework-dashboard/" }],
+    ["link", { rel: "canonical", href: "https://marketsquare.github.io/robotframework-dashboard/" }],
 
     // Open Graph
     ["meta", { property: "og:type", content: "website" }],
@@ -24,7 +24,7 @@ export default defineConfig({
     ["meta", { property: "og:title", content: "RobotFramework Dashboard | Visualize Robot Framework Results" }],
     ["meta", { property: "og:site_name", content: "RobotFramework Dashboard" }],
     ["meta", { property: "og:image", content: "/robotframework-dashboard/robotframework.svg" }],
-    ["meta", { property: "og:url", content: "https://timdegroot1996.github.io/robotframework-dashboard/" }],
+    ["meta", { property: "og:url", content: "https://marketsquare.github.io/robotframework-dashboard/" }],
 
     // Twitter Card
     ["meta", { name: "twitter:card", content: "summary_large_image" }],
@@ -38,7 +38,7 @@ export default defineConfig({
         "@context": "https://schema.org",
         "@type": "SoftwareApplication",
         "name": "RobotFramework Dashboard",
-        "url": "https://timdegroot1996.github.io/robotframework-dashboard/",
+        "url": "https://marketsquare.github.io/robotframework-dashboard/",
         "description": "Interactive dashboard to visualize and analyze Robot Framework test results.",
         "applicationCategory": "DeveloperTool",
         "operatingSystem": "Web"
@@ -91,7 +91,7 @@ export default defineConfig({
         { text: '🤝 Contributions', link: '/contributions.md' }
     ],
     socialLinks: [
-      { icon: 'github', link: 'https://github.com/timdegroot1996/robotframework-dashboard', ariaLabel: 'GitHub Repository' },
+      { icon: 'github', link: 'https://github.com/marketsquare/robotframework-dashboard', ariaLabel: 'GitHub Repository' },
       { icon: { svg: python_svg }, link: 'https://pypi.org/project/robotframework-dashboard/', ariaLabel: 'Python Package on PyPI' },
       { icon: { svg: slack_svg }, link: 'https://robotframework.slack.com/', ariaLabel: 'Robot Framework Slack' },
     ]
diff --git a/docs/contributions.md b/docs/contributions.md
index 1f3c5ea..82d8b87 100644
--- a/docs/contributions.md
+++ b/docs/contributions.md
@@ -13,7 +13,7 @@ Special thanks to the following companies for sponsoring in one form or another!
 
 ## People
 And many thanks to the following people for contributing to the project with feedback, features or just general guidance!
-- [Mark Moberts](https://github.com/MobyNL) maintainer of the [robotframework-mitmlibrary](https://github.com/MobyNL/robotframework-mitmlibrary) and [Awesome Robot Framework](https://github.com/MarketSquare/awesome-robotframework)
+- [Mark Moberts](https://github.com/MobyNL) maintainer of the [robotframework-mitmlibrary](https://github.com/MobyNL/robotframework-mitmlibrary) and [Awesome Robot Framework](https://github.com/marketsquare/awesome-robotframework)
 - [Jurgen Alebregtse](https://github.com/alebr001) maintainer of [robotframework-realtimeresults](https://github.com/alebr001/robotframework-realtimeresults)
 - [Elias Haberl](https://github.com/HuntTheSun)
 - [Pekka Klarck](https://github.com/pekkaklarck) maintainer of [Robot Framework](https://github.com/robotframework/robotframework)
diff --git a/docs/custom-database-class.md b/docs/custom-database-class.md
index a714a03..52c289d 100644
--- a/docs/custom-database-class.md
+++ b/docs/custom-database-class.md
@@ -15,9 +15,9 @@ The project includes several reference implementations. These demonstrate how to
 
 **Available examples:**
 
-- [abstractdb.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/database/abstractdb.py): base abstract class to extend
-- [sqlite3.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/database/sqlite3.py): default implementation used by RobotDashboard
-- [mysql.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/database/mysql.py): example MySQL implementation
+- [abstractdb.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/database/abstractdb.py): base abstract class to extend
+- [sqlite3.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/database/sqlite3.py): default implementation used by RobotDashboard
+- [mysql.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/database/mysql.py): example MySQL implementation
 
 These files define the required structure and show how each method should behave. If you create your own custom database implementation, you are encouraged to submit it via pull request or github issue so it can be added to the example folder to help others.
 
@@ -207,6 +207,6 @@ If you do not use server-side log storage, you can safely omit this method.
 - Your Python file name can be anything.
 
 - Look at the examples before implementing your own:
-  - [abstractdb.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/database/abstractdb.py): base abstract class to extend
-  - [sqlite3.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/database/sqlite3.py): default implementation used by RobotDashboard
-  - [mysql.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/database/mysql.py): example MySQL implementation
+  - [abstractdb.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/database/abstractdb.py): base abstract class to extend
+  - [sqlite3.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/database/sqlite3.py): default implementation used by RobotDashboard
+  - [mysql.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/database/mysql.py): example MySQL implementation
diff --git a/docs/dashboard-server.md b/docs/dashboard-server.md
index 05ae599..8d01dff 100644
--- a/docs/dashboard-server.md
+++ b/docs/dashboard-server.md
@@ -14,7 +14,7 @@ RobotFramework Dashboard includes a built-in server that lets you host the dashb
 - Enable remote clients to push or delete runs in your database  
 - Provide a web-based admin interface for manual management  
 - Secure access via optional basic authentication (username/password)  
-- The server automatically uses offline CDN (js/css) because `FastAPI-offline` is used, making it compatible with [`--offlinedependencies`](https://timdegroot1996.github.io/robotframework-dashboard/advanced-cli-examples) for full offline usage!
+- The server automatically uses offline CDN (js/css) because `FastAPI-offline` is used, making it compatible with [`--offlinedependencies`](https://marketsquare.github.io/robotframework-dashboard/advanced-cli-examples) for full offline usage!
 > **Tip:** To implement your server into your test runs look at the example [listener](/listener-integration.md) integration!
 
 
@@ -91,9 +91,9 @@ The dashboard itself (the HTML) does **not** require authentication. API calls a
 
 You can interact with the server programmatically using HTTP, Python, or Robot Framework. There are example scripts in the `example/server` folder:
 
-- [interact.http](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/server/interact.http) 
-- [interact.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/server/interact.py) 
-- [interact.robot](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/server/interact.robot) 
+- [interact.http](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/server/interact.http) 
+- [interact.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/server/interact.py) 
+- [interact.robot](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/server/interact.robot) 
 
 These scripts demonstrate how to:
 
diff --git a/docs/index.md b/docs/index.md
index 20a7f6d..bde061e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,7 +18,7 @@ hero:
       link: https://pypi.org/project/robotframework-dashboard/
     - theme: alt
       text: ⭐ Star on GitHub
-      link: https://github.com/timdegroot1996/robotframework-dashboard
+      link: https://github.com/marketsquare/robotframework-dashboard
     - theme: alt
       text: Contributions
       link: /contributions.md
diff --git a/docs/listener-integration.md b/docs/listener-integration.md
index 925b311..fcfcedd 100644
--- a/docs/listener-integration.md
+++ b/docs/listener-integration.md
@@ -20,7 +20,7 @@ Its responsibilities include:
 - The script is pabot compatible  
 - Enforcing an optional database run limit (e.g., keep only latest 100 runs)  
 
-The listener script can be found here: [robotdashboardlistener.py](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/listener/robotdashboardlistener.py)
+The listener script can be found here: [robotdashboardlistener.py](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/listener/robotdashboardlistener.py)
 
 > Important: the name of the file and the class should match. In the example it is both **robotdashboardlistener**, but changing it is fine if both are equal. 
 
@@ -109,7 +109,7 @@ The listener will wait for the final merged output and then send it to the Dashb
 
 ## Using the Listener with RobotCode (robot.toml)
 
-RobotDashboard also supports a listener in the `robot.toml` of **RobotCode**. The example can be found here: [robot.toml](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/example/listener/robot.toml)
+RobotDashboard also supports a listener in the `robot.toml` of **RobotCode**. The example can be found here: [robot.toml](https://github.com/marketsquare/robotframework-dashboard/blob/main/example/listener/robot.toml)
 Place both `robot.toml` and `robotdashboardlistener.py` in your project root (or adjust paths accordingly).
 
 ### Basic usage steps
diff --git a/docs/tabs-pages.md b/docs/tabs-pages.md
index 6319f02..85c44bd 100644
--- a/docs/tabs-pages.md
+++ b/docs/tabs-pages.md
@@ -13,7 +13,7 @@ There are also 2 special sections on the Overview page: The "Latest Runs" and "T
 The Overview Statistics section shows the latest run for each project, the sections below it show all runs for each project.  
 You can toggle if you want to show or hide runs for projects or custom project tags.  
 See [Advanced CLI & Examples](advanced-cli-examples.md#project-tagging) for more information on Tags!  
-For a more in depth explanation, hover over the "i" icons in the Overview Statistics and the sections below it in the [Example Dashboard](https://timdegroot1996.github.io/robotframework-dashboard/example/robot_dashboard.html)
+For a more in depth explanation, hover over the "i" icons in the Overview Statistics and the sections below it in the [Example Dashboard](https://marketsquare.github.io/robotframework-dashboard/example/robot_dashboard.html)
 
 ## Dashboard Page
 The Dashboard page offers rich, interactive visualizations for a detailed analysis of test results. Graphs are available at four levels—runs, suites, tests, and keywords—allowing teams to track performance, detect flaky tests, and monitor trends over time. The layout is fully customizable (see [Customization](customization.md)). You can drag and drop graphs and sections to create your preferred view. Most graphs support multiple display modes, including timeline, percentage, bar, donut, and advanced types like boxplots and heatmaps. Each graph also provides detailed popups to explain what the view represents and how the data is calculated (see [Graphs & Tables](graphs-tables.md)).
diff --git a/example/robot_dashboard.html b/example/robot_dashboard.html
index 52c88b6..0285a89 100644
--- a/example/robot_dashboard.html
+++ b/example/robot_dashboard.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html data-bs-theme="dark" class="dark-mode w-100 html-scroll">
 <head>
-<title>Robot Framework Dashboard - 2026-02-09 22:14:31</title>
+<title>Robot Framework Dashboard - 2026-02-11 22:57:34</title>
 <!-- JS/CSS Dependencies -->
 <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.0.0"></script>
@@ -721,15 +721,15 @@
 </li>
 <li class="nav-item">
 <a class="nav-link information" target="_blank" id="bug"
-href="https://github.com/timdegroot1996/robotframework-dashboard/issues"></a>
+href="https://github.com/marketsquare/robotframework-dashboard/issues"></a>
 </li>
 <li class="nav-item">
 <a class="nav-link information" target="_blank" id="github"
-href="https://github.com/timdegroot1996/robotframework-dashboard"></a>
+href="https://github.com/marketsquare/robotframework-dashboard"></a>
 </li>
 <li class="nav-item">
 <a class="nav-link information" target="_blank" id="docs"
-href="https://timdegroot1996.github.io/robotframework-dashboard/"></a>
+href="https://marketsquare.github.io/robotframework-dashboard/"></a>
 </li>
 </ul>
 </nav>
@@ -2677,7 +2677,7 @@ <h6 class="mb-0">Keyword Table</h6>
 const decompressedData = pako.inflate(compressedData, { to: 'string' });
 return JSON.parse(decompressedData);
 }
-var unified_dashboard_title = 'Robot Framework Dashboard - 2026-02-09 22:14:31'
+var unified_dashboard_title = 'Robot Framework Dashboard - 2026-02-11 22:57:34'
 var message_config = '"placeholder_message_config"'
 var force_json_config = false
 var json_config = "placeholder_json_config"
@@ -4668,7 +4668,7 @@ <h6 class="mb-0">Keyword Table</h6>
 "themeLight": "Theme",
 "themeDark": "Theme",
 "database": "Database Summary",
-"versionInformation": 'Robotdashboard 1.6.1',
+"versionInformation": 'Robotdashboard 1.6.2',
 "bug": "Report a bug or request a feature",
 "github": "Github",
 "docs": "Docs",
@@ -6119,15 +6119,18 @@ <h6>Total Runs: ${totalRunsAmount} | Passed Runs: ${passRate}%</h6>
 // for project bars
 const versionsForProject = Object.keys(versionsByProject[projectName]);
 const projectHasVersions = !(versionsForProject.length === 1 && versionsForProject[0] === "None");
-const versionClass = "fw-semibold";
 // for overview statistics
-projectName = settings.show.prefixes ? projectName : projectName.replace(/^project_/, '');
+// Preserve the original project name (used for logic like tag-detection),
+// but compute a display name that omits the 'project_' prefix when prefixes are hidden.
+const originalProjectName = projectName;
+const displayProjectName = settings.show.prefixes ? projectName : projectName.replace(/^project_/, '');
+projectName = displayProjectName;
 let cardTitle = `
-<h5 class="card-title mb-0 fw-semibold">${projectName}</h5>
+<h5 class="card-title mb-0 fw-semibold">${displayProjectName}</h5>
 `;
 if (!isForOverview) {
 // Project bar cards: customize based on project type
-if (projectName.startsWith('project_')) {
+if (originalProjectName.startsWith('project_')) {
 // Tagged projects: display name with inline version
 cardTitle = `
 <h5 class="card-title mb-0 fw-semibold">${stats[5]}, <span class="text-muted">Version:</span> ${normalizedProjectVersion}</h5>
@@ -6139,7 +6142,7 @@ <h5 class="card-title mb-0 fw-semibold">${stats[5]}, <span class="text-muted">Ve
 title="Click to filter for project and version"
 data-js-target="apply-version-filter">
 <h5 class="card-title mb-0 d-inline text-muted">Version:</h5>
-<h5 class="card-title mb-0 d-inline ${versionClass}">
+<h5 class="card-title mb-0 d-inline fw-semibold">
 ${normalizedProjectVersion}
 </h5>
 </div>
@@ -6147,7 +6150,7 @@ <h5 class="card-title mb-0 d-inline ${versionClass}">
 } else {
 // Non-tagged projects without versions: empty title placeholder
 cardTitle = `
-<h5 class="card-title mb-0 ${versionClass}"></h5>
+<h5 class="card-title mb-0 fw-semibold"></h5>
 `;
 }
 smallVersionHtml = '';
diff --git a/robotframework_dashboard/arguments.py b/robotframework_dashboard/arguments.py
index 7c5ba8a..be2a78b 100644
--- a/robotframework_dashboard/arguments.py
+++ b/robotframework_dashboard/arguments.py
@@ -66,7 +66,7 @@ def _parse_arguments(self):
         parser = argparse.ArgumentParser(
             add_help=False,
             formatter_class=argparse.RawTextHelpFormatter,
-            epilog="For full documentation, visit: https://timdegroot1996.github.io/robotframework-dashboard/",
+            epilog="For full documentation, visit: https://marketsquare.github.io/robotframework-dashboard/",
         )
         parser.add_argument(
             "-v",
diff --git a/robotframework_dashboard/js/graph_creation/overview.js b/robotframework_dashboard/js/graph_creation/overview.js
index 4b4ccc0..830cf55 100644
--- a/robotframework_dashboard/js/graph_creation/overview.js
+++ b/robotframework_dashboard/js/graph_creation/overview.js
@@ -658,15 +658,18 @@ function generate_overview_card_html(
     // for project bars
     const versionsForProject = Object.keys(versionsByProject[projectName]);
     const projectHasVersions = !(versionsForProject.length === 1 && versionsForProject[0] === "None");
-    const versionClass = "fw-semibold";
     // for overview statistics
-    projectName = settings.show.prefixes ? projectName : projectName.replace(/^project_/, '');
+    // Preserve the original project name (used for logic like tag-detection),
+    // but compute a display name that omits the 'project_' prefix when prefixes are hidden.
+    const originalProjectName = projectName;
+    const displayProjectName = settings.show.prefixes ? projectName : projectName.replace(/^project_/, '');
+    projectName = displayProjectName;
     let cardTitle = `
-            <h5 class="card-title mb-0 fw-semibold">${projectName}</h5>
+            <h5 class="card-title mb-0 fw-semibold">${displayProjectName}</h5>
         `;
     if (!isForOverview) {
         // Project bar cards: customize based on project type
-        if (projectName.startsWith('project_')) {
+        if (originalProjectName.startsWith('project_')) {
             // Tagged projects: display name with inline version
             cardTitle = `
                 <h5 class="card-title mb-0 fw-semibold">${stats[5]}, <span class="text-muted">Version:</span> ${normalizedProjectVersion}</h5>
@@ -678,7 +681,7 @@ function generate_overview_card_html(
                 title="Click to filter for project and version"
                 data-js-target="apply-version-filter">
                     <h5 class="card-title mb-0 d-inline text-muted">Version:</h5>
-                    <h5 class="card-title mb-0 d-inline ${versionClass}">
+                    <h5 class="card-title mb-0 d-inline fw-semibold">
                         ${normalizedProjectVersion}
                     </h5>
                 </div>
@@ -686,7 +689,7 @@ function generate_overview_card_html(
         } else {
             // Non-tagged projects without versions: empty title placeholder
             cardTitle = `
-                <h5 class="card-title mb-0 ${versionClass}"></h5>
+                <h5 class="card-title mb-0 fw-semibold"></h5>
             `;
         }
         smallVersionHtml = '';
diff --git a/robotframework_dashboard/templates/admin.html b/robotframework_dashboard/templates/admin.html
index 2050322..f8a9b07 100644
--- a/robotframework_dashboard/templates/admin.html
+++ b/robotframework_dashboard/templates/admin.html
@@ -36,15 +36,15 @@
             </li>
             <li class="nav-item">
                 <a class="nav-link information" target="_blank" id="bug"
-                    href="https://github.com/timdegroot1996/robotframework-dashboard/issues"></a>
+                    href="https://github.com/marketsquare/robotframework-dashboard/issues"></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link information" target="_blank" id="github"
-                    href="https://github.com/timdegroot1996/robotframework-dashboard"></a>
+                    href="https://github.com/marketsquare/robotframework-dashboard"></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link information" target="_blank" id="docs"
-                    href="https://timdegroot1996.github.io/robotframework-dashboard/"></a>
+                    href="https://marketsquare.github.io/robotframework-dashboard/"></a>
             </li>
         </ul>
     </nav>
diff --git a/robotframework_dashboard/templates/dashboard.html b/robotframework_dashboard/templates/dashboard.html
index 3073f92..ed91843 100644
--- a/robotframework_dashboard/templates/dashboard.html
+++ b/robotframework_dashboard/templates/dashboard.html
@@ -60,15 +60,15 @@
             </li>
             <li class="nav-item">
                 <a class="nav-link information" target="_blank" id="bug"
-                    href="https://github.com/timdegroot1996/robotframework-dashboard/issues"></a>
+                    href="https://github.com/marketsquare/robotframework-dashboard/issues"></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link information" target="_blank" id="github"
-                    href="https://github.com/timdegroot1996/robotframework-dashboard"></a>
+                    href="https://github.com/marketsquare/robotframework-dashboard"></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link information" target="_blank" id="docs"
-                    href="https://timdegroot1996.github.io/robotframework-dashboard/"></a>
+                    href="https://marketsquare.github.io/robotframework-dashboard/"></a>
             </li>
         </ul>
     </nav>
diff --git a/robotframework_dashboard/version.py b/robotframework_dashboard/version.py
index 9557387..dfa3d08 100644
--- a/robotframework_dashboard/version.py
+++ b/robotframework_dashboard/version.py
@@ -1 +1 @@
-__version__ = "Robotdashboard 1.6.1"
+__version__ = "Robotdashboard 1.6.2"
diff --git a/setup.py b/setup.py
index c6332ab..797cc72 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,11 @@
 
 setup(
     name="robotframework-dashboard",
-    version="1.6.1",
+    version="1.6.2",
     description="Output processor and dashboard generator for Robot Framework output files",
     long_description="""# 📊 Robot Framework Dashboard
 
-Before reading anything else here is a [Fully Functioning Dashboard](https://timdegroot1996.github.io/robotframework-dashboard/example/robot_dashboard.html) you can checkout right away!
+Before reading anything else here is a [Fully Functioning Dashboard](https://marketsquare.github.io/robotframework-dashboard/example/robot_dashboard.html) you can checkout right away!
 
 ## 🎯 Overview
 
@@ -57,25 +57,25 @@
 …and many more advanced features to help you visualize, analyze, and manage your Robot Framework test results with ease!
 
 ## 📖 Read the Docs
-For detailed usage instructions, advanced examples, and full documentation, visit the [official robotdashboard docs](https://timdegroot1996.github.io/robotframework-dashboard/)!
+For detailed usage instructions, advanced examples, and full documentation, visit the [official robotdashboard docs](https://marketsquare.github.io/robotframework-dashboard/)!
 
 ### Quick Links
-- 🚀 [**Getting Started**](https://timdegroot1996.github.io/robotframework-dashboard/getting-started.html) - Quick setup instructions to install Robot Framework and RobotFramework Dashboard, and verify it is working.
-- 📦 [**Installation & Version Info**](https://timdegroot1996.github.io/robotframework-dashboard/installation-version-info.html) - Install the dashboard via pip, check Python and Robot Framework requirements, and view version information.
-- 💻 [**Basic Command Line Interface (CLI)**](https://timdegroot1996.github.io/robotframework-dashboard/basic-command-line-interface-cli.html) - Manage your test results database, add output XML files, remove runs, and generate dashboards directly from the command line.
-- ⚡ [**Advanced CLI & Examples**](https://timdegroot1996.github.io/robotframework-dashboard/advanced-cli-examples.html) - Advanced usage examples including combined commands, tagging strategies, aliases, batch imports, message configuration, and performance tips.
-- 🗂️ [**Tabs / Pages**](https://timdegroot1996.github.io/robotframework-dashboard/tabs-pages.html) - Explore the dashboard's interactive pages including Overview, Dashboard, Compare, and detailed suite/test/keyword views.
-- 📊 [**Graphs & Tables**](https://timdegroot1996.github.io/robotframework-dashboard/graphs-tables.html) - View and filter detailed statistics for runs, suites, tests, and keywords using charts, tables, and summary visualizations.
-- 🔍 [**Filtering**](https://timdegroot1996.github.io/robotframework-dashboard/filtering.html) - Apply filters to analyze trends in your test data and highlight specific tags, amounts or datetime ranges.
-- 🎨 [**Customization**](https://timdegroot1996.github.io/robotframework-dashboard/customization.html) - Customize dashboard sections, graph layouts, and visualizations to suit your workflow.
-- ⚙️ [**Settings**](https://timdegroot1996.github.io/robotframework-dashboard/settings.html) - Configure dashboard preferences including themes, default views, graph options, and save your settings for consistent team-wide use.
-- 🖥️ [**Dashboard Server**](https://timdegroot1996.github.io/robotframework-dashboard/dashboard-server.html) - Host the dashboard for multi-user access, programmatic updates, and remote server integration.
-- 🗄️ [**Custom Database Class**](https://timdegroot1996.github.io/robotframework-dashboard/custom-database-class.html) - Extend or replace the default database backend to suit your storage needs, including SQLite, MySQL, or custom implementations.
-- 🔔 [**Listener Integration**](https://timdegroot1996.github.io/robotframework-dashboard/listener-integration.html) - Use a listener to automatically push test results to the dashboard for every executed run, integrating seamlessly into CI/CD pipelines.
+- 🚀 [**Getting Started**](https://marketsquare.github.io/robotframework-dashboard/getting-started.html) - Quick setup instructions to install Robot Framework and RobotFramework Dashboard, and verify it is working.
+- 📦 [**Installation & Version Info**](https://marketsquare.github.io/robotframework-dashboard/installation-version-info.html) - Install the dashboard via pip, check Python and Robot Framework requirements, and view version information.
+- 💻 [**Basic Command Line Interface (CLI)**](https://marketsquare.github.io/robotframework-dashboard/basic-command-line-interface-cli.html) - Manage your test results database, add output XML files, remove runs, and generate dashboards directly from the command line.
+- ⚡ [**Advanced CLI & Examples**](https://marketsquare.github.io/robotframework-dashboard/advanced-cli-examples.html) - Advanced usage examples including combined commands, tagging strategies, aliases, batch imports, message configuration, and performance tips.
+- 🗂️ [**Tabs / Pages**](https://marketsquare.github.io/robotframework-dashboard/tabs-pages.html) - Explore the dashboard's interactive pages including Overview, Dashboard, Compare, and detailed suite/test/keyword views.
+- 📊 [**Graphs & Tables**](https://marketsquare.github.io/robotframework-dashboard/graphs-tables.html) - View and filter detailed statistics for runs, suites, tests, and keywords using charts, tables, and summary visualizations.
+- 🔍 [**Filtering**](https://marketsquare.github.io/robotframework-dashboard/filtering.html) - Apply filters to analyze trends in your test data and highlight specific tags, amounts or datetime ranges.
+- 🎨 [**Customization**](https://marketsquare.github.io/robotframework-dashboard/customization.html) - Customize dashboard sections, graph layouts, and visualizations to suit your workflow.
+- ⚙️ [**Settings**](https://marketsquare.github.io/robotframework-dashboard/settings.html) - Configure dashboard preferences including themes, default views, graph options, and save your settings for consistent team-wide use.
+- 🖥️ [**Dashboard Server**](https://marketsquare.github.io/robotframework-dashboard/dashboard-server.html) - Host the dashboard for multi-user access, programmatic updates, and remote server integration.
+- 🗄️ [**Custom Database Class**](https://marketsquare.github.io/robotframework-dashboard/custom-database-class.html) - Extend or replace the default database backend to suit your storage needs, including SQLite, MySQL, or custom implementations.
+- 🔔 [**Listener Integration**](https://marketsquare.github.io/robotframework-dashboard/listener-integration.html) - Use a listener to automatically push test results to the dashboard for every executed run, integrating seamlessly into CI/CD pipelines.
 
 ## 🛠️ Contributions
 
-Contributions are welcome! If you encounter any issues, have suggestions for improvements, or would like to add new features, feel free to open an issue or submit a pull request. Additional information can be found here in [Contributing](https://github.com/timdegroot1996/robotframework-dashboard/blob/main/CONTRIBUTING.md)
+Contributions are welcome! If you encounter any issues, have suggestions for improvements, or would like to add new features, feel free to open an issue or submit a pull request. Additional information can be found here in [Contributing](https://github.com/marketsquare/robotframework-dashboard/blob/main/CONTRIBUTING.md)
 
 ## 📋 License
 This project is licensed under the MIT License.
@@ -91,7 +91,7 @@
     keywords="robotframework dashboard reporting database",
     author="Tim de Groot",
     author_email="tim-degroot@live.nl",
-    url="https://github.com/timdegroot1996/robotframework-dashboard",
+    url="https://github.com/marketsquare/robotframework-dashboard",
     license="MIT",
     packages=find_packages(),
     include_package_data=True,