diff --git a/apps/gallery/CHANGELOG.md b/apps/gallery/CHANGELOG.md
index 969c25bf2f..1bbd460f90 100644
--- a/apps/gallery/CHANGELOG.md
+++ b/apps/gallery/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @apps/gallery
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/common@4.0.4
+  - @web3modal/ui@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/apps/gallery/package.json b/apps/gallery/package.json
index 7e7b773042..689c24c502 100644
--- a/apps/gallery/package.json
+++ b/apps/gallery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/gallery",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -9,8 +9,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/common": "4.0.3",
-    "@web3modal/ui": "4.0.3",
+    "@web3modal/common": "4.0.4",
+    "@web3modal/ui": "4.0.4",
     "lit": "3.1.0",
     "storybook": "7.6.7"
   },
diff --git a/apps/laboratory/CHANGELOG.md b/apps/laboratory/CHANGELOG.md
index 10507ad739..3158faeae7 100644
--- a/apps/laboratory/CHANGELOG.md
+++ b/apps/laboratory/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @apps/laboratory
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/ethers@4.0.4
+  - @web3modal/ethers5@4.0.4
+  - @web3modal/wagmi@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
index 2372151444..4187cde6bf 100644
--- a/apps/laboratory/package.json
+++ b/apps/laboratory/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/laboratory",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "private": true,
   "scripts": {
     "dev:laboratory": "next dev",
@@ -22,9 +22,9 @@
     "@sentry/browser": "7.92.0",
     "@sentry/react": "7.92.0",
     "@tanstack/react-query": "5.17.19",
-    "@web3modal/ethers": "4.0.3",
-    "@web3modal/ethers5": "4.0.3",
-    "@web3modal/wagmi": "4.0.3",
+    "@web3modal/ethers": "4.0.4",
+    "@web3modal/ethers5": "4.0.4",
+    "@web3modal/wagmi": "4.0.4",
     "framer-motion": "10.17.9",
     "next": "14.0.4",
     "next-auth": "4.24.5",
diff --git a/dangerfile.ts b/dangerfile.ts
index 71961f4fe0..ea1313d570 100644
--- a/dangerfile.ts
+++ b/dangerfile.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { danger, fail, message, warn } from 'danger'
 import corePackageJson from './packages/core/package.json' assert { type: 'json' }
-import coreScaffoldUtilsJson from './packages/scaffold-utils/package.json' assert { type: 'json' }
+import { ConstantsUtil } from './packages/scaffold-utils/src/ConstantsUtil'
 
 // -- Constants ---------------------------------------------------------------
 const TYPE_COMMENT = `// -- Types --------------------------------------------- //`
@@ -10,6 +10,7 @@ const CONTROLLER_COMMENT = `// -- Controller -----------------------------------
 const RENDER_COMMENT = `// -- Render -------------------------------------------- //`
 const STATE_PROPERTIES_COMMENT = `// -- State & Properties -------------------------------- //`
 const PRIVATE_COMMENT = `// -- Private ------------------------------------------- //`
+const PACKAGE_VERSION = ConstantsUtil.VERSION
 
 // -- Data --------------------------------------------------------------------
 const { modified_files, created_files, deleted_files, diffForFile } = danger.git
@@ -283,7 +284,7 @@ checkClientPackages()
 
 // -- Check sdkVersion ------------------------------------------------------------
 function checkSdkVersion() {
-  if (coreScaffoldUtilsJson.version !== corePackageJson.version) {
+  if (PACKAGE_VERSION !== corePackageJson.version) {
     fail(`VERSION in utils/constants does't match core package.json version`)
   }
 }
diff --git a/examples/html-ethers5/CHANGELOG.md b/examples/html-ethers5/CHANGELOG.md
index 54c275dbc0..976169dc9c 100644
--- a/examples/html-ethers5/CHANGELOG.md
+++ b/examples/html-ethers5/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/html-ethers5
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/ethers5@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/html-ethers5/package.json b/examples/html-ethers5/package.json
index 25b6ac23fb..3ac2c231a0 100644
--- a/examples/html-ethers5/package.json
+++ b/examples/html-ethers5/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/html-ethers5",
   "private": true,
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "dev:example": "vite --port 3011",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/ethers5": "4.0.3",
+    "@web3modal/ethers5": "4.0.4",
     "ethers": "5.7.2"
   },
   "devDependencies": {
diff --git a/examples/html-wagmi/CHANGELOG.md b/examples/html-wagmi/CHANGELOG.md
index eea84779bc..320e367780 100644
--- a/examples/html-wagmi/CHANGELOG.md
+++ b/examples/html-wagmi/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/html-wagmi
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/wagmi@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/html-wagmi/package.json b/examples/html-wagmi/package.json
index df95e5c076..ec35e7f337 100644
--- a/examples/html-wagmi/package.json
+++ b/examples/html-wagmi/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/html-wagmi",
   "private": true,
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "dev:example": "vite --port 3001",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/wagmi": "4.0.3",
+    "@web3modal/wagmi": "4.0.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
diff --git a/examples/next-wagmi/CHANGELOG.md b/examples/next-wagmi/CHANGELOG.md
index 9b7165a55f..4fad200446 100644
--- a/examples/next-wagmi/CHANGELOG.md
+++ b/examples/next-wagmi/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/next-wagmi
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/wagmi@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/next-wagmi/package.json b/examples/next-wagmi/package.json
index a355ab4b58..9847d82a9c 100644
--- a/examples/next-wagmi/package.json
+++ b/examples/next-wagmi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@examples/next-wagmi",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@tanstack/react-query": "5.17.19",
-    "@web3modal/wagmi": "4.0.3",
+    "@web3modal/wagmi": "4.0.4",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
diff --git a/examples/react-ethers5/CHANGELOG.md b/examples/react-ethers5/CHANGELOG.md
index 71f5bfb679..de79efe3e4 100644
--- a/examples/react-ethers5/CHANGELOG.md
+++ b/examples/react-ethers5/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/react-ethers5
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/ethers5@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/react-ethers5/package.json b/examples/react-ethers5/package.json
index 110cf7288c..b95a2544d6 100644
--- a/examples/react-ethers5/package.json
+++ b/examples/react-ethers5/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/react-ethers5",
   "private": true,
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "dev:example": "vite --port 3012",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/ethers5": "4.0.3",
+    "@web3modal/ethers5": "4.0.4",
     "ethers": "5.7.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"
diff --git a/examples/react-wagmi/CHANGELOG.md b/examples/react-wagmi/CHANGELOG.md
index 8acdf5f5b6..0aeaac6a7a 100644
--- a/examples/react-wagmi/CHANGELOG.md
+++ b/examples/react-wagmi/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/react-wagmi
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/wagmi@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/react-wagmi/package.json b/examples/react-wagmi/package.json
index 21965b83ad..1aa26a2f28 100644
--- a/examples/react-wagmi/package.json
+++ b/examples/react-wagmi/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@examples/react-wagmi",
   "private": true,
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "dev:example": "vite --port 3002",
     "build:examples": "vite build"
   },
   "dependencies": {
     "@tanstack/react-query": "5.17.19",
-    "@web3modal/wagmi": "4.0.3",
+    "@web3modal/wagmi": "4.0.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "viem": "2.5.0",
diff --git a/examples/vue-ethers5/CHANGELOG.md b/examples/vue-ethers5/CHANGELOG.md
index db228702da..9c6a6963a7 100644
--- a/examples/vue-ethers5/CHANGELOG.md
+++ b/examples/vue-ethers5/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/vue-ethers5
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/ethers5@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/vue-ethers5/package.json b/examples/vue-ethers5/package.json
index 4e301015c6..7445fe6d16 100644
--- a/examples/vue-ethers5/package.json
+++ b/examples/vue-ethers5/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/vue-ethers5",
   "private": true,
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "dev:example": "vite --port 3013",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/ethers5": "4.0.3",
+    "@web3modal/ethers5": "4.0.4",
     "ethers": "5.7.2"
   },
   "devDependencies": {
diff --git a/examples/vue-wagmi/CHANGELOG.md b/examples/vue-wagmi/CHANGELOG.md
index 6ca170da75..d21ff02f63 100644
--- a/examples/vue-wagmi/CHANGELOG.md
+++ b/examples/vue-wagmi/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @examples/vue-wagmi
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/wagmi@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/examples/vue-wagmi/package.json b/examples/vue-wagmi/package.json
index 916ecabc63..e8650e794e 100644
--- a/examples/vue-wagmi/package.json
+++ b/examples/vue-wagmi/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/vue-wagmi",
   "private": true,
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "dev:example": "vite --port 3003",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/wagmi": "4.0.3"
+    "@web3modal/wagmi": "4.0.4"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "5.0.2"
diff --git a/package-lock.json b/package-lock.json
index e96d3154bf..36c95d203b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,10 +41,10 @@
     },
     "apps/gallery": {
       "name": "@apps/gallery",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
-        "@web3modal/common": "4.0.3",
-        "@web3modal/ui": "4.0.3",
+        "@web3modal/common": "4.0.4",
+        "@web3modal/ui": "4.0.4",
         "lit": "3.1.0",
         "storybook": "7.6.7"
       },
@@ -70,7 +70,7 @@
     },
     "apps/laboratory": {
       "name": "@apps/laboratory",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@emotion/react": "11.11.3",
@@ -78,9 +78,9 @@
         "@sentry/browser": "7.92.0",
         "@sentry/react": "7.92.0",
         "@tanstack/react-query": "5.17.19",
-        "@web3modal/ethers": "4.0.3",
-        "@web3modal/ethers5": "4.0.3",
-        "@web3modal/wagmi": "4.0.3",
+        "@web3modal/ethers": "4.0.4",
+        "@web3modal/ethers5": "4.0.4",
+        "@web3modal/wagmi": "4.0.4",
         "framer-motion": "10.17.9",
         "next": "14.0.4",
         "next-auth": "4.24.5",
@@ -112,9 +112,9 @@
     },
     "examples/html-ethers5": {
       "name": "@examples/html-ethers5",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
-        "@web3modal/ethers5": "4.0.3",
+        "@web3modal/ethers5": "4.0.4",
         "ethers": "5.7.2"
       },
       "devDependencies": {
@@ -170,9 +170,9 @@
     },
     "examples/html-wagmi": {
       "name": "@examples/html-wagmi",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
-        "@web3modal/wagmi": "4.0.3",
+        "@web3modal/wagmi": "4.0.4",
         "react": "18.2.0",
         "react-dom": "18.2.0"
       },
