diff --git a/.babelrc b/.babelrc
index bfbddb3b..9413f37b 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,7 +1,6 @@
 {
   "assumptions": {
-    "setPublicClassFields": true,
-    "privateFieldsAsProperties": true
+    "setPublicClassFields": true
   },
   "presets": [
     [
diff --git a/grunt_config.json b/grunt_config.json
index 6fa84270..33629199 100644
--- a/grunt_config.json
+++ b/grunt_config.json
@@ -136,9 +136,9 @@
           "booleans": true,
           "if_return": true,
           "sequences": true,
-          "unused": true,
+          "unused": false,
           "conditionals": true,
-          "dead_code": true,
+          "dead_code": false,
           "evaluate": true
         },
         "mangle": {
@@ -179,9 +179,9 @@
           "booleans": true,
           "if_return": true,
           "sequences": true,
-          "unused": true,
+          "unused": false,
           "conditionals": true,
-          "dead_code": true,
+          "dead_code": false,
           "evaluate": true
         },
         "mangle": {
diff --git a/package-lock.json b/package-lock.json
index 34d4bd85..5450db2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,8 @@
       },
       "devDependencies": {
         "@babel/core": "^7.24.0",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-transform-class-properties": "^7.27.1",
         "@babel/plugin-transform-private-methods": "^7.24.0",
         "@babel/plugin-transform-private-property-in-object": "^7.24.0",
         "@babel/preset-env": "^7.24.0",
@@ -502,6 +504,24 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
diff --git a/package.json b/package.json
index 5993fd6e..41e5cb1a 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,16 @@
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-transform-class-properties": "^7.27.1",
     "@babel/plugin-transform-private-methods": "^7.24.0",
     "@babel/plugin-transform-private-property-in-object": "^7.24.0",
     "@babel/preset-env": "^7.24.0",
     "@webcomponents/webcomponentsjs": "^2.8.0",
     "babel-loader": "^9.1.3",
-    "core-js": "^3.36.0",
     "clipboard": "^2.0.1",
     "copy-webpack-plugin": "^12.0.2",
+    "core-js": "^3.36.0",
     "css-loader": "^7.1.2",
     "exports-loader": "^5.0.0",
     "favico.js": "^0.3.10",
diff --git a/webpack.config.js b/webpack.config.js
index 47182ee9..a5a8822a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,8 +13,7 @@ if (process.env.RC_STATIC_DIR) {
 // doing it this way because it seems that plugin via grunt does not pick up .babelrc
 let babelRCOptions = {
     "assumptions": {
-        "setPublicClassFields": true,
-        "privateFieldsAsProperties": true
+        "setPublicClassFields": true
     },
     "presets": [
         ["@babel/preset-env", {
@@ -33,7 +32,8 @@ let babelRCOptions = {
 module.exports = {
     mode: 'production',
     optimization: {
-        minimize: false  // Let grunt-terser handle minification to avoid double-minification
+        minimize: false,  // Disable webpack minification - grunt-terser handles final minification
+        usedExports: false,  // Disable tree-shaking - it breaks Lit's re-exports
     },
     // Tell Webpack which file kicks off our app.
     entry: {