diff --git a/templates/about.html b/templates/about.html
index 8eb644f..8508465 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -19,11 +19,11 @@
             <p>Whether you're downloading the latest IG versions, checking compliance, converting resources to FHIR Shorthand (FSH), or pushing guides to a test server, this toolkit aims to be an essential companion.</p>
              {% if app_mode == 'lite' %}
                 <div class="alert alert-info" role="alert">
-                    <i class="bi bi-info-circle-fill me-2"></i>You are currently running the <strong>Lite Version</strong> of the toolkit. This version excludes the built-in HAPI FHIR server and relies on external FHIR servers for functionalities like the API Explorer and Operations UI. Validation uses local StructureDefinition checks.
+                    <i class="bi bi-info-circle-fill me-2"></i>You are currently running the <strong>Lite Version</strong> of the toolkit. This version excludes the built-in FHIR server depending and relies on external FHIR servers for functionalities like the API Explorer and Operations UI. Validation uses local StructureDefinition checks.
                 </div>
              {% else %}
                  <div class="alert alert-success" role="alert">
-                     <i class="bi bi-check-circle-fill me-2"></i>You are currently running the <strong>Standalone Version</strong> of the toolkit, which includes a built-in HAPI FHIR server (accessible via the `/fhir` proxy) for local validation and exploration.
+                     <i class="bi bi-check-circle-fill me-2"></i>You are currently running the <strong>Standalone Version</strong> of the toolkit, which includes a built-in FHIR server based on your build choice (accessible via the `/fhir` proxy) for local validation and exploration, if you configured the Server ENV variable this could also be whatever customer server you have pointed the local ENV variable at allowing you to use any fhir server of your choice.
                  </div>
              {% endif %}
 
@@ -36,7 +36,7 @@
                 <li><strong>FHIR Server Interaction:</strong>
                     <ul>
                         <li>Push processed IGs (including dependencies) to a target FHIR server with real-time console feedback.</li>
-                        <li>Explore FHIR server capabilities and interact with resources using the "FHIR API Explorer" (GET/POST/PUT/DELETE) and "FHIR UI Operations" pages, supporting both the local HAPI server (in Standalone mode) and external servers.</li>
+                        <li>Explore FHIR server capabilities and interact with resources using the "FHIR API Explorer" (GET/POST/PUT/DELETE) and "FHIR UI Operations" pages, supporting both the local server (in Standalone mode) and external servers.</li>
                     </ul>
                 </li>
                 <li><strong>FHIR Shorthand (FSH) Conversion:</strong> Convert FHIR JSON or XML resources to FSH using the integrated GoFSH tool. Offers advanced options like context package selection, various output styles, FHIR version selection, dependency loading, alias file usage, and round-trip validation ("Fishing Trip") with SUSHI. Includes a loading indicator during conversion.</li>
@@ -48,7 +48,7 @@
             <ul>
                 <li><strong>Backend:</strong> Python with the Flask web framework and SQLAlchemy for database interaction (SQLite).</li>
                 <li><strong>Frontend:</strong> HTML, Bootstrap 5 for styling, and JavaScript for interactivity and dynamic content loading. Uses Lottie-Web for animations.</li>
-                <li><strong>FHIR Tooling:</strong> Integrates GoFSH and SUSHI (via Node.js) for FSH conversion and validation. Utilizes the HAPI FHIR server (in Standalone mode) for robust FHIR validation and operations.</li>
+                <li><strong>FHIR Tooling:</strong> Integrates GoFSH and SUSHI (via Node.js) for FSH conversion and validation. Utilizes the Local FHIR server (in Standalone mode) for robust FHIR validation and operations.</li>
                 <li><strong>Deployment:</strong> Runs within a Docker container managed by Docker Compose and Supervisor, ensuring a consistent environment.</li>
             </ul>
 
diff --git a/templates/base.html b/templates/base.html
index 333c9f8..37ef4f0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -796,14 +796,14 @@
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint == 'fsh_converter' else '' }}" href="{{ url_for('fsh_converter') }}"><i class="fas fa-file-code me-1"></i> FSH Converter</a>
                     </li>
-                    <li class="nav-item">
+                    <!-- <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint == 'ig_configurator' else '' }}" href="{{ url_for('ig_configurator') }}"><i class="fas fa-wrench me-1"></i> IG Valid-Conf Gen</a>
-                    </li>
-                    {% if app_mode != 'lite' %}
+                    </li> -->
+                    <!-- {% if app_mode != 'lite' %}
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint == 'config_hapi' else '' }}" href="{{ url_for('config_hapi') }}"><i class="fas fa-cog me-1"></i> Configure HAPI</a>
                     </li>
-                    {% endif %}
+                    {% endif %} -->
                     </ul>
                 <div class="navbar-controls d-flex align-items-center">
                     <div class="form-check form-switch">
diff --git a/templates/fhir_ui.html b/templates/fhir_ui.html
index bd33b58..bb3a1a3 100644
--- a/templates/fhir_ui.html
+++ b/templates/fhir_ui.html
@@ -6,7 +6,7 @@
     <h1 class="display-5 fw-bold text-body-emphasis">FHIR API Explorer</h1>
     <div class="col-lg-6 mx-auto">
         <p class="lead mb-4">
