diff --git a/wcomponents-theme/build-js.mjs b/wcomponents-theme/build-js.mjs
index f2a2fdc94..95018ea0b 100644
--- a/wcomponents-theme/build-js.mjs
+++ b/wcomponents-theme/build-js.mjs
@@ -77,7 +77,15 @@ async function build(singleFile) {
  */
 async function buildSingle(singleFile) {
 	let fileName = singleFile;
-	themeLinter.run(singleFile);
+	try {
+		await themeLinter.run(singleFile);
+	} catch (ignore) {
+		/*
+			We do not break the build when processing a single file, as this only happens during active development.
+			When the full build is run, the build will break.
+		*/
+		console.error(ignore);
+	}
 	fileName = fileName.replace(dirs.script.src, "");
 	let conf = config;
 	Object.assign({}, conf);
diff --git a/wcomponents-theme/package.json b/wcomponents-theme/package.json
index 009b7f740..3f480197c 100755
--- a/wcomponents-theme/package.json
+++ b/wcomponents-theme/package.json
@@ -74,5 +74,10 @@
 		"sass": "1.5.1",
 		"sass-lint": "1.12.1",
 		"uglify-js": "3.17.4"
+	},
+	"overrides": {
+		"babel-plugin-transform-commonjs": {
+			"globals": "17.6.0"
+		}
 	}
 }
diff --git a/wcomponents-theme/src/main/js/wc/a8n.mjs b/wcomponents-theme/src/main/js/wc/a8n.mjs
index 72e64e928..e5c5348fa 100644
--- a/wcomponents-theme/src/main/js/wc/a8n.mjs
+++ b/wcomponents-theme/src/main/js/wc/a8n.mjs
@@ -9,6 +9,7 @@ import timers from "wc/timers.mjs";
 import Observer from "wc/Observer.mjs";
 import fixes from "wc/fixes.mjs";
 
+
 let observer,
 	timer,
 	globalPending = 0;
