diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d80e56..65009dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.0.4
+- yves build process searches for common entry points in core, even when there is a target theme
+
 ### 2.0.3
 - `package.json` allows module's patch version improvements only
 
diff --git a/lib/automation/collector.js b/lib/automation/collector.js
index 29b048c..59dfd5c 100644
--- a/lib/automation/collector.js
+++ b/lib/automation/collector.js
@@ -75,13 +75,15 @@ module.exports = {
 
         if (!!themePattern) {
             return collect('entry points', [
-                path.join(cwd, `./assets/${targetPattern}/${themePattern}/**/*${context.patterns.entry()}`)
+                path.join(cwd, `./vendor/spryker/**/assets/${targetPattern}/**/*${context.patterns.entry()}`),
+                path.join(cwd, `./assets/${targetPattern}/${themePattern}/**/*${context.patterns.entry()}`),
+                path.join(cwd, `./src/Pyz/**/${targetPattern}/${themePattern}/**/*${context.patterns.entry()}`)
             ], context.patterns.entry());
         }
 
         return collect('entry points', [
-            path.join(cwd, `./assets/${targetPattern}/**/*${context.patterns.entry()}`),
             path.join(cwd, `./vendor/spryker/**/assets/${targetPattern}/**/*${context.patterns.entry()}`),
+            path.join(cwd, `./assets/${targetPattern}/**/*${context.patterns.entry()}`),
             path.join(cwd, `./src/Pyz/**/${targetPattern}/**/*${context.patterns.entry()}`)
         ], context.patterns.entry());
     }
diff --git a/package.json b/package.json
index 6d05950..5bef30b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antelope",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Spryker frontend automation tool",
   "main": "antelope.js",
   "preferGlobal": "true",