diff --git a/package.json b/package.json
index 32529ef60..6e1865a53 100644
--- a/package.json
+++ b/package.json
@@ -1,207 +1,210 @@
 {
-  "name": "scullyio",
-  "version": "2.1.18",
-  "license": "MIT",
-  "url": "",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/scullyio/scully.git"
-  },
-  "engines": {
-    "": "This is for building scully itself, using is fine with 12+",
-    "node": ">=14"
-  },
-  "scripts": {
-    "nx": "nx",
-    "start": "nx serve",
-    "build": "nx build",
-    "build:scully": "nx build scully",
-    "build:code": "nx run-many --target=build --all --configuration production ",
-    "build:tools": "tsc -p tools/tsconfig.tools.json",
-    "build:sample": "npm run scully -- --project sample-blog --tds --RSD --scan --404=index --ks",
-    "build:pw-sample": "npm run scully -- --project pw-sample-blog --tds --RSD --scan --404=index --ks",
-    "build:uni": "npm run scully -- --project sps-sample --RSD --tds --scan --ks",
-    "build:docs": "npm run scully -- --project scully-docs --RSD --404=index --scan --ks",
-    "scully": "node ./dist/libs/scully/src/scully.js",
-    "test": "run-s build:code symlinks server:kill build:docs server:kill build:sample  jest:test cypress:e2e:server",
-    "test:noBuild": "run-s server:kill build:docs server:kill build:sample  jest:test cypress:e2e",
-    "lint": "nx workspace-lint && nx lint",
-    "server:wait": "wait-on tcp:1668",
-    "server:testSample": "npm run server:sample &",
-    "server:testDocs": "npm run server:docs &",
-    "server:sample": "npm run scully -- serve --project sample-blog --tds  --404=baseOnly --noCache",
-    "server:pw-sample": "npm run scully -- serve --project pw-sample-blog --tds  --404=baseOnly --noCache",
-    "server:uni": "npm run scully -- serve --project sps-sample --tds  --404=baseOnly --noCache",
-    "server:docs": "npm run scully -- serve --project scully-docs --tds  --noCache",
-    "server:kill": "npm run scully -- killServer ",
-    "e2e": "nx e2e",
-    "docs": "run-s server:kill build:code symlinks build:docs deploy:docs",
-    "debug": "nodemon --legacy-watch --watch ./dist/libs/scully --inspect=0.0.0.0:5858 --nolazy \"./dist/libs/scully/src/scully --pr sample-blog\"",
-    "nozspredeb": "npm run build:scully",
-    "nopreduration": "npx tsc -m commonjs scully.sample-blog.config.ts",
-    "duration": "rm scully.log && npm run scully -- --cf=scully.heavy.config.ts --tds --RSD ",
-    "deb": "node --inspect=0.0.0.0:5858 --nolazy ./dist/libs/scully/src/scully --pr sample-blog",
-    "deploy:docs": "echo No deploy script yet",
-    "affected:apps": "nx affected:apps",
-    "affected:libs": "nx affected:libs",
-    "affected:build": "nx affected:build",
-    "affected:e2e": "nx affected:e2e",
-    "affected:test": "nx affected:test",
-    "affected:lint": "nx affected:lint",
-    "affected:dep-graph": "nx affected:dep-graph",
-    "affected": "nx affected",
-    "format": "nx format:write",
-    "format:write": "nx format:write",
-    "format:check": "nx format:check",
-    "update": "nx migrate latest",
-    "dep-graph": "nx dep-graph",
-    "help": "nx help",
-    "postinstall": "ngcc --properties es2015 browser module main && npm run symlinks && git update-index --skip-worktree tests/assets/blog-files/page-6.md",
-    "cypress:install": "cypress install",
-    "cypress:e2e": "cypress run --spec 'tests/cypress/integration/**/*' --browser chrome --headless",
-    "cypress:e2e:server": "start-server-and-test scully:run:cypress http://localhost:1668 cypress:e2e",
-    "scully:run:cypress": "node ./dist/libs/scully/src/scully serve --project=sample-blog --tds --silent",
-    "symlinks": "npx symlink-dir ./dist/libs ./node_modules/@scullyio",
-    "jest:test": "npx jest",
-    "changelog": "npx conventional-changelog -p scully -i ./CHANGELOG.md -s && git add ./CHANGELOG.md",
-    "commit": "git add . && npx git-cz",
-    "commit:select": "npx git-cz",
-    "fullPublish": "nx workspace-schematic publish",
-    "full-build": "npm i && npm run symlinks && npm run build:code && npm run build:sample && npm run build:docs && npm run jest:test && npm run cypress:e2e:server",
-    "workspace-generator": "nx workspace-generator",
-    "auto-publish-nightly": "tsc -p tools/tsconfig.tools.json && cp tools/package.json dist/tools/. && node dist/tools/autoVersion",
-    "bumpAndTag": "tsc -p tools/tsconfig.tools.json && cp tools/package.json dist/tools/. && node dist/tools/bumpAndTag.js",
-    "doPublish": "tsc -p tools/tsconfig.tools.json && cp tools/package.json dist/tools/. && node dist/tools/publishCurrent.js",
-    "prepare": "husky install"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "12.2.6",
-    "@angular/common": "12.2.6",
-    "@angular/compiler": "12.2.6",
-    "@angular/core": "12.2.6",
-    "@angular/forms": "12.2.6",
-    "@angular/platform-browser": "12.2.6",
-    "@angular/platform-browser-dynamic": "12.2.6",
-    "@angular/platform-server": "^12.2.6",
-    "@angular/router": "12.2.6",
-    "@nrwl/nx-cloud": "^12.3.13",
-    "@sentry/node": "^6.12.0",
-    "@types/compression": "^1.7.2",
-    "@types/cors": "^2.8.12",
-    "@types/minimatch": "^3.0.5",
-    "@types/semver": "^7.3.8",
-    "@types/ws": "^7.4.7",
-    "asciidoctor": "^2.2.5",
-    "chalk": "^4.1.2",
-    "compression": "^1.7.4",
-    "core-js": "^3.17.3",
-    "cors": "^2.8.5",
-    "critical": "^4.0.1",
-    "critters": "^0.0.14",
-    "cz-customizable": "^6.3.0",
-    "express": "4.17.1",
-    "got": "^11.8.2",
-    "jest-preset-angular": "10.0.0",
-    "js-yaml": "^4.1.0",
-    "level": "^7.0.0",
-    "lint-staged": "^12.1.2",
-    "minimatch": "^3.0.4",
-    "npm-run-all": "^4.1.5",
-    "os": "^0.1.2",
-    "playwright": "^1.17.1",
-    "prismjs": "^1.27.0",
-    "puppeteer": "^10.2.0",
-    "rxjs": "^7.3.0",
-    "semver": "^7.3.5",
-    "tslib": "^2.0.0",
-    "ws": "^8.2.2",
-    "zone.js": "0.11.4"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "12.2.6",
-    "@angular-devkit/core": "^12.2.6",
-    "@angular-eslint/eslint-plugin": "~12.3.0",
-    "@angular-eslint/eslint-plugin-template": "~12.3.0",
-    "@angular-eslint/template-parser": "~12.3.0",
-    "@angular/cli": "12.2.6",
-    "@angular/compiler-cli": "12.2.6",
-    "@angular/language-service": "12.2.6",
-    "@commitlint/cli": "11.0.0",
-    "@commitlint/config-angular": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
-    "@jest/globals": "^27.2.0",
-    "@nrwl/angular": "12.9.0",
-    "@nrwl/cli": "12.9.0",
-    "@nrwl/cypress": "12.9.0",
-    "@nrwl/eslint-plugin-nx": "12.9.0",
-    "@nrwl/express": "12.9.0",
-    "@nrwl/jest": "12.9.0",
-    "@nrwl/node": "12.9.0",
-    "@nrwl/workspace": "12.10.0",
-    "@octokit/rest": "^18.12.0",
-    "@types/chalk": "^2.2.0",
-    "@types/express": "4.17.13",
-    "@types/fs-extra": "^9.0.12",
-    "@types/http-proxy-middleware": "^0.19.3",
-    "@types/jasmine": "3.9.1",
-    "@types/jasminewd2": "^2.0.10",
-    "@types/jest": "27.0.1",
-    "@types/js-yaml": "^4.0.3",
-    "@types/jsdom": "^16.2.13",
-    "@types/json5": "^0.0.30",
-    "@types/marked": "^4.0.1",
-    "@types/node": "^14.17.17",
-    "@types/path-to-regexp": "^1.7.0",
-    "@types/request": "^2.48.7",
-    "@types/yamljs": "^0.2.31",
-    "@types/yargs": "^17.0.7",
-    "@typescript-eslint/eslint-plugin": "4.31.1",
-    "@typescript-eslint/parser": "4.31.1",
-    "codelyzer": "6.0.1",
-    "conventional-changelog": "^3.1.24",
-    "cypress": "^8.4.0",
-    "cz-conventional-changelog": "^3.3.0",
-    "dotenv": "10.0.0",
-    "eslint": "7.32.0",
-    "eslint-config-prettier": "8.3.0",
-    "front-matter": "^4.0.2",
-    "fs-extra": "^9.1.0",
-    "guess-parser": "^0.4.22",
-    "http-proxy-middleware": "^2.0.1",
-    "husky": "^7.0.4",
-    "jasmine-core": "3.9.0",
-    "jasmine-spec-reporter": "7.0.0",
-    "jest": "27.2.0",
-    "jest-preset-angular": "9.0.7",
-    "jest-serializer-html": "^7.1.0",
-    "jsdom": "^17.0.0",
-    "jsonc": "^2.0.0",
-    "marked": "^4.0.10",
-    "ng-packagr": "12.2.1",
-    "nodemon": "^2.0.12",
-    "open": "^8.2.1",
-    "osascript": "^1.2.0",
-    "path-to-regexp": "^6.2.0",
-    "prettier": "2.4.1",
-    "pretty-quick": "^3.1.1",
-    "protractor": "7.0.0",
-    "simple-git": "^2.48.0",
-    "start-server-and-test": "^1.14.0",
-    "symlink-dir": "^5.0.1",
-    "ts-jest": "27.0.5",
-    "ts-node": "^10.2.1",
-    "tsickle": "^0.43.0",
-    "tslib": "^2.3.1",
-    "typescript": "4.3.5",
-    "wait-on": "^6.0.0",
-    "yamljs": "^0.3.0",
-    "yargs": "^17.2.1"
-  },
-  "lint-staged": {
-    "*.{js,json,css,scss,ts,html,component.html}": [
-      "prettier --write",
-      "git add"
-    ]
-  }
-}
\ No newline at end of file
+    "name": "scullyio",
+    "version": "2.1.18",
+    "license": "MIT",
+    "url": "",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/scullyio/scully.git"
+    },
+    "engines": {
+        "": "This is for building scully itself, using is fine with 12+",
+        "node": ">=14"
+    },
+    "scripts": {
+        "nx": "nx",
+        "start": "nx serve",
+        "build": "nx build",
+        "build:scully": "nx build scully",
+        "build:code": "nx run-many --target=build --all --configuration production ",
+        "build:tools": "tsc -p tools/tsconfig.tools.json",
+        "build:sample": "npm run scully -- --project sample-blog --tds --RSD --scan --404=index --ks",
+        "build:pw-sample": "npm run scully -- --project pw-sample-blog --tds --RSD --scan --404=index --ks",
+        "build:uni": "npm run scully -- --project sps-sample --RSD --tds --scan --ks",
+        "build:docs": "npm run scully -- --project scully-docs --RSD --404=index --scan --ks",
+        "scully": "node ./dist/libs/scully/src/scully.js",
+        "test": "run-s build:code symlinks server:kill build:docs server:kill build:sample  jest:test cypress:e2e:server",
+        "test:noBuild": "run-s server:kill build:docs server:kill build:sample  jest:test cypress:e2e",
+        "lint": "nx workspace-lint && nx lint",
+        "server:wait": "wait-on tcp:1668",
+        "server:testSample": "npm run server:sample &",
+        "server:testDocs": "npm run server:docs &",
+        "server:sample": "npm run scully -- serve --project sample-blog --tds  --404=baseOnly --noCache",
+        "server:pw-sample": "npm run scully -- serve --project pw-sample-blog --tds  --404=baseOnly --noCache",
+        "server:uni": "npm run scully -- serve --project sps-sample --tds  --404=baseOnly --noCache",
+        "server:docs": "npm run scully -- serve --project scully-docs --tds  --noCache",
+        "server:kill": "npm run scully -- killServer ",
+        "e2e": "nx e2e",
+        "docs": "run-s server:kill build:code symlinks build:docs deploy:docs",
+        "debug": "nodemon --legacy-watch --watch ./dist/libs/scully --inspect=0.0.0.0:5858 --nolazy \"./dist/libs/scully/src/scully --pr sample-blog\"",
+        "nozspredeb": "npm run build:scully",
+        "nopreduration": "npx tsc -m commonjs scully.sample-blog.config.ts",
+        "duration": "rm scully.log && npm run scully -- --cf=scully.heavy.config.ts --tds --RSD ",
+        "deb": "node --inspect=0.0.0.0:5858 --nolazy ./dist/libs/scully/src/scully --pr sample-blog",
+        "deploy:docs": "echo No deploy script yet",
+        "affected:apps": "nx affected:apps",
+        "affected:libs": "nx affected:libs",
+        "affected:build": "nx affected:build",
+        "affected:e2e": "nx affected:e2e",
+        "affected:test": "nx affected:test",
+        "affected:lint": "nx affected:lint",
+        "affected:dep-graph": "nx affected:dep-graph",
+        "affected": "nx affected",
+        "format": "nx format:write",
+        "format:write": "nx format:write",
+        "format:check": "nx format:check",
+        "update": "nx migrate latest",
+        "dep-graph": "nx dep-graph",
+        "help": "nx help",
+        "postinstall": "ngcc --properties es2015 browser module main && npm run symlinks && git update-index --skip-worktree tests/assets/blog-files/page-6.md",
+        "cypress:install": "cypress install",
+        "cypress:e2e": "cypress run --spec 'tests/cypress/integration/**/*' --browser chrome --headless",
+        "cypress:e2e:server": "start-server-and-test scully:run:cypress http://localhost:1668 cypress:e2e",
+        "scully:run:cypress": "node ./dist/libs/scully/src/scully serve --project=sample-blog --tds --silent",
+        "symlinks": "npx symlink-dir ./dist/libs ./node_modules/@scullyio",
+        "jest:test": "npx jest",
+        "changelog": "npx conventional-changelog -p scully -i ./CHANGELOG.md -s && git add ./CHANGELOG.md",
+        "commit": "git add . && npx git-cz",
+        "commit:select": "npx git-cz",
+        "fullPublish": "nx workspace-schematic publish",
+        "full-build": "npm i && npm run symlinks && npm run build:code && npm run build:sample && npm run build:docs && npm run jest:test && npm run cypress:e2e:server",
+        "workspace-generator": "nx workspace-generator",
+        "auto-publish-nightly": "tsc -p tools/tsconfig.tools.json && cp tools/package.json dist/tools/. && node dist/tools/autoVersion",
+        "bumpAndTag": "tsc -p tools/tsconfig.tools.json && cp tools/package.json dist/tools/. && node dist/tools/bumpAndTag.js",
+        "doPublish": "tsc -p tools/tsconfig.tools.json && cp tools/package.json dist/tools/. && node dist/tools/publishCurrent.js",
+        "prepare": "husky install"
+    },
+    "private": true,
+    "dependencies": {
+        "@angular/animations": "12.2.6",
+        "@angular/common": "12.2.6",
+        "@angular/compiler": "12.2.6",
+        "@angular/core": "12.2.6",
+        "@angular/forms": "12.2.6",
+        "@angular/platform-browser": "12.2.6",
+        "@angular/platform-browser-dynamic": "12.2.6",
+        "@angular/platform-server": "^12.2.6",
+        "@angular/router": "12.2.6",
+        "@nrwl/nx-cloud": "^12.3.13",
+        "@sentry/node": "^6.12.0",
+        "@types/compression": "^1.7.2",
+        "@types/cors": "^2.8.12",
+        "@types/minimatch": "^3.0.5",
+        "@types/semver": "^7.3.8",
+        "@types/ws": "^7.4.7",
+        "asciidoctor": "^2.2.5",
+        "chalk": "^4.1.2",
+        "compression": "^1.7.4",
+        "core-js": "^3.17.3",
+        "cors": "^2.8.5",
+        "critical": "^4.0.1",
+        "critters": "^0.0.14",
+        "cz-customizable": "^6.3.0",
+        "express": "4.17.1",
+        "got": "^11.8.2",
+        "jest-preset-angular": "10.0.0",
+        "js-yaml": "^4.1.0",
+        "level": "^7.0.0",
+        "lint-staged": "^12.1.2",
+        "minimatch": "^3.0.4",
+        "npm-run-all": "^4.1.5",
+        "os": "^0.1.2",
+        "playwright": "^1.17.1",
+        "prismjs": "^1.27.0",
+        "puppeteer": "^10.2.0",
+        "rxjs": "^7.3.0",
+        "semver": "^7.3.5",
+        "tslib": "^2.0.0",
+        "ws": "^8.2.2",
+        "zone.js": "0.11.4"
+    },
+    "devDependencies": {
+        "@angular-devkit/build-angular": "12.2.6",
+        "@angular-devkit/core": "^12.2.6",
+        "@angular-eslint/eslint-plugin": "~12.3.0",
+        "@angular-eslint/eslint-plugin-template": "~12.3.0",
+        "@angular-eslint/template-parser": "~12.3.0",
+        "@angular/cli": "12.2.6",
+        "@angular/compiler-cli": "12.2.6",
+        "@angular/language-service": "12.2.6",
+        "@commitlint/cli": "11.0.0",
+        "@commitlint/config-angular": "^11.0.0",
+        "@commitlint/config-conventional": "^11.0.0",
+        "@jest/globals": "^27.2.0",
+        "@nrwl/angular": "12.9.0",
+        "@nrwl/cli": "12.9.0",
+        "@nrwl/cypress": "12.9.0",
+        "@nrwl/eslint-plugin-nx": "12.9.0",
+        "@nrwl/express": "12.9.0",
+        "@nrwl/jest": "12.9.0",
+        "@nrwl/node": "12.9.0",
+        "@nrwl/workspace": "12.10.0",
+        "@octokit/rest": "^18.12.0",
+        "@types/chalk": "^2.2.0",
+        "@types/express": "4.17.13",
+        "@types/fs-extra": "^9.0.12",
+        "@types/http-proxy-middleware": "^0.19.3",
+        "@types/jasmine": "3.9.1",
+        "@types/jasminewd2": "^2.0.10",
+        "@types/jest": "27.0.1",
+        "@types/js-yaml": "^4.0.3",
+        "@types/jsdom": "^16.2.13",
+        "@types/json5": "^0.0.30",
+        "@types/marked": "^4.0.1",
+        "@types/node": "^14.17.17",
+        "@types/path-to-regexp": "^1.7.0",
+        "@types/request": "^2.48.7",
+        "@types/yamljs": "^0.2.31",
+        "@types/yargs": "^17.0.7",
+        "@typescript-eslint/eslint-plugin": "4.31.1",
+        "@typescript-eslint/parser": "4.31.1",
+        "codelyzer": "6.0.1",
+        "conventional-changelog": "^3.1.24",
+        "cypress": "^8.4.0",
+        "cz-conventional-changelog": "^3.3.0",
+        "dotenv": "10.0.0",
+        "eslint": "7.32.0",
+        "eslint-config-prettier": "8.3.0",
+        "front-matter": "^4.0.2",
+        "fs-extra": "^9.1.0",
+        "guess-parser": "^0.4.22",
+        "http-proxy-middleware": "^2.0.1",
+        "husky": "^7.0.4",
+        "jasmine-core": "3.9.0",
+        "jasmine-spec-reporter": "7.0.0",
+        "jest": "27.2.0",
+        "jest-preset-angular": "9.0.7",
+        "jest-serializer-html": "^7.1.0",
+        "jsdom": "^17.0.0",
+        "jsonc": "^2.0.0",
+        "marked": "^4.0.10",
+        "ng-packagr": "12.2.1",
+        "nodemon": "^2.0.12",
+        "open": "^8.2.1",
+        "osascript": "^1.2.0",
+        "path-to-regexp": "^6.2.0",
+        "prettier": "2.4.1",
+        "pretty-quick": "^3.1.1",
+        "protractor": "7.0.0",
+        "simple-git": "^2.48.0",
+        "start-server-and-test": "^1.14.0",
+        "symlink-dir": "^5.0.1",
+        "ts-jest": "27.0.5",
+        "ts-node": "^10.2.1",
+        "tsickle": "^0.43.0",
+        "tslib": "^2.3.1",
+        "typescript": "4.3.5",
+        "wait-on": "^6.0.0",
+        "yamljs": "^0.3.0",
+        "yargs": "^17.2.1"
+    },
+    "lint-staged": {
+        "*.{js,json,css,scss,ts,html,component.html}": [
+            "prettier --write",
+            "git add"
+        ]
+    },
+    "overrides": {
+        "is-accessor-descriptor": "1.0.1"
+    }
+}