@@ -90,7 +91,7 @@ function pendingUpdated(pending, flag) {
 function checkNotify() {
 	const element = document.body;
 	if (element) {
-		const isReady = !globalPending;  // When nothing is pwnding it will be zero
+		const isReady = !globalPending;  // When nothing is pending it will be zero
 		const currentState = instance.isReady();
 		if (isReady !== currentState) {
 			if (timer) {
@@ -131,7 +132,7 @@ function stateChangeFactory(element, attr) {
  */
 function isFlaggedReady() {
 	const element = document.body;
-	return (element && element.getAttribute(instance.attr) === "true");
+	return (element?.getAttribute(instance.attr) === "true");
 }
 
 /**
diff --git a/wcomponents-theme/src/main/js/wc/debug/debugUtils.mjs b/wcomponents-theme/src/main/js/wc/debug/debugUtils.mjs
index 9a693688f..ce64eb6aa 100644
--- a/wcomponents-theme/src/main/js/wc/debug/debugUtils.mjs
+++ b/wcomponents-theme/src/main/js/wc/debug/debugUtils.mjs
@@ -36,7 +36,7 @@ function flagBad(tags, testFunc, container) {
 	}
 
 	if (candidates && candidates.length) {
-		candidates.forEach(testFunc);
+		candidates.forEach(element => testFunc(element));
 	}
 }
 
diff --git a/wcomponents-theme/src/main/js/wc/dom/diagnostic.mjs b/wcomponents-theme/src/main/js/wc/dom/diagnostic.mjs
index d3a69c190..0a82835bd 100644
--- a/wcomponents-theme/src/main/js/wc/dom/diagnostic.mjs
+++ b/wcomponents-theme/src/main/js/wc/dom/diagnostic.mjs
@@ -215,7 +215,7 @@ const diagnostic = {
 	 * @returns {Boolean}
 	 */
 	isMessage: function (element, level) {
-		if (!(element && element.nodeType === Node.ELEMENT_NODE)) {
+		if (element?.nodeType !== Node.ELEMENT_NODE) {
 			return false;
 		}
 		// firstly, do we even have a message?
@@ -265,7 +265,7 @@ const diagnostic = {
 	 * @returns {HTMLElement} the target element of the diagnostic box
 	 */
 	getTarget: function (diag) {
-		if (!(diag && diag.nodeType === Node.ELEMENT_NODE && diag.matches(diagnosticSelector))) {
+		if (!(diag?.nodeType === Node.ELEMENT_NODE && diag.matches(diagnosticSelector))) {
 			return null;
 		}
 
diff --git a/wcomponents-theme/src/main/js/wc/dom/role.mjs b/wcomponents-theme/src/main/js/wc/dom/role.mjs
index 091868889..0bd3ea06b 100644
--- a/wcomponents-theme/src/main/js/wc/dom/role.mjs
+++ b/wcomponents-theme/src/main/js/wc/dom/role.mjs
@@ -16,7 +16,7 @@ export default {
 	 */
 	get: function(element, implied) {
 		let role = "";
-		if (element && element.nodeType === Node.ELEMENT_NODE) {
+		if (element?.nodeType === Node.ELEMENT_NODE) {
 			role = element.getAttribute("role");
 			if (implied && !role) {
 				role = impliedARIA.getImpliedRole(/** @type {HTMLElement} */(element));
@@ -34,7 +34,7 @@ export default {
 	 */
 	has: function(element, implied) {
 		let result = false;
-		if (element && element.nodeType === Node.ELEMENT_NODE) {
+		if (element?.nodeType === Node.ELEMENT_NODE) {
 			result = element.hasAttribute("role");
 			if (implied && !result) {
 				result = !!impliedARIA.getImpliedRole(/** @type {HTMLElement} */(element));
diff --git a/wcomponents-theme/src/main/js/wc/dom/serialize.mjs b/wcomponents-theme/src/main/js/wc/dom/serialize.mjs
index 154b9c72e..4bbb3c51f 100755
--- a/wcomponents-theme/src/main/js/wc/dom/serialize.mjs
+++ b/wcomponents-theme/src/main/js/wc/dom/serialize.mjs
@@ -26,7 +26,7 @@ const instance = {
 					let same = false;
 					const stateBVal = stateB[key];
 					const stateAVal = stateA[key];
-					if (stateBVal && stateAVal && stateBVal.length === stateAVal.length) {
+					if (stateAVal?.length > 0 && stateBVal?.length === stateAVal.length) {
 						same = stateBVal.every(item => stateAVal.includes(item));
 					} else {
 						console.log("Param has changed", key, stateAVal, stateBVal);
diff --git a/wcomponents-theme/src/main/js/wc/dom/wrappedInput.mjs b/wcomponents-theme/src/main/js/wc/dom/wrappedInput.mjs
index 9d34ec09a..0df1a03c6 100644
--- a/wcomponents-theme/src/main/js/wc/dom/wrappedInput.mjs
+++ b/wcomponents-theme/src/main/js/wc/dom/wrappedInput.mjs
@@ -42,7 +42,7 @@ wrappedInput.isReadOnly = function(element) {
  * @return {HTMLElement|null}
  */
 wrappedInput.getInput = function(element) {
-	if (!(element && element.matches(wrapperSelector))) {
+	if (!(element?.matches(wrapperSelector))) {
 		return null;
 	}
 	return element.querySelector(wrappedSelectors);
diff --git a/wcomponents-theme/src/main/js/wc/ui/ajax/processResponse.mjs b/wcomponents-theme/src/main/js/wc/ui/ajax/processResponse.mjs
index 1e53f770b..aeccbdaba 100755
--- a/wcomponents-theme/src/main/js/wc/ui/ajax/processResponse.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/ajax/processResponse.mjs
@@ -381,7 +381,7 @@ function insertScripts(scripts, relativeTo) {
 	const srcAttr = "src", defer = "defer";
 	let ownerElement = document.body;
 
-	if (relativeTo && relativeTo.nodeType === Node.ELEMENT_NODE) {
+	if (relativeTo?.nodeType === Node.ELEMENT_NODE) {
 		ownerElement = relativeTo.closest("form") || document.body;
 	}
 
diff --git a/wcomponents-theme/src/main/js/wc/ui/calendar.mjs b/wcomponents-theme/src/main/js/wc/ui/calendar.mjs
index 7d6b9203c..0ce979c59 100755
--- a/wcomponents-theme/src/main/js/wc/ui/calendar.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/calendar.mjs
@@ -1022,7 +1022,7 @@ function keydownEvent($event) {
 function position(element) {
 	const cal = element || getCal();
 	if (cal && !shed.isHidden(cal, true)) {
-		const fixed = (window.getComputedStyle && window.getComputedStyle(cal).position === "fixed");
+		const fixed = (window?.getComputedStyle(cal).position === "fixed");
 		if (fixed) {
 			const input = getInputForCalendar(cal);
 			if (input) {
diff --git a/wcomponents-theme/src/main/js/wc/ui/feedback.mjs b/wcomponents-theme/src/main/js/wc/ui/feedback.mjs
index 0a7262158..f888d3c81 100644
--- a/wcomponents-theme/src/main/js/wc/ui/feedback.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/feedback.mjs
@@ -255,7 +255,7 @@ const instance = {
 		let writeWhere = args.position,
 			target = args.element || args["target"];  // this was a mess with both properties in use
 
-		if (!(messages && target && target.nodeType === Node.ELEMENT_NODE)) {
+		if (!(messages && target?.nodeType === Node.ELEMENT_NODE)) {
 			// no messages or target for the messages
 			// don't throw: just do nothing
 			console.warn("trying to add nothing or to nothing");
@@ -308,7 +308,7 @@ const instance = {
 	 * @returns {boolean} `true` if a diagnostic box was found and removed.
 	 */
 	remove: function(element, target, level) {
-		if (!(element && element.nodeType === Node.ELEMENT_NODE)) {
+		if (element?.nodeType !== Node.ELEMENT_NODE) {
 			return false;
 		}
 		// read carefully before you try merging these two to be more 'efficient'/
diff --git a/wcomponents-theme/src/main/js/wc/ui/fieldset.mjs b/wcomponents-theme/src/main/js/wc/ui/fieldset.mjs
index 8be383562..9e35ba8dd 100755
--- a/wcomponents-theme/src/main/js/wc/ui/fieldset.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/fieldset.mjs
@@ -45,7 +45,7 @@ function makeLegend(el) {
 }
 
 function labelToLegend(element) {
-	if (element && element.matches(fieldsetSelector)) {
+	if (element?.matches(fieldsetSelector)) {
 		makeLegend(element);
 	} else {
 		Array.from(document.body?.querySelectorAll(fieldsetSelector)).forEach(makeLegend);
diff --git a/wcomponents-theme/src/main/js/wc/ui/icon.mjs b/wcomponents-theme/src/main/js/wc/ui/icon.mjs
index cc13aaf92..155897933 100644
--- a/wcomponents-theme/src/main/js/wc/ui/icon.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/icon.mjs
@@ -93,7 +93,7 @@ function getHTML(icon) {
  * @throws {TypeError} if element is not an Element
  */
 function testElementArg(element) {
-	if (!(element && element.nodeType === Node.ELEMENT_NODE)) {
+	if (element?.nodeType !== Node.ELEMENT_NODE) {
 		throw new TypeError("element must be an HTML element");
 	}
 	return true;
diff --git a/wcomponents-theme/src/main/js/wc/ui/label.mjs b/wcomponents-theme/src/main/js/wc/ui/label.mjs
index 54d64b3d8..82578e0c4 100755
--- a/wcomponents-theme/src/main/js/wc/ui/label.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/label.mjs
@@ -133,7 +133,7 @@ function shedMandatorySubscriber($event) {
 		return;
 	}
 	const input = wrappedInput.isOneOfMe(target) ? wrappedInput.getInput(target) : target;
-	if (input && input.type !== "radio" && (input.matches(tags.join()) || $role.has(input))) {
+	if (input?.type !== "radio" && (input.matches(tags.join()) || $role.has(input))) {
 		const func = action === shed.events.OPTIONAL ? "remove" : "add";
 		getLabelsForElement(target).forEach(function (next) {
 			mandateLabel(next, func);
diff --git a/wcomponents-theme/src/main/js/wc/ui/listboxAnalog.mjs b/wcomponents-theme/src/main/js/wc/ui/listboxAnalog.mjs
index c25b1de2e..49978d8f7 100755
--- a/wcomponents-theme/src/main/js/wc/ui/listboxAnalog.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/listboxAnalog.mjs
@@ -184,7 +184,7 @@ function getTextTarget(options, start, keyName) {
 		for (let i = startIdx + 1; i < options.length; ++i) {
 			let next = options[i];
 			let txt = next.textContent;
-			if (txt && txt[0].toLocaleLowerCase() === keyName) {
+			if (txt?.[0].toLocaleLowerCase() === keyName) {
 				result = next;
 				break;
 			}
diff --git a/wcomponents-theme/src/main/js/wc/ui/menu/core.mjs b/wcomponents-theme/src/main/js/wc/ui/menu/core.mjs
index d44264983..8087a80a1 100755
--- a/wcomponents-theme/src/main/js/wc/ui/menu/core.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/menu/core.mjs
@@ -248,7 +248,7 @@ AbstractMenu.prototype.hasTextNodeMatch = function(element, letter) {
 		tw.nextNode();
 		const node = tw.currentNode;
 
-		if (node && node.nodeType === Node.TEXT_NODE) {
+		if (node?.nodeType === Node.TEXT_NODE) {
 			const textNodeContent = node.nodeValue;
 			if (textNodeContent.toLocaleUpperCase().startsWith(letter.toLocaleUpperCase())) {
 				result = NodeFilter.FILTER_ACCEPT;
diff --git a/wcomponents-theme/src/main/js/wc/ui/radioButtonSelect.mjs b/wcomponents-theme/src/main/js/wc/ui/radioButtonSelect.mjs
index f4cdd0ede..ec902d48c 100755
--- a/wcomponents-theme/src/main/js/wc/ui/radioButtonSelect.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/radioButtonSelect.mjs
@@ -71,7 +71,7 @@ const instance = {
  * @param {String} action One of the {@link module:wc/dom/shed~actions}: MANDATORY or OPTIONAL
  */
 function shedSubscriber(element, action) {
-	if (element && element.matches(radioButtonSelectSelector)) {
+	if (element?.matches(radioButtonSelectSelector)) {
 		group.getGroup(element, radioSelector).forEach(next => shed[action](next));
 	}
 }
diff --git a/wcomponents-theme/src/main/js/wc/ui/table/rowExpansion.mjs b/wcomponents-theme/src/main/js/wc/ui/table/rowExpansion.mjs
index 7e7c1686a..767bd2fab 100755
--- a/wcomponents-theme/src/main/js/wc/ui/table/rowExpansion.mjs
+++ b/wcomponents-theme/src/main/js/wc/ui/table/rowExpansion.mjs
@@ -235,7 +235,7 @@ function showHideContent(triggerRow, action) {
  * @param {CustomEvent & { target: HTMLElement, detail: { action: string } }} $event
  */
 function expCollapseObserver({ target: element, detail }) {
-	if (element && element.matches(tbl_expandable_row)) {
+	if (element?.matches(tbl_expandable_row)) {
 		const action = detail.action;
 		const control = Array.from(element.children).find(el => el.matches(row_trigger));
 		if (control) {