-            Interact with FHIR servers using GET, POST, PUT, or DELETE requests. Toggle between local HAPI or a custom server to explore resources or perform searches.
+            Interact with FHIR servers using GET, POST, PUT, or DELETE requests. Toggle between local Fhir Server or a custom server to explore resources or perform searches.
         </p>
     </div>
 </div>
@@ -21,11 +21,11 @@
                     <label class="form-label">FHIR Server</label>
                     <div class="input-group">
                         <button type="button" class="btn btn-outline-primary" id="toggleServer">
-                            <span id="toggleLabel">Use Local HAPI</span>
+                            <span id="toggleLabel">Use Local </span>
                         </button>
                         <input type="text" class="form-control" id="fhirServerUrl" name="fhir_server_url" placeholder="e.g., https://hapi.fhir.org/baseR4" style="display: none;" aria-describedby="fhirServerHelp">
                     </div>
-                    <small id="fhirServerHelp" class="form-text text-muted">Toggle to use local HAPI (http://localhost:8080/fhir) or enter a custom FHIR server URL.</small>
+                    <small id="fhirServerHelp" class="form-text text-muted">Toggle to use local (http://localhost:8080/fhir) or enter a custom FHIR server URL.</small>
                 </div>
                 <div class="mb-3" id="authSection" style="display: none;">
                     <label class="form-label">Authentication</label>
diff --git a/templates/fhir_ui_operations.html b/templates/fhir_ui_operations.html
index c8d1425..170afec 100644
--- a/templates/fhir_ui_operations.html
+++ b/templates/fhir_ui_operations.html
@@ -112,7 +112,7 @@
     <h1 class="display-5 fw-bold text-body-emphasis">FHIR UI Operations</h1>
     <div class="col-lg-6 mx-auto">
         <p class="lead mb-4">
-            Explore FHIR server operations by selecting resource types or system operations. Toggle between local HAPI or a custom server to interact with FHIR metadata, resources, and server-wide operations.
+            Explore FHIR server operations by selecting resource types or system operations. Toggle between local Server or a custom server to interact with FHIR metadata, resources, and server-wide operations.
         </p>
         <!-----------------------------------------------------------------remove the buttons-----------------------------------------------------
         <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
@@ -134,11 +134,11 @@
                     <label class="form-label fw-bold">FHIR Server</label>
                     <div class="input-group">
                         <button type="button" class="btn btn-outline-primary" id="toggleServer">
-                            <span id="toggleLabel">Use Local HAPI</span>
+                            <span id="toggleLabel">Use Local </span>
                         </button>
                         <input type="text" class="form-control" id="fhirServerUrl" name="fhir_server_url" placeholder="Enter FHIR Base URL e.g., https://hapi.fhir.org/baseR4" style="display: none;" aria-describedby="fhirServerHelp">
                     </div>
-                    <small id="fhirServerHelp" class="form-text text-muted">Toggle to use local HAPI (/fhir proxy) or enter a custom FHIR server URL.</small>
+                    <small id="fhirServerHelp" class="form-text text-muted">Toggle to use local Fhir Server (/fhir proxy) or enter a custom FHIR server URL.</small>
                 </div>
                 <div class="mb-3" id="authSection" style="display: none;">
                     <label class="form-label fw-bold">Authentication</label>
diff --git a/templates/ig_configurator.html b/templates/ig_configurator.html
index 8f788ba..51655c0 100644
--- a/templates/ig_configurator.html
+++ b/templates/ig_configurator.html
@@ -3,7 +3,7 @@
 {% block content %}
 <div class="container mt-4">
     <h2>IG Configuration Generator</h2>
-    <p>Select the Implementation Guides you want to load into HAPI for validation. This will generate the YAML configuration required for the <code>application.yaml</code> file.</p>
+    <p>Select the Implementation Guides you want to load into Local FHIR for validation. This will generate the YAML configuration required for the <code>application.yaml</code> file.</p>
     
     <div class="card mb-4">
         <div class="card-header">Select IGs</div>
diff --git a/templates/retrieve_split_data.html b/templates/retrieve_split_data.html
index 3fe7ff4..efd99ad 100644
--- a/templates/retrieve_split_data.html
+++ b/templates/retrieve_split_data.html
@@ -33,11 +33,11 @@
                     <label class="form-label fw-bold">FHIR Server</label>
                     <div class="input-group">
                         <button type="button" class="btn btn-outline-primary" id="toggleServer">
-                            <span id="toggleLabel">Use Local HAPI</span>
+                            <span id="toggleLabel">Use Local </span>
                         </button>
                         {{ form.fhir_server_url(class="form-control", id="fhirServerUrl", style="display: none;", placeholder="e.g., https://fhir.hl7.org.au/aucore/fhir/DEFAULT", **{'aria-describedby': 'fhirServerHelp'}) }}
                     </div>
-                    <small id="fhirServerHelp" class="form-text text-muted">Toggle to use local HAPI (/fhir proxy) or enter a custom FHIR server URL.</small>
+                    <small id="fhirServerHelp" class="form-text text-muted">Toggle to use local Fhir Server(/fhir proxy) or enter a custom FHIR server URL.</small>
                 </div>
 
                 {# Authentication Section (Shown for Custom URL) #}