diff --git a/.travis.yml b/.travis.yml
index 43f2c258e1d..ce038cf30b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 import:
   - source: Alfresco/alfresco-build-tools:.travis.docker_hub_login.yml@v1.1.1
-  
+
 git:
   depth: 3
   quiet: true
@@ -52,7 +52,7 @@ stages:
   - name: "Build lib"
     if: tag IS blank
   - name: "Check bundle"
-    if: type = push AND tag IS blank
+    if: type = push AND tag IS blank OR (type = cron || type = api)
   - name: "Trigger Alpha ADF child build"
     if: branch = develop AND (type = cron || type = api)
   - name: "Build Demo shell"
diff --git a/scripts/build/build-core.sh b/scripts/build/build-core.sh
index 9e29b02376d..0f6003fc1e7 100755
--- a/scripts/build/build-core.sh
+++ b/scripts/build/build-core.sh
@@ -38,3 +38,23 @@ npx scss-bundle -e "./lib/core/styles/prebuilt/adf-cyan-orange.scss" -o "./lib/d
 npx scss-bundle -e "./lib/core/styles/prebuilt/adf-green-orange.scss" -o ".lib/dist/core/prebuilt-themes/adf-green-orange.scss" -p "./"
 npx scss-bundle -e "./lib/core/styles/prebuilt/adf-indigo-pink.scss" -o "./lib/dist/core/prebuilt-themes/adf-indigo-pink.scss" -p "./"
 npx scss-bundle -e "./lib/core/styles/prebuilt/adf-purple-green.scss" -o "./lib/dist/core/prebuilt-themes/adf-purple-green.scss" -p "./"
+
+node-sass "./lib/dist/core/prebuilt-themes/adf-blue-orange.scss"  "./lib/dist/core/prebuilt-themes/adf-blue-orange.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-blue-purple.scss"  "./lib/dist/core/prebuilt-themes/adf-blue-purple.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-cyan-purple.scss"  "./lib/dist/core/prebuilt-themes/adf-cyan-purple.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-green-purple.scss"  "./lib/dist/core/prebuilt-themes/adf-green-purple.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-pink-bluegrey.scss"  "./lib/dist/core/prebuilt-themes/adf-pink-bluegrey.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-cyan-orange.scss"  "./lib/dist/core/prebuilt-themes/adf-cyan-orange.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-green-orange.scss"  "./lib/dist/core/prebuilt-themes/adf-green-orange.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-indigo-pink.scss"  "./lib/dist/core/prebuilt-themes/adf-indigo-pink.css"
+node-sass "./lib/dist/core/prebuilt-themes/adf-purple-green.scss"  "./lib/dist/core/prebuilt-themes/adf-purple-green.css"
+
+rm "./lib/dist/core/prebuilt-themes/adf-blue-orange.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-blue-purple.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-cyan-purple.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-green-purple.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-pink-bluegrey.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-cyan-orange.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-green-orange.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-indigo-pink.scss"
+rm "./lib/dist/core/prebuilt-themes/adf-purple-green.scss"