@@ -182,10 +182,10 @@
     },
     "examples/next-wagmi": {
       "name": "@examples/next-wagmi",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
         "@tanstack/react-query": "5.17.19",
-        "@web3modal/wagmi": "4.0.3",
+        "@web3modal/wagmi": "4.0.4",
         "next": "14.1.0",
         "react": "18.2.0",
         "react-dom": "18.2.0",
@@ -248,9 +248,9 @@
     },
     "examples/react-ethers5": {
       "name": "@examples/react-ethers5",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
-        "@web3modal/ethers5": "4.0.3",
+        "@web3modal/ethers5": "4.0.4",
         "ethers": "5.7.2",
         "react": "18.2.0",
         "react-dom": "18.2.0"
@@ -309,10 +309,10 @@
     },
     "examples/react-wagmi": {
       "name": "@examples/react-wagmi",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
         "@tanstack/react-query": "5.17.19",
-        "@web3modal/wagmi": "4.0.3",
+        "@web3modal/wagmi": "4.0.4",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "viem": "2.5.0",
@@ -326,9 +326,9 @@
     },
     "examples/vue-ethers5": {
       "name": "@examples/vue-ethers5",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
-        "@web3modal/ethers5": "4.0.3",
+        "@web3modal/ethers5": "4.0.4",
         "ethers": "5.7.2"
       },
       "devDependencies": {
@@ -384,9 +384,9 @@
     },
     "examples/vue-wagmi": {
       "name": "@examples/vue-wagmi",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "dependencies": {
-        "@web3modal/wagmi": "4.0.3"
+        "@web3modal/wagmi": "4.0.4"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "5.0.2"
@@ -30287,7 +30287,7 @@
     },
     "packages/common": {
       "name": "@web3modal/common",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "dayjs": "1.11.10"
@@ -30295,11 +30295,11 @@
     },
     "packages/core": {
       "name": "@web3modal/core",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/common": "4.0.3",
-        "@web3modal/wallet": "4.0.3",
+        "@web3modal/common": "4.0.4",
+        "@web3modal/wallet": "4.0.4",
         "valtio": "1.11.2"
       },
       "devDependencies": {
@@ -30308,16 +30308,16 @@
     },
     "packages/ethers": {
       "name": "@web3modal/ethers",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@coinbase/wallet-sdk": "3.9.1",
         "@walletconnect/ethereum-provider": "2.11.1",
-        "@web3modal/polyfills": "4.0.3",
-        "@web3modal/scaffold": "4.0.3",
-        "@web3modal/scaffold-react": "4.0.3",
-        "@web3modal/scaffold-utils": "4.0.3",
-        "@web3modal/scaffold-vue": "4.0.3",
+        "@web3modal/polyfills": "4.0.4",
+        "@web3modal/scaffold": "4.0.4",
+        "@web3modal/scaffold-react": "4.0.4",
+        "@web3modal/scaffold-utils": "4.0.4",
+        "@web3modal/scaffold-vue": "4.0.4",
         "valtio": "1.11.2"
       },
       "devDependencies": {
@@ -30328,7 +30328,7 @@
         "vue": "3.4.3"
       },
       "optionalDependencies": {
-        "@web3modal/siwe": "4.0.3",
+        "@web3modal/siwe": "4.0.4",
         "react": ">=17",
         "react-dom": ">=17",
         "vue": ">=3"
@@ -30505,16 +30505,16 @@
     },
     "packages/ethers5": {
       "name": "@web3modal/ethers5",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@coinbase/wallet-sdk": "3.9.1",
         "@walletconnect/ethereum-provider": "2.11.1",
-        "@web3modal/polyfills": "4.0.3",
-        "@web3modal/scaffold": "4.0.3",
-        "@web3modal/scaffold-react": "4.0.3",
-        "@web3modal/scaffold-utils": "4.0.3",
-        "@web3modal/scaffold-vue": "4.0.3",
+        "@web3modal/polyfills": "4.0.4",
+        "@web3modal/scaffold": "4.0.4",
+        "@web3modal/scaffold-react": "4.0.4",
+        "@web3modal/scaffold-utils": "4.0.4",
+        "@web3modal/scaffold-vue": "4.0.4",
         "valtio": "1.11.2"
       },
       "devDependencies": {
@@ -30525,7 +30525,7 @@
         "vue": "3.4.3"
       },
       "optionalDependencies": {
-        "@web3modal/siwe": "4.0.3",
+        "@web3modal/siwe": "4.0.4",
         "react": ">=17",
         "react-dom": ">=17",
         "vue": ">=3"
@@ -30750,7 +30750,7 @@
     },
     "packages/polyfills": {
       "name": "@web3modal/polyfills",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "buffer": "6.0.3"
@@ -30758,24 +30758,24 @@
     },
     "packages/scaffold": {
       "name": "@web3modal/scaffold",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/common": "4.0.3",
-        "@web3modal/core": "4.0.3",
-        "@web3modal/ui": "4.0.3",
+        "@web3modal/common": "4.0.4",
+        "@web3modal/core": "4.0.4",
+        "@web3modal/ui": "4.0.4",
         "lit": "3.1.0"
       },
       "devDependencies": {
-        "@web3modal/wallet": "4.0.3"
+        "@web3modal/wallet": "4.0.4"
       }
     },
     "packages/scaffold-react": {
       "name": "@web3modal/scaffold-react",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/scaffold": "4.0.3"
+        "@web3modal/scaffold": "4.0.4"
       },
       "peerDependencies": {
         "react": ">=17",
@@ -30784,20 +30784,20 @@
     },
     "packages/scaffold-utils": {
       "name": "@web3modal/scaffold-utils",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/polyfills": "4.0.3",
-        "@web3modal/scaffold": "4.0.3",
+        "@web3modal/polyfills": "4.0.4",
+        "@web3modal/scaffold": "4.0.4",
         "valtio": "1.11.2"
       }
     },
     "packages/scaffold-vue": {
       "name": "@web3modal/scaffold-vue",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/scaffold": "4.0.3"
+        "@web3modal/scaffold": "4.0.4"
       },
       "peerDependencies": {
         "vue": ">=3"
@@ -30815,11 +30815,11 @@
     },
     "packages/siwe": {
       "name": "@web3modal/siwe",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/core": "4.0.3",
-        "@web3modal/scaffold-utils": "4.0.3"
+        "@web3modal/core": "4.0.4",
+        "@web3modal/scaffold-utils": "4.0.4"
       },
       "optionalDependencies": {
         "react": ">=17",
@@ -30845,7 +30845,7 @@
     },
     "packages/ui": {
       "name": "@web3modal/ui",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "lit": "3.1.0",
@@ -30853,7 +30853,7 @@
       },
       "devDependencies": {
         "@types/qrcode": "1.5.5",
-        "@web3modal/common": "4.0.3",
+        "@web3modal/common": "4.0.4",
         "eslint-plugin-lit": "1.11.0",
         "eslint-plugin-wc": "2.0.4"
       }
