diff --git a/demo-shell/package.json b/demo-shell/package.json
index cda76e467a..00d05600bc 100644
--- a/demo-shell/package.json
+++ b/demo-shell/package.json
@@ -10,7 +10,7 @@
     "start:dev": " npm run lint && npm run server-versions && rimraf dist && npm run clean-lib-angular && concurrently \"ng serve --host 0.0.0.0 --disable-host-check --app dev pp-dev --proxy-config proxy.conf.js --open\" \"npm run style:dev --watch\" \"npm run copy:dev\" ",
     "start:dist": "npm run server-versions && rimraf dist && node --max_old_space_size=30000 node_modules/.bin/ng serve --prod --build-optimizer=false  --aot=false --host 0.0.0.0 --disable-host-check --app dist",
     "build": "npm run validate-config && npm run server-versions && rimraf dist && ng build  --app dist",
-    "build:dev": "npm run validate-config && npm run lint && npm run style:dev && npm run server-versions && rimraf dist && ng build --app dev",
+    "build:dev": "npm run validate-config && npm run lint && npm run style:dev && npm run server-versions && rimraf dist && ng build  --prod --app dev",
     "build:dist": "npm run validate-config && npm run style:dev && npm run server-versions && rimraf dist && node --max_old_space_size=30000 node_modules/.bin/ng build --prod  --build-optimizer=false  --aot=false --app dist",
     "style:dev": "npm run webpack -- --config  config/webpack.style.js --progress --profile --bail",
     "copy:dev": "node ./config/dev-copy-watch.js",
diff --git a/lib/config/bundle-scss-new.js b/lib/config/bundle-scss-new.js
index af8f5054cd..9117dfd578 100644
--- a/lib/config/bundle-scss-new.js
+++ b/lib/config/bundle-scss-new.js
@@ -4,22 +4,22 @@ var mkdirpSync = require('fs-extra').mkdirpSync;
 
  new Bundler().Bundle('./core/styles/_index.scss', '**/*.scss').then(result => {
     mkdirpSync('core');
-    writeFileSync('core/dist/_theming.scss', result.bundledContent);
+    writeFileSync('dist/core/_theming.scss', result.bundledContent);
 });
 
  new Bundler().Bundle('./insights/styles/_index.scss', '**/*.scss').then(result => {
     mkdirpSync('insights');
-    writeFileSync('insights/dist/_theming.scss', result.bundledContent);
+    writeFileSync('dist/insights/_theming.scss', result.bundledContent);
 });
 
 
  new Bundler().Bundle('./process-services/styles/_index.scss', '**/*.scss').then(result => {
     mkdirpSync('process-services');
-    writeFileSync('process-services/dist/_theming.scss', result.bundledContent);
+    writeFileSync('dist/process-services/_theming.scss', result.bundledContent);
 });
 
  new Bundler().Bundle('./content-services/styles/_index.scss', '**/*.scss').then(result => {
     mkdirpSync('content-services');
-    writeFileSync('content-services/dist/_theming.scss', result.bundledContent);
+    writeFileSync('dist/content-services/_theming.scss', result.bundledContent);
 });
 
diff --git a/scripts/npm-check-bundles.sh b/scripts/npm-check-bundles.sh
index 51eaee867e..e53b125833 100755
--- a/scripts/npm-check-bundles.sh
+++ b/scripts/npm-check-bundles.sh
@@ -67,7 +67,7 @@ do
          echo "prebuilt-theme ok!"
     fi
 
-    if [ ! -f package/'schema.json' ]; then
+    if [ ! -f package/'app.config.schema.json' ]; then
         error_out '31;1'  "$PACKAGE schema not found!" >&2
         exit 1
     else
@@ -129,7 +129,6 @@ do
 done
  cd ..
 
-rm -rf temp
 
 set_npm_registry