diff --git a/frontend/bundle-config.json b/frontend/bundle-config.json
index d62c57d809..0e2c105326 100644
--- a/frontend/bundle-config.json
+++ b/frontend/bundle-config.json
@@ -2,11 +2,11 @@
     "order": [
         "main",
         "admin",
+        "extra",
         "crm",
         "chart",
         "calendar",
-        "timeline",
-        "extra"
+        "timeline"
     ],
     "basePath": "client",
     "transpiledPath": "client/lib/transpiled",
@@ -21,35 +21,50 @@
                 "src/loader.js"
             ],
             "patterns": [
-                "src/*.js",
-                "src/ui/**/*.js",
-                "src/views/*.js",
-                "src/views/site/*.js",
-                "src/views/fields/*.js",
-                "src/views/record/**/*.js",
-                "src/views/search/**/*.js",
-                "src/views/modals/*.js",
-                "src/views/dashlets/**/*.js",
-                "src/views/global-search/*.js",
-                "src/views/stream/**/*.js",
-                "src/views/note/**/*.js",
-                "src/views/notification/*.js",
-                "src/controllers/!(admin|inbound-email|layout-set|api-user|role|portal-role).js",
-                "src/models/*.js",
-                "src/collections/*.js",
-                "src/acl/*.js"
+                "src/**/*.js"
+            ],
+            "ignorePatterns": [
+                "src/views/admin/**/*.js",
+                "src/views/settings/**/*.js",
+                "src/views/authentication-provider/**/*.js",
+                "src/views/webhooks/**/*.js",
+                "src/views/templates/**/*.js",
+                "src/views/layout-set/**/*.js",
+                "src/views/role/**/*.js",
+                "src/views/portal-role/**/*.js",
+                "src/views/scheduled-job/**/*.js",
+                "src/views/lead-capture-log-record/**/*.js",
+                "src/views/inbound-email/**/*.js",
+                "src/views/extension/**/*.js",
+                "src/views/api-user/**/*.js",
+
+                "src/controllers/admin.js",
+                "src/controllers/role.js",
+                "src/controllers/portal-role.js",
+
+                "src/views/outbound-email/**/*.js",
+                "src/views/personal-data/**/*.js",
+                "src/views/portal/**/*.js",
+                "src/views/import/**/*.js",
+                "src/views/import-error/**/*.js",
+                "src/views/group-email-folder/**/*.js",
+                "src/views/external-account/**/*.js",
+                "src/views/email-account/**/*.js"
             ]
         },
         "admin": {
             "patterns": [
                 "src/views/admin/**/*.js",
+                "src/views/settings/**/*.js",
+                "src/views/api-user/**/*.js",
+                "src/views/extension/**/*.js",
                 "src/views/authentication-provider/**/*.js",
                 "src/views/inbound-email/**/*.js",
                 "src/views/templates/**/*.js",
                 "src/views/role/**/*.js",
                 "src/views/portal-role/**/*.js",
+                "src/views/portal/**/*.js",
                 "src/views/scheduled-job/**/*.js",
-                "src/views/lead-capture/**/*.js",
                 "src/views/lead-capture-log-record/**/*.js",
                 "src/views/webhooks/**/*.js",
                 "src/views/layout-set/**/*.js",
@@ -67,7 +82,8 @@
             ],
             "lookupPatterns": [
                 "modules/crm/src/**/*.js"
-            ]
+            ],
+            "noDuplicates": true
         },
         "chart": {
             "patterns": [
diff --git a/package-lock.json b/package-lock.json
index 74794746c6..3aaac56a60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55,7 +55,7 @@
       "devDependencies": {
         "archiver": "^5.3.0",
         "chromedriver": "^127.0.1",
-        "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.1.0",
+        "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.1.1",
         "fstream": ">=1.0.12",
         "glob": "^10.2.6",
         "grunt": "^1.5.3",
@@ -3256,8 +3256,8 @@
       }
     },
     "node_modules/espo-frontend-build-tools": {
-      "version": "0.1.0",
-      "resolved": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#4590acc6a7849f91f89c9ceab11581fbe099ed46",
+      "version": "0.1.1",
+      "resolved": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#7f4723b205cd35c602dc5c5aa81a21ad0a7ce0c1",
       "dev": true,
       "dependencies": {
         "@babel/cli": "^7.25.0",
@@ -9686,9 +9686,9 @@
       }
     },
     "espo-frontend-build-tools": {
-      "version": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#4590acc6a7849f91f89c9ceab11581fbe099ed46",
+      "version": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#7f4723b205cd35c602dc5c5aa81a21ad0a7ce0c1",
       "dev": true,
-      "from": "espo-frontend-build-tools@github:espocrm/frontend-build-tools#0.1.0",
+      "from": "espo-frontend-build-tools@github:espocrm/frontend-build-tools#0.1.1",
       "requires": {
         "@babel/cli": "^7.25.0",
         "@babel/core": "^7.25.0",
diff --git a/package.json b/package.json
index dffdde1388..d186a5784e 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "archiver": "^5.3.0",
     "chromedriver": "^127.0.1",
-    "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.1.0",
+    "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.1.1",
     "fstream": ">=1.0.12",
     "glob": "^10.2.6",
     "grunt": "^1.5.3",