@@ -30870,14 +30870,14 @@
     },
     "packages/wagmi": {
       "name": "@web3modal/wagmi",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@web3modal/polyfills": "4.0.3",
-        "@web3modal/scaffold": "4.0.3",
-        "@web3modal/scaffold-react": "4.0.3",
-        "@web3modal/scaffold-utils": "4.0.3",
-        "@web3modal/scaffold-vue": "4.0.3"
+        "@web3modal/polyfills": "4.0.4",
+        "@web3modal/scaffold": "4.0.4",
+        "@web3modal/scaffold-react": "4.0.4",
+        "@web3modal/scaffold-utils": "4.0.4",
+        "@web3modal/scaffold-vue": "4.0.4"
       },
       "devDependencies": {
         "@wagmi/connectors": "4.1.4",
@@ -30889,7 +30889,7 @@
         "vue": "3.4.3"
       },
       "optionalDependencies": {
-        "@web3modal/siwe": "4.0.3",
+        "@web3modal/siwe": "4.0.4",
         "react": ">=17",
         "react-dom": ">=17",
         "vue": ">=3"
@@ -31191,7 +31191,7 @@
     },
     "packages/wallet": {
       "name": "@web3modal/wallet",
-      "version": "4.0.3",
+      "version": "4.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "zod": "3.22.4"
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index ba73b74c57..26f05e0bfc 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/common
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/common/package.json b/packages/common/package.json
index 65f1a70469..092d7ae9e4 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/common",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 569aa336d6..a8f4be5aee 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @web3modal/core
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/common@4.0.4
+  - @web3modal/wallet@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/core/package.json b/packages/core/package.json
index 08c2971bd9..60fdb444dd 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/core",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -17,8 +17,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/common": "4.0.3",
-    "@web3modal/wallet": "4.0.3",
+    "@web3modal/common": "4.0.4",
+    "@web3modal/wallet": "4.0.4",
     "valtio": "1.11.2"
   },
   "devDependencies": {
diff --git a/packages/core/src/controllers/ConnectorController.ts b/packages/core/src/controllers/ConnectorController.ts
index a6eae69152..3893ed162e 100644
--- a/packages/core/src/controllers/ConnectorController.ts
+++ b/packages/core/src/controllers/ConnectorController.ts
@@ -2,6 +2,7 @@ import { subscribeKey as subKey } from 'valtio/utils'
 import { proxy, ref, snapshot } from 'valtio/vanilla'
 import type { Connector, EmailConnector } from '../utils/TypeUtil.js'
 import { OptionsController } from './OptionsController.js'
+import { ThemeController } from './ThemeController.js'
 
 // -- Types --------------------------------------------- //
 export interface ConnectorControllerState {
@@ -38,6 +39,10 @@ export const ConnectorController = {
         sdkVersion: optionsState.sdkVersion,
         projectId: optionsState.projectId
       })
+      emailConnector.provider.syncTheme({
+        themeMode: ThemeController.getSnapshot().themeMode,
+        themeVariables: ThemeController.getSnapshot().themeVariables
+      })
     }
   },
 
