chore: Combine search keybinding definitions

fix: showPopup replace error (#82 )
Error: "TypeError: Cannot read properties of undefined (reading 'replace')"
2026-01-11 23:02:55 +01:00 · 2024-11-18 17:50:41 +01:00 · 2024-11-18 17:06:10 +01:00 · 2024-11-18 17:01:49 +01:00 · 2024-11-13 13:35:03 +01:00 · 2024-11-12 15:50:49 +01:00
160 changed files with 2271 additions and 1129 deletions
--- a/.github/workflows/build-noodl-editor.yml
+++ b/.github/workflows/build-noodl-editor.yml
@@ -1,15 +1,15 @@
-name: Build noodl-editor
+name: Build fluxscape-editor

 on:
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
-        
+
  # Allows you to run this workflow from another workflow
  workflow_call:

  # release:
  #   types: [created]
-    
+
 jobs:
  build_noodl_editor:
    runs-on: ${{ matrix.os }}
@@ -21,22 +21,22 @@ jobs:
          - node: 16
            os: windows-latest
            platform: win32-x64
-          - node: 16
-            os: macos-latest
-            platform: darwin-arm64
-          - node: 16
-            os: macos-latest
-            platform: darwin-x64
          # - node: 16
-          #   os: ubuntu-latest
-          #   platform: linux-x64
+          #   os: macos-latest
+          #   platform: darwin-arm64
+          # - node: 16
+          #   os: macos-latest
+          #   platform: darwin-x64
+          - node: 16
+            os: ubuntu-latest
+            platform: linux-x64

    steps:
-      - if: ${{ matrix.platform == 'darwin-arm64' }} 
+      - if: ${{ matrix.platform == 'darwin-arm64' }}
        name: Setup
        uses: actions/setup-python@v5
        with:
-          python-version: '3.11' 
+          python-version: '3.11'

      - name: Checkout
        uses: actions/checkout@v4
@@ -65,12 +65,13 @@ jobs:
        env:
          WORKSPACE_PATH: .
          TARGET_PLATFORM: ${{ matrix.platform }}
+          DISABLE_SIGNING: true # disable for now

      - run: npm run build:editor:pack

      - name: Upload artifact
        uses: actions/upload-artifact@v3
        with:
-          name: noodl-editor-${{ matrix.platform }}-${{ github.head_ref }}-${{ github.sha }}
+          name: fluxscape-editor-${{ matrix.platform }}-${{ github.head_ref }}-${{ github.sha }}
          path: publish
-          retention-days: "12"
+          retention-days: '12'
--- a/.github/workflows/test-noodl-editor.yml
+++ b/.github/workflows/test-noodl-editor.yml
@@ -1,4 +1,4 @@
-name: Test noodl-editor
+name: Test fluxscape-editor

 on:
  # Allows you to run this workflow manually from the Actions tab
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
-# Noodl
+# Fluxscape

-[Noodl](https://noodl.net) is a low-code platform where designers and developers build custom applications and experiences. Designed as a visual programming environment, it aims to expedite your development process. It promotes the swift and efficient creation of applications, requiring minimal coding knowledge.
+Fluxscape is a low-code platform where designers and developers build custom applications and experiences. Designed as a visual programming environment, it aims to expedite your development process. It promotes the swift and efficient creation of applications, requiring minimal coding knowledge.

 ## Documentation
-Documentation for how to use Noodl can be found here:
-[https://noodlapp.github.io/noodl-docs/](https://noodlapp.github.io/noodl-docs/)
+Documentation for how to use Fluxscape can be found here:
+[Fluxscape Documentation](https://docs.fluxscape.io)

 ## Community
-Main support channel is Discord: [https://www.noodl.net/community](https://www.noodl.net/community)
+Main support channel is Discord: [Fluxscape Discord](https://discord.gg/fXNW9EXa6A)

 ## Download releases
-Pre-built binaries can be [downloaded from Github](https://github.com/noodlapp/noodl/releases)
+Pre-built binaries can be [downloaded from Github](https://github.com/fluxscape/fluxscape/releases)

 ## Note for users who are migrating from the deprecated closed source version
- [Migrating the project files and workspaces to a Git provider](https://noodlapp.github.io/noodl-docs/docs/guides/collaboration/migrating-from-noodl-hosted-git)
- [Migrate backend and database](https://noodlapp.github.io/noodl-docs/docs/guides/deploy/using-an-external-backend#migrating-from-a-noodl-cloud-service)
- [Self-host frontend](https://noodlapp.github.io/noodl-docs/docs/guides/deploy/hosting-frontend)
+- [Migrating the project files and workspaces to a Git provider](https://docs.fluxscape.io/docs/guides/collaboration/migrating-from-noodl-hosted-git/)
+- [Migrate backend and database](https://docs.fluxscape.io/docs/guides/deploy/using-an-external-backend/#migrating-from-a-noodl-cloud-service)
+- [Self-host frontend](https://docs.fluxscape.io/docs/guides/deploy/hosting-frontend/)

 ## Building from source

@@ -23,24 +23,24 @@ Pre-built binaries can be [downloaded from Github](https://github.com/noodlapp/n
 # Install all dependencies
 $ npm install

-# Start the Noodl Editor and build a production version of the cloud and react runtime (useful when running Noodl from source but want to deploy to production)
+# Start the Fluxscape Editor and build a production version of the cloud and react runtime (useful when running Fluxscape from source but want to deploy to production)
 $ npm start

-# Start the Noodl Editor and watch the filesystem for changes to the runtimes. Development versions of the runtimes, not meant for production (mostly due to source maps and file size)
+# Start the Fluxscape Editor and watch the filesystem for changes to the runtimes. Development versions of the runtimes, not meant for production (mostly due to source maps and file size)
 # This is ideal for a quick workflow when doing changes on the runtimes.
 $ npm run dev

-# Start Noodl Editor test runner
+# Start Fluxscape Editor test runner
 $ npm run test:editor
 ```

 ## Licenses
-This repository contains two different licenses for different parts of the Noodl platform.
+This repository contains two different licenses for different parts of the Fluxscape platform.

- Components related to the editor, used to edit Noodl projects, are under GPLv3
- Components related to the end applications, used by the applications Noodl deploys, are under MIT
+- Components related to the editor, used to edit Fluxscape projects, are under GPLv3
+- Components related to the end applications, used by the applications Fluxscape deploys, are under MIT

-All of the source code of applications created with Noodl are under MIT. This means you can do project specific changes to the runtime without having to redistribute your changes.
+All of the source code of applications created with Fluxscape are under MIT. This means you can do project specific changes to the runtime without having to redistribute your changes.

 Packaged licensed under MIT:
 - `noodl-runtime`
--- a/package-lock.json
+++ b/package-lock.json
@@ -2849,9 +2849,9 @@
      }
    },
    "node_modules/@electron/remote": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.1.tgz",
-      "integrity": "sha512-Lfxul2yBxL+FBVaKszNAkuUqSIDbUQ1I7BC394iRXyqA2XGz7im2bAxroNIM51jhySSPKUaOLHaFLxfV6pC9VQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz",
+      "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==",
      "peerDependencies": {
        "electron": ">= 13.0.0"
      }
@@ -25220,13 +25220,13 @@
      }
    },
    "node_modules/electron": {
-      "version": "28.1.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.4.tgz",
-      "integrity": "sha512-WE6go611KOhtH6efRPMnVC7FE7DCKnQ3ZyHFeI1DbaCy8OU4UjZ8/CZGcuZmZgRdxSBEHoHdgaJkWRHZzF0FOg==",
+      "version": "31.3.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-31.3.1.tgz",
+      "integrity": "sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==",
      "hasInstallScript": true,
      "dependencies": {
        "@electron/get": "^2.0.0",
-        "@types/node": "^18.11.18",
+        "@types/node": "^20.9.0",
        "extract-zip": "^2.0.1"
      },
      "bin": {
@@ -25452,6 +25452,14 @@
        "tiny-typed-emitter": "^2.1.0"
      }
    },
+    "node_modules/electron/node_modules/@types/node": {
+      "version": "20.14.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
+      "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
    "node_modules/elliptic": {
      "version": "6.5.4",
      "dev": true,
@@ -27203,6 +27211,10 @@
        "react": "^15.0.2 || ^16.0.0 || ^17.0.0"
      }
    },
+    "node_modules/fluxscape-editor": {
+      "resolved": "packages/noodl-editor",
+      "link": true
+    },
    "node_modules/focus-lock": {
      "version": "0.8.1",
      "dev": true,
@@ -35443,10 +35455,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/noodl-editor": {
-      "resolved": "packages/noodl-editor",
-      "link": true
-    },
    "node_modules/nopt": {
      "version": "1.0.10",
      "license": "MIT",
@@ -43191,6 +43199,11 @@
      "version": "1.13.6",
      "license": "MIT"
    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
    "node_modules/unfetch": {
      "version": "4.2.0",
      "dev": true,
@@ -48967,9 +48980,10 @@
      "dev": true
    },
    "packages/noodl-editor": {
-      "version": "1.0.1",
+      "name": "fluxscape-editor",
+      "version": "1.1.0",
      "dependencies": {
-        "@electron/remote": "^2.1.1",
+        "@electron/remote": "^2.1.2",
        "@jaames/iro": "^5.5.2",
        "@microsoft/fetch-event-source": "^2.0.1",
        "@noodl/git": "file:../noodl-git",
@@ -49025,7 +49039,7 @@
        "babel-loader": "^8.2.4",
        "concurrently": "^7.4.0",
        "css-loader": "^6.7.1",
-        "electron": "28.1.4",
+        "electron": "31.3.1",
        "electron-builder": "^24.9.1",
        "file-loader": "^6.2.0",
        "html-loader": "^3.1.0",
@@ -53375,9 +53389,9 @@
      }
    },
    "@electron/remote": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.1.tgz",
-      "integrity": "sha512-Lfxul2yBxL+FBVaKszNAkuUqSIDbUQ1I7BC394iRXyqA2XGz7im2bAxroNIM51jhySSPKUaOLHaFLxfV6pC9VQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz",
+      "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==",
      "requires": {}
    },
    "@electron/universal": {
@@ -74057,13 +74071,23 @@
      }
    },
    "electron": {
-      "version": "28.1.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.4.tgz",
-      "integrity": "sha512-WE6go611KOhtH6efRPMnVC7FE7DCKnQ3ZyHFeI1DbaCy8OU4UjZ8/CZGcuZmZgRdxSBEHoHdgaJkWRHZzF0FOg==",
+      "version": "31.3.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-31.3.1.tgz",
+      "integrity": "sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==",
      "requires": {
        "@electron/get": "^2.0.0",
-        "@types/node": "^18.11.18",
+        "@types/node": "^20.9.0",
        "extract-zip": "^2.0.1"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "20.14.10",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
+          "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
+          "requires": {
+            "undici-types": "~5.26.4"
+          }
+        }
      }
    },
    "electron-builder": {
@@ -75408,6 +75432,144 @@
        "fbjs": "^3.0.1"
      }
    },
+    "fluxscape-editor": {
+      "version": "file:packages/noodl-editor",
+      "requires": {
+        "@babel/core": "^7.19.1",
+        "@babel/preset-react": "^7.18.6",
+        "@electron/remote": "^2.1.2",
+        "@jaames/iro": "^5.5.2",
+        "@microsoft/fetch-event-source": "^2.0.1",
+        "@noodl/git": "file:../noodl-git",
+        "@noodl/noodl-parse-dashboard": "file:../noodl-parse-dashboard",
+        "@noodl/platform": "file:../noodl-platform",
+        "@noodl/platform-electron": "file:../noodl-platform-electron",
+        "@svgr/webpack": "^6.4.0",
+        "@types/checksum": "^0.1.33",
+        "@types/jasmine": "^4.3.0",
+        "@types/jquery": "^3.5.14",
+        "@types/react": "^17.0.50",
+        "@types/react-dom": "^18.0.0",
+        "@types/remarkable": "^2.0.3",
+        "@types/rimraf": "^3.0.2",
+        "@types/split2": "^3.2.1",
+        "@types/string.prototype.matchall": "^4.0.1",
+        "@types/underscore": "^1.11.4",
+        "@types/webpack-env": "^1.18.0",
+        "about-window": "^1.15.2",
+        "algoliasearch": "^4.14.2",
+        "archiver": "^5.3.0",
+        "async": "^3.2.4",
+        "babel-loader": "^8.2.4",
+        "classnames": "^2.3.2",
+        "concurrently": "^7.4.0",
+        "css-loader": "^6.7.1",
+        "diff3": "0.0.4",
+        "dmg-license": "^1.0.11",
+        "electron": "31.3.1",
+        "electron-builder": "^24.9.1",
+        "electron-store": "^8.1.0",
+        "electron-updater": "^6.1.7",
+        "express": "^4.17.3",
+        "file-loader": "^6.2.0",
+        "highlight.js": "^11.5.1",
+        "html-loader": "^3.1.0",
+        "isbinaryfile": "^5.0.0",
+        "md5": "^2.3.0",
+        "md5-file": "^5.0.0",
+        "mixpanel-browser": "^2.45.0",
+        "mkdirp": "0.5.1",
+        "mkdirp-sync": "0.0.2",
+        "monaco-editor": "^0.34.0",
+        "monaco-editor-webpack-plugin": "^7.0.1",
+        "ncp": "^2.0.0",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.0",
+        "react-hot-toast": "^2.4.0",
+        "react-instantsearch-hooks-web": "^6.38.0",
+        "react-json-view": "^1.21.3",
+        "react-rnd": "^10.3.7",
+        "remarkable": "^2.0.1",
+        "rimraf": "^3.0.2",
+        "s3": "git+https://github.com/noodlapp/node-s3-client.git",
+        "sass": "^1.55.0",
+        "sass-loader": "^12.6.0",
+        "string.prototype.matchall": "^4.0.7",
+        "stringify": "^5.2.0",
+        "style-loader": "^3.3.1",
+        "ts-loader": "^9.4.1",
+        "ts-node": "^10.7.0",
+        "typescript": "^4.8.3",
+        "underscore": "^1.13.6",
+        "url-loader": "^4.1.1",
+        "webpack": "^5.74.0",
+        "webpack-cli": "^4.10.0",
+        "webpack-dev-server": "^4.11.1",
+        "webpack-merge": "^5.8.0",
+        "websocket-stream": "^5.5.2",
+        "ws": "^8.9.0"
+      },
+      "dependencies": {
+        "@webpack-cli/configtest": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
+          "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+          "dev": true,
+          "requires": {}
+        },
+        "@webpack-cli/info": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
+          "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+          "dev": true,
+          "requires": {
+            "envinfo": "^7.7.3"
+          }
+        },
+        "@webpack-cli/serve": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
+          "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+          "dev": true,
+          "requires": {}
+        },
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+          "dev": true
+        },
+        "rechoir": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+          "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+          "dev": true,
+          "requires": {
+            "resolve": "^1.9.0"
+          }
+        },
+        "webpack-cli": {
+          "version": "4.10.0",
+          "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
+          "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
+          "dev": true,
+          "requires": {
+            "@discoveryjs/json-ext": "^0.5.0",
+            "@webpack-cli/configtest": "^1.2.0",
+            "@webpack-cli/info": "^1.5.0",
+            "@webpack-cli/serve": "^1.7.0",
+            "colorette": "^2.0.14",
+            "commander": "^7.0.0",
+            "cross-spawn": "^7.0.3",
+            "fastest-levenshtein": "^1.0.12",
+            "import-local": "^3.0.2",
+            "interpret": "^2.2.0",
+            "rechoir": "^0.7.0",
+            "webpack-merge": "^5.7.3"
+          }
+        }
+      }
+    },
    "focus-lock": {
      "version": "0.8.1",
      "dev": true,
@@ -80983,144 +81145,6 @@
      "version": "2.0.10",
      "dev": true
    },
-    "noodl-editor": {
-      "version": "file:packages/noodl-editor",
-      "requires": {
-        "@babel/core": "^7.19.1",
-        "@babel/preset-react": "^7.18.6",
-        "@electron/remote": "^2.1.1",
-        "@jaames/iro": "^5.5.2",
-        "@microsoft/fetch-event-source": "^2.0.1",
-        "@noodl/git": "file:../noodl-git",
-        "@noodl/noodl-parse-dashboard": "file:../noodl-parse-dashboard",
-        "@noodl/platform": "file:../noodl-platform",
-        "@noodl/platform-electron": "file:../noodl-platform-electron",
-        "@svgr/webpack": "^6.4.0",
-        "@types/checksum": "^0.1.33",
-        "@types/jasmine": "^4.3.0",
-        "@types/jquery": "^3.5.14",
-        "@types/react": "^17.0.50",
-        "@types/react-dom": "^18.0.0",
-        "@types/remarkable": "^2.0.3",
-        "@types/rimraf": "^3.0.2",
-        "@types/split2": "^3.2.1",
-        "@types/string.prototype.matchall": "^4.0.1",
-        "@types/underscore": "^1.11.4",
-        "@types/webpack-env": "^1.18.0",
-        "about-window": "^1.15.2",
-        "algoliasearch": "^4.14.2",
-        "archiver": "^5.3.0",
-        "async": "^3.2.4",
-        "babel-loader": "^8.2.4",
-        "classnames": "^2.3.2",
-        "concurrently": "^7.4.0",
-        "css-loader": "^6.7.1",
-        "diff3": "0.0.4",
-        "dmg-license": "^1.0.11",
-        "electron": "28.1.4",
-        "electron-builder": "^24.9.1",
-        "electron-store": "^8.1.0",
-        "electron-updater": "^6.1.7",
-        "express": "^4.17.3",
-        "file-loader": "^6.2.0",
-        "highlight.js": "^11.5.1",
-        "html-loader": "^3.1.0",
-        "isbinaryfile": "^5.0.0",
-        "md5": "^2.3.0",
-        "md5-file": "^5.0.0",
-        "mixpanel-browser": "^2.45.0",
-        "mkdirp": "0.5.1",
-        "mkdirp-sync": "0.0.2",
-        "monaco-editor": "^0.34.0",
-        "monaco-editor-webpack-plugin": "^7.0.1",
-        "ncp": "^2.0.0",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.0",
-        "react-hot-toast": "^2.4.0",
-        "react-instantsearch-hooks-web": "^6.38.0",
-        "react-json-view": "^1.21.3",
-        "react-rnd": "^10.3.7",
-        "remarkable": "^2.0.1",
-        "rimraf": "^3.0.2",
-        "s3": "git+https://github.com/noodlapp/node-s3-client.git",
-        "sass": "^1.55.0",
-        "sass-loader": "^12.6.0",
-        "string.prototype.matchall": "^4.0.7",
-        "stringify": "^5.2.0",
-        "style-loader": "^3.3.1",
-        "ts-loader": "^9.4.1",
-        "ts-node": "^10.7.0",
-        "typescript": "^4.8.3",
-        "underscore": "^1.13.6",
-        "url-loader": "^4.1.1",
-        "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0",
-        "webpack-dev-server": "^4.11.1",
-        "webpack-merge": "^5.8.0",
-        "websocket-stream": "^5.5.2",
-        "ws": "^8.9.0"
-      },
-      "dependencies": {
-        "@webpack-cli/configtest": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-          "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
-          "dev": true,
-          "requires": {}
-        },
-        "@webpack-cli/info": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-          "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
-          "dev": true,
-          "requires": {
-            "envinfo": "^7.7.3"
-          }
-        },
-        "@webpack-cli/serve": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-          "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
-          "dev": true,
-          "requires": {}
-        },
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-          "dev": true
-        },
-        "rechoir": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-          "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-          "dev": true,
-          "requires": {
-            "resolve": "^1.9.0"
-          }
-        },
-        "webpack-cli": {
-          "version": "4.10.0",
-          "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
-          "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
-          "dev": true,
-          "requires": {
-            "@discoveryjs/json-ext": "^0.5.0",
-            "@webpack-cli/configtest": "^1.2.0",
-            "@webpack-cli/info": "^1.5.0",
-            "@webpack-cli/serve": "^1.7.0",
-            "colorette": "^2.0.14",
-            "commander": "^7.0.0",
-            "cross-spawn": "^7.0.3",
-            "fastest-levenshtein": "^1.0.12",
-            "import-local": "^3.0.2",
-            "interpret": "^2.2.0",
-            "rechoir": "^0.7.0",
-            "webpack-merge": "^5.7.3"
-          }
-        }
-      }
-    },
    "nopt": {
      "version": "1.0.10",
      "requires": {
@@ -86403,6 +86427,11 @@
    "underscore": {
      "version": "1.13.6"
    },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
    "unfetch": {
      "version": "4.2.0",
      "dev": true
--- a/package.json
+++ b/package.json
@@ -2,8 +2,8 @@
  "private": true,
  "name": "@noodl/repo",
  "description": "Low-code for when experience matter",
-  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://noodl.net",
+  "author": "Fluxscape <contact@fluxcsape.io>",
+  "homepage": "https://fluxscape.io",
  "version": "1.0.0",
  "workspaces": [
    "packages/*"
@@ -12,7 +12,7 @@
    "graph": "npx nx graph",
    "ci:prepare:editor": "ts-node ./scripts/ci-editor-prepare.ts",
    "ci:build:viewer": "lerna exec --scope @noodl/noodl-viewer-react -- npm run build",
-    "ci:build:editor": "lerna exec --scope noodl-editor -- npm run ci:build",
+    "ci:build:editor": "lerna exec --scope fluxscape-editor -- npm run ci:build",
    "build:editor": "ts-node ./scripts/build-editor.ts",
    "build:editor:_viewer": "ts-node ./scripts/noodl-editor/build-viewer.ts",
    "build:editor:_editor": "ts-node ./scripts/noodl-editor/build-editor.ts",
@@ -20,7 +20,7 @@
    "build:cloud-runtime": "lerna run build --scope @noodl/cloud-runtime --stream && lerna run build:pack --scope @noodl/cloud-runtime --stream",
    "start:storybook": "lerna exec --scope @noodl/noodl-core-ui -- npm run start",
    "start:viewer": "lerna run start --scope @noodl/noodl-viewer-react --stream",
-    "start:editor": "lerna run start --scope noodl-editor --stream",
+    "start:editor": "lerna run start --scope fluxscape-editor --stream",
    "dev": "ts-node ./scripts/start.ts",
    "start": "ts-node ./scripts/start.ts -- --build-viewer",
    "test:editor": "ts-node ./scripts/test-editor.ts",
@@ -47,4 +47,4 @@
    "npm": ">=6.0.0",
    "node": ">=16.0.0 <=18"
  }
-}
+}
--- a/packages/noodl-core-ui/src/assets/icons/icon-component/logo.svg
+++ b/packages/noodl-core-ui/src/assets/icons/icon-component/logo.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21 8.46785C21 6.8533 20.0098 5.47016 18.6036 4.89221L18.4702 4.83923L18.8936 4.10593C19.0158 3.89432 18.8631 3.63006 18.6187 3.63006H14.8823C14.6382 3.63006 14.4855 3.89465 14.6074 4.10593L16.4756 7.34158C16.5978 7.55318 16.9032 7.55318 17.0251 7.34158L17.4956 6.52658L17.9396 6.72041C18.6089 7.02197 19.0747 7.69166 19.0747 8.46965C19.0747 8.76585 19.0073 9.04613 18.8868 9.29674L14.5003 18.6933C14.461 18.7753 14.4033 18.8507 14.3269 18.9132C14.0931 19.1046 13.7492 19.1043 13.5155 18.9126C13.4817 18.885 13.4519 18.8549 13.4252 18.8226L9.79186 14.368L8.7771 16.1566L11.9959 20.1111C12.4667 20.6461 13.1565 20.9834 13.9253 20.9834C14.983 20.9834 15.8915 20.3446 16.2856 19.4313L20.6354 10.1097C20.8692 9.61133 21 9.05499 21 8.46785Z" fill="white"/>
-<path d="M5.54434 16.485C5.5396 16.485 5.53486 16.4847 5.53012 16.4847C4.46423 16.4847 3.60013 17.3488 3.60013 18.4148C3.60013 19.4807 4.46423 20.3448 5.53012 20.3448C6.59607 20.3448 7.46017 19.4807 7.46017 18.4148C7.46017 18.0652 7.36723 17.7374 7.20477 17.4548L11.4253 9.67665C11.4315 9.6657 11.438 9.65475 11.4439 9.64381L11.4472 9.6385C11.7934 9.00136 11.9902 8.27128 11.9902 7.4951C11.9902 5.01255 9.97759 3 7.4951 3C5.01255 3 3 5.01255 3 7.4951C3 8.61075 3.40629 9.63139 4.07921 10.4173L6.37285 13.2269L7.39377 11.4513L5.53046 9.17183C5.15966 8.72644 4.91995 8.12039 4.91995 7.49538C4.91995 6.07641 6.0702 4.92616 7.48917 4.92616C8.90814 4.92616 10.0584 6.07641 10.0584 7.49538C10.0584 7.95466 9.93797 8.38583 9.72665 8.759L9.72546 8.76108L5.54434 16.485Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.609 9.22205H14.4786C15.5078 9.22205 16.3421 10.0512 16.3421 11.074C16.3421 12.0968 15.5078 12.9259 14.4786 12.9259L11.609 12.9259C10.9813 12.9259 10.4725 13.4316 10.4725 14.0555C10.4725 14.6793 10.9813 15.185 11.6091 15.185C13.5014 15.185 15.0357 16.7086 15.0377 18.5888V18.5961C15.0357 20.4763 13.5014 21.9999 11.609 21.9999H10.5656C10.2568 21.9999 10.0065 21.7512 10.0065 21.4443C10.0065 21.1374 10.2568 20.8887 10.5656 20.8887H11.609C12.2367 20.8887 12.7456 20.383 12.7456 19.7591C12.7456 19.1353 12.2368 18.6296 11.6091 18.6296C8.99654 18.6296 6.8784 16.526 6.87604 13.9302V13.9215C6.8784 11.3257 8.99654 9.22205 11.609 9.22205Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6087 2H18.537C19.8973 2 21 3.1027 21 4.46295C21 5.8232 19.8973 6.9259 18.5371 6.9259L11.6087 6.9259L11.6087 2ZM11.6087 8.25933L11.6087 6.9259L11.6087 2.00004L11.6085 2.00004C6.87488 2.00004 3.03361 5.79695 3 10.4934V10.6177C3.02455 14.0492 5.08185 17.0005 8.03472 18.3413C6.73836 17.3036 5.90846 15.7136 5.90692 13.9309V13.9209C5.90963 10.7936 8.46136 8.25933 11.6087 8.25933ZM11.6087 13.8888C11.6086 13.8888 11.6086 13.8888 11.6085 13.8888V14.2223C11.6086 14.2223 11.6086 14.2223 11.6087 14.2223L11.6087 13.8888ZM11.6089 6.92591H12.6504C12.0819 6.92893 11.6206 7.38207 11.6089 7.94502V6.92591Z" fill="white"/>
 </svg>
--- a/packages/noodl-core-ui/src/components/common/Logo/Logo.tsx
+++ b/packages/noodl-core-ui/src/components/common/Logo/Logo.tsx
@@ -1,6 +1,8 @@
-import { UnsafeStyleProps } from '@noodl-core-ui/types/global';
 import classNames from 'classnames';
 import React from 'react';
+
+import { UnsafeStyleProps } from '@noodl-core-ui/types/global';
+
 import css from './Logo.module.scss';

 export enum LogoVariant {
@@ -43,12 +45,7 @@ export function Logo({

  return (
    <div
-      className={classNames([
-        css['Root'],
-        css[`is-variant-${variant}`],
-        css[`is-size-${size}`],
-        UNSAFE_className
-      ])}
+      className={classNames([css['Root'], css[`is-variant-${variant}`], css[`is-size-${size}`], UNSAFE_className])}
      onClick={onClick}
      style={UNSAFE_style}
    >
@@ -60,18 +57,92 @@ export function Logo({
 const DefaultIcon = React.memo(function () {
  return (
    <svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <path
-        d="M30 60C46.5685 60 60 46.5686 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5686 13.4315 60 30 60Z"
-        fill="#F5BC41"
-      />
-      <path
-        d="M48.9051 22.4621C48.9051 19.0553 46.8158 16.1367 43.8486 14.9172L43.567 14.8055L44.4605 13.2582C44.7184 12.8117 44.3962 12.2541 43.8804 12.2541H35.9965C35.4813 12.2541 35.1592 12.8123 35.4164 13.2582L39.3584 20.0856C39.6163 20.532 40.2607 20.532 40.5179 20.0856L41.5107 18.3659L42.4474 18.7749C43.8598 19.4112 44.8426 20.8242 44.8426 22.4658C44.8426 23.0909 44.7003 23.6822 44.4461 24.2111L35.1904 44.0383H35.191C35.1079 44.2112 34.9856 44.3705 34.8245 44.5022C34.3312 44.9062 33.6056 44.9056 33.1123 44.501C33.0411 44.4429 32.9781 44.3792 32.9219 44.3112L25.2553 34.9118L23.1141 38.6857L29.9059 47.0299C30.8994 48.1588 32.3549 48.8707 33.9771 48.8707C36.2088 48.8707 38.1258 47.5225 38.9575 45.5956L48.1358 25.9264C48.6291 24.8749 48.9051 23.7009 48.9051 22.4621Z"
-        fill="#1F1F1F"
-      />
-      <path
-        d="M16.2933 39.3787C16.2833 39.3787 16.2733 39.3781 16.2633 39.3781C14.0142 39.3781 12.1909 41.2014 12.1909 43.4506C12.1909 45.6997 14.0142 47.523 16.2633 47.523C18.5125 47.523 20.3358 45.6997 20.3358 43.4506C20.3358 42.7131 20.1397 42.0213 19.7969 41.425L28.7024 25.0127L28.7037 25.0133C28.7168 24.9902 28.7293 24.9665 28.7417 24.9434L28.7486 24.9322C29.4792 23.5878 29.8944 22.0473 29.8944 20.4095C29.8944 15.1712 25.6477 10.9246 20.4095 10.9246C15.1712 10.9246 10.9246 15.1712 10.9246 20.4095C10.9246 22.7636 11.7819 24.9172 13.2018 26.5756L18.0415 32.5039L20.1957 28.7573L16.264 23.9475C15.4816 23.0077 14.9758 21.7289 14.9758 20.4101C14.9758 17.416 17.4029 14.9889 20.397 14.9889C23.3911 14.9889 25.8182 17.416 25.8182 20.4101C25.8182 21.3792 25.5641 22.289 25.1182 23.0764L25.1157 23.0808L16.2933 39.3787Z"
-        fill="#1F1F1F"
-      />
+      <g filter="url(#filter0_i_574_6111)">
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M3.76172 24.8943L3.76172 25.7516C3.99042 39.1618 14.9298 49.9629 28.3932 49.9685H28.4072L28.4072 14.8675L48.1979 14.8675C52.1163 14.8675 55.2928 11.691 55.2928 7.77258C55.2928 3.85417 52.1163 0.677665 48.1979 0.677666L28.4072 0.677669V0.67749L28.4036 0.67749C14.9354 0.677491 3.99048 11.4808 3.76172 24.8943ZM31.3869 14.8676H28.4105V17.7311C28.481 16.1441 29.7849 14.8778 31.3869 14.8676ZM26.5352 35.4054C26.5352 36.4366 27.3711 37.2725 28.4022 37.2725V33.5383C27.3711 33.5383 26.5352 34.3743 26.5352 35.4054Z"
+          fill="url(#paint0_linear_574_6111)"
+        />
+      </g>
+      <g filter="url(#filter1_i_574_6111)">
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M13.4805 35.166L13.4805 34.8968C13.5528 26.7095 20.2122 20.0947 28.4165 20.0947L28.4171 20.0947L28.4171 37.2721H28.4176C34.571 37.2721 39.5657 42.2334 39.6196 48.3741V48.5751C39.5657 54.7136 34.5746 59.6736 28.4242 59.6771H28.4177V59.6772H25.4304C23.7805 59.6772 22.443 58.3397 22.443 56.6898C22.443 55.04 23.7805 53.7025 25.4304 53.7025H28.4051V53.7026C29.4363 53.7026 30.2722 52.8667 30.2722 51.8355C30.2722 50.8084 29.4428 49.975 28.4171 49.9685V49.9681H28.4102C20.2088 49.9647 13.5527 43.3512 13.4805 35.166ZM28.4177 20.0948L36.6329 20.0948C40.345 20.0948 43.3544 23.1042 43.3544 26.8163C43.3544 30.5285 40.3451 33.5378 36.6329 33.5378L28.4177 33.5378L28.4177 20.0948ZM28.4049 37.2724C27.3737 37.2724 26.5378 36.4365 26.5378 35.4053C26.5378 34.3741 27.3737 33.5382 28.4049 33.5382V37.2724Z"
+          fill="url(#paint1_radial_574_6111)"
+        />
+      </g>
+      <defs>
+        <filter
+          id="filter0_i_574_6111"
+          x="3.76172"
+          y="0.67749"
+          width="51.5312"
+          height="53.291"
+          filterUnits="userSpaceOnUse"
+          colorInterpolationFilters="sRGB"
+        >
+          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+          <feColorMatrix
+            in="SourceAlpha"
+            type="matrix"
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+            result="hardAlpha"
+          />
+          <feOffset dy="4" />
+          <feGaussianBlur stdDeviation="8" />
+          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0" />
+          <feBlend mode="normal" in2="shape" result="effect1_innerShadow_574_6111" />
+        </filter>
+        <filter
+          id="filter1_i_574_6111"
+          x="13.4805"
+          y="20.0947"
+          width="29.875"
+          height="43.5825"
+          filterUnits="userSpaceOnUse"
+          colorInterpolationFilters="sRGB"
+        >
+          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+          <feColorMatrix
+            in="SourceAlpha"
+            type="matrix"
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+            result="hardAlpha"
+          />
+          <feOffset dy="4" />
+          <feGaussianBlur stdDeviation="12" />
+          <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+          <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0" />
+          <feBlend mode="normal" in2="shape" result="effect1_innerShadow_574_6111" />
+        </filter>
+        <linearGradient
+          id="paint0_linear_574_6111"
+          x1="28.407"
+          y1="25.323"
+          x2="3.76172"
+          y2="25.323"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#FF1818" />
+          <stop offset="0.835" stopColor="#FFC700" />
+        </linearGradient>
+        <radialGradient
+          id="paint1_radial_574_6111"
+          cx="0"
+          cy="0"
+          r="1"
+          gradientUnits="userSpaceOnUse"
+          gradientTransform="translate(43.5954 26.9914) rotate(125.992) scale(39.6798 39.1304)"
+        >
+          <stop stopColor="#FF0000" />
+          <stop offset="1" stopColor="#6732FF" />
+        </radialGradient>
+      </defs>
    </svg>
  );
 });
@@ -80,17 +151,36 @@ const InvertedIcon = React.memo(function () {
  return (
    <svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
      <path
-        d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z"
-        fill="#1F1F1F"
+        d="M0 13.3981C0 5.99852 5.99852 0 13.3981 0H46.6019C54.0015 0 60 5.99852 60 13.3981V46.6019C60 54.0015 54.0015 60 46.6019 60H13.3981C5.99852 60 0 54.0015 0 46.6019V13.3981Z"
+        fill="url(#paint0_linear_569_5866)"
      />
      <path
-        d="M48.9051 22.462C48.9051 19.0552 46.8158 16.1367 43.8486 14.9172L43.567 14.8054L44.4605 13.2581C44.7184 12.8116 44.3962 12.254 43.8804 12.254H35.9965C35.4814 12.254 35.1592 12.8123 35.4164 13.2581L39.3584 20.0855C39.6163 20.532 40.2607 20.532 40.5179 20.0855L41.5107 18.3658L42.4474 18.7748C43.8598 19.4111 44.8427 20.8242 44.8427 22.4658C44.8427 23.0908 44.7003 23.6822 44.4461 24.211L35.1904 44.0382H35.191C35.108 44.2112 34.9856 44.3704 34.8245 44.5022C34.3312 44.9062 33.6056 44.9055 33.1123 44.5009C33.0411 44.4428 32.9781 44.3792 32.9219 44.3111L25.2553 34.9117L23.1141 38.6857L29.9059 47.0298C30.8994 48.1588 32.3549 48.8706 33.9771 48.8706C36.2088 48.8706 38.1258 47.5225 38.9575 45.5955L48.1358 25.9263C48.6291 24.8748 48.9051 23.7009 48.9051 22.462Z"
-        fill="#F5BC41"
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M29.5856 25.4583L36.212 25.4583C38.5885 25.4583 40.515 27.3848 40.515 29.7613C40.515 32.1378 38.5885 34.0643 36.212 34.0643L29.5856 34.0643C28.1361 34.0643 26.9611 35.2394 26.9611 36.6889C26.9611 38.1383 28.1362 39.3134 29.5856 39.3134C33.9555 39.3134 37.4985 42.8535 37.5031 47.2222V47.2393C37.4985 51.608 33.9555 55.1482 29.5856 55.1482H27.1761C26.463 55.1482 25.885 54.5701 25.885 53.8571C25.885 53.1441 26.463 52.566 27.1761 52.566H29.5856C31.0351 52.566 32.2102 51.3911 32.2102 49.9416C32.2102 48.4921 31.0351 47.317 29.5856 47.317C23.5529 47.317 18.6617 42.4292 18.6562 36.3978V36.3775C18.6617 30.3461 23.5529 25.4583 29.5856 25.4583Z"
+        fill="black"
      />
      <path
-        d="M16.2933 39.3787C16.2833 39.3787 16.2733 39.3781 16.2633 39.3781C14.0142 39.3781 12.1909 41.2014 12.1909 43.4506C12.1909 45.6997 14.0142 47.523 16.2633 47.523C18.5125 47.523 20.3358 45.6997 20.3358 43.4506C20.3358 42.7131 20.1397 42.0213 19.7969 41.425L28.7024 25.0127L28.7037 25.0133C28.7168 24.9902 28.7293 24.9665 28.7417 24.9434L28.7486 24.9322C29.4792 23.5878 29.8944 22.0473 29.8944 20.4095C29.8944 15.1712 25.6477 10.9246 20.4095 10.9246C15.1712 10.9246 10.9246 15.1712 10.9246 20.4095C10.9246 22.7636 11.7819 24.9172 13.2018 26.5756L18.0415 32.5039L20.1957 28.7573L16.264 23.9475C15.4816 23.0077 14.9758 21.7289 14.9758 20.4101C14.9758 17.416 17.4029 14.9889 20.397 14.9889C23.3911 14.9889 25.8182 17.416 25.8182 20.4101C25.8182 21.3792 25.5641 22.289 25.1182 23.0764L25.1157 23.0808L16.2933 39.3787Z"
-        fill="#F5BC41"
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M29.5868 8.67749L45.5503 8.67749C48.7109 8.67749 51.2731 11.2397 51.2731 14.4002C51.2731 17.5608 48.7109 20.123 45.5503 20.123L31.9874 20.123C30.6594 20.1323 29.5857 21.2117 29.5857 22.5419V22.5419H29.5856V23.2213C22.3185 23.222 16.4268 29.1103 16.4206 36.3762V36.3993C16.4241 40.5418 18.3408 44.2365 21.3346 46.6476C14.4743 43.5135 9.70703 36.5918 9.70703 28.5567C9.70703 17.5779 18.6069 8.67784 29.5856 8.6776L29.5856 20.123H29.5868L29.5868 8.67749ZM29.5856 39.3135V47.3171C23.5535 47.3164 18.6631 42.4289 18.6576 36.3978V36.3776C18.6631 30.3466 23.5535 25.4591 29.5856 25.4583V34.0644C28.1368 34.0652 26.9625 35.2399 26.9625 36.6889C26.9625 38.138 28.1368 39.3127 29.5856 39.3135ZM29.5856 37.0764V36.3015C29.5852 36.3015 29.5847 36.3015 29.5842 36.3015V37.0764C29.5847 37.0764 29.5852 37.0764 29.5856 37.0764Z"
+        fill="black"
      />
+      <defs>
+        <linearGradient
+          id="paint0_linear_569_5866"
+          x1="9.6215e-06"
+          y1="-4.68362e-06"
+          x2="60"
+          y2="60"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stop-color="#EFBB07" />
+          <stop offset="0.0001" stop-color="#682BD8" />
+          <stop offset="0.505" stop-color="#FF0000" />
+          <stop offset="0.88" stop-color="#EFBB07" />
+        </linearGradient>
+      </defs>
    </svg>
  );
 });
@@ -99,11 +189,15 @@ const GrayscaleIcon = React.memo(function () {
  return (
    <svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
      <path
-        d="M48.9051 22.462C48.9051 19.0552 46.8158 16.1367 43.8486 14.9172L43.567 14.8054L44.4605 13.2581C44.7184 12.8116 44.3962 12.254 43.8804 12.254H35.9965C35.4814 12.254 35.1592 12.8123 35.4164 13.2581L39.3584 20.0855C39.6163 20.532 40.2607 20.532 40.5179 20.0855L41.5107 18.3658L42.4474 18.7748C43.8598 19.4111 44.8427 20.8242 44.8427 22.4658C44.8427 23.0908 44.7003 23.6822 44.4461 24.211L35.1904 44.0382H35.191C35.108 44.2112 34.9856 44.3704 34.8245 44.5022C34.3312 44.9062 33.6056 44.9055 33.1123 44.5009C33.0411 44.4428 32.9781 44.3792 32.9219 44.3111L25.2553 34.9117L23.1141 38.6857L29.9059 47.0298C30.8994 48.1588 32.3549 48.8706 33.9771 48.8706C36.2088 48.8706 38.1258 47.5225 38.9575 45.5955L48.1358 25.9263C48.6291 24.8748 48.9051 23.7009 48.9051 22.462Z"
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M29.5856 25.4583L36.212 25.4583C38.5885 25.4583 40.515 27.3848 40.515 29.7613C40.515 32.1378 38.5885 34.0643 36.212 34.0643L29.5856 34.0643C28.1361 34.0643 26.9611 35.2394 26.9611 36.6889C26.9611 38.1383 28.1362 39.3134 29.5856 39.3134C33.9555 39.3134 37.4985 42.8535 37.5031 47.2222V47.2393C37.4985 51.608 33.9555 55.1482 29.5856 55.1482H27.1761C26.463 55.1482 25.885 54.5701 25.885 53.8571C25.885 53.1441 26.463 52.566 27.1761 52.566H29.5856C31.0351 52.566 32.2102 51.3911 32.2102 49.9416C32.2102 48.4921 31.0351 47.317 29.5856 47.317C23.5529 47.317 18.6617 42.4292 18.6562 36.3978V36.3775C18.6617 30.3461 23.5529 25.4583 29.5856 25.4583Z"
        fill="white"
      />
      <path
-        d="M16.2933 39.3787C16.2833 39.3787 16.2733 39.3781 16.2633 39.3781C14.0142 39.3781 12.1909 41.2014 12.1909 43.4506C12.1909 45.6997 14.0142 47.523 16.2633 47.523C18.5125 47.523 20.3358 45.6997 20.3358 43.4506C20.3358 42.7131 20.1397 42.0213 19.7969 41.425L28.7024 25.0127L28.7037 25.0133C28.7168 24.9902 28.7293 24.9665 28.7417 24.9434L28.7486 24.9322C29.4792 23.5878 29.8944 22.0473 29.8944 20.4095C29.8944 15.1712 25.6477 10.9246 20.4095 10.9246C15.1712 10.9246 10.9246 15.1712 10.9246 20.4095C10.9246 22.7636 11.7819 24.9172 13.2018 26.5756L18.0415 32.5039L20.1957 28.7573L16.264 23.9475C15.4816 23.0077 14.9758 21.7289 14.9758 20.4101C14.9758 17.416 17.4029 14.9889 20.397 14.9889C23.3911 14.9889 25.8182 17.416 25.8182 20.4101C25.8182 21.3792 25.5641 22.289 25.1182 23.0764L25.1157 23.0808L16.2933 39.3787Z"
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M29.5868 8.67749L45.5503 8.67749C48.7109 8.67749 51.2731 11.2397 51.2731 14.4002C51.2731 17.5608 48.7109 20.123 45.5503 20.123L31.9874 20.123C30.6594 20.1323 29.5857 21.2117 29.5857 22.5419V22.5419H29.5856V23.2213C22.3185 23.222 16.4268 29.1103 16.4206 36.3762V36.3993C16.4241 40.5418 18.3408 44.2365 21.3346 46.6476C14.4743 43.5135 9.70703 36.5918 9.70703 28.5567C9.70703 17.5779 18.6069 8.67784 29.5856 8.6776L29.5856 20.123H29.5868L29.5868 8.67749ZM29.5856 39.3135V47.3171C23.5535 47.3164 18.6631 42.4289 18.6576 36.3978V36.3776C18.6631 30.3466 23.5535 25.4591 29.5856 25.4583V34.0644C28.1368 34.0652 26.9625 35.2399 26.9625 36.6889C26.9625 38.138 28.1368 39.3127 29.5856 39.3135ZM29.5856 37.0764V36.3015C29.5852 36.3015 29.5847 36.3015 29.5842 36.3015V37.0764C29.5847 37.0764 29.5852 37.0764 29.5856 37.0764Z"
        fill="white"
      />
    </svg>
--- a/packages/noodl-core-ui/src/components/layout/BaseDialog/BaseDialog.module.scss
+++ b/packages/noodl-core-ui/src/components/layout/BaseDialog/BaseDialog.module.scss
@@ -1,123 +1,128 @@
-.Root {
-  border: none;
-  padding: 0;
-  background: transparent;
-  box-sizing: border-box;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-
-  &.has-backdrop {
-    background-color: var(--theme-color-bg-1-transparent);
-  }
-
-  &.is-locking-scroll {
-    background-color: transparent;
-  }
-
-  &:not(.has-backdrop):not(.is-locking-scroll) {
-    pointer-events: none;
-  }
-}
-
-.VisibleDialog {
-  filter: drop-shadow(0 4px 15px var(--theme-color-bg-1-transparent-2));
-  box-shadow: 0 0 10px -5px var(--theme-color-bg-1-transparent-2);
-  position: absolute;
-  width: var(--width);
-  pointer-events: all;
-
-  .Root.is-centered & {
-    top: 50%;
-    left: 50%;
-    animation: enter-centered var(--speed-quick) var(--easing-base) both;
-  }
-
-  .Root:not(.is-centered) &.is-visible {
-    &.is-variant-default {
-      animation: enter var(--speed-quick) var(--easing-base) both;
-    }
-
-    &.is-variant-select {
-      transform: translate(var(--offsetX), var(--offsetY));
-    }
-  }
-
-  &::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: var(--background);
-    border-radius: 2px;
-    overflow: hidden;
-  }
-}
-
-.Arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  top: var(--arrow-top);
-  left: var(--arrow-left);
-  pointer-events: none;
-
-  &::after {
-    content: '';
-    display: block;
-    width: 11px;
-    height: 11px;
-    transform: translate(-50%, -50%) rotate(45deg);
-    background: var(--background);
-  }
-
-  &.is-contrast::after {
-    background: var(--backgroundContrast);
-  }
-}
-
-.Title {
-  background-color: var(--backgroundContrast);
-  padding: 12px;
-}
-
-.MeasuringContainer {
-  pointer-events: none;
-  height: 0;
-  overflow: visible;
-  opacity: 0;
-}
-
-.ChildContainer {
-  position: relative;
-  z-index: 1;
-}
-
-@keyframes enter {
-  from {
-    opacity: 0;
-    transform: translate(
-      calc(var(--animationStartOffsetX) + var(--offsetX)),
-      calc(var(--animationStartOffsetY) + var(--offsetY))
-    );
-  }
-  to {
-    opacity: 1;
-    transform: translate(var(--offsetX), var(--offsetY));
-  }
-}
-
-@keyframes enter-centered {
-  from {
-    opacity: 0;
-    transform: translate(-50%, calc(-50% + 16px));
-  }
-  to {
-    opacity: 1;
-    transform: translate(-50%, -50%);
-  }
-}
+.Root {
+  border: none;
+  padding: 0;
+  background: transparent;
+  box-sizing: border-box;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+
+  &.is-hidden {
+    visibility: hidden;
+    pointer-events: none;
+  }
+
+  &.has-backdrop {
+    background-color: var(--theme-color-bg-1-transparent);
+  }
+
+  &.is-locking-scroll {
+    background-color: transparent;
+  }
+
+  &:not(.has-backdrop):not(.is-locking-scroll) {
+    pointer-events: none;
+  }
+}
+
+.VisibleDialog {
+  filter: drop-shadow(0 4px 15px var(--theme-color-bg-1-transparent-2));
+  box-shadow: 0 0 10px -5px var(--theme-color-bg-1-transparent-2);
+  position: absolute;
+  width: var(--width);
+  pointer-events: all;
+
+  .Root.is-centered & {
+    top: 50%;
+    left: 50%;
+    animation: enter-centered var(--speed-quick) var(--easing-base) both;
+  }
+
+  .Root:not(.is-centered) &.is-visible {
+    &.is-variant-default {
+      animation: enter var(--speed-quick) var(--easing-base) both;
+    }
+
+    &.is-variant-select {
+      transform: translate(var(--offsetX), var(--offsetY));
+    }
+  }
+
+  &::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: var(--background);
+    border-radius: 2px;
+    overflow: hidden;
+  }
+}
+
+.Arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  top: var(--arrow-top);
+  left: var(--arrow-left);
+  pointer-events: none;
+
+  &::after {
+    content: '';
+    display: block;
+    width: 11px;
+    height: 11px;
+    transform: translate(-50%, -50%) rotate(45deg);
+    background: var(--background);
+  }
+
+  &.is-contrast::after {
+    background: var(--backgroundContrast);
+  }
+}
+
+.Title {
+  background-color: var(--backgroundContrast);
+  padding: 12px;
+}
+
+.MeasuringContainer {
+  pointer-events: none;
+  height: 0;
+  overflow: visible;
+  opacity: 0;
+}
+
+.ChildContainer {
+  position: relative;
+  z-index: 1;
+}
+
+@keyframes enter {
+  from {
+    opacity: 0;
+    transform: translate(
+      calc(var(--animationStartOffsetX) + var(--offsetX)),
+      calc(var(--animationStartOffsetY) + var(--offsetY))
+    );
+  }
+  to {
+    opacity: 1;
+    transform: translate(var(--offsetX), var(--offsetY));
+  }
+}
+
+@keyframes enter-centered {
+  from {
+    opacity: 0;
+    transform: translate(-50%, calc(-50% + 16px));
+  }
+  to {
+    opacity: 1;
+    transform: translate(-50%, -50%);
+  }
+}
--- a/packages/noodl-core-ui/src/components/layout/BaseDialog/BaseDialog.tsx
+++ b/packages/noodl-core-ui/src/components/layout/BaseDialog/BaseDialog.tsx
@@ -42,6 +42,7 @@ export interface BaseDialogProps extends UnsafeStyleProps {
  isVisible?: boolean;
  hasBackdrop?: boolean;
  hasArrow?: boolean;
+  alwaysMounted?: boolean;

  children?: Slot;

@@ -69,6 +70,7 @@ export function CoreBaseDialog({
  isVisible,
  hasBackdrop,
  hasArrow,
+  alwaysMounted,

  children,

@@ -261,7 +263,7 @@ export function CoreBaseDialog({
    }
  }, [background]);

-  if (!isVisible) return null;
+  if (!isVisible && !alwaysMounted) return null;

  return (
    <div
@@ -270,6 +272,7 @@ export function CoreBaseDialog({
        hasBackdrop && css['has-backdrop'],
        isLockingScroll && css['is-locking-scroll'],
        typeof triggerRef === 'undefined' && css['is-centered'],
+        !isVisible && css['is-hidden'],
        css[variant]
      )}
      onClick={onClose}
--- a/packages/noodl-core-ui/src/components/popups/MenuDialog/MenuDialog.tsx
+++ b/packages/noodl-core-ui/src/components/popups/MenuDialog/MenuDialog.tsx
@@ -72,7 +72,7 @@ export function MenuDialog({
      hasArrow
    >
      <div className={classNames(css['Root'], css[width])} style={{ maxHeight: UNSAFE_maxHeight }}>
-        {items.map((item, i) => {
+        {items.filter(Boolean).map((item, i) => {
          if (item === 'divider') return <div className={css['Divider']} key={i} />;
          if (item?.isHidden) return null;

--- a/packages/noodl-core-ui/src/components/popups/Tooltip/Tooltip.tsx
+++ b/packages/noodl-core-ui/src/components/popups/Tooltip/Tooltip.tsx
@@ -11,7 +11,7 @@ import css from './Tooltip.module.scss';

 export interface TooltipProps extends UnsafeStyleProps {
  content: SingleSlot;
-  fineType?: string;
+  fineType?: string | string[];
  children: Slot;
  showAfterMs?: number;

@@ -79,9 +79,17 @@ export function Tooltip({

        {fineType && (
          <div className={css['FineType']}>
-            <Label size={LabelSize.Small} variant={TextType.Secondary}>
-              {fineType}
-            </Label>
+            {Array.isArray(fineType) ? (
+              fineType.map((x) => (
+                <Label size={LabelSize.Small} variant={TextType.Secondary}>
+                  {x}
+                </Label>
+              ))
+            ) : (
+              <Label size={LabelSize.Small} variant={TextType.Secondary}>
+                {fineType}
+              </Label>
+            )}
          </div>
        )}
      </BaseDialog>
--- a/packages/noodl-editor/build/icon.icns
+++ b/packages/noodl-editor/build/icon.icns
--- a/packages/noodl-editor/build/icon.ico
+++ b/packages/noodl-editor/build/icon.ico
--- a/packages/noodl-editor/build/icons/1024x1024.png
+++ b/packages/noodl-editor/build/icons/1024x1024.png
--- a/packages/noodl-editor/build/icons/128x128.png
+++ b/packages/noodl-editor/build/icons/128x128.png
--- a/packages/noodl-editor/build/icons/256x256.png
+++ b/packages/noodl-editor/build/icons/256x256.png
--- a/packages/noodl-editor/build/icons/32x32.png
+++ b/packages/noodl-editor/build/icons/32x32.png
--- a/packages/noodl-editor/build/icons/48x48.png
+++ b/packages/noodl-editor/build/icons/48x48.png
--- a/packages/noodl-editor/build/icons/512x512.png
+++ b/packages/noodl-editor/build/icons/512x512.png
--- a/packages/noodl-editor/build/icons/64x64.png
+++ b/packages/noodl-editor/build/icons/64x64.png
--- a/packages/noodl-editor/build/macos-notarize.js
+++ b/packages/noodl-editor/build/macos-notarize.js
@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-var electron_notarize = require('electron-notarize');

 module.exports = async function (params) {
  if (process.platform !== 'darwin') {
@@ -12,7 +11,7 @@ module.exports = async function (params) {
    return;
  }

-  const appId = 'noodl.net.noodl';
+  const appId = 'fluxscape.net.fluxscape';

  const appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`);
  if (!fs.existsSync(appPath)) {
@@ -22,6 +21,7 @@ module.exports = async function (params) {
  console.log(`Notarizing ${appId} found at ${appPath}`);

  try {
+    const electron_notarize = require('electron-notarize');
    await electron_notarize.notarize({
      appBundleId: appId,
      appPath: appPath,
--- a/packages/noodl-editor/package.json
+++ b/packages/noodl-editor/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "noodl-editor",
-  "productName": "Noodl Editor",
-  "description": "Low-code for when experience matter",
-  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://noodl.net",
-  "version": "1.0.1",
+  "name": "fluxscape-editor",
+  "productName": "Fluxscape",
+  "description": "Node-Based App Builder for Scalability & Rapid Development, a fork of Noodl",
+  "author": "Fluxscape <contact@fluxscape.io>",
+  "homepage": "https://fluxscape.io",
+  "version": "1.1.0",
  "main": "src/main/main.js",
  "scripts": {
    "build": "npx ts-node -P ./tsconfig.build.json ./scripts/build.ts",
@@ -15,17 +15,30 @@
    "test:ci": "webpack-cli --config=webpackconfigs/webpack.test-ci.js && electron test.js"
  },
  "build": {
-    "appId": "noodl.net.noodl-editor",
+    "appId": "fluxscape.net.fluxscape",
+    "afterSign": "./build/macos-notarize.js",
+    "mac": {
+      "hardenedRuntime": true,
+      "entitlements": "build/entitlements.mac.plist",
+      "extendInfo": {
+        "LSMultipleInstancesProhibited": true,
+        "NSMicrophoneUsageDescription": "Allow Fluxscape apps that you create and run to access the microphone?",
+        "NSCameraUsageDescription": "Allow Fluxscape apps that you create and run to access the camera?"
+      }
+    },
    "win": {
      "target": "nsis"
    },
    "nsis": {
-      "guid": "noodl.net.noodl-editor"
+      "guid": "fluxscape.net.fluxscape"
+    },
+    "linux": {
+      "target": "deb"
    },
    "protocols": {
-      "name": "noodl",
+      "name": "fluxscape",
      "schemes": [
-        "noodl"
+        "fluxscape"
      ]
    },
    "npmRebuild": false,
@@ -45,7 +58,7 @@
    ]
  },
  "dependencies": {
-    "@electron/remote": "^2.1.1",
+    "@electron/remote": "^2.1.2",
    "@jaames/iro": "^5.5.2",
    "@microsoft/fetch-event-source": "^2.0.1",
    "@noodl/git": "file:../noodl-git",
@@ -101,7 +114,7 @@
    "babel-loader": "^8.2.4",
    "concurrently": "^7.4.0",
    "css-loader": "^6.7.1",
-    "electron": "28.1.4",
+    "electron": "31.3.1",
    "electron-builder": "^24.9.1",
    "file-loader": "^6.2.0",
    "html-loader": "^3.1.0",
--- a/packages/noodl-editor/scripts/build.ts
+++ b/packages/noodl-editor/scripts/build.ts
@@ -7,6 +7,7 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms';
  // Inputs
  const DISABLE_SIGNING = valueToBoolean(process.env.DISABLE_SIGNING);
  const TARGET_PLATFORM = process.env.TARGET_PLATFORM;
+  const CSC_NAME = process.env.CSC_NAME;

  if (!TARGET_PLATFORM) throw new Error('TARGET_PLATFORM is falsy');

@@ -48,7 +49,7 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms';
      DISABLE_SIGNING
        ? {}
        : {
-            // CSC_NAME: 'Add signing name here'
+            CSC_NAME
          },
      process.env
    )
--- a/packages/noodl-editor/src/assets/icons/core-ui-temp/logo.svg
+++ b/packages/noodl-editor/src/assets/icons/core-ui-temp/logo.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21 8.46785C21 6.8533 20.0098 5.47016 18.6036 4.89221L18.4702 4.83923L18.8936 4.10593C19.0158 3.89432 18.8631 3.63006 18.6187 3.63006H14.8823C14.6382 3.63006 14.4855 3.89465 14.6074 4.10593L16.4756 7.34158C16.5978 7.55318 16.9032 7.55318 17.0251 7.34158L17.4956 6.52658L17.9396 6.72041C18.6089 7.02197 19.0747 7.69166 19.0747 8.46965C19.0747 8.76585 19.0073 9.04613 18.8868 9.29674L14.5003 18.6933C14.461 18.7753 14.4033 18.8507 14.3269 18.9132C14.0931 19.1046 13.7492 19.1043 13.5155 18.9126C13.4817 18.885 13.4519 18.8549 13.4252 18.8226L9.79186 14.368L8.7771 16.1566L11.9959 20.1111C12.4667 20.6461 13.1565 20.9834 13.9253 20.9834C14.983 20.9834 15.8915 20.3446 16.2856 19.4313L20.6354 10.1097C20.8692 9.61133 21 9.05499 21 8.46785Z" fill="white"/>
-<path d="M5.54434 16.485C5.5396 16.485 5.53486 16.4847 5.53012 16.4847C4.46423 16.4847 3.60013 17.3488 3.60013 18.4148C3.60013 19.4807 4.46423 20.3448 5.53012 20.3448C6.59607 20.3448 7.46017 19.4807 7.46017 18.4148C7.46017 18.0652 7.36723 17.7374 7.20477 17.4548L11.4253 9.67665C11.4315 9.6657 11.438 9.65475 11.4439 9.64381L11.4472 9.6385C11.7934 9.00136 11.9902 8.27128 11.9902 7.4951C11.9902 5.01255 9.97759 3 7.4951 3C5.01255 3 3 5.01255 3 7.4951C3 8.61075 3.40629 9.63139 4.07921 10.4173L6.37285 13.2269L7.39377 11.4513L5.53046 9.17183C5.15966 8.72644 4.91995 8.12039 4.91995 7.49538C4.91995 6.07641 6.0702 4.92616 7.48917 4.92616C8.90814 4.92616 10.0584 6.07641 10.0584 7.49538C10.0584 7.95466 9.93797 8.38583 9.72665 8.759L9.72546 8.76108L5.54434 16.485Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.609 9.22205H14.4786C15.5078 9.22205 16.3421 10.0512 16.3421 11.074C16.3421 12.0968 15.5078 12.9259 14.4786 12.9259L11.609 12.9259C10.9813 12.9259 10.4725 13.4316 10.4725 14.0555C10.4725 14.6793 10.9813 15.185 11.6091 15.185C13.5014 15.185 15.0357 16.7086 15.0377 18.5888V18.5961C15.0357 20.4763 13.5014 21.9999 11.609 21.9999H10.5656C10.2568 21.9999 10.0065 21.7512 10.0065 21.4443C10.0065 21.1374 10.2568 20.8887 10.5656 20.8887H11.609C12.2367 20.8887 12.7456 20.383 12.7456 19.7591C12.7456 19.1353 12.2368 18.6296 11.6091 18.6296C8.99654 18.6296 6.8784 16.526 6.87604 13.9302V13.9215C6.8784 11.3257 8.99654 9.22205 11.609 9.22205Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6087 2H18.537C19.8973 2 21 3.1027 21 4.46295C21 5.8232 19.8973 6.9259 18.5371 6.9259L11.6087 6.9259L11.6087 2ZM11.6087 8.25933L11.6087 6.9259L11.6087 2.00004L11.6085 2.00004C6.87488 2.00004 3.03361 5.79695 3 10.4934V10.6177C3.02455 14.0492 5.08185 17.0005 8.03472 18.3413C6.73836 17.3036 5.90846 15.7136 5.90692 13.9309V13.9209C5.90963 10.7936 8.46136 8.25933 11.6087 8.25933ZM11.6087 13.8888C11.6086 13.8888 11.6086 13.8888 11.6085 13.8888V14.2223C11.6086 14.2223 11.6086 14.2223 11.6087 14.2223L11.6087 13.8888ZM11.6089 6.92591H12.6504C12.0819 6.92893 11.6206 7.38207 11.6089 7.94502V6.92591Z" fill="white"/>
 </svg>
--- a/packages/noodl-editor/src/assets/images/getting-started-docs.png
+++ b/packages/noodl-editor/src/assets/images/getting-started-docs.png
--- a/packages/noodl-editor/src/assets/images/getting-started-vid-tuts.png
+++ b/packages/noodl-editor/src/assets/images/getting-started-vid-tuts.png
--- a/packages/noodl-editor/src/assets/images/ic_back.png
+++ b/packages/noodl-editor/src/assets/images/ic_back.png
--- a/packages/noodl-editor/src/assets/images/ic_logo.png
+++ b/packages/noodl-editor/src/assets/images/ic_logo.png
--- a/packages/noodl-editor/src/assets/images/icon.png
+++ b/packages/noodl-editor/src/assets/images/icon.png
--- a/packages/noodl-editor/src/assets/images/icon128.png
+++ b/packages/noodl-editor/src/assets/images/icon128.png
--- a/packages/noodl-editor/src/assets/images/icon48.png
+++ b/packages/noodl-editor/src/assets/images/icon48.png
--- a/packages/noodl-editor/src/assets/images/import-icon.png
+++ b/packages/noodl-editor/src/assets/images/import-icon.png
--- a/packages/noodl-editor/src/assets/images/outline-cloud_done-24px.svg
+++ b/packages/noodl-editor/src/assets/images/outline-cloud_done-24px.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM19 18H6c-2.21 0-4-1.79-4-4 0-2.05 1.53-3.76 3.56-3.97l1.07-.11.5-.95C8.08 7.14 9.94 6 12 6c2.62 0 4.88 1.86 5.39 4.43l.3 1.5 1.53.11c1.56.1 2.78 1.41 2.78 2.96 0 1.65-1.35 3-3 3zm-9-3.82l-2.09-2.09L6.5 13.5 10 17l6.01-6.01-1.41-1.41z"/></svg>
--- a/packages/noodl-editor/src/assets/images/personal.png
+++ b/packages/noodl-editor/src/assets/images/personal.png
--- a/packages/noodl-editor/src/assets/images/sharp-add-24px.svg
+++ b/packages/noodl-editor/src/assets/images/sharp-add-24px.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
--- a/packages/noodl-editor/src/assets/images/sharp-input-24px.svg
+++ b/packages/noodl-editor/src/assets/images/sharp-input-24px.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="M0 0h24v24H0V0z"/><path opacity=".87" d="M0 0h24v24H0V0z"/></g><path d="M21 3.01H3c-1.1 0-2 .9-2 2V9h2V4.99h18v14.03H3V15H1v4.01c0 1.1.9 1.98 2 1.98h18c1.1 0 2-.88 2-1.98v-14c0-1.11-.9-2-2-2zM11 16l4-4-4-4v3H1v2h10v3zM23 3.01H1V9h2V4.99h18v14.03H3V15H1v5.99h22V3.01zM11 16l4-4-4-4v3H1v2h10v3z"/></svg>
--- a/packages/noodl-editor/src/assets/images/sharp-library_books-24px.svg
+++ b/packages/noodl-editor/src/assets/images/sharp-library_books-24px.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M4 6H2v16h16v-2H4V6zm18-4H6v16h16V2zm-3 9H9V9h10v2zm-4 4H9v-2h6v2zm4-8H9V5h10v2z"/></svg>
--- a/packages/noodl-editor/src/assets/images/sharp-list-24px.svg
+++ b/packages/noodl-editor/src/assets/images/sharp-list-24px.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="M0 0h24v24H0V0z"/><path opacity=".87" d="M0 0h24v24H0V0z"/></g><path d="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 7v2h14V7H7zm-4 6h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 7v2h14V7H7z"/></svg>
--- a/packages/noodl-editor/src/assets/images/sharp-settings-24px.svg
+++ b/packages/noodl-editor/src/assets/images/sharp-settings-24px.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19.44 12.99l-.01.02c.04-.33.08-.67.08-1.01 0-.34-.03-.66-.07-.99l.01.02 2.44-1.92-2.43-4.22-2.87 1.16.01.01c-.52-.4-1.09-.74-1.71-1h.01L14.44 2H9.57l-.44 3.07h.01c-.62.26-1.19.6-1.71 1l.01-.01-2.88-1.17-2.44 4.22 2.44 1.92.01-.02c-.04.33-.07.65-.07.99 0 .34.03.68.08 1.01l-.01-.02-2.1 1.65-.33.26 2.43 4.2 2.88-1.15-.02-.04c.53.41 1.1.75 1.73 1.01h-.03L9.58 22h4.85s.03-.18.06-.42l.38-2.65h-.01c.62-.26 1.2-.6 1.73-1.01l-.02.04 2.88 1.15 2.43-4.2s-.14-.12-.33-.26l-2.11-1.66zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/></svg>
--- a/packages/noodl-editor/src/assets/images/start.png
+++ b/packages/noodl-editor/src/assets/images/start.png
--- a/packages/noodl-editor/src/assets/images/workspace.png
+++ b/packages/noodl-editor/src/assets/images/workspace.png
--- a/packages/noodl-editor/src/editor/index.html
+++ b/packages/noodl-editor/src/editor/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <title>Noodl</title>
+    <title>Fluxscape</title>
    <link href="../assets/lib/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
    <link href="../assets/css/style.css" rel="stylesheet" />

--- a/packages/noodl-editor/src/editor/src/constants/Keybindings.ts
+++ b/packages/noodl-editor/src/editor/src/constants/Keybindings.ts
@@ -2,6 +2,11 @@ import { Keybinding } from '@noodl-utils/keyboard/Keybinding';
 import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';

 export namespace Keybindings {
+  export const SEARCH = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_F);
+
+  export const CLOUD_SERVICE_OPEN_DASHBOARD = new Keybinding(KeyMod.CtrlCmd, KeyMod.Shift, KeyCode.KEY_P);
+  export const CLOUD_SERVICE_OPEN_DASHBOARD_BROWSER = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_P);
+
  export const REFRESH_PREVIEW = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_R);
  export const OPEN_DEVTOOLS = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_D);
  export const OPEN_CLOUD_DEVTOOLS = new Keybinding(KeyMod.CtrlCmd, KeyMod.Shift, KeyCode.KEY_R);
--- a/packages/noodl-editor/src/editor/src/contexts/NodeReferencesContext/NodeReferencesContext.tsx
+++ b/packages/noodl-editor/src/editor/src/contexts/NodeReferencesContext/NodeReferencesContext.tsx
@@ -0,0 +1,142 @@
+import React, { createContext, useContext, useState, useEffect } from 'react';
+
+import { type ComponentModel } from '@noodl-models/componentmodel';
+import { type NodeGraphNode } from '@noodl-models/nodegraphmodel';
+import { type NodeLibraryNodeType } from '@noodl-models/nodelibrary';
+import { type Slot } from '@noodl-core-ui/types/global';
+import { ProjectModel } from '@noodl-models/projectmodel';
+import { EventDispatcher } from '../../../../shared/utils/EventDispatcher';
+
+export type NodeReference = {
+  type: NodeLibraryNodeType | undefined;
+  displayName: string;
+  referenaces: {
+    displayName: string;
+    node?: NodeGraphNode;
+    component: ComponentModel;
+  }[];
+};
+
+export interface NodeReferencesContext {
+  nodeReferences: NodeReference[];
+}
+
+const NodeReferencesContext = createContext<NodeReferencesContext>({
+  nodeReferences: [],
+});
+
+// Since all the editor code is not written in React we need a way to be able to
+// access this information outside of React too.
+let HACK_nodeReferences: NodeReference[] = [];
+export function HACK_findNodeReference(componentName: string): NodeReference | undefined {
+  return HACK_nodeReferences.find(x => x.type?.fullName === componentName);
+}
+
+
+export interface NodeReferencesContextProps {
+  children: Slot;
+}
+
+export function NodeReferencesContextProvider({ children }: NodeReferencesContextProps) {
+  const [group] = useState({});
+  const [nodeReferences, setNodeReferences] = useState<NodeReference[]>([]);
+
+  useEffect(() => {
+    function updateIndex() {
+      const types: { [key: string]: NodeReference['type'] } = {};
+      const references = new Map<string, NodeReference['referenaces']>();
+
+      function handleComponent(component: ComponentModel) {
+        component.forEachNode((node: NodeGraphNode) => {
+          const name = node.type.name;
+
+          // Add the reference
+          references.set(name, [
+            ...(references.get(name) || []),
+            {
+              displayName: component.displayName || component.name,
+              node,
+              component
+            }
+          ]);
+
+          // Repeater
+          if (name === 'For Each' && node.parameters.template) {
+            const templateComponent = ProjectModel.instance.getComponentWithName(node.parameters.template);
+
+            if (templateComponent) {
+              references.set(templateComponent.fullName, [
+                ...(references.get(templateComponent.fullName) || []),
+                {
+                  displayName: component.displayName || component.name,
+                  node,
+                  component
+                }
+              ]);
+
+              handleComponent(templateComponent);
+            }
+          }
+
+          // Add some metadata for this node if we dont have it yet.
+          if (!types[name]) {
+            types[name] = node.type;
+          }
+        });
+      }
+
+      // Loop all the nodes in the project
+      ProjectModel.instance.forEachComponent(handleComponent);
+
+      // Combine the result to look a little better.
+      const results: NodeReference[] = Array.from(references.keys())
+        .map((key) => ({
+          type: types[key],
+          displayName: types[key]?.displayName || key,
+          referenaces: references.get(key)
+        }))
+        .sort((a, b) => b.referenaces.length - a.referenaces.length);
+
+      HACK_nodeReferences = results;
+      setNodeReferences(results);
+    }
+
+    updateIndex();
+
+    EventDispatcher.instance.on(
+      [
+        'Model.nodeAdded',
+        'Model.nodeRemoved',
+        'Model.componentAdded',
+        'Model.componentRemoved',
+        'Model.componentRenamed'
+      ],
+      updateIndex,
+      group
+    );
+
+    return function () {
+      EventDispatcher.instance.off(group);
+    };
+  }, []);
+
+  return (
+    <NodeReferencesContext.Provider
+      value={{
+        nodeReferences,
+      }}
+    >
+      {children}
+    </NodeReferencesContext.Provider>
+  );
+}
+
+export function useNodeReferencesContext() {
+  const context = useContext(NodeReferencesContext);
+
+  if (context === undefined) {
+    throw new Error('useNodeReferencesContext must be a child of NodeReferencesContextProvider');
+  }
+
+  return context;
+}
--- a/packages/noodl-editor/src/editor/src/contexts/NodeReferencesContext/index.ts
+++ b/packages/noodl-editor/src/editor/src/contexts/NodeReferencesContext/index.ts
@@ -0,0 +1 @@
+export * from './NodeReferencesContext';
--- a/packages/noodl-editor/src/editor/src/contexts/PluginContext/PluginContext.tsx
+++ b/packages/noodl-editor/src/editor/src/contexts/PluginContext/PluginContext.tsx
@@ -0,0 +1,35 @@
+import React, { createContext, useContext, useEffect } from 'react';
+
+import { Slot } from '@noodl-core-ui/types/global';
+
+import { commandEventHandler } from './iframe';
+
+export interface PluginContext {}
+
+const PluginContext = createContext<PluginContext>({});
+
+export interface PluginContextProps {
+  children: Slot;
+}
+
+export function PluginContextProvider({ children }: PluginContextProps) {
+  // Listen for all the iframe commands
+  useEffect(() => {
+    window.addEventListener('message', commandEventHandler, false);
+    return function () {
+      window.removeEventListener('message', commandEventHandler, false);
+    };
+  }, []);
+
+  return <PluginContext.Provider value={{}}>{children}</PluginContext.Provider>;
+}
+
+export function usePluginContext() {
+  const context = useContext(PluginContext);
+
+  if (context === undefined) {
+    throw new Error('usePluginContext must be a child of PluginContextProvider');
+  }
+
+  return context;
+}
--- a/packages/noodl-editor/src/editor/src/contexts/PluginContext/commands/notify.ts
+++ b/packages/noodl-editor/src/editor/src/contexts/PluginContext/commands/notify.ts
@@ -0,0 +1,24 @@
+import { ToastLayer } from '../../../views/ToastLayer';
+
+export type Command = {
+  kind: 'notify';
+  messageType: 'info' | 'success' | 'error';
+  message: string;
+};
+
+export async function execute(command: Command, _event: MessageEvent) {
+  switch (command.messageType || 'info') {
+    case 'info': {
+      ToastLayer.showInteraction(String(command.message));
+      break;
+    }
+    case 'success': {
+      ToastLayer.showSuccess(String(command.message));
+      break;
+    }
+    case 'error': {
+      ToastLayer.showError(String(command.message));
+      break;
+    }
+  }
+}
--- a/packages/noodl-editor/src/editor/src/contexts/PluginContext/commands/upload-aws-s3.ts
+++ b/packages/noodl-editor/src/editor/src/contexts/PluginContext/commands/upload-aws-s3.ts
@@ -0,0 +1,169 @@
+import s3 from 's3';
+import { filesystem, platform } from '@noodl/platform';
+
+import { Environment, EnvironmentDataFormat } from '@noodl-models/CloudServices';
+import { ProjectModel } from '@noodl-models/projectmodel';
+import { createEditorCompilation } from '@noodl-utils/compilation/compilation.editor';
+import { guid } from '@noodl-utils/utils';
+
+import { ToastLayer } from '../../../views/ToastLayer';
+
+export type Command = {
+  kind: 'upload-aws-s3';
+  taskId: string;
+  cloudService: EnvironmentDataFormat;
+  s3: {
+    accessKeyId: string;
+    secretAccessKey: string;
+    sessionToken: string;
+    region: string;
+    bucket: string;
+    prefix: string;
+  }
+  messages: {
+    progress: string;
+    success: string;
+    failure: string;
+  }
+  // Initial version to a more extendable system that can be used with these
+  // kind of events.
+  events: {
+    complete: {
+      kind: "fetch",
+      resource: string,
+      options: RequestInit
+    }[]
+  }
+};
+
+export async function execute(command: Command, event: MessageEvent) {
+  const project = ProjectModel.instance;
+  const taskId = command.taskId || guid();
+
+  // Setup the build steps
+  const compilation = createEditorCompilation(project).addProjectBuildScripts();
+
+  // Create a temp folder
+  const tempDir = platform.getTempPath() + '/upload-' + taskId;
+
+  // Deploy to temp folder
+  await compilation.deployToFolder(tempDir, {
+    environment: command.cloudService ? new Environment(command.cloudService) : undefined
+  });
+
+  // Upload to S3
+  try {
+    await uploadDirectory(
+      {
+        localDir: tempDir,
+        accessKeyId: command.s3.accessKeyId,
+        secretAccessKey: command.s3.secretAccessKey,
+        sessionToken: command.s3.sessionToken,
+        region: command.s3.region,
+        bucket: command.s3.bucket,
+        prefix: command.s3.prefix
+      },
+      ({ progress, total }) => {
+        ToastLayer.showProgress(command.messages.progress, (progress / total) * 100, taskId);
+      }
+    );
+
+    ToastLayer.showSuccess(command.messages.success);
+  } catch (error) {
+    console.error(error);
+    ToastLayer.showError(command.messages.failure);
+  } finally {
+    ToastLayer.hideProgress(taskId);
+  }
+
+  // Clean up the temp folder
+  filesystem.removeDirRecursive(tempDir);
+
+  // NOTE: Would be nice to clean up the events in here, so "complete" is like
+  // "finally". And then also have "success" and "failure".
+
+  // Notify that the process is done
+  event.source.postMessage({
+    kind: "upload-aws-s3",
+    id: taskId,
+    status: "complete",
+  }, { targetOrigin: event.origin })
+
+  // Execute complete event
+  if (Array.isArray(command?.events?.complete)) {
+    for (const event of command.events.complete) {
+      if (event.kind === "fetch") {
+        await fetch(event.resource, event.options);
+      } else {
+        console.error("invalid event type", event);
+      }
+    }
+  }
+}
+
+function uploadDirectory(
+  options: {
+    localDir: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    sessionToken: string;
+    region: string;
+    bucket: string;
+    prefix: string;
+  },
+  progress: (args: { progress: number; total: number }) => void
+) {
+  return new Promise<void>((resolve, reject) => {
+    // https://github.com/noodlapp/node-s3-client?tab=readme-ov-file#create-a-client
+    const client = s3.createClient({
+      maxAsyncS3: 20, // this is the default
+      s3RetryCount: 3, // this is the default
+      s3RetryDelay: 1000, // this is the default
+      multipartUploadThreshold: 20971520, // this is the default (20 MB)
+      multipartUploadSize: 15728640, // this is the default (15 MB)
+      s3Options: {
+        accessKeyId: options.accessKeyId,
+        secretAccessKey: options.secretAccessKey,
+        sessionToken: options.sessionToken,
+        region: options.region
+      }
+    });
+
+    function getFileCacheControl(fullPath: string) {
+      switch (fullPath.split('.').at(-1)) {
+        case 'html':
+          return 'no-cache';
+        default: {
+          const TIME_1 = 31536000; // 365 days
+          const TIME_2 = 10800; // 3 hours for files with hash
+          const maxAge = /-[a-f0-9]{16}\./.test(fullPath) ? TIME_1 : TIME_2;
+          return `public, max-age=${maxAge}`;
+        }
+      }
+    }
+
+    const uploader = client.uploadDir({
+      localDir: options.localDir,
+      deleteRemoved: true,
+      s3Params: {
+        Bucket: options.bucket,
+        Prefix: options.prefix
+      },
+      getS3Params(fullPath, _s3Object, callback) {
+        callback(null, {
+          CacheControl: getFileCacheControl(fullPath)
+        });
+      }
+    });
+
+    uploader.on('error', function (error) {
+      reject(error);
+    });
+    uploader.on('progress', function () {
+      progress({ progress: uploader.progressAmount, total: uploader.progressTotal });
+    });
+    uploader.on('end', function () {
+      resolve();
+    });
+  });
+}
--- a/packages/noodl-editor/src/editor/src/contexts/PluginContext/iframe.ts
+++ b/packages/noodl-editor/src/editor/src/contexts/PluginContext/iframe.ts
@@ -0,0 +1,19 @@
+import * as Notify from './commands/notify';
+import * as UploadAwsS3 from './commands/upload-aws-s3';
+
+type IFrameCommand = Notify.Command | UploadAwsS3.Command;
+
+const commands: Record<IFrameCommand['kind'], (command: IFrameCommand, event: MessageEvent) => Promise<void>> = {
+  notify: Notify.execute,
+  'upload-aws-s3': UploadAwsS3.execute
+};
+
+export function commandEventHandler(event: MessageEvent) {
+  try {
+    const command = event.data;
+    const handler = commands[command.kind];
+    handler && handler(command, event);
+  } catch (error) {
+    console.error(error);
+  }
+}
--- a/packages/noodl-editor/src/editor/src/contexts/PluginContext/index.ts
+++ b/packages/noodl-editor/src/editor/src/contexts/PluginContext/index.ts
@@ -0,0 +1 @@
+export * from './PluginContext';
--- a/packages/noodl-editor/src/editor/src/models/AiAssistant/context/ai-api.ts
+++ b/packages/noodl-editor/src/editor/src/models/AiAssistant/context/ai-api.ts
@@ -38,7 +38,7 @@ async function directChatOpenAi({ messages, provider, abortController, onEnd, on
      stream: true
    }),
    async onopen(response) {
-      if (response.ok && response.headers.get('content-type') === EventStreamContentType) {
+      if (response.ok && response.headers.get('content-type').includes(EventStreamContentType)) {
        return; // everything's good
      } else if (response.status >= 400 && response.status < 500 && response.status !== 429) {
        // client-side errors are usually non-retriable:
--- a/packages/noodl-editor/src/editor/src/models/CloudServices/ExternalCloudService.ts
+++ b/packages/noodl-editor/src/editor/src/models/CloudServices/ExternalCloudService.ts
@@ -3,7 +3,7 @@ import { JSONStorage } from '@noodl/platform';
 import { CreateEnvironment, CreateEnvironmentRequest, UpdateEnvironmentRequest } from '@noodl-models/CloudServices';

 /** The data format is separated from our internal model. */
-type EnvironmentDataFormat = {
+export type EnvironmentDataFormat = {
  enabled: boolean;
  id: string;
  name: string;
--- a/packages/noodl-editor/src/editor/src/models/NodeTypeAdapters/CloudFunctionAdapter.ts
+++ b/packages/noodl-editor/src/editor/src/models/NodeTypeAdapters/CloudFunctionAdapter.ts
@@ -57,10 +57,13 @@ export class CloudFunctionAdapter extends NodeTypeAdapter {

    // Collect all cloud function components
    const functionRequestNodes = ProjectModel.instance.getNodesWithType('noodl.cloud.request');
-    const functions = functionRequestNodes.map((r) => {
-      const component = r.owner.owner;
-      return component.fullName;
-    });
+    const functions = functionRequestNodes
+      .map((r) => {
+        const component = r.owner.owner;
+        return component.fullName;
+      })
+      // Remove all the Cloud Trigger functions
+      .filter((x) => !x.startsWith('/#__cloud__/__noodl_cloud_triggers__'));

    ports.push({
      plug: 'input',
--- a/packages/noodl-editor/src/editor/src/pages/AppRoute.ts
+++ b/packages/noodl-editor/src/editor/src/pages/AppRoute.ts
@@ -1,4 +1,4 @@
-import { AppRouter } from "noodl-editor/src/editor/src/pages/AppRouter";
+import { AppRouter } from "./AppRouter";

 export class AppRoute {
  constructor(public readonly router: AppRouter) {}
--- a/packages/noodl-editor/src/editor/src/pages/EditorPage/EditorPage.tsx
+++ b/packages/noodl-editor/src/editor/src/pages/EditorPage/EditorPage.tsx
@@ -1,4 +1,6 @@
 import { NodeGraphContextProvider } from '@noodl-contexts/NodeGraphContext/NodeGraphContext';
+import { NodeReferencesContextProvider } from '@noodl-contexts/NodeReferencesContext';
+import { PluginContextProvider } from '@noodl-contexts/PluginContext';
 import { ProjectDesignTokenContextProvider } from '@noodl-contexts/ProjectDesignTokenContext';
 import { useKeyboardCommands } from '@noodl-hooks/useKeyboardCommands';
 import { useModel } from '@noodl-hooks/useModel';
@@ -6,6 +8,7 @@ import { ipcRenderer } from 'electron';
 import React, { useEffect, useState } from 'react';
 import { platform } from '@noodl/platform';

+import { Keybindings } from '@noodl-constants/Keybindings';
 import { App } from '@noodl-models/app';
 import { AppRegistry } from '@noodl-models/app_registry';
 import { CloudService } from '@noodl-models/CloudServices';
@@ -154,7 +157,7 @@ export function EditorPage({ route }: EditorPageProps) {
  useKeyboardCommands(() => [
    {
      handler: () => SidebarModel.instance.switch('search'),
-      keybinding: KeyMod.CtrlCmd | KeyCode.KEY_F
+      keybinding: Keybindings.SEARCH.hash
    },
    {
      handler: () => EventDispatcher.instance.emit('viewer-open-devtools'),
@@ -222,26 +225,30 @@ export function EditorPage({ route }: EditorPageProps) {

  return (
    <NodeGraphContextProvider>
-      <ProjectDesignTokenContextProvider>
-        <BaseWindow>
-          {isLoading ? (
-            <ActivityIndicator />
-          ) : (
-            <>
-              <FrameDivider
-                first={<SidePanel />}
-                second={<ErrorBoundary>{Boolean(Document) && <Document />}</ErrorBoundary>}
-                sizeMin={200}
-                size={frameDividerSize}
-                horizontal
-                onSizeChanged={setFrameDividerSize}
-              />
+      <NodeReferencesContextProvider>
+        <ProjectDesignTokenContextProvider>
+          <PluginContextProvider>
+            <BaseWindow>
+              {isLoading ? (
+                <ActivityIndicator />
+              ) : (
+                <>
+                  <FrameDivider
+                    first={<SidePanel />}
+                    second={<ErrorBoundary>{Boolean(Document) && <Document />}</ErrorBoundary>}
+                    sizeMin={200}
+                    size={frameDividerSize}
+                    horizontal
+                    onSizeChanged={setFrameDividerSize}
+                  />

-              {Boolean(lesson) && <Frame instance={lesson} isContentSize isFitWidth />}
-            </>
-          )}
-        </BaseWindow>
-      </ProjectDesignTokenContextProvider>
+                  {Boolean(lesson) && <Frame instance={lesson} isContentSize isFitWidth />}
+                </>
+              )}
+            </BaseWindow>
+          </PluginContextProvider>
+        </ProjectDesignTokenContextProvider>
+      </NodeReferencesContextProvider>
    </NodeGraphContextProvider>
  );
 }
--- a/packages/noodl-editor/src/editor/src/pages/ProjectsPage/ProjectsPage.tsx
+++ b/packages/noodl-editor/src/editor/src/pages/ProjectsPage/ProjectsPage.tsx
@@ -109,7 +109,7 @@ function TopBar({ showSpinner, setShowSpinner }: TopBarProps) {
          }}
        />
        <TextButton label="Docs" onClick={() => platform.openExternal(getDocsEndpoint())} />
-        <TextButton label="Community" onClick={() => platform.openExternal('https://www.noodl.net/community')} />
+        <TextButton label="Community" onClick={() => platform.openExternal('https://www.fluxscape.io/community')} />
      </HStack>
    </div>
  );
--- a/packages/noodl-editor/src/editor/src/router.setup.ts
+++ b/packages/noodl-editor/src/editor/src/router.setup.ts
@@ -1,7 +1,6 @@
 import { AppRegistry } from '@noodl-models/app_registry';
 import { SidebarModel } from '@noodl-models/sidebar';
-import { Keybinding } from '@noodl-utils/keyboard/Keybinding';
-import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
+import { Keybindings } from '@noodl-constants/Keybindings';

 import { IconName } from '@noodl-core-ui/components/common/Icon';

@@ -69,7 +68,7 @@ export function installSidePanel({ isLesson }: SetupEditorOptions) {
  SidebarModel.instance.register({
    id: 'search',
    name: 'Search',
-    fineType: new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_F).label,
+    fineType: Keybindings.SEARCH.label,
    order: 2,
    icon: IconName.Search,
    panel: SearchPanel
--- a/packages/noodl-editor/src/editor/src/utils/LocalProjectsModel.ts
+++ b/packages/noodl-editor/src/editor/src/utils/LocalProjectsModel.ts
@@ -16,6 +16,7 @@ import { projectFromDirectory, unzipIntoDirectory } from '../models/projectmodel
 import FileSystem from './filesystem';
 import { tracker } from './tracker';
 import { guid } from './utils';
+import { getTopLevelWorkingDirectory } from '@noodl/git/src/core/open';

 export interface ProjectItem {
  id: string;
@@ -267,12 +268,15 @@ export class LocalProjectsModel extends Model {
    });
  }

-  isGitProject(project: ProjectModel): boolean {
-    // TODO: check if there's is git in any parent folder too
-
-    // Check if the git folder exists.
-    const gitPath = filesystem.join(project._retainedProjectDirectory, '.git');
-    return filesystem.exists(gitPath);
+  /**
+   * Check if this project is in a git repository.
+   *
+   * @param project 
+   * @returns 
+   */
+  async isGitProject(project: ProjectModel): Promise<boolean> {
+    const gitPath = await getTopLevelWorkingDirectory(project._retainedProjectDirectory);
+    return gitPath !== null;
  }

  setCurrentGlobalGitAuth(projectId: string) {
--- a/packages/noodl-editor/src/editor/src/utils/compilation/build/deploy-index.ts
+++ b/packages/noodl-editor/src/editor/src/utils/compilation/build/deploy-index.ts
@@ -67,6 +67,14 @@ async function _writeFileToFolder({
  runtimeType
 }: WriteFileToFolderArgs) {
  const fullPath = filesystem.join(getExternalFolderPath(), runtimeType, url);
+
+  if (!filesystem.exists(fullPath)) {
+    // TODO: Save this warning somewhere, usually, this is not an issue though.
+    // This occurred because building in dev mode does not create the source map
+    // files which it expects to copy over.
+    return;
+  }
+
  let content = await filesystem.readFile(fullPath);
  let filename = url;

--- a/packages/noodl-editor/src/editor/src/utils/compilation/build/processors/html-processor.ts
+++ b/packages/noodl-editor/src/editor/src/utils/compilation/build/processors/html-processor.ts
@@ -41,7 +41,7 @@ export class HtmlProcessor {
      baseUrl = baseUrl + '/';
    }

-    const title = parameters.title || settings.htmlTitle || 'Noodl Viewer';
+    const title = parameters.title || settings.htmlTitle || 'Fluxscape Viewer';
    let headCode = settings.headCode || '';

    if (parameters.headCode) {
--- a/packages/noodl-editor/src/editor/src/utils/compilation/passes/deploy-cloud-functions.ts
+++ b/packages/noodl-editor/src/editor/src/utils/compilation/passes/deploy-cloud-functions.ts
@@ -74,7 +74,13 @@ export const deployCloudFunctionBuildScript: BuildScript = {
              'X-Parse-Application-Id': environment.appId,
              'X-Parse-Master-Key': environment.masterKey
            },
-            body: JSON.stringify({ deploy: json, runtime: manifest.version })
+            body: JSON.stringify({
+              // Project ID, let the server know about which project is pushing changes.
+              projectId: context.project.id,
+              projectName: context.project.name,
+              deploy: json,
+              runtime: manifest.version
+            })
          });

          // NOTE: Expecting that we always get a JSON response
--- a/packages/noodl-editor/src/editor/src/utils/forge/template/providers/noodl-docs-template-provider.ts
+++ b/packages/noodl-editor/src/editor/src/utils/forge/template/providers/noodl-docs-template-provider.ts
@@ -6,7 +6,7 @@ import { ITemplateProvider, ProgressCallback, TemplateItem, TemplateListFilter }
 */
 export class NoodlDocsTemplateProvider implements ITemplateProvider {
  get name(): string {
-    return 'https://docs.noodl.net';
+    return this.getDocsEndpoint() || 'https://docs.fluxscape.io';
  }

  constructor(private readonly getDocsEndpoint: () => string) {}
--- a/packages/noodl-editor/src/editor/src/utils/getDocsEndpoint.ts
+++ b/packages/noodl-editor/src/editor/src/utils/getDocsEndpoint.ts
@@ -2,5 +2,5 @@ const remote = require('@electron/remote');

 export default function getDocsEndpoint() {
  const localDocs = remote.getGlobal('useLocalDocs');
-  return localDocs ? 'http://localhost:3000' : 'https://noodlapp.github.io/noodl-docs/';
+  return localDocs ? 'http://localhost:3000' : 'https://docs.fluxscape.io';
 }
--- a/packages/noodl-editor/src/editor/src/utils/projectmerger.diff.ts
+++ b/packages/noodl-editor/src/editor/src/utils/projectmerger.diff.ts
@@ -11,6 +11,14 @@ export interface ArrayDiff<T> {
  changed: T[];
  unchanged: T[];
 }
+export function createEmptyArrayDiff<T>(): ArrayDiff<T> {
+  return {
+    deleted: [],
+    created: [],
+    changed: [],
+    unchanged: [],
+  }
+}

 export interface ProjectDiffItem {
  graph: TSFixme;
--- a/packages/noodl-editor/src/editor/src/utils/schemahandler.ts
+++ b/packages/noodl-editor/src/editor/src/utils/schemahandler.ts
@@ -13,6 +13,7 @@ export default class SchemaHandler {
  public dbCollections: TSFixme[];
  public systemCollections: TSFixme[];
  public configSchema: TSFixme;
+  public parseServerVersion: string;

  constructor() {
    EventDispatcher.instance.on(
@@ -119,6 +120,20 @@ export default class SchemaHandler {
            console.log(e);
          }
        });
+
+        // Get Parse Server Version & Supported features
+        fetch(environment.url + '/serverInfo', {
+          method: 'POST',
+          body: JSON.stringify({
+            "_method": "GET",
+            "_ApplicationId": environment.appId,
+            "_MasterKey": environment.masterKey,
+          })
+        })
+          .then((response) => response.json())
+          .then((json) => {
+            this.parseServerVersion = json.parseServerVersion;
+          });
      });
    });
  }
@@ -129,10 +144,20 @@ export default class SchemaHandler {
        ProjectModel.instance.setMetaData('dbCollections', this.dbCollections);
        ProjectModel.instance.setMetaData('systemCollections', this.systemCollections);
        ProjectModel.instance.setMetaData('dbConfigSchema', this.configSchema);
+
+        const versionNumbers = this.parseServerVersion?.split(".")
+        if (versionNumbers && versionNumbers.length > 0) {
+          // Let's only save the major version number,
+          // since this will be used to determine which verison of the API to use.
+          ProjectModel.instance.setMetaData('dbVersionMajor', versionNumbers[0]);
+        } else {
+          ProjectModel.instance.setMetaData('dbVersionMajor', undefined);
+        }
      } else {
        ProjectModel.instance.setMetaData('dbCollections', undefined);
        ProjectModel.instance.setMetaData('systemCollections', undefined);
        ProjectModel.instance.setMetaData('dbConfigSchema', undefined);
+        ProjectModel.instance.setMetaData('dbVersionMajor', undefined);
      }
    }
  }
--- a/packages/noodl-editor/src/editor/src/views/DeployPopup/DeployPopup.tsx
+++ b/packages/noodl-editor/src/editor/src/views/DeployPopup/DeployPopup.tsx
@@ -1,5 +1,7 @@
 import React, { RefObject } from 'react';

+import { ProjectModel } from '@noodl-models/projectmodel';
+
 import { ActivityIndicator } from '@noodl-core-ui/components/common/ActivityIndicator';
 import { BaseDialog } from '@noodl-core-ui/components/layout/BaseDialog';
 import { Tabs } from '@noodl-core-ui/components/layout/Tabs';
@@ -25,7 +27,12 @@ function DeployPopupChild() {
      >
        <PopupSection title="Deploy options" />

-        <Tabs tabs={[{ label: 'Self Hosting', content: <DeployToFolderTab />, testId: 'self-hosting-tab-button' }]} />
+        <Tabs
+          tabs={[
+            { label: 'Fluxscape', content: <FluxscapeDeployTab />, testId: 'fluxscape-tab-button' },
+            { label: 'Self Hosting', content: <DeployToFolderTab />, testId: 'self-hosting-tab-button' }
+          ]}
+        />

        {hasActivity && <ActivityIndicator isOverlay />}
      </div>
@@ -48,9 +55,28 @@ export function DeployPopup(props: DeployPopupProps) {
        onClose={props.onClose}
        hasArrow
        isLockingScroll
+        alwaysMounted
      >
        <DeployPopupChild />
      </BaseDialog>
    </DeployContextProvider>
  );
 }
+
+function FluxscapeDeployTab() {
+  const params = {};
+
+  const projectId = ProjectModel.instance.id;
+  if (projectId) {
+    params['projectId'] = projectId;
+  }
+
+  const urlParams = new URLSearchParams(params);
+
+  return (
+    <iframe
+      src={`https://portal.fluxscape.io/?${urlParams.toString()}`}
+      style={{ width: '100%', height: '50vh', borderStyle: 'none' }}
+    />
+  );
+}
--- a/packages/noodl-editor/src/editor/src/views/VisualCanvas/CanvasView.ts
+++ b/packages/noodl-editor/src/editor/src/views/VisualCanvas/CanvasView.ts
@@ -96,6 +96,12 @@ export class CanvasView extends View {
            });
          }
        });
+
+        // Patch to open the next window in the same webview.
+        // Since we don't support multiple webviews.
+        window.open = function (url) {
+          window.location.href = url;
+        }
      `;

      webview.executeJavaScript(code);
--- a/packages/noodl-editor/src/editor/src/views/panels/CloudServicePanel/CloudServiceCard/CloudServiceCard.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/CloudServicePanel/CloudServiceCard/CloudServiceCard.tsx
@@ -1,13 +1,16 @@
 import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';

+import { Keybindings } from '@noodl-constants/Keybindings';
 import { Environment } from '@noodl-models/CloudServices';
 import ParseDashboardServer from '@noodl-utils/parsedashboardserver';

 import { Icon, IconName, IconSize } from '@noodl-core-ui/components/common/Icon';
 import { IconButton, IconButtonState, IconButtonVariant } from '@noodl-core-ui/components/inputs/IconButton';
 import { PrimaryButton, PrimaryButtonSize, PrimaryButtonVariant } from '@noodl-core-ui/components/inputs/PrimaryButton';
+import { DialogRenderDirection } from '@noodl-core-ui/components/layout/BaseDialog';
 import { Collapsible } from '@noodl-core-ui/components/layout/Collapsible';
+import { Tooltip } from '@noodl-core-ui/components/popups/Tooltip';
 import { Label, LabelSpacingSize } from '@noodl-core-ui/components/typography/Label';
 import { Text, TextType } from '@noodl-core-ui/components/typography/Text';

@@ -118,12 +121,21 @@ export function CloudServiceCard({
          </div>

          {isEditorEnvironment && (
-            <PrimaryButton
-              label="Open dashboard"
-              size={PrimaryButtonSize.Small}
-              onClick={onDashboardClicked}
-              isGrowing
-            />
+            <Tooltip
+              content="Open the Parse Dashboard"
+              fineType={[
+                `In Window: ${Keybindings.CLOUD_SERVICE_OPEN_DASHBOARD.label}`,
+                `In Browser: ${Keybindings.CLOUD_SERVICE_OPEN_DASHBOARD_BROWSER.label}`
+              ]}
+              renderDirection={DialogRenderDirection.Below}
+            >
+              <PrimaryButton
+                label="Open dashboard"
+                size={PrimaryButtonSize.Small}
+                onClick={onDashboardClicked}
+                isGrowing
+              />
+            </Tooltip>
          )}
        </div>
      </div>
--- a/packages/noodl-editor/src/editor/src/views/panels/NodeReferencesPanel/NodeReferencesPanel.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/NodeReferencesPanel/NodeReferencesPanel.tsx
@@ -1,14 +1,12 @@
 import { NodeGraphContextTmp } from '@noodl-contexts/NodeGraphContext/NodeGraphContext';
+import { type NodeReference, useNodeReferencesContext } from '@noodl-contexts/NodeReferencesContext';
 import { useFocusRefOnPanelActive } from '@noodl-hooks/useFocusRefOnPanelActive';
 import { useNodeLibraryLoaded } from '@noodl-hooks/useNodeLibraryLoaded';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';

 import { INodeColorScheme } from '@noodl-types/nodeTypes';
-import { ComponentModel } from '@noodl-models/componentmodel';
-import { NodeGraphNode } from '@noodl-models/nodegraphmodel';
-import { NodeLibrary, NodeLibraryNodeType } from '@noodl-models/nodelibrary';
+import { NodeLibrary } from '@noodl-models/nodelibrary';
 import { BasicNodeType } from '@noodl-models/nodelibrary/BasicNodeType';
-import { ProjectModel } from '@noodl-models/projectmodel';

 import { EditorNode } from '@noodl-core-ui/components/common/EditorNode';
 import { IconName, IconSize } from '@noodl-core-ui/components/common/Icon';
@@ -26,113 +24,17 @@ import { Section, SectionVariant } from '@noodl-core-ui/components/sidebar/Secti
 import { Label } from '@noodl-core-ui/components/typography/Label';

 import { NodeReferencesPanel_ID } from '.';
-import { EventDispatcher } from '../../../../../shared/utils/EventDispatcher';
-
-type ResultItem = {
-  type: NodeLibraryNodeType;
-  displayName: string;
-  referenaces: {
-    displayName: string;
-    node?: NodeGraphNode;
-    component: ComponentModel;
-  }[];
-};
-
-function useNodeReferences() {
-  const [group] = useState({});
-  const [result, setResult] = useState<ResultItem[]>([]);
-
-  useEffect(() => {
-    function updateIndex() {
-      const types: { [key: string]: ResultItem['type'] } = {};
-      const references = new Map<string, ResultItem['referenaces']>();
-
-      function handleComponent(component: ComponentModel) {
-        component.forEachNode((node: NodeGraphNode) => {
-          const name = node.type.name;
-
-          // Add the reference
-          references.set(name, [
-            ...(references.get(name) || []),
-            {
-              displayName: component.displayName || component.name,
-              node,
-              component
-            }
-          ]);
-
-          // Repeater
-          if (name === 'For Each' && node.parameters.template) {
-            const templateComponent = ProjectModel.instance.getComponentWithName(node.parameters.template);
-
-            if (templateComponent) {
-              references.set(templateComponent.fullName, [
-                ...(references.get(templateComponent.fullName) || []),
-                {
-                  displayName: component.displayName || component.name,
-                  node,
-                  component
-                }
-              ]);
-
-              handleComponent(templateComponent);
-            }
-          }
-
-          // Add some metadata for this node if we dont have it yet.
-          if (!types[name]) {
-            types[name] = node.type;
-          }
-        });
-      }
-
-      // Loop all the nodes in the project
-      ProjectModel.instance.forEachComponent(handleComponent);
-
-      // Combine the result to look a little better.
-      const results: ResultItem[] = Array.from(references.keys())
-        .map((key) => ({
-          type: types[key],
-          displayName: types[key]?.displayName || key,
-          referenaces: references.get(key)
-        }))
-        .sort((a, b) => b.referenaces.length - a.referenaces.length);
-
-      setResult(results);
-    }
-
-    updateIndex();
-
-    EventDispatcher.instance.on(
-      [
-        'Model.nodeAdded',
-        'Model.nodeRemoved',
-        'Model.componentAdded',
-        'Model.componentRemoved',
-        'Model.componentRenamed'
-      ],
-      updateIndex,
-      group
-    );
-
-    return function () {
-      EventDispatcher.instance.off(group);
-    };
-  }, []);
-
-  return [result];
-}

 export function NodeReferencesPanel() {
  const [searchTerm, setSearchTerm] = useState('');
  const [includeCoreNodes, setIncludeCoreNodes] = useState(false);
  const inputRef = useRef(null);
-  const [result] = useNodeReferences();
+  const { nodeReferences } = useNodeReferencesContext();
  const nodeLibraryLoaded = useNodeLibraryLoaded();

  useFocusRefOnPanelActive(inputRef, NodeReferencesPanel_ID);

-  function searchFilter(x: ResultItem) {
+  function searchFilter(x: NodeReference) {
    if (x.displayName.toLowerCase().includes(searchTerm)) {
      return true;
    }
@@ -144,7 +46,7 @@ export function NodeReferencesPanel() {
    return false;
  }

-  let filteredResult = result.filter(searchFilter);
+  let filteredResult = nodeReferences.filter(searchFilter);
  if (!includeCoreNodes) {
    filteredResult = filteredResult.filter((x) => x.displayName.startsWith('/'));
  }
@@ -185,7 +87,7 @@ export function NodeReferencesPanel() {
 }

 interface ItemProps {
-  entry: ResultItem;
+  entry: NodeReference;
 }

 function Item({ entry }: ItemProps) {
@@ -245,8 +147,8 @@ function Item({ entry }: ItemProps) {
 }

 interface ItemReferenceProps {
-  entry: ResultItem;
-  referenace: ResultItem['referenaces'][0];
+  entry: NodeReference;
+  referenace: NodeReference['referenaces'][0];
  colors: INodeColorScheme;
 }

--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/VersionControlPanel.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/VersionControlPanel.tsx
@@ -33,6 +33,7 @@ import { History } from './components/History';
 import { LocalChanges } from './components/LocalChanges';
 import { MergeConflicts } from './components/MergeConflicts';
 import { useVersionControlContext, VersionControlProvider } from './context';
+import { convertGitRemoteUrlToRepoUrl } from './github';

 enum ViewState {
  Default,
@@ -40,25 +41,6 @@ enum ViewState {
  BranchMerge
 }

-function convertGitRemoteUrlToRepoUrl(gitRemoteUrl) {
-  // Remove the .git extension if present
-  gitRemoteUrl = gitRemoteUrl.replace(/\.git$/, '');
-
-  // Extract the repository name and owner from the URL
-  const regex = /^(?:https?:\/\/)?github\.com\/([^/]+)\/([^/]+)$/;
-  const match = gitRemoteUrl.match(regex);
-
-  if (match) {
-    const owner = match[1];
-    const repo = match[2];
-    // Construct the GitHub repository URL
-    const repoUrl = `https://github.com/${owner}/${repo}`;
-    return repoUrl;
-  } else {
-    throw new Error('Invalid GitHub Git remote URL');
-  }
-}
-
 function BaseVersionControlPanel() {
  const { git, activeTabId, setActiveTabId, localChangesCount, branchStatus, fetch, updateLocalDiff } =
    useVersionControlContext();
@@ -217,6 +199,7 @@ function BaseVersionControlPanel() {

 export function VersionControlPanel() {
  const [git, setGit] = useState<Git>(null);
+  const [state, setState] = useState<'loading' | 'loaded' | 'not-git'>('loading');

  async function createGit() {
    const gitClient = new Git(mergeProject);
@@ -224,12 +207,18 @@ export function VersionControlPanel() {
    setGit(gitClient);
  }

-  const isGitProject = git === null ? LocalProjectsModel.instance.isGitProject(ProjectModel.instance) : true;
  useEffect(() => {
-    if (isGitProject) {
-      createGit();
-    }
-  }, [isGitProject]);
+    LocalProjectsModel.instance
+      .isGitProject(ProjectModel.instance)
+      .then(async (isGitProject) => {
+        if (isGitProject) {
+          await createGit();
+          setState('loaded');
+        } else {
+          setState('not-git');
+        }
+      });
+  }, []);

  async function setupGit() {
    const gitClient = new Git(mergeProject);
@@ -238,7 +227,7 @@ export function VersionControlPanel() {
    setGit(gitClient);
  }

-  if (git === null && !isGitProject) {
+  if (git === null && state === 'not-git') {
    return (
      <BasePanel isFill title="Version Control">
        <Box hasXSpacing hasYSpacing>
--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/CommitChangesDiff.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/CommitChangesDiff.tsx
@@ -6,11 +6,13 @@ import { Commit } from '@noodl/git/src/core/models/snapshot';
 import { FileChange } from '@noodl/git/src/core/models/status';
 import { revRange } from '@noodl/git/src/core/rev-list';

+import { ProjectModel } from '@noodl-models/projectmodel';
 import { applyPatches } from '@noodl-models/ProjectPatches/applypatches';
 import { mergeProject } from '@noodl-utils/projectmerger';
 import { ProjectDiff, diffProject } from '@noodl-utils/projectmerger.diff';

 import { useVersionControlContext } from '../context';
+import { getProjectFilePath } from '../context/DiffUtils';
 import { DiffList } from './DiffList';

 //Kind:
@@ -124,7 +126,10 @@ async function getMergeDiff(repositoryPath: string, commit: Commit, refToDiffTo:
 }

 async function getProjectFile(commit: Commit) {
-  const projectContent = JSON.parse(await commit.getFileAsString('project.json'));
+  const projectFilePath = getProjectFilePath(commit.repositoryDir, ProjectModel.instance._retainedProjectDirectory);
+
+  const projectContentRaw = await commit.getFileAsString(projectFilePath);
+  const projectContent = JSON.parse(projectContentRaw);
  applyPatches(projectContent);
  return projectContent;
 }
--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/DiffList.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/DiffList.tsx
@@ -61,7 +61,7 @@ export function DiffList({ diff, fileChanges, componentDiffTitle, actions, commi
  const [imageDiff, setImageDiff] = useState<IImageDiff>(null);

  const components = diff?.components ? getChangedComponents(diff.components) : [];
-  const files = (fileChanges || [])?.filter((f) => f.path !== 'project.json') || [];
+  const files = (fileChanges || [])?.filter((f) => !f.path.endsWith('project.json')) || [];
  const settings = diff?.settings ? getChangedObjectProperties(diff.settings) : [];
  const colorStyles = diff?.styles.colors ? getChangedObjectProperties(diff.styles.colors) : [];
  const textStyles = diff?.styles.text ? getChangedObjectProperties(diff.styles.text) : [];
--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/HistoryCommitDiff.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/HistoryCommitDiff.tsx
@@ -13,13 +13,15 @@ import { EventDispatcher } from '../../../../../../shared/utils/EventDispatcher'
 import { ToastLayer } from '../../../ToastLayer/ToastLayer';
 import { useVersionControlContext } from '../context';
 import { CommitChangesDiff } from './CommitChangesDiff';
+import { convertGitRemoteUrlToCommitUrl } from '../github';
+import { platform } from '@noodl/platform';

 export interface HistoryCommitDiffProps {
  commit: Commit;
 }

 export function HistoryCommitDiff({ commit }: HistoryCommitDiffProps) {
-  const { repositoryPath, localChangesCount, fetch } = useVersionControlContext();
+  const { git, repositoryPath, localChangesCount, fetch } = useVersionControlContext();

  const [HaveLocalChangesDialog, showHaveLocalChangesDialog] = useConfirmationDialog({
    isCancelButtonHidden: true,
@@ -71,6 +73,13 @@ export function HistoryCommitDiff({ commit }: HistoryCommitDiffProps) {
                copyValueToClipboard({
                  value: commit.sha
                })
+            },
+            git.Provider === 'github' && {
+              label: 'View on GitHub',
+              onClick: () => {
+                const commitLink = convertGitRemoteUrlToCommitUrl(git.OriginUrl, commit.sha);
+                platform.openExternal(commitLink);
+              }
            }
          ]}
        />
--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/context/DiffUtils.ts
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/context/DiffUtils.ts
@@ -1,21 +1,24 @@
+import path from 'path';
+import { getCommit } from '@noodl/git/src/core/logs';
+import { FileStatusKind } from '@noodl/git/src/core/models/status';
+
+import { FeedbackType } from '@noodl-constants/FeedbackType';
+import { applyPatches } from '@noodl-models/ProjectPatches/applypatches';
 import {
  ProjectDiff,
  ProjectDiffItem,
  ProjectBasicDiffItem,
  ArrayDiff,
-  diffProject
+  diffProject,
+  createEmptyArrayDiff
 } from '@noodl-utils/projectmerger.diff';

+import { IconName } from '@noodl-core-ui/components/common/Icon';
+import { ListItemProps } from '@noodl-core-ui/components/layout/ListItem';
+
 import { ProjectModel } from '../../../../models/projectmodel';

-import { applyPatches } from '@noodl-models/ProjectPatches/applypatches';
-import { FileStatusKind } from '@noodl/git/src/core/models/status';
-import { IconName } from '@noodl-core-ui/components/common/Icon';
-import { ListItemProps } from '@noodl-core-ui/components/layout/ListItem';
-import { FeedbackType } from '@noodl-constants/FeedbackType';
-import { getCommit } from '@noodl/git/src/core/logs';
-
-export interface ProjectLocalDiff extends ProjectDiff{
+export interface ProjectLocalDiff extends ProjectDiff {
  baseProject: TSFixme; //Project model as an object from raw json
  commitShaDiffedTo: string;
 }
@@ -84,17 +87,49 @@ export function getFileStatusIconProps(status: FileStatusKind): Partial<ListItem
  }
 }

-export async function doLocalDiff(repositoryPath: string, headCommitId: string): Promise<ProjectLocalDiff> {
-  const baseCommit = await getCommit(repositoryPath, headCommitId);
-  const baseProjectJson = await baseCommit.getFileAsString('project.json');
-  const baseProject = JSON.parse(baseProjectJson);
-  applyPatches(baseProject);
-
-  const diff = diffProject(baseProject, ProjectModel.instance.toJSON());
-
-  return {
-    ...diff,
-    baseProject,
-    commitShaDiffedTo: headCommitId
-  };
+export function getProjectFilePath(repositoryPath: string, projectPath: string) {
+  const relativePath = path.relative(repositoryPath, projectPath);
+  const projectFilePath = path.join(relativePath, 'project.json').replaceAll('\\', '/');
+  return projectFilePath;
+}
+
+export async function doLocalDiff(
+  repositoryPath: string,
+  projectPath: string,
+  headCommitId: string
+): Promise<ProjectLocalDiff> {
+  const projectFilePath = getProjectFilePath(repositoryPath, projectPath);
+
+  try {
+    const baseCommit = await getCommit(projectPath, headCommitId);
+    const baseProjectJson = await baseCommit.getFileAsString(projectFilePath);
+    const baseProject = JSON.parse(baseProjectJson);
+    applyPatches(baseProject);
+
+    const diff = diffProject(baseProject, ProjectModel.instance.toJSON());
+
+    return {
+      ...diff,
+      baseProject,
+      commitShaDiffedTo: headCommitId
+    };
+  } catch (error) {
+    if (error.toString().includes('exists on disk, but not in')) {
+      console.warn('project.json does not exist in this commit.');
+    }
+
+    // Return empty state
+    return {
+      baseProject: {},
+      commitShaDiffedTo: headCommitId,
+      components: createEmptyArrayDiff(),
+      variants: createEmptyArrayDiff(),
+      settings: createEmptyArrayDiff(),
+      styles: {
+        colors: createEmptyArrayDiff(),
+        text: createEmptyArrayDiff()
+      },
+      cloudservices: createEmptyArrayDiff()
+    };
+  }
 }
--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/context/index.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/context/index.tsx
@@ -8,6 +8,7 @@ import { Slot } from '@noodl-core-ui/types/global';
 import { doLocalDiff, ProjectLocalDiff } from './DiffUtils';
 import { useVersionControlFetch } from './fetch.context';
 import { BranchStatus, IVersionControlContext } from './types';
+import { ProjectModel } from '@noodl-models/projectmodel';

 const VersionControlContext = createContext<IVersionControlContext>({
  git: null,
@@ -57,7 +58,8 @@ export function VersionControlProvider({ git, children }: { git: Git; children:
    (async () => {
      const currentCommitSha = await git.getHeadCommitId();
      if (currentCommitSha) {
-        const diff = await doLocalDiff(git.repositoryPath, currentCommitSha);
+        const projectPath = ProjectModel.instance._retainedProjectDirectory;
+        const diff = await doLocalDiff(git.repositoryPath, projectPath, currentCommitSha);
        setLocalDiff(diff);
      }
    })();
--- a/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/github.ts
+++ b/packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/github.ts
@@ -0,0 +1,23 @@
+export function convertGitRemoteUrlToRepoUrl(gitRemoteUrl: string): string {
+  // Remove the .git extension if present
+  gitRemoteUrl = gitRemoteUrl.replace(/\.git$/, '');
+
+  // Extract the repository name and owner from the URL
+  const regex = /^(?:https?:\/\/)?github\.com\/([^/]+)\/([^/]+)$/;
+  const match = gitRemoteUrl.match(regex);
+
+  if (match) {
+    const owner = match[1];
+    const repo = match[2];
+    // Construct the GitHub repository URL
+    const repoUrl = `https://github.com/${owner}/${repo}`;
+    return repoUrl;
+  } else {
+    throw new Error('Invalid GitHub Git remote URL');
+  }
+}
+
+export function convertGitRemoteUrlToCommitUrl(gitRemoteUrl: string, commitSha: string): string {
+  const githubLink = convertGitRemoteUrlToRepoUrl(gitRemoteUrl);
+  return `${githubLink}/commit/${commitSha}`;
+}
--- a/packages/noodl-editor/src/editor/src/views/panels/componentspanel/ComponentsPanel.ts
+++ b/packages/noodl-editor/src/editor/src/views/panels/componentspanel/ComponentsPanel.ts
@@ -17,9 +17,11 @@ import { EventDispatcher } from '../../../../../shared/utils/EventDispatcher';
 import View from '../../../../../shared/view';
 import { NodeGraphEditor } from '../../nodegrapheditor';
 import * as NewPopupLayer from '../../PopupLayer/index';
+import { type PopupMenuItem } from '../../PopupLayer/index';
 import { ToastLayer } from '../../ToastLayer/ToastLayer';
 import { ComponentsPanelFolder } from './ComponentsPanelFolder';
 import { ComponentTemplates } from './ComponentTemplates';
+import { HACK_findNodeReference } from '@noodl-contexts/NodeReferencesContext';

 const PopupLayer = require('@noodl-views/popuplayer');
 const ComponentsPanelTemplate = require('../../../templates/componentspanel.html');
@@ -961,7 +963,7 @@ export class ComponentsPanelView extends View {
      forRuntimeType: this.getRuntimeType()
    });

-    let items: TSFixme[] = templates.map((t) => ({
+    let items: PopupMenuItem[] = templates.map((t) => ({
      icon: IconName.Plus,
      label: t.label,
      onClick: () => {
@@ -987,6 +989,10 @@ export class ComponentsPanelView extends View {
      });
    }

+    // Find references
+    const nodeReference = HACK_findNodeReference(scope.comp.name);
+    const nodeReferencesText = `Used in ${nodeReference?.referenaces?.length || 0} places`;
+
    items = items.concat([
      {
        icon: IconName.Pencil,
@@ -1011,6 +1017,9 @@ export class ComponentsPanelView extends View {
          _this.onDeleteClicked(scope, el);
          evt.stopPropagation();
        }
+      },
+      {
+        label: nodeReferencesText
      }
    ]);

@@ -1110,6 +1119,16 @@ export class ComponentsPanelView extends View {
      }
    ]);

+    if (scope.canBecomeRoot) {
+      // Find references
+      const nodeReference = HACK_findNodeReference(scope.folder.component.name);
+      const nodeReferencesText = `Used in ${nodeReference?.referenaces?.length || 0} places`;
+
+      items = items.concat([{
+        label: nodeReferencesText
+      }]);
+    }
+
    const menu = new NewPopupLayer.PopupMenu({
      items: items
    });
--- a/packages/noodl-editor/src/editor/src/views/panels/search-panel/search-panel.tsx
+++ b/packages/noodl-editor/src/editor/src/views/panels/search-panel/search-panel.tsx
@@ -5,7 +5,9 @@ import { useSidePanelKeyboardCommands } from '@noodl-hooks/useKeyboardCommands';
 import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';

-import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
+import { Keybindings } from '@noodl-constants/Keybindings';
+import { ComponentModel } from '@noodl-models/componentmodel';
+import { NodeGraphNode } from '@noodl-models/nodegraphmodel';
 import { performSearch } from '@noodl-utils/universal-search';

 import { SearchInput } from '@noodl-core-ui/components/inputs/SearchInput';
@@ -38,7 +40,7 @@ export function SearchPanel() {
          inputRef.current.focus();
          inputRef.current.select();
        },
-        keybinding: KeyMod.CtrlCmd | KeyCode.KEY_F
+        keybinding: Keybindings.SEARCH.hash
      }
    ],
    'search'
@@ -54,7 +56,7 @@ export function SearchPanel() {
    }
  }, [debouncedSearchTerm]);

-  function onSearchItemClicked(searchResult) {
+  function onSearchItemClicked(searchResult: SearchResultItem) {
    if (searchResult.type === 'Component') {
      NodeGraphContextTmp.switchToComponent(searchResult.componentTarget, {
        breadcrumbs: false,
@@ -85,29 +87,7 @@ export function SearchPanel() {

      <div className={css.SearchResults}>
        {searchResults.map((component) => (
-          <Section
-            title={`${component.componentName} (${component.results.length} result${
-              component.results.length > 1 ? 's' : ''
-            })`}
-            key={component.componentId}
-            variant={SectionVariant.Panel}
-          >
-            {component.results.map((result, index) => (
-              <div
-                className={classNames(
-                  css.SearchResultItem
-                  // lastActiveComponentId === result.componentTarget.id && css['is-active']
-                )}
-                key={index}
-                onClick={() => onSearchItemClicked(result)}
-              >
-                <Label variant={TextType.Proud}>
-                  {result.userLabel ? result.type + ' - ' + result.userLabel : result.type}
-                </Label>
-                <Text>{result.label}</Text>
-              </div>
-            ))}
-          </Section>
+          <SearchItem key={component.componentId} component={component} onSearchItemClicked={onSearchItemClicked} />
        ))}
        {searchResults.length === 0 && debouncedSearchTerm.length > 0 && (
          <Container hasXSpacing hasYSpacing>
@@ -118,3 +98,51 @@ export function SearchPanel() {
    </BasePanel>
  );
 }
+
+type SearchResultItem = {
+  componentTarget: ComponentModel;
+  label: string;
+  nodeTarget: NodeGraphNode;
+  type: string;
+  userLabel: string;
+};
+
+type SearchItemProps = {
+  component: {
+    componentName: string;
+    componentId: string;
+    results: SearchResultItem[];
+  };
+  onSearchItemClicked: (item: SearchResultItem) => void;
+};
+
+function SearchItem({ component, onSearchItemClicked }: SearchItemProps) {
+  const resultCountText = `${component.results.length} result${component.results.length > 1 ? 's' : ''}`;
+  let titleText = `${component.componentName} (${resultCountText})`;
+
+  // We expect there to always be at least one result, to get the full component name.
+  const isInCloudFunctions = component.results[0].componentTarget.name.startsWith('/#__cloud__/');
+  if (isInCloudFunctions) {
+    titleText += ' (Cloud Function)';
+  }
+
+  return (
+    <Section title={titleText} variant={SectionVariant.Panel}>
+      {component.results.map((result, index) => (
+        <div
+          className={classNames(
+            css.SearchResultItem
+            // lastActiveComponentId === result.componentTarget.id && css['is-active']
+          )}
+          key={index}
+          onClick={() => onSearchItemClicked(result)}
+        >
+          <Label variant={TextType.Proud}>
+            {result.userLabel ? result.type + ' - ' + result.userLabel : result.type}
+          </Label>
+          <Text>{result.label}</Text>
+        </div>
+      ))}
+    </Section>
+  );
+}
--- a/packages/noodl-editor/src/frames/viewer-frame/assets/icon.png
+++ b/packages/noodl-editor/src/frames/viewer-frame/assets/icon.png
--- a/packages/noodl-editor/src/frames/viewer-frame/index.html
+++ b/packages/noodl-editor/src/frames/viewer-frame/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-    <title>Noodl Viewer</title>
+    <title>Fluxscape Viewer</title>
    <link href="../../assets/lib/fontawesome/css/font-awesome.min.css" rel="stylesheet">
    <link href="assets/style.css" rel="stylesheet">
    <script type="text/javascript" src="../../assets/lib/jquery-min.js"></script>
--- a/packages/noodl-editor/src/main/main.js
+++ b/packages/noodl-editor/src/main/main.js
@@ -365,7 +365,7 @@ function launchApp() {
      click: () => {
        require('about-window').default({
          icon_path: appPath + '/src/assets/images/icon.png',
-          copyright: 'Copyright (c) 2023 Future Platforms AB',
+          copyright: 'Copyright (c) 2024 Fluxscape LLC',
          description: buildNumber ? 'Build ' + buildNumber : undefined
        });
      }
--- a/packages/noodl-editor/src/main/src/web-server.js
+++ b/packages/noodl-editor/src/main/src/web-server.js
@@ -67,7 +67,7 @@ function startServer(app, projectGetSettings, projectGetInfo, projectGetComponen
        ProjectModules.instance.injectIntoHtml(info.projectDirectory, data, '/', function (injected) {
          projectGetSettings((settings) => {
            settings = settings || {};
-            injected = injected.replace('{{#title#}}', settings.htmlTitle || 'Noodl Viewer');
+            injected = injected.replace('{{#title#}}', settings.htmlTitle || 'Fluxscape Viewer');
            injected = injected.replace('{{#customHeadCode#}}', settings.headCode || '');

            response.writeHead(200, {
--- a/packages/noodl-editor/tests/testfs/sync_proj1-latest/icon.png
+++ b/packages/noodl-editor/tests/testfs/sync_proj1-latest/icon.png
--- a/packages/noodl-editor/tests/testfs/sync_proj1/icon.png
+++ b/packages/noodl-editor/tests/testfs/sync_proj1/icon.png
--- a/packages/noodl-editor/tests/testfs/sync_stash_proj-start/icon.png
+++ b/packages/noodl-editor/tests/testfs/sync_stash_proj-start/icon.png
--- a/packages/noodl-git/package.json
+++ b/packages/noodl-git/package.json
@@ -3,8 +3,8 @@
  "version": "2.7.0",
  "main": "src/index.ts",
  "description": "",
-  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://noodl.net",
+  "author": "Fluxscape <contact@fluxscape.io>",
+  "homepage": "https://fluxscape.io",
  "dependencies": {
    "desktop-trampoline": "https://github.com/desktop/desktop-trampoline/archive/refs/tags/v0.9.8.tar.gz",
    "dugite": "^1.106.0",
--- a/packages/noodl-git/src/core/open.ts
+++ b/packages/noodl-git/src/core/open.ts
@@ -22,7 +22,11 @@ export async function open(basePath: string): Promise<string> {
  //   console.log("VCS error when opening project: " + e);
  // }

-  return basePath;
+
+  // Find the relative git repository path
+  const repositoryPath = await getTopLevelWorkingDirectory(basePath);
+
+  return repositoryPath;
 }

 /**
--- a/packages/noodl-platform-electron/package.json
+++ b/packages/noodl-platform-electron/package.json
@@ -3,8 +3,8 @@
  "version": "2.7.0",
  "main": "src/index.ts",
  "description": "Cross platform implementation of platform specific features.",
-  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://noodl.net",
+  "author": "Fluxscape <contact@fluxscape.io>",
+  "homepage": "https://fluxscape.io",
  "dependencies": {
    "@noodl/platform": "file:../noodl-platform",
    "@noodl/platform-node": "file:../noodl-platform-node"
--- a/packages/noodl-platform-node/package.json
+++ b/packages/noodl-platform-node/package.json
@@ -3,8 +3,8 @@
  "version": "2.7.0",
  "main": "src/index.ts",
  "description": "Cross platform implementation of platform specific features.",
-  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://noodl.net",
+  "author": "Fluxscape <contact@fluxscape.io>",
+  "homepage": "https://fluxscape.io",
  "scripts": {
    "test": "jest",
    "test:coverage": "jest --coverage"
--- a/packages/noodl-platform/package.json
+++ b/packages/noodl-platform/package.json
@@ -3,6 +3,6 @@
  "version": "2.7.0",
  "main": "src/index.ts",
  "description": "Cross platform implementation of platform specific features.",
-  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://noodl.net"
+  "author": "Fluxscape <contact@fluxscape.io>",
+  "homepage": "https://fluxscape.io"
 }
--- a/packages/noodl-runtime/src/api/cloudstore.js
+++ b/packages/noodl-runtime/src/api/cloudstore.js
@@ -32,12 +32,15 @@ class CloudStore {

  _initCloudServices() {
    _collections = undefined; // clear collection cache, so it's refetched
-    const cloudServices = NoodlRuntime.instance.getMetaData('cloudservices');

+    const cloudServices = NoodlRuntime.instance.getMetaData('cloudservices');
    if (cloudServices) {
      this.appId = cloudServices.appId;
      this.endpoint = cloudServices.endpoint;
    }
+
+    const dbVersionMajor = NoodlRuntime.instance.getMetaData('dbVersionMajor');
+    this.dbVersionMajor = dbVersionMajor;
  }

  on() {
@@ -70,8 +73,9 @@ class CloudStore {
      xhr.open(options.method || 'GET', this.endpoint + path, true);

      xhr.setRequestHeader('X-Parse-Application-Id', this.appId);
-      if (typeof _noodl_cloudservices !== 'undefined')
+      if (typeof _noodl_cloudservices !== 'undefined') {
        xhr.setRequestHeader('X-Parse-Master-Key', _noodl_cloudservices.masterKey);
+      }

      // Check for current users
      var _cu = localStorage['Parse/' + this.appId + '/currentUser'];
@@ -168,13 +172,10 @@ class CloudStore {
      return;
    }

-    if (options.where) args.push('match=' + encodeURIComponent(JSON.stringify(options.where)));
    if (options.limit) args.push('limit=' + options.limit);
    if (options.skip) args.push('skip=' + options.skip);

-    const grouping = {
-      objectId: null
-    };
+    const grouping = {};

    Object.keys(options.group).forEach((k) => {
      const _g = {};
@@ -188,7 +189,20 @@ class CloudStore {
      grouping[k] = _g;
    });

-    args.push('group=' + JSON.stringify(grouping));
+    // I don't know which version the API was changed, lets just say above 4 for now.
+    if (this.dbVersionMajor && this.dbVersionMajor > 4) {
+      grouping._id = null;
+
+      if (options.where) args.push('$match=' + encodeURIComponent(JSON.stringify(options.where)));
+
+      args.push('$group=' + JSON.stringify(grouping));
+    } else {
+      grouping.objectId = null;
+
+      if (options.where) args.push('match=' + encodeURIComponent(JSON.stringify(options.where)));
+
+      args.push('group=' + JSON.stringify(grouping));
+    }

    this._makeRequest('/aggregate/' + options.collection + (args.length > 0 ? '?' + args.join('&') : ''), {
      success: function (response) {
@@ -244,11 +258,34 @@ class CloudStore {
    });
  }

+  /**
+   *
+   * @param {{
+   *    objectId: string;
+   *    collection: string;
+   *    keys?: string[] | string;
+   *    include?: string[] | string;
+   *    excludeKeys?: string[] | string;
+   *    success: (data: unknown) => void;
+   *    error: (error: unknown) => void;
+   * }} options
+   */
  fetch(options) {
    const args = [];

-    if (options.include)
+    if (options.include) {
      args.push('include=' + (Array.isArray(options.include) ? options.include.join(',') : options.include));
+    }
+
+    if (options.keys) {
+      args.push('keys=' + (Array.isArray(options.keys) ? options.keys.join(',') : options.keys));
+    }
+
+    if (options.excludeKeys) {
+      args.push(
+        'excludeKeys=' + (Array.isArray(options.excludeKeys) ? options.excludeKeys.join(',') : options.excludeKeys)
+      );
+    }

    this._makeRequest(
      '/classes/' + options.collection + '/' + options.objectId + (args.length > 0 ? '?' + args.join('&') : ''),
@@ -420,6 +457,8 @@ class CloudStore {
   *    file: {
   *      name: string;
   *    }
+   *    success: (data: unknown) => void;
+   *    error: (error: unknown) => void;
   * }} options
   */
  deleteFile(options) {
@@ -550,21 +589,26 @@ function _deserializeJSON(data, type, modelScope) {
 }

 function _fromJSON(item, collectionName, modelScope) {
-  const m = (modelScope || Model).get(item.objectId);
-  m._class = collectionName;
+  const modelStore = modelScope || Model;

-  if (collectionName !== undefined && CloudStore._collections[collectionName] !== undefined)
-    var schema = CloudStore._collections[collectionName].schema;
+  const model = modelStore.get(item.objectId);
+  model._class = collectionName;

-  for (var key in item) {
-    if (key === 'objectId' || key === 'ACL') continue;
-
-    var _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
-
-    m.set(key, _deserializeJSON(item[key], _type, modelScope));
+  let schema = undefined;
+  if (collectionName !== undefined && CloudStore._collections[collectionName] !== undefined) {
+    schema = CloudStore._collections[collectionName].schema;
  }

-  return m;
+  for (const key in item) {
+    if (key === 'objectId' || key === 'ACL') {
+      continue;
+    }
+
+    const _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
+    model.set(key, _deserializeJSON(item[key], _type, modelScope));
+  }
+
+  return model;
 }

 CloudStore._fromJSON = _fromJSON;
--- a/packages/noodl-runtime/src/api/queryutils.js
+++ b/packages/noodl-runtime/src/api/queryutils.js
@@ -36,16 +36,15 @@ function convertVisualFilter(query, options) {
    const _res = {};
    var cond;
    var value = query.input !== undefined ? inputs[query.input] : query.value;
-    
+
    if (query.operator === 'exist') {
-        _res[query.property] = { $exists: true };
-        return _res;
+      _res[query.property] = { $exists: true };
+      return _res;
+    } else if (query.operator === 'not exist') {
+      _res[query.property] = { $exists: false };
+      return _res;
    }
-    else if (query.operator === 'not exist') {
-        _res[query.property] = { $exists: false };
-        return _res;
-    }
-    
+
    if (value === undefined) return;

    if (CloudStore._collections[options.collectionName])
@@ -80,7 +79,6 @@ function convertVisualFilter(query, options) {
      cond = { $regex: value, $options: 'i' };
    }

-
    _res[query.property] = cond;

    return _res;
@@ -163,10 +161,22 @@ function _value(v) {
  return v;
 }

+/**
+ *
+ * @param {Record<string, unknown>} filter
+ * @param {{
+ *   collectionName?: string;
+ *   modelScope?: unknown;
+ *   error: (error: string) => void;
+ * }} options
+ * @returns
+ */
 function convertFilterOp(filter, options) {
  const keys = Object.keys(filter);
  if (keys.length === 0) return {};
-  if (keys.length !== 1) return options.error('Filter must only have one key found ' + keys.join(','));
+  if (keys.length !== 1) {
+    return options.error('Filter must only have one key found ' + keys.join(','));
+  }

  const res = {};
  const key = keys[0];
@@ -179,18 +189,27 @@ function convertFilterOp(filter, options) {
  } else if (filter['idContainedIn'] !== undefined) {
    res['objectId'] = { $in: filter['idContainedIn'] };
  } else if (filter['relatedTo'] !== undefined) {
-    var modelId = filter['relatedTo']['id'];
-    if (modelId === undefined) return options.error('Must provide id in relatedTo filter');
+    const modelId = filter['relatedTo']['id'];
+    if (modelId === undefined) {
+      return options.error('Must provide id in relatedTo filter');
+    }

-    var relationKey = filter['relatedTo']['key'];
-    if (relationKey === undefined) return options.error('Must provide key in relatedTo filter');
+    const relationKey = filter['relatedTo']['key'];
+    if (relationKey === undefined) {
+      return options.error('Must provide key in relatedTo filter');
+    }
+
+    const className = filter['relatedTo']['className'] || (options.modelScope || Model).get(modelId)?._class;
+    if (typeof className === 'undefined') {
+      // Either the pointer is loaded as an object or we allow passing in the className.
+      return options.error('Must preload the Pointer or include className');
+    }

-    var m = (options.modelScope || Model).get(modelId);
    res['$relatedTo'] = {
      object: {
        __type: 'Pointer',
        objectId: modelId,
-        className: m._class
+        className
      },
      key: relationKey
    };
@@ -208,13 +227,14 @@ function convertFilterOp(filter, options) {
    else if (opAndValue['containedIn'] !== undefined) res[key] = { $in: opAndValue['containedIn'] };
    else if (opAndValue['notContainedIn'] !== undefined) res[key] = { $nin: opAndValue['notContainedIn'] };
    else if (opAndValue['pointsTo'] !== undefined) {
-      var m = (options.modelScope || Model).get(opAndValue['pointsTo']);
-      if (CloudStore._collections[options.collectionName])
-        var schema = CloudStore._collections[options.collectionName].schema;
+      let schema = null;
+      if (CloudStore._collections[options.collectionName]) {
+        schema = CloudStore._collections[options.collectionName].schema;
+      }

-      var targetClass =
+      const targetClass =
        schema && schema.properties && schema.properties[key] ? schema.properties[key].targetClass : undefined;
-      var type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
+      const type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;

      if (type === 'Relation') {
        res[key] = {
@@ -223,13 +243,13 @@ function convertFilterOp(filter, options) {
          className: targetClass
        };
      } else {
-        if (Array.isArray(opAndValue['pointsTo']))
+        if (Array.isArray(opAndValue['pointsTo'])) {
          res[key] = {
            $in: opAndValue['pointsTo'].map((v) => {
              return { __type: 'Pointer', objectId: v, className: targetClass };
            })
          };
-        else
+        } else {
          res[key] = {
            $eq: {
              __type: 'Pointer',
@@ -237,6 +257,7 @@ function convertFilterOp(filter, options) {
              className: targetClass
            }
          };
+        }
      }
    } else if (opAndValue['matchesRegex'] !== undefined) {
      res[key] = {
@@ -257,43 +278,42 @@ function convertFilterOp(filter, options) {
            }
          }
        };
-    // Geo points
+      // Geo points
    } else if (opAndValue['nearSphere'] !== undefined) {
      var _v = opAndValue['nearSphere'];
      res[key] = {
        $nearSphere: {
-          __type: "GeoPoint",
+          __type: 'GeoPoint',
          latitude: _v.latitude,
-          longitude: _v.longitude,
+          longitude: _v.longitude
        },
-        $maxDistanceInMiles:_v.$maxDistanceInMiles,
-        $maxDistanceInKilometers:_v.maxDistanceInKilometers,
-        $maxDistanceInRadians:_v.maxDistanceInRadians
+        $maxDistanceInMiles: _v.$maxDistanceInMiles,
+        $maxDistanceInKilometers: _v.maxDistanceInKilometers,
+        $maxDistanceInRadians: _v.maxDistanceInRadians
      };
    } else if (opAndValue['withinBox'] !== undefined) {
      var _v = opAndValue['withinBox'];
      res[key] = {
-        $within:{
-          $box: _v.map(gp => ({
-            __type:"GeoPoint",
-            latitude:gp.latitude,
-            longitude:gp.longitude
+        $within: {
+          $box: _v.map((gp) => ({
+            __type: 'GeoPoint',
+            latitude: gp.latitude,
+            longitude: gp.longitude
          }))
        }
      };
    } else if (opAndValue['withinPolygon'] !== undefined) {
      var _v = opAndValue['withinPolygon'];
      res[key] = {
-        $geoWithin:{
-          $polygon: _v.map(gp => ({
-            __type:"GeoPoint",
-            latitude:gp.latitude,
-            longitude:gp.longitude
+        $geoWithin: {
+          $polygon: _v.map((gp) => ({
+            __type: 'GeoPoint',
+            latitude: gp.latitude,
+            longitude: gp.longitude
          }))
        }
      };
    }
-
  } else {
    options.error('Unrecognized filter keys ' + keys.join(','));
  }
--- a/packages/noodl-runtime/src/api/records.js
+++ b/packages/noodl-runtime/src/api/records.js
@@ -12,6 +12,7 @@ function createRecordsAPI(modelScope) {

  return {
    async query(className, query, options) {
+      if (typeof className === 'undefined') throw new Error("'className' is undefined");
      return new Promise((resolve, reject) => {
        cloudstore().query({
          collection: className,
@@ -26,9 +27,9 @@ function createRecordsAPI(modelScope) {
          include: options ? options.include : undefined,
          select: options ? options.select : undefined,
          count: options ? options.count : undefined,
-          success: (results,count) => {
+          success: (results, count) => {
            const _results = results.map((r) => cloudstore()._fromJSON(r, className));
-            if(count !== undefined)  resolve({results:_results,count});
+            if (count !== undefined) resolve({ results: _results, count });
            else resolve(_results);
          },
          error: (err) => {
@@ -39,6 +40,7 @@ function createRecordsAPI(modelScope) {
    },

    async count(className, query) {
+      if (typeof className === 'undefined') throw new Error("'className' is undefined");
      return new Promise((resolve, reject) => {
        cloudstore().count({
          collection: className,
@@ -60,6 +62,7 @@ function createRecordsAPI(modelScope) {
    },

    async distinct(className, property, query) {
+      if (typeof className === 'undefined') throw new Error("'className' is undefined");
      return new Promise((resolve, reject) => {
        cloudstore().distinct({
          collection: className,
@@ -82,6 +85,7 @@ function createRecordsAPI(modelScope) {
    },

    async aggregate(className, group, query) {
+      if (typeof className === 'undefined') throw new Error("'className' is undefined");
      return new Promise((resolve, reject) => {
        cloudstore().aggregate({
          collection: className,
@@ -103,19 +107,35 @@ function createRecordsAPI(modelScope) {
      });
    },

+    /**
+     *
+     * @param {string | { getId(): string; }} objectOrId
+     * @param {{
+     *    className: string;
+     *    keys?: string[] | string;
+     *    include?: string[] | string;
+     *    excludeKeys?: string[] | string;
+     * }} options
+     * @returns {Promise<unknown>}
+     */
    async fetch(objectOrId, options) {
+      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
      if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
      const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;

      return new Promise((resolve, reject) => {
-        if (!className) return reject('No class name specified');
+        if (!className) {
+          return reject('No class name specified');
+        }

        cloudstore().fetch({
          collection: className,
          objectId: objectOrId,
-          include: options ? options.include : undefined,
+          keys: options?.keys,
+          include: options?.include,
+          excludeKeys: options?.excludeKeys,
          success: function (response) {
-            var record = cloudstore()._fromJSON(response, className);
+            const record = cloudstore()._fromJSON(response, className);
            resolve(record);
          },
          error: function (err) {
@@ -126,6 +146,7 @@ function createRecordsAPI(modelScope) {
    },

    async increment(objectOrId, properties, options) {
+      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
      if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
      const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;

@@ -149,6 +170,7 @@ function createRecordsAPI(modelScope) {
    },

    async save(objectOrId, properties, options) {
+      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
      if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
      const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;

@@ -179,6 +201,7 @@ function createRecordsAPI(modelScope) {
    },

    async create(className, properties, options) {
+      if (typeof className === 'undefined') throw new Error("'className' is undefined");
      return new Promise((resolve, reject) => {
        cloudstore().create({
          collection: className,
@@ -197,6 +220,7 @@ function createRecordsAPI(modelScope) {
    },

    async delete(objectOrId, options) {
+      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
      if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
      const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;

@@ -265,7 +289,7 @@ function createRecordsAPI(modelScope) {
            resolve();
          },
          error: (err) => {
-            reject(Error(rr || 'Failed to add relation.'));
+            reject(Error(err || 'Failed to add relation.'));
          }
        });
      });
--- a/packages/noodl-runtime/src/collection.js
+++ b/packages/noodl-runtime/src/collection.js
@@ -1,6 +1,6 @@
-"use strict";
+'use strict';

-var Model = require("./model");
+var Model = require('./model');

 // Get and set proxy
 /*const proxies = {}
@@ -221,48 +221,48 @@ Collection.prototype.toJSON = function() {
 }*/

 // ----
-Object.defineProperty(Array.prototype, "items", {
+Object.defineProperty(Array.prototype, 'items', {
  enumerable: false,
  get() {
    return this;
  },
  set(data) {
    this.set(data);
-  },
+  }
 });
-Object.defineProperty(Array.prototype, "each", {
+Object.defineProperty(Array.prototype, 'each', {
  enumerable: false,
  writable: false,
-  value: Array.prototype.forEach,
+  value: Array.prototype.forEach
 });
-Object.defineProperty(Array.prototype, "size", {
+Object.defineProperty(Array.prototype, 'size', {
  enumerable: false,
  writable: false,
  value: function () {
    return this.length;
-  },
+  }
 });
-Object.defineProperty(Array.prototype, "get", {
+Object.defineProperty(Array.prototype, 'get', {
  enumerable: false,
  writable: false,
  value: function (index) {
    return this[index];
-  },
+  }
 });
-Object.defineProperty(Array.prototype, "getId", {
+Object.defineProperty(Array.prototype, 'getId', {
  enumerable: false,
  writable: false,
  value: function () {
    return this._id;
-  },
+  }
 });
-Object.defineProperty(Array.prototype, "id", {
+Object.defineProperty(Array.prototype, 'id', {
  enumerable: false,
  get() {
    return this.getId();
-  },
+  }
 });
-Object.defineProperty(Array.prototype, "set", {
+Object.defineProperty(Array.prototype, 'set', {
  enumerable: false,
  writable: false,
  value: function (src) {
@@ -323,10 +323,10 @@ Object.defineProperty(Array.prototype, "set", {
    for (i = aItems.length; i < bItems.length; i++) {
      this.add(bItems[i]);
    }
-  },
+  }
 });

-Object.defineProperty(Array.prototype, "notify", {
+Object.defineProperty(Array.prototype, 'notify', {
  enumerable: false,
  writable: false,
  value: async function (event, args) {
@@ -337,80 +337,80 @@ Object.defineProperty(Array.prototype, "notify", {
    for (var i = 0; i < l.length; i++) {
      await l[i](args);
    }
-  },
+  }
 });

-Object.defineProperty(Array.prototype, "contains", {
+Object.defineProperty(Array.prototype, 'contains', {
  enumerable: false,
  writable: false,
  value: function (item) {
    return this.indexOf(item) !== -1;
-  },
+  }
 });

-Object.defineProperty(Array.prototype, "add", {
+Object.defineProperty(Array.prototype, 'add', {
  enumerable: false,
  writable: false,
  value: async function (item) {
    if (this.contains(item)) return; // Already contains item

    this.items.push(item);
-    await this.notify("add", { item: item, index: this.items.length - 1 });
-    await this.notify("change");
-    await item.notify("add", { collection: this });
-  },
+    await this.notify('add', { item: item, index: this.items.length - 1 });
+    await this.notify('change');
+    await item.notify('add', { collection: this });
+  }
 });

-Object.defineProperty(Array.prototype, "remove", {
+Object.defineProperty(Array.prototype, 'remove', {
  enumerable: false,
  writable: false,
  value: function (item) {
    var idx = this.items.indexOf(item);
    if (idx !== -1) this.removeAtIndex(idx);
-  },
+  }
 });

-Object.defineProperty(Array.prototype, "addAtIndex", {
+Object.defineProperty(Array.prototype, 'addAtIndex', {
  enumerable: false,
  writable: false,
  value: async function (item, index) {
    if (this.contains(item)) return; // Already contains item

    this.items.splice(index, 0, item);
-    await this.notify("add", { item: item, index: index });
-    await this.notify("change");
-    await item.notify("add", { collection: this, index: index });
-  },
+    await this.notify('add', { item: item, index: index });
+    await this.notify('change');
+    await item.notify('add', { collection: this, index: index });
+  }
 });

-Object.defineProperty(Array.prototype, "removeAtIndex", {
+Object.defineProperty(Array.prototype, 'removeAtIndex', {
  enumerable: false,
  writable: false,
  value: async function (idx) {
    var item = this.items[idx];
    this.items.splice(idx, 1);
-    await this.notify("remove", { item: item, index: idx });
-    await this.notify("change");
-    await item.notify("remove", { collection: this });
-  },
+    await this.notify('remove', { item: item, index: idx });
+    await this.notify('change');
+    await item.notify('remove', { collection: this });
+  }
 });

-Object.defineProperty(Array.prototype, "on", {
+Object.defineProperty(Array.prototype, 'on', {
  enumerable: false,
  writable: false,
  value: function (event, listener) {
    if (!this._listeners)
-      Object.defineProperty(this, "_listeners", {
+      Object.defineProperty(this, '_listeners', {
        enumerable: false,
        writable: false,
-        value: {},
+        value: {}
      });
    if (!this._listeners[event]) this._listeners[event] = [];
    this._listeners[event].push(listener);
-  },
+  }
 });

-Object.defineProperty(Array.prototype, "off", {
+Object.defineProperty(Array.prototype, 'off', {
  enumerable: false,
  writable: false,
  value: function (event, listener) {
@@ -418,20 +418,20 @@ Object.defineProperty(Array.prototype, "off", {
    if (!this._listeners[event]) return;
    var idx = this._listeners[event].indexOf(listener);
    if (idx !== -1) this._listeners[event].splice(idx, 1);
-  },
+  }
 });

 class Collection extends Array {}

-var collections = (Collection._collections = {});
+const collections = (Collection._collections = {});

 Collection.create = function (items) {
  const name = Model.guid();
  collections[name] = new Collection();
-  Object.defineProperty(collections[name], "_id", {
+  Object.defineProperty(collections[name], '_id', {
    enumerable: false,
    writable: false,
-    value: name,
+    value: name
  });
  if (items) {
    collections[name].set(items);
@@ -439,14 +439,18 @@ Collection.create = function (items) {
  return collections[name];
 };

+/**
+ * @param {string} name
+ * @returns {Collection}
+ */
 Collection.get = function (name) {
  if (name === undefined) name = Model.guid();
  if (!collections[name]) {
    collections[name] = new Collection();
-    Object.defineProperty(collections[name], "_id", {
+    Object.defineProperty(collections[name], '_id', {
      enumerable: false,
      writable: false,
-      value: name,
+      value: name
    });
  }

--- a/packages/noodl-runtime/src/model.js
+++ b/packages/noodl-runtime/src/model.js
@@ -35,6 +35,11 @@ const _modelProxyHandler = {
  }
 };

+/**
+ *
+ * @param {*} id
+ * @returns {Model}
+ */
 Model.get = function (id) {
  if (id === undefined) id = Model.guid();
  if (!models[id]) {
@@ -122,13 +127,22 @@ Model.prototype.fill = function (value = null) {
  }
 };

+/**
+ * @param {string} name
+ * @param {unknown} value
+ * @param {{
+ *  resolve?: boolean;
+ *  forceChange?: boolean;
+ *  silent?: boolean;
+ * }} args
+ */
 Model.prototype.set = function (name, value, args) {
  if (args && args.resolve && name.indexOf('.') !== -1) {
    // We should resolve path references
-    var path = name.split('.');
-    var model = this;
-    for (var i = 0; i < path.length - 1; i++) {
-      var v = model.get(path[i]);
+    const path = name.split('.');
+    let model = this;
+    for (let i = 0; i < path.length - 1; i++) {
+      const v = model.get(path[i]);
      if (Model.instanceOf(v)) model = v;
      else return; // Path resolve failed
    }
@@ -138,24 +152,35 @@ Model.prototype.set = function (name, value, args) {

  const forceChange = args && args.forceChange;

-  var oldValue = this.data[name];
+  const oldValue = this.data[name];
  this.data[name] = value;
-  (forceChange || oldValue !== value) &&
-    (!args || !args.silent) &&
+
+  if ((forceChange || oldValue !== value) && (!args || !args.silent)) {
    this.notify('change', { name: name, value: value, old: oldValue });
+  }
 };

+/**
+ * @returns {string}
+ */
 Model.prototype.getId = function () {
  return this.id;
 };

+/**
+ * @param {string} name
+ * @param {{
+ *  resolve?: boolean;
+ * }} args
+ * @returns {unknown}
+ */
 Model.prototype.get = function (name, args) {
  if (args && args.resolve && name.indexOf('.') !== -1) {
    // We should resolve path references
-    var path = name.split('.');
-    var model = this;
-    for (var i = 0; i < path.length - 1; i++) {
-      var v = model.get(path[i]);
+    const path = name.split('.');
+    let model = this;
+    for (let i = 0; i < path.length - 1; i++) {
+      const v = model.get(path[i]);
      if (Model.instanceOf(v)) model = v;
      else return; // Path resolve failed
    }
--- a/packages/noodl-runtime/src/nodecontext.js
+++ b/packages/noodl-runtime/src/nodecontext.js
@@ -230,7 +230,7 @@ NodeContext.prototype.deregisterComponentModel = function (componentModel) {

 NodeContext.prototype.fetchComponentBundle = async function (name) {
  const fetchBundle = async (name) => {
-    let baseUrl = Noodl.Env["BaseUrl"] || '/';
+    let baseUrl = Noodl.Env['BaseUrl'] || '/';
    let bundleUrl = `${baseUrl}noodl_bundles/${name}.json`;

    const response = await fetch(bundleUrl);
@@ -455,6 +455,15 @@ NodeContext.prototype.setPopupCallbacks = function ({ onShow, onClose }) {
  this.onClosePopup = onClose;
 };

+/**
+ * @param {string} popupComponent
+ * @param {Record<string, unknown>} params
+ * @param {{
+ *  senderNode?: unknown;
+ *  onClosePopup?: (action?: string, results: object) => void;
+ * }} args
+ * @returns
+ */
 NodeContext.prototype.showPopup = async function (popupComponent, params, args) {
  if (!this.onShowPopup) return;

--- a/packages/noodl-runtime/src/nodes/std-library/data/dbcollectionnode2.js
+++ b/packages/noodl-runtime/src/nodes/std-library/data/dbcollectionnode2.js
@@ -28,6 +28,7 @@ var DbCollectionNode = {
      _this.scheduleAfterInputsHaveUpdated(function () {
        _this.flagOutputDirty('count');
        _this.flagOutputDirty('firstItemId');
+        _this.flagOutputDirty('isEmpty');
        collectionChangedScheduled = false;
      });
    };
@@ -66,6 +67,7 @@ var DbCollectionNode = {

        _this.flagOutputDirty('count');
        _this.flagOutputDirty('firstItemId');
+        _this.flagOutputDirty('isEmpty');
      }

      if (args.type === 'create') {
@@ -91,6 +93,7 @@ var DbCollectionNode = {

            _this.flagOutputDirty('count');
            _this.flagOutputDirty('firstItemId');
+            _this.flagOutputDirty('isEmpty');
          } else if (matchesQuery && !_this._internal.collection.contains(m)) {
            // It's not part of the result collection but now matches they query, add it and resort
            _addModelAtCorrectIndex(m);
@@ -106,6 +109,7 @@ var DbCollectionNode = {

          _this.flagOutputDirty('count');
          _this.flagOutputDirty('firstItemId');
+          _this.flagOutputDirty('isEmpty');
        }
      }
    };
@@ -153,6 +157,17 @@ var DbCollectionNode = {
        }
      }
    },
+    isEmpty: {
+      type: 'boolean',
+      displayName: 'Is Empty',
+      group: 'General',
+      getter: function () {
+        if (this._internal.collection) {
+          return this._internal.collection.size() === 0;
+        }
+        return true;
+      }
+    },
    count: {
      type: 'number',
      displayName: 'Count',
@@ -189,6 +204,7 @@ var DbCollectionNode = {
    setCollection: function (collection) {
      this.bindCollection(collection);
      this.flagOutputDirty('firstItemId');
+      this.flagOutputDirty('isEmpty');
      this.flagOutputDirty('items');
      this.flagOutputDirty('count');
    },
@@ -257,7 +273,7 @@ var DbCollectionNode = {
        limit: limit,
        skip: skip,
        count: count,
-        success: (results,count) => {
+        success: (results, count) => {
          if (results !== undefined) {
            _c.set(
              results.map((i) => {
@@ -267,10 +283,9 @@ var DbCollectionNode = {
              })
            );
          }
-          if(count !== undefined) {
+          if (count !== undefined) {
            this._internal.storageSettings.storageTotalCount = count;
-            if(this.hasOutput('storageTotalCount')) 
-              this.flagOutputDirty('storageTotalCount');
+            if (this.hasOutput('storageTotalCount')) this.flagOutputDirty('storageTotalCount');
          }
          this.setCollection(_c);
          this.sendSignalOnOutput('fetched');
@@ -383,7 +398,7 @@ var DbCollectionNode = {
      if (!storageSettings['storageEnableLimit']) return;
      else return storageSettings['storageSkip'] || 0;
    },
-    getStorageFetchTotalCount: function() {
+    getStorageFetchTotalCount: function () {
      const storageSettings = this._internal.storageSettings;

      return !!storageSettings['storageEnableCount'];
--- a/packages/noodl-runtime/src/nodes/std-library/data/dbmodelnode2.js
+++ b/packages/noodl-runtime/src/nodes/std-library/data/dbmodelnode2.js
@@ -2,10 +2,10 @@

 const { Node, EdgeTriggeredInput } = require('../../../../noodl-runtime');

-var Model = require('../../../model');
+const Model = require('../../../model');
 const CloudStore = require('../../../api/cloudstore');

-var ModelNodeDefinition = {
+const ModelNodeDefinition = {
  name: 'DbModel2',
  docs: 'https://docs.noodl.net/nodes/data/cloud-data/record',
  displayNodeName: 'Record',
@@ -21,11 +21,11 @@ var ModelNodeDefinition = {
    }
  ],
  initialize: function () {
-    var internal = this._internal;
+    const internal = this._internal;
    internal.inputValues = {};
    internal.relationModelIds = {};

-    var _this = this;
+    const _this = this;
    this._internal.onModelChangedCallback = function (args) {
      if (_this.isInputConnected('fetch')) return;

@@ -109,13 +109,18 @@ var ModelNodeDefinition = {
      displayName: 'Id',
      group: 'General',
      set: function (value) {
-        if (value instanceof Model) value = value.getId();
-        // Can be passed as model as well
-        else if (typeof value === 'object') value = Model.create(value).getId(); // If this is an js object, dereference it
+        if (value instanceof Model) {
+          // Can be passed as model as well
+          value = value.getId();
+        } else if (typeof value === 'object') {
+          // If this is an js object, dereference it
+          value = Model.create(value).getId();
+        }

        this._internal.modelId = value; // Wait to fetch data
-        if (this.isInputConnected('fetch') === false) this.setModelID(value);
-        else {
+        if (this.isInputConnected('fetch') === false) {
+          this.setModelID(value);
+        } else {
          this.flagOutputDirty('id');
        }
      }
@@ -138,9 +143,10 @@ var ModelNodeDefinition = {
      this.setModel(model);
    },
    setModel: function (model) {
-      if (this._internal.model)
+      if (this._internal.model) {
        // Remove old listener if existing
        this._internal.model.off('change', this._internal.onModelChangedCallback);
+      }

      this._internal.model = model;
      this.flagOutputDirty('id');
@@ -148,7 +154,9 @@ var ModelNodeDefinition = {

      // We have a new model, mark all outputs as dirty
      for (var key in model.data) {
-        if (this.hasOutput('prop-' + key)) this.flagOutputDirty('prop-' + key);
+        if (this.hasOutput('prop-' + key)) {
+          this.flagOutputDirty('prop-' + key);
+        }
      }
      this.sendSignalOnOutput('fetched');
    },
@@ -184,7 +192,7 @@ var ModelNodeDefinition = {
      }
    },
    scheduleFetch: function () {
-      var _this = this;
+      const _this = this;
      const internal = this._internal;

      this.scheduleOnce('Fetch', function () {
@@ -199,12 +207,13 @@ var ModelNodeDefinition = {
          collection: internal.collectionId,
          objectId: internal.modelId, // Get the objectId part of the model id
          success: function (response) {
-            var model = cloudstore._fromJSON(response, internal.collectionId);
+            const model = cloudstore._fromJSON(response, internal.collectionId);
            if (internal.model !== model) {
              // Check if we need to change model
-              if (internal.model)
+              if (internal.model) {
                // Remove old listener if existing
                internal.model.off('change', internal.onModelChangedCallback);
+              }

              internal.model = model;
              model.on('change', internal.onModelChangedCallback);
@@ -213,8 +222,10 @@ var ModelNodeDefinition = {

            delete response.objectId;

-            for (var key in response) {
-              if (_this.hasOutput('prop-' + key)) _this.flagOutputDirty('prop-' + key);
+            for (const key in response) {
+              if (_this.hasOutput('prop-' + key)) {
+                _this.flagOutputDirty('prop-' + key);
+              }
            }

            _this.sendSignalOnOutput('fetched');
@@ -226,7 +237,6 @@ var ModelNodeDefinition = {
      });
    },
    scheduleStore: function () {
-      var _this = this;
      var internal = this._internal;
      if (!internal.model) return;

@@ -247,8 +257,6 @@ var ModelNodeDefinition = {
        });
    },
    registerInputIfNeeded: function (name) {
-      var _this = this;
-
      if (this.hasInput(name)) {
        return;
      }
@@ -328,8 +336,7 @@ function updatePorts(nodeId, parameters, editorConnection, graphModel) {
        var p = props[key];
        if (ports.find((_p) => _p.name === key)) continue;

-        if (p.type === 'Relation') {
-        } else {
+        if (p.type !== 'Relation') {
          // Other schema type ports
          const _typeMap = {
            String: 'string',
@@ -373,16 +380,16 @@ module.exports = {
    function _managePortsForNode(node) {
      updatePorts(node.id, node.parameters, context.editorConnection, graphModel);

-      node.on('parameterUpdated', function (event) {
+      node.on('parameterUpdated', function () {
        updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
      });

-      graphModel.on('metadataChanged.dbCollections', function (data) {
+      graphModel.on('metadataChanged.dbCollections', function () {
        CloudStore.invalidateCollections();
        updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
      });

-      graphModel.on('metadataChanged.systemCollections', function (data) {
+      graphModel.on('metadataChanged.systemCollections', function () {
        CloudStore.invalidateCollections();
        updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
      });
--- a/packages/noodl-runtime/src/nodes/std-library/data/setdbmodelpropertiesnode.js
+++ b/packages/noodl-runtime/src/nodes/std-library/data/setdbmodelpropertiesnode.js
@@ -75,12 +75,12 @@ var SetDbModelPropertiedNodeDefinition = {
            _this.setError('Missing Record Id');
            return;
          }
-          var model = internal.model;
-
-          for (var i in internal.inputValues) {
-            model.set(i, internal.inputValues[i], { resolve: true });
+          
+          const model = internal.model;
+          for (const key in internal.inputValues) {
+            model.set(key, internal.inputValues[key], { resolve: true });
          }
-
+          
          CloudStore.forScope(_this.nodeScope.modelScope).save({
            collection: internal.collectionId,
            objectId: model.getId(), // Get the objectId part of the model id
--- a/packages/noodl-runtime/src/nodes/std-library/datetostring.js
+++ b/packages/noodl-runtime/src/nodes/std-library/datetostring.js
@@ -31,8 +31,6 @@ const DateToStringNode = {

        this._internal.currentInput = _value;
        this._format();
-        this.flagOutputDirty('currentValue');
-        this.sendSignalOnOutput('inputChanged');
      }
    }
  },
@@ -49,28 +47,45 @@ const DateToStringNode = {
      type: 'signal',
      displayName: 'Date Changed',
      group: 'Signals'
+    },
+    onError: {
+      type: 'signal',
+      displayName: 'Invalid Date',
+      group: 'Signals'
    }
  },
  methods: {
    _format() {
-      const t = this._internal.currentInput;
-      const format = this._internal.formatString;
-      const date = ('0' + t.getDate()).slice(-2);
-      const month = ('0' + (t.getMonth() + 1)).slice(-2);
-      const monthShort = new Intl.DateTimeFormat('en-US', { month: 'short' }).format(t);
-      const year = t.getFullYear();
-      const hours = ('0' + t.getHours()).slice(-2);
-      const minutes = ('0' + t.getMinutes()).slice(-2);
-      const seconds = ('0' + t.getSeconds()).slice(-2);
+      try {
+        const t = this._internal.currentInput;
+        const format = this._internal.formatString;
+        const date = ('0' + t.getDate()).slice(-2);
+        const month = ('0' + (t.getMonth() + 1)).slice(-2);
+        const monthShort = new Intl.DateTimeFormat('en-US', { month: 'short' }).format(t);
+        const year = t.getFullYear();
+        const yearShort = year.toString().substring(2);
+        const hours = ('0' + t.getHours()).slice(-2);
+        const minutes = ('0' + t.getMinutes()).slice(-2);
+        const seconds = ('0' + t.getSeconds()).slice(-2);

-      this._internal.dateString = format
-        .replace(/\{date\}/g, date)
-        .replace(/\{month\}/g, month)
-        .replace(/\{monthShort\}/g, monthShort)
-        .replace(/\{year\}/g, year)
-        .replace(/\{hours\}/g, hours)
-        .replace(/\{minutes\}/g, minutes)
-        .replace(/\{seconds\}/g, seconds);
+        this._internal.dateString = format
+          .replace(/\{date\}/g, date)
+          .replace(/\{month\}/g, month)
+          .replace(/\{monthShort\}/g, monthShort)
+          .replace(/\{year\}/g, year)
+          .replace(/\{yearShort\}/g, yearShort)
+          .replace(/\{hours\}/g, hours)
+          .replace(/\{minutes\}/g, minutes)
+          .replace(/\{seconds\}/g, seconds);
+      } catch (error) {
+        // Set the output to be blank, makes it easier to handle.
+        this._internal.dateString = '';
+        this.flagOutputDirty('onError');
+      }
+
+      // Flag that the value have changed
+      this.flagOutputDirty('currentValue');
+      this.sendSignalOnOutput('inputChanged');
    }
  }
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Tuvesson	b4ef346d25	chore: Combine search keybinding definitions	2024-11-18 17:50:41 +01:00
Eric Tuvesson	6205d08451	fix: showPopup replace error (#82 ) Error: "TypeError: Cannot read properties of undefined (reading 'replace')"	2024-11-18 17:06:10 +01:00
Eric Tuvesson	14786b2144	chore(runtime): Add some JSDocs (#81 )	2024-11-18 17:01:49 +01:00
Eric Tuvesson	e25155556f	feat(runtime): 'Set Variable' node, add editor getInspectInfo (#80 ) It is very nice to be able to inspect the value inside the variable even via the "Set Variable" node. Most of the time I see an additional variable node placed above the "Set Variable" node to just inspect the current value.	2024-11-13 13:35:03 +01:00
Eric Tuvesson	016837f466	feat(runtime): Add "keys" and "excludeKeys" to fetch record api (#79 ) Adding support for some more options when fetching a record. `91f9aca25b/src/Routers/ClassesRouter.js (L60-L68)`	2024-11-12 15:50:49 +01:00
Eric Tuvesson	fff03c05bf	fix(runtime): Close Popup node with no actions causing error (#78 ) TypeError: Cannot read properties of undefined (reading 'replace') at Object.onClosePopup (navigation.js:10:1) at EventEmitter.<anonymous> (nodecontext.js:491:1) at Object.onceWrapper (events.js:242:1) at EventEmitter.emit (events.js:153:1) at NoodlRuntime._doUpdate (noodl-runtime.js:338:1)	2024-10-03 11:24:57 +02:00
Eric Tuvesson	5dbb11bac8	chore: code clean up (#76 )	2024-10-01 16:09:03 +02:00
Eric Tuvesson	d80870e835	fix(runtime): Passing in invalid date to "Date To String" node causes node scope to fail (#75 )	2024-09-23 21:11:32 +02:00
Eric Tuvesson	a98e381f8c	fix: deploy in devmode (#74 ) This occurred because building in dev mode does not create the source map files which it expects to copy over.	2024-09-23 08:44:54 +02:00
Eric Tuvesson	72aec29e27	feat(runtime): Add "className" option support to "relatedTo" (#73 ) * feat(runtime): Add "className" option support to "relatedTo" Also includes error handling when "className" is not found.	2024-09-16 22:12:07 +02:00
Eric Tuvesson	2eb18acfef	fix(viewer-react): Update CurrentUserObject TS typings (#72 )	2024-09-11 16:15:02 +02:00
Eric Tuvesson	e1a1b31213	feat(viewer-react): Array, add "First Item Id" output (#71 ) Same behaviour as Query Record's "First Record Id"	2024-09-11 16:14:49 +02:00
Eric Tuvesson	5febc490b4	feat(runtime): Query Records, add "Is Empty" output (#70 )	2024-09-10 11:31:51 +02:00
Eric Tuvesson	48541347f0	fix(editor): Remove all the Cloud Triggers from the Cloud Function node Functions dropdown (#69 )	2024-09-09 17:35:08 +02:00
Eric Tuvesson	cc79ea5f7e	feat(viewer-react): Add groups to Component Stack outputs (#67 )	2024-09-07 14:31:06 +02:00
Eric Tuvesson	46f6cb2da9	feat(viewer-react): Add Target Page input to "Push Component To Stack" (#66 )	2024-09-07 14:14:39 +02:00
Eric Tuvesson	34c3d07112	feat(editor): Add "Used in x places" in Component List menu (#65 )	2024-09-05 13:35:15 +02:00
Eric Tuvesson	d85dce8d02	refactor(editor): useNodeReferences to React context (#64 )	2024-09-05 13:19:17 +02:00
Eric Tuvesson	89ed2d602f	feat: Add source maps (#63 )	2024-09-05 09:59:11 +02:00
Eric Tuvesson	94dd3dbf0e	chore: bump version (#62 )	2024-08-08 21:27:12 +02:00
Eric Tuvesson	c593a134b3	chore: rename project name (#60 )	2024-08-08 21:23:23 +02:00
Eric Tuvesson	dc638ea8fc	feat: Upgrade Electron (#61 )	2024-08-08 21:12:39 +02:00
Eric Tuvesson	759c8a0030	fix(runtime): Column node, hide children on calculation (#59 ) This removes the initial visible layout shift	2024-07-24 15:59:10 +02:00
Eric Tuvesson	aea80c6586	feat(runtime): Add capture attribute on Open File Picker node (#57 ) - https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#capture - https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/capture	2024-07-19 15:03:03 +02:00
Eric Tuvesson	46e2efa576	feat(runtime): Add "Switched" signal output on the Switch node (#58 )	2024-07-19 15:02:49 +02:00
Eric Tuvesson	c508e15546	chore: clean up user nodes (#53 )	2024-07-15 15:21:01 +02:00
Eric Tuvesson	d61effc615	feat(editor): Deploy popup always mounted (#51 ) This removes the delayed loading when opening the deploy popup	2024-07-08 12:47:28 +02:00
Eric Tuvesson	12be6dc69f	feat(editor): Upgrade electron (#50 )	2024-07-08 09:35:18 +02:00
Eric Tuvesson	17e3d16436	chore: clean up editor assets (#12 )	2024-07-08 08:09:39 +02:00
Eric Tuvesson	233479a1bc	feat: Add Support for Parse Server v7 (#20 ) * feat: Upgrade Aggregate queries to latest Parse API * feat: Save parse server major version in metadata This can be used to determine which version of the Parse API that will be used. * fix: Add support for both versions of aggregate queries	2024-07-08 08:06:47 +02:00
Eric Tuvesson	57e5246022	feat(runtime): Add default label to String Format node (#49 ) Update the String Format node default label to show the format, like how the other nodes work.	2024-07-04 15:54:20 +02:00
Eric Tuvesson	dda22e0de6	feat(runtime): Add Image node output "On Error" signal (#48 ) "On Error" is triggered when the image is not loading correctly, making it possible to hide the Image node or show a placeholder instead.	2024-07-04 14:02:34 +02:00
Eric Tuvesson	618955e1ee	feat: Portal include Project ID (#47 )	2024-06-28 00:43:34 +02:00
Eric Tuvesson	8c7d4faeca	fix(runtime): Column node added a div with empty Repeater (#45 ) When the Column node only had an empty Repeater child, there was an empty HTML element.	2024-06-27 21:16:50 +02:00
Eric Tuvesson	c5754c9160	feat(runtime): Add "data-testId" attribute to Columns node (#44 )	2024-06-27 15:42:25 +02:00
Eric Tuvesson	3fb3668fc3	feat: Allow relative git repository (#41 )	2024-06-26 21:11:50 +02:00
Eric Tuvesson	fa282d6169	feat(runtime): Add "data-testid" attributes to UI nodes (#42 )	2024-06-26 21:08:01 +02:00
Eric Tuvesson	0ee55c26eb	feat(editor): Search panel show "(Cloud Function)" if result is in Cloud Functions sheet (#40 )	2024-06-17 10:35:02 +02:00
Eric Tuvesson	3a31b86d48	chore(runtime): Clean up "Push Component To Stack" (#30 )	2024-06-13 22:25:16 +02:00
Eric Tuvesson	2f06952e4a	fix(runtime): JavaScript Records API error handling (#32 )	2024-06-13 22:24:34 +02:00
Eric Tuvesson	44a40aef96	fix: Add more error handling to JavaScript Records API (#33 )	2024-06-13 22:24:05 +02:00
Eric Tuvesson	0a69765460	chore: Update template provider name (#38 )	2024-06-13 22:23:30 +02:00
alan-x-n	2ebd57b29a	chore: Update README.md	2024-06-02 15:29:25 -07:00
alan-x-n	5225d26870	chore: Updated README.md	2024-06-02 15:27:35 -07:00
Eric Tuvesson	eb71536cb0	chore: Update branding info (#31 ) * fix: branding info for package.json * fix: updated package jsons with updated contact & author info --------- Co-authored-by: alan-x-n <x.alanan.x@gmail.com>	2024-06-02 17:43:03 +02:00
Eric Tuvesson	d67afd3c60	feat(runtime): Date To String node, add "yearShort" format (#29 )	2024-06-02 07:55:39 -07:00
Eric Tuvesson	1a048587d9	feat(editor): Tooltip support multiple fineTypes (#28 )	2024-05-31 08:58:17 +02:00
Eric Tuvesson	8e16d5f9d4	feat: Add tooltip to cloud service "Open Dashboard" button (#27 )	2024-05-29 10:05:38 +02:00
Eric Tuvesson	cdeb4b1c15	feat: Improve the Noodl.Records.query typings API (#25 )	2024-05-24 15:49:05 +02:00
Eric Tuvesson	f8a2170f5d	fix: Pop Component Stack back actions (#22 ) Fixes https://github.com/The-Low-Code-Foundation/Code-Crusher/issues/3	2024-05-20 22:49:26 +02:00
Eric Tuvesson	4237b9290d	fix: Logo TSX (#21 )	2024-05-20 22:38:57 +02:00
Eric Tuvesson	c9243e355b	feat: Include project info when deploying Cloud Functions (#19 )	2024-05-17 09:54:56 +02:00
Eric Tuvesson	4f85055fe8	feat: Editor Preview, patch "window.open" to navigate in same view (#18 )	2024-05-16 10:58:02 +02:00
Eric Tuvesson	4e09a70a24	feat: Version control commit, View on GitHub (#17 ) * feat: Version control commit, View on GitHub * fix: MenuDialog allow undefined menu item This makes it a lot easier to create conditional menu items	2024-05-14 14:00:43 +02:00
Eric Tuvesson	13c92779b2	fix: Video node attributes (#16 ) Fixes https://github.com/noodlapp/noodl/issues/39	2024-05-09 16:49:09 +02:00
Eric Tuvesson	68e2070c61	fix: OpenAI Fetch API (#15 )	2024-05-09 14:17:08 +02:00
Eric Tuvesson	c7053f6ddf	Fix: Javascript node error logs (#14 ) In some cases the error is a string, and when logging it will write "undefined" into the console instead of providing a useful error message.	2024-05-09 14:09:37 +02:00
Eric Tuvesson	badc47e392	fix(build): macos-notarize.js	2024-04-18 22:55:13 +02:00
Eric Tuvesson	d14da98637	chore: Update "Build noodl-editor" GH workflow	2024-04-18 22:30:52 +02:00
Eric Tuvesson	ac1980fed6	feat: build (#13 )	2024-04-09 22:37:17 +02:00
Eric Tuvesson	5ef436215d	chore: update icons and branding (#11 ) Co-authored-by: alan-x-n <x.alanan.x@gmail.com>	2024-04-04 07:30:14 +02:00
Eric Tuvesson	9f85089bd6	feat: Add initial Fluxscape deploy popup (#6 )	2024-04-03 18:56:07 +02:00
Eric Tuvesson	51224f9455	chore: Update more branding (#9 ) Co-authored-by: alan-x-n <x.alanan.x@gmail.com>	2024-04-03 00:14:40 +02:00
Eric Tuvesson	d7147efa0c	feat: Updated SVG logos in Logo.tsx (#8 ) Co-authored-by: alan-x-n <x.alanan.x@gmail.com>	2024-04-02 15:05:14 +02:00
Eric Tuvesson	f216e5844b	chore: Update more branding (#7 )	2024-04-01 19:32:29 +02:00
alan-x-n	51f6263931	Merge pull request #2 from fluxscape/alan feat: Update branding	2024-03-27 02:47:38 -07:00
alan-x-n	694963b310	Branding Logo Updates	2024-03-27 01:00:29 -07:00
Eric Tuvesson	3500ac3637	fix: docs link (#5 ) Fixes https://github.com/noodlapp/noodl/issues/16	2024-03-26 22:53:55 +01:00
Eric Tuvesson	da0a17a6e8	feat: Improve build scripts signing (#4 )	2024-03-26 22:32:04 +01:00
Eric Tuvesson	ff3b29b097	fix: import issue (#3 )	2024-03-26 22:13:39 +01:00
Eric Tuvesson	247122633a	feat: Cloud Services, allow changing all fields (#1 )	2024-03-26 22:05:21 +01:00
alan-x-n	2899ceace4	updated icons brightness fix	2024-03-25 21:41:49 -07:00
alan-x-n	60c1899273	Updated Fluxscape Icons Updated Fluxscape Icons	2024-03-21 13:04:34 -07:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM19 18H6c-2.21 0-4-1.79-4-4 0-2.05 1.53-3.76 3.56-3.97l1.07-.11.5-.95C8.08 7.14 9.94 6 12 6c2.62 0 4.88 1.86 5.39 4.43l.3 1.5 1.53.11c1.56.1 2.78 1.41 2.78 2.96 0 1.65-1.35 3-3 3zm-9-3.82l-2.09-2.09L6.5 13.5 10 17l6.01-6.01-1.41-1.41z"/></svg>
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>`