ORNL-AMO · rmroot · Mar 23, 2026 · Feb 11, 2026 · Feb 11, 2026 · Feb 26, 2026
diff --git a/LICENSE b/LICENSE
@@ -19,5 +19,5 @@ ALLIANCE FOR ENERGY INNOVATION, LLC, UT-BATTELLE, LLC AND THE GOVERNMENT MAKE NO
 ****************************************************************************************************************
 NOTICE TO USERS
 
-Note that users should be aware that finding non-energy benefits can vary and are not guaranteed. The use of the JUSTIFI tool does not constitute or imply any endorsement, recommendation, or favoring of any entity, product, or service. Please refer to the terms and disclaimer located in this LICENSE file and in the application's documentation for more information.
+Note that users should be aware that finding multiple benefits can vary and are not guaranteed. The use of the JUSTIFI tool does not constitute or imply any endorsement, recommendation, or favoring of any entity, product, or service. Please refer to the terms and disclaimer located in this LICENSE file and in the application's documentation for more information.
 ****************************************************************************************************************
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![Last Commit](https://img.shields.io/github/last-commit/ORNL-AMO/JUSTIFI)](https://github.com/ORNL-AMO/JUSTIFI/commits/main)
 
 
-JUSTIFI is a tool that is a member of **Oak Ridge National Laboratory's Industrial Resources** suite of applications. The application was developed in collaboration with the **National Laboratory of the Rockies (NLR, formerly known as NREL)** around the study of **Non-Energy Benefits (NEBs)**. JUSTIFI allows users to identify the Key Performance Metrics (KPM) for a manufacturing facility and quantify the impacts of NEBs from implementation of energy efficiency opportunities.
+JUSTIFI is a tool that is a member of **Oak Ridge National Laboratory's Industrial Resources** suite of applications. The application was developed in collaboration with the **National Laboratory of the Rockies (NLR, formerly known as NREL)** around the study of **Multiple Benefits (MBs)**. JUSTIFI allows users to identify the Key Performance Metrics (KPM) for a manufacturing facility and quantify the impacts of MBs from implementation of energy efficiency opportunities.
 
 JUSTIFI, like it's sibling applications [MEASUR](https://github.com/ORNL-AMO/MEASUR) and [VERIFI](https://github.com/ORNL-AMO/VERIFI), is developed as a web application but is also packaged and distributed as an installable desktop application.
 
@@ -24,8 +24,8 @@ Alternatively, downloads and additional information about ORNL's suite of tools
 Track our progress and planned work on the [JUSTIFI GitHub Project Board](https://github.com/orgs/ORNL-AMO/projects/9/views/17).
 
 
-# Non-Energy Benefits Research
-NLR led the research effort around the study and quantification of NEBs. For more information visit the [Non-energy Benefits Knowledge Library](https://www.nrel.gov/manufacturing/non-energy-benefits).
+# Multiple Benefits Research
+NLR led the research effort around the study and quantification of MBs. For more information visit the [Multiple Benefits Knowledge Library](https://www.nlr.gov/manufacturing/multiple-benefits-of-manufacturing-energy-productivity).
 
 
 # Details For Developers

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "justifi",
-  "version": "0.2.6-beta",
+  "version": "1.0.0",
   "main": "main.js",
   "author": "National Laboratory of the Rockies & Oak Ridge National Laboratory",
-  "description": "A tool to identify, estimate potential and report on non-energy benefits (NEBs) that can be found while conducting energy assessments",
+  "description": "A tool to identify, estimate potential and report on multiple benefits (MBs) that can be found while conducting energy assessments",
   "repository": "https://github.com/ORNL-AMO/JUSTIFI.git",
   "engines": {
     "node": "24.5.0",
@@ -24,7 +24,7 @@
   "private": true,
   "build": {
     "appId": "gov.ornl.justifi",
-    "copyright": "Copyright 2025 ORNL. All rights reserved.",
+    "copyright": "Copyright 2026 ORNL. All rights reserved.",
     "productName": "JUSTIFI",
     "directories": {
       "output": "./output/"
@@ -65,29 +65,29 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "20.3.15",
+    "@angular/animations": "21.2.1",
     "@angular/cdk": "20.2.14",
-    "@angular/common": "20.3.15",
-    "@angular/compiler": "20.3.15",
-    "@angular/core": "20.3.15",
-    "@angular/forms": "20.3.15",
-    "@angular/platform-browser": "20.3.15",
-    "@angular/platform-browser-dynamic": "20.3.15",
-    "@angular/router": "20.3.15",
-    "@angular/service-worker": "20.3.15",
-    "@fortawesome/angular-fontawesome": "3.0.0",
-    "@fortawesome/fontawesome-svg-core": "6.6.0",
-    "@fortawesome/free-solid-svg-icons": "6.6.0",
+    "@angular/common": "21.2.1",
+    "@angular/compiler": "21.2.1",
+    "@angular/core": "21.2.1",
+    "@angular/forms": "21.2.1",
+    "@angular/platform-browser": "21.2.1",
+    "@angular/platform-browser-dynamic": "21.2.1",
+    "@angular/router": "21.2.1",
+    "@angular/service-worker": "21.2.1",
+    "@fortawesome/angular-fontawesome": "4.0.0",
+    "@fortawesome/fontawesome-svg-core": "7.2.0",
+    "@fortawesome/free-solid-svg-icons": "7.2.0",
     "angular-plotly.js": "6.0.0",
     "bootstrap": "5.3.8",
     "electron-log": "5.4.0",
     "electron-updater": "6.6.2",
     "exceljs": "4.4.0",
     "jszip": "3.10.1",
     "libphonenumber-js": "1.11.3",
-    "ngx-indexed-db": "19.3.2",
-    "ngx-webstorage": "20.0.0",
-    "plotly.js": "3.0.0",
+    "ngx-indexed-db": "22.0.0",
+    "ngx-webstorage": "21.0.1",
+    "plotly.js": "3.4.0",
     "rxjs": "~7.8.0",
     "semver": "7.6.2",
     "tslib": "2.7.0",
@@ -96,13 +96,13 @@
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular/build": "20.3.12",
-    "@angular/cli": "20.3.12",
-    "@angular/compiler-cli": "20.3.15",
+    "@angular/build": "^21.2.1",
+    "@angular/cli": "21.2.1",
+    "@angular/compiler-cli": "21.2.1",
     "@popperjs/core": "^2.11.8",
     "@types/jasmine": "5.1.4",
-    "electron": "36.2.0",
-    "electron-builder": "26.0.12",
+    "electron": "40.8.0",
+    "electron-builder": "26.8.1",
     "jasmine-core": "5.3.0",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
@@ -113,4 +113,4 @@
     "pptxgenjs": "3.12.0",
     "typescript": "~5.9.3"
   }
-}
+}
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,24 +1,25 @@
 <div class="d-flex flex-column" [ngClass]="{'neb-container': !print}">
-    <app-navbar class="hide-print"></app-navbar>
-    <ng-template [ngIf]="dataInitialized" [ngIfElse]="initializingDataBlock">
-        <div class="d-flex w-100">
-            <div class="d-flex">
-                <app-sidebar></app-sidebar>
-            </div>
-            <div class="w-100 main-content" (click)="collapseSidebar()">
-                <router-outlet></router-outlet>
-                <app-toast-notifications *ngIf="!print"></app-toast-notifications>
-            </div>
-        </div>
-    </ng-template>
-    <ng-template #initializingDataBlock>
-        Initializing data...
-    </ng-template>
-    <ng-container *ngIf="!print">
-        <app-loading></app-loading>
-        <app-setup-wizard-modal></app-setup-wizard-modal>
-        <app-auto-update-toast></app-auto-update-toast>
-        <app-welcome-slideshow></app-welcome-slideshow>
-        <app-update-check></app-update-check>
-    </ng-container>
+  <app-navbar class="hide-print"></app-navbar>
+  @if (dataInitialized) {
+    <div class="d-flex w-100">
+      <div class="d-flex">
+        <app-sidebar></app-sidebar>
+      </div>
+      <div class="w-100 main-content" (click)="collapseSidebar()">
+        <router-outlet></router-outlet>
+        @if (!print) {
+          <app-toast-notifications></app-toast-notifications>
+        }
+      </div>
+    </div>
+  } @else {
+    Initializing data...
+  }
+  @if (!print) {
+    <app-loading></app-loading>
+    <app-setup-wizard-modal></app-setup-wizard-modal>
+    <app-auto-update-toast></app-auto-update-toast>
+    <app-welcome-slideshow></app-welcome-slideshow>
+    <app-update-check></app-update-check>
+  }
 </div>
diff --git a/src/app/core-components/about/about.component.html b/src/app/core-components/about/about.component.html
@@ -117,7 +117,7 @@ <h4>
             </p>
             <p class="alert alert-info">
                 NOTICE TO USERS<br>
-                Note that users should be aware that finding non-energy benefits can vary and are not guaranteed.
+                Note that users should be aware that finding multiple benefits can vary and are not guaranteed.
                 The use of the JUSTIFI tool does not constitute or imply any endorsement, recommendation,
                 or favoring of any entity, product, or service.
                 Please refer to the terms and disclaimer located in the project <a

diff --git a/src/app/core-components/backup-modal/export-backup-modal/export-backup-modal.component.html b/src/app/core-components/backup-modal/export-backup-modal/export-backup-modal.component.html
@@ -1,63 +1,66 @@
 <div [ngClass]="{'window-overlay': showExportModal}"></div>
 <div class="popup" [ngClass]="{'open': showExportModal }">
-    <div class="popup-header">Export Data
-        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeExportDataModal()"></button>
+  <div class="popup-header">Export Data
+    <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeExportDataModal()"></button>
+  </div>
+  <div class="popup-body">
+    <!-- Export file name -->
+    <div class="input-group">
+      <label for="exportFileName" class="col-form-label col-sm-4">File Name</label>
+      <input type="text" class="form-control col-sm-8" id="exportFileName" [(ngModel)]="exportFileName"
+        placeholder="Enter file name" />
     </div>
-    <div class="popup-body">
-        <!-- Export file name -->
-        <div class="input-group">
-            <label for="exportFileName" class="col-form-label col-sm-4">File Name</label>
-            <input type="text" class="form-control col-sm-8" id="exportFileName" [(ngModel)]="exportFileName"
-                    placeholder="Enter file name" />
+    <div class="fw-light small my-2">The file will be saved as {{exportFileName? exportFileName : 'JUSTIFI_backup'}}.json</div>
+    <!-- Export Options -->
+    <div class="mb-3">
+      <label class="form-label fw-bold">Export Option</label>
+      <div class="form-check">
+        <input class="form-check-input" type="radio" id="exportAll" name="exportOption"
+          [(ngModel)]="exportOption" value="all" (change)="onExportOptionChange()">
+        <label class="form-check-label" for="exportAll">Export all data</label>
+      </div>
+      @if (visitGuid) {
+        <div class="form-check">
+          <input class="form-check-input" type="radio" id="exportCurrentVisit" name="exportOption"
+            [(ngModel)]="exportOption" value="visit" (change)="onExportOptionChange()">
+          <label class="form-check-label" for="exportCurrentVisit">Export current visit</label>
         </div>
-        <div class="fw-light small my-2">The file will be saved as {{exportFileName? exportFileName : 'JUSTIFI_backup'}}.json</div>
-        <!-- Export Options -->
-        <div class="mb-3">
-            <label class="form-label fw-bold">Export Option</label>
-            <div class="form-check">
-                <input class="form-check-input" type="radio" id="exportAll" name="exportOption"
-                    [(ngModel)]="exportOption" value="all" (change)="onExportOptionChange()">
-                <label class="form-check-label" for="exportAll">Export all data</label>
-            </div>
-            <div *ngIf="visitGuid" class="form-check">
-                <input class="form-check-input" type="radio" id="exportCurrentVisit" name="exportOption"
-                    [(ngModel)]="exportOption" value="visit" (change)="onExportOptionChange()">
-                <label class="form-check-label" for="exportCurrentVisit">Export current visit</label>
-            </div>
-            <div class="form-check">
-                <input class="form-check-input" type="radio" id="exportCustom" name="exportOption"
-                    [(ngModel)]="exportOption" value="custom" (change)="onExportOptionChange()">
-                <label class="form-check-label" for="exportCustom">Custom selection</label>
-            </div>
-        </div>
-        <!-- Custom Export Tree -->
-        <ng-template [ngIf]="exportTree && exportTree.length > 0" [ngIfElse]="noDataBlock">
-            <div *ngIf="exportOption === 'custom'">
-                <div class="d-flex gap-2 flex-wrap ms-2">
-                    <button class="btn btn-outline-primary btn-sm border-0" (click)="selectAll()">
-                        <fa-icon [icon]="faCheckSquare"></fa-icon> Select All</button>
-                    <button class="btn btn-outline-secondary btn-sm border-0" (click)="unselectAll()">
-                        <fa-icon [icon]="faSquare"></fa-icon> Unselect All</button>
-                    <button class="btn btn-outline-primary btn-sm border-0" (click)="expandAll()">
-                        <fa-icon [icon]="faAnglesDown"></fa-icon> Expand All</button>
-                    <button class="btn btn-outline-secondary btn-sm border-0" (click)="collapseAll()">
-                        <fa-icon [icon]="faAnglesUp"></fa-icon> Collapse All</button>
+      }
+      <div class="form-check">
+        <input class="form-check-input" type="radio" id="exportCustom" name="exportOption"
+          [(ngModel)]="exportOption" value="custom" (change)="onExportOptionChange()">
+        <label class="form-check-label" for="exportCustom">Custom selection</label>
+      </div>
+    </div>
+    <!-- Custom Export Tree -->
+    @if (exportTree && exportTree.length > 0) {
+      @if (exportOption === 'custom') {
+        <div>
+          <div class="d-flex gap-2 flex-wrap ms-2">
+            <button class="btn btn-outline-primary btn-sm border-0" (click)="selectAll()">
+              <fa-icon [icon]="faCheckSquare"></fa-icon> Select All</button>
+              <button class="btn btn-outline-secondary btn-sm border-0" (click)="unselectAll()">
+                <fa-icon [icon]="faSquare"></fa-icon> Unselect All</button>
+                <button class="btn btn-outline-primary btn-sm border-0" (click)="expandAll()">
+                  <fa-icon [icon]="faAnglesDown"></fa-icon> Expand All</button>
+                  <button class="btn btn-outline-secondary btn-sm border-0" (click)="collapseAll()">
+                    <fa-icon [icon]="faAnglesUp"></fa-icon> Collapse All</button>
+                  </div>
+                  <hr class="mt-1 mb-2">
+                  <app-export-backup-tree [nodes]="exportTree"></app-export-backup-tree>
                 </div>
-                <hr class="mt-1 mb-2">
-                <app-export-backup-tree [nodes]="exportTree"></app-export-backup-tree>
-            </div>
-        </ng-template>
-        <ng-template #noDataBlock>
-            <div class="alert alert-warning">
+              }
+            } @else {
+              <div class="alert alert-warning">
                 No data available to export.
-            </div>
-        </ng-template>
-    </div>
-    <hr class="mt-0 mb-2">
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-sm btn-secondary me-2" (click)="closeExportDataModal()">Cancel</button>
-        <button class="btn btn-sm btn-success" (click)="backupData()"
-            [disabled]="isNoneSelected(exportTree)"><fa-icon [icon]="faDownload"></fa-icon>
+              </div>
+            }
+          </div>
+          <hr class="mt-0 mb-2">
+          <div class="popup-footer d-flex justify-content-end">
+            <button class="btn btn-sm btn-secondary me-2" (click)="closeExportDataModal()">Cancel</button>
+            <button class="btn btn-sm btn-success" (click)="backupData()"
+              [disabled]="isNoneSelected(exportTree)"><fa-icon [icon]="faDownload"></fa-icon>
             Export Data</button>
-    </div>
-</div>
+          </div>
+        </div>
diff --git a/...nts/backup-modal/export-backup-modal/export-backup-tree/export-backup-tree.component.html b/...nts/backup-modal/export-backup-modal/export-backup-tree/export-backup-tree.component.html
@@ -1,27 +1,45 @@
-<ul class="tree-list" *ngIf="nodes">
-    <li *ngFor="let node of nodes">
+@if (nodes) {
+  <ul class="tree-list">
+    @for (node of nodes; track node) {
+      <li>
         <div class="form-check">
-                <span *ngIf="node.children && node.children.length > 0" (click)="toggleNode(node)" class="tree-toggle">
-                <fa-icon [icon]="node.expanded ? faAngleDown : faAngleRight"></fa-icon>
+          @if (node.children && node.children.length > 0) {
+            <span (click)="toggleNode(node)" class="tree-toggle">
+              <fa-icon [icon]="node.expanded ? faAngleDown : faAngleRight"></fa-icon>
             </span>
-            <input class="form-check-input" type="checkbox" [id]="'export_node' + node.item.guid"
-                [checked]="node.checked"
-                [indeterminate]="node.indeterminate"
-                [(ngModel)]="node.checked"
-                (change)="onCheckboxChange(node)" />
-            <label class="form-check-label" [for]="'export_node_' + node.item.guid">
-                <ng-container [ngSwitch]="node.type">
-                    <fa-icon *ngSwitchCase="'company'" [icon]="faBuilding" class="me-1"></fa-icon>
-                    <fa-icon *ngSwitchCase="'facility'" [icon]="faIndustry" class="me-1"></fa-icon>
-                    <fa-icon *ngSwitchCase="'visit'" [icon]="faCalendar" class="me-1"></fa-icon>
-                    <fa-icon *ngSwitchCase="'assessment'" [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
-                    <fa-icon *ngSwitchDefault [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
-                </ng-container>
-                {{ node.name }}
-            </label>
+          }
+          <input class="form-check-input" type="checkbox" [id]="'export_node' + node.item.guid"
+            [checked]="node.checked"
+            [indeterminate]="node.indeterminate"
+            [(ngModel)]="node.checked"
+            (change)="onCheckboxChange(node)" />
+          <label class="form-check-label" [for]="'export_node_' + node.item.guid">
+            @switch (node.type) {
+              @case ('company') {
+                <fa-icon [icon]="faBuilding" class="me-1"></fa-icon>
+              }
+              @case ('facility') {
+                <fa-icon [icon]="faIndustry" class="me-1"></fa-icon>
+              }
+              @case ('visit') {
+                <fa-icon [icon]="faCalendar" class="me-1"></fa-icon>
+              }
+              @case ('assessment') {
+                <fa-icon [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
+              }
+              @default {
+                <fa-icon [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
+              }
+            }
+            {{ node.name }}
+          </label>
         </div>
-        <div class="subtree-list" *ngIf="node.expanded && node.children && node.children.length > 0">
+        @if (node.expanded && node.children && node.children.length > 0) {
+          <div class="subtree-list">
             <app-export-backup-tree [nodes]="node.children"></app-export-backup-tree>
-        </div>
-    </li>
-  </ul>
+          </div>
+        }
+      </li>
+    }
+  </ul>
+}