diff --git a/packages/core/src/controllers/ThemeController.ts b/packages/core/src/controllers/ThemeController.ts
index 68eb02fbda..b8ee87925d 100644
--- a/packages/core/src/controllers/ThemeController.ts
+++ b/packages/core/src/controllers/ThemeController.ts
@@ -1,5 +1,6 @@
 import { proxy, subscribe as sub, snapshot } from 'valtio/vanilla'
 import type { ThemeMode, ThemeVariables } from '../utils/TypeUtil.js'
+import { ConnectorController } from './ConnectorController.js'
 
 // -- Types --------------------------------------------- //
 export interface ThemeControllerState {
@@ -23,10 +24,33 @@ export const ThemeController = {
 
   setThemeMode(themeMode: ThemeControllerState['themeMode']) {
     state.themeMode = themeMode
+    try {
+      const emailConnector = ConnectorController.getEmailConnector()
+
+      if (emailConnector) {
+        emailConnector.provider.syncTheme({
+          themeMode: ThemeController.getSnapshot().themeMode
+        })
+      }
+    } catch {
+      // eslint-disable-next-line no-console
+      console.info('Unable to sync theme to email connector')
+    }
   },
 
   setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
     state.themeVariables = { ...state.themeVariables, ...themeVariables }
+    try {
+      const emailConnector = ConnectorController.getEmailConnector()
+      if (emailConnector) {
+        emailConnector.provider.syncTheme({
+          themeVariables: ThemeController.getSnapshot().themeVariables
+        })
+      }
+    } catch {
+      // eslint-disable-next-line no-console
+      console.info('Unable to sync theme to email connector')
+    }
   },
 
   getSnapshot() {
diff --git a/packages/core/src/utils/CoreHelperUtil.ts b/packages/core/src/utils/CoreHelperUtil.ts
index 4fcfb50945..2955891b14 100644
--- a/packages/core/src/utils/CoreHelperUtil.ts
+++ b/packages/core/src/utils/CoreHelperUtil.ts
@@ -138,7 +138,7 @@ export const CoreHelperUtil = {
       }
     }
 
-    return formattedBalance ? `${formattedBalance} ${symbol ?? ''}` : '0.000'
+    return formattedBalance ? `${formattedBalance} ${symbol ?? ''}` : `0.000 ${symbol ?? ''}`
   },
 
   formatBalance2(balance: string | undefined, symbol: string | undefined) {
diff --git a/packages/ethers/CHANGELOG.md b/packages/ethers/CHANGELOG.md
index 6fba10a406..a9e6754c83 100644
--- a/packages/ethers/CHANGELOG.md
+++ b/packages/ethers/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @web3modal/ethers
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/scaffold@4.0.4
+  - @web3modal/polyfills@4.0.4
+  - @web3modal/scaffold-react@4.0.4
+  - @web3modal/scaffold-utils@4.0.4
+  - @web3modal/scaffold-vue@4.0.4
+  - @web3modal/siwe@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/ethers/exports/react.tsx b/packages/ethers/exports/react.tsx
index 77738a96fb..58ae46920d 100644
--- a/packages/ethers/exports/react.tsx
+++ b/packages/ethers/exports/react.tsx
@@ -49,6 +49,16 @@ export function useDisconnect() {
   }
 }
 
