@networkpro/web 1.22.2 → 1.23.0

package/.node-version

@@ -1 +1 @@
-22.21.0
+22.21.1

package/.nvmrc

@@ -1 +1 @@
-22.21.0
+22.21.1

package/CHANGELOG.md

@@ -22,6 +22,58 @@ This project attempts to follow [Keep a Changelog](https://keepachangelog.com/en
 
 ---
 
+## [1.23.0] - 2025-10-30
+
+### Documentation
+
+- Updated `src/lib/README.md` to reflect newly added app constants.
+
+### Changed
+
+- Refactored all route files to use named imports from `$lib/components` and `$lib/pages` barrel modules, replacing individual `.svelte` imports for improved consistency and maintainability.
+- Changed `COMPANY_INFO.APP_NAME` constant to `Network Pro™` in `src/lib/index.js`.
+  - Removed unnecessary `™` symbol from files that utilize the app constant.
+- Changed `/license` and `/foss-spotlight` routes to `/legal` and `/foss`, respectively, for more intuitive navigation.
+  - Updated all references to the new routes, `/legal` and `/foss`.
+  - Updated `vercel.json` to redirect `/license` to `/legal`, and `/foss-spotlight` to `/foss`.
+- Refactored Playwright helper utilities to modern standards:
+  - Replaced deprecated `page.waitForNavigation()` with `waitForURL()` and `waitForLoadState()` in `clickAndWaitForNavigation()` for improved SPA and full-page navigation reliability.
+  - Simplified logic and removed unsupported `lastResponse()` usage.
+  - Improved test stability for mobile navigation (especially in CI environments).
+- Modified `tests/unit/server/meta.test.js` to match on `Locking Down Networks`, rather than `Network Pro`, which is now dynamically attached.
+- Refreshed **Last Modified** timestamps in `static/sitemap.xml`.
+- Updated `.node-version` and `.nvmrc` to utilize **Node.js** `22.21.1` (LTS).
+- Updated generator metadata in `src/app.html` to reflect **SvelteKit 2.48.4**.
+- Bumped project version to `v1.23.0`.
+- Updated dependencies:
+  - `@sveltejs/kit` `2.48.3` → `2.48.4`
+  - `svelte` `5.43.0` → `5.43.2`
+  - `eslint-plugin-svelte` `^3.12.5` → `^3.13.0`
+
+- Refactored metadata and SEO handling for consistency and maintainability:
+  - Centralized all `<meta>` and `<title>` management in `src/lib/components/MetaTags.svelte`.
+  - Removed redundant per-page `<svelte:head>` entries and `MetaTags` imports in individual `+page.svelte` files.
+  - Added dynamic canonical URL generation using route `pathname` from `+layout.js`.
+  - Implemented automatic title and description suffixing:
+    - Titles now end with `— Network Pro™`.
+    - Descriptions now end with `| Security, Networking, Privacy — Network Pro Strategies`.
+  - Cleaned up fallback values (`defaultTitle`, `defaultDescription`, `defaultMeta`) to prevent redundant branding text.
+  - Adjusted layout structure to ensure correct canonical and OpenGraph metadata per route.
+
+- Updated `src/app.html`:
+  - Removed duplicate document sections and placeholder meta tags.
+  - Verified correct `%sveltekit.head%` placement for dynamic head injection.
+  - Moved static PWA-related metadata (e.g., `<meta name="theme-color">`) into `app.html`.
+  - Retained dynamic icons and preload links for cache-busted assets via `+layout.svelte`.
+
+### Security
+
+- Added transitive dependency overrides to address reported vulnerabilities:
+  - `tar@7.5.1` → `tar@7.5.2` (fixes CVE-2025-64118: race condition/uninitialized memory exposure).
+- Confirmed overrides applied correctly via `npm ls` and `npm explain`.
+
+---
+
 ## [1.22.2] - 2025-10-29
 
 ### Documentation
@@ -1310,7 +1362,8 @@ This project attempts to follow [Keep a Changelog](https://keepachangelog.com/en
 
 <!-- Link references -->
 
-[Unreleased]: https://github.com/netwk-pro/netwk-pro.github.io/compare/v1.22.2...HEAD
+[Unreleased]: https://github.com/netwk-pro/netwk-pro.github.io/compare/v1.23.0...HEAD
+[1.23.0]: https://github.com/netwk-pro/netwk-pro.github.io/releases/tag/v1.23.0
 [1.22.2]: https://github.com/netwk-pro/netwk-pro.github.io/releases/tag/v1.22.2
 [1.22.1]: https://github.com/netwk-pro/netwk-pro.github.io/releases/tag/v1.22.1
 [1.22.0]: https://github.com/netwk-pro/netwk-pro.github.io/releases/tag/v1.22.0

package/LICENSE.md

@@ -45,7 +45,7 @@ This document is provided for convenience only. In the event of any discrepancy,
 
 ---
 
-**Formats Available:** [HTML](https://netwk.pro/license) | Markdown
+**Formats Available:** [HTML](https://netwk.pro/legal) | Markdown
 
 <a name="ownership"></a>
 

package/README.md

@@ -465,11 +465,11 @@ Refer to the Wiki for:
 
 This project is licensed under:
 
-- [Creative Commons BY 4.0](https://netwk.pro/license#cc-by)
+- [Creative Commons BY 4.0](https://netwk.pro/legal#cc-by)
 
-- Or optionally, [GNU GPL v3 or later](https://netwk.pro/license#gnu-gpl)
+- Or optionally, [GNU GPL v3 or later](https://netwk.pro/legal#gnu-gpl)
 
-Source code, branding, and visual assets are subject to reuse and distribution terms specified on our [Legal, Copyright, and Licensing page](https://netwk.pro/license).
+Source code, branding, and visual assets are subject to reuse and distribution terms specified on our [Legal, Copyright, and Licensing page](https://netwk.pro/legal).
 
 </section>
 
@@ -499,9 +499,9 @@ _Designed for professionals. Hardened for privacy. Built with intent._
 Copyright &copy; 2025  
 **[Network Pro Strategies](https://netwk.pro) (Network Pro&trade;)**
 
-Network Pro&trade;, the shield logo, and the "Locking Down Networks...&trade;" slogan are [trademarks](https://netwk.pro/license#trademark) of Network Pro Strategies.
+Network Pro&trade;, the shield logo, and the "Locking Down Networks...&trade;" slogan are [trademarks](https://netwk.pro/legal#trademark) of Network Pro Strategies.
 
-Licensed under **[CC BY 4.0](https://netwk.pro/license#cc-by)** and the **[GNU GPL](https://netwk.pro/license#gnu-gpl)**, as published by the [Free Software Foundation](https://www.fsf.org), either version 3 of the License, or (at your option) any later version.
+Licensed under **[CC BY 4.0](https://netwk.pro/legal#cc-by)** and the **[GNU GPL](https://netwk.pro/legal#gnu-gpl)**, as published by the [Free Software Foundation](https://www.fsf.org), either version 3 of the License, or (at your option) any later version.
 
 </span>
 

package/budget.json

@@ -21,7 +21,7 @@
     ]
   },
   {
-    "path": "/foss-spotlight",
+    "path": "/foss",
     "resourceSizes": [
       { "resourceType": "image", "budget": 500 },
       { "resourceType": "total", "budget": 1200 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@networkpro/web",
   "private": false,
-  "version": "1.22.2",
+  "version": "1.23.0",
   "description": "Locking Down Networks, Unlocking Confidence™ | Security, Networking, Privacy — Network Pro Strategies",
   "keywords": [
     "advisory",
@@ -81,7 +81,7 @@
     "dompurify": "^3.3.0",
     "posthog-js": "^1.282.0",
     "semver": "^7.7.3",
-    "svelte": "5.43.0"
+    "svelte": "5.43.2"
   },
   "devDependencies": {
     "@eslint/compat": "^1.4.1",
@@ -89,7 +89,7 @@
     "@lhci/cli": "^0.15.1",
     "@playwright/test": "^1.56.1",
     "@sveltejs/adapter-vercel": "^6.1.1",
-    "@sveltejs/kit": "2.48.3",
+    "@sveltejs/kit": "2.48.4",
     "@sveltejs/vite-plugin-svelte": "^6.2.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/svelte": "^5.2.8",
@@ -99,7 +99,7 @@
     "eslint": "^9.38.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-jsdoc": "^61.1.11",
-    "eslint-plugin-svelte": "^3.12.5",
+    "eslint-plugin-svelte": "^3.13.0",
     "globals": "^16.4.0",
     "jsdom": "26.1.0",
     "lightningcss": "^1.30.2",
@@ -124,7 +124,8 @@
     "vitest": "3.2.4"
   },
   "overrides": {
-    "tmp": ">=0.2.4",
-    "cookie": "^1.0.0"
+    "cookie": "^1.0.0",
+    "tar": "7.5.2",
+    "tmp": ">=0.2.4"
   }
 }

package/src/app.html

@@ -10,12 +10,12 @@
     This file is part of Network Pro.
     ====================================================================== -->
 
-    <title>%sveltekit.title%</title>
-    <meta name="description" content="%sveltekit.description%" />
+    <!-- ✅ DO NOT include any <title> or <meta name="description"> tags here
+         Titles and metadata are managed by SvelteKit via MetaTags.svelte -->
+
     <meta
       name="robots"
       content="index, follow, max-image-preview:large, max-snippet:-1, max-video-preview:-1" />
-    <meta name="author" content="Scott Lopez" />
 
     <!-- Favicon: Keep only ICO for max compatibility -->
     <link
@@ -53,7 +53,7 @@
       content="bx4ham0zkpvzztzu213bhpt76m9siq" />
     <!-- cspell:enable -->
 
-    <meta name="generator" content="SvelteKit 2.48.3" />
+    <meta name="generator" content="SvelteKit 2.48.4" />
 
     <script src="/disableSw.js"></script>
 

package/src/lib/README.md

@@ -84,17 +84,20 @@ console.log(CONSTANTS.COMPANY_INFO.APP_NAME); // "Network Pro"
 | Key        | Description                  | Example                  |
 | ---------- | ---------------------------- | ------------------------ |
 | `NAME`     | Full company name            | `Network Pro Strategies` |
-| `APP_NAME` | Application or branding name | `Network Pro`            |
+| `APP_NAME` | Application or branding name | `Network Pro™`          |
 | `YEAR`     | Copyright / app year         | `2025`                   |
 
 ### 📬 CONTACT
 
-| Key       | Description             | Example                     |
-| --------- | ----------------------- | --------------------------- |
-| `EMAIL`   | General support email   | `support (at) neteng.pro`   |
-| `SECURE`  | Secure contact address  | `contact (at) s.neteng.pro` |
-| `PRIVACY` | Privacy-related contact | `privacy (at) netwk.pro`    |
-| `PHONE`   | Company phone number    | `(623) 252-4350`            |
+| Key            | Description                    | Example                     |
+| -------------- | ------------------------------ | --------------------------- |
+| `EMAIL`        | General support email          | `support (at) netwk.pro`    |
+| `EMAIL_LINK`   | General support email (link)   | `support@netwk.pro`         |
+| `SECURE`       | Secure contact address         | `contact (at) s.neteng.pro` |
+| `SECURE_LINK`  | Secure contact address (link)  | `contact@s.neteng.pro`      |
+| `PRIVACY`      | Privacy-related contact        | `privacy (at) netwk.pro`    |
+| `PRIVACY_LINK` | Privacy-related contact (link) | `privacy@netwk.pro`         |
+| `PHONE`        | Company phone number           | `(623) 252-4350`            |
 
 ### 🗂️ PAGE
 
@@ -153,8 +156,8 @@ No need to modify imports when adding new images — just add them to `images.js
 Copyright © 2025  
 **[Network Pro Strategies](https://netwk.pro) (Network Pro™)**
 
-Network Pro™, the shield logo, and the "Locking Down Networks...™" slogan are [trademarks](https://netwk.pro/license#trademark) of Network Pro Strategies.
+Network Pro™, the shield logo, and the "Locking Down Networks...™" slogan are [trademarks](https://netwk.pro/legal#trademark) of Network Pro Strategies.
 
-Licensed under **[CC BY 4.0](https://netwk.pro/license#cc-by)** and the **[GNU GPL](https://netwk.pro/license#gnu-gpl)**, as published by the [Free Software Foundation](https://www.fsf.org), either version 3 of the License, or (at your option) any later version.
+Licensed under **[CC BY 4.0](https://netwk.pro/legal#cc-by)** and the **[GNU GPL](https://netwk.pro/legal#gnu-gpl)**, as published by the [Free Software Foundation](https://www.fsf.org), either version 3 of the License, or (at your option) any later version.
 
 </span>

package/src/lib/components/Badges.svelte

@@ -19,8 +19,8 @@ This file is part of Network Pro.
 
   const { PAGE } = CONSTANTS;
 
-  const ccbyLink = `${base}/license#cc-by`;
-  const gplLink = `${base}/license#gnu-gpl`;
+  const ccbyLink = `${base}/legal#cc-by`;
+  const gplLink = `${base}/legal#gnu-gpl`;
 
   /**
    * Badge link object.

package/src/lib/components/LegalNav.svelte

@@ -19,7 +19,7 @@ This file is part of Network Pro.
 
   const termsLink = `${base}/terms-of-use`;
   const privacyLink = `${base}/privacy`;
-  const licenseLink = `${base}/license`;
+  const licenseLink = `${base}/legal`;
   const pdashLink = `${base}/privacy-dashboard`;
 
   /**

package/src/lib/components/MetaTags.svelte

@@ -9,6 +9,9 @@ This file is part of Network Pro.
 <script>
   export let title;
   export let description;
+  export let url = 'https://netwk.pro';
+  export let image = `${url}/img/banner-og-1200x630.png`;
+  export let pathname = '';
 
   import { CONSTANTS } from '$lib';
 
@@ -16,33 +19,56 @@ This file is part of Network Pro.
 
   const { COMPANY_INFO, LINKS } = CONSTANTS;
 
+  // Default fallbacks (for missing or undefined props)
+  const defaultTitle = 'Security, Networking, Privacy';
+  const defaultDescription = 'Locking Down Networks, Unlocking Confidence™';
+
+  // computed title/description with fallback
+  $: metaTitle = title
+    ? `${title}${title.includes(COMPANY_INFO.APP_NAME) ? '' : ` — ${COMPANY_INFO.APP_NAME}`}`
+    : defaultTitle;
+
+  $: metaDescription = description
+    ? `${description}${description.includes(COMPANY_INFO.NAME) ? '' : ` | Security, Networking, Privacy — ${COMPANY_INFO.NAME}`}`
+    : defaultDescription;
+
+  // Compute canonical URL
+  $: canonicalUrl = pathname
+    ? `${url.replace(/\/$/, '')}${pathname.startsWith('/') ? pathname : `/${pathname}`}`
+    : url;
+
   // Static shared values
-  const ogUrl = LINKS.HOME;
-  const ogImg = '/img/banner-og-1200x630.png';
-  const companyName = COMPANY_INFO.NAME;
   const twitterAct = '@NetEng_Pro';
 </script>
 
 <svelte:head>
-  <title>{title}</title>
-  <meta name="description" content={description} />
+  <title>{metaTitle}</title>
+  <meta name="description" content={metaDescription} />
 
   <!-- OpenGraph -->
-  <meta property="og:title" content={title} />
+  <meta property="og:title" content={metaTitle} />
+  <meta property="og:description" content={metaDescription} />
+  <meta property="og:url" content={url} />
   <meta property="og:type" content="website" />
-  <meta property="og:url" content={ogUrl} />
-  <meta property="og:image" content={ogImg} />
-  <meta property="og:image:alt" content={companyName} />
-  <meta property="og:description" content={description} />
+  <meta property="og:site_name" content={COMPANY_INFO.APP_NAME} />
+  <meta property="og:image" content={image} />
+  <meta property="og:image:alt" content={COMPANY_INFO.NAME} />
+  <meta property="og:locale" content="en_US" />
 
   <!-- Twitter -->
   <meta name="twitter:card" content="summary_large_image" />
+  <meta name="twitter:title" content={metaTitle} />
+  <meta name="twitter:description" content={metaDescription} />
   <meta name="twitter:site" content={twitterAct} />
   <meta name="twitter:creator" content={twitterAct} />
-  <meta property="twitter:domain" content={ogUrl} />
-  <meta property="twitter:url" content={ogUrl} />
-  <meta name="twitter:title" content={title} />
-  <meta name="twitter:description" content={description} />
-  <meta name="twitter:image" content={ogImg} />
-  <meta name="twitter:image:alt" content={companyName} />
+  <meta property="twitter:domain" content={url} />
+  <meta property="twitter:url" content={url} />
+  <meta name="twitter:image" content={image} />
+  <meta name="twitter:image:alt" content={COMPANY_INFO.NAME} />
+
+  <!-- Canonical URL -->
+  <link rel="canonical" href={canonicalUrl} />
+
+  <!-- Basic SEO -->
+  <meta name="author" content="Scott Lopez" />
 </svelte:head>

package/src/lib/components/layout/Footer.svelte

@@ -6,8 +6,6 @@ SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
 This file is part of Network Pro.
 ========================================================================== -->
 
-<!-- cspell:ignore ccby gnugpl -->
-
 <script>
   import { base } from '$app/paths';
   // Import icons for licenses
@@ -22,9 +20,9 @@ This file is part of Network Pro.
   const { COMPANY_INFO, CONTACT, PAGE, NAV } = CONSTANTS;
 
   // Dynamic links for licensing and trademark
-  const ccbyLink = `${base}/license#cc-by`;
-  const gnugplLink = `${base}/license#gnu-gpl`;
-  const trademarkLink = `${base}/license#trademark`;
+  const ccbyLink = `${base}/legal#cc-by`;
+  const gnugplLink = `${base}/legal#gnu-gpl`;
+  const trademarkLink = `${base}/legal#trademark`;
 
   /** @type {string} */
   const creatorUrl = 'https://netwk.pro';
@@ -101,12 +99,12 @@ This file is part of Network Pro.
       target={PAGE.BLANK}>
       <strong>{COMPANY_INFO.NAME}</strong>
     </a>
-    ({COMPANY_INFO.APP_NAME}&trade;)
+    ({COMPANY_INFO.APP_NAME})
   </p>
 
   <!-- Trademark Section -->
   <p>
-    {COMPANY_INFO.APP_NAME}&trade;, the shield logo, and the "{creatorSlogan}&trade;"
+    {COMPANY_INFO.APP_NAME}, the shield logo, and the "{creatorSlogan}&trade;"
     slogan are
     <a href={trademarkLink} target={PAGE.SELF}>trademarks</a>
     of {COMPANY_INFO.NAME}.
@@ -146,3 +144,5 @@ This file is part of Network Pro.
   </p>
 </div>
 <!-- END FOOTER -->
+
+<!-- cspell:ignore ccby gnugpl -->

package/src/lib/components/layout/HeaderDefault.svelte

@@ -21,7 +21,7 @@ This file is part of Network Pro.
   const aboutLink = `${base}/about`;
   const servLink = `${base}/services`;
   const lhubLink = `${base}/links`;
-  const fossLink = `${base}/foss-spotlight`;
+  const fossLink = `${base}/foss`;
   const discussLink =
     'https://github.com/netwk-pro/netwk-pro.github.io/discussions';
 

package/src/lib/components/layout/HeaderHome.svelte

@@ -18,7 +18,7 @@ This file is part of Network Pro.
   const { PAGE, LINKS } = CONSTANTS;
 
   const aboutLink = `${base}/about`;
-  const fossLink = `${base}/foss-spotlight`;
+  const fossLink = `${base}/foss`;
   const servLink = `${base}/services`;
   const lhubLink = `${base}/links`;
   const discussLink =

package/src/lib/index.js

@@ -16,7 +16,7 @@ This file is part of Network Pro.
  * and re-exported here for flat `$lib` imports.
  * @module src/lib
  * @author Scott Lopez
- * @updated 2025-10-20
+ * @updated 2025-10-30
  */
 
 // Re-export all images so they can be imported directly from `$lib`
@@ -52,7 +52,7 @@ export { PGP_KEYS } from '$lib/data/pgpKeys.js';
 export const CONSTANTS = {
   COMPANY_INFO: {
     NAME: 'Network Pro Strategies',
-    APP_NAME: 'Network Pro',
+    APP_NAME: 'Network Pro™',
     YEAR: '2025',
   },
   CONTACT: {

package/src/lib/meta.js

@@ -18,62 +18,62 @@ This file is part of Network Pro.
 const meta = {
   '/': {
     title:
-      'Security, Networking, Privacy — Network Pro Strategies',
+      'Security, Networking, Privacy',
     description:
-      'Locking Down Networks, Unlocking Confidence™ | Security, Networking, Privacy — Network Pro Strategies',
+      'Locking Down Networks, Unlocking Confidence™',
   },
   '/about': {
-    title: 'About Us — Network Pro™',
-    description: 'About Us | Security, Networking, Privacy — Network Pro Strategies',
+    title: 'About Us',
+    description: 'About Us',
   },
   '/privacy': {
-    title: 'Privacy Policy — Network Pro™',
+    title: 'Privacy Policy',
     description:
-      'Privacy Policy | Security, Networking, Privacy — Network Pro Strategies',
+      'Privacy Policy',
   },
   '/terms-of-use': {
-    title: 'Website Terms of Use — Network Pro™',
+    title: 'Website Terms of Use',
     description:
-      'Website Terms of Use | Security, Networking, Privacy — Network Pro Strategies',
+      'Website Terms of Use',
   },
-  '/license': {
-    title: 'Legal, Copyright, and Licensing — Network Pro™',
+  '/legal': {
+    title: 'Legal, Copyright, and Licensing',
     description:
-      'Legal, Copyright, and Licensing | Security, Networking, Privacy — Network Pro Strategies',
+      'Legal, Copyright, and Licensing',
   },
   '/terms-conditions': {
-    title: 'Consulting Terms and Conditions — Network Pro™',
+    title: 'Consulting Terms and Conditions',
     description:
-      'Terms and Conditions | Security, Networking, Privacy — Network Pro Strategies',
+      'Terms and Conditions',
   },
-  '/foss-spotlight': {
-    title: 'FOSS Spotlight — Network Pro™',
+  '/foss': {
+    title: 'FOSS Spotlight',
     description:
-      'FOSS Spotlight | Security, Networking, Privacy — Network Pro Strategies',
+      'FOSS Spotlight',
   },
   '/privacy-dashboard': {
-    title: 'Privacy Dashboard — Network Pro™',
+    title: 'Privacy Dashboard',
     description:
-      'Privacy Dashboard | Security, Networking, Privacy — Network Pro Strategies',
+      'Privacy Dashboard',
   },
   '/pgp': {
-    title: 'Public PGP Keys — Network Pro™',
+    title: 'Public PGP Keys',
     description:
-      'Public encryption keys for secure communication | Security, Networking, Privacy — Network Pro Strategies',
+      'Public encryption keys for secure communication',
   },
   '/services': {
-    title: "On-Site Services - Network Pro™",
+    title: "On-Site Services",
     description:
-      'On-Site Services | Security, Networking, Privacy — Network Pro Strategies'
+      'On-Site Services'
   },
   // Excludes redirect-only routes like /contact, /consultation, /privacy-rights
 };
 
 /** @type {MetaData} */
 const defaultMeta = {
-  title: 'Loading... | Network Pro™',
+  title: 'Loading...',
   description:
-    'Please wait while the content loads... | Security, Networking, Privacy — Network Pro™',
+    'Please wait while the content loads...',
 };
 
 // Export values

package/src/lib/pages/AboutContent.svelte

@@ -116,9 +116,9 @@ This file is part of Network Pro.
 </section>
 
 <section id="page-title">
-  <h1>About {COMPANY_INFO.APP_NAME}&trade;</h1>
+  <h1>About {COMPANY_INFO.APP_NAME}</h1>
   <p>
-    <strong>{COMPANY_INFO.NAME} ({COMPANY_INFO.APP_NAME}&trade;)</strong>
+    <strong>{COMPANY_INFO.NAME} ({COMPANY_INFO.APP_NAME})</strong>
     <br />
     <em>Security, Networking, Privacy</em>
   </p>
@@ -143,8 +143,8 @@ This file is part of Network Pro.
 </p>
 
 <p>
-  At <strong>{COMPANY_INFO.NAME} ({COMPANY_INFO.APP_NAME}&trade;)</strong>, we
-  deliver network security and engineering, cybersecurity, and digital privacy
+  At <strong>{COMPANY_INFO.NAME} ({COMPANY_INFO.APP_NAME})</strong>, we deliver
+  network security and engineering, cybersecurity, and digital privacy
   consulting with clarity, credibility, and care. We believe that real security
   doesn't have to come at the cost of user autonomy, and that privacy-minded
   solutions can be both practical and powerful.
@@ -186,7 +186,7 @@ This file is part of Network Pro.
 <div class="spacer"></div>
 
 <p>
-  Additionally, {COMPANY_INFO.APP_NAME}&trade; provides
+  Additionally, {COMPANY_INFO.APP_NAME} provides
   <a href={servLink} target={PAGE.SELF}>on-site services</a>
   in the Greater Phoenix Metropolitan Area (Maricopa County, AZ). Our
   <a href={servLink} target={PAGE.SELF}>on-site services</a> are available to both
@@ -212,10 +212,10 @@ This file is part of Network Pro.
 </p>
 
 <p>
-  At {COMPANY_INFO.APP_NAME}&trade;, we deliver robust, intentional solutions
-  for individuals and organizations that prioritize integrity — without
-  compromising agility or trust. We don't just protect infrastructure. We
-  protect peace of mind.
+  At {COMPANY_INFO.APP_NAME}, we deliver robust, intentional solutions for
+  individuals and organizations that prioritize integrity — without compromising
+  agility or trust. We don't just protect infrastructure. We protect peace of
+  mind.
 </p>
 
 <p>

package/src/lib/pages/HomeContent.svelte

@@ -21,7 +21,7 @@ This file is part of Network Pro.
    * URL to the FOSS Spotlight page, using the base path
    * @type {string}
    */
-  const spotlightLink = `${base}/foss-spotlight`;
+  const spotlightLink = `${base}/foss`;
 
   /**
    * CSS class for the index headings.

package/src/lib/pages/LicenseContent.svelte

@@ -126,7 +126,7 @@ This file is part of Network Pro.
       <p>
         All content—including text, software, logos, graphics, documentation,
         and other materials—provided by
-        <strong>{COMPANY_INFO.NAME}</strong> ("{COMPANY_INFO.APP_NAME}&trade;",
+        <strong>{COMPANY_INFO.NAME}</strong> ("{COMPANY_INFO.APP_NAME}",
         "Company", "Licensor") is protected by U.S. and international copyright
         laws.
       </p>
@@ -135,12 +135,12 @@ This file is part of Network Pro.
         <strong>
           <a href={homeLink} target={PAGE.BLANK}> {COMPANY_INFO.NAME} </a>
         </strong>
-        ({COMPANY_INFO.APP_NAME}&trade;)
+        ({COMPANY_INFO.APP_NAME})
       </p>
     {:else if link.id === 'trademark'}
       <p>The following trademarks are the exclusive property of the Company:</p>
       <ul>
-        <li><strong>Brand Name:</strong> {COMPANY_INFO.APP_NAME}&trade;</li>
+        <li><strong>Brand Name:</strong> {COMPANY_INFO.APP_NAME}</li>
         <li><strong>Domain Names:</strong> netwk.pro, neteng.pro, neteng.cc</li>
         <li
           ><strong>Logo:</strong> The shield logo displayed on our homepage</li>
@@ -233,8 +233,7 @@ This file is part of Network Pro.
       </p>
 
       <p>
-        {COMPANY_INFO.APP_NAME}&trade; (the "Licensed Material") is licensed
-        under
+        {COMPANY_INFO.APP_NAME} (the "Licensed Material") is licensed under
         <strong>Creative Commons Attribution 4.0 International</strong> (CC BY
         4.0)
         <a
@@ -314,8 +313,8 @@ This file is part of Network Pro.
       </p>
 
       <p>
-        {COMPANY_INFO.APP_NAME}&trade; is free software: you can redistribute it
-        and/or modify it under the terms of the
+        {COMPANY_INFO.APP_NAME} is free software: you can redistribute it and/or
+        modify it under the terms of the
         <strong>GNU General Public License</strong> (GNU GPL) as published by
         the
         <a rel={PAGE.REL} href="https://fsf.org" target={PAGE.BLANK}

package/src/lib/pages/ServicesContent.svelte

@@ -85,8 +85,7 @@ This file is part of Network Pro.
   well. Simply <a href={consultLink} target={PAGE.BLANK}
     >schedule a free, initial consultation</a>
   or <a href={contactLink} target={PAGE.BLANK}>contact us directly</a> — we'd be
-  happy to discuss how {COMPANY_INFO.APP_NAME}&trade; can support your business
-  on-site.
+  happy to discuss how {COMPANY_INFO.APP_NAME} can support your business on-site.
 </p>
 
 <p>

package/src/lib/pages/TermsUseContent.svelte

@@ -35,7 +35,7 @@ This file is part of Network Pro.
    * URL to License page, using the base path
    * @type {string}
    */
-  const licenseLink = `${base}/license`;
+  const licenseLink = `${base}/legal`;
 
   /**
    * Markdown version of the Terms of Use document