+export function useSwitchNetwork() {
+  async function switchNetwork(chainId: number) {
+    await modal?.switchNetwork(chainId)
+  }
+
+  return {
+    switchNetwork
+  }
+}
+
 export function useWeb3ModalAccount() {
   const { address, isConnected, chainId } = useSnapshot(EthersStoreUtil.state)
 
diff --git a/packages/ethers/exports/vue.ts b/packages/ethers/exports/vue.ts
index 34fb06bc89..a009cfdffd 100644
--- a/packages/ethers/exports/vue.ts
+++ b/packages/ethers/exports/vue.ts
@@ -56,6 +56,16 @@ export function useDisconnect() {
   }
 }
 
+export function useSwitchNetwork() {
+  async function switchNetwork(chainId: number) {
+    await modal?.switchNetwork(chainId)
+  }
+
+  return {
+    switchNetwork
+  }
+}
+
 export function useWeb3ModalAccount() {
   if (!modal) {
     throw new Error('Please call "createWeb3Modal" before using "useWeb3ModalAccount" composition')
diff --git a/packages/ethers/package.json b/packages/ethers/package.json
index cd0c07afcf..40f0022896 100644
--- a/packages/ethers/package.json
+++ b/packages/ethers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/ethers",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -45,11 +45,11 @@
   "dependencies": {
     "@coinbase/wallet-sdk": "3.9.1",
     "@walletconnect/ethereum-provider": "2.11.1",
-    "@web3modal/polyfills": "4.0.3",
-    "@web3modal/scaffold": "4.0.3",
-    "@web3modal/scaffold-react": "4.0.3",
-    "@web3modal/scaffold-utils": "4.0.3",
-    "@web3modal/scaffold-vue": "4.0.3",
+    "@web3modal/polyfills": "4.0.4",
+    "@web3modal/scaffold": "4.0.4",
+    "@web3modal/scaffold-react": "4.0.4",
+    "@web3modal/scaffold-utils": "4.0.4",
+    "@web3modal/scaffold-vue": "4.0.4",
     "valtio": "1.11.2"
   },
   "peerDependencies": {
@@ -81,7 +81,7 @@
     }
   },
   "optionalDependencies": {
-    "@web3modal/siwe": "4.0.3",
+    "@web3modal/siwe": "4.0.4",
     "react": ">=17",
     "react-dom": ">=17",
     "vue": ">=3"
diff --git a/packages/ethers/src/client.ts b/packages/ethers/src/client.ts
index 86ef8e5df8..23bfd85620 100644
--- a/packages/ethers/src/client.ts
+++ b/packages/ethers/src/client.ts
@@ -860,13 +860,14 @@ export class Web3Modal extends Web3ModalScaffold {
         if (jsonRpcProvider) {
           const balance = await jsonRpcProvider.getBalance(address)
           const formattedBalance = formatEther(balance)
+
           this.setBalance(formattedBalance, chain.currency)
         }
       }
     }
   }
 
-  private async switchNetwork(chainId: number) {
+  public async switchNetwork(chainId: number) {
     const provider = EthersStoreUtil.state.provider
     const providerType = EthersStoreUtil.state.providerType
     if (this.chains) {
diff --git a/packages/ethers5/CHANGELOG.md b/packages/ethers5/CHANGELOG.md
index 3e48c377a6..3b119d2411 100644
--- a/packages/ethers5/CHANGELOG.md
+++ b/packages/ethers5/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @web3modal/ethers5
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/scaffold@4.0.4
+  - @web3modal/polyfills@4.0.4
+  - @web3modal/scaffold-react@4.0.4
+  - @web3modal/scaffold-utils@4.0.4
+  - @web3modal/scaffold-vue@4.0.4
+  - @web3modal/siwe@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/ethers5/exports/react.tsx b/packages/ethers5/exports/react.tsx
index b50a8b00d6..599b508e8c 100644
--- a/packages/ethers5/exports/react.tsx
+++ b/packages/ethers5/exports/react.tsx
@@ -49,6 +49,16 @@ export function useDisconnect() {
   }
 }
 
+export function useSwitchNetwork() {
+  async function switchNetwork(chainId: number) {
+    await modal?.switchNetwork(chainId)
+  }
+
+  return {
+    switchNetwork
+  }
+}
+
 export function useWeb3ModalAccount() {
   const { address, isConnected, chainId } = useSnapshot(EthersStoreUtil.state)
 
diff --git a/packages/ethers5/exports/vue.ts b/packages/ethers5/exports/vue.ts
index 6cdf0ebe72..1ab5816ff7 100644
--- a/packages/ethers5/exports/vue.ts
+++ b/packages/ethers5/exports/vue.ts
@@ -58,6 +58,16 @@ export function useDisconnect() {
   }
 }
 
+export function useSwitchNetwork() {
+  async function switchNetwork(chainId: number) {
+    await modal?.switchNetwork(chainId)
+  }
+
+  return {
+    switchNetwork
+  }
+}
+
 export function useWeb3ModalAccount() {
   if (!modal) {
     throw new Error('Please call "createWeb3Modal" before using "useWeb3ModalAccount" composition')
diff --git a/packages/ethers5/package.json b/packages/ethers5/package.json
index cde1c3fb80..0b6bc7be8c 100644
--- a/packages/ethers5/package.json
+++ b/packages/ethers5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/ethers5",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -45,11 +45,11 @@
   "dependencies": {
     "@coinbase/wallet-sdk": "3.9.1",
     "@walletconnect/ethereum-provider": "2.11.1",
-    "@web3modal/polyfills": "4.0.3",
-    "@web3modal/scaffold": "4.0.3",
-    "@web3modal/scaffold-react": "4.0.3",
-    "@web3modal/scaffold-utils": "4.0.3",
-    "@web3modal/scaffold-vue": "4.0.3",
+    "@web3modal/polyfills": "4.0.4",
+    "@web3modal/scaffold": "4.0.4",
+    "@web3modal/scaffold-react": "4.0.4",
+    "@web3modal/scaffold-utils": "4.0.4",
+    "@web3modal/scaffold-vue": "4.0.4",
     "valtio": "1.11.2"
   },
   "devDependencies": {
@@ -81,7 +81,7 @@
     }
   },
   "optionalDependencies": {
-    "@web3modal/siwe": "4.0.3",
+    "@web3modal/siwe": "4.0.4",
     "react": ">=17",
     "react-dom": ">=17",
     "vue": ">=3"
diff --git a/packages/ethers5/src/client.ts b/packages/ethers5/src/client.ts
index dc693b0648..d0f3372f24 100644
--- a/packages/ethers5/src/client.ts
+++ b/packages/ethers5/src/client.ts
@@ -799,7 +799,7 @@ export class Web3Modal extends Web3ModalScaffold {
     }
   }
 
-  private async switchNetwork(chainId: number) {
+  public async switchNetwork(chainId: number) {
     const provider = EthersStoreUtil.state.provider
     const providerType = EthersStoreUtil.state.providerType
     if (this.chains) {
diff --git a/packages/polyfills/CHANGELOG.md b/packages/polyfills/CHANGELOG.md
index d870ec9fff..29b5ca7675 100644
--- a/packages/polyfills/CHANGELOG.md
+++ b/packages/polyfills/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/polyfills
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json
index 538fc92874..c4c291ff81 100644
--- a/packages/polyfills/package.json
+++ b/packages/polyfills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/polyfills",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
diff --git a/packages/scaffold-react/CHANGELOG.md b/packages/scaffold-react/CHANGELOG.md
index 3e2d426b1d..9ef61208e7 100644
--- a/packages/scaffold-react/CHANGELOG.md
+++ b/packages/scaffold-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @web3modal/scaffold-react
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/scaffold@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/scaffold-react/package.json b/packages/scaffold-react/package.json
index a73e7186e2..2e1e1dca80 100644
--- a/packages/scaffold-react/package.json
+++ b/packages/scaffold-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/scaffold-react",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -16,7 +16,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/scaffold": "4.0.3"
+    "@web3modal/scaffold": "4.0.4"
   },
   "peerDependencies": {
     "react": ">=17",
diff --git a/packages/scaffold-utils/CHANGELOG.md b/packages/scaffold-utils/CHANGELOG.md
index b632361ca5..12224b9706 100644
--- a/packages/scaffold-utils/CHANGELOG.md
+++ b/packages/scaffold-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @web3modal/scaffold-utils
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/scaffold@4.0.4
+  - @web3modal/polyfills@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/scaffold-utils/package.json b/packages/scaffold-utils/package.json
index 1ea116e07a..1ef151b120 100644
--- a/packages/scaffold-utils/package.json
+++ b/packages/scaffold-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/scaffold-utils",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -35,8 +35,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/polyfills": "4.0.3",
-    "@web3modal/scaffold": "4.0.3",
+    "@web3modal/polyfills": "4.0.4",
+    "@web3modal/scaffold": "4.0.4",
     "valtio": "1.11.2"
   },
   "keywords": [
diff --git a/packages/scaffold-utils/src/ConstantsUtil.ts b/packages/scaffold-utils/src/ConstantsUtil.ts
index 9257bb0614..0d3babcda7 100644
--- a/packages/scaffold-utils/src/ConstantsUtil.ts
+++ b/packages/scaffold-utils/src/ConstantsUtil.ts
@@ -11,5 +11,5 @@ export const ConstantsUtil = {
   ADD_CHAIN_METHOD: 'wallet_addEthereumChain',
   EIP6963_ANNOUNCE_EVENT: 'eip6963:announceProvider',
   EIP6963_REQUEST_EVENT: 'eip6963:requestProvider',
-  VERSION: '4.0.3'
+  VERSION: '4.0.4'
 }
diff --git a/packages/scaffold-vue/CHANGELOG.md b/packages/scaffold-vue/CHANGELOG.md
index 86529eda8b..faa78cf85f 100644
--- a/packages/scaffold-vue/CHANGELOG.md
+++ b/packages/scaffold-vue/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @web3modal/scaffold-vue
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/scaffold@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/scaffold-vue/package.json b/packages/scaffold-vue/package.json
index 0bd2d1a64f..ae7a6a5cee 100644
--- a/packages/scaffold-vue/package.json
+++ b/packages/scaffold-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/scaffold-vue",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -16,7 +16,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/scaffold": "4.0.3"
+    "@web3modal/scaffold": "4.0.4"
   },
   "peerDependencies": {
     "vue": ">=3"
diff --git a/packages/scaffold/CHANGELOG.md b/packages/scaffold/CHANGELOG.md
index 41fea8bbfc..5f099b0fde 100644
--- a/packages/scaffold/CHANGELOG.md
+++ b/packages/scaffold/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @web3modal/scaffold
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/core@4.0.4
+  - @web3modal/common@4.0.4
+  - @web3modal/ui@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/scaffold/package.json b/packages/scaffold/package.json
index 3b135b95f6..d175019c24 100644
--- a/packages/scaffold/package.json
+++ b/packages/scaffold/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/scaffold",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -16,13 +16,13 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/common": "4.0.3",
-    "@web3modal/core": "4.0.3",
-    "@web3modal/ui": "4.0.3",
+    "@web3modal/common": "4.0.4",
+    "@web3modal/core": "4.0.4",
+    "@web3modal/ui": "4.0.4",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@web3modal/wallet": "4.0.3"
+    "@web3modal/wallet": "4.0.4"
   },
   "keywords": [
     "web3",
diff --git a/packages/scaffold/src/client.ts b/packages/scaffold/src/client.ts
index e3d760a4a6..c9c050b5c5 100644
--- a/packages/scaffold/src/client.ts
+++ b/packages/scaffold/src/client.ts
@@ -96,33 +96,11 @@ export class Web3ModalScaffold {
   public setThemeMode(themeMode: ThemeControllerState['themeMode']) {
     ThemeController.setThemeMode(themeMode)
     setColorTheme(ThemeController.state.themeMode)
-    try {
-      const emailConnector = ConnectorController.getEmailConnector()
-      if (emailConnector) {
-        emailConnector.provider.syncTheme({
-          themeMode: ThemeController.getSnapshot().themeMode
-        })
-      }
-    } catch {
-      // eslint-disable-next-line no-console
-      console.info('Unable to sync theme to email connector')
-    }
   }
 
   public setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
     ThemeController.setThemeVariables(themeVariables)
     setThemeVariables(ThemeController.state.themeVariables)
-    try {
-      const emailConnector = ConnectorController.getEmailConnector()
-      if (emailConnector) {
-        emailConnector.provider.syncTheme({
-          themeVariables: ThemeController.getSnapshot().themeVariables
-        })
-      }
-    } catch {
-      // eslint-disable-next-line no-console
-      console.info('Unable to sync theme to email connector')
-    }
   }
 
   public subscribeTheme(callback: (newState: ThemeControllerState) => void) {
diff --git a/packages/siwe/CHANGELOG.md b/packages/siwe/CHANGELOG.md
index fd1ccc451c..1abf406c60 100644
--- a/packages/siwe/CHANGELOG.md
+++ b/packages/siwe/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @web3modal/siwe
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/core@4.0.4
+  - @web3modal/scaffold-utils@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/siwe/package.json b/packages/siwe/package.json
index a499f0d63f..a962c7fcce 100644
--- a/packages/siwe/package.json
+++ b/packages/siwe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/siwe",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -16,8 +16,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/core": "4.0.3",
-    "@web3modal/scaffold-utils": "4.0.3"
+    "@web3modal/core": "4.0.4",
+    "@web3modal/scaffold-utils": "4.0.4"
   },
   "peerDependencies": {
     "react": ">=17",
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
index 355a3c363f..fbafad52aa 100644
--- a/packages/ui/CHANGELOG.md
+++ b/packages/ui/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/ui
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/ui/package.json b/packages/ui/package.json
index c7afc7eab1..ff3ea5ac74 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/ui",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/qrcode": "1.5.5",
-    "@web3modal/common": "4.0.3",
+    "@web3modal/common": "4.0.4",
     "eslint-plugin-lit": "1.11.0",
     "eslint-plugin-wc": "2.0.4"
   },
diff --git a/packages/wagmi/CHANGELOG.md b/packages/wagmi/CHANGELOG.md
index e3aa43a878..d05dfe150b 100644
--- a/packages/wagmi/CHANGELOG.md
+++ b/packages/wagmi/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @web3modal/wagmi
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
+- Updated dependencies []:
+  - @web3modal/scaffold@4.0.4
+  - @web3modal/polyfills@4.0.4
+  - @web3modal/scaffold-react@4.0.4
+  - @web3modal/scaffold-utils@4.0.4
+  - @web3modal/scaffold-vue@4.0.4
+  - @web3modal/siwe@4.0.4
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/wagmi/package.json b/packages/wagmi/package.json
index 1a003b4cd1..c658c504df 100644
--- a/packages/wagmi/package.json
+++ b/packages/wagmi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/wagmi",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -51,11 +51,11 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/polyfills": "4.0.3",
-    "@web3modal/scaffold": "4.0.3",
-    "@web3modal/scaffold-react": "4.0.3",
-    "@web3modal/scaffold-utils": "4.0.3",
-    "@web3modal/scaffold-vue": "4.0.3"
+    "@web3modal/polyfills": "4.0.4",
+    "@web3modal/scaffold": "4.0.4",
+    "@web3modal/scaffold-react": "4.0.4",
+    "@web3modal/scaffold-utils": "4.0.4",
+    "@web3modal/scaffold-vue": "4.0.4"
   },
   "devDependencies": {
     "@wagmi/connectors": "4.1.4",
@@ -90,7 +90,7 @@
     }
   },
   "optionalDependencies": {
-    "@web3modal/siwe": "4.0.3",
+    "@web3modal/siwe": "4.0.4",
     "react": ">=17",
     "react-dom": ">=17",
     "vue": ">=3"
diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts
index e1a5319d7d..ba1c90d303 100644
--- a/packages/wagmi/src/client.ts
+++ b/packages/wagmi/src/client.ts
@@ -384,9 +384,14 @@ export class Web3Modal extends Web3ModalScaffold {
   ) {
     if (typeof window !== 'undefined' && connector) {
       super.setLoading(true)
+
       const provider = (await connector.getProvider()) as W3mFrameProvider
       const isLoginEmailUsed = provider.getLoginEmailUsed()
       super.setLoading(isLoginEmailUsed)
+      if (isLoginEmailUsed) {
+        this.setIsConnected(false)
+      }
+
       provider.onRpcRequest(request => {
         if (!W3mFrameHelpers.checkIfRequestIsAllowed(request)) {
           super.open({ view: 'ApproveTransaction' })
@@ -396,6 +401,7 @@ export class Web3Modal extends Web3ModalScaffold {
         super.close()
       })
       provider.onIsConnected(() => {
+        this.setIsConnected(true)
         super.setLoading(false)
       })
     }
diff --git a/packages/wallet/CHANGELOG.md b/packages/wallet/CHANGELOG.md
index 5d61bc2e13..2fc9beec1b 100644
--- a/packages/wallet/CHANGELOG.md
+++ b/packages/wallet/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/wallet
 
+## 4.0.4
+
+### Patch Changes
+
+- Fix theming issue for email
+
 ## 4.0.3
 
 ### Patch Changes
diff --git a/packages/wallet/package.json b/packages/wallet/package.json
index c72c05b5ed..bdc8e6d92f 100644
--- a/packages/wallet/package.json
+++ b/packages/wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/wallet",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",