2025-03-01 10:36:34 +00:00
323 changed files with 7254 additions and 55647 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -12,11 +12,12 @@ permissions:
 jobs:
  build:
    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
      contents: read  # for actions/checkout to fetch code
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version: [18, 20, 22]
+        node-version: [16, 18, 20]
    steps:
    - uses: actions/checkout@v4
    - name: Use Node.js ${{ matrix.node-version }}
@ -28,3 +29,8 @@ jobs:
    - name: Run tests
      run: |
        npm run test
+    # - name: Publish to coveralls.io
+    #   if: ${{ matrix.node-version == 16 }}
+    #   uses: coverallsapp/github-action@v1.1.2
+    #   with:
+    #     github-token: ${{ github.token }}
--- a/.gitignore
+++ b/.gitignore
@ -28,4 +28,3 @@ docs
 .nyc_output
 sync.ffs_db
 package-lock.json
-.editorconfig
--- a/.nodemonignore
+++ b/.nodemonignore
@ -0,0 +1,4 @@
+/Gruntfile.js
+/.git/*
+*.backup
+/public/*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,193 +1,14 @@
-#### 4.0.9: Maintenance Release
+#### 3.1.11: Maintenance Release

- Editor
- 
- - Add details for the dynamic subscription to match the English docs (#5050) @aikitori
- - Fix tooltip snapping based on `typedInput` type (#5051) @GogoVega
- - Prevent symbol usage warning in monaco (#5049) @Steve-Mcl
- - Show subflow flow context under node section of sidebar (#5025) @knolleary
- - feat: Add custom label for default deploy button in settings.editorTheme (#5030) @matiseni51
- - Handle long auto-complete suggests (#5042) @knolleary
- - Handle undefined username when generating user icon (#5043) @knolleary
- - Handle dragging node into group and splicing link at same time (#5027) @knolleary
- - Remember context sidebar tree state when refreshing (#5021) @knolleary
- - Update sf instance env vars when removed from template (#5023) @knolleary
- - Do not select group when triggering quick-add within it (#5022) @knolleary
- - Fix library icon handling within library browser component (#5017) @knolleary
- 
-Runtime
- - Allow env var access to context (#5016) @knolleary
- - fix debug status reporting if null (#5018) @dceejay
- - Fix grunt dev via better ndoemon ignore rules (#5015) @knolleary
- - Fix typo in CHANGELOG (4.0.7-->4.0.8) (#5007) @natcl
+ - Add/Update German Translations for delay node (#4762) @dceejay
+ - Update ws dependency

-Nodes
- - Switch: Avoid exceeding call stack when draining message group in Switch (#5014) @knolleary
-
-#### 4.0.8: Maintenance Release
-
-Editor
-
- - Fix config node sort order when importing (#5000) @knolleary
-
-#### 4.0.7: Maintenance Release
-
-Editor
-
- - Fix def can be undefined if the type is missing (#4997) @GogoVega
- - Fix the user list of nested config node (#4995) @GogoVega
- - Support custom login message and button (#4993) @knolleary
-
-#### 4.0.6: Maintenance Release
-
-Editor
-
- - Roll up various fixes on config node change history (#4975) @knolleary
- - Add quotes when installing local tgz to fix spacing in the file path (#4949) @AGhorab-upland
- - Validate json dropped into editor to avoid unhelpful error messages (#4964) @knolleary
- - Fix junction insert position via context menu (#4974) @knolleary
- - Apply zoom scale when calculating annotation positions (#4981) @knolleary
- - Handle the import of an incomplete Subflow (#4811) @GogoVega
- - Fix updating the Subflow name during a copy (#4809) @GogoVega
- - Rename variable to avoid confusion in view.js (#4963) @knolleary
- - Change groups.length to groups.size (#4959) @hungtcs
- - Remove disabled node types from QuickAddDialog list (#4946) @GogoVega
- - Fix `setModulePendingUpdated` with plugins (#4939) @GogoVega
- - Missing getSubscriptions in the docs while its implemented (#4934) @ersinpw
- - Apply `envVarExcludes` setting to `util.getSetting` into the function node (#4925) @GogoVega
- - Fix `envVar` editable list should be sortable (#4932) @GogoVega
- - Improve the node name auto-generated with the first available number (#4912) @GogoVega
-
-Runtime
-
- - Get the env config node from the parent subflow (#4960) @GogoVega
- - Update dependencies (#4987) @knolleary
-
-Nodes
-
- - Performance : make reading single buffer / string file faster by not re-allocating and handling huge buffers (#4980) @Fadoli
- - Make delay node rate limit reset consistent - not send on reset. (#4940) @dceejay
- - Fix trigger node date handling for latest time type input (#4915) @dceejay
- - Fix delay node not dropping when nodeMessageBufferMaxLength is set (#4973)
- - Ensure node.sep is honoured when generating CSV (#4982) @knolleary
-
-#### 4.0.5: Maintenance Release
-
-Editor
-
- - Refix link call node can call out of a subflow (#4908) @GogoVega
-
-#### 4.0.4: Maintenance Release
-
-Editor
-
- - Fix `link call` node can call out of a subflow (#4892) @GogoVega
- - Fix wrong unlock state when event is triggered after deployment (#4889) @GogoVega
- - i18n(App) update with latest language file changes (#4903) @joebordes
- - fix typo: depreciated (#4895) @dxdc
-
-Runtime
-
- - Update dev dependencies (#4893) @knolleary
-
-Nodes
- 
- - MQTT: Allow msg.userProperties to have number values (#4900) @hardillb
-
-#### 4.0.3: Maintenance Release
-
-Editor
-
- - Refresh page title after changing tab name (#4850) @kazuhitoyokoi
- - Add Japanese translations for v4.0.2 (again) (#4853) @kazuhitoyokoi
- - Stay in quick-add mode following context menu insert (#4883) @knolleary
- - Do not include Junction type in quick-add for virtual links (#4879) @knolleary
- - Multiplayer cursor tracking (#4845) @knolleary
- - Hide add-flow options when disabled via editorTheme (#4869) @knolleary
- - Fix env-var config select when multiple defined (#4872) @knolleary
- - Fix subflow outbound-link filter (#4857) @GogoVega
- - Add French translations for v4.0.2 (#4856) @GogoVega
- - Fix moving link wires (#4851) @knolleary
- - Adjust type search dialog position to prevent x-overflow (#4844) @Steve-Mcl
- - fix: modulesInUse might be undefined (#4838) @lorenz-maurer
- - Add Japanese translations for v4.0.2 (#4849) @kazuhitoyokoi
- - Fix menu to enable/disable selection when it's a group (#4828) @GogoVega
-
-Runtime
-
- - Update dependencies (#4874) @knolleary
- - GitHub: Add citation file to enable "Cite this repository" feature (#4861) @lobis
- - Remove use of util.log (#4875) @knolleary
-
-Nodes
-
- - Fix invalid property error in range node example (#4855)
- - Fix typo in flow example name (#4854) @kazuhitoyokoi
- - Move SNI, ALPN and Verify Server cert out of check (#4882) @hardillb
- - Set status of mqtt nodes to "disconnected" when deregistered from broker (#4878) @Steve-Mcl
- - MQTT: Ensure will payload is a string (#4873) @knolleary
- - Let batch node terminate "early" if msg.parts set to end of sequence (#4829) @dceejay
- - Fix unintentional Capitalisation in Split node name (#4835) @dceejay
-
-#### 4.0.2: Maintenance Release
-
-Editor
-
- - Use a more subtle border on the header (#4818) @bonanitech
- - Improve the editor's French translations (#4824) @GogoVega
- - Clean up orphaned editors (#4821) @Steve-Mcl
- - Fix node validation if the property is not required (#4812) @GogoVega
- - Ensure mermaid.min.js is cached properly between loads of the editor (#4817) @knolleary
-
-Runtime
-
- - Allow auth cookie name to be customised (#4815) @knolleary
- - Guard against undefined sessions in multiplayer (#4816) @knolleary
-
-#### 4.0.1: Maintenance Release
-
-Editor
-
- - Ensure subflow instance credential property values are extracted (#4802) @knolleary
- - Use `_ADD_` value for both `add new...` and `none` options (#4800) @GogoVega
- - Fix the config node select value assignment (#4788) @GogoVega
- - Add tooltip for number of subflow instance on info tab (#4786) @kazuhitoyokoi
- - Add Japanese translations for v4.0.0 (#4785) @kazuhitoyokoi
-
-Runtime
-
- - Ensure group nodes are properly exported in /flow api (#4803) @knolleary
-
- Nodes
-
- - Joins: make using msg.parts optional in join node (#4796) @dceejay
- - HTTP Request: UI proxy should setup agents for both http_proxy and https_proxy (#4794) @Steve-Mcl
- - HTTP Request: Remove default user agent (#4791) @Steve-Mcl
-
-#### 4.0.0: Milestone Release
-
-This marks the next major release of Node-RED. The following changes represent
-those added since the last beta. Check the beta release details below for the complete
-list.
-
-Breaking Changes
-
- - Node-RED now requires Node 18.x or later. At the time of release, we recommend
-   using Node 20.
-
-Editor
-
- - Add `httpStaticCors` (#4761) @knolleary
- - Update dependencies (#4763) @knolleary
- - Sync master to dev (#4756) @knolleary
- - Add tooltip and message validation to `typedInput` (#4747) @GogoVega
- - Replace bcrypt with @node-rs/bcrypt (#4744) @knolleary
- - Export Nodes dialog refinement (#4746) @Steve-Mcl
-
-#### 4.0.0-beta.4: Beta Release
-
-Editor
+#### 3.1.10: Maintenance Release

+ - Include rewired nodes when calculating Modified Flows stop list (#4754) @knolleary
+ - Fix clone of group env var properties (#4753) @knolleary
+ - Fix losing links when importing a copy of links into a subflow (#4750) @GogoVega
+ - Ensure all CSS variables are in the output file (#3743) @bonanitech
 - Fix the Sidebar Config is not refreshed after a deploy (#4734) @GogoVega
 - Fix checkboxes are not updated when calling `typedInput("value", "")` (#4729) @GogoVega
 - Fix panning with middle mouse button on windows 10/11 (#4716) @corentin-sodebo-voile
@ -198,109 +19,669 @@ Editor
 - Change the Config Node cursor to `pointer` (#4711) @GogoVega
 - Add missing tooltips to Sidebar (#4713) @GogoVega
 - Allow nodes to return additional history entries in onEditSave (#4710) @knolleary
- - Update to Monaco 0.49.0 (#4725) @Steve-Mcl
- - Add Japanese translations for 4.0.0-beta.3 (#4726) @kazuhitoyokoi
- - Show lock on deploy if user is read-only (#4706) @knolleary
-
-Runtime
-
- - Ensure all CSS variables are in the output file (#3743) @bonanitech
- - Add httpAdminCookieOptions (#4718) @knolleary
- - chore: migrate deprecated `util.isArray` (#4724) @Rotzbua
- - Add --version cli args (#4707) @knolleary
- - feat(grunt): fail if files are missing (#4739) @Rotzbua
- - fix(node-red-pi): node-red not started by path (#4736) @Rotzbua
- - fix(editor): remove trailing slash (#4735) @Rotzbua
- - fix: remove deprecated mqtt.js (#4733) @Rotzbua 
-
-Nodes
-
- - Perform Proxy logic more like cURL (#4616) @Steve-Mcl
-
-#### 4.0.0-beta.3: Beta Release
-
-Editor
-
- - Improve background-deploy notification handling (#4692) @knolleary
- - Hide workspace tab on middle mouse click (#4657) @Steve-Mcl
- - multiplayer: Add user presence indicators (#4666) @knolleary
- - Enable updating dependency node of package.json in project feature (#4676) @kazuhitoyokoi
- - Add French translations for 4.0.0-beta.2 (#4681) @GogoVega
- - Add Japanese translations for 4.0.0-beta.2 (#4674) @kazuhitoyokoi
- - Fix saving of conf-type properties in module packaged subflows (#4658) @knolleary
- - Add npm install timeout notification (#4662) @hardillb
+ - Pass full error object in Function node and copy over cause property (#4685) @knolleary
+ - Replacing vm.createScript in favour of vm.Script (#4534) @patlux
+ - Avoid login loops when autoLogin enabled but login fails (#4684) @knolleary
 - Fix undo of subflow env property edits (#4667) @knolleary
 - Fix three error typos in monaco.js (#4660) @JoshuaCWebDeveloper
 - docs: Add closing paragraph tag (#4664) @ZJvandeWeg
- - Avoid login loops when autoLogin enabled but login fails (#4684) @knolleary

-Runtime
+#### 3.1.9: Maintenance Release

- - Allow blank strings to be used for env var property substitutions (#4672) @knolleary
- - Use rfdc for cloning pure JSON values (#4679) @knolleary
- - fix: remove outdated Node 11+ check (#4314) @Rotzbua
- - feat(ci): add new nodejs v22 (#4694) @Rotzbua
- - fix(node): increase required node >=18.5 (#4690) @Rotzbua
- - fix(dns): remove outdated node check (#4689) @Rotzbua
- - fix(polyfill): remove import module polyfill (#4688) @Rotzbua
- - Fix typo (#4686) @Rotzbua
+ - Prevent subflow being added to itself (#4654) @knolleary
+ - Fix use of spawn on windows with cmd files (#4652) @knolleary
+ - Guard refresh of unknown subflow (#4640) @knolleary
+ - Fix subflow module sending messages to debug sidebar (#4642) @knolleary

-Nodes
+#### 3.1.8: Maintenance Release

- - Pass full error object in Function node and copy over cause property (#4685) @knolleary
- - Replacing vm.createScript in favour of vm.Script (#4534) @patlux
+ - Add validation and error handling on subflow instance properties (#4632) @knolleary
+ - Hide import/export context menu if disabled in theme (#4633) @knolleary
+ - Show change indicator on subflow tabs (#4631) @knolleary
+ - Bump dependencies (#4630) @knolleary
+ - Reset workspace index when clearing nodes (#4619) @knolleary
+ - Remove typo in global config (#4613) @kazuhitoyokoi

-#### 4.0.0-beta.2: Beta Release
+#### 3.1.7: Maintenance Release
+
+ - Add Japanese translation for v3.1.6 (#4603) @kazuhitoyokoi
+ - Update jsonata version (#4593) @hardillb
+
+#### 3.1.6: Maintenance Release

 Editor

- - Introduce multiplayer feature (#4629) @knolleary
- - Separate the "add new config-node" option into a new (+) button (#4627) @GogoVega
- - Retain Palette categories collapsed and filter to localStorage (#4634) @knolleary
- - Ensure palette filter reapplies and clear up unknown categories (#4637) @knolleary
- - Add support for plugin (only) modules to the palette manager (#4620) @knolleary
- - Update monaco to latest and node types to 18 LTS (#4615) @Steve-Mcl
+ - Do not flag env var in num typedInput as error (#4582) @knolleary
+ - Fix example flow name in import dialog (#4578) @kazuhitoyokoi
+ - Fix missing node icons in workspace (#4570) @knolleary

 Runtime

- - Fix handling of subflow config-node select type in sf module (#4643) @knolleary
- - Comms API updates (#4628) @knolleary
- - Add French translations for 4.0.0-beta.1 (#4621) @GogoVega
- - Add Japanese translations for 4.0.0-beta.1 (#4612) @kazuhitoyokoi
+ - Handle undefined env vars (#4581) @knolleary
+ - fix: Removed offending MD5 crypto hash and replaced with SHA1 and SHA256 … (#4568) @JaysonHurst
+ - chore: remove never use import code (#4580) @giscafer

 Nodes
- - Fix change node handling of replacing with boolean (#4639) @knolleary

-#### 4.0.0-beta.1: Beta Release
+ - fix: template node zh-CN translation (#4575) @giscafer
+
+#### 3.1.5: Maintenance Release
+
+Runtime
+
+ - Fix require of dns module (#4562) @knolleary
+ - Ensure global creds object is initialised when adding first cred (#4561) @knolleary
+
+#### 3.1.4: Maintenance Release

 Editor

- - Click on id in debug panel highlights node or flow (#4439) @ralphwetzel
- - Support config selection in a subflow env var (#4587) @Steve-Mcl
- - Add timestamp formatting options to TypedInput (#4468) @knolleary
- - Allow RED.view.select to select links (#4553) @lgrkvst
- - Add auto-complete to flow/global/env typedInput types (#4480) @knolleary
- - Improve the appearance of the Node-RED primary header (#4598) @joepavitt
+ - Highlight errors in config node sidebar (#4529) @knolleary
+ - Improve feedback in import dialog to show conflicted nodes (#4550) @knolleary
+ - Modify node users info in config editor footer (#4528) @knolleary
+ - Handle modified-nodes deploy after replacing unknown config node (#4556) @knolleary
+ - Handle undefined default export when importing module (#4539) @knolleary
+ - Fix icon scaling for non .svg icons (#4491) @ralphwetzel
+ - (convertNode) Do not create the credentials object if there is nothing to export (#4544) @GogoVega
+ - Ensure subflow instance node has g property set (#4538) @knolleary
+ - Handle importing flow with existing subflow and instance node (#4546) @knolleary
+ - Update index.mst (#4483) @gorenje
+ - Include top level property name when copying path from context (#4527) @knolleary
+ - Add handling to disable items on context menu (#4500) @kazuhitoyokoi
+ - Focus Quick Add dialog from context menu (#4516) @kazuhitoyokoi
+ - Fix subflow ports in Quick Add dialog (#4518) @kazuhitoyokoi
+ - Fix location of subflow ports in palette (#4502) @kazuhitoyokoi
+ - Client/Editor Events: fix off-in-on pattern emulating once (#4484) @gorenje
+ - Restore caching busting functionality without using explict version number (#4512) @knolleary
+ - Do not translate the list of available languages (#4531) @GogoVega
+ - Add French translation of v3.1.3 changes (#4477) @GogoVega
+ - i18n(es-ES) Spanish Spain translation (#4495) @joebordes
+ - Add missing validation messages (#4487) @GogoVega
+ - Add Japanese translations for v3.1.3 (#4498) @kazuhitoyokoi
+ - Replace `rename` by `edit` for the menu flow label (#4506) @GogoVega
+ - Update editor.json fix typo in German translation (#4552) @guidoffm

 Runtime

- - let settings.httpNodeAuth accept single middleware or array of middlewares (#4572) @kevinGodell
- - Upgrade to JSONata 2.x (#4590) @knolleary
- - Bump minimum version to node 18 (#4571) @knolleary
- - npm: Remove production flag on npm invocation (#4347) @ZJvandeWeg
- - Timer testing fix (#4367) @hlovdal
- - Bump to 4.0.0-dev (#4322) @knolleary
+ - Bump the github-actions group with 1 update (#4554) @app/dependabot
+ - Clone objects types when getting env values (#4519) @knolleary
+ - Ensure global-config credential env vars are merged on deploy (#4526) @knolleary

 Nodes

- - TCP node - when resetting, if no payload, stay disconnected @dceejay
- - HTML node: add option for collecting attributes and content (#4513) @gorenje
- - let split node specify property to split on, and join auto join correctly (#4386) @dceejay
- - Add RFC4180 compliant mode to CSV node (#4540) @Steve-Mcl
- - Fix change node to return boolean if asked (#4525) @dceejay
- - Let msg.reset reset Tcp request node connection when in stay connected mode (#4406) @dceejay
- - Let debug node status msg length be settable via settings (#4402) @dceejay
- - Feat: Add ability to set headers for WebSocket client (#4436) @marcus-j-davies
+ - 21-httprequest.js remove unused code, because of broken use of toLowercase (#4522) @gorenje
+
+#### 3.1.3: Maintenance Release
+
+Editor
+
+ - Add missing en-us messages (#4475) @knolleary
+
+#### 3.1.2: Maintenance Release
+
+Editor 
+
+ - Relax some node validators to allow undefined value (#4471) @knolleary
+ - Fix switch validation of typeof field (#4465) @knolleary
+ - Use move cursor when hovering on group border (#4467) @knolleary
+ - Added action list Chinese (Simplified and Traditional) translation + v3.1.1 changes (#4470) @wangyiyi2056
+ - Add French translation of `action-list` + v3.1.1 changes (#4466) @GogoVega
+ 
+ Runtime
+
+ - Ensure nested groups inside subflows have their g props remapped (#4472) @knolleary
+ 
+#### 3.1.1: Maintenance Release
+
+Editor
+
+ - Fix debug filter (#4461) @knolleary
+ - Fix various issues with debug pop-out window (#4459) @knolleary
+ - Ensure subflow instances keep track of their groups (#4457) @knolleary
+ - Fix `validateNodeProperty` without validator provided (#4455) @GogoVega
+ - Debounce node-removed notifications (#4453) @knolleary
+ - Don't try to load the parents of the first commit (#4448) @bonanitech
+ - Allow a theme to specifiy which theme mermaid should use (#4441) @knolleary
+ - Update browser title with flow name if set (#4427) @knolleary
+ - Ensure typeSearch handles undefined node definitions (#4423) @knolleary
+ - Ensure group w/h are imported if present (#4426) @knolleary
+ - Hide node status background when there is no status to show (#4425) @knolleary
+ - Add a close button to the restart-required notification (#4407) @knolleary
+ - Extend typedInput "num" type validity check to NaN, binary, octal & hex (#4371) @ralphwetzel
+ - Fix unintended new line in node name (#4399) @kazuhitoyokoi
+ - Ctrl-Enter does not close tray (Monaco) #4377 (#4382) @hazymat
+ - fix buffer viewer to handle 0b style binary (#4393) @dceejay
+ - Rework mermaid integration to support off-DOM rendering (#4364) @knolleary
+ - Add missing nls labels to context menu (#4365) @knolleary
+
+Runtime
+
+ - Bump the github-actions group with 2 updates (#4404) @app/dependabot
+ - Handle unknown node reference inside subflow module (#4460) @knolleary
+ - Add modules.install audit event when external module installed (#4452) @knolleary
+ - Allow import of modules with subpath in specifier (#4451) @knolleary
+ - Update node-red-admin version (#4438) @knolleary
+ - Handle false-like env vars properly (#4411) @knolleary
+ - Only save settings once during node load process (#4409) @knolleary
+ - Ensure global-config nodes lookup cred values properly (#4405) @knolleary
+ - Handle credential env var evaluation when no value set (#4362) @knolleary
+ - Don't commit package-lock.json (#4354) @bonanitech
+ - Fix env evaluation when one env references another in the same object (#4361) @knolleary
+ - Add dependabot for Github Actions (#4312) @Rotzbua
+ - Update outdated Github Actions (#4311) @Rotzbua
+ - github: Request `npm run test` in PR template (#4348) @ZJvandeWeg
+ - Add French translation of v3.1.0-beta.4 changes + slight improvements (#4329) @GogoVega
+ - Handle nodes with multiple input handlers properly (#4332) @knolleary
+ - Soften the language around unrequited PRs (#4351) @knolleary
+
+Nodes
+
+ - CSV: make CSV export way faster by not re-allocating and handling huge string (#4349) @Fadoli
+ - Delay: Fix regression in delay node to not pass on msg.reset (#4350) @dceejay
+ - Link Call: Handle undefined linkType value for existing link-call nodes (#4331) @knolleary
+ - MQTT: Guard against node.broker being undefined (#4454) @knolleary
+ - MQTT: check topic length > 0 before publish (#4416) @dceejay
+ - Switch/Change: Improve validation of switch/change node rules (#4368) @knolleary
+ - Template: Fix height of description editor in template node (#4346) @kazuhitoyokoi
+ - Various: Add validators to any fields using msg-typed Input (#4440) @knolleary
+
+#### 3.1.0: Milestone Release
+
+Editor
+
+ - Default filter to All Catalogues and show nodes for small lists (#4318) @knolleary
+ - Better distinguish between ctrl and meta keys on mac (#4310) @knolleary
+ - Ensure junction appears when filtering quick-add list (#4297) @knolleary
+ - Update message catalogs for JSONata Expression editor (#4287) @kazuhitoyokoi
+ - Add tooltip to relevance sort button in user settings UI (#4288) @kazuhitoyokoi
+ - Capture workspace dirty state when quick-adding junction (#4283) @knolleary
+ - Add docs for $clone function (#4284) @knolleary
+
+Runtime
+
+ - Dependency updates (#4317) @knolleary
+ - Ensure storage/util.writeFile handles concurrent write attempts (#4316) @knolleary
+ - Migrate http -> https for nodered.org (#4313) @Rotzbua
+ - Add Node 20 to GH Action test matrix (#4305) @Rotzbua
+ - Handle group-scoped nodes inside subflow (#4301) @knolleary
+ - Handle non-url-safe chars in context api (#4298) @knolleary
+ - Fix git pull operation in project feature (#4290) @kazuhitoyokoi
+ - Change linefeed codes in Korean message catalogs (#4286) @kazuhitoyokoi
+ - Fix file permissions of message catalogs (#4285) @kazuhitoyokoi
+ - Update tour (#4278) @knolleary
+ 
+Nodes
+
+ - File: Fix handling in file nodes when number is specified as file name (#4267) @kazuhitoyokoi
+ - Function: Adding function timeout to settings file (#4265) (#4309) @knolleary
+ - Function: Fix function setup tab layout (#4299) @knolleary
+ - HTTP Request: Handle 204 in httprequest JSON (#4262) @sammachin
+ - JSON: Fix test cases of JSON node (#4275) @kazuhitoyokoi
+ - MQTT: Remove unnecessary check for clientid if autoUnsub set (#4302) @knolleary
+
+##### 3.1.0-beta.4: Beta Release
+
+ Editor
+
+ - Add Japanese translation for 3.1.0 (#4252) @kazuhitoyokoi
+ - Improve Catalogue visibility (#4248) @Steve-Mcl
+ - Add support for wiring and moving junctions on touch device (#4244) @Steve-Mcl
+ - Show errors and statuses of config nodes in the sidebar when no catch node is available (#4231) @bvmensvoort
+ - Improve wiring for horizontally aligned nodes (#4232) @knolleary
+ - French translation of Welcome Tours (#4200) @GogoVega
+ - French translation of v3.1.0-beta.3 changes (#4199) @GogoVega
+ - add Japanese message for 3.1.0 beta 3 (#4209) @HiroyasuNishiyama
+ - Dont clone the group nodes `node` array when saving edits (#4208) @Steve-Mcl
+
+ Runtime
+
+ - Add NR_SUBFLOW_NAME/ID/PATH env vars (#4250) @knolleary
+ - Evaluate all env vars as part of async flow start (#4230) @knolleary
+ - Add support for httpStatic middleware (#4229) @knolleary
+
+ Nodes
+
+ - Fix JSONata in file nodes (#4246) @kazuhitoyokoi
+ - Fix timeout icon in function and link call nodes (#4253) @kazuhitoyokoi
+ - Fix connection keep-alive in http request node (#4228) @knolleary
+ - adding timeout attribute to function node (#4177) @k1ln
+ - Fix manual mode join when multiple sequences being handled (#4143) @BitCaesar
+ - Fix delay node flush issue (#4203) @dceejay
+ - Update status and catch node labels in group mode (#4207) @Steve-Mcl
+
+##### 3.1.0-beta.3: Beta Release
+
+Editor
+
+ - Select the item that is specified in a deep link URL (#4113) @Steve-Mcl
+ - Update to Monaco 0.38.0 (#4189) @Steve-Mcl
+ - Place subflow outputs/inputs relative to current view (#4183) @knolleary
+ - Enable RED.view.select to select group by id (#4184) @knolleary
+ - Combine existing env vars when merging groups (#4182) @knolleary
+ - Avoid creating empty global-config node if not needed (#4153) @knolleary
+ - Fix group selection when using lasso (#4108) @knolleary
+ - Use editor path in generating localStorage keys (#4151) @mw75
+ - Ensure no node credentials are included when exporting to clipboard (#4112) @knolleary
+ - Fix jsonata expression test ui (#4097) @knolleary
+ - Fix search button in palette popover (#4096) @knolleary
+
+Runtime
+
+ - Allow options object on each httpStatic configuration (#4109) @kevinGodell
+ - Ensure non-zero exit codes for errors (#4181) @knolleary
+ - Ensure external modules are installed synchronously (#4180) @knolleary
+ - Update dependecies include got (#4155) @knolleary
+ - Add Japanese translations for v3.1 beta.2 (#4158) @kazuhitoyokoi
+ - Ensure express server options are applied consistently (#4178) @knolleary
+ - Remove version info from theme endpoint (#4179) @knolleary
+ - Add Japanese translations for welcome tour of 3.1.0 beta.2 (#4145) @kazuhitoyokoi
+ - Added SHA-256 and SHA-512-256 digest authentication (#4100) @sroebert
+ - Add "timers" types to known types (#4103) @Steve-Mcl
+
+Nodes
+
+ - Allow Catch/Status nodes to be scoped to their group (#4185) @NetHans
+ - MQTT: Option to disable MQTT topic unsubscribe on disconnect (#4078) @flying7eleven
+
+
+##### 3.1.0-beta.2: Beta Release
+
+Editor
+
+ - NEW: Add change icon to tabs (#4068) @knolleary
+ - NEW: Complete overhaul of Group UX (#4079) @knolleary
+ - NEW: Add link to node help in node edit dialog footer (#4065) @knolleary
+ - NEW: Added editor feature for connecting multiple nodes to single node (#4051) @sonntam
+ - NEW: Increase workspace size to 8000x8000 (#4094) @knolleary
+ - Ensure node buttons are redrawn when flow lock state is changed (#4091) @knolleary
+ - Prevent loops being created with junction nodes (#4087) @knolleary
+ - Prevent opening locked node's edit dialog (#4069) @knolleary
+ - Reverse direction of tab scroll to expected direction (#4064) @knolleary
+ - Add cancel operation to editableList (#4077) @HiroyasuNishiyama
+ - Apply Mermaid diagram for project settings UI (#4054) @kazuhitoyokoi
+ - Add tooltip for show/hide button on info sidebar (#4050) @kazuhitoyokoi
+ - Fix align nodes on locked tab (#4072) @HiroyasuNishiyama
+ - Fix importing connected link nodes into a subflow (#4082) @knolleary
+ - Fix to add empty marker to empty group (#4060) @HiroyasuNishiyama
+ - Fix image URLs for v3.0 tour (#4053) @kazuhitoyokoi
+ - Show scrollbar in notification dialog only when needed (#4048) @kazuhitoyokoi
+ - Update-monaco-and-typings (#4089) @Steve-Mcl
+ - Update jquery UI (#4088) @knolleary
+ - Support i18n of lock/unlock buttons in flow property UI (#4049) @kazuhitoyokoi
+ - Translation kr (#3895) @hae-iotplatform
+ - Translation zhcn (！！请懂中文的帮忙review) (#3952) @cliyr
+ - Add French translation of nodes (#3964) @GogoVega
+ - Add French translation (#3962) @GogoVega
+ - Portuguese Brazilian (pt-BR) translation (#3804) @FabsMuller
+ 
+
+Runtime
+
+ - NEW: Generate stable ids for subflow instance internal nodes (#4093) @knolleary
+ - NEW: Change default file name to flows.json in project feature (#4073) @kazuhitoyokoi
+ - NEW: Deprecate synchronous access to jsonata (#4090) @knolleary
+ - Add Node 18 to test matrix (#4084) @knolleary
+ - Bump minimum nodejs version supported to match documented value (#4086) @knolleary
+ - Update monaco docs link in settings.js (#4075) @Steve-Mcl
+ - Remove duplicated messages in the message catalog (#4066) @kazuhitoyokoi
+ - Ensure errors in preDeliver callback are handled (#3911) @knolleary
+ - Fix "EADDRINUSE" error (#4046) @bggbr
+
+Nodes
+
+ - Link Call: Clear link-call timeouts when node is closed (#4085) @knolleary
+ - Join: ensure inflight status is cleared when in auto mode (#4083) @knolleary
+ - File Out: Fix extra newline append for multipart file write (#3915) @dceejay
+ - Add validators for complete and link call nodes (#4056) @kazuhitoyokoi
+
+##### 3.1.0-beta.1: Beta Release
+
+Editor
+
+ - NEW: Locking Flows (#3938) @knolleary
+ - NEW: Improve UX around hiding flows via context menu (#3930) @knolleary
+ - NEW: Add support for inline image in markdown editor by drag and drop of an image file (#4006) @HiroyasuNishiyama
+ - NEW: Add support for mermaid diagram to markdown editor (#4007) @HiroyasuNishiyama
+ - NEW: Support uri fragments for nodes and groups including edit support (#3870) @knolleary
+ - NEW: Add global environment variable feature (#3941) @HiroyasuNishiyama
+
+ - Remember compact/pretty flow export user choice (#3974) @Steve-Mcl
+ - fix .red-ui-notification class (#4035) @xiaobinqt
+ - Fix border radius on Modules list header (#4038) @bonanitech
+ - fix workspace reference error in case of empty tabs (#4029) @HiroyasuNishiyama
+ - Disable delete tab menu when single tab exists (#4030) @HiroyasuNishiyama
+ - Disable hide all menu if all tabs hidden (#4031) @HiroyasuNishiyama
+ - fix hide subflow tooltip (#4033) @HiroyasuNishiyama
+ - Fix disabled menu items in project feature (#4027) @kazuhitoyokoi
+ - Let themes change radialMenu text colors (#3995) @bonanitech
+ - Add Japanese translations for v3.0.3 (#4012) @kazuhitoyokoi
+ - Add Japanese translation for v3.1.0-beta.0 (#3997) @kazuhitoyokoi
+ - Add Japanese translation for v3.1.0-beta.0 (#3916) @kazuhitoyokoi
+ - Hide subflow category after deleting subflow (#3980) @kazuhitoyokoi
+ - Prevent dbl-click opening node edit dialog with text selected (#3970) @knolleary
+ - Handle replacing unknown node inside group or subflow (#3921) @knolleary
+ - Fix #3939, red border red-ui-typedInput-container (#3949) @Steveorevo
+ - i18n item URL copy notification & add Japanese message (#3946) @HiroyasuNishiyama
+ - add Japanese message for item url copy actions (#3947) @HiroyasuNishiyama
+ - Fix autocomplete entry for responseUrl (#3884) @knolleary
+ - Fix Japanese translation for JSONata editor (#3872) @HiroyasuNishiyama
+ - Fix search type with spaces (#3841) @Steve-Mcl
+ - Fix error hanndling of JSONata expression editor for extended functions (#3871) @HiroyasuNishiyama
+ - Add button type to the adding SSH key button (#3866) @kazuhitoyokoi
+ - Check radio button as default in project dialog (#3879) @kazuhitoyokoi
+ - Add $clone as supported function (#3874) @HiroyasuNishiyama
+ - Env var jsonata (#3807) @HiroyasuNishiyama
+ - Add Japanese translation for v3.0.2 (#3852) @kazuhitoyokoi
+
+Runtime
+
+ - Force IPv4 name resolution to have priority (#4019) @dceejay
+ - Fix async loading of modules containing both nodes and plugins (#3999) @knolleary
+ - Use main branch as default in project feature (#4036) @kazuhitoyokoi
+ - Rename package var to avoid strict mode error (#4020) @knolleary
+ - Fix typos in settings.js (#4013) @ypid
+ - Ensure credentials object is removed before returning node in getFlow request (#3971) @knolleary
+ - Ignore commit error in project feature (#3987) @kazuhitoyokoi
+ - Update dependencies (#3969) @knolleary
+ - Add check that node sends object rather than primitive type (#3909) @knolleary
+ - Ensure key_path is quoted in GIT_SSH_COMMAND in case of spaces in pathname (#3912) @knolleary
+ - Fix nodesDir scan when node package has js/html in sub dir to package.json (#3867) @Steve-Mcl
+ - Fix file permissions (#3917) @kazuhitoyokoi
+ - ci: add minimum GitHub token permissions for workflows (#3907) @boahc077
+
+Nodes
+
+ - Catch: fix typo in catch.html (#3965) @we11adam
+ - Change: Fix change node overwriting msg with itself (#3899) @dceejay
+ - Comment node: Clarify where the text will appear (#4004) @dirkjanfaber
+ - CSV: change replace to replaceAll (#3990) @dceejay
+ - CSV node: check header properties for ' and " (#3920) @dceejay
+ - CSV: Fix for CSV undefined property (#3906) @dceejay
+ - Delay: let delay node handle both flush then reset (#3898) @dceejay
+ - Function: Limit number of ports in function node (#3886) @kazuhitoyokoi
+ - Function: Remove dot from variable name for external module in function node (#3880) @kazuhitoyokoi
+ - Function: add function node monaco types util and promisify (#3868) @Steve-Mcl
+ - HTTP In: Ensure msg.req.headers is enumerable (#3908) @knolleary
+ - HTTP Request: Support form-data arrays (#3991) @hardillb
+ - HTTP Request: Fix httprequest tests to be more lenient on error message (#3922) @knolleary
+ - HTTP Request: Add missing property to node object HTTPRequest (#3842) @hardillb
+ - HTTP Request/Response: Support sortable list on property UI of http request and http response nodes (#3857) @kazuhitoyokoi
+ - HTTP Response: Ensure statusCode is a number (#3894) @hardillb
+ - Inject: Allow Inject node to work with async context stores (#4021) @knolleary
+ - Join/Batch: Add count to join and batch node labels (#4028) @dceejay
+ - MQTT: Fix birth topic handling in MQTT node (#3905) @Steve-Mcl
+ - MQTT: Fix pull-down menus of MQTT configuration node (#3890) @kazuhitoyokoi
+ - MQTT: Prevent invalid mqtt birth topic crashing node-red (#3869) @Steve-Mcl
+ - MQTT: ensure sessionExpiry(Interval) is applied (#3840) @Steve-Mcl
+ - MQTT: Fix mqtt nodes not reconnecting on modified-flows deploy (#3992) @knolleary
+ - MQTT: fix single subscription mqtt node status (#3966) @Steve-Mcl
+ - Range: Add drop mode to range node (#3935) @dceejay
+ - Remove done from describe (#3873) @HiroyasuNishiyama
+ - Split node: avoid duplicate done call for buffer split (#4000) @knolleary
+ - Status: Fix typo in 25-status.html (#3981) @kazuhitoyokoi
+ - TCP Node: ensure newline substitution applies to whole message (#4009) @dceejay
+ - Template: Add information about environment variable to template node (#3882) @kazuhitoyokoi
+ - Trigger: Hide trigger node repeat send option if sending nothing (#4023) @dceejay
+ - Watch: fix watch node test on MacOS/ARM (#3942) @HiroyasuNishiyama
+
+#### 3.0.2: Maintenance Release
+
+Editor
+
+ - Fix workspace chart bottom property (#3812) @bonanitech
+ - Update german translation (#3802) @Dennis14e
+ - Support color reset to the default in subflow and group (#3801) @kazuhitoyokoi
+ - Allow generateNodeNames to handle names containing regex control chars (#3817) @knolleary
+ - Hide scrollbars until they're needed (#3808) @bonanitech
+ - Include junctions/groups when exporting subflows plus related fixes (#3816) @knolleary
+ - remove console.log (#3820) @Steve-Mcl
+
+Runtime
+
+ - Register subflow module instance node with parent flow (#3818) @knolleary
+
+Nodes
+
+ - HTTP Request: Allow HTTP Headers not in spec (#3776) @hardillb
+
+#### 3.0.1: Maintenance Release
+
+Editor
+
+ - Allow codeEditor theme to be set even if `codeEditor` is not set in settings.js (#3794) @Steve-Mcl
+ - Sys info (diagnostics report) amendments (#3793) @Steve-Mcl
+ - Allow `mode` and `title` to be omitted in `options` argument for `createEditor` (#3791) @Steve-Mcl
+ - Fix focus issues (#3789) @Steve-Mcl
+ - Ensure all typedInput buttons have button type set (#3788) @knolleary
+ - Do not flag hasUsers=false nodes as unused in search (#3787) @knolleary
+ - Properly position quick-add dialog in all cases (#3786) @knolleary
+ - Ensure quick-add dialog does not obscure ghost node when shifted (#3785) @knolleary
+ - Remove use of Object.hasOwn (#3784) @knolleary
+
+#### 3.0.0: Milestone Release
+
+Editor
+
+ - Use theme page and header values if settings.js values are not present (#3767) @Steve-Mcl
+ - Focus editor for undo after some actions in menu (#3759) @kazuhitoyokoi
+ - Ensure node icon shade has properly rounded corners (#3763) @knolleary
+ - Fix storing subflow credential type when input has multiple types (#3762) @knolleary
+ - Ensure global-config and flow-config have info in the hierarchy popover (#3752) @Steve-Mcl
+ - Include dirty state in history event (#3748) @Steve-Mcl
+ - Fix display direction of context sub-menu (#3746) @knolleary
+ - Fix clear pinned paths of debug sidebar menu (#3745) @HiroyasuNishiyama
+ - prevent exception generating tooltip for deleted nodes (#3742) @Steve-Mcl
+ - Fix context menu issues ready for v3 beta.5 (#3741) @Steve-Mcl
+ - Do not generate new node-ids when pasting a cut flow (#3729) @knolleary
+ - Fix to prevent node from moving out of workspace (#3731) @HiroyasuNishiyama
+ - Don't let themes change disabled config node background color (#3736) @bonanitech
+ - Move colors left behind in #3692 to CSS variables (#3737) @bonanitech
+ - Fix handling of global debug message (#3733) @HiroyasuNishiyama
+ - Fix label overflow @ config-node palette (#3730) @ralphwetzel
+ - Fix defaulting to monaco if settings does not contain codeEditor (#3732) @knolleary
+ - Disable keyboard shortcut mapping when showing Edit[..]Dialog (#3700) @ralphwetzel
+ - Update add-junction menu to work in more cases (#3727) @knolleary
+ - Ensure importMap is not null when using import UI (#3723) @Steve-Mcl
+ - Add Japanese translations for v3.0-beta.4 (#3724) @kazuhitoyokoi
+ - Fix "split with" on virtual links (#3766) @Steve-Mcl
+
+Runtime
+
+ - Do not remove unknown credentials of Subflow Modules (#3728) @knolleary
+ - Add missing entries from beta.4 changelog (#3721) @knolleary
+
+Nodes
+
+ - Change: Fix change node, not handling from field properly when using context (#3754) @Fadoli
+ - Link Call: Fix linkcall registry bugs (#3751) @Steve-Mcl
+ - WebSocket: Fix close timeout of websocket node (#3734) @HiroyasuNishiyama
+
+#### 3.0.0-beta.4: Beta Release
+
+Editor
+
+ - Move all colours to CSS variables (#3692) @bonanitech
+ - Fix clicking on node in workspace to hide context menu (#3696) @knolleary
+ - Fix credential type input item of subflow template (#3703) @HiroyasuNishiyama
+ - Add option flag `reimport` to `importNodes` (#3718) @Steve-Mcl
+ - Update german translation (#3691) @Dennis14e
+ - List welcome tours in help sidebar (#3717) @knolleary
+ - Ensure 'hidden flow' count doesn't include subflows (#3715) @knolleary
+ - Fix Chinese translate (#3706) @hotlong
+ - Fix use default button for node icon (#3714) @kazuhitoyokoi
+ - Fix select boxes vertical alignment (#3698) @bonanitech
+ - Ensure workspace clean after undoing dropped node (#3708) @Steve-Mcl
+ - Use solid colour as config node icon background to hide text overflow (#3710) @Steve-Mcl
+ - Increase quick-add height to reveal 2 most recent entries (#3711) @Steve-Mcl
+ - Set default editor to monaco in absence of user preference (#3702) @knolleary
+ - Add Japanese translations for v3.0-beta.3 (#3688) @kazuhitoyokoi
+ - Fix handling of spacebar inside JSON visual editor (#3687) @knolleary
+ - Fix menu padding to handle both icons and submenus (#3686) @knolleary
+ - Include scroll offset when positioning quick-add dialog (#3685) @knolleary
+
+Runtime
+
+ - Allow flows to be stopped and started manually (#3719) @knolleary
+ - Import default export if node is a transpiled es module (#3669) @dschmidt
+ - Leave Monaco theme commented out by default (#3704) @bonanitech
+
+Nodes
+
+ - CSV: Fix CSV node to handle when outputting text fields (#3716) @dceejay
+ - Delay: Fix delay rate limit last timing when empty (#3709) @dceejay
+ - Link: Ensure link-call cache is updated when link-in is modified (#3695) @Steve-Mcl
+ - Join: Join node in reduce mode doesn't keep existing msg properties (#3670) @dceejay
+ - Template: Add support for evalulating {{env.<var>}} within a template node (#3690) @cow0w
+
+#### 3.0.0-beta.3: Beta Release
+
+Editor
+
+ - Add Right-Click content menu (#3678) @knolleary
+ - Fix disable junction (#3671) @HiroyasuNishiyama
+ - Add Japanese translations for v2.2.3 (#3672) @kazuhitoyokoi
+ - Reset mouse state when switching tabs (#3643) @knolleary
+ - Fix uncorrect fix of junction to subflow conversion (#3666) @HiroyasuNishiyama
+ - Fix undoing junction to subflow (#3653) @HiroyasuNishiyama
+ - Fix conversion of junction to subflow (#3652) @HiroyasuNishiyama
+ - Fix to include junction to exported nodes (#3650) @HiroyasuNishiyama
+ - Fix z-index value for shade to cover nodes in palette (#3649) @kazuhitoyokoi
+ - Fix to extend escaped subflow category characters (#3647) @HiroyasuNishiyama
+ - Fix to sanitize tab name (#3646) @HiroyasuNishiyama
+ - Fix selector placement (#3644) @bonanitech
+ - Add Japanese translations for v3.0-beta.2 (#3622) @kazuhitoyokoi
+ - Fix new folder menu of save to library dialog (#3633) @HiroyasuNishiyama
+ - Fix layer of palette node (#3638) @HiroyasuNishiyama
+ - Fix to place a node dragged from palette within the workspace (#3637) @HiroyasuNishiyama
+ - Fix typo in CSS (#3628) @bonanitech
+ - Use the correct variable for the gutter text color (#3615) @bonanitech
+
+
+Runtime
+
+ - Support loading node modules from `nodesdir` (#3676) @Steve-Mcl
+ - fix buffer parse error message of evaluateNodeProperty (#3624) @HiroyasuNishiyama
+
+Nodes
+
+ - File: Further simplify file node filename entry UX (v3) (#3677) @Steve-Mcl
+ - Function: Fix initial cursor position of init/finalize tab of function node (#3674) @HiroyasuNishiyama
+ - Function: Fix ESM module loading in Function node (#3645) @knolleary
+ - Inject: Fix JSONata evaluation of inject button (#3632) @HiroyasuNishiyama
+ - TCP: Dont delete TCP socket twice (#3630) @Steve-Mcl
+ - MQTT Node: define noproxy variable (#3626) @Steve-Mcl
+ - Debug: i18n debug sidebar node label (#3623) @HiroyasuNishiyama
+
+#### 3.0.0-beta.2: Beta Release
+
+**Migration from 2.x**
+
+ - The 'slice wires' action has changed from Ctrl-RightMouseButton to Alt-LeftMouseButton
+
+Editor
+
+ - Rework Junctions to be more node like in their event handling (#3607) @knolleary
+ - Change slicing / slice-junction operations over to mouse button 0 (Left Mouse Button) (#3609) @Steve-Mcl
+ - Do not slice-junction link node wires (#3608) @knolleary
+ - Handle many-to-one slicing of wires (#3604) @knolleary
+ - Ensure ACE worker options are set (#3611) @Steve-Mcl
+ - Remove duplicate history add of ungroup event (#3605) @knolleary
+ - use text width instead of number of characters for deciding select fi… (#3603) @HiroyasuNishiyama
+ - Update Japanese info of link call node reflecting update of English info (#3600) @HiroyasuNishiyama
+ - Fix typedInput label not visible on themes (#3580) @bonanitech
+ - Fix project switching when junctions are present (#3595) @Steve-Mcl
+ - Fix junction: when wiring from a regular nodes INPUT, backwards to a junction (#3591) @Steve-Mcl
+ - Fix error initialising flow tab editor (#3585) @Steve-Mcl
+ - Add Japanese translations for v3.0-beta.1 (#3576) @kazuhitoyokoi
+ - Fix image paths where `red/image/typedInput/XXXX.png` should be `red/image/typedInput/XXXX.svg` (#3592) @kazuhitoyokoi
+ - Fix browser console error Uncaught TypeError when searching certain terms (#3584) @Steve-Mcl
+
+Runtime
+
+ - fix error on system-info action (#3589) @HiroyasuNishiyama
+
+Nodes
+
+ - I18n switch rule selector (#3602) @HiroyasuNishiyama
+ - Handle removal of event handlers to allow mqtt client.end() to work (#3594) @PhilDay-CT
+ - update link-call node info according to current behavior (#3597) @HiroyasuNishiyama
+
+
+#### 3.0.0-beta.1: Beta Release
+
+**Migration from 2.x**
+
+ - Node-RED now requires Node.js 14.x or later.
+ - New installs of Node-RED will default to the monaco editor.
+
+
+Editor
+
+ - Add Junctions (#3462) @knolleary
+ - Allow node name to be auto-generated when added (#3478, #3538) @knolleary
+ - Set monaco as default code editor as of v3.x (#3543) @Steve-Mcl
+ - Update Monaco to V0.33.0 (#3522) @Steve-Mcl
+ - Auto-complete Improvements (#3521) @Steve-Mcl
+ - Add a tooltip to debug sidebar messages to reveal full path to node (#3503) @knolleary
+ - Fix down arrow triggering menu in search box (#3507) @Steve-Mcl
+ - Add Japanese translations for v3.0 (#3512) @kazuhitoyokoi
+ - Add feature: Continuous search tools (search previous, search next) (#3405) @Steve-Mcl
+ - Add feature: split-wire-to-links (#3399, #3476) @Steve-Mcl
+ - Add copy button to node properties tables (#3390) @knolleary
+ - Add info-tab search options dropdown to the regular search (#3395) @Steve-Mcl
+ - New Feature: Add ability to find modified nodes/flows. (#3392) @Steve-Mcl
+ - Code editor ux improvements around remembering state of each code editor in a flow (#3553) @Steve-Mcl
+ - Make it easier to apply themes on SVG icons (#3515) @bonanitech
+ - Add support of property validation message (#3438) @HiroyasuNishiyama
+ - Ensure node validation tooltip is closed when field becomes valid (#3570) @knolleary
+ - Add "search for" buttons to notifications (#3567) @Steve-Mcl
+ - Don't let themes change node config colors (#3564) @bonanitech
+ - Fix gap between typedInput containers borders (#3560) @bonanitech
+ - Fix recording removed links in edit history (#3547) @knolleary
+ - Remove unused SASS vars (#3536) @bonanitech
+ - Add custom style for jQuery widgets borders (#3537) @bonanitech
+ - fix out of scope reference of hasUnusedConfig variable (#3535) @HiroyasuNishiyama
+ - correct "non string" check parenthesis (#3524) @Steve-Mcl
+ - Ensure i18n of scoped package name (#3516) @Steve-Mcl
+ - Prevent shortcut deploy when deploy button shaded (#3517) @Steve-Mcl
+ - Fix: Sidebar "Configuration" filter button tooltip (#3500) @ralphwetzel
+ - Add the ability to customize diff colors even more (#3499) @bonanitech
+ - Do JSON comparison of old value/new value in editor (#3481) @Steve-Mcl
+ - Fix nodes losing their wires when in an iframe (#3484) @zettca
+ - Improve scroll into view (#3468) @Steve-Mcl
+ - Do not show 1st tab if hidden when loading (#3464) @Steve-Mcl
+
+Runtime
+
+ - Fix importing external module from node-red module (#3541) @knolleary
+ - Add support for multiple static paths with optional static root (#3542) @Steve-Mcl
+ - Store external token when authenticating if provided (#3460) @ArFe
+ - Support OAuth/OpenID logout (#3388) @mw75
+ - Allow adminAuth to auto-login users when using passport strategy (#3519) @knolleary
+ - Add runtime diagnostics admin endpoint (#3511) @Steve-Mcl
+ - Don't start if user has no home directory (#3540) @hardillb
+ - Error on invalid encrypted credentials (#3498) @sammachin
+
+Nodes
+
+ - Debug: Add message count option to Debug status (#3544 #3551) @rafaelmuynarsk @knolleary
+ - File: Change basic Filename field to a typedInput (#3533) @Steve-Mcl
+ - HTTP Request: Add UI for Http Request node headers (#3488) @Steve-Mcl
+ - Inject: let inject optionally fire at start in only at time mode. (#3385) @dceejay
+ - Link Call: Dynamic link call (#3463) @Steve-Mcl
+ - Link Call: Display link targets of nodes in a regular flow, for Link Call nodes inside a subflow (#3528) @Steve-Mcl
+ - MQTT: MQTT payload auto parsing improvements (#3530) @Steve-Mcl
+ - MQTT: Add client and Runtime MQTT topic validation (#3563) @Steve-Mcl [dev]
+ - MQTT: save and restore v5 config user props (#3562) @Steve-Mcl
+ - MQTT: Fix incorrect MQTT status (#3552) @Steve-Mcl
+ - MQTT: fix reference error of msg.status in debug node (#3526) @HiroyasuNishiyama
+ - MQTT: Add unit tests for MQTT nodes (#3497) @Steve-Mcl
+ - MQTT: fix typo of will properties (#3502) @Steve-Mcl
+ - MQTT: ensure mqtt v5 props can be set false (#3472) @Steve-Mcl
+ - Switch: add check for NaN in is of type number to be false (#3409) @dceejay
+ - TCP: TCP node better split (#3465) @dceejay
+ - Watch: Update Watch node to use node-watch module (#3559 #3569) @knolleary
+ - WebSocket: call done after ws disconnects (#3531) @Steve-Mcl

 #### Older Releases

--- a/CITATION.cff
+++ b/CITATION.cff
@ -1,7 +0,0 @@
-cff-version: 1.2.0
-message: "If you use this software, please cite it as below."
-title: "Node-RED"
-authors:
-  - family-names: "OpenJS Foundation"
-  - family-names: "Contributors"
-url: "https://nodered.org"
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -143,7 +143,6 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/user.js",
                    "packages/node_modules/@node-red/editor-client/src/js/comms.js",
                    "packages/node_modules/@node-red/editor-client/src/js/runtime.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/multiplayer.js",
                    "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
                    "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
@ -208,52 +207,38 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/tour/*.js"
                ],
-                nonull: true,
                dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
            },
            vendor: {
-                files: [
-                    {
-                        src: [
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                            "node_modules/marked/marked.min.js",
-                            "node_modules/dompurify/dist/purify.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
-                            "node_modules/i18next/i18next.min.js",
-                            "node_modules/i18next-http-backend/i18nextHttpBackend.min.js",
-                            "node_modules/jquery-i18next/jquery-i18next.min.js",
-                            "node_modules/jsonata/jsonata-es5.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js"
-                        ],
-                        nonull: true,
-                        dest: "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js"
-                    },
-                    // {
-                    //     src: [
-                    //         // TODO: resolve relative resource paths in
-                    //         //       bootstrap/FA/jquery
-                    //     ],
-                    //     dest: "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css"
-                    // },
-                    {
-                        src: [
-                            "node_modules/jsonata/jsonata-es5.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
-                        ],
-                        nonull: true,
-                        dest: "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js",
-                    },
-                    {
-                        src: "node_modules/mermaid/dist/mermaid.min.js",
-                        nonull: true,
-                        dest: "packages/node_modules/@node-red/editor-client/public/vendor/mermaid/mermaid.min.js",
-                    },
-                ]
+                files: {
+                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                        "node_modules/marked/marked.min.js",
+                        "node_modules/dompurify/dist/purify.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
+                        "node_modules/i18next/i18next.min.js",
+                        "node_modules/i18next-http-backend/i18nextHttpBackend.min.js",
+                        "node_modules/jquery-i18next/jquery-i18next.min.js",
+                        "node_modules/jsonata/jsonata-es5.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js"
+                    ],
+                    // "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
+                    //     // TODO: resolve relative resource paths in
+                    //     //       bootstrap/FA/jquery
+                    // ],
+                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
+                        "node_modules/jsonata/jsonata-es5.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
+                    ],
+                    "packages/node_modules/@node-red/editor-client/public/vendor/mermaid/mermaid.min.js": [
+                        "node_modules/mermaid/dist/mermaid.min.js"
+                    ]
+                }
            }
        },
        uglify: {
--- a/nodemon.json
+++ b/nodemon.json
@ -1,16 +0,0 @@
-{
-    "ignoreRoot": [
-        ".git",
-        ".nyc_output",
-        ".sass-cache",
-        "bower-components",
-        "coverage"
-    ],
-    "ignore": [
-        "/Gruntfile.js",
-        "/.git/*",
-        "*.backup",
-        "/public/*"
-    ]
-}
-
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "4.0.9",
+    "version": "3.1.11",
    "description": "Low-code programming for event-driven applications",
    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
@ -26,26 +26,26 @@
        }
    ],
    "dependencies": {
-        "acorn": "8.12.1",
-        "acorn-walk": "8.3.4",
-        "ajv": "8.17.1",
-        "async-mutex": "0.5.0",
+        "acorn": "8.8.2",
+        "acorn-walk": "8.2.0",
+        "ajv": "8.12.0",
+        "async-mutex": "0.4.0",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
        "cheerio": "1.0.0-rc.10",
        "clone": "2.1.2",
        "content-type": "1.0.5",
-        "cookie": "0.7.2",
-        "cookie-parser": "1.4.7",
+        "cookie": "0.5.0",
+        "cookie-parser": "1.4.6",
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
        "denque": "2.1.0",
-        "express": "4.21.2",
-        "express-session": "1.18.1",
+        "express": "4.19.2",
+        "express-session": "1.17.3",
        "form-data": "4.0.0",
-        "fs-extra": "11.2.0",
-        "got": "12.6.1",
+        "fs-extra": "11.1.1",
+        "got": "12.6.0",
        "hash-sum": "2.0.0",
        "hpagent": "1.2.0",
        "https-proxy-agent": "5.0.1",
@ -54,42 +54,41 @@
        "is-utf8": "0.2.1",
        "js-yaml": "4.1.0",
        "json-stringify-safe": "5.0.1",
-        "jsonata": "2.0.5",
+        "jsonata": "1.8.7",
        "lodash.clonedeep": "^4.5.0",
        "media-typer": "1.1.0",
        "memorystore": "1.6.7",
        "mime": "3.0.0",
-        "moment": "2.30.1",
-        "moment-timezone": "0.5.46",
-        "mqtt": "5.7.0",
+        "moment": "2.29.4",
+        "moment-timezone": "0.5.43",
+        "mqtt": "4.3.7",
        "multer": "1.4.5-lts.1",
        "mustache": "4.2.0",
-        "node-red-admin": "^4.0.1",
+        "node-red-admin": "^3.1.3",
        "node-watch": "0.7.4",
        "nopt": "5.0.0",
-        "oauth2orize": "1.12.0",
+        "oauth2orize": "1.11.1",
        "on-headers": "1.0.2",
-        "passport": "0.7.0",
+        "passport": "0.6.0",
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "3.0.0",
-        "rfdc": "^1.3.1",
-        "semver": "7.6.3",
-        "tar": "7.4.3",
-        "tough-cookie": "^5.0.0",
+        "raw-body": "2.5.2",
+        "semver": "7.5.4",
+        "tar": "6.2.1",
+        "tough-cookie": "4.1.3",
        "uglify-js": "3.17.4",
-        "uuid": "9.0.1",
+        "uuid": "9.0.0",
        "ws": "7.5.10",
        "xml2js": "0.6.2"
    },
    "optionalDependencies": {
-        "@node-rs/bcrypt": "1.10.4"
+        "bcrypt": "5.1.1"
    },
    "devDependencies": {
-        "dompurify": "2.5.7",
+        "dompurify": "2.4.1",
        "grunt": "1.6.1",
        "grunt-chmod": "~1.1.1",
-        "grunt-cli": "~1.5.0",
+        "grunt-cli": "~1.4.3",
        "grunt-concurrent": "3.0.0",
        "grunt-contrib-clean": "2.0.1",
        "grunt-contrib-compress": "2.0.0",
@ -100,7 +99,7 @@
        "grunt-contrib-watch": "1.1.0",
        "grunt-jsdoc": "2.4.1",
        "grunt-jsdoc-to-markdown": "6.0.0",
-        "grunt-jsonlint": "3.0.0",
+        "grunt-jsonlint": "2.1.3",
        "grunt-mkdir": "~1.1.0",
        "grunt-npm-command": "~0.1.2",
        "grunt-sass": "~3.1.0",
@ -110,11 +109,11 @@
        "jquery-i18next": "1.2.1",
        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
        "marked": "4.3.0",
-        "mermaid": "11.3.0",
+        "mermaid": "^10.4.0",
        "minami": "1.2.3",
        "mocha": "9.2.2",
        "node-red-node-test-helper": "^0.3.3",
-        "nodemon": "3.1.7",
+        "nodemon": "2.0.20",
        "proxy": "^1.0.2",
        "sass": "1.62.1",
        "should": "13.2.3",
@ -123,6 +122,6 @@
        "supertest": "6.3.3"
    },
    "engines": {
-        "node": ">=18.5"
+        "node": ">=14"
    }
 }
--- a/packages/node_modules/@node-red/editor-api/lib/admin/context.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/context.js
@ -33,9 +33,6 @@ module.exports = {
            store: req.query['store'],
            req: apiUtils.getRequestLogObject(req)
        }
-        if (req.query['keysOnly'] !== undefined) {
-            opts.keysOnly = true
-        }
        runtimeAPI.context.getValue(opts).then(function(result) {
            res.json(result);
        }).catch(function(err) {
--- a/packages/node_modules/@node-red/editor-api/lib/admin/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/index.js
@ -91,7 +91,6 @@ module.exports = {
        // Plugins
        adminApp.get("/plugins", needsPermission("plugins.read"), plugins.getAll, apiUtil.errorHandler);
        adminApp.get("/plugins/messages", needsPermission("plugins.read"), plugins.getCatalogs, apiUtil.errorHandler);
-        adminApp.get(/^\/plugins\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("plugins.read"),plugins.getConfig,apiUtil.errorHandler);

        adminApp.get("/diagnostics", needsPermission("diagnostics.read"), diagnostics.getReport, apiUtil.errorHandler);

--- a/packages/node_modules/@node-red/editor-api/lib/admin/plugins.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/plugins.js
@ -40,31 +40,5 @@ module.exports = {
            console.log(err.stack);
            apiUtils.rejectHandler(req,res,err);
        })
-    },
-    getConfig: function(req, res) {
-
-        let opts = {
-            user: req.user,
-            module: req.params[0],
-            req: apiUtils.getRequestLogObject(req)
-        }
-
-        if (req.get("accept") === "application/json") {
-            runtimeAPI.nodes.getNodeInfo(opts.module).then(function(result) {
-                res.send(result);
-            }).catch(function(err) {
-                apiUtils.rejectHandler(req,res,err);
-            })
-        } else {
-            opts.lang = apiUtils.determineLangFromHeaders(req.acceptsLanguages());
-            if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
-                opts.lang = "en-US";
-            }
-            runtimeAPI.plugins.getPluginConfig(opts).then(function(result) {
-                return res.send(result);
-            }).catch(function(err) {
-                apiUtils.rejectHandler(req,res,err);
-            })
-        }
    }
 };
--- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
@ -126,14 +126,6 @@ async function login(req,res) {
        if (themeContext.login && themeContext.login.image) {
            response.image = themeContext.login.image;
        }
-        if (themeContext.login?.message) {
-            response.loginMessage = themeContext.login?.message
-        }
-        if (themeContext.login?.button) {
-            response.prompts = [
-                { type: "button", ...themeContext.login.button }
-            ]
-        }
    }
    res.json(response);
 }
@ -168,34 +160,20 @@ function completeVerify(profile,done) {


 function genericStrategy(adminApp,strategy) {
-    const crypto = require("crypto")
-    const session = require('express-session')
-    const MemoryStore = require('memorystore')(session)
+    var crypto = require("crypto")
+    var session = require('express-session')
+    var MemoryStore = require('memorystore')(session)

-    const sessionOptions = {
-        // As the session is only used across the life-span of an auth
-        // hand-shake, we can use a instance specific random string
-        secret: crypto.randomBytes(20).toString('hex'),
-        resave: false,
-        saveUninitialized: false,
-        store: new MemoryStore({
-          checkPeriod: 86400000 // prune expired entries every 24h
-        })
-    }
-    if (settings.httpAdminCookieOptions) {
-        sessionOptions.cookie = {
-            path: '/',
-            httpOnly: true,
-            secure: false,
-            maxAge: null,
-            ...settings.httpAdminCookieOptions
-        }
-        if (sessionOptions.cookie.name){
-            sessionOptions.name = sessionOptions.cookie.name
-            delete sessionOptions.cookie.name
-        }
-    }
-    adminApp.use(session(sessionOptions));
+    adminApp.use(session({
+      // As the session is only used across the life-span of an auth
+      // hand-shake, we can use a instance specific random string
+      secret: crypto.randomBytes(20).toString('hex'),
+      resave: false,
+      saveUninitialized: false,
+      store: new MemoryStore({
+        checkPeriod: 86400000 // prune expired entries every 24h
+      })
+    }));
    //TODO: all passport references ought to be in ./auth
    adminApp.use(passport.initialize());
    adminApp.use(passport.session());
@ -229,10 +207,10 @@ function genericStrategy(adminApp,strategy) {
    adminApp.get('/auth/strategy',
        passport.authenticate(strategy.name, {
            session:false,
-            failWithError: true,
-            failureMessage: true
+            failureMessage: true,
+            failureRedirect: settings.httpAdminRoot + '?session_message=Login Failed'
        }),
-        completeGenericStrategyAuth,
+        completeGenerateStrategyAuth,
        handleStrategyError
    );

@ -244,14 +222,14 @@ function genericStrategy(adminApp,strategy) {
        passport.authenticate(strategy.name, {
            session:false,
            failureMessage: true,
-            failWithError: true
+            failureRedirect: settings.httpAdminRoot + '?session_message=Login Failed'
        }),
-        completeGenericStrategyAuth,
+        completeGenerateStrategyAuth,
        handleStrategyError
    );

 }
-function completeGenericStrategyAuth(req,res) {
+function completeGenerateStrategyAuth(req,res) {
    var tokens = req.user.tokens;
    delete req.user.tokens;
    // Successful authentication, redirect home.
@ -261,8 +239,6 @@ function handleStrategyError(err, req, res, next) {
    if (res.headersSent) {
        return next(err)
    }
-    // Remove the header that passport auto-adds as we don't need it
-    res.removeHeader('WWW-Authenticate')
    log.audit({event: "auth.login.fail.oauth",error:err.toString()});
    res.redirect(settings.httpAdminRoot + '?session_message='+err.toString());
 }
--- a/packages/node_modules/@node-red/editor-api/lib/auth/permissions.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/permissions.js
@ -25,7 +25,7 @@ function hasPermission(userScope,permission) {
    }
    var i;

-    if (Array.isArray(permission)) {
+    if (util.isArray(permission)) {
        // Multiple permissions requested - check each one
        for (i=0;i<permission.length;i++) {
            if (!hasPermission(userScope,permission[i])) {
@ -36,7 +36,7 @@ function hasPermission(userScope,permission) {
        return true;
    }

-    if (Array.isArray(userScope)) {
+    if (util.isArray(userScope)) {
        if (userScope.length === 0) {
            return false;
        }
--- a/packages/node_modules/@node-red/editor-api/lib/auth/users.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/users.js
@ -17,7 +17,7 @@
 var util = require("util");
 var clone = require("clone");
 var bcrypt;
-try { bcrypt = require('@node-rs/bcrypt'); }
+try { bcrypt = require('bcrypt'); }
 catch(e) { bcrypt = require('bcryptjs'); }
 var users = {};
 var defaultUser = null;
@ -33,11 +33,11 @@ function authenticate() {
            if (args.length === 2) {
                // Username/password authentication
                var password = args[1];
-                return bcrypt.compare(password, user.password).then(res => {
-                    return res ? cleanUser(user) : null
-                }).catch(err => {
-                    return null
-                })
+                return new Promise(function(resolve,reject) {
+                    bcrypt.compare(password, user.password, function(err, res) {
+                        resolve(res?cleanUser(user):null);
+                    });
+                });
            } else {
                // Try to extract common profile information
                if (args[0].hasOwnProperty('photos') && args[0].photos.length > 0) {
@ -74,7 +74,7 @@ function init(config) {
            } else {
                var us = config.users;
                /* istanbul ignore else */
-                if (!Array.isArray(us)) {
+                if (!util.isArray(us)) {
                    us = [us];
                }
                for (var i=0;i<us.length;i++) {
--- a/packages/node_modules/@node-red/editor-api/lib/editor/comms.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/comms.js
@ -77,53 +77,6 @@ function CommsConnection(ws, user) {
        log.trace("comms.close "+self.session);
        removeActiveConnection(self);
    });
-
-    const handleAuthPacket = function(msg) {
-        Tokens.get(msg.auth).then(function(client) {
-            if (client) {
-                Users.get(client.user).then(function(user) {
-                    if (user) {
-                        self.user = user;
-                        log.audit({event: "comms.auth",user:self.user});
-                        completeConnection(msg, client.scope,msg.auth,true);
-                    } else {
-                        log.audit({event: "comms.auth.fail"});
-                        completeConnection(msg, null,null,false);
-                    }
-                });
-            } else {
-                Users.tokens(msg.auth).then(function(user) {
-                    if (user) {
-                        self.user = user;
-                        log.audit({event: "comms.auth",user:self.user});
-                        completeConnection(msg, user.permissions,msg.auth,true);
-                    } else {
-                        log.audit({event: "comms.auth.fail"});
-                        completeConnection(msg, null,null,false);
-                    }
-                });
-            }
-        });
-    }
-    const completeConnection = function(msg, userScope, session, sendAck) {
-        try {
-            if (!userScope || !Permissions.hasPermission(userScope,"status.read")) {
-                ws.send(JSON.stringify({auth:"fail"}));
-                ws.close();
-            } else {
-                pendingAuth = false;
-                addActiveConnection(self);
-                self.token = msg.auth;
-                if (sendAck) {
-                    ws.send(JSON.stringify({auth:"ok"}));
-                }
-            }
-        } catch(err) {
-            console.log(err.stack);
-            // Just in case the socket closes before we attempt
-            // to send anything.
-        }
-    }
    ws.on('message', function(data,flags) {
        var msg = null;
        try {
@ -133,34 +86,68 @@ function CommsConnection(ws, user) {
            return;
        }
        if (!pendingAuth) {
-            if (msg.auth) {
-                handleAuthPacket(msg)
-            } else if (msg.subscribe) {
+            if (msg.subscribe) {
                self.subscribe(msg.subscribe);
                // handleRemoteSubscription(ws,msg.subscribe);
-            } else if (msg.topic) {
-                runtimeAPI.comms.receive({
-                    user: self.user,
-                    client: self,
-                    topic: msg.topic,
-                    data: msg.data
-                })
            }
        } else {
+            var completeConnection = function(userScope,session,sendAck) {
+                try {
+                    if (!userScope || !Permissions.hasPermission(userScope,"status.read")) {
+                        ws.send(JSON.stringify({auth:"fail"}));
+                        ws.close();
+                    } else {
+                        pendingAuth = false;
+                        addActiveConnection(self);
+                        self.token = msg.auth;
+                        if (sendAck) {
+                            ws.send(JSON.stringify({auth:"ok"}));
+                        }
+                    }
+                } catch(err) {
+                    console.log(err.stack);
+                    // Just in case the socket closes before we attempt
+                    // to send anything.
+                }
+            }
            if (msg.auth) {
-                handleAuthPacket(msg)
+                Tokens.get(msg.auth).then(function(client) {
+                    if (client) {
+                        Users.get(client.user).then(function(user) {
+                            if (user) {
+                                self.user = user;
+                                log.audit({event: "comms.auth",user:self.user});
+                                completeConnection(client.scope,msg.auth,true);
+                            } else {
+                                log.audit({event: "comms.auth.fail"});
+                                completeConnection(null,null,false);
+                            }
+                        });
+                    } else {
+                        Users.tokens(msg.auth).then(function(user) {
+                            if (user) {
+                                self.user = user;
+                                log.audit({event: "comms.auth",user:self.user});
+                                completeConnection(user.permissions,msg.auth,true);
+                            } else {
+                                log.audit({event: "comms.auth.fail"});
+                                completeConnection(null,null,false);
+                            }
+                        });
+                    }
+                });
            } else {
                if (anonymousUser) {
                    log.audit({event: "comms.auth",user:anonymousUser});
                    self.user = anonymousUser;
-                    completeConnection(msg, anonymousUser.permissions, null, false);
+                    completeConnection(anonymousUser.permissions,null,false);
                    //TODO: duplicated code - pull non-auth message handling out
                    if (msg.subscribe) {
                        self.subscribe(msg.subscribe);
                    }
                } else {
                    log.audit({event: "comms.auth.fail"});
-                    completeConnection(msg, null,null,false);
+                    completeConnection(null,null,false);
                }
            }
        }
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@ -70,7 +70,7 @@ function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
    var result = [];
    if (themeValue) {
        var array = themeValue;
-        if (!Array.isArray(array)) {
+        if (!util.isArray(array)) {
            array = [array];
        }

@ -185,12 +185,13 @@ module.exports = {
        }

        if (theme.deployButton) {
-            themeSettings.deployButton = {};
-            if (theme.deployButton.label) {
-                themeSettings.deployButton.label = theme.deployButton.label;
-            }
            if (theme.deployButton.type == "simple") {
-                themeSettings.deployButton.type = theme.deployButton.type;
+                themeSettings.deployButton = {
+                    type: "simple"
+                }
+                if (theme.deployButton.label) {
+                    themeSettings.deployButton.label = theme.deployButton.label;
+                }
                if (theme.deployButton.icon) {
                    url = serveFile(themeApp,"/deploy/",theme.deployButton.icon);
                    if (url) {
@ -205,26 +206,14 @@ module.exports = {
        }

        if (theme.login) {
-            let themeContextLogin = {}
-            let hasLoginTheme = false
            if (theme.login.image) {
                url = serveFile(themeApp,"/login/",theme.login.image);
                if (url) {
-                    themeContextLogin.image = url
-                    hasLoginTheme = true
+                    themeContext.login = {
+                        image: url
+                    }
                }
            }
-            if (theme.login.message) {
-                themeContextLogin.message = theme.login.message
-                hasLoginTheme = true
-            }
-            if (theme.login.button) {
-                themeContextLogin.button = theme.login.button
-                hasLoginTheme = true
-            }
-            if (hasLoginTheme) {
-                themeContext.login = themeContextLogin
-            }
        }
        themeApp.get("/", async function(req,res) {
            const themePluginList = await runtimeAPI.plugins.getPluginsByType({type:"node-red-theme"});
@ -244,10 +233,6 @@ module.exports = {
            themeSettings.projects = theme.projects;
        }

-        if (theme.hasOwnProperty("multiplayer")) {
-            themeSettings.multiplayer = theme.multiplayer;
-        }
-
        if (theme.hasOwnProperty("keymap")) {
            themeSettings.keymap = theme.keymap;
        }
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-api",
-    "version": "4.0.9",
+    "version": "3.1.11",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@ -16,25 +16,25 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "4.0.9",
-        "@node-red/editor-client": "4.0.9",
+        "@node-red/util": "3.1.11",
+        "@node-red/editor-client": "3.1.11",
        "bcryptjs": "2.4.3",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
        "clone": "2.1.2",
        "cors": "2.8.5",
-        "express-session": "1.18.1",
-        "express": "4.21.2",
+        "express-session": "1.17.3",
+        "express": "4.19.2",
        "memorystore": "1.6.7",
        "mime": "3.0.0",
        "multer": "1.4.5-lts.1",
        "mustache": "4.2.0",
-        "oauth2orize": "1.12.0",
+        "oauth2orize": "1.11.1",
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.7.0",
+        "passport": "0.6.0",
        "ws": "7.5.10"
    },
    "optionalDependencies": {
-        "@node-rs/bcrypt": "1.10.4"
+        "bcrypt": "5.1.0"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@ -590,8 +590,6 @@
            },
            "nodeCount": "__label__ Node",
            "nodeCount_plural": "__label__ Nodes",
-            "pluginCount": "__count__ Plugin",
-            "pluginCount_plural": "__count__ Plugins",    
            "moduleCount": "__count__ Modul verfügbar",
            "moduleCount_plural": "__count__ Module verfügbar",
            "inuse": "In Gebrauch",
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@ -27,8 +27,7 @@
            "lock": "Lock",
            "unlock": "Unlock",
            "locked": "Locked",
-            "unlocked": "Unlocked",
-            "format": "Format"
+            "unlocked": "Unlocked"
        },
        "type": {
            "string": "string",
@ -373,12 +372,8 @@
            "deleted": "deleted",
            "flowDeleted": "flow deleted",
            "flowAdded": "flow added",
-            "moved": "moved",
            "movedTo": "moved to __id__",
-            "movedFrom": "moved from __id__",
-            "none": "none",
-            "position": "position",
-            "wires": "wires"
+            "movedFrom": "moved from __id__"
        },
        "nodeCount": "__count__ node",
        "nodeCount_plural": "__count__ nodes",
@ -387,14 +382,9 @@
        "reviewChanges": "Review Changes",
        "noBinaryFileShowed": "Cannot show binary file contents",
        "viewCommitDiff": "View Commit Changes",
-        "commit": "Commit",
        "compareChanges": "Compare Changes",
        "saveConflict": "Save conflict resolution",
        "conflictHeader": "<span>__resolved__</span> of <span>__unresolved__</span> conflicts resolved",
-        "localChanges": "Local Changes",
-        "remoteChanges": "Remote Changes",
-        "useLocalChanges": "use local changes",
-        "useRemoteChanges": "use remote changes",
        "commonVersionError": "Common Version doesn't contain valid JSON:",
        "oldVersionError": "Old Version doesn't contain valid JSON:",
        "newVersionError": "New Version doesn't contain valid JSON:"
@ -562,9 +552,7 @@
        "types": {
            "local": "Local",
            "examples": "Examples"
-        },
-        "type": "Type",
-        "name": "Name"
+        }
    },
    "palette": {
        "noInfo": "no information available",
@ -626,8 +614,6 @@
            },
            "nodeCount": "__label__ node",
            "nodeCount_plural": "__label__ nodes",
-            "pluginCount": "__count__ plugin",
-            "pluginCount_plural": "__count__ plugins",
            "moduleCount": "__count__ module available",
            "moduleCount_plural": "__count__ modules available",
            "inuse": "in use",
@ -655,7 +641,6 @@
            "errors": {
                "catalogLoadFailed": "<p>Failed to load node catalogue.</p><p>Check the browser console for more information</p>",
                "installFailed": "<p>Failed to install: __module__</p><p>__message__</p><p>Check the log for more information</p>",
-                "installTimeout": "<p>Install continuing the background.</p><p>Nodes will appear in palette when complete. Check the log for more information.</p>",
                "removeFailed": "<p>Failed to remove: __module__</p><p>__message__</p><p>Check the log for more information</p>",
                "updateFailed": "<p>Failed to update: __module__</p><p>__message__</p><p>Check the log for more information</p>",
                "enableFailed": "<p>Failed to enable: __module__</p><p>__message__</p><p>Check the log for more information</p>",
@ -670,9 +655,6 @@
                    "body": "<p>Removing '__module__'</p><p>Removing the node will uninstall it from Node-RED. The node may continue to use resources until Node-RED is restarted.</p>",
                    "title": "Remove nodes"
                },
-                "removePlugin": {
-                    "body": "<p>Removed plugin __module__. Please reload the editor to clear left-overs.</p>"
-                },
                "update": {
                    "body": "<p>Updating '__module__'</p><p>Updating the node will require a restart of Node-RED to complete the update. This must be done manually.</p>",
                    "title": "Update nodes"
@ -684,8 +666,7 @@
                    "review": "Open node information",
                    "install": "Install",
                    "remove": "Remove",
-                    "update": "Update",
-                    "understood": "Understood"
+                    "update": "Update"
                }
            }
        }
@ -813,7 +794,6 @@
                "branches": "Branches",
                "noBranches": "No branches",
                "deleteConfirm": "Are you sure you want to delete the local branch '__name__'? This cannot be undone.",
-                "deleteBranch": "Delete branch",
                "unmergedConfirm": "The local branch '__name__' has unmerged changes that will be lost. Are you sure you want to delete it?",
                "deleteUnmergedBranch": "Delete unmerged branch",
                "gitRemotes": "Git remotes",
@ -947,14 +927,7 @@
            "date": "timestamp",
            "jsonata": "expression",
            "env": "env variable",
-            "cred": "credential",
-            "conf-types": "config node"
-        },
-        "date": {
-            "format": {
-                "timestamp": "milliseconds since epoch",
-                "object": "JavaScript Date Object"
-            }
+            "cred": "credential"
        }
    },
    "editableList": {
--- a/packages/node_modules/@node-red/editor-client/locales/es-ES/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/es-ES/editor.json
@ -27,8 +27,7 @@
            "lock": "Bloquear",
            "unlock": "Desbloquear",
            "locked": "Bloqueado",
-            "unlocked": "Desbloqueado",
-            "format": "Formato"
+            "unlocked": "Desbloqueado"
        },
        "type": {
            "string": "texto",
@ -304,8 +303,7 @@
                "missingType": "La entrada no es un flujo válido - elemento __index__ falta la propiedad 'type'"
            },
            "conflictNotification1": "Algunos de los nodos que estás importando ya existen en tu espacio de trabajo.",
-            "conflictNotification2": "Selecciona qué nodos importar y si reemplazar los nodos existentes o importar una copia de los mismos.",
-            "alreadyExists": "Este nodo ya existe"
+            "conflictNotification2": "Selecciona qué nodos importar y si reemplazar los nodos existentes o importar una copia de los mismos."
        },
        "copyMessagePath": "Ruta copiada",
        "copyMessageValue": "Valor copiado",
@ -373,12 +371,8 @@
            "deleted": "eliminado",
            "flowDeleted": "flujo eliminado",
            "flowAdded": "flujo añadido",
-            "moved": "movido",
            "movedTo": "movido a __id__",
-            "movedFrom": "movido desde __id__",
-            "none": "ninguno",
-            "position": "posición",
-            "wires": "conectores"
+            "movedFrom": "movido desde __id__"
        },
        "nodeCount": "__count__ nodo",
        "nodeCount_plural": "__count__ nodos",
@ -387,14 +381,9 @@
        "reviewChanges": "Revisar Cambios",
        "noBinaryFileShowed": "No se puede mostrar el contenido del archivo binario",
        "viewCommitDiff": "Ver cambios de commit",
-        "commit": "Commit",
        "compareChanges": "Comparar Cambios",
        "saveConflict": "Guardar resolución de conflictos",
        "conflictHeader": "<span>__resolved__</span> de <span>__unresolved__</span> conflictos resueltos",
-        "localChanges": "Cambios Locales",
-        "remoteChanges": "Cambios Remotos",
-        "useLocalChanges": "utilizar cambios locales",
-        "useRemoteChanges": "utilizar cambios remotos",
        "commonVersionError": "La versión común no contiene JSON válido:",
        "oldVersionError": "La versión anterior no contiene JSON válido:",
        "newVersionError": "La versión nueva no contiene JSON válido:"
@ -562,9 +551,7 @@
        "types": {
            "local": "Local",
            "examples": "Ejemplos"
-        },
-        "type": "Tipo",
-        "name": "Nombre"
+        }
    },
    "palette": {
        "noInfo": "no hay información disponible",
@ -626,8 +613,6 @@
            },
            "nodeCount": "__label__ nodo",
            "nodeCount_plural": "__label__ nodos",
-            "pluginCount": "__count__ extensión",
-            "pluginCount_plural": "__count__ extensiones",
            "moduleCount": "__count__ módulo disponible",
            "moduleCount_plural": "__count__ módulos disponibles",
            "inuse": "en uso",
@ -655,7 +640,6 @@
            "errors": {
                "catalogLoadFailed": "<p>La carga del catálogo de nodos ha fallado</p><p>Revise la consola del navegador para mas información</p>",
                "installFailed": "<p>Fallo al instalar: __module__</p><p>__message__</p><p>Revise el log para mas información</p>",
-                "installTimeout": "<p>La instalación continúa en segundo plano.</p><p>Los nodos aparecerán en la paleta cuando finalice. Consulta el registro para obtener más información.</p>",
                "removeFailed": "<p>Fallo al eliminar: __module__</p><p>__message__</p><p>Revise el log para mas información</p>",
                "updateFailed": "<p>Fallo al actualizar: __module__</p><p>__message__</p><p>Revise el log para mas información</p>",
                "enableFailed": "<p>Fallo al activar: __module__</p><p>__message__</p><p>Revise el log para mas información</p>",
@ -670,9 +654,6 @@
                    "body":"<p>Eliminando '__module__'</p><p>La eliminación del nodo lo desinstalará de Node-RED. Es posible que el nodo siga utilizando recursos hasta que Node-RED sea reiniciado.</p>",
                    "title": "Eliminar nodos"
                },
-                "removePlugin": {
-                    "body": "<p>Extensión __module__ eliminada. Vuelve a cargar el editor para borrar los elementos sobrantes.</p>"
-                },
                "update": {
                    "body":"<p>Actualizando '__module__'</p><p>La actualización del nodo requerirá un reinicio manual de Node-RED para completarse. Debe ser reiniciado manualmente.</p>",
                    "title": "Actualizar nodos"
@ -684,8 +665,7 @@
                    "review": "Abrir información del nodo",
                    "install": "Instalar",
                    "remove": "Eliminar",
-                    "update": "Actualizar",
-                    "understood": "Entendido"
+                    "update": "Actualizar"
                }
            }
        }
@ -738,7 +718,6 @@
            "nodeHelp": "Ayuda de nodo",
            "showHelp": "Mostrar ayuda",
            "showInOutline": "Mostrar en controno",
-            "hideTopics": "Esconder temas",
            "showTopics": "Mostrar temas",
            "noHelp": "No hay ningun tema de ayuda seleccionado",
            "changeLog": "Registro de Cambios"
@ -813,7 +792,6 @@
                "branches": "Ramas",
                "noBranches": "Sin ramas",
                "deleteConfirm": "¿Estás seguro de que quieres eliminar la rama local '__name__'? Esta acción no puede deshacerse.",
-                "deleteBranch": "Eliminar rama",
                "unmergedConfirm": "La rama local '__name__' tiene cambios no fusionados que se perderán. ¿Estás seguro de que quieres eliminarla?",
                "deleteUnmergedBranch": "Eliminar rama no fusionada",
                "gitRemotes": "Git remotes",
@ -935,8 +913,6 @@
        }
    },
    "typedInput": {
-        "selected": "__count__ seleccionado",
-        "selected_plural": "__count__ seleccionados",
        "type": {
            "str": "texto",
            "num": "número",
@ -947,14 +923,7 @@
            "date": "marca tiempo",
            "jsonata": "expresión",
            "env": "variable de entorno",
-            "cred": "credencial",
-            "conf-types": "nodo configuración"
-        },
-        "date": {
-            "format": {
-                "timestamp": "milisegundos desde epoch",
-                "object": "Objeto de fecha de JavaScript"
-            }
+            "cred": "credencial"
        }
    },
    "editableList": {
@ -1236,18 +1205,6 @@
    "diagnostics": {
        "title": "Información Sistema"
    },
-    "languages": {
-        "de": "Deutsch",
-        "en-US": "English",
-        "es-ES": "Español (España)",
-        "fr": "Français",
-        "ja": "日本語",
-        "ko": "Korean",
-        "pt-BR": "Português (Brasil)",
-        "ru": "Русский",
-        "zh-CN": "简体中文",
-        "zh-TW": "繁體中文"
-    },
    "validator": {
        "errors": {
            "invalid-json": "Datos JSON inválidos: __error__",
--- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
@ -27,8 +27,7 @@
      "lock": "Verrouiller",
      "unlock": "Déverrouiller",
      "locked": "Verrouillé",
-      "unlocked": "Déverrouillé",
-      "format": "Format"
+      "unlocked": "Déverrouillé"
    },
    "type": {
      "string": "chaîne de caractères",
@ -55,10 +54,10 @@
  "workspace": {
    "defaultName": "Flux __number__",
    "editFlow": "Modifier le flux : __name__",
-    "confirmDelete": "Confirmer la suppression",
-    "delete": "Êtes-vous sûr de vouloir supprimer '__label__' ?",
-    "dropFlowHere": "Lâchez le flux ici",
-    "dropImageHere": "Lâchez l'image ici",
+    "confirmDelete": "Confirmation de la suppression",
+    "delete": "Etes-vous sûr de vouloir supprimer '__label__'?",
+    "dropFlowHere": "Déposer le flux ici",
+    "dropImageHere": "Déposer l'image ici",
    "addFlow": "Ajouter un flux",
    "addFlowToRight": "Ajouter un flux à droite",
    "closeFlow": "Fermer le flux",
@ -75,7 +74,7 @@
    "enabled": "Activé",
    "disabled": "Désactivé",
    "info": "Description",
-    "selectNodes": "Cliquer pour sélectionner",
+    "selectNodes": "Cliquer sur les noeuds pour sélectionner",
    "enableFlow": "Activer le flux",
    "disableFlow": "Désactiver le flux",
    "lockFlow": "Verrouiller le flux",
@ -99,7 +98,7 @@
        "rtl": "De droite à gauche",
        "auto": "Contextuel",
        "language": "Langue",
-        "browserDefault": "Par défaut du Navigateur"
+        "browserDefault": "Navigateur par défaut"
      },
      "sidebar": {
        "show": "Afficher la barre latérale"
@ -135,7 +134,7 @@
      "disableSelectedNodes": "Désactiver les noeuds sélectionnés",
      "showSelectedNodeLabels": "Afficher les étiquettes des noeuds sélectionnés",
      "hideSelectedNodeLabels": "Masquer les étiquettes des noeuds sélectionnés",
-      "showWelcomeTours": "Afficher les visites guidées des nouvelles versions",
+      "showWelcomeTours": "Afficher les visites guidées pour les nouvelles versions",
      "help": "Site web de Node-RED",
      "projects": "Projets",
      "projects-new": "Nouveau projet",
@ -144,7 +143,7 @@
      "showNodeLabelDefault": "Afficher l'étiquette des noeuds nouvellement ajoutés",
      "codeEditor": "Éditeur de code",
      "groups": "Groupes",
-      "groupSelection": "Grouper la sélection",
+      "groupSelection": "Grouper cette sélection",
      "ungroupSelection": "Dégrouper la sélection",
      "groupMergeSelection": "Fusionner la sélection",
      "groupRemoveSelection": "Supprimer du groupe",
@ -156,7 +155,7 @@
      "alignMiddle": "Aligner au milieu",
      "alignBottom": "Aligner en bas",
      "distributeHorizontally": "Répartir horizontalement",
-      "distributeVertically": "Répartir verticalement",
+      "distributeVertically": "Distribuer verticalement",
      "moveToBack": "Déplacer vers l'arrière",
      "moveToFront": "Déplacer vers l'avant",
      "moveBackwards": "Reculer",
@ -164,21 +163,21 @@
    }
  },
  "actions": {
-    "toggle-navigator": "Basculer l'affichage du navigateur",
-    "zoom-out": "Réduire",
-    "zoom-reset": "Réinitialiser",
+    "toggle-navigator": "Basculer de navigateur",
+    "zoom-out": "Dézoomer",
+    "zoom-reset": "Réinitialiser le zoom",
    "zoom-in": "Agrandir",
    "search-flows": "Rechercher le flux",
    "search-prev": "Précédent",
    "search-next": "Suivant",
-    "search-counter": "\"__term__\" __result__ sur __count__"
+    "search-counter": "\"__term__\" __result__ de __count__"
  },
  "user": {
    "loggedInAs": "Connecté en tant que __name__",
    "username": "Nom d'utilisateur",
    "password": "Mot de passe",
-    "login": "Se connecter",
-    "loginFailed": "Échec de connexion",
+    "login": "Connexion",
+    "loginFailed": "Échec de la connexion",
    "notAuthorized": "Pas autorisé",
    "errors": {
      "settings": "Vous devez être connecté pour accéder aux paramètres",
@ -194,16 +193,16 @@
    "warning": "<strong>Attention</strong> : __message__",
    "warnings": {
      "undeployedChanges": "Le noeud a des modifications non déployées",
-      "nodeActionDisabled": "Les actions du noeud sont désactivées",
-      "nodeActionDisabledSubflow": "Les actions de noeud sont désactivées à l'intérieur du sous-flux",
+      "nodeActionDisabled": "Actions de noeud désactivées",
+      "nodeActionDisabledSubflow": "Actions de noeud désactivées dans le sous-flux",
      "missing-types": "<p>Flux arrêtés en raison de types de noeuds manquants.</p>",
      "missing-modules": "<p>Flux arrêtés en raison de modules manquants.</p>",
-      "safe-mode": "<p>Flux arrêtés en mode sans échec.</p><p>Vous pouvez modifier vos flux et déployer ensuite les changements afin de démarrer vos flux.</p>",
+      "safe-mode": "<p>Flux arrêtés en mode sans échec.</p><p>Vous pouvez modifier vos flux et déployer les changements pour redémarrer.</p>",
      "restartRequired": "Node-RED doit être redémarré pour mettre à jour les modules",
-      "credentials_load_failed": "<p>Les flux se sont arrêtés car les informations d'identification n'ont pas pu être déchiffrées.</p><p>Le fichier d'informations d'identification du flux est chiffré mais la clé de chiffrement du projet est manquante ou invalide.</p>",
-      "credentials_load_failed_reset": "<p>Les informations d'identification n'ont pas pu être déchiffrées</p><p>Le fichier d'informations d'identification du flux est chiffré mais la clé de chiffrement du projet est manquante ou invalide.</p><p>Le fichier d'informations d'identification du flux sera réinitialisé lors du prochain déploiement. Toutes les informations d'identification des flux existants seront perdues.</p>",
+      "credentials_load_failed": "<p>Les flux se sont arrêtés car les informations d'identification n'ont pas pu être déchiffrées.</p><p>Le fichier d'informations d'identification du flux est chiffré, mais la clé de chiffrement du projet est manquante ou invalide.</p>",
+      "credentials_load_failed_reset": "<p>Les informations d'identification n'ont pas pu être déchiffrées</p><p>Le fichier d'informations d'identification du flux est chiffré, mais la clé de chiffrement du projet est manquante ou invalide.</p><p>Le fichier d'informations d'identification du flux sera réinitialisé lors du prochain déploiement. Toutes les informations d'identification de flux existantes seront perdues.</p>",
      "missing_flow_file": "<p>Fichier contenant les flux introuvable.</p><p>Le projet n'est pas configuré avec un fichier de flux.</p>",
-      "missing_package_file": "<p>Fichier de paquetage du projet introuvable.</p><p>Il manque au projet le fichier <code>package.json</code>.</p>",
+      "missing_package_file": "<p>Fichier de paquetage du projet introuvable.</p><p>Il manque au projet un fichier package.json.</p>",
      "project_empty": "<p>Le projet est vide.</p><p>Voulez-vous créer un ensemble de fichiers de projet par défaut ?<br/>Sinon, vous devrez ajouter manuellement des fichiers au projet (en dehors de l'éditeur).</p>",
      "project_not_found": "<p>Le projet '__project__' est introuvable.</p>",
      "git_merge_conflict": "<p>La fusion automatique des modifications a échoué.</p><p>Corriger les conflits non fusionnés, puis valider le résultat.</p>"
@ -220,7 +219,7 @@
    },
    "project": {
      "change-branch": "Changer pour une branche locale '__project__'",
-      "merge-abort": "Fusion Git abandonnée",
+      "merge-abort": "Git fusion abandonnée",
      "loaded": "Projet '__project__' chargé",
      "updated": "Projet '__project__' mis à jour",
      "pull": "Projet '__project__' rechargé",
@ -353,7 +352,7 @@
      "backgroundUpdate": "Les flux sur le serveur ont été mis à jour.",
      "conflictChecking": "Vérifier si les modifications peuvent être fusionnées automatiquement",
      "conflictAutoMerge": "Les modifications n'incluent aucun conflit et peuvent être fusionnées automatiquement.",
-      "conflictManualMerge": "Les modifications incluent des conflits qui doivent être résolus avant de pouvoir être déployées.",
+      "conflictManualMerge": "Les changements incluent des conflits qui doivent être résolus avant de pouvoir être déployés.",
      "plusNMore": "+ __count__ en plus"
    }
  },
@ -373,28 +372,19 @@
      "deleted": "supprimé",
      "flowDeleted": "flux supprimé",
      "flowAdded": "flux ajouté",
-      "moved": "déplacé",
      "movedTo": "déplacé vers __id__",
-      "movedFrom": "déplacé depuis __id__",
-      "none": "aucun",
-      "position": "position",
-      "wires": "câbles"
+      "movedFrom": "déplacé depuis __id__"
    },
    "nodeCount": "__count__ noeud",
    "nodeCount_plural": "__count__ noeuds",
    "local": "Changements locaux",
-    "remote": "Changements distants",
+    "remote": "Modifications à distance",
    "reviewChanges": "Examiner les modifications",
    "noBinaryFileShowed": "Impossible d'afficher le contenu du fichier binaire",
-    "viewCommitDiff": "Afficher les modifications de la validation",
-    "commit": "Validation",
+    "viewCommitDiff": "Afficher les modifications de validation",
    "compareChanges": "Comparer les modifications",
    "saveConflict": "Enregistrer la résolution des conflits",
    "conflictHeader": "<span>__resolved__</span> sur <span>__unresolved__</span> conflit(s) résolu(s)",
-    "localChanges": "Modifications locales",
-    "remoteChanges": "Modifications distantes",
-    "useLocalChanges": "utiliser les modifications locales",
-    "useRemoteChanges": "utiliser les modifications distantes",
    "commonVersionError": "La version commune ne contient pas de JSON valide :",
    "oldVersionError": "L'ancienne version ne contient pas de JSON valide :",
    "newVersionError": "La nouvelle version ne contient pas de JSON valide :"
@ -405,9 +395,9 @@
    "edit": "Modifier le modèle du sous-flux",
    "subflowInstances": "Il existe __count__ instance de ce modèle de sous-flux",
    "subflowInstances_plural": "Il existe __count__ instances de ce modèle de sous-flux",
-    "editSubflowProperties": "Modifier les propriétés",
-    "input": "Entrées :",
-    "output": "Sorties :",
+    "editSubflowProperties": "modifier les propriétés",
+    "input": "Entrées:",
+    "output": "Sorties:",
    "status": "Statut du noeud",
    "deleteSubflow": "Supprimer le sous-flux",
    "confirmDelete": "Voulez-vous vraiment supprimer ce sous-flux ?",
@ -421,7 +411,7 @@
    "version": "Version",
    "versionPlaceholder": "x.y.z",
    "keys": "Mots clés",
-    "keysPlaceholder": "Mots clés séparés par une virgule",
+    "keysPlaceholder": "Mots clés séparés par des virgules",
    "author": "Auteur",
    "authorPlaceholder": "Votre nom <email@exemple.com>",
    "desc": "Description",
@ -478,7 +468,7 @@
      "select": "sélection",
      "checkbox": "case à cocher",
      "spinner": "valeurs à défiler",
-      "none": "aucun",
+      "none": "aucune",
      "hidden": "masquer la propriété"
    },
    "types": {
@ -506,7 +496,7 @@
      "max": "Maximum"
    },
    "errors": {
-      "scopeChange": "La modification de la portée rendra indisponible ce noeud de configuration aux noeuds d'autres flux qui l'utilisent",
+      "scopeChange": "La modification de la portée la rendra indisponible pour les noeuds d'autres flux qui l'utilisent",
      "invalidProperties": "Propriétés invalides :",
      "credentialLoadFailed": "Échec du chargement des identifiants du noeud"
    }
@ -520,7 +510,7 @@
    "unassigned": "Non attribué",
    "global": "Global",
    "workspace": "Espace de travail",
-    "editor": "Boîte d'édition",
+    "editor": "Boîte de dialogue d'édition",
    "selectAll": "Tout sélectionner",
    "selectNone": "Ne rien sélectionner",
    "selectAllConnected": "Sélectionner tous les éléments connectés",
@ -551,7 +541,7 @@
    "openLibrary": "Ouvrir la bibliothèque...",
    "saveToLibrary": "Enregistrer dans la bibliothèque...",
    "typeLibrary": "__type__ bibliothèque",
-    "unnamedType": "Sans nom __type__",
+    "unnamedType": "Innomé __type__",
    "exportedToLibrary": "Noeuds exportés vers la bibliothèque",
    "dialogSaveOverwrite": "Une __libraryType__ appelée __libraryName__ existe déjà. Écraser ?",
    "invalidFilename": "Nom de fichier non valide",
@ -562,15 +552,13 @@
    "types": {
      "local": "Local",
      "examples": "Exemples"
-    },
-    "type": "Type",
-    "name": "Nom"
+    }
  },
  "palette": {
    "noInfo": "Pas d'information disponible",
    "filter": "Rechercher le noeud",
    "search": "Rechercher les modules",
-    "addCategory": "Ajouter une nouvelle...",
+    "addCategory": "Ajouter un nouveau...",
    "label": {
      "subflows": "Sous-flux",
      "network": "Réseau",
@ -626,8 +614,6 @@
      },
      "nodeCount": "__label__ noeud",
      "nodeCount_plural": "__label__ noeuds",
-      "pluginCount": "__count__ plugin",
-      "pluginCount_plural": "__count__ plugins",
      "moduleCount": "__count__ module disponible",
      "moduleCount_plural": "__count__ modules disponibles",
      "inuse": "En cours d'utilisation",
@ -650,12 +636,11 @@
      "sortAZ": "A-Z",
      "sortRecent": "Récent",
      "more": "+ __count__ en plus",
-      "upload": "Charger le fichier .tgz du module",
+      "upload": "Charger le fichier tgz du module",
      "refresh": "Actualiser la liste des modules",
      "errors": {
        "catalogLoadFailed": "<p>Échec du chargement du catalogue de noeuds.</p><p>Vérifier la console du navigateur pour plus d'informations</p>",
        "installFailed": "<p>Échec lors de l'installation : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
-        "installTimeout": "<p>L'installation continue en arrière-plan.</p><p>Les noeuds apparaîtront dans la palette une fois l'installation terminée. Consulter le journal pour plus d'informations.</p>",
        "removeFailed": "<p>Échec lors de la suppression : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
        "updateFailed": "<p>Échec lors de la mise à jour : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
        "enableFailed": "<p>Échec lors de l'activation : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
@ -663,29 +648,25 @@
      },
      "confirm": {
        "install": {
-          "body": "<p>Installation de '__module__'</p><p>Avant l'installation, veuillez lire la documentation du noeud. Certains noeuds ont des dépendances qui ne peuvent pas être résolues automatiquement et peuvent nécessiter un redémarrage de Node-RED.</p>",
+          "body": "<p>Installation de '__module__'</p><p>Avant l'installation, veuiller lire la documentation du noeud. Certains noeuds ont des dépendances qui ne peuvent pas être résolues automatiquement et peuvent nécessiter un redémarrage de Node-RED.</p>",
          "title": "Installer les noeuds"
        },
        "remove": {
-          "body": "<p>Suppression de '__module__'</p><p>La suppression du noeud le désinstallera de Node-RED. Le noeud peut continuer à utiliser ses ressources jusqu'au redémarrage de Node-RED.</p>",
+          "body": "<p>Suppression de '__module__'</p><p>La suppression du noeud le désinstallera de Node-RED. Le noeud peut continuer à utiliser des ressources jusqu'au redémarrage de Node-RED.</p>",
          "title": "Supprimer les noeuds"
        },
-        "removePlugin": {
-          "body": "<p>Suppression du plugin '__module__'. Veuillez recharger l'éditeur afin d'appliquer les changements.</p>"
-        },
        "update": {
          "body": "<p>Mise à jour de '__module__'</p><p>La mise à jour du noeud nécessitera un redémarrage de Node-RED pour terminer la mise à jour. Cela doit être fait manuellement.</p>",
          "title": "Mettre à jour les noeuds"
        },
        "cannotUpdate": {
-          "body": "Une mise à jour pour ce noeud est disponible, mais il n'est pas installé dans un emplacement que le gestionnaire de palette peut mettre à jour.<br/><br/>Veuillez vous référer à la documentation pour savoir comment mettre à jour ce noeud."
+          "body": "Une mise à jour pour ce noeud est disponible, mais il n'est pas installé dans un emplacement que le gestionnaire de palette peut mettre à jour.<br/><br/>Veuiller vous référer à la documentation pour savoir comment mettre à jour ce noeud."
        },
        "button": {
          "review": "Ouvrir la documentation",
          "install": "Installer",
          "remove": "Supprimer",
-          "update": "Mettre à jour",
-          "understood": "Compris"
+          "update": "Mettre à jour"
        }
      }
    }
@ -720,8 +701,8 @@
      "nodeHelp": "Aide sur les noeuds",
      "none": "Aucun",
      "arrayItems": "__count__ éléments",
-      "showTips": "Vous pouvez afficher les astuces à partir du panneau des paramètres",
-      "outline": "Contour",
+      "showTips": "Vous pouvez ouvrir les astuces à partir du panneau des paramètres",
+      "outline": "Plan",
      "empty": "Vide",
      "globalConfig": "Noeuds de configuration globale",
      "triggerAction": "Déclencher une action",
@ -734,7 +715,7 @@
    "help": {
      "name": "Aide",
      "label": "Aide",
-      "search": "Rechercher l'aide",
+      "search": "Aide à la recherche",
      "nodeHelp": "Aide sur les noeuds",
      "showHelp": "Afficher l'aide",
      "showInOutline": "Afficher dans les grandes lignes",
@ -813,8 +794,7 @@
        "branches": "Branches",
        "noBranches": "Pas de branche",
        "deleteConfirm": "Êtes-vous sûr de vouloir supprimer la branche locale '__name__' ? Ça ne peut pas être annulé.",
-        "deleteBranch": "Supprimer la branche",
-        "unmergedConfirm": "La branche locale '__name__' contient des modifications non fusionnées qui seront perdues. Êtes-vous sûr de vouloir la supprimer?",
+        "unmergedConfirm": "La branche locale '__name__' contient des modifications non fusionnées qui seront perdues. Etes-vous sûr de vouloir la supprimer?",
        "deleteUnmergedBranch": "Supprimer la branche non fusionnée",
        "gitRemotes": "Git distant",
        "addRemote": "Ajout distant",
@ -858,17 +838,17 @@
        "deleteConfirm": "Êtes-vous sûr de vouloir supprimer la clé SSH __name__ ? Ça ne peut pas être annulé."
      },
      "versionControl": {
-        "unstagedChanges": "Changements non indexés",
-        "stagedChanges": "Changements indexés",
-        "unstageChange": "Annuler l'indexation des changements",
-        "stageChange": "Indexer les changements",
-        "unstageAllChange": "Annuler l'indexation de tous les changements",
-        "stageAllChange": "Indexer tous les changements",
+        "unstagedChanges": "Abandon des changements",
+        "stagedChanges": "Changement mis en place",
+        "unstageChange": "Ne pas mettre en place le changement",
+        "stageChange": "Mettre en place le changement",
+        "unstageAllChange": "Ne pas mettre en place tous les changements",
+        "stageAllChange": "Mettre en place tous les changements",
        "commitChanges": "Valider les changements",
        "resolveConflicts": "Résoudre les conflits",
        "head": "En-tête",
-        "staged": "Indexé",
-        "unstaged": "Non indexé",
+        "staged": "Mis en place",
+        "unstaged": "Non mis en place",
        "local": "Local",
        "remote": "Distant",
        "revert": "Voulez-vous vraiment annuler les modifications apportées à '__file__' ? Ça ne peut pas être annulé.",
@ -902,11 +882,11 @@
        "pushFailed": "L'envoi a échoué car la branche a des validations plus récentes. Tirer et fusionner d'abord, puis envoyer à nouveau.",
        "push": "Envoyer",
        "pull": "Tirer",
-        "unablePull": "<p>Impossible d'extraire les modifications à distance; vos modifications locales non mises en place seraient écrasées.</p><p>Valider vos modifications et réessayer.</p>",
-        "showUnstagedChanges": "Afficher les modifications non indexées",
+        "unablePull": "<p>Impossible d'extraire les modifications à distance ; vos modifications locales non mises en place seraient écrasées.</p><p>Valider vos modifications et réessayer.</p>",
+        "showUnstagedChanges": "Afficher les modifications non mise en place",
        "connectionFailed": "Impossible de se connecter au référentiel distant: ",
        "pullUnrelatedHistory": "<p>Le réferentiel distant a un historique de validations sans rapport.</p><p>Êtes-vous sûr de vouloir extraire les modifications dans votre référentiel local ?</p>",
-        "pullChanges": "Tirer les changements distants",
+        "pullChanges": "Tirer les changements",
        "history": "Historique",
        "projectHistory": "Historique du projet",
        "daysAgo": "il y a __count__ jour",
@ -947,14 +927,7 @@
      "date": "horodatage",
      "jsonata": "expression",
      "env": "variable d'environnement",
-      "cred": "identifiant",
-      "conf-types": "noeud de configuration"
-    },
-    "date": {
-      "format": {
-        "timestamp": "millisecondes depuis l'époque",
-        "object": "Objet de date JavaScript"
-      }
+      "cred": "identifiant"
    }
  },
  "editableList": {
@ -987,7 +960,7 @@
    "result": "Résultat",
    "format": "Format",
    "compatMode": "Mode de compatibilité activé",
-    "compatModeDesc": "<h3>Mode de compatibilité JSONata</h3><p> L'expression actuelle semble toujours faire référence à <code>msg</code> et sera donc évaluée en mode de compatibilité. Veuillez mettre à jour l'expression pour ne pas utiliser <code>msg</code> car ce mode sera supprimé à l'avenir.</p><p> Lorsque la prise en charge de JSONata a été ajoutée pour la première fois à Node-RED, il fallait que l'expression référencie l'objet <code>msg</code>. Par exemple, <code>msg.payload</code> serait utilisé pour accéder à la charge utile.</p><p> Cela n'est plus nécessaire car l'expression sera évaluée directement par rapport au message. Pour accéder à la charge utile, l'expression doit être simplement <code>charge utile</code>.</p>",
+    "compatModeDesc": "<h3>Mode de compatibilité JSONata</h3><p> L'expression actuelle semble toujours faire référence à <code>msg</code> et sera donc évaluée en mode de compatibilité. Veuiller mettre à jour l'expression pour ne pas utiliser <code>msg</code> car ce mode sera supprimé à l'avenir.</p><p> Lorsque la prise en charge de JSONata a été ajoutée pour la première fois à Node-RED, il fallait que l'expression référencie l'objet <code>msg</code>. Par exemple, <code>msg.payload</code> serait utilisé pour accéder à la charge utile.</p><p> Cela n'est plus nécessaire car l'expression sera évaluée directement par rapport au message. Pour accéder à la charge utile, l'expression doit être simplement <code>charge utile</code>.</p>",
    "noMatch": "Aucun résultat correspondant",
    "errors": {
      "invalid-expr": "Expression JSONata non valide :\n  __message__",
@ -1010,7 +983,7 @@
  },
  "jsonEditor": {
    "title": "Éditeur JSON",
-    "format": "Formatter JSON",
+    "format": "Format JSON",
    "rawMode": "Modifier JSON",
    "uiMode": "Afficher l'éditeur",
    "rawMode-readonly": "JSON",
@ -1029,7 +1002,7 @@
  "markdownEditor": {
    "title": "Éditeur Markdown",
    "expand": "Développer",
-    "format": "Formatter avec Markdown",
+    "format": "Formaté avec Markdown",
    "heading1": "Rubrique 1",
    "heading2": "Rubrique 2",
    "heading3": "Rubrique 3",
@ -1103,7 +1076,7 @@
      "credential-key": "Clé de chiffrement des identifiants",
      "cant-get-ssh-key": "Erreur! Impossible d'obtenir le chemin de la clé SSH sélectionnée.",
      "already-exists2": "Existe déjà",
-      "git-error": "Erreur Git",
+      "git-error": "Erreur git",
      "connection-failed": "La connexion a échoué",
      "not-git-repo": "Ce n'est pas un dépôt Git",
      "repo-not-found": "Référentiel introuvable"
@ -1117,7 +1090,7 @@
      "credentials-file": "Fichier d'identifiants"
    },
    "encryption-config": {
-      "setup": "Configuration du chiffrement de votre fichier d'informations d'identification",
+      "setup": "Configuration du chiffrage de votre fichier d'informations d'identification",
      "desc0": "Votre fichier d'informations d'identification de flux peut être chiffré pour sécuriser son contenu.",
      "desc1": "Si vous souhaitez stocker ces identifiants dans un référentiel Git public, vous devez les chiffrer en fournissant une phrase clé secrète.",
      "desc2": "Votre fichier d'identifiants de flux n'est actuellement pas chiffré.",
@ -1174,9 +1147,9 @@
      "add-ssh-key": "Ajouter une clé ssh",
      "credentials-encryption-key": "Clé de chiffrement des identifiants",
      "already-exists-2": "Existe déjà",
-      "git-error": "Erreur Git",
+      "git-error": "Erreur git",
      "con-failed": "La connexion a échoué",
-      "not-git": "Ce n'est pas un dépôt Git",
+      "not-git": "Ce n'est pas un dépôt git",
      "no-resource": "Référentiel introuvable",
      "cant-get-ssh-key-path": "Erreur! Impossible d'obtenir le chemin de la clé SSH sélectionnée.",
      "unexpected_error": "Erreur inattendue",
@ -1214,7 +1187,7 @@
    },
    "errors": {
      "no-username-email": "Votre client Git n'est pas configuré avec un nom d'utilisateur/e-mail.",
-      "unexpected": "Une erreur inattendue est survenue",
+      "unexpected": "Une erreur inattendue est apparue",
      "code": "Code"
    }
  },
@ -1283,7 +1256,7 @@
    "list-modified-nodes": "Afficher les flux modifiés",
    "list-hidden-flows": "Afficher les flux cachés",
    "list-flows": "Lister les flux",
-    "list-subflows": "Lister les sous-flux",
+    "list-subflows": "Liste les sous-flux",
    "go-to-previous-location": "Aller à l'emplacement précédent",
    "go-to-next-location": "Aller à l'emplacement suivant",
    "copy-selection-to-internal-clipboard": "Copier la sélection dans le presse-papiers",
@ -1343,8 +1316,8 @@
    "align-selection-to-bottom": "Aligner la sélection vers le bas",
    "align-selection-to-middle": "Aligner la sélection au centre verticalement",
    "align-selection-to-center": "Aligner la sélection au centre horizontalement",
-    "distribute-selection-horizontally": "Répartir la sélection horizontalement",
-    "distribute-selection-vertical": "Répartir la sélection verticalement",
+    "distribute-selection-horizontally": "Distribuer la sélection horizontalement",
+    "distribute-selection-vertical": "Distribuer la sélection verticalement",
    "wire-series-of-nodes": "Connecter les noeuds en série",
    "wire-node-to-multiple": "Connecter les noeuds à plusieurs",
    "wire-multiple-to-node": "Connecter plusieurs au noeud",
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@ -27,8 +27,7 @@
            "lock": "固定",
            "unlock": "固定を解除",
            "locked": "固定済み",
-            "unlocked": "固定なし",
-            "format": "形式"
+            "unlocked": "固定なし"
        },
        "type": {
            "string": "文字列",
@ -282,8 +281,8 @@
            "selected": "選択したフロー",
            "current": "現在のタブ",
            "all": "全てのタブ",
-            "compact": "インデントなし",
-            "formatted": "インデント付き",
+            "compact": "インデントのないJSONフォーマット",
+            "formatted": "インデント付きのJSONフォーマット",
            "copy": "書き出し",
            "export": "ライブラリに書き出し",
            "exportAs": "書き出し先",
@ -373,12 +372,8 @@
            "deleted": "削除",
            "flowDeleted": "削除されたフロー",
            "flowAdded": "追加されたフロー",
-            "moved": "移動",
            "movedTo": "__id__ へ移動",
-            "movedFrom": "__id__ から移動",
-            "none": "なし",
-            "position": "位置",
-            "wires": "ワイヤー"
+            "movedFrom": "__id__ から移動"
        },
        "nodeCount": "__count__ 個のノード",
        "nodeCount_plural": "__count__ 個のノード",
@ -387,14 +382,9 @@
        "reviewChanges": "変更を表示",
        "noBinaryFileShowed": "バイナリファイルの中身は表示することができません",
        "viewCommitDiff": "コミットの内容を表示",
-        "commit": "コミット",
        "compareChanges": "変更を比較",
        "saveConflict": "解決して保存",
        "conflictHeader": "<span>__unresolved__</span> 個中 <span>__resolved__</span> 個のコンフリクトを解決",
-        "localChanges": "ローカルの変更",
-        "remoteChanges": "リモートの変更",
-        "useLocalChanges": "ローカルの変更を使用",
-        "useRemoteChanges": "リモートの変更を使用",
        "commonVersionError": "共通バージョンは正しいJSON形式ではありません:",
        "oldVersionError": "古いバージョンは正しいJSON形式ではありません:",
        "newVersionError": "新しいバージョンは正しいJSON形式ではありません:"
@ -562,9 +552,7 @@
        "types": {
            "local": "ローカル",
            "examples": "サンプル"
-        },
-        "type": "型",
-        "name": "名前"
+        }
    },
    "palette": {
        "noInfo": "情報がありません",
@ -626,8 +614,6 @@
            },
            "nodeCount": "__label__ 個のノード",
            "nodeCount_plural": "__label__ 個のノード",
-            "pluginCount": "__count__ 個のプラグイン",
-            "pluginCount_plural": "__count__ 個のプラグイン",
            "moduleCount": "__count__ 個のモジュール",
            "moduleCount_plural": "__count__ 個のモジュール",
            "inuse": "使用中",
@ -655,7 +641,6 @@
            "errors": {
                "catalogLoadFailed": "<p>ノードのカタログの読み込みに失敗しました。</p><p>詳細はブラウザのコンソールを確認してください。</p>",
                "installFailed": "<p>追加処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
-                "installTimeout": "<p>バックグラウンドでインストールが継続されます。</p><p>完了した時にノードが表示されます。詳細はログを確認してください。</p>",
                "removeFailed": "<p>削除処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
                "updateFailed": "<p>更新処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
                "enableFailed": "<p>有効化処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
@ -670,9 +655,6 @@
                    "body": "<p>__module__ を削除します。</p><p>Node-REDからノードを削除します。ノードはNode-REDが再起動されるまで、リソースを使い続ける可能性があります。</p>",
                    "title": "ノードを削除"
                },
-                "removePlugin": {
-                    "body": "<p>プラグイン __module__ を削除しました。ブラウザを再読み込みして残った表示を消してください。</p>"
-                },
                "update": {
                    "body": "<p>__module__ を更新します。</p><p>更新を完了するには手動でNode-REDを再起動する必要があります。</p>",
                    "title": "ノードの更新"
@ -684,8 +666,7 @@
                    "review": "ノードの情報を参照",
                    "install": "追加",
                    "remove": "削除",
-                    "update": "更新",
-                    "understood": "了解"
+                    "update": "更新"
                }
            }
        }
@ -813,7 +794,6 @@
                "branches": "ブランチ",
                "noBranches": "ブランチなし",
                "deleteConfirm": "本当にローカルブランチ'__name__'を削除しますか？削除すると元に戻すことはできません。",
-                "deleteBranch": "ブランチを削除",
                "unmergedConfirm": "ローカルブランチ'__name__'にはマージされていない変更があります。この変更は削除されます。本当に削除しますか？",
                "deleteUnmergedBranch": "マージされていないブランチを削除",
                "gitRemotes": "Gitリモート",
@ -935,8 +915,6 @@
        }
    },
    "typedInput": {
-        "selected": "__count__個を選択",
-        "selected_plural": "__count__個を選択",
        "type": {
            "str": "文字列",
            "num": "数値",
@ -947,14 +925,7 @@
            "date": "日時",
            "jsonata": "JSONata式",
            "env": "環境変数",
-            "cred": "認証情報",
-            "conf-types": "設定ノード"
-        },
-        "date": {
-            "format": {
-                "timestamp": "エポックからの経過ミリ秒",
-                "object": "JavaScript日付オブジェクト"
-            }
+            "cred": "認証情報"
        }
    },
    "editableList": {
@ -1260,7 +1231,7 @@
    },
    "env-var": {
        "environment": "環境変数",
-        "header": "グローバル環境変数",
+        "header": "大域環境変数",
        "revert": "破棄"
    },
    "action-list": {
@ -1412,7 +1383,7 @@
        "copy-item-edit-url": "要素の編集URLをコピー",
        "move-flow-to-start": "フローを先頭に移動",
        "move-flow-to-end": "フローを末尾に移動",
-        "show-global-env": "グローバル環境変数を表示",
+        "show-global-env": "大域環境変数を表示",
        "lock-flow": "フローを固定",
        "unlock-flow": "フローの固定を解除",
        "show-node-help": "ノードのヘルプを表示"
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-client",
-    "version": "4.0.9",
+    "version": "3.1.11",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/js/comms.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/comms.js
@ -26,15 +26,6 @@ RED.comms = (function() {
    var reconnectAttempts = 0;
    var active = false;

-    RED.events.on('login', function(username) {
-        // User has logged in
-        // Need to upgrade the connection to be authenticated
-        if (ws && ws.readyState == 1) {
-            const auth_tokens = RED.settings.get("auth-tokens");
-            ws.send(JSON.stringify({auth:auth_tokens.access_token}))
-        }
-    })
-
    function connectWS() {
        active = true;
        var wspath;
@ -65,7 +56,6 @@ RED.comms = (function() {
                    ws.send(JSON.stringify({subscribe:t}));
                }
            }
-            emit('connect')
        }

        ws = new WebSocket(wspath);
@ -190,53 +180,9 @@ RED.comms = (function() {
        }
    }

-    function send(topic, msg) {
-        if (ws && ws.readyState == 1) {
-            ws.send(JSON.stringify({
-                topic,
-                data: msg
-            }))
-        }
-    }
-
-    const eventHandlers = {};
-    function on(evt,func) {
-        eventHandlers[evt] = eventHandlers[evt]||[];
-        eventHandlers[evt].push(func);
-    }
-    function off(evt,func) {
-        const handler = eventHandlers[evt];
-        if (handler) {
-            for (let i=0;i<handler.length;i++) {
-                if (handler[i] === func) {
-                    handler.splice(i,1);
-                    return;
-                }
-            }
-        }
-    }
-    function emit() {
-        const evt = arguments[0]
-        const args = Array.prototype.slice.call(arguments,1);
-        if (eventHandlers[evt]) {
-            let cpyHandlers = [...eventHandlers[evt]];
-            for (let i=0;i<cpyHandlers.length;i++) {
-                try {
-                    cpyHandlers[i].apply(null, args);
-                } catch(err) {
-                    console.warn("RED.comms.emit error: ["+evt+"] "+(err.toString()));
-                    console.warn(err);
-                }
-            }
-        }
-    }
-
    return {
        connect: connectWS,
        subscribe: subscribe,
-        unsubscribe:unsubscribe,
-        on,
-        off,
-        send
+        unsubscribe:unsubscribe
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@ -29,14 +29,7 @@ RED.history = (function() {
        }
        return RED.nodes.junction(id);
    }
-    function ensureUnlocked(id, flowsToLock) {
-        const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
-        const isLocked = flow ? flow.locked : false;
-        if (flow && isLocked) {
-            flow.locked = false;
-            flowsToLock.add(flow)
-        }
-    }
+
    function undoEvent(ev) {
        var i;
        var len;
@ -66,46 +59,18 @@ RED.history = (function() {
                        t: 'replace',
                        config: RED.nodes.createCompleteNodeSet(),
                        changed: {},
-                        moved: {},
-                        complete: true,
-                        rev: RED.nodes.version(),
-                        dirty: RED.nodes.dirty()
+                        rev: RED.nodes.version()
                    };
-                    var selectedTab = RED.workspaces.active();
-                    inverseEv.config.forEach(n => {
-                        const node = RED.nodes.node(n.id)
-                        if (node) {
-                            inverseEv.changed[n.id] = node.changed
-                            inverseEv.moved[n.id] = node.moved
-                        }
-                    })
                    RED.nodes.clear();
                    var imported = RED.nodes.import(ev.config);
-                    // Clear all change flags from the import
-                    RED.nodes.dirty(false);
-
-                    const flowsToLock = new Set()
-                    
                    imported.nodes.forEach(function(n) {
                        if (ev.changed[n.id]) {
-                            ensureUnlocked(n.z, flowsToLock)
                            n.changed = true;
+                            inverseEv.changed[n.id] = true;
                        }
-                        if (ev.moved[n.id]) {
-                            ensureUnlocked(n.z, flowsToLock)
-                            n.moved = true;
-                        }
-                    })
-                    flowsToLock.forEach(flow => {
-                        flow.locked = true
                    })

                    RED.nodes.version(ev.rev);
-                    RED.view.redraw(true);
-                    RED.palette.refresh();
-                    RED.workspaces.refresh();
-                    RED.workspaces.show(selectedTab, true);
-                    RED.sidebar.config.refresh();
                } else {
                    var importMap = {};
                    ev.config.forEach(function(n) {
@ -453,61 +418,10 @@ RED.history = (function() {
                                    RED.events.emit("nodes:change",newConfigNode);
                                }
                            });
-                        } else if (i === "env" && ev.node.type.indexOf("subflow:") === 0) {
-                            // Subflow can have config node in node.env
-                            let nodeList = ev.node.env || [];
-                            nodeList = nodeList.reduce((list, prop) => {
-                                if (prop.type === "conf-type" && prop.value) {
-                                    list.push(prop.value);
-                                }
-                                return list;
-                            }, []);
-
-                            nodeList.forEach(function(id) {
-                                const configNode = RED.nodes.node(id);
-                                if (configNode) {
-                                    if (configNode.users.indexOf(ev.node) !== -1) {
-                                        configNode.users.splice(configNode.users.indexOf(ev.node), 1);
-                                        RED.events.emit("nodes:change", configNode);
-                                    }
-                                }
-                            });
-
-                            nodeList = ev.changes.env || [];
-                            nodeList = nodeList.reduce((list, prop) => {
-                                if (prop.type === "conf-type" && prop.value) {
-                                    list.push(prop.value);
-                                }
-                                return list;
-                            }, []);
-
-                            nodeList.forEach(function(id) {
-                                const configNode = RED.nodes.node(id);
-                                if (configNode) {
-                                    if (configNode.users.indexOf(ev.node) === -1) {
-                                        configNode.users.push(ev.node);
-                                        RED.events.emit("nodes:change", configNode);
-                                    }
-                                }
-                            });
-                        }
-                        if (i === "credentials" && ev.changes[i]) {
-                            // Reset - Only want to keep the changes
-                            inverseEv.changes[i] = {};
-                            for (const [key, value] of Object.entries(ev.changes[i])) {
-                                // Edge case: node.credentials is cleared after a deploy, so we can't
-                                // capture values for the inverse event when undoing past a deploy
-                                if (ev.node.credentials) {
-                                    inverseEv.changes[i][key] = ev.node.credentials[key];
-                                }
-                                ev.node.credentials[key] = value;
-                            }
-                        } else {
-                            ev.node[i] = ev.changes[i];
                        }
+                        ev.node[i] = ev.changes[i];
                    }
                }
-
                ev.node.dirty = true;
                ev.node.changed = ev.changed;

@ -587,24 +501,6 @@ RED.history = (function() {
                    RED.editor.updateNodeProperties(ev.node,outputMap);
                    RED.editor.validateNode(ev.node);
                }
-                // If it's a Config Node, validate user nodes too.
-                // NOTE: The Config Node must be validated before validating users.
-                if (ev.node.users) {
-                    const validatedNodes = new Set();
-                    const userStack = ev.node.users.slice();
-
-                    validatedNodes.add(ev.node.id);
-                    while (userStack.length) {
-                        const node = userStack.pop();
-                        if (!validatedNodes.has(node.id)) {
-                            validatedNodes.add(node.id);
-                            if (node.users) {
-                                userStack.push(...node.users);
-                            }
-                            RED.editor.validateNode(node);
-                        }
-                    }
-                }
                if (ev.links) {
                    inverseEv.createdLinks = [];
                    for (i=0;i<ev.links.length;i++) {
--- a/packages/node_modules/@node-red/editor-client/src/js/multiplayer.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/multiplayer.js
@ -1,560 +0,0 @@
-RED.multiplayer = (function () {
-
-    // activeSessionId - used to identify sessions across websocket reconnects
-    let activeSessionId
-
-    let headerWidget
-    // Map of session id to { session:'', user:{}, location:{}}
-    let sessions = {}
-    // Map of username to { user:{}, sessions:[] }
-    let users = {}
-
-    function addUserSession (session) {
-        if (sessions[session.session]) {
-            // This is an existing connection that has been authenticated
-            const existingSession = sessions[session.session]
-            if (existingSession.user.username !== session.user.username) {
-                removeUserHeaderButton(users[existingSession.user.username])
-            }
-        }
-        sessions[session.session] = session
-        const user = users[session.user.username] = users[session.user.username] || {
-            user: session.user,
-            sessions: []
-        }
-        if (session.user.profileColor === undefined) {
-            session.user.profileColor = (1 + Math.floor(Math.random() * 5))
-        }
-        session.location = session.location || {}
-        user.sessions.push(session)
-
-        if (session.session === activeSessionId) {
-            // This is the current user session - do not add a extra button for them
-        } else {
-            if (user.sessions.length === 1) {
-                if (user.button) {
-                    clearTimeout(user.inactiveTimeout)
-                    clearTimeout(user.removeTimeout)
-                    user.button.removeClass('inactive')
-                } else {
-                    addUserHeaderButton(user)
-                }
-            }
-            sessions[session.session].location = session.location
-            updateUserLocation(session.session)
-        }
-    }
-
-    function removeUserSession (sessionId, isDisconnected) {
-        removeUserLocation(sessionId)
-        const session = sessions[sessionId]
-        delete sessions[sessionId]
-        const user = users[session.user.username]
-        const i = user.sessions.indexOf(session)
-        user.sessions.splice(i, 1)
-        if (isDisconnected) {
-            removeUserHeaderButton(user)
-        } else {
-            if (user.sessions.length === 0) {
-                // Give the user 5s to reconnect before marking inactive
-                user.inactiveTimeout = setTimeout(() => {
-                    user.button.addClass('inactive')
-                    // Give the user further 20 seconds to reconnect before removing them
-                    // from the user toolbar entirely
-                    user.removeTimeout = setTimeout(() => {
-                        removeUserHeaderButton(user)
-                    }, 20000)
-                }, 5000)
-            }
-        }
-    }
-
-    function addUserHeaderButton (user) {
-        user.button = $('<li class="red-ui-multiplayer-user"><button type="button" class="red-ui-multiplayer-user-icon"></button></li>')
-            .attr('data-username', user.user.username)
-            .prependTo("#red-ui-multiplayer-user-list");
-        var button = user.button.find("button")
-        RED.popover.tooltip(button, user.user.username)
-        button.on('click', function () {
-            const location = user.sessions[0].location
-            revealUser(location)
-        })
-
-        const userProfile = RED.user.generateUserIcon(user.user)
-        userProfile.appendTo(button)
-    }
-
-    function removeUserHeaderButton (user) {
-        user.button.remove()
-        delete user.button
-    }
-
-    function getLocation () {
-        const location = {
-            workspace: RED.workspaces.active()
-        }
-        const editStack = RED.editor.getEditStack()
-        for (let i = editStack.length - 1; i >= 0; i--) {
-            if (editStack[i].id) {
-                location.node = editStack[i].id
-                break
-            }
-        }
-        if (isInWorkspace) {
-            const chart = $('#red-ui-workspace-chart')
-            const chartOffset = chart.offset()
-            const scaleFactor = RED.view.scale()
-            location.cursor = {
-                x: (lastPosition[0] - chartOffset.left + chart.scrollLeft()) / scaleFactor,
-                y: (lastPosition[1] - chartOffset.top + chart.scrollTop()) / scaleFactor
-            }
-        }
-        return location
-    }
-
-    let publishLocationTimeout
-    let lastPosition = [0,0]
-    let isInWorkspace = false
-
-    function publishLocation () {
-        if (!publishLocationTimeout) {
-            publishLocationTimeout = setTimeout(() => {
-                const location = getLocation()
-                if (location.workspace !== 0) {
-                    log('send', 'multiplayer/location', location)
-                    RED.comms.send('multiplayer/location', location)
-                }
-                publishLocationTimeout = null
-            }, 100)
-        }
-    }
-
-
-    function revealUser(location, skipWorkspace) {
-        if (location.node) {
-            // Need to check if this is a known node, so we can fall back to revealing
-            // the workspace instead
-            const node = RED.nodes.node(location.node)
-            if (node) {
-                RED.view.reveal(location.node)
-            } else if (!skipWorkspace && location.workspace) {
-                RED.view.reveal(location.workspace)
-            }
-        } else if (!skipWorkspace && location.workspace) {
-            RED.view.reveal(location.workspace)
-        }
-    }
-
-    const workspaceTrays = {}
-    function getWorkspaceTray(workspaceId) {
-        // console.log('get tray for',workspaceId)
-        if (!workspaceTrays[workspaceId]) {
-            const tray = $('<div class="red-ui-multiplayer-users-tray"></div>')
-            const users = []
-            const userIcons = {}
-
-            const userCountIcon = $(`<div class="red-ui-multiplayer-user-location"><span class="red-ui-user-profile red-ui-multiplayer-user-count"><span></span></span></div>`)
-            const userCountSpan = userCountIcon.find('span span')
-            userCountIcon.hide()
-            userCountSpan.text('')
-            userCountIcon.appendTo(tray)
-            const userCountTooltip = RED.popover.tooltip(userCountIcon, function () {
-                    const content = $('<div>')
-                    users.forEach(sessionId => {
-                        $('<div>').append($('<a href="#">').text(sessions[sessionId].user.username).on('click', function (evt) {
-                            evt.preventDefault()
-                            revealUser(sessions[sessionId].location, true)
-                            userCountTooltip.close()
-                        })).appendTo(content)
-                    })
-                    return content
-                },
-                null,
-                true
-            )
-
-            const updateUserCount = function () {
-                const maxShown = 2
-                const children = tray.children()
-                children.each(function (index, element) {
-                    const i = users.length - index
-                    if (i > maxShown) {
-                        $(this).hide()
-                    } else if (i >= 0) {
-                        $(this).show()
-                    }
-                })
-                if (users.length < maxShown + 1) { 
-                    userCountIcon.hide()
-                } else {
-                    userCountSpan.text('+'+(users.length - maxShown))
-                    userCountIcon.show()
-                }
-            }
-            workspaceTrays[workspaceId] = {
-                attached: false,
-                tray,
-                users,
-                userIcons,
-                addUser: function (sessionId) {
-                    if (users.indexOf(sessionId) === -1) {
-                        // console.log(`addUser ws:${workspaceId} session:${sessionId}`)
-                        users.push(sessionId)
-                        const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
-                        const userLocationIcon = $(`<div class="red-ui-multiplayer-user-location" id="${userLocationId}"></div>`)
-                        RED.user.generateUserIcon(sessions[sessionId].user).appendTo(userLocationIcon)
-                        userLocationIcon.prependTo(tray)
-                        RED.popover.tooltip(userLocationIcon, sessions[sessionId].user.username)
-                        userIcons[sessionId] = userLocationIcon
-                        updateUserCount()
-                    }
-                },
-                removeUser: function (sessionId) {
-                    // console.log(`removeUser ws:${workspaceId} session:${sessionId}`)
-                    const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
-                    const index = users.indexOf(sessionId)
-                    if (index > -1) {
-                        users.splice(index, 1)
-                        userIcons[sessionId].remove()
-                        delete userIcons[sessionId]
-                    }
-                    updateUserCount()
-                },
-                updateUserCount
-            }
-        }
-        const trayDef = workspaceTrays[workspaceId]
-        if (!trayDef.attached) {
-            const workspaceTab = $(`#red-ui-tab-${workspaceId}`)
-            if (workspaceTab.length > 0) {
-                trayDef.attached = true
-                trayDef.tray.appendTo(workspaceTab)
-                trayDef.users.forEach(sessionId => {
-                    trayDef.userIcons[sessionId].on('click', function (evt) {
-                        revealUser(sessions[sessionId].location, true)
-                    })
-                })
-            }
-        }
-        return workspaceTrays[workspaceId]
-    }
-    function attachWorkspaceTrays () {
-        let viewTouched = false
-        for (let sessionId of Object.keys(sessions)) {
-            const location = sessions[sessionId].location
-            if (location) {
-                if (location.workspace) {
-                    getWorkspaceTray(location.workspace).updateUserCount()
-                }
-                if (location.node) {
-                    addUserToNode(sessionId, location.node)
-                    viewTouched = true
-                }
-            }
-        }
-        if (viewTouched) {
-            RED.view.redraw()
-        }
-    }
-
-    function addUserToNode(sessionId, nodeId) {
-        const node = RED.nodes.node(nodeId)
-        if (node) {
-            if (!node._multiplayer) {
-                node._multiplayer = {
-                    users: [sessionId]
-                }
-                node._multiplayer_refresh = true
-            } else {
-                if (node._multiplayer.users.indexOf(sessionId) === -1) {
-                    node._multiplayer.users.push(sessionId)
-                    node._multiplayer_refresh = true
-                }
-            }
-        }
-    }
-    function removeUserFromNode(sessionId, nodeId) {
-        const node = RED.nodes.node(nodeId)
-        if (node && node._multiplayer) {
-            const i = node._multiplayer.users.indexOf(sessionId)
-            if (i > -1) {
-                node._multiplayer.users.splice(i, 1)
-            }
-            if (node._multiplayer.users.length === 0) {
-                delete node._multiplayer
-            } else {
-                node._multiplayer_refresh = true
-            }
-        }
-
-    }
-
-    function removeUserLocation (sessionId) {
-        updateUserLocation(sessionId, {})
-        removeUserCursor(sessionId)
-    }
-    function removeUserCursor (sessionId) {
-        // return
-        if (sessions[sessionId]?.cursor) {
-            sessions[sessionId].cursor.parentNode.removeChild(sessions[sessionId].cursor)
-            delete sessions[sessionId].cursor
-        }
-    }
-
-    function updateUserLocation (sessionId, location) {
-        let viewTouched = false
-        const oldLocation = sessions[sessionId].location
-        if (location) {
-            if (oldLocation.workspace !== location.workspace) {
-                // console.log('removing', sessionId, oldLocation.workspace)
-                workspaceTrays[oldLocation.workspace]?.removeUser(sessionId)
-            }
-            if (oldLocation.node !== location.node) {
-                removeUserFromNode(sessionId, oldLocation.node)
-                viewTouched = true
-            }
-            sessions[sessionId].location = location
-        } else {
-            location = sessions[sessionId].location
-        }
-        // console.log(`updateUserLocation sessionId:${sessionId} oldWS:${oldLocation?.workspace} newWS:${location.workspace}`)
-        if (location.workspace) {
-            getWorkspaceTray(location.workspace).addUser(sessionId)
-            if (location.cursor && location.workspace === RED.workspaces.active()) {
-                if (!sessions[sessionId].cursor) {
-                    const user = sessions[sessionId].user
-                    const cursorIcon = document.createElementNS("http://www.w3.org/2000/svg","g");
-                    cursorIcon.setAttribute("class", "red-ui-multiplayer-annotation")
-                    cursorIcon.appendChild(createAnnotationUser(user, true))
-                    $(cursorIcon).css({
-                        transform: `translate( ${location.cursor.x}px, ${location.cursor.y}px)`,
-                        transition: 'transform 0.1s linear'
-                    })
-                    $("#red-ui-workspace-chart svg").append(cursorIcon)
-                    sessions[sessionId].cursor = cursorIcon
-                } else {
-                    const cursorIcon = sessions[sessionId].cursor
-                    $(cursorIcon).css({
-                        transform: `translate( ${location.cursor.x}px, ${location.cursor.y}px)`
-                    })
-    
-                }
-            } else if (sessions[sessionId].cursor) {
-                removeUserCursor(sessionId)
-            }
-        }
-        if (location.node) {
-            addUserToNode(sessionId, location.node)
-            viewTouched = true
-        }
-        if (viewTouched) {
-            RED.view.redraw()
-        }
-    }
-
-    // function refreshUserLocations () {
-    //     for (const session of Object.keys(sessions)) {
-    //         if (session !== activeSessionId) {
-    //             updateUserLocation(session)
-    //         }
-    //     }
-    // }
-
-
-    function createAnnotationUser(user, pointer = false) {
-        const radius = 20
-        const halfRadius = radius/2
-        const group = document.createElementNS("http://www.w3.org/2000/svg","g");
-        const badge = document.createElementNS("http://www.w3.org/2000/svg","path");
-        let shapePath
-        if (!pointer) {
-            shapePath = `M 0 ${halfRadius} a ${halfRadius} ${halfRadius} 0 1 1 ${radius} 0 a ${halfRadius} ${halfRadius} 0 1 1 -${radius} 0 z`
-        } else {
-            shapePath = `M 0 0 h ${halfRadius} a ${halfRadius} ${halfRadius} 0 1 1 -${halfRadius} ${halfRadius} z`
-        }
-        badge.setAttribute('d', shapePath)
-        badge.setAttribute("class", "red-ui-multiplayer-annotation-background")
-        group.appendChild(badge)
-        if (user && user.profileColor !== undefined) {
-            badge.setAttribute("class", "red-ui-multiplayer-annotation-background red-ui-user-profile-color-" + user.profileColor)
-        }
-        if (user && user.image) {
-            const image = document.createElementNS("http://www.w3.org/2000/svg","image");
-            image.setAttribute("width", radius)
-            image.setAttribute("height", radius)
-            image.setAttribute("href", user.image)
-            image.setAttribute("clip-path", "circle("+Math.floor(radius/2)+")")
-            group.appendChild(image)
-        } else if (user && user.anonymous) {
-            const anonIconHead = document.createElementNS("http://www.w3.org/2000/svg","circle");
-            anonIconHead.setAttribute("cx", radius/2)
-            anonIconHead.setAttribute("cy", radius/2 - 2)
-            anonIconHead.setAttribute("r", 2.4)
-            anonIconHead.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
-            group.appendChild(anonIconHead)
-            const anonIconBody = document.createElementNS("http://www.w3.org/2000/svg","path");
-            anonIconBody.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
-            // anonIconBody.setAttribute("d",`M ${radius/2 - 4} ${radius/2 + 1} h 8 v4 h -8 z`);
-            anonIconBody.setAttribute("d",`M ${radius/2} ${radius/2 + 5} h -2.5 c -2 1 -2 -5 0.5 -4.5 c 2 1 2 1 4 0 c 2.5 -0.5  2.5 5.5  0 4.5  z`);
-            group.appendChild(anonIconBody)
-        } else {
-            const label = document.createElementNS("http://www.w3.org/2000/svg","text");
-            if (user.username || user.email) {
-                label.setAttribute("class","red-ui-multiplayer-annotation-label");
-                label.textContent = (user.username || user.email).substring(0,2)
-            } else {
-                label.setAttribute("class","red-ui-multiplayer-annotation-label red-ui-multiplayer-user-count")
-                label.textContent = 'nr'
-            }
-            label.setAttribute("text-anchor", "middle")
-            label.setAttribute("x",radius/2);
-            label.setAttribute("y",radius/2 + 3);
-            group.appendChild(label)
-        }
-        const border = document.createElementNS("http://www.w3.org/2000/svg","path");
-        border.setAttribute('d', shapePath)
-        border.setAttribute("class", "red-ui-multiplayer-annotation-border")
-        group.appendChild(border)
-        return group
-    }
-
-    return {
-        init: function () {
-
-            
-            
-            RED.view.annotations.register("red-ui-multiplayer",{
-                type: 'badge',
-                align: 'left',
-                class: "red-ui-multiplayer-annotation",
-                show: "_multiplayer",
-                refresh: "_multiplayer_refresh",
-                element: function(node) {
-                    const containerGroup = document.createElementNS("http://www.w3.org/2000/svg","g");
-                    containerGroup.setAttribute("transform","translate(0,-4)")
-                    if (node._multiplayer) {
-                        let y = 0
-                        for (let i = Math.min(1, node._multiplayer.users.length - 1); i >= 0; i--) {
-                            const user = sessions[node._multiplayer.users[i]].user
-                            const group = createAnnotationUser(user)
-                            group.setAttribute("transform","translate("+y+",0)")
-                            y += 15
-                            containerGroup.appendChild(group)
-                        }
-                        if (node._multiplayer.users.length > 2) {
-                            const group = createAnnotationUser('+'+(node._multiplayer.users.length - 2))
-                            group.setAttribute("transform","translate("+y+",0)")
-                            y += 12
-                            containerGroup.appendChild(group)
-                        }
-
-                    }
-                    return containerGroup;
-                },
-                tooltip: node => { return node._multiplayer.users.map(u => sessions[u].user.username).join('\n') }
-            });
-
-
-            // activeSessionId = RED.settings.getLocal('multiplayer:sessionId')
-            // if (!activeSessionId) {
-                activeSessionId = RED.nodes.id()
-            //     RED.settings.setLocal('multiplayer:sessionId', activeSessionId)
-            //     log('Session ID (new)', activeSessionId)
-            // } else {
-                log('Session ID', activeSessionId)
-            // }
-            
-            headerWidget = $('<li><ul id="red-ui-multiplayer-user-list"></ul></li>').prependTo('.red-ui-header-toolbar')
-
-            RED.comms.on('connect', () => {
-                const location = getLocation()
-                const connectInfo = {
-                    session: activeSessionId
-                }
-                if (location.workspace !== 0) {
-                    connectInfo.location = location
-                }
-                RED.comms.send('multiplayer/connect', connectInfo)
-            })
-            RED.comms.subscribe('multiplayer/#', (topic, msg) => {
-                log('recv', topic, msg)
-                if (topic === 'multiplayer/init') {
-                    // We have just reconnected, runtime has sent state to
-                    // initialise the world
-                    sessions = {}
-                    users = {}
-                    $('#red-ui-multiplayer-user-list').empty()
-
-                    msg.sessions.forEach(session => {
-                        addUserSession(session)
-                    })
-                } else if (topic === 'multiplayer/connection-added') {
-                    addUserSession(msg)
-                } else if (topic === 'multiplayer/connection-removed') {
-                    removeUserSession(msg.session, msg.disconnected)
-                } else if (topic === 'multiplayer/location') {
-                    const session = msg.session
-                    delete msg.session
-                    updateUserLocation(session, msg)
-                }
-            })
-
-            RED.events.on('workspace:change', (event) => {
-                getWorkspaceTray(event.workspace)
-                publishLocation()
-            })
-            RED.events.on('editor:open', () => {
-                publishLocation()
-            })
-            RED.events.on('editor:close', () => {
-                publishLocation()
-            })
-            RED.events.on('editor:change', () => {
-                publishLocation()
-            })
-            RED.events.on('login', () => {
-                publishLocation()
-            })
-            RED.events.on('flows:loaded', () => {
-                attachWorkspaceTrays()
-            })
-            RED.events.on('workspace:close', (event) => {
-                // A subflow tab has been closed. Need to mark its tray as detached
-                if (workspaceTrays[event.workspace]) {
-                    workspaceTrays[event.workspace].attached = false
-                }
-            })
-            RED.events.on('logout', () => {
-                const disconnectInfo = {
-                    session: activeSessionId
-                }
-                RED.comms.send('multiplayer/disconnect', disconnectInfo)
-                RED.settings.removeLocal('multiplayer:sessionId')
-            })
-            
-            const chart = $('#red-ui-workspace-chart')
-            chart.on('mousemove', function (evt) {
-                lastPosition[0] = evt.clientX
-                lastPosition[1] = evt.clientY
-                publishLocation()
-            })
-            chart.on('scroll', function (evt) {
-                publishLocation()
-            })
-            chart.on('mouseenter', function () {
-                isInWorkspace = true
-                publishLocation()
-            })
-            chart.on('mouseleave', function () {
-                isInWorkspace = false
-                publishLocation()
-            })
-        }
-    }
-
-    function log() {
-        if (RED.multiplayer.DEBUG) {
-            console.log('[multiplayer]', ...arguments)
-        }
-    }
-})();
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@ -73,13 +73,7 @@ RED.nodes = (function() {

        var exports = {
            setModulePendingUpdated: function(module,version) {
-                if (!!RED.plugins.getModule(module)) {
-                    // The module updated is a plugin
-                    RED.plugins.getModule(module).pending_version = version;
-                } else {
-                    moduleList[module].pending_version = version;
-                }
-
+                moduleList[module].pending_version = version;
                RED.events.emit("registry:module-updated",{module:module,version:version});
            },
            getModule: function(module) {
@ -97,31 +91,6 @@ RED.nodes = (function() {
            getNodeTypes: function() {
                return Object.keys(nodeDefinitions);
            },
-            /**
-             * Get an array of node definitions
-             * @param {Object} options - options object
-             * @param {boolean} [options.configOnly] - if true, only return config nodes
-             * @param {function} [options.filter] - a filter function to apply to the list of nodes
-             * @returns array of node definitions
-             */
-            getNodeDefinitions: function(options) {
-                const result = []
-                const configOnly = (options && options.configOnly)
-                const filter = (options && options.filter)
-                const keys = Object.keys(nodeDefinitions)
-                for (const key of keys) {
-                    const def = nodeDefinitions[key]
-                    if(!def) { continue }
-                    if (configOnly && def.category !== "config") {
-                            continue
-                    }
-                    if (filter && !filter(nodeDefinitions[key])) {
-                        continue
-                    }
-                    result.push(nodeDefinitions[key])
-                }
-                return result
-            },
            setNodeList: function(list) {
                nodeList = [];
                for(var i=0;i<list.length;i++) {
@ -155,8 +124,6 @@ RED.nodes = (function() {
            },
            removeNodeSet: function(id) {
                var ns = nodeSets[id];
-                if (!ns) { return {} }
-
                for (var j=0;j<ns.types.length;j++) {
                    delete typeToId[ns.types[j]];
                }
@ -707,15 +674,12 @@ RED.nodes = (function() {
            }
            n["_"] = RED._;
        }
-
-        // Both node and config node can use a config node
-        updateConfigNodeUsers(newNode, { action: "add" });
-
        if (n._def.category == "config") {
-            configNodes[n.id] = newNode;
+            configNodes[n.id] = n;
        } else {
            if (n.wires && (n.wires.length > n.outputs)) { n.outputs = n.wires.length; }
            n.dirty = true;
+            updateConfigNodeUsers(n);
            if (n._def.category == "subflows" && typeof n.i === "undefined") {
                var nextId = 0;
                RED.nodes.eachNode(function(node) {
@ -777,11 +741,9 @@ RED.nodes = (function() {
        var removedLinks = [];
        var removedNodes = [];
        var node;
-
        if (id in configNodes) {
            node = configNodes[id];
            delete configNodes[id];
-            updateConfigNodeUsers(node, { action: "remove" });
            RED.events.emit('nodes:remove',node);
            RED.workspaces.refresh();
        } else if (allNodes.hasNode(id)) {
@ -790,9 +752,6 @@ RED.nodes = (function() {
            delete nodeLinks[id];
            removedLinks = links.filter(function(l) { return (l.source === node) || (l.target === node); });
            removedLinks.forEach(removeLink);
-            updateConfigNodeUsers(node, { action: "remove" });
-
-            // TODO: Legacy code for exclusive config node
            var updatedConfigNode = false;
            for (var d in node._def.defaults) {
                if (node._def.defaults.hasOwnProperty(d)) {
@ -806,6 +765,10 @@ RED.nodes = (function() {
                                if (configNode._def.exclusive) {
                                    removeNode(node[d]);
                                    removedNodes.push(configNode);
+                                } else {
+                                    var users = configNode.users;
+                                    users.splice(users.indexOf(node),1);
+                                    RED.events.emit('nodes:change',configNode)
                                }
                            }
                        }
@ -1042,34 +1005,23 @@ RED.nodes = (function() {
        return {nodes:removedNodes,links:removedLinks, groups: removedGroups, junctions: removedJunctions};
    }

-    /**
-      * Add a Subflow to the Workspace
-      *
-      * @param {object} sf The Subflow to add.
-      * @param {boolean|undefined} createNewIds Whether to update the name.
-      */
    function addSubflow(sf, createNewIds) {
        if (createNewIds) {
-            // Update the Subflow name to highlight that this is a copy
-            const subflowNames = Object.keys(subflows).map(function (sfid) {
-                return subflows[sfid].name || "";
-            })
-            subflowNames.sort()
-
-            let copyNumber = 1;
-            let subflowName = sf.name;
-            subflowNames.forEach(function(name) {
-                if (subflowName == name) {
-                    subflowName = sf.name + " (" + copyNumber + ")";
-                    copyNumber++;
-                }
+            var subflowNames = Object.keys(subflows).map(function(sfid) {
+                return subflows[sfid].name;
            });

+            subflowNames.sort();
+            var copyNumber = 1;
+            var subflowName = sf.name;
+            subflowNames.forEach(function(name) {
+                if (subflowName == name) {
+                    copyNumber++;
+                    subflowName = sf.name+" ("+copyNumber+")";
+                }
+            });
            sf.name = subflowName;
        }
-
-        sf.instances = [];
-
        subflows[sf.id] = sf;
        allNodes.addTab(sf.id);
        linkTabMap[sf.id] = [];
@ -1122,7 +1074,7 @@ RED.nodes = (function() {
                module: "node-red"
            }
        });
-
+        sf.instances = [];
        sf._def = RED.nodes.getType("subflow:"+sf.id);
        RED.events.emit("subflows:add",sf);
    }
@ -1764,8 +1716,7 @@ RED.nodes = (function() {
            // Remove the old subflow definition - but leave the instances in place
            var removalResult = RED.subflow.removeSubflow(n.id, true);
            // Create the list of nodes for the new subflow def
-            // Need to sort the list in order to remove missing nodes
-            var subflowNodes = [n].concat(zMap[n.id]).filter((s) => !!s);
+            var subflowNodes = [n].concat(zMap[n.id]);
            // Import the new subflow - no clashes should occur as we've removed
            // the old version
            var result = importNodes(subflowNodes);
@ -1802,20 +1753,9 @@ RED.nodes = (function() {
        // Replace config nodes
        //
        configNodeIds.forEach(function(id) {
-            const configNode = getNode(id);
-            const currentUserCount = configNode.users;
-
-            // Add a snapshot of the Config Node
-            removedNodes = removedNodes.concat(convertNode(configNode));
-
-            // Remove the Config Node instance
+            removedNodes = removedNodes.concat(convertNode(getNode(id)));
            removeNode(id);
-
-            // Import the new one
-            importNodes([newConfigNodes[id]]);
-
-            // Re-attributes the user count
-            getNode(id).users = currentUserCount;
+            importNodes([newConfigNodes[id]])
        });

        return {
@ -2056,8 +1996,6 @@ RED.nodes = (function() {
                if (matchingSubflow) {
                    subflow_denylist[n.id] = matchingSubflow;
                } else {
-                    const oldId = n.id;
-
                    subflow_map[n.id] = n;
                    if (createNewIds || options.importMap[n.id] === "copy") {
                        nid = getID();
@ -2085,7 +2023,7 @@ RED.nodes = (function() {
                        n.status.id = getID();
                    }
                    new_subflows.push(n);
-                    addSubflow(n,createNewIds || options.importMap[oldId] === "copy");
+                    addSubflow(n,createNewIds || options.importMap[n.id] === "copy");
                }
            }
        }
@ -2099,8 +2037,6 @@ RED.nodes = (function() {
            activeWorkspace = RED.workspaces.active();
        }

-        const pendingConfigNodes = []
-        const pendingConfigNodeIds = new Set()
        // Find all config nodes and add them
        for (i=0;i<newNodes.length;i++) {
            n = newNodes[i];
@ -2160,8 +2096,7 @@ RED.nodes = (function() {
                        type:n.type,
                        info: n.info,
                        users:[],
-                        _config:{},
-                        _configNodeReferences: new Set()
+                        _config:{}
                    };
                    if (!n.z) {
                        delete configNode.z;
@ -2176,9 +2111,6 @@ RED.nodes = (function() {
                        if (def.defaults.hasOwnProperty(d)) {
                            configNode[d] = n[d];
                            configNode._config[d] = JSON.stringify(n[d]);
-                            if (def.defaults[d].type) {
-                                configNode._configNodeReferences.add(n[d])
-                            }
                        }
                    }
                    if (def.hasOwnProperty('credentials') && n.hasOwnProperty('credentials')) {
@ -2195,55 +2127,11 @@ RED.nodes = (function() {
                        configNode.id = getID();
                    }
                    node_map[n.id] = configNode;
-                    pendingConfigNodes.push(configNode);
-                    pendingConfigNodeIds.add(configNode.id)
+                    new_nodes.push(configNode);
                }
            }
        }

-        // We need to sort new_nodes (which only contains config nodes at this point)
-        // to ensure they get added in the right order. If NodeA depends on NodeB, then
-        // NodeB must be added first.
-        
-        // Limit us to 5 full iterations of the list - this should be more than
-        // enough to process the list as config->config node relationships are
-        // not very common
-        let iterationLimit = pendingConfigNodes.length * 5
-        const handledConfigNodes = new Set()
-        while (pendingConfigNodes.length > 0 && iterationLimit > 0) {
-            const node = pendingConfigNodes.shift()
-            let hasPending = false
-            // Loop through the nodes referenced by this node to see if anything
-            // is pending
-            node._configNodeReferences.forEach(id => {
-                if (pendingConfigNodeIds.has(id) && !handledConfigNodes.has(id)) {
-                    // This reference is for a node we know is in this import, but
-                    // it isn't added yet - flag as pending
-                    hasPending = true
-                }
-            })
-            if (!hasPending) {
-                // This node has no pending config node references - safe to add
-                delete node._configNodeReferences
-                new_nodes.push(node)
-                handledConfigNodes.add(node.id)
-            } else {
-                // This node has pending config node references
-                // Put to the back of the queue
-                pendingConfigNodes.push(node)
-            }
-            iterationLimit--
-        }
-        if (pendingConfigNodes.length > 0) {
-            // We exceeded the iteration count. Could be due to reference loops
-            // between the config nodes. At this point, just add the remaining
-            // nodes as-is
-            pendingConfigNodes.forEach(node => {
-                delete node._configNodeReferences
-                new_nodes.push(node)
-            })
-        }
-
        // Find regular flow nodes and subflow instances
        for (i=0;i<newNodes.length;i++) {
            n = newNodes[i];
@ -2255,7 +2143,7 @@ RED.nodes = (function() {
                        x:parseFloat(n.x || 0),
                        y:parseFloat(n.y || 0),
                        z:n.z,
-                        type: n.type,
+                        type:0,
                        info: n.info,
                        changed:false,
                        _config:{}
@ -2316,6 +2204,7 @@ RED.nodes = (function() {
                            }
                        }
                    }
+                    node.type = n.type;
                    node._def = def;
                    if (node.type === "group") {
                        node._def = RED.group.def;
@ -2345,15 +2234,6 @@ RED.nodes = (function() {
                                outputs: n.outputs|| (n.wires && n.wires.length) || 0,
                                set: registry.getNodeSet("node-red/unknown")
                            }
-                            var orig = {};
-                            for (var p in n) {
-                                if (n.hasOwnProperty(p) && p!="x" && p!="y" && p!="z" && p!="id" && p!="wires") {
-                                    orig[p] = n[p];
-                                }
-                            }
-                            node._orig = orig;
-                            node.name = n.type;
-                            node.type = "unknown";
                        } else {
                            if (subflow_denylist[parentId] || createNewIds || options.importMap[n.id] === "copy") {
                                parentId = subflow.id;
@ -2414,31 +2294,29 @@ RED.nodes = (function() {
                            node.type = "unknown";
                        }
                        if (node._def.category != "config") {
-                            if (n.hasOwnProperty('inputs') && node._def.defaults.hasOwnProperty("inputs")) {
-                                node.inputs = parseInt(n.inputs, 10);
+                            if (n.hasOwnProperty('inputs')) {
+                                node.inputs = n.inputs;
                                node._config.inputs = JSON.stringify(n.inputs);
                            } else {
                                node.inputs = node._def.inputs;
                            }
-                            if (n.hasOwnProperty('outputs') && node._def.defaults.hasOwnProperty("outputs")) {
-                                node.outputs = parseInt(n.outputs, 10);
+                            if (n.hasOwnProperty('outputs')) {
+                                node.outputs = n.outputs;
                                node._config.outputs = JSON.stringify(n.outputs);
                            } else {
                                node.outputs = node._def.outputs;
                            }
-
-                            // The node declares outputs in its defaults, but has not got a valid value
-                            // Defer to the length of the wires array
-                            if (node.hasOwnProperty('wires')) {
-                                if (isNaN(node.outputs)) {
-                                    node.outputs = node.wires.length;
-                                } else if (node.wires.length > node.outputs) {
+                            if (node.hasOwnProperty('wires') && node.wires.length > node.outputs) {
+                                if (!node._def.defaults.hasOwnProperty("outputs") || !isNaN(parseInt(n.outputs))) {
                                    // If 'wires' is longer than outputs, clip wires
-                                    console.log("Warning: node.wires longer than node.outputs - trimming wires:", node.id, " wires:", node.wires.length, " outputs:", node.outputs);
-                                    node.wires = node.wires.slice(0, node.outputs);
+                                    console.log("Warning: node.wires longer than node.outputs - trimming wires:",node.id," wires:",node.wires.length," outputs:",node.outputs);
+                                    node.wires = node.wires.slice(0,node.outputs);
+                                } else {
+                                    // The node declares outputs in its defaults, but has not got a valid value
+                                    // Defer to the length of the wires array
+                                    node.outputs = node.wires.length;
                                }
                            }
-
                            for (d in node._def.defaults) {
                                if (node._def.defaults.hasOwnProperty(d) && d !== 'inputs' && d !== 'outputs') {
                                    node[d] = n[d];
@ -2501,28 +2379,11 @@ RED.nodes = (function() {
            } else {
                delete n.g
            }
-            // If importing a link node, ensure both ends of each link are either:
-            // - not in a subflow
-            // - both in the same subflow (not for link call node)
-            if (/^link /.test(n.type) && n.links) {
+            // If importing into a subflow, ensure an outbound-link doesn't get added
+            if (activeSubflow && /^link /.test(n.type) && n.links) {
                n.links = n.links.filter(function(id) {
                    const otherNode = node_map[id] || RED.nodes.node(id);
-                    if (!otherNode) {
-                        // Cannot find other end - remove the link
-                        return false
-                    }
-                    if (otherNode.z === n.z) {
-                        // Both ends in the same flow/subflow
-                        return true
-                    } else if (n.type === "link call" && !getSubflow(otherNode.z)) {
-                        // Link call node can call out of a subflow as long as otherNode is
-                        // not in a subflow
-                        return true
-                    } else if (!!getSubflow(n.z) || !!getSubflow(otherNode.z)) {
-                        // One end is in a subflow - remove the link
-                        return false
-                    }
-                    return true
+                    return (otherNode && otherNode.z === activeWorkspace);
                });
            }
            for (var d3 in n._def.defaults) {
@ -2535,6 +2396,11 @@ RED.nodes = (function() {
                        nodeList = nodeList.map(function(id) {
                            var node = node_map[id];
                            if (node) {
+                                if (node._def.category === 'config') {
+                                    if (node.users.indexOf(n) === -1) {
+                                        node.users.push(n);
+                                    }
+                                }
                                return node.id;
                            }
                            return id;
@ -2548,11 +2414,9 @@ RED.nodes = (function() {
            n = new_subflows[i];
            n.in.forEach(function(input) {
                input.wires.forEach(function(wire) {
-                    if (node_map.hasOwnProperty(wire.id)) {
-                        var link = {source:input, sourcePort:0, target:node_map[wire.id]};
-                        addLink(link);
-                        new_links.push(link);
-                    }
+                    var link = {source:input, sourcePort:0, target:node_map[wire.id]};
+                    addLink(link);
+                    new_links.push(link);
                });
                delete input.wires;
            });
@ -2561,13 +2425,11 @@ RED.nodes = (function() {
                    var link;
                    if (subflow_map[wire.id] && subflow_map[wire.id].id == n.id) {
                        link = {source:n.in[wire.port], sourcePort:wire.port,target:output};
-                    } else if (node_map.hasOwnProperty(wire.id) || subflow_map.hasOwnProperty(wire.id)) {
+                    } else {
                        link = {source:node_map[wire.id]||subflow_map[wire.id], sourcePort:wire.port,target:output};
                    }
-                    if (link) {
-                        addLink(link);
-                        new_links.push(link);
-                    }
+                    addLink(link);
+                    new_links.push(link);
                });
                delete output.wires;
            });
@ -2576,13 +2438,11 @@ RED.nodes = (function() {
                    var link;
                    if (subflow_map[wire.id] && subflow_map[wire.id].id == n.id) {
                        link = {source:n.in[wire.port], sourcePort:wire.port,target:n.status};
-                    } else if (node_map.hasOwnProperty(wire.id) || subflow_map.hasOwnProperty(wire.id)) {
+                    } else {
                        link = {source:node_map[wire.id]||subflow_map[wire.id], sourcePort:wire.port,target:n.status};
                    }
-                    if (link) {
-                        addLink(link);
-                        new_links.push(link);
-                    }
+                    addLink(link);
+                    new_links.push(link);
                });
                delete n.status.wires;
            }
@ -2761,79 +2621,25 @@ RED.nodes = (function() {
        return result;
    }

-    /**
-     * Update any config nodes referenced by the provided node to ensure
-     * their 'users' list is correct.
-     *
-     * @param {object} node The node in which to check if it contains references
-     * @param {object} options Options to apply.
-     * @param {"add" | "remove"} [options.action] Add or remove the node from
-     * the Config Node users list. Default `add`.
-     * @param {boolean} [options.emitEvent] Emit the `nodes:changes` event.
-     * Default true.
-     */
-    function updateConfigNodeUsers(node, options) {
-        const defaultOptions = { action: "add", emitEvent: true };
-        options = Object.assign({}, defaultOptions, options);
-
-        for (var d in node._def.defaults) {
-            if (node._def.defaults.hasOwnProperty(d)) {
-                var property = node._def.defaults[d];
+    // Update any config nodes referenced by the provided node to ensure their 'users' list is correct
+    function updateConfigNodeUsers(n) {
+        for (var d in n._def.defaults) {
+            if (n._def.defaults.hasOwnProperty(d)) {
+                var property = n._def.defaults[d];
                if (property.type) {
                    var type = registry.getNodeType(property.type);
-                    // Need to ensure the type is a config node to not treat links nodes
                    if (type && type.category == "config") {
-                        var configNode = configNodes[node[d]];
+                        var configNode = configNodes[n[d]];
                        if (configNode) {
-                            if (options.action === "add") {
-                                if (configNode.users.indexOf(node) === -1) {
-                                    configNode.users.push(node);
-                                    if (options.emitEvent) {
-                                        RED.events.emit('nodes:change', configNode);
-                                    }
-                                }
-                            } else if (options.action === "remove") {
-                                if (configNode.users.indexOf(node) !== -1) {
-                                    const users = configNode.users;
-                                    users.splice(users.indexOf(node), 1);
-                                    if (options.emitEvent) {
-                                        RED.events.emit('nodes:change', configNode);
-                                    }
-                                }
+                            if (configNode.users.indexOf(n) === -1) {
+                                configNode.users.push(n);
+                                RED.events.emit('nodes:change',configNode)
                            }
                        }
                    }
                }
            }
        }
-
-        // Subflows can have config node env
-        if (node.type.indexOf("subflow:") === 0) {
-            node.env?.forEach((prop) => {
-                if (prop.type === "conf-type" && prop.value) {
-                    // Add the node to the config node users
-                    const configNode = getNode(prop.value);
-                    if (configNode) {
-                        if (options.action === "add") {
-                            if (configNode.users.indexOf(node) === -1) {
-                                configNode.users.push(node);
-                                if (options.emitEvent) {
-                                    RED.events.emit('nodes:change', configNode);
-                                }
-                            }
-                        } else if (options.action === "remove") {
-                            if (configNode.users.indexOf(node) !== -1) {
-                                const users = configNode.users;
-                                users.splice(users.indexOf(node), 1);
-                                if (options.emitEvent) {
-                                    RED.events.emit('nodes:change', configNode);
-                                }
-                            }
-                        }
-                    }
-                }
-            });
-        }
    }

    function flowVersion(version) {
--- a/packages/node_modules/@node-red/editor-client/src/js/plugins.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/plugins.js
@ -1,7 +1,6 @@
 RED.plugins = (function() {
    var plugins = {};
    var pluginsByType = {};
-    var moduleList = {};

    function registerPlugin(id,definition) {
        plugins[id] = definition;
@ -39,43 +38,9 @@ RED.plugins = (function() {
    function getPluginsByType(type) {
        return pluginsByType[type] || [];
    }
-
-    function setPluginList(list) {
-        for(let i=0;i<list.length;i++) {
-            let p = list[i];
-            addPlugin(p);
-        }
-    }
-
-    function addPlugin(p) {
-
-        moduleList[p.module] = moduleList[p.module] || {
-            name:p.module,
-            version:p.version,
-            local:p.local,
-            sets:{},
-            plugin: true,
-            id: p.id
-        };
-        if (p.pending_version) {
-            moduleList[p.module].pending_version = p.pending_version;
-        }
-        moduleList[p.module].sets[p.name] = p;
-
-        RED.events.emit("registry:plugin-module-added",p.module);
-    }
-
-    function getModule(module) {
-        return moduleList[module];
-    }
-
    return {
        registerPlugin: registerPlugin,
        getPlugin: getPlugin,
-        getPluginsByType: getPluginsByType,
-
-        setPluginList: setPluginList,
-        addPlugin: addPlugin,
-        getModule: getModule
+        getPluginsByType: getPluginsByType
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@ -25,7 +25,6 @@ var RED = (function() {
            cache: false,
            url: 'plugins',
            success: function(data) {
-                RED.plugins.setPluginList(data);
                loader.reportProgress(RED._("event.loadPlugins"), 13)
                RED.i18n.loadPluginCatalogs(function() {
                    loadPlugins(function() {
@ -298,7 +297,6 @@ var RED = (function() {
                                RED.workspaces.show(workspaces[0]);
                            }
                        }
-                        RED.events.emit('flows:loaded')
                    } catch(err) {
                        console.warn(err);
                        RED.notify(
@ -536,41 +534,6 @@ var RED = (function() {
                RED.view.redrawStatus(node);
            }
        });
-        RED.comms.subscribe("notification/plugin/#",function(topic,msg) {
-            if (topic == "notification/plugin/added") {
-                RED.settings.refreshSettings(function(err, data) {
-                    let addedPlugins = [];
-                    msg.forEach(function(m) {
-                        let id = m.id;
-                        RED.plugins.addPlugin(m);
-
-                        m.plugins.forEach((p) => {
-                            addedPlugins.push(p.id);
-                        })
-
-                        RED.i18n.loadNodeCatalog(id, function() {
-                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
-                            $.ajax({
-                                headers: {
-                                    "Accept":"text/html",
-                                    "Accept-Language": lang
-                                },
-                                cache: false,
-                                url: 'plugins/'+id,
-                                success: function(data) {
-                                    appendPluginConfig(data);
-                                }
-                            });
-                        });
-                    });
-                    if (addedPlugins.length) {
-                        let pluginList = "<ul><li>"+addedPlugins.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                        // ToDo: Adapt notification (node -> plugin)
-                        RED.notify(RED._("palette.event.nodeAdded", {count:addedPlugins.length})+pluginList,"success");
-                    }
-                })
-            }
-        });

        let pendingNodeRemovedNotifications = []
        let pendingNodeRemovedTimeout
@ -840,10 +803,6 @@ var RED = (function() {

        RED.nodes.init();
        RED.runtime.init()
-
-        if (RED.settings.theme("multiplayer.enabled",false)) {
-            RED.multiplayer.init()
-        }
        RED.comms.connect();

        $("#red-ui-main-container").show();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js
@ -205,9 +205,7 @@ RED.actionList = (function() {
    }

    function init() {
-        if (RED.settings.theme("menu.menu-item-action-list", true)) {
-            RED.actions.add("core:show-action-list",show);
-        }
+        RED.actions.add("core:show-action-list",show);

        RED.events.on("editor:open",function() { disabled = true; });
        RED.events.on("editor:close",function() { disabled = false; });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@ -26,7 +26,6 @@ RED.clipboard = (function() {
    var currentPopoverError;
    var activeTab;
    var libraryBrowser;
-    var clipboardTabs;

    var activeLibraries = {};

@ -216,13 +215,6 @@ RED.clipboard = (function() {
                open: function( event, ui ) {
                    RED.keyboard.disable();
                },
-                beforeClose: function(e) {
-                    if (clipboardTabs && activeTab === "red-ui-clipboard-dialog-export-tab-clipboard") {
-                        const jsonTabIndex = clipboardTabs.getTabIndex('red-ui-clipboard-dialog-export-tab-clipboard-json')
-                        const activeTabIndex = clipboardTabs.activeIndex()
-                        RED.settings.set("editor.dialog.export.json-view", activeTabIndex === jsonTabIndex )
-                    }
-                },
                close: function(e) {
                    RED.keyboard.enable();
                    if (popover) {
@ -236,23 +228,12 @@ RED.clipboard = (function() {

        exportNodesDialog =
            '<div class="form-row">'+
-                '<div style="display: flex; justify-content: space-between;">'+
-                    '<div class="form-row">'+
-                        '<label style="width:auto;margin-right: 10px;" data-i18n="common.label.export"></label>'+
-                        '<span id="red-ui-clipboard-dialog-export-rng-group" class="button-group">'+
-                            '<a id="red-ui-clipboard-dialog-export-rng-selected" class="red-ui-button toggle" href="#" data-i18n="clipboard.export.selected"></a>'+
-                            '<a id="red-ui-clipboard-dialog-export-rng-flow" class="red-ui-button toggle" href="#" data-i18n="clipboard.export.current"></a>'+
-                            '<a id="red-ui-clipboard-dialog-export-rng-full" class="red-ui-button toggle" href="#" data-i18n="clipboard.export.all"></a>'+
-                        '</span>'+
-                    '</div>'+
-                    '<div class="form-row">'+
-                        '<label style="width:auto;margin-right: 10px;" data-i18n="common.label.format"></label>'+
-                        '<span id="red-ui-clipboard-dialog-export-fmt-group" class="button-group">'+
-                            '<a id="red-ui-clipboard-dialog-export-fmt-mini" class="red-ui-button red-ui-button toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
-                            '<a id="red-ui-clipboard-dialog-export-fmt-full" class="red-ui-button red-ui-button toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
-                        '</span>'+
-                    '</div>'+
-                '</div>'+
+                '<label style="width:auto;margin-right: 10px;" data-i18n="common.label.export"></label>'+
+                '<span id="red-ui-clipboard-dialog-export-rng-group" class="button-group">'+
+                    '<a id="red-ui-clipboard-dialog-export-rng-selected" class="red-ui-button toggle" href="#" data-i18n="clipboard.export.selected"></a>'+
+                    '<a id="red-ui-clipboard-dialog-export-rng-flow" class="red-ui-button toggle" href="#" data-i18n="clipboard.export.current"></a>'+
+                    '<a id="red-ui-clipboard-dialog-export-rng-full" class="red-ui-button toggle" href="#" data-i18n="clipboard.export.all"></a>'+
+                '</span>'+
            '</div>'+
            '<div class="red-ui-clipboard-dialog-box">'+
                '<div class="red-ui-clipboard-dialog-tabs">'+
@ -267,9 +248,15 @@ RED.clipboard = (function() {
                            '<div id="red-ui-clipboard-dialog-export-tab-clipboard-preview-list"></div>'+
                        '</div>'+
                        '<div class="red-ui-clipboard-dialog-export-tab-clipboard-tab" id="red-ui-clipboard-dialog-export-tab-clipboard-json">'+
-                            '<div class="form-row" style="height:calc(100% - 10px)">'+
+                            '<div class="form-row" style="height:calc(100% - 40px)">'+
                                '<textarea readonly id="red-ui-clipboard-dialog-export-text"></textarea>'+
                            '</div>'+
+                            '<div class="form-row" style="text-align: right;">'+
+                                '<span id="red-ui-clipboard-dialog-export-fmt-group" class="button-group">'+
+                                    '<a id="red-ui-clipboard-dialog-export-fmt-mini" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
+                                    '<a id="red-ui-clipboard-dialog-export-fmt-full" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
+                                '</span>'+
+                            '</div>'+
                        '</div>'+
                    '</div>'+
                    '<div class="form-row" id="red-ui-clipboard-dialog-export-tab-library-filename">'+
@ -334,30 +321,6 @@ RED.clipboard = (function() {
        },100);
    }

-    /**
-     * Validates if the provided string looks like valid flow json
-     * @param {string} flowString the string to validate
-     * @returns If valid, returns the node array
-     */
-    function validateFlowString(flowString) {
-        const res = JSON.parse(flowString)
-        if (!Array.isArray(res)) {
-            throw new Error(RED._("clipboard.import.errors.notArray"));
-        }
-        for (let i = 0; i < res.length; i++) {
-            if (typeof res[i] !== "object") {
-                throw new Error(RED._("clipboard.import.errors.itemNotObject",{index:i}));
-            }
-            if (!Object.hasOwn(res[i], 'id')) {
-                throw new Error(RED._("clipboard.import.errors.missingId",{index:i}));
-            }
-            if (!Object.hasOwn(res[i], 'type')) {
-                throw new Error(RED._("clipboard.import.errors.missingType",{index:i}));
-            }
-        }
-        return res
-    }
-
    var validateImportTimeout;
    function validateImport() {
        if (activeTab === "red-ui-clipboard-dialog-import-tab-clipboard") {
@ -375,7 +338,21 @@ RED.clipboard = (function() {
                    return;
                }
                try {
-                    validateFlowString(v)
+                    if (!/^\[[\s\S]*\]$/m.test(v)) {
+                        throw new Error(RED._("clipboard.import.errors.notArray"));
+                    }
+                    var res = JSON.parse(v);
+                    for (var i=0;i<res.length;i++) {
+                        if (typeof res[i] !== "object") {
+                            throw new Error(RED._("clipboard.import.errors.itemNotObject",{index:i}));
+                        }
+                        if (!res[i].hasOwnProperty('id')) {
+                            throw new Error(RED._("clipboard.import.errors.missingId",{index:i}));
+                        }
+                        if (!res[i].hasOwnProperty('type')) {
+                            throw new Error(RED._("clipboard.import.errors.missingType",{index:i}));
+                        }
+                    }
                    currentPopoverError = null;
                    popover.close(true);
                    importInput.removeClass("input-error");
@ -592,7 +569,7 @@ RED.clipboard = (function() {

        dialogContainer.empty();
        dialogContainer.append($(exportNodesDialog));
-        clipboardTabs = null
+
        var tabs = RED.tabs.create({
            id: "red-ui-clipboard-dialog-export-tabs",
            vertical: true,
@ -653,7 +630,7 @@ RED.clipboard = (function() {
        $("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
        $("#red-ui-clipboard-dialog-export").button("enable");

-        clipboardTabs = RED.tabs.create({
+        var clipboardTabs = RED.tabs.create({
            id: "red-ui-clipboard-dialog-export-tab-clipboard-tabs",
            onchange: function(tab) {
                $(".red-ui-clipboard-dialog-export-tab-clipboard-tab").hide();
@ -670,9 +647,6 @@ RED.clipboard = (function() {
            id: "red-ui-clipboard-dialog-export-tab-clipboard-json",
            label: RED._("editor.types.json")
        });
-        if (RED.settings.get("editor.dialog.export.json-view") === true) {
-            clipboardTabs.activateTab("red-ui-clipboard-dialog-export-tab-clipboard-json");
-        }

        var previewList = $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").css({position:"absolute",top:0,right:0,bottom:0,left:0}).treeList({
            data: []
@ -1008,16 +982,16 @@ RED.clipboard = (function() {
    }

    function importNodes(nodesStr,addFlow) {
-        let newNodes = nodesStr;
+        var newNodes = nodesStr;
        if (typeof nodesStr === 'string') {
            try {
                nodesStr = nodesStr.trim();
                if (nodesStr.length === 0) {
                    return;
                }
-                newNodes = validateFlowString(nodesStr)
+                newNodes = JSON.parse(nodesStr);
            } catch(err) {
-                const e = new Error(RED._("clipboard.invalidFlow",{message:err.message}));
+                var e = new Error(RED._("clipboard.invalidFlow",{message:err.message}));
                e.code = "NODE_RED";
                throw e;
            }
@ -1352,7 +1326,6 @@ RED.clipboard = (function() {
                            }
                        }
                    } catch(err) {
-                        console.warn('Import failed: ', err)
                        // Ensure any errors throw above doesn't stop the drop target from
                        // being hidden.
                    }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js
@ -61,7 +61,7 @@
            }
            this.menu = RED.popover.menu({
                tabSelect: true,
-                width: Math.max(300, this.element.width()),
+                width: 300,
                maxHeight: 200,
                class: "red-ui-autoComplete-container",
                options: completions,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@ -174,24 +174,12 @@
                this.uiContainer.width(m[1]);
            }
            if (this.options.sortable) {
-                var isCanceled = false; // Flag to track if an item has been canceled from being dropped into a different list
-                var noDrop = false; // Flag to track if an item is being dragged into a different list
                var handle = (typeof this.options.sortable === 'string')?
                                this.options.sortable :
                                ".red-ui-editableList-item-handle";
                var sortOptions = {
                    axis: "y",
                    update: function( event, ui ) {
-                        // dont trigger update if the item is being canceled
-                        const targetList = $(event.target);
-                        const draggedItem = ui.item;
-                        const draggedItemParent = draggedItem.parent();
-                        if (!targetList.is(draggedItemParent) && draggedItem.hasClass("red-ui-editableList-item-constrained")) {
-                            noDrop = true;
-                        }
-                        if (isCanceled || noDrop) {
-                            return;
-                        }
                        if (that.options.sortItems) {
                            that.options.sortItems(that.items());
                        }
@ -201,32 +189,8 @@
                    tolerance: "pointer",
                    forcePlaceholderSize:true,
                    placeholder: "red-ui-editabelList-item-placeholder",
-                    start: function (event, ui) {
-                        isCanceled = false;
-                        ui.placeholder.height(ui.item.height() - 4);
-                        ui.item.css('cursor', 'grabbing'); // TODO: this doesn't seem to work, use a class instead?
-                    },
-                    stop: function (event, ui) {
-                        ui.item.css('cursor', 'auto');
-                    },
-                    receive: function (event, ui) {
-                        if (ui.item.hasClass("red-ui-editableList-item-constrained")) {
-                            isCanceled = true;
-                            $(ui.sender).sortable('cancel');
-                        }
-                    },
-                    over: function (event, ui) {
-                        // if the dragged item is constrained, prevent it from being dropped into a different list
-                        const targetList = $(event.target);
-                        const draggedItem = ui.item;
-                        const draggedItemParent = draggedItem.parent();
-                        if (!targetList.is(draggedItemParent) && draggedItem.hasClass("red-ui-editableList-item-constrained")) {
-                            noDrop = true;
-                            draggedItem.css('cursor', 'no-drop'); // TODO: this doesn't seem to work, use a class instead?
-                        } else {
-                            noDrop = false;
-                            draggedItem.css('cursor', 'grabbing'); // TODO: this doesn't seem to work, use a class instead?
-                        }
+                    start: function(e, ui){
+                        ui.placeholder.height(ui.item.height()-4);
                    }
                };
                if (this.options.connectWith) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@ -211,7 +211,7 @@ RED.popover = (function() {
                        closePopup(true);
                    });
                }
-                if (/*trigger === 'hover' && */options.interactive) {
+                if (trigger === 'hover' && options.interactive) {
                    div.on('mouseenter', function(e) {
                        clearTimeout(timer);
                        active = true;
@ -445,12 +445,9 @@ RED.popover = (function() {

    return {
        create: createPopover,
-        tooltip: function(target,content, action, interactive) {
+        tooltip: function(target,content, action) {
            var label = function() {
                var label = content;
-                if (typeof content === 'function') {
-                    label = content()
-                }
                if (action) {
                    var shortcut = RED.keyboard.getShortcut(action);
                    if (shortcut && shortcut.key) {
@ -466,7 +463,6 @@ RED.popover = (function() {
                size: "small",
                direction: "bottom",
                content: label,
-                interactive,
                delay: { show: 750, hide: 50 }
            });
            popover.setContent = function(newContent) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@ -365,10 +365,7 @@ RED.tabs = (function() {

            var thisTabA = thisTab.find("a");
            if (options.onclick) {
-                options.onclick(tabs[thisTabA.attr('href').slice(1)], evt);
-                if (evt.isDefaultPrevented() && evt.isPropagationStopped()) {
-                    return false
-                }
+                options.onclick(tabs[thisTabA.attr('href').slice(1)]);
            }
            activateTab(thisTabA);
            if (fireSelectionChanged) {
@ -551,8 +548,6 @@ RED.tabs = (function() {
        ul.find("li.red-ui-tab a")
            .on("mousedown", function(evt) { mousedownTab = evt.currentTarget })
            .on("mouseup",onTabClick)
-            // prevent browser-default middle-click behaviour
-            .on("auxclick", function(evt) { evt.preventDefault() })
            .on("click", function(evt) {evt.preventDefault(); })
            .on("dblclick", function(evt) {evt.stopPropagation(); evt.preventDefault(); })

@ -821,8 +816,6 @@ RED.tabs = (function() {
                }
                link.on("mousedown", function(evt) { mousedownTab = evt.currentTarget })
                link.on("mouseup",onTabClick);
-                // prevent browser-default middle-click behaviour
-                link.on("auxclick", function(evt) { evt.preventDefault() })
                link.on("click", function(evt) { evt.preventDefault(); })
                link.on("dblclick", function(evt) { evt.stopPropagation(); evt.preventDefault(); })

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@ -54,27 +54,25 @@
        return icon;
    }

-    function getMatch(value, searchValue) {
-        const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
-        const len = idx > -1 ? searchValue.length : 0;
-        return {
-            index: idx,
-            found: idx > -1,
-            pre: value.substring(0,idx),
-            match: value.substring(idx,idx+len),
-            post: value.substring(idx+len),
-            exact: idx === 0 && value.length === searchValue.length
+    var autoComplete = function(options) {
+        function getMatch(value, searchValue) {
+            const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
+            const len = idx > -1 ? searchValue.length : 0;
+            return {
+                index: idx,
+                found: idx > -1,
+                pre: value.substring(0,idx),
+                match: value.substring(idx,idx+len),
+                post: value.substring(idx+len),
+            }
+        }
+        function generateSpans(match) {
+            const els = [];
+            if(match.pre) { els.push($('<span/>').text(match.pre)); }
+            if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
+            if(match.post) { els.push($('<span/>').text(match.post)); }
+            return els;
        }
-    }
-    function generateSpans(match) {
-        const els = [];
-        if(match.pre) { els.push($('<span/>').text(match.pre)); }
-        if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
-        if(match.post) { els.push($('<span/>').text(match.post)); }
-        return els;
-    }
-    
-    const msgAutoComplete = function(options) {
        return function(val) {
            var matches = [];
            options.forEach(opt => {
@ -84,7 +82,7 @@
                const srcMatch = getMatch(optSrc, val);
                if (valMatch.found || srcMatch.found) {
                    const element = $('<div>',{style: "display: flex"});
-                    const valEl = $('<div/>',{ class: "red-ui-autoComplete-completion" });
+                    const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
                    valEl.append(generateSpans(valMatch));
                    valEl.appendTo(element);
                    if (optSrc) {
@ -104,210 +102,6 @@
        }
    }

-    function getEnvVars (obj, envVars = {}) {
-        contextKnownKeys.env = contextKnownKeys.env || {}
-        if (contextKnownKeys.env[obj.id]) {
-            return contextKnownKeys.env[obj.id]
-        }
-        let parent
-        if (obj.type === 'tab' || obj.type === 'subflow') {
-            RED.nodes.eachConfig(function (conf) {
-                if (conf.type === "global-config") {
-                    parent = conf;
-                }
-            })
-        } else if (obj.g) {
-            parent = RED.nodes.group(obj.g)
-        } else if (obj.z) {
-            parent = RED.nodes.workspace(obj.z) || RED.nodes.subflow(obj.z)
-        }
-        if (parent) {
-            getEnvVars(parent, envVars)
-        }
-        if (obj.env) {
-            obj.env.forEach(env => {
-                envVars[env.name] = obj
-            })
-        }
-        contextKnownKeys.env[obj.id] = envVars
-        return envVars
-    }
-
-    const envAutoComplete = function (val) {
-        const editStack = RED.editor.getEditStack()
-        if (editStack.length === 0) {
-            done([])
-            return
-        }
-        const editingNode = editStack.pop()
-        if (!editingNode) {
-            return []
-        }
-        const envVarsMap = getEnvVars(editingNode)
-        const envVars = Object.keys(envVarsMap)
-        const matches = []
-        const i = val.lastIndexOf('${')
-        let searchKey = val
-        let isSubkey = false
-        if (i > -1) {
-            if (val.lastIndexOf('}') < i) {
-                searchKey = val.substring(i+2)
-                isSubkey = true
-            }
-        }
-        envVars.forEach(v => {
-            let valMatch = getMatch(v, searchKey);
-            if (valMatch.found) {
-                const optSrc = envVarsMap[v]
-                const element = $('<div>',{style: "display: flex"});
-                const valEl = $('<div/>',{ class: "red-ui-autoComplete-completion" });
-                valEl.append(generateSpans(valMatch))
-                valEl.appendTo(element)
-
-                if (optSrc) {
-                    const optEl = $('<div>').css({ "font-size": "0.8em" });
-                    let label
-                    if (optSrc.type === 'global-config') {
-                        label = RED._('sidebar.context.global')
-                    } else if (optSrc.type === 'group') {
-                        label = RED.utils.getNodeLabel(optSrc) || (RED._('sidebar.info.group') + ': '+optSrc.id)
-                    } else {
-                        label = RED.utils.getNodeLabel(optSrc) || optSrc.id
-                    }
-
-                    optEl.append(generateSpans({ match: label }));
-                    optEl.appendTo(element);
-                }
-                matches.push({
-                    value: isSubkey ? val + v + '}' : v,
-                    label: element,
-                    i: valMatch.index
-                });
-            }
-        })
-        matches.sort(function(A,B){return A.i-B.i})
-        return matches
-    }
-
-    let contextKnownKeys = {}
-    let contextCache = {}
-    if (RED.events) {
-        RED.events.on("editor:close", function () {
-            contextCache = {}
-            contextKnownKeys = {}
-        });
-    }
-
-    const contextAutoComplete = function() {
-        const that = this
-        const getContextKeysFromRuntime = function(scope, store, searchKey, done) {
-            contextKnownKeys[scope] = contextKnownKeys[scope] || {}
-            contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Map()
-            if (searchKey.length > 0) {
-                try {
-                    RED.utils.normalisePropertyExpression(searchKey)
-                } catch (err) {
-                    // Not a valid context key, so don't try looking up
-                    done()
-                    return
-                }
-            }
-            const url = `context/${scope}/${encodeURIComponent(searchKey)}?store=${store}&keysOnly`
-            if (contextCache[url]) {
-                // console.log('CACHED', url)
-                done()
-            } else {
-                // console.log('GET', url)
-                $.getJSON(url, function(data) {
-                    // console.log(data)
-                    contextCache[url] = true
-                    const result = data[store] || {}
-                    const keys = result.keys || []
-                    const keyPrefix = searchKey + (searchKey.length > 0 ? '.' : '')
-                    keys.forEach(keyInfo => {
-                        const key = keyInfo.key
-                        if (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(key)) {
-                            contextKnownKeys[scope][store].set(keyPrefix + key, keyInfo)
-                        } else {
-                            contextKnownKeys[scope][store].set(searchKey + "[\""+key.replace(/"/,"\\\"")+"\"]", keyInfo)
-                        }                        
-                    })
-                    done()
-                })
-            }
-        }
-        const getContextKeys = function(key, done) {
-            const keyParts = key.split('.')
-            const partialKey = keyParts.pop()
-            let scope = that.propertyType
-            if (scope === 'flow') {
-                // Get the flow id of the node we're editing
-                const editStack = RED.editor.getEditStack()
-                if (editStack.length === 0) {
-                    done(new Map())
-                    return
-                }
-                const editingNode = editStack.pop()
-                if (editingNode.z) {
-                    scope = `${scope}/${editingNode.z}`
-                } else {
-                    done(new Map())
-                    return
-                }
-            }
-            const store = (contextStoreOptions.length === 1) ? contextStoreOptions[0].value : that.optionValue
-            const searchKey = keyParts.join('.')
-           
-            getContextKeysFromRuntime(scope, store, searchKey, function() {
-                if (contextKnownKeys[scope][store].has(key) || key.endsWith(']')) {
-                    getContextKeysFromRuntime(scope, store, key, function() {
-                        done(contextKnownKeys[scope][store])
-                    })
-                }
-                done(contextKnownKeys[scope][store])
-            })
-        }
-
-        return function(val, done) {
-            getContextKeys(val, function (keys) {
-                const matches = []
-                keys.forEach((keyInfo, v) => {
-                    let optVal = v
-                    let valMatch = getMatch(optVal, val);
-                    if (!valMatch.found && val.length > 0) {
-                        if (val.endsWith('.')) {
-                            // Search key ends in '.' - but doesn't match. Check again
-                            // with [" at the end instead so we match bracket notation
-                            valMatch = getMatch(optVal, val.substring(0, val.length - 1) + '["')
-                        // } else if (val.endsWith('[') && /^array/.test(keyInfo.format)) {
-                        //     console.log('this case')
-                        }
-                    }
-                    if (valMatch.found) {
-                        const element = $('<div>',{style: "display: flex"});
-                        const valEl = $('<div/>',{ class: "red-ui-autoComplete-completion" });
-                        // if (keyInfo.format) {
-                        //     valMatch.post += ' ' + keyInfo.format
-                        // }
-                        if (valMatch.exact && /^array/.test(keyInfo.format)) {
-                            valMatch.post += `[0-${keyInfo.length}]`
-                            optVal +=  '['
-
-                        }
-                        valEl.append(generateSpans(valMatch))
-                        valEl.appendTo(element)
-                        matches.push({
-                            value: optVal,
-                            label: element,
-                        });
-                    }
-                })
-                matches.sort(function(a, b) { return a.value.localeCompare(b.value) });
-                done(matches);
-            })
-        }
-    }
-
    // This is a hand-generated list of completions for the core nodes (based on the node help html).
    var msgCompletions = [
        { value: "payload" },
@ -372,93 +166,68 @@
        { value: "_session", source: ["websocket out","tcp out"] },
    ]
    var allOptions = {
-        msg: { value: "msg", label: "msg.", validate: RED.utils.validatePropertyExpression, autoComplete: msgAutoComplete(msgCompletions) },
-        flow: { value: "flow", label: "flow.", hasValue: true,
-            options: [],
-            validate: RED.utils.validatePropertyExpression,
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
+        flow: {value:"flow",label:"flow.",hasValue:true,
+            options:[],
+            validate:RED.utils.validatePropertyExpression,
            parse: contextParse,
            export: contextExport,
-            valueLabel: contextLabel,
-            autoComplete: contextAutoComplete
+            valueLabel: contextLabel
        },
-        global: {
-            value: "global", label: "global.", hasValue: true,
-            options: [],
-            validate: RED.utils.validatePropertyExpression,
+        global: {value:"global",label:"global.",hasValue:true,
+            options:[],
+            validate:RED.utils.validatePropertyExpression,
            parse: contextParse,
            export: contextExport,
-            valueLabel: contextLabel,
-            autoComplete: contextAutoComplete
+            valueLabel: contextLabel
        },
-        str: { value: "str", label: "string", icon: "red/images/typedInput/az.svg" },
-        num: { value: "num", label: "number", icon: "red/images/typedInput/09.svg", validate: function (v, o) {
-            return RED.utils.validateTypedProperty(v, "num", o);
+        str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
+        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate: function(v) {
+            return (true === RED.utils.validateTypedProperty(v, "num"));
        } },
-        bool: { value: "bool", label: "boolean", icon: "red/images/typedInput/bool.svg", options: ["true", "false"] },
+        bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg",options:["true","false"]},
        json: {
-            value: "json",
-            label: "JSON",
-            icon: "red/images/typedInput/json.svg",
-            validate: function (v, o) {
-                return RED.utils.validateTypedProperty(v, "json", o);
-            },
-            expand: function () {
+            value:"json",
+            label:"JSON",
+            icon:"red/images/typedInput/json.svg",
+            validate: function(v) { try{JSON.parse(v);return true;}catch(e){return false;}},
+            expand: function() {
                var that = this;
                var value = this.value();
                try {
-                    value = JSON.stringify(JSON.parse(value), null, 4);
-                } catch (err) {
+                    value = JSON.stringify(JSON.parse(value),null,4);
+                } catch(err) {
                }
                RED.editor.editJSON({
                    value: value,
                    stateId: RED.editor.generateViewStateId("typedInput", that, "json"),
                    focus: true,
-                    complete: function (v) {
+                    complete: function(v) {
                        var value = v;
                        try {
                            value = JSON.stringify(JSON.parse(v));
-                        } catch (err) {
+                        } catch(err) {
                        }
                        that.value(value);
                    }
                })
            }
        },
-        re: { value: "re", label: "regular expression", icon: "red/images/typedInput/re.svg" },
-        date: {
-            value: "date",
-            label: "timestamp",
-            icon: "fa fa-clock-o",
-            options: [
-                {
-                    label: 'milliseconds since epoch',
-                    value: ''
-                },
-                {
-                    label: 'YYYY-MM-DDTHH:mm:ss.sssZ',
-                    value: 'iso'
-                },
-                {
-                    label: 'JavaScript Date Object',
-                    value: 'object'
-                }
-            ]
-        },
+        re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.svg"},
+        date: {value:"date",label:"timestamp",icon:"fa fa-clock-o",hasValue:false},
        jsonata: {
            value: "jsonata",
            label: "expression",
            icon: "red/images/typedInput/expr.svg",
-            validate: function (v, o) {
-                return RED.utils.validateTypedProperty(v, "jsonata", o);
-            },
-            expand: function () {
+            validate: function(v) { try{jsonata(v);return true;}catch(e){return false;}},
+            expand:function() {
                var that = this;
                RED.editor.editExpression({
-                    value: this.value().replace(/\t/g, "\n"),
+                    value: this.value().replace(/\t/g,"\n"),
                    stateId: RED.editor.generateViewStateId("typedInput", that, "jsonata"),
                    focus: true,
-                    complete: function (v) {
-                        that.value(v.replace(/\n/g, "\t"));
+                    complete: function(v) {
+                        that.value(v.replace(/\n/g,"\t"));
                    }
                })
            }
@ -467,13 +236,13 @@
            value: "bin",
            label: "buffer",
            icon: "red/images/typedInput/bin.svg",
-            expand: function () {
+            expand: function() {
                var that = this;
                RED.editor.editBuffer({
                    value: this.value(),
                    stateId: RED.editor.generateViewStateId("typedInput", that, "bin"),
                    focus: true,
-                    complete: function (v) {
+                    complete: function(v) {
                        that.value(v);
                    }
                })
@ -482,16 +251,15 @@
        env: {
            value: "env",
            label: "env variable",
-            icon: "red/images/typedInput/env.svg",
-            autoComplete: envAutoComplete
+            icon: "red/images/typedInput/env.svg"
        },
        node: {
            value: "node",
            label: "node",
            icon: "red/images/typedInput/target.svg",
-            valueLabel: function (container, value) {
+            valueLabel: function(container,value) {
                var node = RED.nodes.node(value);
-                var nodeDiv = $('<div>', { class: "red-ui-search-result-node" }).css({
+                var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).css({
                    "margin-top": "2px",
                    "margin-left": "3px"
                }).appendTo(container);
@ -500,190 +268,133 @@
                    "margin-left": "6px"
                }).appendTo(container);
                if (node) {
-                    var colour = RED.utils.getNodeColor(node.type, node._def);
-                    var icon_url = RED.utils.getNodeIcon(node._def, node);
+                    var colour = RED.utils.getNodeColor(node.type,node._def);
+                    var icon_url = RED.utils.getNodeIcon(node._def,node);
                    if (node.type === 'tab') {
                        colour = "#C0DEED";
                    }
-                    nodeDiv.css('backgroundColor', colour);
-                    var iconContainer = $('<div/>', { class: "red-ui-palette-icon-container" }).appendTo(nodeDiv);
+                    nodeDiv.css('backgroundColor',colour);
+                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                    RED.utils.createIconElement(icon_url, iconContainer, true);
-                    var l = RED.utils.getNodeLabel(node, node.id);
+                    var l = RED.utils.getNodeLabel(node,node.id);
                    nodeLabel.text(l);
                } else {
                    nodeDiv.css({
                        'backgroundColor': '#eee',
-                        'border-style': 'dashed'
+                        'border-style' : 'dashed'
                    });

                }
            },
-            expand: function () {
+            expand: function() {
                var that = this;
                RED.tray.hide();
                RED.view.selectNodes({
                    single: true,
                    selected: [that.value()],
-                    onselect: function (selection) {
+                    onselect: function(selection) {
                        that.value(selection.id);
                        RED.tray.show();
                    },
-                    oncancel: function () {
+                    oncancel: function() {
                        RED.tray.show();
                    }
                })
            }
        },
-        cred: {
-            value: "cred",
-            label: "credential",
-            icon: "fa fa-lock",
+        cred:{
+            value:"cred",
+            label:"credential",
+            icon:"fa fa-lock",
            inputType: "password",
-            valueLabel: function (container, value) {
+            valueLabel: function(container,value) {
                var that = this;
-                container.css("pointer-events", "none");
-                container.css("flex-grow", 0);
+                container.css("pointer-events","none");
+                container.css("flex-grow",0);
                this.elementDiv.hide();
                var buttons = $('<div>').css({
                    position: "absolute",
-                    right: "6px",
+                    right:"6px",
                    top: "6px",
-                    "pointer-events": "all"
+                    "pointer-events":"all"
                }).appendTo(container);
                var eyeButton = $('<button type="button" class="red-ui-button red-ui-button-small"></button>').css({
-                    width: "20px"
-                }).appendTo(buttons).on("click", function (evt) {
+                    width:"20px"
+                }).appendTo(buttons).on("click", function(evt) {
                    evt.preventDefault();
                    var cursorPosition = that.input[0].selectionStart;
                    var currentType = that.input.attr("type");
                    if (currentType === "text") {
-                        that.input.attr("type", "password");
+                        that.input.attr("type","password");
                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
-                        setTimeout(function () {
+                        setTimeout(function() {
                            that.input.focus();
                            that.input[0].setSelectionRange(cursorPosition, cursorPosition);
-                        }, 50);
+                        },50);
                    } else {
-                        that.input.attr("type", "text");
+                        that.input.attr("type","text");
                        eyeCon.removeClass("fa-eye").addClass("fa-eye-slash");
-                        setTimeout(function () {
+                        setTimeout(function() {
                            that.input.focus();
                            that.input[0].setSelectionRange(cursorPosition, cursorPosition);
-                        }, 50);
+                        },50);
                    }
                }).hide();
-                var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left", "-2px").appendTo(eyeButton);
+                var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left","-2px").appendTo(eyeButton);

                if (value === "__PWRD__") {
                    var innerContainer = $('<div><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i></div>').css({
-                        padding: "6px 6px",
-                        borderRadius: "4px"
+                        padding:"6px 6px",
+                        borderRadius:"4px"
                    }).addClass("red-ui-typedInput-value-label-inactive").appendTo(container);
-                    var editButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-pencil"></i></button>').appendTo(buttons).on("click", function (evt) {
+                    var editButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-pencil"></i></button>').appendTo(buttons).on("click", function(evt) {
                        evt.preventDefault();
                        innerContainer.hide();
-                        container.css("background", "none");
-                        container.css("pointer-events", "none");
+                        container.css("background","none");
+                        container.css("pointer-events","none");
                        that.input.val("");
                        that.element.val("");
                        that.elementDiv.show();
                        editButton.hide();
                        cancelButton.show();
                        eyeButton.show();
-                        setTimeout(function () {
+                        setTimeout(function() {
                            that.input.focus();
-                        }, 50);
+                        },50);
                    });
-                    var cancelButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-times"></i></button>').css("margin-left", "3px").appendTo(buttons).on("click", function (evt) {
+                    var cancelButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-times"></i></button>').css("margin-left","3px").appendTo(buttons).on("click", function(evt) {
                        evt.preventDefault();
                        innerContainer.show();
-                        container.css("background", "");
+                        container.css("background","");
                        that.input.val("__PWRD__");
                        that.element.val("__PWRD__");
                        that.elementDiv.hide();
                        editButton.show();
                        cancelButton.hide();
                        eyeButton.hide();
-                        that.input.attr("type", "password");
+                        that.input.attr("type","password");
                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");

                    }).hide();
                } else {
-                    container.css("background", "none");
-                    container.css("pointer-events", "none");
+                    container.css("background","none");
+                    container.css("pointer-events","none");
                    this.elementDiv.show();
                    eyeButton.show();
                }
            }
-        },
-        'conf-types': {
-            value: "conf-types",
-            label: "config",
-            icon: "fa fa-cog",
-            // hasValue: false,
-            valueLabel: function (container, value) {
-                // get the selected option (for access to the "name" and "module" properties)
-                const _options = this._optionsCache || this.typeList.find(opt => opt.value === value)?.options || []
-                const selectedOption = _options.find(opt => opt.value === value) || {
-                    title: '',
-                    name: '',
-                    module: ''
-                }
-                container.attr("title", selectedOption.title) // set tooltip to the full path/id of the module/node
-                container.text(selectedOption.name) // apply the "name" of the selected option
-                // set "line-height" such as to make the "name" appear further up, giving room for the "module" to be displayed below the value
-                container.css("line-height", "1.4em")
-                // add the module name in smaller, lighter font below the value
-                $('<div></div>').text(selectedOption.module).css({
-                    // "font-family": "var(--red-ui-monospace-font)",
-                    color: "var(--red-ui-tertiary-text-color)",
-                    "font-size": "0.8em",
-                    "line-height": "1em",
-                    opacity: 0.8
-                }).appendTo(container);
-            },
-            // hasValue: false,
-            options: function () {
-                if (this._optionsCache) {
-                    return this._optionsCache
-                }
-                const configNodes = RED.nodes.registry.getNodeDefinitions({configOnly: true, filter: (def) => def.type !== "global-config"}).map((def) => {
-                    // create a container with with 2 rows (row 1 for the name, row 2 for the module name in smaller, lighter font)
-                    const container = $('<div style="display: flex; flex-direction: column; justify-content: space-between; row-gap: 1px;">')
-                    const row1Name = $('<div>').text(def.type)
-                    const row2Module = $('<div style="font-size: 0.8em; color: var(--red-ui-tertiary-text-color);">').text(def.set.module)
-                    container.append(row1Name, row2Module)
-        
-                    return {
-                        value: def.type,
-                        name: def.type,
-                        enabled: def.set.enabled ?? true,
-                        local: def.set.local,
-                        title: def.set.id, // tooltip e.g. "node-red-contrib-foo/bar"
-                        module: def.set.module,
-                        icon: container[0].outerHTML.trim(), // the typeInput will interpret this as html text and render it in the anchor
-                    }
-                })
-                this._optionsCache = configNodes
-                return configNodes
-            }
        }
    };

-    
    // For a type with options, check value is a valid selection
    // If !opt.multiple, returns the valid option object
    // if opt.multiple, returns an array of valid option objects
    // If not valid, returns null;

    function isOptionValueValid(opt, currentVal) {
-        let _options = opt.options
-        if (typeof _options === "function") {
-            _options = _options.call(this)
-        }
        if (!opt.multiple) {
-            for (var i=0;i<_options.length;i++) {
-                op = _options[i];
+            for (var i=0;i<opt.options.length;i++) {
+                op = opt.options[i];
                if (typeof op === "string" && op === currentVal) {
                    return {value:currentVal}
                } else if (op.value === currentVal) {
@ -700,8 +411,8 @@
                    currentValues[v] = true;
                }
            });
-            for (var i=0;i<_options.length;i++) {
-                op = _options[i];
+            for (var i=0;i<opt.options.length;i++) {
+                op = opt.options[i];
                var val = typeof op === "string" ? op : op.value;
                if (currentValues.hasOwnProperty(val)) {
                    delete currentValues[val];
@ -716,7 +427,6 @@
    }

    var nlsd = false;
-    let contextStoreOptions;

    $.widget( "nodered.typedInput", {
        _create: function() {
@ -728,7 +438,7 @@
                    }
                }
                var contextStores = RED.settings.context.stores;
-                contextStoreOptions = contextStores.map(function(store) {
+                var contextOptions = contextStores.map(function(store) {
                    return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
                }).sort(function(A,B) {
                    if (A.value === RED.settings.context.default) {
@ -739,17 +449,13 @@
                        return A.value.localeCompare(B.value);
                    }
                })
-                if (contextStoreOptions.length < 2) {
+                if (contextOptions.length < 2) {
                    allOptions.flow.options = [];
                    allOptions.global.options = [];
                } else {
-                    allOptions.flow.options = contextStoreOptions;
-                    allOptions.global.options = contextStoreOptions;
+                    allOptions.flow.options = contextOptions;
+                    allOptions.global.options = contextOptions;
                }
-                // Translate timestamp options
-                allOptions.date.options.forEach(opt => {
-                    opt.label = RED._("typedInput.date.format." + (opt.value || 'timestamp'), {defaultValue: opt.label})
-                })
            }
            nlsd = true;
            var that = this;
@ -838,7 +544,7 @@
                that.element.trigger('paste',evt);
            });
            this.input.on('keydown', function(evt) {
-                if (that.typeMap[that.propertyType].autoComplete || that.input.hasClass('red-ui-autoComplete')) {
+                if (that.typeMap[that.propertyType].autoComplete) {
                    return
                }
                if (evt.keyCode >= 37 && evt.keyCode <= 40) {
@ -1132,9 +838,7 @@
            if (this.optionMenu) {
                this.optionMenu.remove();
            }
-            if (this.menu) {
-                this.menu.remove();
-            }
+            this.menu.remove();
            this.uiSelect.remove();
        },
        types: function(types) {
@ -1167,7 +871,7 @@
            this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
            if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                if (!firstCall) {
-                    this.type(this.typeList[0]?.value || ""); // permit empty typeList
+                    this.type(this.typeList[0].value);
                }
            } else {
                this.propertyType = null;
@ -1204,11 +908,6 @@
                var selectedOption = [];
                var valueToCheck = value;
                if (opt.options) {
-                    let _options = opt.options
-                    if (typeof opt.options === "function") {
-                        _options = opt.options.call(this)
-                    }
-
                    if (opt.hasValue && opt.parse) {
                        var parts = opt.parse(value);
                        if (this.options.debug) { console.log(this.identifier,"new parse",parts) }
@ -1222,8 +921,8 @@
                        checkValues = valueToCheck.split(",");
                    }
                    checkValues.forEach(function(valueToCheck) {
-                        for (var i=0;i<_options.length;i++) {
-                            var op = _options[i];
+                        for (var i=0;i<opt.options.length;i++) {
+                            var op = opt.options[i];
                            if (typeof op === "string") {
                                if (op === valueToCheck || op === ""+valueToCheck) {
                                    selectedOption.push(that.activeOptions[op]);
@ -1258,7 +957,7 @@
        },
        type: function(type) {
            if (!arguments.length) {
-                return this.propertyType || this.options?.default || '';
+                return this.propertyType;
            } else {
                var that = this;
                if (this.options.debug) { console.log(this.identifier,"----- SET TYPE -----",type) }
@ -1268,9 +967,6 @@
                    // If previousType is !null, then this is a change of the type, rather than the initialisation
                    var previousType = this.typeMap[this.propertyType];
                    previousValue = this.input.val();
-                    if (this.input.hasClass('red-ui-autoComplete')) {
-                        this.input.autoComplete("destroy");
-                    }

                    if (previousType && this.typeChanged) {
                        if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
@ -1317,9 +1013,7 @@
                            this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
                        }
                        if (previousType.autoComplete) {
-                            if (this.input.hasClass('red-ui-autoComplete')) {
-                                this.input.autoComplete("destroy");
-                            }
+                            this.input.autoComplete("destroy");
                        }
                    }
                    this.propertyType = type;
@ -1359,10 +1053,6 @@
                        this.optionMenu = null;
                    }
                    if (opt.options) {
-                        let _options = opt.options
-                        if (typeof _options === "function") {
-                            _options = opt.options.call(this);
-                        }
                        if (this.optionExpandButton) {
                            this.optionExpandButton.hide();
                            this.optionExpandButton.shown = false;
@ -1379,7 +1069,7 @@
                                this.valueLabelContainer.hide();
                            }
                            this.activeOptions = {};
-                            _options.forEach(function(o) {
+                            opt.options.forEach(function(o) {
                                if (typeof o === 'string') {
                                    that.activeOptions[o] = {label:o,value:o};
                                } else {
@ -1399,7 +1089,7 @@
                                    if (validValues) {
                                        that._updateOptionSelectLabel(validValues)
                                    } else {
-                                        op = _options[0] || {value:""}; // permit zero options
+                                        op = opt.options[0];
                                        if (typeof op === "string") {
                                            this.value(op);
                                            that._updateOptionSelectLabel({value:op});
@ -1418,7 +1108,7 @@
                                    that._updateOptionSelectLabel(validValues);
                                }
                            } else {
-                                var selectedOption = this.optionValue||_options[0];
+                                var selectedOption = this.optionValue||opt.options[0];
                                if (opt.parse) {
                                    var selectedOptionObj = typeof selectedOption === "string"?{value:selectedOption}:selectedOption
                                    var parts = opt.parse(this.input.val(),selectedOptionObj);
@ -1451,18 +1141,8 @@
                                } else {
                                    this.optionSelectTrigger.hide();
                                }
-                                if (opt.autoComplete) {
-                                    let searchFunction = opt.autoComplete
-                                    if (searchFunction.length === 0) {
-                                        searchFunction = opt.autoComplete.call(this)
-                                    }
-                                    this.input.autoComplete({
-                                        search: searchFunction,
-                                        minLength: 0
-                                    })
-                                }
                            }
-                            this.optionMenu = this._createMenu(_options,opt,function(v){
+                            this.optionMenu = this._createMenu(opt.options,opt,function(v){
                                if (!opt.multiple) {
                                    that._updateOptionSelectLabel(that.activeOptions[v]);
                                    if (!opt.hasValue) {
@ -1503,12 +1183,8 @@
                            this.valueLabelContainer.hide();
                            this.elementDiv.show();
                            if (opt.autoComplete) {
-                                let searchFunction = opt.autoComplete
-                                if (searchFunction.length === 0) {
-                                    searchFunction = opt.autoComplete.call(this)
-                                }
                                this.input.autoComplete({
-                                    search: searchFunction,
+                                    search: opt.autoComplete,
                                    minLength: 0
                                })
                            }
@ -1557,49 +1233,26 @@
                }
            }
        },
-        validate: function(options) {
-            let valid = true;
-            const value = this.value();
-            const type = this.type();
+        validate: function() {
+            var result;
+            var value = this.value();
+            var type = this.type();
            if (this.typeMap[type] && this.typeMap[type].validate) {
-                const validate = this.typeMap[type].validate;
-                if (typeof validate === 'function') {
-                    valid = validate(value, {});
+                var val = this.typeMap[type].validate;
+                if (typeof val === 'function') {
+                    result = val(value);
                } else {
-                    // Regex
-                    valid = validate.test(value);
-                    if (!valid) {
-                        valid = RED._("validator.errors.invalid-regexp");
-                    }
-                }
-            }
-            if ((typeof valid === "string") || !valid) {
-                this.element.addClass("input-error");
-                this.uiSelect.addClass("input-error");
-                if (typeof valid === "string") {
-                    let tooltip = this.element.data("tooltip");
-                    if (tooltip) {
-                        tooltip.setContent(valid);
-                    } else {
-                        const target = this.typeMap[type]?.options ? this.optionSelectLabel : this.elementDiv;
-                        tooltip = RED.popover.tooltip(target, valid);
-                        this.element.data("tooltip", tooltip);
-                    }
+                    result = val.test(value);
                }
            } else {
-                this.element.removeClass("input-error");
-                this.uiSelect.removeClass("input-error");
-                const tooltip = this.element.data("tooltip");
-                if (tooltip) {
-                    this.element.data("tooltip", null);
-                    tooltip.delete();
-                }
+                result = true;
            }
-            if (options?.returnErrorMessage === true) {
-                return valid;
+            if (result) {
+                this.uiSelect.removeClass('input-error');
+            } else {
+                this.uiSelect.addClass('input-error');
            }
-            // Must return a boolean for no 3.x validator
-            return (typeof valid === "string") ? false : valid;
+            return result;
        },
        show: function() {
            this.uiSelect.show();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@ -32,44 +32,39 @@ RED.contextMenu = (function () {
            const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
            let hasGroup, isAllGroups = true, hasDisabledNode, hasEnabledNode, hasLabeledNode, hasUnlabeledNode;
            if (hasSelection) {
-                const nodes = selection.nodes.slice();
-                while (nodes.length) {
-                    const n = nodes.shift();
+                selection.nodes.forEach(n => {
                    if (n.type === 'group') {
                        hasGroup = true;
-                        nodes.push(...n.nodes);
                    } else {
                        isAllGroups = false;
-                        if (n.d) {
-                            hasDisabledNode = true;
-                        } else {
-                            hasEnabledNode = true;
-                        }
+                    }
+                    if (n.d) {
+                        hasDisabledNode = true;
+                    } else {
+                        hasEnabledNode = true;
                    }
                    if (n.l === undefined || n.l) {
                        hasLabeledNode = true;
                    } else {
                        hasUnlabeledNode = true;
                    }
-                }
+                });
            }
-
-            const scale = RED.view.scale()
            const offset = $("#red-ui-workspace-chart").offset()
-            let addX = (options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()) / scale
-            let addY = (options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()) / scale
+
+            let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
+            let addY = options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()

            if (RED.view.snapGrid) {
                const gridSize = RED.view.gridSize()
-                addX = gridSize * Math.round(addX / gridSize)
-                addY = gridSize * Math.round(addY / gridSize)
+                addX = gridSize * Math.floor(addX / gridSize)
+                addY = gridSize * Math.floor(addY / gridSize)
            }

-            if (RED.settings.theme("menu.menu-item-action-list", true)) {
-                menuItems.push(
-                    { onselect: 'core:show-action-list', label: RED._("contextMenu.showActionList"), onpostselect: function () { } }
-                )
-            }
+            menuItems.push(
+                { onselect: 'core:show-action-list', label: RED._("contextMenu.showActionList"), onpostselect: function () { } }
+            )
+
            const insertOptions = []
            menuItems.push({ label: RED._("contextMenu.insert"), options: insertOptions })
            insertOptions.push(
@ -87,9 +82,7 @@ RED.contextMenu = (function () {
                },
                (hasLinks) ? { // has least 1 wire selected
                    label: RED._("contextMenu.junction"),
-                    onselect: function () {
-                        RED.actions.invoke('core:split-wires-with-junctions', { x: addX, y: addY })
-                    },
+                    onselect: 'core:split-wires-with-junctions',
                    disabled: !canEdit || !hasLinks
                } : {
                    label: RED._("contextMenu.junction"),
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@ -34,8 +34,6 @@ RED.deploy = (function() {

    var currentDiff = null;

-    var activeBackgroundDeployNotification;
-
    function changeDeploymentType(type) {
        deploymentType = type;
        $("#red-ui-header-button-deploy-icon").attr("src",deploymentTypes[type].img);
@ -44,7 +42,6 @@ RED.deploy = (function() {
    /**
     * options:
     *   type: "default" - Button with drop-down options - no further customisation available
-     *      label: the text to display - default: "Deploy"
     *   type: "simple"  - Button without dropdown. Customisations:
     *      label: the text to display - default: "Deploy"
     *      icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg"
@ -52,20 +49,19 @@ RED.deploy = (function() {
    function init(options) {
        options = options || {};
        var type = options.type || "default";
-        var label = options.label || RED._("deploy.deploy");

        if (type == "default") {
            $('<li><span class="red-ui-deploy-button-group button-group">'+
              '<a id="red-ui-header-button-deploy" class="red-ui-deploy-button disabled" href="#">'+
                '<span class="red-ui-deploy-button-content">'+
                 '<img id="red-ui-header-button-deploy-icon" src="red/images/deploy-full-o.svg"> '+
-                 '<span>'+label+'</span>'+
+                 '<span>'+RED._("deploy.deploy")+'</span>'+
                '</span>'+
                '<span class="red-ui-deploy-button-spinner hide">'+
                 '<img src="red/images/spin.svg"/>'+
                '</span>'+
              '</a>'+
-              '<a id="red-ui-header-button-deploy-options" class="red-ui-deploy-button" href="#"><i class="fa fa-caret-down"></i><i class="fa fa-lock"></i></a>'+
+              '<a id="red-ui-header-button-deploy-options" class="red-ui-deploy-button" href="#"><i class="fa fa-caret-down"></i></a>'+
              '</span></li>').prependTo(".red-ui-header-toolbar");
            const mainMenuItems = [
                    {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
@ -80,6 +76,7 @@ RED.deploy = (function() {
            mainMenuItems.push({id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"})
            RED.menu.init({id:"red-ui-header-button-deploy-options", options: mainMenuItems });
        } else if (type == "simple") {
+            var label = options.label || RED._("deploy.deploy");
            var icon = 'red/images/deploy-full-o.svg';
            if (options.hasOwnProperty('icon')) {
                icon = options.icon;
@ -115,80 +112,53 @@ RED.deploy = (function() {
            RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
        }

-        window.addEventListener('beforeunload', function (event) {
-            if (RED.nodes.dirty()) {
-                event.preventDefault();
-                event.stopImmediatePropagation()
-                event.returnValue = RED._("deploy.confirm.undeployedChanges");
-                return
-            }
-        })
+

        RED.events.on('workspace:dirty',function(state) {
-            if (RED.settings.user?.permissions === 'read') {
-                return
-            }
            if (state.dirty) {
-                // window.onbeforeunload = function() {
-                //     return 
-                // }
+                window.onbeforeunload = function() {
+                    return RED._("deploy.confirm.undeployedChanges");
+                }
                $("#red-ui-header-button-deploy").removeClass("disabled");
            } else {
-                // window.onbeforeunload = null;
+                window.onbeforeunload = null;
                $("#red-ui-header-button-deploy").addClass("disabled");
            }
        });

+        var activeNotifyMessage;
        RED.comms.subscribe("notification/runtime-deploy",function(topic,msg) {
-            var currentRev = RED.nodes.version();
-            if (currentRev === null || deployInflight || currentRev === msg.revision) {
-                return;
-            }
-            if (activeBackgroundDeployNotification?.hidden && !activeBackgroundDeployNotification?.closed) {
-                activeBackgroundDeployNotification.showNotification()
-                return
-            }
-            const message = $('<p>').text(RED._('deploy.confirm.backgroundUpdate'));
-            const options = {
-                id: 'background-update',
-                type: 'compact',
-                modal: false,
-                fixed: true,
-                timeout: 10000,
-                buttons: [
-                    {
-                        text: RED._('deploy.confirm.button.review'),
-                        class: "primary",
-                        click: function() {
-                            activeBackgroundDeployNotification.hideNotification();
-                            var nns = RED.nodes.createCompleteNodeSet();
-                            resolveConflict(nns,false);
+            if (!activeNotifyMessage) {
+                var currentRev = RED.nodes.version();
+                if (currentRev === null || deployInflight || currentRev === msg.revision) {
+                    return;
+                }
+                var message = $('<p>').text(RED._('deploy.confirm.backgroundUpdate'));
+                activeNotifyMessage = RED.notify(message,{
+                    modal: true,
+                    fixed: true,
+                    buttons: [
+                        {
+                            text: RED._('deploy.confirm.button.ignore'),
+                            click: function() {
+                                activeNotifyMessage.close();
+                                activeNotifyMessage = null;
+                            }
+                        },
+                        {
+                            text: RED._('deploy.confirm.button.review'),
+                            class: "primary",
+                            click: function() {
+                                activeNotifyMessage.close();
+                                var nns = RED.nodes.createCompleteNodeSet();
+                                resolveConflict(nns,false);
+                                activeNotifyMessage = null;
+                            }
                        }
-                    }
-                ]
-            }
-            if (!activeBackgroundDeployNotification || activeBackgroundDeployNotification.closed) {
-                activeBackgroundDeployNotification = RED.notify(message, options)
-            } else {
-                activeBackgroundDeployNotification.update(message, options)
+                    ]
+                });
            }
        });
-
-
-        updateLockedState()
-        RED.events.on('login', updateLockedState)
-    }
-
-    function updateLockedState() {
-        if (RED.settings.user?.permissions === 'read') {
-            $(".red-ui-deploy-button-group").addClass("readOnly");
-            $("#red-ui-header-button-deploy").addClass("disabled");
-        } else {
-            $(".red-ui-deploy-button-group").removeClass("readOnly");
-            if (RED.nodes.dirty()) {
-                $("#red-ui-header-button-deploy").removeClass("disabled");
-            }
-        }
    }

    function getNodeInfo(node) {
@ -243,11 +213,7 @@ RED.deploy = (function() {
                class: "primary disabled",
                click: function() {
                    if (!$("#red-ui-deploy-dialog-confirm-deploy-review").hasClass('disabled')) {
-                        RED.diff.showRemoteDiff(null, {
-                            onmerge: function () {
-                                activeBackgroundDeployNotification.close()
-                            }
-                        });
+                        RED.diff.showRemoteDiff();
                        conflictNotification.close();
                    }
                }
@ -260,7 +226,6 @@ RED.deploy = (function() {
                    if (!$("#red-ui-deploy-dialog-confirm-deploy-merge").hasClass('disabled')) {
                        RED.diff.mergeDiff(currentDiff);
                        conflictNotification.close();
-                        activeBackgroundDeployNotification.close()
                    }
                }
            }
@ -273,7 +238,6 @@ RED.deploy = (function() {
                click: function() {
                    save(true,activeDeploy);
                    conflictNotification.close();
-                    activeBackgroundDeployNotification.close()
                }
            })
        }
@ -284,17 +248,21 @@ RED.deploy = (function() {
            buttons: buttons
        });

+        var now = Date.now();
        RED.diff.getRemoteDiff(function(diff) {
+            var ellapsed = Math.max(1000 - (Date.now()-now), 0);
            currentDiff = diff;
-            conflictCheck.hide();
-            var d = Object.keys(diff.conflicts);
-            if (d.length === 0) {
-                conflictAutoMerge.show();
-                $("#red-ui-deploy-dialog-confirm-deploy-merge").removeClass('disabled')
-            } else {
-                conflictManualMerge.show();
-            }
-            $("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled')
+            setTimeout(function() {
+                conflictCheck.hide();
+                var d = Object.keys(diff.conflicts);
+                if (d.length === 0) {
+                    conflictAutoMerge.show();
+                    $("#red-ui-deploy-dialog-confirm-deploy-merge").removeClass('disabled')
+                } else {
+                    conflictManualMerge.show();
+                }
+                $("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled')
+            },ellapsed);
        })
    }
    function cropList(list) {
@ -425,15 +393,11 @@ RED.deploy = (function() {
            const unknownNodes = [];
            const invalidNodes = [];

-            const isDisabled = function (node) {
-                return (node.d || RED.nodes.workspace(node.z)?.disabled);
-            };
-
            RED.nodes.eachConfig(function (node) {
                if (node.valid === undefined) {
                    RED.editor.validateNode(node);
                }
-                if (!node.valid && !isDisabled(node)) {
+                if (!node.valid && !node.d) {
                    invalidNodes.push(getNodeInfo(node));
                }
                if (node.type === "unknown") {
@ -443,7 +407,7 @@ RED.deploy = (function() {
                }
            });
            RED.nodes.eachNode(function (node) {
-                if (!node.valid && !isDisabled(node)) {
+                if (!node.valid && !node.d) {
                    invalidNodes.push(getNodeInfo(node));
                }
                if (node.type === "unknown") {
@ -457,7 +421,7 @@ RED.deploy = (function() {

            const unusedConfigNodes = [];
            RED.nodes.eachConfig(function (node) {
-                if ((node._def.hasUsers !== false) && (node.users.length === 0) && !isDisabled(node)) {
+                if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
                    unusedConfigNodes.push(getNodeInfo(node));
                    hasUnusedConfig = true;
                }
@ -594,9 +558,7 @@ RED.deploy = (function() {
                RED.notify('<p>' + RED._("deploy.successfulDeploy") + '</p>', "success");
            }
            const flowsToLock = new Set()
-            // Node's properties cannot be modified if its workspace is locked.
            function ensureUnlocked(id) {
-                // TODO: `RED.nodes.subflow` is useless
                const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
                const isLocked = flow ? flow.locked : false;
                if (flow && isLocked) {
@ -649,7 +611,6 @@ RED.deploy = (function() {
                    delete confNode.credentials;
                }
            });
-            // Subflow cannot be locked
            RED.nodes.eachSubflow(function (subflow) {
                if (subflow.changed) {
                    subflow.changed = false;
@ -658,18 +619,12 @@ RED.deploy = (function() {
            });
            RED.nodes.eachWorkspace(function (ws) {
                if (ws.changed || ws.added) {
-                    // Ensure the Workspace is unlocked to modify its properties.
-                    ensureUnlocked(ws.id);
+                    ensureUnlocked(ws.z)
                    ws.changed = false;
                    delete ws.added
-                    if (flowsToLock.has(ws)) {
-                        ws.locked = true;
-                        flowsToLock.delete(ws);
-                    }
                    RED.events.emit("flows:change", ws)
                }
            });
-            // Ensures all workspaces to be locked have been locked.
            flowsToLock.forEach(flow => {
                flow.locked = true
            })
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@ -1,4 +1,5 @@
 RED.diff = (function() {
+
    var currentDiff = {};
    var diffVisible = false;
    var diffList;
@ -61,14 +62,12 @@ RED.diff = (function() {
                        addedCount:0,
                        deletedCount:0,
                        changedCount:0,
-                        movedCount:0,
                        unchangedCount: 0
                    },
                    remote: {
                        addedCount:0,
                        deletedCount:0,
                        changedCount:0,
-                        movedCount:0,
                        unchangedCount: 0
                    },
                    conflicts: 0
@ -139,7 +138,7 @@ RED.diff = (function() {
                            $(this).parent().toggleClass('collapsed');
                        });

-                        createNodePropertiesTable(def,tab,localTabNode,remoteTabNode).appendTo(div);
+                        createNodePropertiesTable(def,tab,localTabNode,remoteTabNode,conflicts).appendTo(div);
                        selectState = "";
                        if (conflicts[tab.id]) {
                            flowStats.conflicts++;
@ -209,26 +208,19 @@ RED.diff = (function() {
                        var localStats = $('<span>',{class:"red-ui-diff-list-flow-stats"}).appendTo(localCell);
                        $('<span class="red-ui-diff-status"></span>').text(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats);

-                        if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.movedCount + flowStats.local.deletedCount > 0) {
+                        if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.deletedCount > 0) {
                            $('<span class="red-ui-diff-status"> [ </span>').appendTo(localStats);
                            if (flowStats.conflicts > 0) {
                                $('<span class="red-ui-diff-status-conflict"><span class="red-ui-diff-status"><i class="fa fa-exclamation"></i> '+flowStats.conflicts+'</span></span>').appendTo(localStats);
                            }
                            if (flowStats.local.addedCount > 0) {
-                                const cell = $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.local.addedCount+'</span></span>').appendTo(localStats);
-                                RED.popover.tooltip(cell, RED._('diff.type.added'))
+                                $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.local.addedCount+'</span></span>').appendTo(localStats);
                            }
                            if (flowStats.local.changedCount > 0) {
-                                const cell = $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.local.changedCount+'</span></span>').appendTo(localStats);
-                                RED.popover.tooltip(cell, RED._('diff.type.changed'))
-                            }
-                            if (flowStats.local.movedCount > 0) {
-                                const cell = $('<span class="red-ui-diff-status-moved"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.local.movedCount+'</span></span>').appendTo(localStats);
-                                RED.popover.tooltip(cell, RED._('diff.type.moved'))
+                                $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.local.changedCount+'</span></span>').appendTo(localStats);
                            }
                            if (flowStats.local.deletedCount > 0) {
-                                const cell = $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.local.deletedCount+'</span></span>').appendTo(localStats);
-                                RED.popover.tooltip(cell, RED._('diff.type.deleted'))
+                                $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.local.deletedCount+'</span></span>').appendTo(localStats);
                            }
                            $('<span class="red-ui-diff-status"> ] </span>').appendTo(localStats);
                        }
@ -254,26 +246,19 @@ RED.diff = (function() {
                            }
                            var remoteStats = $('<span>',{class:"red-ui-diff-list-flow-stats"}).appendTo(remoteCell);
                            $('<span class="red-ui-diff-status"></span>').text(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats);
-                            if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.movedCount + flowStats.remote.deletedCount > 0) {
+                            if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.deletedCount > 0) {
                                $('<span class="red-ui-diff-status"> [ </span>').appendTo(remoteStats);
                                if (flowStats.conflicts > 0) {
                                    $('<span class="red-ui-diff-status-conflict"><span class="red-ui-diff-status"><i class="fa fa-exclamation"></i> '+flowStats.conflicts+'</span></span>').appendTo(remoteStats);
                                }
                                if (flowStats.remote.addedCount > 0) {
-                                    const cell = $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.remote.addedCount+'</span></span>').appendTo(remoteStats);
-                                    RED.popover.tooltip(cell, RED._('diff.type.added'))
+                                    $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.remote.addedCount+'</span></span>').appendTo(remoteStats);
                                }
                                if (flowStats.remote.changedCount > 0) {
-                                    const cell = $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.remote.changedCount+'</span></span>').appendTo(remoteStats);
-                                    RED.popover.tooltip(cell, RED._('diff.type.changed'))
-                                }
-                                if (flowStats.remote.movedCount > 0) {
-                                    const cell = $('<span class="red-ui-diff-status-moved"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.remote.movedCount+'</span></span>').appendTo(remoteStats);
-                                    RED.popover.tooltip(cell, RED._('diff.type.moved'))
+                                    $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.remote.changedCount+'</span></span>').appendTo(remoteStats);
                                }
                                if (flowStats.remote.deletedCount > 0) {
-                                    const cell = $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.remote.deletedCount+'</span></span>').appendTo(remoteStats);
-                                    RED.popover.tooltip(cell, RED._('diff.type.deleted'))
+                                    $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.remote.deletedCount+'</span></span>').appendTo(remoteStats);
                                }
                                $('<span class="red-ui-diff-status"> ] </span>').appendTo(remoteStats);
                            }
@ -308,7 +293,7 @@ RED.diff = (function() {
        if (options.mode === "merge") {
            diffPanel.addClass("red-ui-diff-panel-merge");
        }
-        var diffList = createDiffTable(diffPanel, diff, options);
+        var diffList = createDiffTable(diffPanel, diff);

        var localDiff = diff.localDiff;
        var remoteDiff = diff.remoteDiff;
@ -497,7 +482,7 @@ RED.diff = (function() {
            }
        })
        if (c === 0) {
-            result.text(RED._("diff.type.none"));
+            result.text("none");
        } else {
            list.appendTo(result);
        }
@ -531,6 +516,7 @@ RED.diff = (function() {

        var hasChanges = false; // exists in original and local/remote but with changes
        var unChanged = true; // existing in original,local,remote unchanged
+        var localChanged = false;

        if (localDiff.added[node.id]) {
            stats.local.addedCount++;
@ -549,20 +535,12 @@ RED.diff = (function() {
            unChanged = false;
        }
        if (localDiff.changed[node.id]) {
-            if (localDiff.positionChanged[node.id]) {
-                stats.local.movedCount++
-            } else {
-                stats.local.changedCount++;
-            }
+            stats.local.changedCount++;
            hasChanges = true;
            unChanged = false;
        }
        if (remoteDiff && remoteDiff.changed[node.id]) {
-            if (remoteDiff.positionChanged[node.id]) {
-                stats.remote.movedCount++
-            } else {
-                stats.remote.changedCount++;
-            }
+            stats.remote.changedCount++;
            hasChanges = true;
            unChanged = false;
        }
@ -627,32 +605,27 @@ RED.diff = (function() {
                    localNodeDiv.addClass("red-ui-diff-status-moved");
                    var localMovedMessage = "";
                    if (node.z === localN.z) {
-                        const movedFromNodeTab = localDiff.currentConfig.all[localDiff.currentConfig.all[node.id].z]
-                        const movedFromLabel = `'${movedFromNodeTab ? (movedFromNodeTab.label || movedFromNodeTab.id) : 'global'}'`
-                        localMovedMessage = RED._("diff.type.movedFrom",{id: movedFromLabel});
+                        localMovedMessage = RED._("diff.type.movedFrom",{id:(localDiff.currentConfig.all[node.id].z||'global')});
                    } else {
-                        const movedToNodeTab = localDiff.newConfig.all[localN.z]
-                        const movedToLabel = `'${movedToNodeTab ? (movedToNodeTab.label || movedToNodeTab.id) : 'global'}'`
-                        localMovedMessage = RED._("diff.type.movedTo",{id:movedToLabel});
+                        localMovedMessage = RED._("diff.type.movedTo",{id:(localN.z||'global')});
                    }
                    $('<span class="red-ui-diff-status"><i class="fa fa-caret-square-o-right"></i> '+localMovedMessage+'</span>').appendTo(localNodeDiv);
                }
+                localChanged = true;
            } else if (localDiff.deleted[node.z]) {
                localNodeDiv.addClass("red-ui-diff-empty");
+                localChanged = true;
            } else if (localDiff.deleted[node.id]) {
                localNodeDiv.addClass("red-ui-diff-status-deleted");
                $('<span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> <span data-i18n="diff.type.deleted"></span></span>').appendTo(localNodeDiv);
+                localChanged = true;
            } else if (localDiff.changed[node.id]) {
                if (localDiff.newConfig.all[node.id].z !== node.z) {
                    localNodeDiv.addClass("red-ui-diff-empty");
                } else {
-                    if (localDiff.positionChanged[node.id]) {
-                        localNodeDiv.addClass("red-ui-diff-status-moved");
-                        $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.moved"></span></span>').appendTo(localNodeDiv);
-                    } else {
-                        localNodeDiv.addClass("red-ui-diff-status-changed");
-                        $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(localNodeDiv);
-                    }
+                    localNodeDiv.addClass("red-ui-diff-status-changed");
+                    $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(localNodeDiv);
+                    localChanged = true;
                }
            } else {
                if (localDiff.newConfig.all[node.id].z !== node.z) {
@ -673,13 +646,9 @@ RED.diff = (function() {
                        remoteNodeDiv.addClass("red-ui-diff-status-moved");
                        var remoteMovedMessage = "";
                        if (node.z === remoteN.z) {
-                            const movedFromNodeTab = remoteDiff.currentConfig.all[remoteDiff.currentConfig.all[node.id].z]
-                            const movedFromLabel = `'${movedFromNodeTab ? (movedFromNodeTab.label || movedFromNodeTab.id) : 'global'}'`
-                            remoteMovedMessage = RED._("diff.type.movedFrom",{id:movedFromLabel});
+                            remoteMovedMessage = RED._("diff.type.movedFrom",{id:(remoteDiff.currentConfig.all[node.id].z||'global')});
                        } else {
-                            const movedToNodeTab = remoteDiff.newConfig.all[remoteN.z]
-                            const movedToLabel = `'${movedToNodeTab ? (movedToNodeTab.label || movedToNodeTab.id) : 'global'}'`
-                            remoteMovedMessage = RED._("diff.type.movedTo",{id:movedToLabel});
+                            remoteMovedMessage = RED._("diff.type.movedTo",{id:(remoteN.z||'global')});
                        }
                        $('<span class="red-ui-diff-status"><i class="fa fa-caret-square-o-right"></i> '+remoteMovedMessage+'</span>').appendTo(remoteNodeDiv);
                    }
@ -692,13 +661,8 @@ RED.diff = (function() {
                    if (remoteDiff.newConfig.all[node.id].z !== node.z) {
                        remoteNodeDiv.addClass("red-ui-diff-empty");
                    } else {
-                        if (remoteDiff.positionChanged[node.id]) {
-                            remoteNodeDiv.addClass("red-ui-diff-status-moved");
-                            $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.moved"></span></span>').appendTo(remoteNodeDiv);
-                        } else {
-                            remoteNodeDiv.addClass("red-ui-diff-status-changed");
-                            $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(remoteNodeDiv);
-                        }
+                        remoteNodeDiv.addClass("red-ui-diff-status-changed");
+                        $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(remoteNodeDiv);
                    }
                } else {
                    if (remoteDiff.newConfig.all[node.id].z !== node.z) {
@ -821,10 +785,10 @@ RED.diff = (function() {
                conflict = true;
            }
            row = $("<tr>").appendTo(nodePropertiesTableBody);
-            $("<td>",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.position")).appendTo(row);
+            $("<td>",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row);
            localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
            if (localNode) {
-                localCell.addClass("red-ui-diff-status-"+(localChanged?"moved":"unchanged"));
+                localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
                $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
                var localPosition = {x:localNode.x,y:localNode.y};
@ -849,7 +813,7 @@ RED.diff = (function() {

            if (remoteNode !== undefined) {
                remoteCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row);
-                remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"moved":"unchanged"));
+                remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"changed":"unchanged"));
                if (remoteNode) {
                    $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                    element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
@ -899,7 +863,7 @@ RED.diff = (function() {
                conflict = true;
            }
            row = $("<tr>").appendTo(nodePropertiesTableBody);
-            $("<td>",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.wires")).appendTo(row);
+            $("<td>",{class:"red-ui-diff-list-cell-label"}).text("wires").appendTo(row);
            localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
            if (localNode) {
                if (!conflict) {
@ -1135,11 +1099,11 @@ RED.diff = (function() {
    //     var diff = generateDiff(originalFlow,nns);
    //     showDiff(diff);
    // }
-    function showRemoteDiff(diff, options = {}) {
-        if (!diff) {
-            getRemoteDiff((remoteDiff) => showRemoteDiff(remoteDiff, options));
+    function showRemoteDiff(diff) {
+        if (diff === undefined) {
+            getRemoteDiff(showRemoteDiff);
        } else {
-            showDiff(diff,{...options, mode:'merge'});
+            showDiff(diff,{mode:'merge'});
        }
    }
    function parseNodes(nodeList) {
@ -1180,53 +1144,23 @@ RED.diff = (function() {
        }
    }
    function generateDiff(currentNodes,newNodes) {
-        const currentConfig = parseNodes(currentNodes);
-        const newConfig = parseNodes(newNodes);
-        const added = {};
-        const deleted = {};
-        const changed = {};
-        const positionChanged = {};
-        const moved = {};
+        var currentConfig = parseNodes(currentNodes);
+        var newConfig = parseNodes(newNodes);
+        var added = {};
+        var deleted = {};
+        var changed = {};
+        var moved = {};

        Object.keys(currentConfig.all).forEach(function(id) {
-            const node = RED.nodes.workspace(id)||RED.nodes.subflow(id)||RED.nodes.node(id);
+            var node = RED.nodes.workspace(id)||RED.nodes.subflow(id)||RED.nodes.node(id);
            if (!newConfig.all.hasOwnProperty(id)) {
                deleted[id] = true;
-                return
-            }
-            const currentConfigJSON = JSON.stringify(currentConfig.all[id])
-            const newConfigJSON = JSON.stringify(newConfig.all[id])
-            
-            if (currentConfigJSON !== newConfigJSON) {
+            } else if (JSON.stringify(currentConfig.all[id]) !== JSON.stringify(newConfig.all[id])) {
                changed[id] = true;
+
                if (currentConfig.all[id].z !== newConfig.all[id].z) {
                    moved[id] = true;
-                } else if (
-                    currentConfig.all[id].x !== newConfig.all[id].x ||
-                    currentConfig.all[id].y !== newConfig.all[id].y ||
-                    currentConfig.all[id].w !== newConfig.all[id].w ||
-                    currentConfig.all[id].h !== newConfig.all[id].h
-                ) {
-                    // This node's position on its parent has changed. We want to
-                    // check if this is the *only* change for this given node
-                    const currentNodeClone = JSON.parse(currentConfigJSON)
-                    const newNodeClone = JSON.parse(newConfigJSON)
-
-                    delete currentNodeClone.x
-                    delete currentNodeClone.y
-                    delete currentNodeClone.w
-                    delete currentNodeClone.h
-                    delete newNodeClone.x
-                    delete newNodeClone.y
-                    delete newNodeClone.w
-                    delete newNodeClone.h
-                    
-                    if (JSON.stringify(currentNodeClone) === JSON.stringify(newNodeClone)) {
-                        // Only the position has changed - everything else is the same
-                        positionChanged[id] = true
-                    }
                }
-
            }
        });
        Object.keys(newConfig.all).forEach(function(id) {
@ -1235,14 +1169,13 @@ RED.diff = (function() {
            }
        });

-        const diff = {
-            currentConfig,
-            newConfig,
-            added,
-            deleted,
-            changed,
-            positionChanged,
-            moved
+        var diff = {
+            currentConfig: currentConfig,
+            newConfig: newConfig,
+            added: added,
+            deleted: deleted,
+            changed: changed,
+            moved: moved
        };
        return diff;
    }
@ -1307,14 +1240,12 @@ RED.diff = (function() {
        return diff;
    }

-    function showDiff(diff, options) {
+    function showDiff(diff,options) {
        if (diffVisible) {
            return;
        }
        options = options || {};
        var mode = options.mode || 'merge';
-        
-        options.hidePositionChanges = true

        var localDiff = diff.localDiff;
        var remoteDiff = diff.remoteDiff;
@ -1384,9 +1315,6 @@ RED.diff = (function() {
                        if (!$("#red-ui-diff-view-diff-merge").hasClass('disabled')) {
                            refreshConflictHeader(diff);
                            mergeDiff(diff);
-                            if (options.onmerge) {
-                                options.onmerge()
-                            }
                            RED.tray.close();
                        }
                    }
@ -1417,7 +1345,6 @@ RED.diff = (function() {
        var newConfig = [];
        var node;
        var nodeChangedStates = {};
-        var nodeMovedStates = {};
        var localChangedStates = {};
        for (id in localDiff.newConfig.all) {
            if (localDiff.newConfig.all.hasOwnProperty(id)) {
@ -1425,14 +1352,12 @@ RED.diff = (function() {
                if (resolutions[id] === 'local') {
                    if (node) {
                        nodeChangedStates[id] = node.changed;
-                        nodeMovedStates[id] = node.moved;
                    }
                    newConfig.push(localDiff.newConfig.all[id]);
                } else if (resolutions[id] === 'remote') {
                    if (!remoteDiff.deleted[id] && remoteDiff.newConfig.all.hasOwnProperty(id)) {
                        if (node) {
                            nodeChangedStates[id] = node.changed;
-                            nodeMovedStates[id] = node.moved;
                        }
                        localChangedStates[id] = 1;
                        newConfig.push(remoteDiff.newConfig.all[id]);
@ -1456,9 +1381,8 @@ RED.diff = (function() {
        }
        return {
            config: newConfig,
-            nodeChangedStates,
-            nodeMovedStates,
-            localChangedStates
+            nodeChangedStates: nodeChangedStates,
+            localChangedStates: localChangedStates
        }
    }

@ -1469,7 +1393,6 @@ RED.diff = (function() {

        var newConfig = appliedDiff.config;
        var nodeChangedStates = appliedDiff.nodeChangedStates;
-        var nodeMovedStates = appliedDiff.nodeMovedStates;
        var localChangedStates = appliedDiff.localChangedStates;

        var isDirty = RED.nodes.dirty();
@ -1478,56 +1401,33 @@ RED.diff = (function() {
            t:"replace",
            config: RED.nodes.createCompleteNodeSet(),
            changed: nodeChangedStates,
-            moved: nodeMovedStates,
-            complete: true,
            dirty: isDirty,
            rev: RED.nodes.version()
        }

        RED.history.push(historyEvent);

-        // var originalFlow = RED.nodes.originalFlow();
-        // // originalFlow is what the editor thinks it loaded
-        // //  - add any newly added nodes from remote diff as they are now part of the record
-        // for (var id in diff.remoteDiff.added) {
-        //     if (diff.remoteDiff.added.hasOwnProperty(id)) {
-        //         if (diff.remoteDiff.newConfig.all.hasOwnProperty(id)) {
-        //             originalFlow.push(JSON.parse(JSON.stringify(diff.remoteDiff.newConfig.all[id])));
-        //         }
-        //     }
-        // }
+        var originalFlow = RED.nodes.originalFlow();
+        // originalFlow is what the editor things it loaded
+        //  - add any newly added nodes from remote diff as they are now part of the record
+        for (var id in diff.remoteDiff.added) {
+            if (diff.remoteDiff.added.hasOwnProperty(id)) {
+                if (diff.remoteDiff.newConfig.all.hasOwnProperty(id)) {
+                    originalFlow.push(JSON.parse(JSON.stringify(diff.remoteDiff.newConfig.all[id])));
+                }
+            }
+        }

        RED.nodes.clear();
        var imported = RED.nodes.import(newConfig);

-        // // Restore the original flow so subsequent merge resolutions can properly
-        // // identify new-vs-old
-        // RED.nodes.originalFlow(originalFlow);
-
-        // Clear all change flags from the import
-        RED.nodes.dirty(false);
-        
-        const flowsToLock = new Set()
-        function ensureUnlocked(id) {
-            const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
-            const isLocked = flow ? flow.locked : false;
-            if (flow && isLocked) {
-                flow.locked = false;
-                flowsToLock.add(flow)
-            }
-        }
+        // Restore the original flow so subsequent merge resolutions can properly
+        // identify new-vs-old
+        RED.nodes.originalFlow(originalFlow);
        imported.nodes.forEach(function(n) {
-            if (nodeChangedStates[n.id]) {
-                ensureUnlocked(n.z)
+            if (nodeChangedStates[n.id] || localChangedStates[n.id]) {
                n.changed = true;
            }
-            if (nodeMovedStates[n.id]) {
-                ensureUnlocked(n.z)
-                n.moved = true;
-            }
-        })
-        flowsToLock.forEach(flow => {
-            flow.locked = true
        })

        RED.nodes.version(diff.remoteDiff.rev);
@ -2029,14 +1929,15 @@ RED.diff = (function() {
                            if (!isSeparator) {
                                var isOurs = /^..<<<<<<</.test(lineText);
                                if (isOurs) {
-                                    $('<span>').text("<<<<<<< " + RED._("diff.localChanges")).appendTo(line);
+                                    $('<span>').text("<<<<<<< Local Changes").appendTo(line);
                                    hunk.localChangeStart = actualLineNumber;
                                } else {
                                    hunk.remoteChangeEnd = actualLineNumber;
-                                    $('<span>').text(">>>>>>> " + RED._("diff.remoteChanges")).appendTo(line);
+                                    $('<span>').text(">>>>>>> Remote Changes").appendTo(line);
+
                                }
                                diffRow.addClass("mergeHeader-"+(isOurs?"ours":"theirs"));
-                                $('<button class="red-ui-button red-ui-button-small" style="float: right; margin-right: 20px;"><i class="fa fa-angle-double-'+(isOurs?"down":"up")+'"></i> '+RED._(isOurs?"diff.useLocalChanges":"diff.useRemoteChanges")+'</button>')
+                                $('<button class="red-ui-button red-ui-button-small" style="float: right; margin-right: 20px;"><i class="fa fa-angle-double-'+(isOurs?"down":"up")+'"></i> use '+(isOurs?"local":"remote")+' changes</button>')
                                    .appendTo(line)
                                    .on("click", function(evt) {
                                        evt.preventDefault();
@ -2118,7 +2019,7 @@ RED.diff = (function() {
                $("<h3>").text(commit.title).appendTo(content);
                $('<div class="commit-body"></div>').text(commit.comment).appendTo(content);
                var summary = $('<div class="commit-summary"></div>').appendTo(content);
-                $('<div style="float: right">').text(RED._('diff.commit')+" "+commit.sha).appendTo(summary);
+                $('<div style="float: right">').text("Commit "+commit.sha).appendTo(summary);
                $('<div>').text((commit.authorName||commit.author)+" - "+options.date).appendTo(summary);

                if (commit.files) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@ -157,12 +157,6 @@ RED.editor = (function() {
            }
        }
        if (valid && "validate" in definition[property]) {
-            if (definition[property].hasOwnProperty("required") &&
-                definition[property].required === false) {
-                if (value === "") {
-                    return true;
-                }
-            }
            try {
                var opt = {};
                if (label) {
@ -189,11 +183,6 @@ RED.editor = (function() {
                });
            }
        } else if (valid) {
-            if (definition[property].hasOwnProperty("required") && definition[property].required === false) {
-                if (value === "") {
-                    return true;
-                }
-            }
            // If the validator is not provided in node property => Check if the input has a validator
            if ("category" in node._def) {
                const isConfig = node._def.category === "config";
@ -201,10 +190,7 @@ RED.editor = (function() {
                const input = $("#"+prefix+"-"+property);
                const isTypedInput = input.length > 0 && input.next(".red-ui-typedInput-container").length > 0;
                if (isTypedInput) {
-                    valid = input.typedInput("validate", { returnErrorMessage: true });
-                    if (typeof valid === "string") {
-                        return label ? label + ": " + valid : valid;
-                    }
+                    valid = input.typedInput("validate");
                }
            }
        }
@ -342,101 +328,49 @@ RED.editor = (function() {

    /**
     * Create a config-node select box for this property
-     * @param  {Object} node - the node being edited
-     * @param {String} property - the name of the node property
-     * @param {String} type - the type of the config-node
-     * @param {"node-config-input"|"node-input"|"node-input-subflow-env"} prefix - the prefix to use in the input element ids
-     * @param {Function} [filter] - a function to filter the list of config nodes
-     * @param {Object} [env] - the environment variable object (only used for subflow env vars)
+     * @param node - the node being edited
+     * @param property - the name of the field
+     * @param type - the type of the config-node
     */
-    function prepareConfigNodeSelect(node, property, type, prefix, filter, env) {
-        let nodeValue
-        if (prefix === 'node-input-subflow-env') {
-            nodeValue = env?.value
-        } else {
-            nodeValue = node[property]
-        }
-
-        const addBtnId = `${prefix}-btn-${property}-add`;
-        const editBtnId = `${prefix}-btn-${property}-edit`;
-        const selectId = prefix + '-' + property;
-        const input = $(`#${selectId}`);
-        if (input.length === 0) {
+    function prepareConfigNodeSelect(node,property,type,prefix,filter) {
+        var input = $("#"+prefix+"-"+property);
+        if (input.length === 0 ) {
            return;
        }
-        const attrStyle = input.attr('style');
-        let newWidth;
-        let m;
+        var newWidth = input.width();
+        var attrStyle = input.attr('style');
+        var m;
        if ((m = /(^|\s|;)width\s*:\s*([^;]+)/i.exec(attrStyle)) !== null) {
            newWidth = m[2].trim();
        } else {
            newWidth = "70%";
        }
-        const outerWrap = $("<div></div>").css({
+        var outerWrap = $("<div></div>").css({
            width: newWidth,
-            display: 'inline-flex'
+            display:'inline-flex'
        });
-        const select = $('<select id="' + selectId + '"></select>').appendTo(outerWrap);
+        var select = $('<select id="'+prefix+'-'+property+'"></select>').appendTo(outerWrap);
        input.replaceWith(outerWrap);
        // set the style attr directly - using width() on FF causes a value of 114%...
        select.css({
            'flex-grow': 1
        });
-
-        updateConfigNodeSelect(property, type, nodeValue, prefix, filter);
-
-        // create the edit button
-        const editButton = $('<a id="' + editBtnId + '" class="red-ui-button"><i class="fa fa-pencil"></i></a>')
-            .css({ "margin-left": "10px" })
+        updateConfigNodeSelect(property,type,node[property],prefix,filter);
+        $('<a id="'+prefix+'-lookup-'+property+'" class="red-ui-button"><i class="fa fa-pencil"></i></a>')
+            .css({"margin-left":"10px"})
            .appendTo(outerWrap);
-
-        RED.popover.tooltip(editButton, RED._('editor.editConfig', { type }));
-
-        // create the add button
-        const addButton = $('<a id="' + addBtnId + '" class="red-ui-button"><i class="fa fa-plus"></i></a>')
-            .css({ "margin-left": "10px" })
-            .appendTo(outerWrap);
-        RED.popover.tooltip(addButton, RED._('editor.addNewConfig', { type }));
-
-        const disableButton = function(button, disabled) {
-            $(button).prop("disabled", !!disabled)
-            $(button).toggleClass("disabled", !!disabled)
-        };
-
-        // add the click handler
-        addButton.on("click", function (e) {
-            if (addButton.prop("disabled")) { return }
-            showEditConfigNodeDialog(property, type, "_ADD_", prefix, node);
-            e.preventDefault();
-        });
-        editButton.on("click", function (e) {
-            const selectedOpt = select.find(":selected")
-            if (selectedOpt.data('env')) { return } // don't show the dialog for env vars items (MVP. Future enhancement: lookup the env, if present, show the associated edit dialog)
-            if (editButton.prop("disabled")) { return }
-            showEditConfigNodeDialog(property, type, selectedOpt.val(), prefix, node);
+        $('#'+prefix+'-lookup-'+property).on("click", function(e) {
+            showEditConfigNodeDialog(property,type,select.find(":selected").val(),prefix,node);
            e.preventDefault();
        });
+        var label = "";
+        var configNode = RED.nodes.node(node[property]);
+        var node_def = RED.nodes.getType(type);

-        // dont permit the user to click the button if the selected option is an env var
-        select.on("change", function () {
-            const selectedOpt = select.find(":selected");
-            const optionsLength = select.find("option").length;
-            if (selectedOpt?.data('env')) {
-                disableButton(addButton, true);
-                disableButton(editButton, true);
-            // disable the edit button if no options available or 'none' selected
-            } else if (optionsLength === 1 || selectedOpt.val() === "_ADD_") {
-                disableButton(addButton, false);
-                disableButton(editButton, true);
-            } else {
-                disableButton(addButton, false);
-                disableButton(editButton, false);
-            }
-        });
-
-        // If the value is "", 'add new...' option if no config node available or 'none' option
-        // Otherwise, it's a config node
-        select.val(nodeValue || '_ADD_');
+        if (configNode) {
+            label = RED.utils.getNodeLabel(configNode,configNode.id);
+        }
+        input.val(label);
    }

    /**
@ -808,20 +742,6 @@ RED.editor = (function() {
                }
            }

-            const oldCreds = {};
-            if (editing_node._def.credentials) {
-                for (const prop in editing_node._def.credentials) {
-                    if (Object.prototype.hasOwnProperty.call(editing_node._def.credentials, prop)) {
-                        if (editing_node._def.credentials[prop].type === 'password') {
-                            oldCreds['has_' + prop] = editing_node.credentials['has_' + prop];
-                        }
-                        if (prop in editing_node.credentials) {
-                            oldCreds[prop] = editing_node.credentials[prop];
-                        }
-                    }
-                }
-            }
-
            try {
                const rc = editing_node._def.oneditsave.call(editing_node);
                if (rc === true) {
@ -853,32 +773,16 @@ RED.editor = (function() {
                    }
                }
            }
-
-            if (editing_node._def.credentials) {
-                for (const prop in editing_node._def.credentials) {
-                    if (Object.prototype.hasOwnProperty.call(editing_node._def.credentials, prop)) {
-                        if (oldCreds[prop] !== editing_node.credentials[prop]) {
-                            if (editing_node.credentials[prop] === '__PWRD__') {
-                                // The password may not exist in oldCreds
-                                // The value '__PWRD__' means the password exists,
-                                // so ignore this change
-                                continue;
-                            }
-                            editState.changes.credentials = editState.changes.credentials || {};
-                            editState.changes.credentials['has_' + prop] = oldCreds['has_' + prop];
-                            editState.changes.credentials[prop] = oldCreds[prop];
-                            editState.changed = true;
-                        }
-                    }
-                }
-            }
        }
    }

    function defaultConfigNodeSort(A,B) {
-        // sort case insensitive so that `[env] node-name` items are at the top and
-        // not mixed inbetween the the lower and upper case items
-        return (A.__label__ || '').localeCompare((B.__label__ || ''), undefined, {sensitivity: 'base'})
+        if (A.__label__ < B.__label__) {
+            return -1;
+        } else if (A.__label__ > B.__label__) {
+            return 1;
+        }
+        return 0;
    }

    function updateConfigNodeSelect(name,type,value,prefix,filter) {
@ -893,7 +797,7 @@ RED.editor = (function() {
                }
                $("#"+prefix+"-"+name).val(value);
            } else {
-                let inclSubflowEnvvars = false
+
                var select = $("#"+prefix+"-"+name);
                var node_def = RED.nodes.getType(type);
                select.children().remove();
@ -901,7 +805,6 @@ RED.editor = (function() {
                var activeWorkspace = RED.nodes.workspace(RED.workspaces.active());
                if (!activeWorkspace) {
                    activeWorkspace = RED.nodes.subflow(RED.workspaces.active());
-                    inclSubflowEnvvars = true
                }

                var configNodes = [];
@ -917,31 +820,6 @@ RED.editor = (function() {
                        }
                    }
                });
- 
-                // as includeSubflowEnvvars is true, this is a subflow.
-                // include any 'conf-types' env vars as a list of avaiable configs
-                // in the config dropdown as `[env] node-name`
-                if (inclSubflowEnvvars && activeWorkspace.env) {
-                    const parentEnv = activeWorkspace.env.filter(env => env.ui?.type === 'conf-types' && env.type === type)
-                    if (parentEnv && parentEnv.length > 0) {
-                        const locale = RED.i18n.lang()
-                        for (let i = 0; i < parentEnv.length; i++) {
-                            const tenv = parentEnv[i]
-                            const ui = tenv.ui || {}
-                            const labels = ui.label || {}
-                            const labelText = RED.editor.envVarList.lookupLabel(labels, labels["en-US"] || tenv.name, locale)
-                            const config = {
-                                env: tenv,
-                                id: '${' + tenv.name + '}',
-                                type: type,
-                                label: labelText,
-                                __label__: `[env] ${labelText}`
-                            }
-                            configNodes.push(config)
-                        }
-                    }
-                }
-
                var configSortFn = defaultConfigNodeSort;
                if (typeof node_def.sort == "function") {
                    configSortFn = node_def.sort;
@ -953,10 +831,7 @@ RED.editor = (function() {
                }

                configNodes.forEach(function(cn) {
-                    const option = $('<option value="'+cn.id+'"'+(value==cn.id?" selected":"")+'></option>').text(RED.text.bidi.enforceTextDirectionWithUCC(cn.__label__)).appendTo(select);
-                    if (cn.env) {
-                        option.data('env', cn.env) // set a data attribute to indicate this is an env var (to inhibit the edit button)
-                    }
+                    $('<option value="'+cn.id+'"'+(value==cn.id?" selected":"")+'></option>').text(RED.text.bidi.enforceTextDirectionWithUCC(cn.__label__)).appendTo(select);
                    delete cn.__label__;
                });

@ -969,14 +844,7 @@ RED.editor = (function() {
                    }
                }

-                if (!configNodes.length) {
-                    // Add 'add new...' option
-                    select.append('<option value="_ADD_" selected>' + RED._("editor.addNewType", { type: label }) + '</option>');
-                } else {
-                    // Add 'none' option
-                    select.append('<option value="_ADD_">' + RED._("editor.inputs.none") + '</option>');
-                }
-
+                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:label})+'</option>');
                window.setTimeout(function() { select.trigger("change");},50);
            }
        }
@ -1514,193 +1382,139 @@ RED.editor = (function() {
            },
            {
                id: "node-config-dialog-ok",
-                text: adding ? RED._("editor.configAdd") : RED._("editor.configUpdate"),
+                text: adding?RED._("editor.configAdd"):RED._("editor.configUpdate"),
                class: "primary",
                click: function() {
-                    // TODO: Already defined
-                    const configProperty = name;
-                    const configType = type;
-                    const configTypeDef = RED.nodes.getType(configType);
-
-                    const wasChanged = editing_config_node.changed;
-                    const editState = {
+                    var editState = {
                        changes: {},
                        changed: false,
                        outputMap: null
                    };
-                    
-                    // Call `oneditsave` and search for changes
-                    handleEditSave(editing_config_node, editState);
+                    var configProperty = name;
+                    var configId = editing_config_node.id;
+                    var configType = type;
+                    var configAdding = adding;
+                    var configTypeDef = RED.nodes.getType(configType);
+                    var d;
+                    var input;

-                    // Search for changes in the edit box (panes)
-                    activeEditPanes.forEach(function (pane) {
+                    if (configTypeDef.oneditsave) {
+                        try {
+                            configTypeDef.oneditsave.call(editing_config_node);
+                        } catch(err) {
+                            console.warn("oneditsave",editing_config_node.id,editing_config_node.type,err.toString());
+                        }
+                    }
+
+                    for (d in configTypeDef.defaults) {
+                        if (configTypeDef.defaults.hasOwnProperty(d)) {
+                            var newValue;
+                            input = $("#node-config-input-"+d);
+                            if (input.attr('type') === "checkbox") {
+                                newValue = input.prop('checked');
+                            } else if ("format" in configTypeDef.defaults[d] && configTypeDef.defaults[d].format !== "" && input[0].nodeName === "DIV") {
+                                newValue = input.text();
+                            } else {
+                                newValue = input.val();
+                            }
+                            if (newValue != null && newValue !== editing_config_node[d]) {
+                                if (editing_config_node._def.defaults[d].type) {
+                                    if (newValue == "_ADD_") {
+                                        newValue = "";
+                                    }
+                                    // Change to a related config node
+                                    var configNode = RED.nodes.node(editing_config_node[d]);
+                                    if (configNode) {
+                                        var users = configNode.users;
+                                        users.splice(users.indexOf(editing_config_node),1);
+                                        RED.events.emit("nodes:change",configNode);
+                                    }
+                                    configNode = RED.nodes.node(newValue);
+                                    if (configNode) {
+                                        configNode.users.push(editing_config_node);
+                                        RED.events.emit("nodes:change",configNode);
+                                    }
+                                }
+                                editing_config_node[d] = newValue;
+                            }
+                        }
+                    }
+
+                    activeEditPanes.forEach(function(pane) {
                        if (pane.apply) {
                            pane.apply.call(pane, editState);
                        }
-                    });
+                    })

-                    // TODO: Why?
-                    editing_config_node.label = configTypeDef.label
+                    editing_config_node.label = configTypeDef.label;
+
+                    var scope = $("#red-ui-editor-config-scope").val();
+                    editing_config_node.z = scope;

-                    // Check if disabled has changed
                    if ($("#node-config-input-node-disabled").prop('checked')) {
                        if (editing_config_node.d !== true) {
-                            editState.changes.d = editing_config_node.d;
-                            editState.changed = true;
                            editing_config_node.d = true;
                        }
                    } else {
                        if (editing_config_node.d === true) {
-                            editState.changes.d = editing_config_node.d;
-                            editState.changed = true;
                            delete editing_config_node.d;
                        }
                    }

-                    // NOTE: must be undefined if no scope used
-                    const scope = $("#red-ui-editor-config-scope").val() || undefined;
-
-                    // Check if the scope has changed
-                    if (editing_config_node.z !== scope) {
-                        editState.changes.z = editing_config_node.z;
-                        editState.changed = true;
-                        editing_config_node.z = scope;
-                    }
-
-                    // Search for nodes that use this config node that are no longer
-                    // in scope, so must be removed
-                    const historyEvents = [];
                    if (scope) {
-                        const newUsers = editing_config_node.users.filter(function (node) {
-                            let keepNode = false;
-                            let nodeModified = null;
-
-                            for (const d in node._def.defaults) {
-                                if (node._def.defaults.hasOwnProperty(d)) {
-                                    if (node._def.defaults[d].type === editing_config_node.type) {
-                                        if (node[d] === editing_config_node.id) {
-                                            if (node.z === editing_config_node.z) {
-                                                // The node is kept only if at least one property uses
-                                                // this config node in the correct scope.
-                                                keepNode = true;
-                                            } else {
-                                                if (!nodeModified) {
-                                                    nodeModified = {
-                                                        t: "edit",
-                                                        node: node,
-                                                        changes: { [d]: node[d] },
-                                                        changed: node.changed,
-                                                        dirty: node.dirty
-                                                    };
-                                                } else {
-                                                    nodeModified.changes[d] = node[d];
-                                                }
-
-                                                // Remove the reference to the config node
-                                                node[d] = "";
-                                            }
-                                        }
+                        // Search for nodes that use this one that are no longer
+                        // in scope, so must be removed
+                        editing_config_node.users = editing_config_node.users.filter(function(n) {
+                            var keep = true;
+                            for (var d in n._def.defaults) {
+                                if (n._def.defaults.hasOwnProperty(d)) {
+                                    if (n._def.defaults[d].type === editing_config_node.type &&
+                                        n[d] === editing_config_node.id &&
+                                        n.z !== scope) {
+                                            keep = false;
+                                            // Remove the reference to this node
+                                            // and revalidate
+                                            n[d] = null;
+                                            n.dirty = true;
+                                            n.changed = true;
+                                            validateNode(n);
                                    }
                                }
                            }
-
-                            // Add the node modified to the history
-                            if (nodeModified) {
-                                historyEvents.push(nodeModified);
-                            }
-
-                            // Mark as changed and revalidate this node
-                            if (!keepNode) {
-                                node.changed = true;
-                                node.dirty = true;
-                                validateNode(node);
-                                RED.events.emit("nodes:change", node);
-                            }
-
-                            return keepNode;
+                            return keep;
                        });
-
-                        // Check if users are changed
-                        if (editing_config_node.users.length !== newUsers.length) {
-                            editState.changes.users = editing_config_node.users;
-                            editState.changed = true;
-                            editing_config_node.users = newUsers;
-                        }
                    }

-                    if (editState.changed) {
-                        // Set the congig node as changed
-                        editing_config_node.changed = true;
+                    if (configAdding) {
+                        RED.nodes.add(editing_config_node);
                    }

-                    // Now, validate the config node
                    validateNode(editing_config_node);
+                    var validatedNodes = {};
+                    validatedNodes[editing_config_node.id] = true;

-                    // And validate nodes using this config node too
-                    const validatedNodes = new Set();
-                    const userStack = editing_config_node.users.slice();
-
-                    validatedNodes.add(editing_config_node.id);
-                    while (userStack.length) {
-                        const node = userStack.pop();
-                        if (!validatedNodes.has(node.id)) {
-                            validatedNodes.add(node.id);
-                            if (node.users) {
-                                userStack.push(...node.users);
+                    var userStack = editing_config_node.users.slice();
+                    while(userStack.length > 0) {
+                        var user = userStack.pop();
+                        if (!validatedNodes[user.id]) {
+                            validatedNodes[user.id] = true;
+                            if (user.users) {
+                                userStack = userStack.concat(user.users);
                            }
-                            validateNode(node);
+                            validateNode(user);
                        }
                    }
-
-                    let historyEvent = {
-                        t: "edit",
-                        node: editing_config_node,
-                        changes: editState.changes,
-                        changed: wasChanged,
-                        dirty: RED.nodes.dirty()
-                    };
-
-                    if (historyEvents.length) {
-                        // Need a multi events
-                        historyEvent = {
-                            t: "multi",
-                            events: [historyEvent].concat(historyEvents),
-                            dirty: historyEvent.dirty
-                        };
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                    if (!configAdding) {
+                        RED.events.emit("editor:save",editing_config_node);
+                        RED.events.emit("nodes:change",editing_config_node);
                    }
-
-                    if (!adding) {
-                        // This event is triggered when the edit box is saved,
-                        // regardless of whether there are any modifications.
-                        RED.events.emit("editor:save", editing_config_node);
-                    }
-
-                    if (editState.changed) {
-                        if (adding) {
-                            RED.history.push({ t: "add", nodes: [editing_config_node.id], dirty: RED.nodes.dirty() });
-                            // Add the new config node and trigger the `nodes:add` event
-                            RED.nodes.add(editing_config_node);
-                        } else {
-                            RED.history.push(historyEvent);
-                            RED.events.emit("nodes:change", editing_config_node);
-                        }
-
-                        RED.nodes.dirty(true);
-                        RED.view.redraw(true);
-                    }
-
                    RED.tray.close(function() {
                        var filter = null;
-                        // when editing a config via subflow edit panel, the `configProperty` will not
-                        // necessarily be a property of the editContext._def.defaults object
-                        // Also, when editing via dashboard sidebar, editContext can be null
-                        // so we need to guard both scenarios
-                        if (editContext?._def) {
-                            const isSubflow = (editContext._def.type === 'subflow' || /subflow:.*/.test(editContext._def.type))
-                            if (editContext && !isSubflow && typeof editContext._def.defaults?.[configProperty]?.filter === 'function') {
-                                filter = function(n) {
-                                    return editContext._def.defaults[configProperty].filter.call(editContext,n);
-                                }
+                        if (editContext && typeof editContext._def.defaults[configProperty].filter === 'function') {
+                            filter = function(n) {
+                                return editContext._def.defaults[configProperty].filter.call(editContext,n);
                            }
                        }
                        updateConfigNodeSelect(configProperty,configType,editing_config_node.id,prefix,filter);
@ -1761,7 +1575,7 @@ RED.editor = (function() {
                    RED.history.push(historyEvent);
                    RED.tray.close(function() {
                        var filter = null;
-                        if (editContext && typeof editContext._def.defaults[configProperty]?.filter === 'function') {
+                        if (editContext && typeof editContext._def.defaults[configProperty].filter === 'function') {
                            filter = function(n) {
                                return editContext._def.defaults[configProperty].filter.call(editContext,n);
                            }
@ -1836,18 +1650,8 @@ RED.editor = (function() {
                                }
                            });
                        }
-                        let envToRemove = new Set()
+
                        if (!isSameObj(old_env, new_env)) {
-                            // Get a list of env properties that have been removed
-                            // by comparing old_env and new_env
-                            if (old_env) {
-                                old_env.forEach(env => { envToRemove.add(env.name) })
-                            }
-                            if (new_env) {
-                                new_env.forEach(env => {
-                                    envToRemove.delete(env.name)
-                                })
-                            }
                            editState.changes.env = editing_node.env;
                            editing_node.env = new_env;
                            editState.changed = true;
@ -1856,11 +1660,10 @@ RED.editor = (function() {


                        if (editState.changed) {
-                            let wasChanged = editing_node.changed;
+                            var wasChanged = editing_node.changed;
                            editing_node.changed = true;
                            validateNode(editing_node);
-                            let subflowInstances = [];
-                            let instanceHistoryEvents = []
+                            var subflowInstances = [];
                            RED.nodes.eachNode(function(n) {
                                if (n.type == "subflow:"+editing_node.id) {
                                    subflowInstances.push({
@ -1870,35 +1673,13 @@ RED.editor = (function() {
                                    n._def.color = editing_node.color;
                                    n.changed = true;
                                    n.dirty = true;
-                                    if (n.env) {
-                                        const oldEnv = n.env
-                                        const newEnv = []
-                                        let envChanged = false
-                                        n.env.forEach((env, index) => {
-                                            if (envToRemove.has(env.name)) {
-                                                envChanged = true
-                                            } else {
-                                                newEnv.push(env)
-                                            }
-                                        })
-                                        if (envChanged) {
-                                            instanceHistoryEvents.push({
-                                                t: 'edit',
-                                                node: n,
-                                                changes: { env: oldEnv },
-                                                dirty: n.dirty,
-                                                changed: n.changed
-                                            })
-                                            n.env = newEnv
-                                        }
-                                    }
                                    updateNodeProperties(n);
                                    validateNode(n);
                                }
                            });
                            RED.events.emit("subflows:change",editing_node);
                            RED.nodes.dirty(true);
-                            let historyEvent = {
+                            var historyEvent = {
                                t:'edit',
                                node:editing_node,
                                changes:editState.changes,
@ -1908,13 +1689,7 @@ RED.editor = (function() {
                                    instances:subflowInstances
                                }
                            };
-                            if (instanceHistoryEvents.length > 0) {
-                                historyEvent = {
-                                    t: 'multi',
-                                    events: [ historyEvent, ...instanceHistoryEvents ],
-                                    dirty: wasDirty
-                                }
-                            }
+
                            RED.history.push(historyEvent);
                        }
                        editing_node.dirty = true;
@ -2341,7 +2116,6 @@ RED.editor = (function() {
            }
        },
        editBuffer: function(options) { showTypeEditor("_buffer", options) },
-        getEditStack: function () { return [...editStack] },
        buildEditForm: buildEditForm,
        validateNode: validateNode,
        updateNodeProperties: updateNodeProperties,
@ -2386,7 +2160,6 @@ RED.editor = (function() {
                filteredEditPanes[type] = filter
            }
            editPanes[type] = definition;
-        },
-        prepareConfigNodeSelect: prepareConfigNodeSelect,
+        }
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
@ -165,13 +165,7 @@ RED.editor.codeEditor.monaco = (function() {
        //Handles orphaned models
        //ensure loaded models that are not explicitly destroyed by a call to .destroy() are disposed
        RED.events.on("editor:close",function() {
-            if (!window.monaco) { return; }
-            const editors = window.monaco.editor.getEditors()
-            const orphanEditors = editors.filter(editor => editor && !document.body.contains(editor.getDomNode()))
-            orphanEditors.forEach(editor => {
-                editor.dispose();
-            });
-            let models = monaco.editor.getModels()
+            let models = window.monaco ? monaco.editor.getModels() : null;
            if(models && models.length) {
                console.warn("Cleaning up monaco models left behind. Any node that calls createEditor() should call .destroy().")
                for (let index = 0; index < models.length; index++) {
@ -591,7 +585,7 @@ RED.editor.codeEditor.monaco = (function() {
                    createMonacoCompletionItem("set (flow context)", 'flow.set("${1:name}", ${1:value});','Set a value in flow context',range),
                    createMonacoCompletionItem("get (global context)", 'global.get("${1:name}");','Get a value from global context',range),
                    createMonacoCompletionItem("set (global context)", 'global.set("${1:name}", ${1:value});','Set a value in global context',range),
-                    createMonacoCompletionItem("get (env)", 'env.get("${1|NR_NODE_ID,NR_NODE_NAME,NR_NODE_PATH,NR_GROUP_ID,NR_GROUP_NAME,NR_FLOW_ID,NR_FLOW_NAME,NR_SUBFLOW_NAME,NR_SUBFLOW_ID,NR_SUBFLOW_PATH|}");','Get env variable value',range),
+                    createMonacoCompletionItem("get (env)", 'env.get("${1|NR_NODE_ID,NR_NODE_NAME,NR_NODE_PATH,NR_GROUP_ID,NR_GROUP_NAME,NR_FLOW_ID,NR_FLOW_NAME|}");','Get env variable value',range),
                    createMonacoCompletionItem("cloneMessage (RED.util)", 'RED.util.cloneMessage(${1:msg});',
                        ["```typescript",
                        "RED.util.cloneMessage<T extends registry.NodeMessage>(msg: T): T",
@ -691,7 +685,6 @@ RED.editor.codeEditor.monaco = (function() {
                        2322,  //Type 'unknown' is not assignable to type 'string'
                        2339,  //property does not exist on
                        2345,  //Argument of type xxx is not assignable to parameter of type 'DateTimeFormatOptions'
-                        2538,  //Ignore symbols as index property error. 
                        7043,  //i forget what this one is,
                        80001, //Convert to ES6 module
                        80004, //JSDoc types may be moved to TypeScript types.
@ -1131,7 +1124,6 @@ RED.editor.codeEditor.monaco = (function() {

            $(el).remove();
            $(toolbarRow).remove();
-            ed.dispose();
        }

        ed.resize = function resize() {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
@ -1,9 +1,8 @@
 RED.editor.envVarList = (function() {

    var currentLocale = 'en-US';
-    const DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
-    const DEFAULT_ENV_TYPE_LIST_INC_CONFTYPES = ['str','num','bool','json','bin','env','conf-types'];
-    const DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred','jsonata'];
+    var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred','jsonata'];

    /**
     * Create env var edit interface
@ -11,8 +10,8 @@ RED.editor.envVarList = (function() {
     * @param node - subflow node
     */
    function buildPropertiesList(envContainer, node) {
-        if(RED.editor.envVarList.debug) { console.log('envVarList: buildPropertiesList', envContainer, node) }
-        const isTemplateNode = (node.type === "subflow");
+
+        var isTemplateNode = (node.type === "subflow");

        envContainer
            .css({
@ -84,14 +83,7 @@ RED.editor.envVarList = (function() {
                        // if `opt.ui` does not exist, then apply defaults. If these
                        // defaults do not change then they will get stripped off
                        // before saving.
-                        if (opt.type === 'conf-types') {
-                            opt.ui = opt.ui || {
-                                icon: "fa fa-cog",
-                                type: "conf-types",
-                                opts: {opts:[]}
-                            }
-                            opt.ui.type = "conf-types";
-                        } else if (opt.type === 'cred') {
+                        if (opt.type === 'cred') {
                            opt.ui = opt.ui || {
                                icon: "",
                                type: "cred"
@ -127,11 +119,11 @@ RED.editor.envVarList = (function() {
                            }
                        });

-                        buildEnvEditRow(uiRow, opt, nameField, valueField);
+                        buildEnvEditRow(uiRow, opt.ui, nameField, valueField);
                        nameField.trigger('change');
                    }
                },
-                sortable: true,
+                sortable: ".red-ui-editableList-item-handle",
                removable: false
            });
        var parentEnv = {};
@ -189,23 +181,21 @@ RED.editor.envVarList = (function() {
     * @param nameField - name field of env var
     * @param valueField - value field of env var
     */
-     function buildEnvEditRow(container, opt, nameField, valueField) {
-        const ui = opt.ui
-        if(RED.editor.envVarList.debug) { console.log('envVarList: buildEnvEditRow', container, ui, nameField, valueField) }
+     function buildEnvEditRow(container, ui, nameField, valueField) {
         container.addClass("red-ui-editor-subflow-env-ui-row")
         var topRow = $('<div></div>').appendTo(container);
         $('<div></div>').appendTo(topRow);
         $('<div>').text(RED._("editor.icon")).appendTo(topRow);
         $('<div>').text(RED._("editor.label")).appendTo(topRow);
-         $('<div class="red-env-ui-input-type-col">').text(RED._("editor.inputType")).appendTo(topRow);
+         $('<div>').text(RED._("editor.inputType")).appendTo(topRow);

         var row = $('<div></div>').appendTo(container);
         $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
         var typeOptions = {
-            'input': {types:DEFAULT_ENV_TYPE_LIST_INC_CONFTYPES},
-            'select': {opts:[]},
-            'spinner': {},
-            'cred': {}
+             'input': {types:DEFAULT_ENV_TYPE_LIST},
+             'select': {opts:[]},
+             'spinner': {},
+             'cred': {}
         };
         if (ui.opts) {
             typeOptions[ui.type] = ui.opts;
@ -270,16 +260,15 @@ RED.editor.envVarList = (function() {
            labelInput.attr("placeholder",$(this).val())
        });

-        var inputCell = $('<div class="red-env-ui-input-type-col"></div>').appendTo(row);
-        var uiInputTypeInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
+        var inputCell = $('<div></div>').appendTo(row);
+        var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
        if (ui.type === "input") {
-            uiInputTypeInput.val(ui.opts.types.join(","));
+            inputCellInput.val(ui.opts.types.join(","));
        }
        var checkbox;
        var selectBox;

-        // the options presented in the UI section for an "input" type selection
-        uiInputTypeInput.typedInput({
+        inputCellInput.typedInput({
            types: [
                {
                    value:"input",
@ -440,7 +429,7 @@ RED.editor.envVarList = (function() {
                                        }
                                    });
                                    ui.opts.opts = vals;
-                                    uiInputTypeInput.typedInput('value',Date.now())
+                                    inputCellInput.typedInput('value',Date.now())
                                }
                            }
                        }
@ -507,13 +496,12 @@ RED.editor.envVarList = (function() {
                                    } else {
                                        delete ui.opts.max;
                                    }
-                                    uiInputTypeInput.typedInput('value',Date.now())
+                                    inputCellInput.typedInput('value',Date.now())
                                }
                            }
                        }
                    }
                },
-                'conf-types',
                {
                    value:"none",
                    label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
@ -531,20 +519,14 @@ RED.editor.envVarList = (function() {
                // In the case of 'input' type, the typedInput uses the multiple-option
                // mode. Its value needs to be set to a comma-separately list of the
                // selected options.
-                uiInputTypeInput.typedInput('value',ui.opts.types.join(","))
-            } else if (ui.type === 'conf-types') {
-                // In the case of 'conf-types' type, the typedInput will be populated
-                // with a list of all config nodes types installed.
-                // Restore the value to the last selected type
-                uiInputTypeInput.typedInput('value', opt.type)
+                inputCellInput.typedInput('value',ui.opts.types.join(","))
            } else {
                // No other type cares about `value`, but doing this will
                // force a refresh of the label now that `ui.opts` has
                // been updated.
-                uiInputTypeInput.typedInput('value',Date.now())
+                inputCellInput.typedInput('value',Date.now())
            }

-            if(RED.editor.envVarList.debug) { console.log('envVarList: inputCellInput on:typedinputtypechange. ui.type = ' + ui.type) }
            switch (ui.type) {
                case 'input':
                    valueField.typedInput('types',ui.opts.types);
@ -562,7 +544,7 @@ RED.editor.envVarList = (function() {
                    valueField.typedInput('types',['cred']);
                    break;
                default:
-                    valueField.typedInput('types', DEFAULT_ENV_TYPE_LIST);
+                    valueField.typedInput('types',DEFAULT_ENV_TYPE_LIST)
            }
            if (ui.type === 'checkbox') {
                valueField.typedInput('type','bool');
@ -574,46 +556,8 @@ RED.editor.envVarList = (function() {
            }

        }).on("change", function(evt,type) {
-            const selectedType = $(this).typedInput('type') // the UI typedInput type
-            if(RED.editor.envVarList.debug) { console.log('envVarList: inputCellInput on:change. selectedType = ' + selectedType) }
-            if (selectedType === 'conf-types') {
-                const selectedConfigType = $(this).typedInput('value') || opt.type
-                let activeWorkspace = RED.nodes.workspace(RED.workspaces.active());
-                if (!activeWorkspace) {
-                    activeWorkspace = RED.nodes.subflow(RED.workspaces.active());
-                }
-
-                // get a list of all config nodes matching the selectedValue
-                const configNodes = [];
-                RED.nodes.eachConfig(function(config) {
-                    if (config.type == selectedConfigType && (!config.z || config.z === activeWorkspace.id)) {
-                        const modulePath = config._def?.set?.id || ''
-                        let label = RED.utils.getNodeLabel(config, config.id) || config.id;
-                        label += config.d ? ' ['+RED._('workspace.disabled')+']' : '';
-                        const _config = {
-                            _type: selectedConfigType,
-                            value: config.id,
-                            label: label,
-                            title: modulePath ? modulePath + ' - ' + label : label,
-                            enabled: config.d !== true,
-                            disabled: config.d === true,
-                        }
-                        configNodes.push(_config);
-                    }
-                });
-                const tiTypes = {
-                    value: selectedConfigType,
-                    label: "config",
-                    icon: "fa fa-cog",
-                    options: configNodes,
-                }
-                valueField.typedInput('types', [tiTypes]);
-                valueField.typedInput('type', selectedConfigType);
-                valueField.typedInput('value', opt.value);
-
-
-            } else if (ui.type === 'input') {
-                var types = uiInputTypeInput.typedInput('value');
+            if (ui.type === 'input') {
+                var types = inputCellInput.typedInput('value');
                ui.opts.types = (types === "") ? ["str"] : types.split(",");
                valueField.typedInput('types',ui.opts.types);
            }
@ -625,7 +569,7 @@ RED.editor.envVarList = (function() {
        })
        // Set the input to the right type. This will trigger the 'typedinputtypechange'
        // event handler (just above ^^) to update the value if needed
-        uiInputTypeInput.typedInput('type',ui.type)
+        inputCellInput.typedInput('type',ui.type)
    }

    function setLocale(l, list) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@ -27,12 +27,6 @@
        reader.readAsDataURL(file);
    }

-    function file2Text(file,cb) {
-        file.arrayBuffer().then(d => {
-            cb( new TextDecoder().decode(d) )
-        }).catch(ex => { cb(`error: ${ex}`) })
-    }
-
    var initialized = false;
    var currentEditor = null;
    /**
@ -58,8 +52,7 @@
                    if (files.length === 1) {
                        var file = files[0];
                        var name = file.name.toLowerCase();
-                        var fileType = file.type.toLowerCase();
-                        
+
                        if (name.match(/\.(apng|avif|gif|jpeg|png|svg|webp)$/)) {
                            file2base64Image(file, function (image) {
                                var session = currentEditor.getSession();
@ -70,30 +63,7 @@
                            });
                            return;
                        }
-
-                        if ( fileType.startsWith("text/") ) {
-                            file2Text(file, function (txt) {
-                                var session = currentEditor.getSession();
-                                var pos = session.getCursorPosition();
-                                session.insert(pos, txt);
-                                $("#red-ui-image-drop-target").hide();
-                            });
-                            return;
-                        }
-                        
                    }
-                } else if ($.inArray("text/plain", ev.originalEvent.dataTransfer.types) != -1) {
-                    let item = Object.values(ev.originalEvent.dataTransfer.items).filter(d => d.type == "text/plain")[0]
-
-                    if (item) {
-                         item.getAsString(txt => {
-                            var session = currentEditor.getSession();
-                            var pos = session.getCursorPosition();
-                            session.insert(pos, txt);
-                            $("#red-ui-image-drop-target").hide();
-                         })
-                         return
-                    }                    
                }
                $("#red-ui-image-drop-target").hide();
            });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
@ -11,22 +11,9 @@ RED.editor.mermaid = (function () {
            
            if (!initializing) {
                initializing = true
-                // Find the cache-buster:
-                let cacheBuster
-                $('script').each(function (i, el) { 
-                    if (!cacheBuster) {
-                        const src = el.getAttribute('src')
-                        const m = /\?v=(.+)$/.exec(src)
-                        if (m) {
-                            cacheBuster = m[1]
-                        }
-                    }
-                })
-                $.ajax({
-                    url: `vendor/mermaid/mermaid.min.js?v=${cacheBuster}`,
-                    dataType: "script",
-                    cache: true,
-                    success: function (data, stat, jqxhr) {
+                $.getScript(
+                    'vendor/mermaid/mermaid.min.js',
+                    function (data, stat, jqxhr) {
                        mermaid.initialize({
                            startOnLoad: false,
                            theme: RED.settings.get('mermaid', {}).theme
@ -37,7 +24,7 @@ RED.editor.mermaid = (function () {
                            render(pending)
                        }
                    }
-                });
+                )
            }
        } else {
            const nodes = document.querySelectorAll(selector)
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js
@ -20,31 +20,10 @@
            apply: function(editState) {
                var old_env = node.env;
                var new_env = [];
-
                if (/^subflow:/.test(node.type)) {
-                    // Get the list of environment variables from the node properties
                    new_env = RED.subflow.exportSubflowInstanceEnv(node);
                }

-                if (old_env && old_env.length) {
-                    old_env.forEach(function (prop) {
-                        if (prop.type === "conf-type" && prop.value) {
-                            const stillInUse = new_env?.some((p) => p.type === "conf-type" && p.name === prop.name && p.value === prop.value);
-                            if (!stillInUse) {
-                                // Remove the node from the config node users
-                                // Only for empty value or modified
-                                const configNode = RED.nodes.node(prop.value);
-                                if (configNode) {
-                                    if (configNode.users.indexOf(node) !== -1) {
-                                        configNode.users.splice(configNode.users.indexOf(node), 1);
-                                        RED.events.emit('nodes:change', configNode)
-                                    }
-                                }
-                            }
-                        }
-                    });
-                }
-
                // Get the values from the Properties table tab
                var items = this.list.editableList('items');
                items.each(function (i,el) {
@ -62,6 +41,7 @@
                    }
                });

+
                if (new_env && new_env.length > 0) {
                    new_env.forEach(function(prop) {
                        if (prop.type === "cred") {
@ -72,15 +52,6 @@
                                editState.changed = true;
                            }
                            delete prop.value;
-                        } else if (prop.type === "conf-type" && prop.value) {  
-                            const configNode = RED.nodes.node(prop.value);
-                            if (configNode) {
-                                if (configNode.users.indexOf(node) === -1) {
-                                    // Add the node to the config node users
-                                    configNode.users.push(node);
-                                    RED.events.emit('nodes:change', configNode);
-                                }
-                            }
                        }
                    });
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
@ -44,7 +44,6 @@
            apply: function(editState) {
                var newValue;
                var d;
-                // If the node is a subflow, the node's properties (exepts name) are saved by `envProperties`
                if (node._def.defaults) {
                    for (d in node._def.defaults) {
                        if (node._def.defaults.hasOwnProperty(d)) {
@ -132,16 +131,9 @@
                    }
                }
                if (node._def.credentials) {
-                    const credDefinition = node._def.credentials;
-                    const credChanges = updateNodeCredentials(node, credDefinition, this.inputClass);
-
-                    if (Object.keys(credChanges).length) {
-                        editState.changed = true;
-                        editState.changes.credentials = {
-                            ...(editState.changes.credentials || {}),
-                            ...credChanges
-                        };
-                    }
+                    var credDefinition = node._def.credentials;
+                    var credsChanged = updateNodeCredentials(node,credDefinition,this.inputClass);
+                    editState.changed = editState.changed || credsChanged;
                }
            }
        }
@ -169,11 +161,10 @@
     * @param node - the node containing the credentials
     * @param credDefinition - definition of the credentials
     * @param prefix - prefix of the input fields
-     * @return {object} an object containing the modified properties
+     * @return {boolean} whether anything has changed
     */
    function updateNodeCredentials(node, credDefinition, prefix) {
-        const changes = {};
-
+        var changed = false;
        if (!node.credentials) {
            node.credentials = {_:{}};
        } else if (!node.credentials._) {
@ -186,33 +177,22 @@
                if (input.length > 0) {
                    var value = input.val();
                    if (credDefinition[cred].type == 'password') {
-                        if (value === '__PWRD__') {
-                            // A cred value exists - no changes
-                        } else if (value === '' && node.credentials['has_' + cred] === false) {
-                            // Empty cred value exists - no changes
-                        } else if (value === node.credentials[cred]) {
-                            // A cred value exists locally in the editor - no changes
-                            // Like the user sets a value, saves the config,
-                            // reopens the config and save the config again
-                        } else {
-                            changes['has_' + cred] = node.credentials['has_' + cred];
-                            changes[cred] = node.credentials[cred];
-                            node.credentials[cred] = value;
+                        node.credentials['has_' + cred] = (value !== "");
+                        if (value == '__PWRD__') {
+                            continue;
                        }
+                        changed = true;

-                        node.credentials['has_' + cred] = (value !== '');
-                    } else {
-                        // Since these creds are loaded by the editor,
-                        // values can be directly compared
-                        if (value !== node.credentials[cred]) {
-                            changes[cred] = node.credentials[cred];
-                            node.credentials[cred] = value;
-                        }
+                    }
+                    node.credentials[cred] = value;
+                    if (value != node.credentials._[cred]) {
+                        changed = true;
                    }
                }
            }
        }
-
-        return changes;
+        return changed;
    }
+
+
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js
@ -153,6 +153,10 @@ RED.envVar = (function() {
    }

    function init(done) {
+        if (!RED.user.hasPermission("settings.write")) {
+            RED.notify(RED._("user.errors.settings"),"error");
+            return;
+        }
        RED.userSettings.add({
            id:'envvar',
            title: RED._("env-var.environment"),
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@ -245,15 +245,10 @@ RED.library = (function() {
                        if (lib.types && lib.types.indexOf(options.url) === -1) {
                            return;
                        }
-                        let icon = 'fa fa-hdd-o';
-                        if (lib.icon) {
-                            const fullIcon = RED.utils.separateIconPath(lib.icon);
-                            icon = (fullIcon.module==="font-awesome"?"fa ":"")+fullIcon.file;
-                        }
                        listing.push({
                            library: lib.id,
                            type: options.url,
-                            icon,
+                            icon: lib.icon || 'fa fa-hdd-o',
                            label: RED._(lib.label||lib.id),
                            path: "",
                            expanded: true,
@ -308,15 +303,10 @@ RED.library = (function() {
                        if (lib.types && lib.types.indexOf(options.url) === -1) {
                            return;
                        }
-                        let icon = 'fa fa-hdd-o';
-                        if (lib.icon) {
-                            const fullIcon = RED.utils.separateIconPath(lib.icon);
-                            icon = (fullIcon.module==="font-awesome"?"fa ":"")+fullIcon.file;
-                        }
                        listing.push({
                            library: lib.id,
                            type: options.url,
-                            icon,
+                            icon: lib.icon || 'fa fa-hdd-o',
                            label: RED._(lib.label||lib.id),
                            path: "",
                            expanded: true,
@ -849,10 +839,10 @@ RED.library = (function() {
                    if (file && file.label && !file.children) {
                        $.get("library/"+file.library+"/"+file.type+"/"+file.path, function(data) {
                            //TODO: nls + sanitize
-                            var propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("library.type")+'</td><td></td></tr>').appendTo(table);
+                            var propRow = $('<tr class="red-ui-help-info-row"><td>Type</td><td></td></tr>').appendTo(table);
                            $(propRow.children()[1]).text(activeLibrary.type);
                            if (file.props.hasOwnProperty('name')) {
-                                propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("library.name")+'</td><td>'+file.props.name+'</td></tr>').appendTo(table);
+                                propRow = $('<tr class="red-ui-help-info-row"><td>Name</td><td>'+file.props.name+'</td></tr>').appendTo(table);
                                $(propRow.children()[1]).text(file.props.name);
                            }
                            for (var p in file.props) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
@ -221,12 +221,12 @@ RED.notifications = (function() {
                    if (newType) {
                        n.className = "red-ui-notification red-ui-notification-"+newType;
                    }
-                    newTimeout = newOptions.hasOwnProperty('timeout')?newOptions.timeout:timeout
+
                    if (!fixed || newOptions.fixed === false) {
-                        newTimeout = newTimeout || 5000
+                        newTimeout = (newOptions.hasOwnProperty('timeout')?newOptions.timeout:timeout)||5000;
                    }
                    if (newOptions.buttons) {
-                        var buttonSet = $('<div class="ui-dialog-buttonset"></div>').appendTo(nn)
+                        var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(nn)
                        newOptions.buttons.forEach(function(buttonDef) {
                            var b = $('<button>').text(buttonDef.text).on("click", buttonDef.click).appendTo(buttonSet);
                            if (buttonDef.id) {
@ -272,15 +272,6 @@ RED.notifications = (function() {
                };
            })());
            n.timeoutid = window.setTimeout(n.close,timeout||5000);
-        } else if (timeout) {
-            $(n).on("click.red-ui-notification-close", (function() {
-                var nn = n;
-                return function() {
-                    nn.hideNotification();
-                    window.clearTimeout(nn.timeoutid);
-                };
-            })());
-            n.timeoutid = window.setTimeout(n.hideNotification,timeout||5000);
        }
        currentNotifications.push(n);
        if (options.id) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@ -133,7 +133,7 @@ RED.palette.editor = (function() {
        }).done(function(data,textStatus,xhr) {
            callback();
        }).fail(function(xhr,textStatus,err) {
-            callback(xhr,textStatus,err);
+            callback(xhr);
        });
    }
    function removeNodeModule(id,callback) {
@ -248,107 +248,87 @@ RED.palette.editor = (function() {
            var moduleInfo = nodeEntries[module].info;
            var nodeEntry = nodeEntries[module].elements;
            if (nodeEntry) {
-                if (moduleInfo.plugin) {
-                    nodeEntry.enableButton.hide();
-                    nodeEntry.removeButton.show();
+                var activeTypeCount = 0;
+                var typeCount = 0;
+                var errorCount = 0;
+                nodeEntry.errorList.empty();
+                nodeEntries[module].totalUseCount = 0;
+                nodeEntries[module].setUseCount = {};

-                    let pluginCount = 0;
-                    for (let setName in moduleInfo.sets) {
-                        if (moduleInfo.sets.hasOwnProperty(setName)) {
-                            let set = moduleInfo.sets[setName];
-                            if (set.plugins) {
-                                pluginCount += set.plugins.length;
+                for (var setName in moduleInfo.sets) {
+                    if (moduleInfo.sets.hasOwnProperty(setName)) {
+                        var inUseCount = 0;
+                        var set = moduleInfo.sets[setName];
+                        var setElements = nodeEntry.sets[setName];
+                        if (set.err) {
+                            errorCount++;
+                            var errMessage = set.err;
+                            if (set.err.message) {
+                                errMessage = set.err.message;
+                            } else if (set.err.code) {
+                                errMessage = set.err.code;
                            }
+                            $("<li>").text(errMessage).appendTo(nodeEntry.errorList);
                        }
-                    }
-                    
-                    nodeEntry.setCount.text(RED._('palette.editor.pluginCount',{count:pluginCount,label:pluginCount}));
-
-                } else {
-                    var activeTypeCount = 0;
-                    var typeCount = 0;
-                    var errorCount = 0;
-                    nodeEntry.errorList.empty();
-                    nodeEntries[module].totalUseCount = 0;
-                    nodeEntries[module].setUseCount = {};
-
-                    for (var setName in moduleInfo.sets) {
-                        if (moduleInfo.sets.hasOwnProperty(setName)) {
-                            var inUseCount = 0;
-                            const set = moduleInfo.sets[setName];
-                            const setElements = nodeEntry.sets[setName]
-
-                            if (set.err) {
-                                errorCount++;
-                                var errMessage = set.err;
-                                if (set.err.message) {
-                                    errMessage = set.err.message;
-                                } else if (set.err.code) {
-                                    errMessage = set.err.code;
-                                }
-                                $("<li>").text(errMessage).appendTo(nodeEntry.errorList);
-                            }
+                        if (set.enabled) {
+                            activeTypeCount += set.types.length;
+                        }
+                        typeCount += set.types.length;
+                        for (var i=0;i<moduleInfo.sets[setName].types.length;i++) {
+                            var t = moduleInfo.sets[setName].types[i];
+                            inUseCount += (typesInUse[t]||0);
+                            var swatch = setElements.swatches[t];
                            if (set.enabled) {
-                                activeTypeCount += set.types.length;
-                            }
-                            typeCount += set.types.length;
-                            for (var i=0;i<moduleInfo.sets[setName].types.length;i++) {
-                                var t = moduleInfo.sets[setName].types[i];
-                                inUseCount += (typesInUse[t]||0);
-                                if (setElements && set.enabled) {
-                                    var def = RED.nodes.getType(t);
-                                    if (def && def.color) {
-                                        setElements.swatches[t].css({background:RED.utils.getNodeColor(t,def)});
-                                        setElements.swatches[t].css({border: "1px solid "+getContrastingBorder(setElements.swatches[t].css('backgroundColor'))})
-                                    }
+                                var def = RED.nodes.getType(t);
+                                if (def && def.color) {
+                                    swatch.css({background:RED.utils.getNodeColor(t,def)});
+                                    swatch.css({border: "1px solid "+getContrastingBorder(swatch.css('backgroundColor'))})
                                }
                            }
-                            nodeEntries[module].setUseCount[setName] = inUseCount;
-                            nodeEntries[module].totalUseCount += inUseCount;
-
-                            if (setElements) {
-                                if (inUseCount > 0) {
-                                    setElements.enableButton.text(RED._('palette.editor.inuse'));
-                                    setElements.enableButton.addClass('disabled');
-                                } else {
-                                    setElements.enableButton.removeClass('disabled');
-                                    if (set.enabled) {
-                                        setElements.enableButton.text(RED._('palette.editor.disable'));
-                                    } else {
-                                        setElements.enableButton.text(RED._('palette.editor.enable'));
-                                    }
-                                }
-                                setElements.setRow.toggleClass("red-ui-palette-module-set-disabled",!set.enabled);
-                            }
                        }
-                    }
+                        nodeEntries[module].setUseCount[setName] = inUseCount;
+                        nodeEntries[module].totalUseCount += inUseCount;

-                    if (errorCount === 0) {
-                        nodeEntry.errorRow.hide()
-                    } else {
-                        nodeEntry.errorRow.show();
-                    }
-
-                    var nodeCount = (activeTypeCount === typeCount)?typeCount:activeTypeCount+" / "+typeCount;
-                    nodeEntry.setCount.text(RED._('palette.editor.nodeCount',{count:typeCount,label:nodeCount}));
-
-                    if (nodeEntries[module].totalUseCount > 0) {
-                        nodeEntry.enableButton.text(RED._('palette.editor.inuse'));
-                        nodeEntry.enableButton.addClass('disabled');
-                        nodeEntry.removeButton.hide();
-                    } else {
-                        nodeEntry.enableButton.removeClass('disabled');
-                        if (moduleInfo.local) {
-                            nodeEntry.removeButton.css('display', 'inline-block');
-                        }
-                        if (activeTypeCount === 0) {
-                            nodeEntry.enableButton.text(RED._('palette.editor.enableall'));
+                        if (inUseCount > 0) {
+                            setElements.enableButton.text(RED._('palette.editor.inuse'));
+                            setElements.enableButton.addClass('disabled');
                        } else {
-                            nodeEntry.enableButton.text(RED._('palette.editor.disableall'));
+                            setElements.enableButton.removeClass('disabled');
+                            if (set.enabled) {
+                                setElements.enableButton.text(RED._('palette.editor.disable'));
+                            } else {
+                                setElements.enableButton.text(RED._('palette.editor.enable'));
+                            }
                        }
-                        nodeEntry.container.toggleClass("disabled",(activeTypeCount === 0));
+                        setElements.setRow.toggleClass("red-ui-palette-module-set-disabled",!set.enabled);
                    }
                }
+
+                if (errorCount === 0) {
+                    nodeEntry.errorRow.hide()
+                } else {
+                    nodeEntry.errorRow.show();
+                }
+
+                var nodeCount = (activeTypeCount === typeCount)?typeCount:activeTypeCount+" / "+typeCount;
+                nodeEntry.setCount.text(RED._('palette.editor.nodeCount',{count:typeCount,label:nodeCount}));
+
+                if (nodeEntries[module].totalUseCount > 0) {
+                    nodeEntry.enableButton.text(RED._('palette.editor.inuse'));
+                    nodeEntry.enableButton.addClass('disabled');
+                    nodeEntry.removeButton.hide();
+                } else {
+                    nodeEntry.enableButton.removeClass('disabled');
+                    if (moduleInfo.local) {
+                        nodeEntry.removeButton.css('display', 'inline-block');
+                    }
+                    if (activeTypeCount === 0) {
+                        nodeEntry.enableButton.text(RED._('palette.editor.enableall'));
+                    } else {
+                        nodeEntry.enableButton.text(RED._('palette.editor.disableall'));
+                    }
+                    nodeEntry.container.toggleClass("disabled",(activeTypeCount === 0));
+                }
            }
            if (moduleInfo.pending_version) {
                nodeEntry.versionSpan.html(moduleInfo.version+' <i class="fa fa-long-arrow-right"></i> '+moduleInfo.pending_version).appendTo(nodeEntry.metaRow)
@ -698,33 +678,6 @@ RED.palette.editor = (function() {
                }
            }
        })
-
-        RED.events.on("registry:plugin-module-added", function(module) {
-
-            if (!nodeEntries.hasOwnProperty(module)) {
-                nodeEntries[module] = {info:RED.plugins.getModule(module)};
-                var index = [module];
-                for (var s in nodeEntries[module].info.sets) {
-                    if (nodeEntries[module].info.sets.hasOwnProperty(s)) {
-                        index.push(s);
-                        index = index.concat(nodeEntries[module].info.sets[s].types)
-                    }
-                }
-                nodeEntries[module].index = index.join(",").toLowerCase();
-                nodeList.editableList('addItem', nodeEntries[module]);
-            } else {
-                _refreshNodeModule(module);
-            }
-
-            for (var i=0;i<filteredList.length;i++) {
-                if (filteredList[i].info.id === module) {
-                    var installButton = filteredList[i].elements.installButton;
-                    installButton.addClass('disabled');
-                    installButton.text(RED._('palette.editor.installed'));
-                    break;
-                }
-            }
-        });
    }

    var settingsPane;
@ -851,7 +804,6 @@ RED.palette.editor = (function() {
                        errorRow: errorRow,
                        errorList: errorList,
                        setCount: setCount,
-                        setButton: setButton,
                        container: container,
                        shade: shade,
                        versionSpan: versionSpan,
@ -862,88 +814,49 @@ RED.palette.editor = (function() {
                        if (container.hasClass('expanded')) {
                            container.removeClass('expanded');
                            contentRow.slideUp();
-                            setTimeout(() => {
-                                contentRow.empty()
-                            }, 200)
-                            object.elements.sets = {}
                        } else {
                            container.addClass('expanded');
-                            populateSetList()
                            contentRow.slideDown();
                        }
                    })
-                    const populateSetList = function () {
-                        var setList = Object.keys(entry.sets)
-                        setList.sort(function(A,B) {
-                            return A.toLowerCase().localeCompare(B.toLowerCase());
-                        });
-                        setList.forEach(function(setName) {
-                            var set = entry.sets[setName];
-                            var setRow = $('<div>',{class:"red-ui-palette-module-set"}).appendTo(contentRow);
-                            var buttonGroup = $('<div>',{class:"red-ui-palette-module-set-button-group"}).appendTo(setRow);
-                            var typeSwatches = {};
-                            let enableButton;
-                            if (set.types) {
-                                set.types.forEach(function(t) {
-                                    var typeDiv = $('<div>',{class:"red-ui-palette-module-type"}).appendTo(setRow);
-                                    typeSwatches[t] = $('<span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
-                                    if (set.enabled) {
-                                        var def = RED.nodes.getType(t);
-                                        if (def && def.color) {
-                                            typeSwatches[t].css({background:RED.utils.getNodeColor(t,def)});
-                                            typeSwatches[t].css({border: "1px solid "+getContrastingBorder(typeSwatches[t].css('backgroundColor'))})
+
+                    var setList = Object.keys(entry.sets)
+                    setList.sort(function(A,B) {
+                        return A.toLowerCase().localeCompare(B.toLowerCase());
+                    });
+                    setList.forEach(function(setName) {
+                        var set = entry.sets[setName];
+                        var setRow = $('<div>',{class:"red-ui-palette-module-set"}).appendTo(contentRow);
+                        var buttonGroup = $('<div>',{class:"red-ui-palette-module-set-button-group"}).appendTo(setRow);
+                        var typeSwatches = {};
+                        set.types.forEach(function(t) {
+                            var typeDiv = $('<div>',{class:"red-ui-palette-module-type"}).appendTo(setRow);
+                            typeSwatches[t] = $('<span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
+                            $('<span>',{class:"red-ui-palette-module-type-node"}).text(t).appendTo(typeDiv);
+                        })
+                        var enableButton = $('<a href="#" class="red-ui-button red-ui-button-small"></a>').appendTo(buttonGroup);
+                        enableButton.on("click", function(evt) {
+                            evt.preventDefault();
+                            if (object.setUseCount[setName] === 0) {
+                                var currentSet = RED.nodes.registry.getNodeSet(set.id);
+                                shade.show();
+                                var newState = !currentSet.enabled
+                                changeNodeState(set.id,newState,shade,function(xhr){
+                                    if (xhr) {
+                                        if (xhr.responseJSON) {
+                                            RED.notify(RED._('palette.editor.errors.'+(newState?'enable':'disable')+'Failed',{module: id,message:xhr.responseJSON.message}));
                                        }
                                    }
-                                    $('<span>',{class:"red-ui-palette-module-type-node"}).text(t).appendTo(typeDiv);
-                                })
-                                enableButton = $('<a href="#" class="red-ui-button red-ui-button-small"></a>').appendTo(buttonGroup);
-                                enableButton.on("click", function(evt) {
-                                    evt.preventDefault();
-                                    if (object.setUseCount[setName] === 0) {
-                                        var currentSet = RED.nodes.registry.getNodeSet(set.id);
-                                        shade.show();
-                                        var newState = !currentSet.enabled
-                                        changeNodeState(set.id,newState,shade,function(xhr){
-                                            if (xhr) {
-                                                if (xhr.responseJSON) {
-                                                    RED.notify(RED._('palette.editor.errors.'+(newState?'enable':'disable')+'Failed',{module: id,message:xhr.responseJSON.message}));
-                                                }
-                                            }
-                                        });
-                                    }
-                                })
-
-                                if (object.setUseCount[setName] > 0) {
-                                    enableButton.text(RED._('palette.editor.inuse'));
-                                    enableButton.addClass('disabled');
-                                } else {
-                                    enableButton.removeClass('disabled');
-                                    if (set.enabled) {
-                                        enableButton.text(RED._('palette.editor.disable'));
-                                    } else {
-                                        enableButton.text(RED._('palette.editor.enable'));
-                                    }
-                                }
-                                setRow.toggleClass("red-ui-palette-module-set-disabled",!set.enabled);
-
-
-                            }
-                            if (set.plugins) {
-                                set.plugins.forEach(function(p) {
-                                    var typeDiv = $('<div>',{class:"red-ui-palette-module-type"}).appendTo(setRow);
-                                    // typeSwatches[p.id] = $('<span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
-                                    $('<span><i class="fa fa-puzzle-piece" aria-hidden="true"></i>  </span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
-                                    $('<span>',{class:"red-ui-palette-module-type-node"}).text(p.id).appendTo(typeDiv);
-                                })
+                                });
                            }
+                        })

-                            object.elements.sets[set.name] = {
-                                setRow: setRow,
-                                enableButton: enableButton,
-                                swatches: typeSwatches
-                            };
-                        });
-                    }
+                        object.elements.sets[set.name] = {
+                            setRow: setRow,
+                            enableButton: enableButton,
+                            swatches: typeSwatches
+                        };
+                    });
                    enableButton.on("click", function(evt) {
                        evt.preventDefault();
                        if (object.totalUseCount === 0) {
@ -1313,55 +1226,7 @@ RED.palette.editor = (function() {
                                                }
                                            }
                                        ]
-                                    });                                
-                                }
-                            } else {
-                                // dedicated list management for plugins
-                                if (entry.plugin) {
-
-                                    let e = nodeEntries[entry.name];
-                                    if (e) {
-                                        nodeList.editableList('removeItem', e);
-                                        delete nodeEntries[entry.name];
-                                    }
-
-                                    // We assume that a plugin that implements onremove
-                                    // cleans the editor accordingly of its left-overs.
-                                    let found_onremove = true;
-
-                                    let keys = Object.keys(entry.sets);
-                                    keys.forEach((key) => {
-                                        let set = entry.sets[key];
-                                        for (let i=0; i<set.plugins?.length; i++) {
-                                            let plgn = RED.plugins.getPlugin(set.plugins[i].id);
-                                            if (plgn && plgn.onremove  && typeof plgn.onremove === 'function') {
-                                                plgn.onremove();
-                                            } else {
-                                                if (plgn && plgn.onadd && typeof plgn.onadd === 'function') {
-                                                    // if there's no 'onadd', there shouldn't be any left-overs
-                                                    found_onremove = false;
-                                                }
-                                            }
-                                        }
-                                    });
-
-                                    if (!found_onremove) {
-                                        let removeNotify = RED.notify(RED._("palette.editor.confirm.removePlugin.body",{module:entry.name}),{
-                                            modal: true,
-                                            fixed: true,
-                                            type: 'warning',
-                                            buttons: [
-                                                {
-                                                    text: RED._("palette.editor.confirm.button.understood"),
-                                                    class:"primary",
-                                                    click: function(e) {
-                                                        removeNotify.close();
-                                                    }
-                                                }
-                                            ]
-                                        });
-                                    }
-                                }        
+                                    });                                }
                            }
                        })
                        notification.close();
@ -1405,28 +1270,9 @@ RED.palette.editor = (function() {
                    RED.actions.invoke("core:show-event-log");
                });
                RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.id+" "+entry.version);
-                installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr, textStatus,err) {
+                installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr) {
                    spinner.remove();
-                     if (err && xhr.status === 504) {
-                        var notification = RED.notify(RED._("palette.editor.errors.installTimeout"), {
-                            modal: true,
-                            fixed: true,
-                            buttons: [
-                                {
-                                    text: RED._("common.label.close"),
-                                    click: function() {
-                                        notification.close();
-                                    }
-                                },{
-                                    text: RED._("eventLog.view"),
-                                    click: function() {
-                                        notification.close();
-                                        RED.actions.invoke("core:show-event-log");
-                                    }
-                                }
-                            ]
-                        })
-                     } else if (xhr) {
+                     if (xhr) {
                         if (xhr.responseJSON) {
                             var notification = RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}),{
                                 type: 'error',
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@ -35,10 +35,6 @@ RED.palette = (function() {
    var categoryContainers = {};
    var sidebarControls;

-    let paletteState = { filter: "", collapsed: [] };
-
-    let filterRefreshTimeout
-
    function createCategory(originalCategory,rootCategory,category,ns) {
        if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
            createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
@ -64,57 +60,20 @@ RED.palette = (function() {
        catDiv.data('label',label);
        categoryContainers[category] = {
            container: catDiv,
-            hide: function (instant) {
-                if (instant) {
-                    catDiv.hide()
-                } else {
-                    catDiv.slideUp()
-                }
-            },
-            show: function () {
-                catDiv.show()
-            },
-            isOpen: function () {
-                return !!catDiv.hasClass("red-ui-palette-open")
-            },
-            getNodeCount: function (visibleOnly) {
-                const nodes = catDiv.find(".red-ui-palette-node")
-                if (visibleOnly) {
-                    return nodes.filter(function() { return $(this).css('display') !== 'none'}).length
-                } else {
-                    return nodes.length
-                }
-            },
-            close: function(instant, skipSaveState) {
+            close: function() {
                catDiv.removeClass("red-ui-palette-open");
                catDiv.addClass("red-ui-palette-closed");
-                if (instant) {
-                    $("#red-ui-palette-base-category-"+category).hide();
-                } else {
-                    $("#red-ui-palette-base-category-"+category).slideUp();
-                }
+                $("#red-ui-palette-base-category-"+category).slideUp();
                $("#red-ui-palette-header-"+category+" i").removeClass("expanded");
-                if (!skipSaveState) {
-                    if (!paletteState.collapsed.includes(category)) {
-                        paletteState.collapsed.push(category);
-                        savePaletteState();
-                    }
-                }
            },
-            open: function(skipSaveState) {
+            open: function() {
                catDiv.addClass("red-ui-palette-open");
                catDiv.removeClass("red-ui-palette-closed");
                $("#red-ui-palette-base-category-"+category).slideDown();
                $("#red-ui-palette-header-"+category+" i").addClass("expanded");
-                if (!skipSaveState) {
-                    if (paletteState.collapsed.includes(category)) {
-                        paletteState.collapsed.splice(paletteState.collapsed.indexOf(category), 1);
-                        savePaletteState();
-                    }
-                }
            },
            toggle: function() {
-                if (categoryContainers[category].isOpen()) {
+                if (catDiv.hasClass("red-ui-palette-open")) {
                    categoryContainers[category].close();
                } else {
                    categoryContainers[category].open();
@ -456,16 +415,8 @@ RED.palette = (function() {

            var categoryNode = $("#red-ui-palette-container-"+rootCategory);
            if (categoryNode.find(".red-ui-palette-node").length === 1) {
-                if (!paletteState?.collapsed?.includes(rootCategory)) {
-                    categoryContainers[rootCategory].open();
-                } else {
-                    categoryContainers[rootCategory].close(true);
-                }
+                categoryContainers[rootCategory].open();
            }
-            clearTimeout(filterRefreshTimeout)
-            filterRefreshTimeout = setTimeout(() => {
-                refreshFilter()
-            }, 200)

        }
    }
@ -565,8 +516,7 @@ RED.palette = (function() {
        paletteNode.css("backgroundColor", sf.color);
    }

-    function refreshFilter() {
-        const val = $("#red-ui-palette-search input").val()
+    function filterChange(val) {
        var re = new RegExp(val.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'),'i');
        $("#red-ui-palette-container .red-ui-palette-node").each(function(i,el) {
            var currentLabel = $(el).attr("data-palette-label");
@ -578,26 +528,16 @@ RED.palette = (function() {
            }
        });

-        for (let category in categoryContainers) {
+        for (var category in categoryContainers) {
            if (categoryContainers.hasOwnProperty(category)) {
-                const categorySection = categoryContainers[category]
-                if (categorySection.getNodeCount(true) === 0) {
-                    categorySection.hide()
+                if (categoryContainers[category].container
+                        .find(".red-ui-palette-node")
+                        .filter(function() { return $(this).css('display') !== 'none'}).length === 0) {
+                    categoryContainers[category].close();
+                    categoryContainers[category].container.slideUp();
                } else {
-                    categorySection.show()
-                    if (val) {
-                        // There is a filter being applied and it has matched
-                        // something in this category - show the contents
-                        categorySection.open(true)
-                    } else {
-                        // No filter. Only show the category if it isn't in lastState
-                        if (!paletteState.collapsed.includes(category)) {
-                            categorySection.open(true)
-                        } else if (categorySection.isOpen()) {
-                            // This section should be collapsed but isn't - so make it so
-                            categorySection.close(true, true)
-                        }
-                    }
+                    categoryContainers[category].open();
+                    categoryContainers[category].container.show();
                }
            }
        }
@ -613,9 +553,6 @@ RED.palette = (function() {

        $("#red-ui-palette > .red-ui-palette-spinner").show();

-        RED.events.on('logout', function () {
-            RED.settings.removeLocal('palette-state')
-        })

        RED.events.on('registry:node-type-added', function(nodeType) {
            var def = RED.nodes.getType(nodeType);
@ -659,14 +596,14 @@ RED.palette = (function() {

        RED.events.on("subflows:change",refreshSubflow);

+
+
        $("#red-ui-palette-search input").searchBox({
            delay: 100,
            change: function() {
-                refreshFilter();
-                paletteState.filter = $(this).val();
-                savePaletteState();
+                filterChange($(this).val());
            }
-        });
+        })

        sidebarControls = $('<div class="red-ui-sidebar-control-left"><i class="fa fa-chevron-left"></i></div>').appendTo($("#red-ui-palette"));
        RED.popover.tooltip(sidebarControls,RED._("keyboard.togglePalette"),"core:toggle-palette");
@ -732,23 +669,7 @@ RED.palette = (function() {
                togglePalette(state);
            }
        });
-
-        try {
-            paletteState = JSON.parse(RED.settings.getLocal("palette-state") || '{"filter":"", "collapsed": []}');
-            if (paletteState.filter) {
-                // Apply the category filter
-                $("#red-ui-palette-search input").searchBox("value", paletteState.filter);
-            }
-        } catch (error) {
-            console.error("Unexpected error loading palette state from localStorage: ", error);
-        }
-        setTimeout(() => {
-            // Lazily tidy up any categories that haven't been reloaded
-            paletteState.collapsed = paletteState.collapsed.filter(category => !!categoryContainers[category])
-            savePaletteState()
-        }, 10000)
    }
-
    function togglePalette(state) {
        if (!state) {
            $("#red-ui-main-container").addClass("red-ui-palette-closed");
@ -768,15 +689,6 @@ RED.palette = (function() {
        })
        return categories;
    }
-
-    function savePaletteState() {
-        try {
-            RED.settings.setLocal("palette-state", JSON.stringify(paletteState));
-        } catch (error) {
-            console.error("Unexpected error saving palette state to localStorage: ", error);
-        }
-    }
-
    return {
        init: init,
        add:addNodeType,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
@ -287,7 +287,7 @@ RED.projects.settings = (function() {
        var notInstalledCount = 0;

        for (var m in modulesInUse) {
-            if (modulesInUse.hasOwnProperty(m) && !activeProject.dependencies.hasOwnProperty(m)) {
+            if (modulesInUse.hasOwnProperty(m)) {
                depsList.editableList('addItem',{
                    id: modulesInUse[m].module,
                    version: modulesInUse[m].version,
@ -307,8 +307,8 @@ RED.projects.settings = (function() {

        if (activeProject.dependencies) {
            for (var m in activeProject.dependencies) {
-                if (activeProject.dependencies.hasOwnProperty(m)) {
-                    var installed = !!RED.nodes.registry.getModule(m) && activeProject.dependencies[m] === modulesInUse[m]?.version;
+                if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) {
+                    var installed = !!RED.nodes.registry.getModule(m);
                    depsList.editableList('addItem',{
                        id: m,
                        version: activeProject.dependencies[m], //RED.nodes.registry.getModule(module).version,
@ -1256,7 +1256,7 @@ RED.projects.settings = (function() {
                                            notification.close();
                                        }
                                    },{
-                                        text: RED._("sidebar.project.projectSettings.deleteBranch"),
+                                        text: 'Delete branch',
                                        click: function() {
                                            notification.close();
                                            var url = "projects/"+activeProject.name+"/branches/"+entry.name;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@ -909,19 +909,17 @@ RED.subflow = (function() {


    /**
-     * Build the edit dialog for a subflow template (creating/modifying a subflow template)
-     * @param {Object} uiContainer - the jQuery container for the environment variable list
-     * @param {Object} node - the subflow template node
+     * Create interface for controlling env var UI definition
     */
-    function buildEnvControl(uiContainer,node) {
+    function buildEnvControl(envList,node) {
        var tabs = RED.tabs.create({
            id: "subflow-env-tabs",
            onchange: function(tab) {
                if (tab.id === "subflow-env-tab-preview") {
                    var inputContainer = $("#subflow-input-ui");
-                    var list = uiContainer.editableList("items");
+                    var list = envList.editableList("items");
                    var exportedEnv = exportEnvList(list, true);
-                    buildEnvUI(inputContainer, exportedEnv, node);
+                    buildEnvUI(inputContainer, exportedEnv,node);
                }
                $("#subflow-env-tabs-content").children().hide();
                $("#" + tab.id).show();
@ -959,33 +957,12 @@ RED.subflow = (function() {
        RED.editor.envVarList.setLocale(locale);
    }

-    /**
-     * Build a UI row for a subflow instance environment variable
-     * Also used to build the UI row for subflow template preview
-     * @param {JQuery} row - A form row element
-     * @param {Object} tenv - A template environment variable
-     * @param {String} tenv.name - The name of the environment variable
-     * @param {String} tenv.type - The type of the environment variable
-     * @param {String} tenv.value - The value set for this environment variable
-     * @param {Object} tenv.parent - The parent environment variable
-     * @param {String} tenv.parent.value - The value set for the parent environment variable
-     * @param {String} tenv.parent.type - The type of the parent environment variable
-     * @param {Object} tenv.ui - The UI configuration for the environment variable
-     * @param {String} tenv.ui.icon - The icon for the environment variable
-     * @param {Object} tenv.ui.label - The label for the environment variable
-     * @param {String} tenv.ui.type - The type of the UI control for the environment variable
-     * @param {Object} node - The subflow instance node
-     */
-    function buildEnvUIRow(row, tenv, node) {
-        if(RED.subflow.debug) { console.log("buildEnvUIRow", tenv) }
-        const ui = tenv.ui || {}
+
+    function buildEnvUIRow(row, tenv, ui, node) {
        ui.label = ui.label||{};
        if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
            ui.type = "cred";
            ui.opts = {};
-        } else if (tenv.type === "conf-types") {
-            ui.type = "conf-types"
-            ui.opts = { types: ['conf-types'] }
        } else if (!ui.type) {
            ui.type = "input";
            ui.opts = { types: RED.editor.envVarList.DEFAULT_ENV_TYPE_LIST }
@ -1029,10 +1006,9 @@ RED.subflow = (function() {
        if (tenv.hasOwnProperty('type')) {
            val.type = tenv.type;
        }
-        const elId = getSubflowEnvPropertyName(tenv.name)
        switch(ui.type) {
            case "input":
-                input = $('<input type="text">').css('width','70%').attr('id', elId).appendTo(row);
+                input = $('<input type="text">').css('width','70%').appendTo(row);
                if (ui.opts.types && ui.opts.types.length > 0) {
                    var inputType = val.type;
                    if (ui.opts.types.indexOf(inputType) === -1) {
@ -1059,7 +1035,7 @@ RED.subflow = (function() {
                }
                break;
            case "select":
-                input = $('<select>').css('width','70%').attr('id', elId).appendTo(row);
+                input = $('<select>').css('width','70%').appendTo(row);
                if (ui.opts.opts) {
                    ui.opts.opts.forEach(function(o) {
                        $('<option>').val(o.v).text(RED.editor.envVarList.lookupLabel(o.l, o.l['en-US']||o.v, locale)).appendTo(input);
@ -1070,7 +1046,7 @@ RED.subflow = (function() {
            case "checkbox":
                label.css("cursor","default");
                var cblabel = $('<label>').css('width','70%').appendTo(row);
-                input = $('<input type="checkbox">').attr('id', elId).css({
+                input = $('<input type="checkbox">').css({
                    marginTop: 0,
                    width: 'auto',
                    height: '34px'
@ -1088,7 +1064,7 @@ RED.subflow = (function() {
                input.prop("checked",boolVal);
                break;
            case "spinner":
-                input = $('<input>').css('width','70%').attr('id', elId).appendTo(row);
+                input = $('<input>').css('width','70%').appendTo(row);
                var spinnerOpts = {};
                if (ui.opts.hasOwnProperty('min')) {
                    spinnerOpts.min = ui.opts.min;
@ -1100,7 +1076,7 @@ RED.subflow = (function() {
                input.val(val.value);
                break;
            case "cred":
-                input = $('<input type="password">').css('width','70%').attr('id', elId).appendTo(row);
+                input = $('<input type="password">').css('width','70%').appendTo(row);
                if (node.credentials) {
                    if (node.credentials[tenv.name]) {
                        input.val(node.credentials[tenv.name]);
@ -1117,25 +1093,18 @@ RED.subflow = (function() {
                    default: 'cred'
                })
                break;
-            case "conf-types":
-                // let clsId = 'config-node-input-' + val.type + '-' + val.value + '-' + Math.floor(Math.random() * 100000);
-                // clsId = clsId.replace(/\W/g, '-');
-                // input = $('<input>').css('width','70%').addClass(clsId).attr('id', elId).appendTo(row);
-                input = $('<input>').css('width','70%').attr('id', elId).appendTo(row);
-                const _type = tenv.parent?.type || tenv.type;
-                RED.editor.prepareConfigNodeSelect(node, tenv.name, _type, 'node-input-subflow-env', null, tenv);
-                break;
+        }
+        if (input) {
+            input.attr('id',getSubflowEnvPropertyName(tenv.name))
        }
    }

    /**
-     * Build the edit form for a subflow instance
-     * Also used to build the preview form in the subflow template edit dialog
+     * Create environment variable input UI
     * @param uiContainer - container for UI
     * @param envList - env var definitions of template
     */
    function buildEnvUI(uiContainer, envList, node) {
-        if(RED.subflow.debug) { console.log("buildEnvUI",envList) }
        uiContainer.empty();
        for (var i = 0; i < envList.length; i++) {
            var tenv = envList[i];
@ -1143,7 +1112,7 @@ RED.subflow = (function() {
                continue;
            }
            var row = $("<div/>", { class: "form-row" }).appendTo(uiContainer);
-            buildEnvUIRow(row, tenv, node);
+            buildEnvUIRow(row,tenv, tenv.ui || {}, node);
        }
    }
    // buildEnvUI
@ -1216,9 +1185,6 @@ RED.subflow = (function() {
                                        delete ui.opts
                                    }
                                    break;
-                                case "conf-types":
-                                    delete ui.opts;
-                                    break;
                                default:
                                    delete ui.opts;
                            }
@ -1241,9 +1207,8 @@ RED.subflow = (function() {
        if (/^subflow:/.test(node.type)) {
            var subflowDef = RED.nodes.subflow(node.type.substring(8));
            if (subflowDef.env) {
-                subflowDef.env.forEach(function(env, i) {
+                subflowDef.env.forEach(function(env) {
                    var item = {
-                        index: i,
                        name:env.name,
                        parent: {
                            type: env.type,
@ -1280,20 +1245,14 @@ RED.subflow = (function() {
                    var nodePropValue = nodeProp;
                    if (prop.ui && prop.ui.type === "cred") {
                        nodePropType = "cred";
-                    } else if (prop.ui && prop.ui.type === "conf-types") {
-                        nodePropType = prop.value.type
                    } else {
                        switch(typeof nodeProp) {
                            case "string": nodePropType = "str"; break;
                            case "number": nodePropType = "num"; break;
                            case "boolean": nodePropType = "bool"; nodePropValue = nodeProp?"true":"false"; break;
                            default:
-                                if (nodeProp) {
-                                    nodePropType = nodeProp.type;
-                                    nodePropValue = nodeProp.value;
-                                } else {
-                                    nodePropType = 'str'
-                                }
+                            nodePropType = nodeProp.type;
+                            nodePropValue = nodeProp.value;
                        }
                    }
                    var item = {
@ -1314,7 +1273,6 @@ RED.subflow = (function() {
    }

    function exportSubflowInstanceEnv(node) {
-        if(RED.subflow.debug) { console.log("exportSubflowInstanceEnv",node) }
        var env = [];
        // First, get the values for the SubflowTemplate defined properties
        //  - these are the ones with custom UI elements
@ -1346,7 +1304,7 @@ RED.subflow = (function() {
                        }
                        break;
                    case "cred":
-                        item.value = input.typedInput('value');
+                        item.value = input.val();
                        item.type = 'cred';
                        break;
                    case "spinner":
@ -1361,9 +1319,6 @@ RED.subflow = (function() {
                        item.type = 'bool';
                        item.value = ""+input.prop("checked");
                        break;
-                    case "conf-types":
-                        item.value = input.val() === "_ADD_" ? "" : input.val();
-                        item.type = "conf-type"
                }
                if (ui.type === "cred" || item.type !== data.parent.type || item.value !== data.parent.value) {
                    env.push(item);
@ -1377,15 +1332,8 @@ RED.subflow = (function() {
        return 'node-input-subflow-env-'+name.replace(/[^a-z0-9-_]/ig,"_");
    }

-    
-    /**
-     * Build the subflow edit form
-     * Called by subflow.oneditprepare for both instances and templates
-     * @param {"subflow"|"subflow-template"} type - the type of subflow being edited
-     * @param {Object} node - the node being edited
-     */
+    // Called by subflow.oneditprepare for both instances and templates
    function buildEditForm(type,node) {
-        if(RED.subflow.debug) { console.log("buildEditForm",type,node) }
        if (type === "subflow-template") {
            // This is the tabbed UI that offers the env list - with UI options
            // plus the preview tab
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
@ -56,16 +56,7 @@ RED.sidebar.config = (function() {
            } else {
                $('<span class="red-ui-palette-node-config-label" data-i18n="sidebar.config.'+name+'">').appendTo(header);
            }
-
            $('<span class="red-ui-sidebar-node-config-filter-info"></span>').appendTo(header);
-
-            const changeBadgeContainer = $('<svg class="red-ui-sidebar-config-category-changed red-ui-flow-node-changed" width="10" height="10" viewBox="-1 -1 12 12"></svg>').appendTo(header);
-            const changeBadge = document.createElementNS("http://www.w3.org/2000/svg", "circle");
-            changeBadge.setAttribute("cx", "5");
-            changeBadge.setAttribute("cy", "5");
-            changeBadge.setAttribute("r", "5");
-            changeBadgeContainer.append(changeBadge);
-
            category = $('<ul class="red-ui-palette-content red-ui-sidebar-node-config-list"></ul>').appendTo(container);
            category.on("click", function(e) {
                $(content).find(".red-ui-palette-node").removeClass("selected");
@ -159,6 +150,9 @@ RED.sidebar.config = (function() {
                    $('<li class="red-ui-palette-node-config-type">'+node.type+'</li>').appendTo(list);
                    currentType = node.type;
                }
+                if (node.changed) {
+                    labelText += "!!"
+                }
                var entry = $('<li class="red-ui-palette-node_id_'+node.id.replace(/\./g,"-")+'"></li>').appendTo(list);
                var nodeDiv = $('<div class="red-ui-palette-node-config red-ui-palette-node"></div>').appendTo(entry);
                entry.data('node',node.id);
@ -187,29 +181,15 @@ RED.sidebar.config = (function() {
                    }
                }

-                if (node.changed) {
-                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-changed" width="10" height="10" viewBox="-1 -1 12 12"></svg>').appendTo(nodeDiv);
-                    const changeBadge = document.createElementNS("http://www.w3.org/2000/svg", "circle");
-                    changeBadge.setAttribute("cx", "5");
-                    changeBadge.setAttribute("cy", "5");
-                    changeBadge.setAttribute("r", "5");
-                    nodeDivAnnotations.append($(changeBadge));
-
-                    const categoryHeader = list.parent().find(".red-ui-sidebar-config-tray-header.red-ui-palette-header");
-                    categoryHeader.addClass("red-ui-sidebar-config-changed");
-                    nodeDiv.addClass("red-ui-palette-node-config-changed");
-                }
-
                if (!node.valid) {
-                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-error" width="10" height="10"></svg>').appendTo(nodeDiv);
-                    const errorBadge = document.createElementNS("http://www.w3.org/2000/svg", "path");
-                    errorBadge.setAttribute("d", "M 0,9 l 10,0 -5,-8 z");
-                    nodeDivAnnotations.append($(errorBadge));
-
-                    nodeDiv.addClass("red-ui-palette-node-config-invalid");
+                    nodeDiv.addClass("red-ui-palette-node-config-invalid")
+                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-error" width="10" height="10"></svg>').appendTo(nodeDiv)
+                    const errorBadge = document.createElementNS("http://www.w3.org/2000/svg","path");
+                    errorBadge.setAttribute("d","M 0,9 l 10,0 -5,-8 z");
+                    nodeDivAnnotations.append($(errorBadge))
                    RED.popover.tooltip(nodeDivAnnotations, function () {
                        if (node.validationErrors && node.validationErrors.length > 0) {
-                            return RED._("editor.errors.invalidProperties") + "<br>  - " + node.validationErrors.join("<br>  - ");
+                            return RED._("editor.errors.invalidProperties")+"<br>  - "+node.validationErrors.join("<br>  - ")
                        }
                    })
                }
@ -272,10 +252,6 @@ RED.sidebar.config = (function() {
                $(this).remove();
                delete categories[id];
            }
-
-            // Remove the `changed` badge from the category header
-            const categoryHeader = $(this).find(".red-ui-sidebar-config-tray-header.red-ui-palette-header");
-            categoryHeader.removeClass("red-ui-sidebar-config-changed");
        })
        var globalConfigNodes = [];
        var configList = {};
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
@ -18,6 +18,8 @@ RED.sidebar.context = (function() {
    var content;
    var sections;

+    var localCache = {};
+
    var flowAutoRefresh;
    var nodeAutoRefresh;
    var nodeSection;
@ -25,8 +27,6 @@ RED.sidebar.context = (function() {
    var flowSection;
    var globalSection;

-    const expandedPaths = {}
-
    var currentNode;
    var currentFlow;

@ -212,41 +212,14 @@ RED.sidebar.context = (function() {
            var l = keys.length;
            for (var i = 0; i < l; i++) {
                sortedData[keys[i]].forEach(function(v) {
-                    const k = keys[i];
-                    let payload = v.msg;
-                    let format = v.format;
-                    const tools = $('<span class="button-group"></span>');
-                    expandedPaths[id + "." + k] = expandedPaths[id + "." + k] || new Set()
-                    const objectElementOptions = {
-                        typeHint: format,
-                        sourceId: id + "." + k,
-                        tools,
-                        path: k,
-                        rootPath: k,
-                        exposeApi: true,
-                        ontoggle: function(path,state) {
-                            path = path.substring(k.length+1)
-                            if (state) {
-                                expandedPaths[id+"."+k].add(path)
-                            } else {
-                                // if 'a' has been collapsed, we want to remove 'a.b' and 'a[0]...' from the set
-                                // of collapsed paths
-                                for (let expandedPath of expandedPaths[id+"."+k]) {
-                                    if (expandedPath.startsWith(path+".") || expandedPath.startsWith(path+"[")) {
-                                        expandedPaths[id+"."+k].delete(expandedPath)
-                                    }
-                                }
-                                expandedPaths[id+"."+k].delete(path)
-                            }
-                        },
-                        expandPaths: [ ...expandedPaths[id+"."+k] ].sort(),
-                        expandLeafNodes: true
-                    }
-                    const propRow = $('<tr class="red-ui-help-info-row"><td class="red-ui-sidebar-context-property"></td><td></td></tr>').appendTo(container);
-                    const obj = $(propRow.children()[0]);
+                    var k = keys[i];
+                    var l2 = sortedData[k].length;
+                    var propRow = $('<tr class="red-ui-help-info-row"><td class="red-ui-sidebar-context-property"></td><td></td></tr>').appendTo(container);
+                    var obj = $(propRow.children()[0]);
                    obj.text(k);
+                    var tools = $('<span class="button-group"></span>');
                    const urlSafeK = encodeURIComponent(k)
-                    const refreshItem = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-refresh"></i></button>').appendTo(tools).on("click", function(e) {
+                    var refreshItem = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-refresh"></i></button>').appendTo(tools).on("click", function(e) {
                        e.preventDefault();
                        e.stopPropagation();
                        $.getJSON(baseUrl+"/"+urlSafeK+"?store="+v.store, function(data) {
@ -256,14 +229,16 @@ RED.sidebar.context = (function() {
                                tools.detach();
                                $(propRow.children()[1]).empty();
                                RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
-                                    ...objectElementOptions,
                                    typeHint: data.format,
+                                    sourceId: id+"."+k,
+                                    tools: tools,
+                                    path: k
                                }).appendTo(propRow.children()[1]);
                            }
                        })
                    });
                    RED.popover.tooltip(refreshItem,RED._("sidebar.context.refrsh"));
-                    const deleteItem = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-trash"></i></button>').appendTo(tools).on("click", function(e) {
+                    var deleteItem = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-trash"></i></button>').appendTo(tools).on("click", function(e) {
                        e.preventDefault();
                        e.stopPropagation();
                        var popover = RED.popover.create({
@ -271,7 +246,7 @@ RED.sidebar.context = (function() {
                            target: propRow,
                            direction: "left",
                            content: function() {
-                                const content = $('<div>');
+                                var content = $('<div>');
                                $('<p data-i18n="sidebar.context.deleteConfirm"></p>').appendTo(content);
                                var row = $('<p>').appendTo(content);
                                var bg = $('<span class="button-group"></span>').appendTo(row);
@ -294,15 +269,16 @@ RED.sidebar.context = (function() {
                                                if (container.children().length === 0) {
                                                    $('<tr class="red-ui-help-info-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.empty"></td></tr>').appendTo(container).i18n();
                                                }
-                                                delete expandedPaths[id + "." + k]
                                            } else {
                                                payload = data.msg;
                                                format = data.format;
                                                tools.detach();
                                                $(propRow.children()[1]).empty();
                                                RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
-                                                    ...objectElementOptions,
-                                                    typeHint: data.format
+                                                    typeHint: data.format,
+                                                    sourceId: id+"."+k,
+                                                    tools: tools,
+                                                    path: k
                                                }).appendTo(propRow.children()[1]);
                                            }
                                        });
@ -317,7 +293,14 @@ RED.sidebar.context = (function() {

                    });
                    RED.popover.tooltip(deleteItem,RED._("sidebar.context.delete"));
-                    RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), objectElementOptions).appendTo(propRow.children()[1]);
+                    var payload = v.msg;
+                    var format = v.format;
+                    RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
+                        typeHint: v.format,
+                        sourceId: id+"."+k,
+                        tools: tools,
+                        path: k
+                    }).appendTo(propRow.children()[1]);
                    if (contextStores.length > 1) {
                        $("<span>",{class:"red-ui-sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))
                    }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@ -103,7 +103,7 @@ RED.sidebar.info.outliner = (function() {
                evt.stopPropagation();
                RED.search.show("type:subflow:"+n.id);
            })
-            RED.popover.tooltip(subflowInstanceBadge,function() { return RED._('subflow.subflowInstances',{count:n.instances.length})});
+            // RED.popover.tooltip(userCountBadge,function() { return RED._('editor.nodesUse',{count:n.users.length})});
        }
        if (n._def.category === "config" && n.type !== "group") {
            var userCountBadge = $('<button type="button" class="red-ui-info-outline-item-control-users red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').text(n.users.length).appendTo(controls).on("click",function(evt) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@ -204,7 +204,7 @@ RED.sidebar.info = (function() {

            propertiesPanelHeaderIcon.empty();
            RED.utils.createNodeIcon({type:"_selection_"}).appendTo(propertiesPanelHeaderIcon);
-            propertiesPanelHeaderLabel.text(RED._("sidebar.info.selection"));
+            propertiesPanelHeaderLabel.text("Selection");
            propertiesPanelHeaderReveal.hide();
            propertiesPanelHeaderHelp.hide();
            propertiesPanelHeaderCopyLink.hide();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
@ -435,15 +435,10 @@ RED.tourGuide = (function() {

    function listTour() {
        return [
-            {
-                id: "4_0",
-                label: "4.0",
-                path: "./tours/welcome.js"
-            },
            {
                id: "3_1",
                label: "3.1",
-                path: "./tours/3.1/welcome.js"
+                path: "./tours/welcome.js"
            },
            {
                id: "3_0",
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@ -264,7 +264,6 @@
                setTimeout(function() {
                    oldTray.tray.detach();
                    showTray(options);
-                    RED.events.emit('editor:change')
                },250)
            } else {
                if (stack.length > 0) {
@ -334,7 +333,6 @@
                        RED.view.focus();
                    } else {
                        stack[stack.length-1].tray.css("z-index", "auto");
-                        RED.events.emit('editor:change')
                    }
                },250)
            }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@ -279,11 +279,6 @@ RED.typeSearch = (function() {
        if ($("#red-ui-main-container").height() - opts.y - 195 < 0) {
            opts.y = opts.y - 275;
        }
-        const dialogWidth = dialog.width() || 300 // default is 300 (defined in class .red-ui-search)
-        const workspaceWidth = $('#red-ui-workspace').width()
-        if (workspaceWidth > dialogWidth && workspaceWidth - opts.x - dialogWidth < 0) {
-            opts.x = opts.x - (dialogWidth - RED.view.node_width)
-        }
        dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
        searchResultsDiv.slideDown(300);
        setTimeout(function() {
@ -335,25 +330,13 @@ RED.typeSearch = (function() {
        }
    }
    function applyFilter(filter,type,def) {
-        if (!filter) {
-            // No filter; allow everything
-            return true
-        }
-        if (type === 'junction') {
-            // Only allow Junction is there's no specific type filter
-            return !filter.type
-        }
-        if (filter.type) {
-            // Handle explicit type filter
-            return filter.type === type
-        }
-        if (!def) {
-            // No node definition available - allow it
-            return true
-        }
-        // Check if the filter is for input/outputs and apply
-        return (!filter.input || def.inputs > 0) &&
-                (!filter.output || def.outputs > 0)
+        return !def || !filter ||
+            (
+                (!filter.spliceMultiple) &&
+                (!filter.type || type === filter.type) &&
+                (!filter.input || type === 'junction' || def.inputs > 0) &&
+                (!filter.output || type === 'junction' || def.outputs > 0)
+            )
    }
    function refreshTypeList(opts) {
        var i;
@ -382,7 +365,7 @@ RED.typeSearch = (function() {
        var items = [];
        RED.nodes.registry.getNodeTypes().forEach(function(t) {
            var def = RED.nodes.getType(t);
-            if (def.set?.enabled !== false && def.category !== 'config' && t !== 'unknown' && t !== 'tab') {
+            if (def.category !== 'config' && t !== 'unknown' && t !== 'tab') {
                items.push({type:t,def: def, label:getTypeLabel(t,def)});
            }
        });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@ -230,7 +230,7 @@ RED.utils = (function() {
    var pinnedPaths = {};
    var formattedPaths = {};

-    function addMessageControls(obj,sourceId,key,msg,rootPath,strippedKey,extraTools,enablePinning) {
+    function addMessageControls(obj,sourceId,key,msg,rootPath,strippedKey,extraTools) {
        if (!pinnedPaths.hasOwnProperty(sourceId)) {
            pinnedPaths[sourceId] = {}
        }
@ -250,7 +250,7 @@ RED.utils = (function() {
            RED.clipboard.copyText(msg,copyPayload,"clipboard.copyMessageValue");
        })
        RED.popover.tooltip(copyPayload,RED._("node-red:debug.sidebar.copyPayload"));
-        if (enablePinning && strippedKey !== undefined && strippedKey !== '') {
+        if (strippedKey !== undefined && strippedKey !== '') {
            var isPinned = pinnedPaths[sourceId].hasOwnProperty(strippedKey);

            var pinPath = $('<button class="red-ui-button red-ui-button-small red-ui-debug-msg-tools-pin"><i class="fa fa-map-pin"></i></button>').appendTo(tools).on("click", function(e) {
@ -281,16 +281,13 @@ RED.utils = (function() {
            }
        }
    }
-    function checkExpanded(strippedKey, expandPaths, { minRange, maxRange, expandLeafNodes }) {
+    function checkExpanded(strippedKey,expandPaths,minRange,maxRange) {
        if (expandPaths && expandPaths.length > 0) {
            if (strippedKey === '' && minRange === undefined) {
                return true;
            }
            for (var i=0;i<expandPaths.length;i++) {
                var p = expandPaths[i];
-                if (expandLeafNodes && p === strippedKey) {
-                    return true
-                }
                if (p.indexOf(strippedKey) === 0 && (p[strippedKey.length] === "." ||  p[strippedKey.length] === "[") ) {

                    if (minRange !== undefined && p[strippedKey.length] === "[") {
@ -397,8 +394,6 @@ RED.utils = (function() {
        var sourceId = options.sourceId;
        var rootPath = options.rootPath;
        var expandPaths = options.expandPaths;
-        const enablePinning = options.enablePinning
-        const expandLeafNodes = options.expandLeafNodes;
        var ontoggle = options.ontoggle;
        var exposeApi = options.exposeApi;
        var tools = options.tools;
@ -421,11 +416,11 @@ RED.utils = (function() {
        }
        header = $('<span class="red-ui-debug-msg-row"></span>').appendTo(element);
        if (sourceId) {
-            addMessageControls(header,sourceId,path,obj,rootPath,strippedKey,tools, enablePinning);
+            addMessageControls(header,sourceId,path,obj,rootPath,strippedKey,tools);
        }
        if (!key) {
            element.addClass("red-ui-debug-msg-top-level");
-            if (sourceId && !expandPaths) {
+            if (sourceId) {
                var pinned = pinnedPaths[sourceId];
                expandPaths = [];
                if (pinned) {
@ -481,23 +476,13 @@ RED.utils = (function() {
                    $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-type-header"></span>').text(typeHint||'string').appendTo(header);
                    var row = $('<div class="red-ui-debug-msg-object-entry collapsed"></div>').appendTo(element);
                    $('<pre class="red-ui-debug-msg-type-string"></pre>').text(obj).appendTo(row);
-                },function(state) {if (ontoggle) { ontoggle(path,state);}}, checkExpanded(strippedKey, expandPaths, { expandLeafNodes }));
+                },function(state) {if (ontoggle) { ontoggle(path,state);}}, checkExpanded(strippedKey,expandPaths));
            }
            e = $('<span class="red-ui-debug-msg-type-string red-ui-debug-msg-object-header"></span>').html('"'+formatString(sanitize(obj))+'"').appendTo(entryObj);
            if (/^#[0-9a-f]{6}$/i.test(obj)) {
                $('<span class="red-ui-debug-msg-type-string-swatch"></span>').css('backgroundColor',obj).appendTo(e);
            }

-            let n = RED.nodes.node(obj) ?? RED.nodes.workspace(obj);
-            if (n) {
-                if (options.nodeSelector && "function" == typeof options.nodeSelector) {
-                    e.css('cursor', 'pointer').on("click", function(evt) {
-                        evt.preventDefault();
-                        options.nodeSelector(n.id);
-                    })
-                }
-            }
-
        } else if (typeof obj === 'number') {
            e = $('<span class="red-ui-debug-msg-type-number"></span>').appendTo(entryObj);

@ -597,16 +582,13 @@ RED.utils = (function() {
                                    typeHint: type==='buffer'?'hex':false,
                                    hideKey: false,
                                    path: path+"["+i+"]",
-                                    sourceId,
-                                    rootPath,
-                                    expandPaths,
-                                    expandLeafNodes,
-                                    ontoggle,
-                                    exposeApi,
+                                    sourceId: sourceId,
+                                    rootPath: rootPath,
+                                    expandPaths: expandPaths,
+                                    ontoggle: ontoggle,
+                                    exposeApi: exposeApi,
                                    // tools: tools // Do not pass tools down as we
                                                    // keep them attached to the top-level header
-                                    nodeSelector: options.nodeSelector,
-                                    enablePinning
                                }
                            ).appendTo(row);
                        }
@ -630,23 +612,20 @@ RED.utils = (function() {
                                                typeHint: type==='buffer'?'hex':false,
                                                hideKey: false,
                                                path: path+"["+i+"]",
-                                                sourceId,
-                                                rootPath,
-                                                expandPaths,
-                                                expandLeafNodes,
-                                                ontoggle,
-                                                exposeApi,
+                                                sourceId: sourceId,
+                                                rootPath: rootPath,
+                                                expandPaths: expandPaths,
+                                                ontoggle: ontoggle,
+                                                exposeApi: exposeApi,
                                                // tools: tools // Do not pass tools down as we
                                                                // keep them attached to the top-level header
-                                                nodeSelector: options.nodeSelector,
-                                                enablePinning
                                            }
                                        ).appendTo(row);
                                    }
                                }
                            })(),
                            (function() { var path = path+"["+i+"]"; return function(state) {if (ontoggle) { ontoggle(path,state);}}})(),
-                            checkExpanded(strippedKey,expandPaths,{ minRange, maxRange: Math.min(fullLength-1,(minRange+9)), expandLeafNodes}));
+                            checkExpanded(strippedKey,expandPaths,minRange,Math.min(fullLength-1,(minRange+9))));
                            $('<span class="red-ui-debug-msg-object-key"></span>').html("["+minRange+" &hellip; "+Math.min(fullLength-1,(minRange+9))+"]").appendTo(header);
                        }
                        if (fullLength < originalLength) {
@ -655,7 +634,7 @@ RED.utils = (function() {
                    }
                },
                function(state) {if (ontoggle) { ontoggle(path,state);}},
-                checkExpanded(strippedKey, expandPaths, { expandLeafNodes }));
+                checkExpanded(strippedKey,expandPaths));
            }
        } else if (typeof obj === 'object') {
            element.addClass('collapsed');
@ -689,16 +668,13 @@ RED.utils = (function() {
                                typeHint: false,
                                hideKey: false,
                                path: newPath,
-                                sourceId,
-                                rootPath,
-                                expandPaths,
-                                expandLeafNodes,
-                                ontoggle,
-                                exposeApi,
+                                sourceId: sourceId,
+                                rootPath: rootPath,
+                                expandPaths: expandPaths,
+                                ontoggle: ontoggle,
+                                exposeApi: exposeApi,
                                // tools: tools // Do not pass tools down as we
                                                // keep them attached to the top-level header
-                                nodeSelector: options.nodeSelector,
-                                enablePinning
                            }
                        ).appendTo(row);
                    }
@ -707,7 +683,7 @@ RED.utils = (function() {
                    }
                },
                function(state) {if (ontoggle) { ontoggle(path,state);}},
-                checkExpanded(strippedKey, expandPaths, { expandLeafNodes }));
+                checkExpanded(strippedKey,expandPaths));
            }
            if (key) {
                $('<span class="red-ui-debug-msg-type-meta"></span>').text(type).appendTo(entryObj);
@ -912,25 +888,11 @@ RED.utils = (function() {
        return parts;
    }

-    /**
-     * Validate a property expression
-     * @param {*} str - the property value
-     * @returns {boolean|string} whether the node proprty is valid. `true`: valid `false|String`: invalid
-     */
-    function validatePropertyExpression(str, opt) {
+    function validatePropertyExpression(str) {
        try {
-            const parts = normalisePropertyExpression(str);
+            var parts = normalisePropertyExpression(str);
            return true;
        } catch(err) {
-            // If the validator has opt, it is a 3.x validator that
-            // can return a String to mean 'invalid' and provide a reason
-            if (opt) {
-                if (opt.label) {
-                    return opt.label + ': ' + err.message;
-                }
-                return err.message;
-            }
-            // Otherwise, a 2.x returns a false value
            return false;
        }
    }
@ -948,24 +910,22 @@ RED.utils = (function() {
            // Allow ${ENV_VAR} value
            return true
        }
-        let error;
+        let error
        if (propertyType === 'json') {
            try {
                JSON.parse(propertyValue);
            } catch(err) {
                error = RED._("validator.errors.invalid-json", {
                    error: err.message
-                });
+                })
            }
        } else if (propertyType === 'msg' || propertyType === 'flow' || propertyType === 'global' ) {
-            // To avoid double label
-            const valid = RED.utils.validatePropertyExpression(propertyValue, opt ? {} : null);
-            if (valid !== true) {
-                error = opt ? valid : RED._("validator.errors.invalid-prop");
+            if (!RED.utils.validatePropertyExpression(propertyValue)) {
+                error = RED._("validator.errors.invalid-prop")
            }
        } else if (propertyType === 'num') {
            if (!/^NaN$|^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$|^[+-]?(0b|0B)[01]+$|^[+-]?(0o|0O)[0-7]+$|^[+-]?(0x|0X)[0-9a-fA-F]+$/.test(propertyValue)) {
-                error = RED._("validator.errors.invalid-num");
+                error = RED._("validator.errors.invalid-num")
            }
        } else if (propertyType === 'jsonata') {
            try { 
@ -973,16 +933,16 @@ RED.utils = (function() {
            } catch(err) {
                error = RED._("validator.errors.invalid-expr", {
                    error: err.message
-                });
+                })
            }
        }
        if (error) {
            if (opt && opt.label) {
-                return opt.label + ': ' + error;
+                return opt.label+': '+error
            }
-            return error;
+            return error
        }
-        return true;
+        return true
    }

    function getMessageProperty(msg,expr) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-annotations.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-annotations.js
@ -9,27 +9,14 @@ RED.view.annotations = (function() {
                    addAnnotation(evt.node.__pendingAnnotation__,evt);
                    delete evt.node.__pendingAnnotation__;
                }
-                let badgeRDX = 0;
-                let badgeLDX = 0;
-                const scale = RED.view.scale()
-                for (let i=0,l=evt.el.__annotations__.length;i<l;i++) {
-                    const annotation = evt.el.__annotations__[i];
+                var badgeDX = 0;
+                var controlDX = 0;
+                for (var i=0,l=evt.el.__annotations__.length;i<l;i++) {
+                    var annotation = evt.el.__annotations__[i];
                    if (annotations.hasOwnProperty(annotation.id)) {
-                        const opts = annotations[annotation.id];
-                        let showAnnotation = true;
-                        const isBadge = opts.type === 'badge';
-                        if (opts.refresh !== undefined) {
-                            let refreshAnnotation = false
-                            if (typeof opts.refresh === "string") {
-                                refreshAnnotation = !!evt.node[opts.refresh]
-                                delete evt.node[opts.refresh]
-                            } else if (typeof opts.refresh === "function") {
-                                refreshAnnotation = opts.refresh(evnt.node)
-                            }
-                            if (refreshAnnotation) {
-                                refreshAnnotationElement(annotation.id, annotation.node, annotation.element)
-                            }
-                        }
+                        var opts = annotations[annotation.id];
+                        var showAnnotation = true;
+                        var isBadge = opts.type === 'badge';
                        if (opts.show !== undefined) {
                            if (typeof opts.show === "string") {
                                showAnnotation = !!evt.node[opts.show]
@ -42,26 +29,17 @@ RED.view.annotations = (function() {
                        }
                        if (isBadge) {
                            if (showAnnotation) {
-                                // getBoundingClientRect is in real-world scale so needs to be adjusted according to
-                                // the current scale factor
-                                const rectWidth = annotation.element.getBoundingClientRect().width / scale;
-                                let annotationX
-                                if (!opts.align || opts.align === 'right') {
-                                    annotationX = evt.node.w - 3 - badgeRDX - rectWidth
-                                    badgeRDX += rectWidth + 4;
-
-                                } else if (opts.align === 'left') {
-                                    annotationX = 3 + badgeLDX
-                                    badgeLDX += rectWidth + 4;
-                                }
-                                annotation.element.setAttribute("transform", "translate("+annotationX+", -8)");
+                                var rect = annotation.element.getBoundingClientRect();
+                                badgeDX += rect.width;
+                                annotation.element.setAttribute("transform", "translate("+(evt.node.w-3-badgeDX)+", -8)");
+                                badgeDX += 4;
+                            }
+                        } else {
+                            if (showAnnotation) {
+                                var rect = annotation.element.getBoundingClientRect();
+                                annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
+                                controlDX += rect.width + 4;
                            }
-                        // } else {
-                        //     if (showAnnotation) {
-                        //         var rect = annotation.element.getBoundingClientRect();
-                        //         annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
-                        //         controlDX += rect.width + 4;
-                        //     }
                        }
                    } else {
                        annotation.element.parentNode.removeChild(annotation.element);
@ -117,25 +95,15 @@ RED.view.annotations = (function() {
        annotationGroup.setAttribute("class",opts.class || "");
        evt.el.__annotations__.push({
            id:id,
-            node: evt.node,
            element: annotationGroup
        });
-        refreshAnnotationElement(id, evt.node, annotationGroup)
-        evt.el.appendChild(annotationGroup);
-    }
-
-    function refreshAnnotationElement(id, node, annotationGroup) {
-        const opts = annotations[id];
-        const annotation = opts.element(node);
+        var annotation = opts.element(evt.node);
        if (opts.tooltip) {
-            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation, node, opts.tooltip));
+            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation,evt.node,opts.tooltip));
            annotation.addEventListener("mouseleave", annotationMouseLeave);
        }
-        if (annotationGroup.hasChildNodes()) {
-            annotationGroup.removeChild(annotationGroup.firstChild)
-        }
        annotationGroup.appendChild(annotation);
-
+        evt.el.appendChild(annotationGroup);
    }


--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
@ -1102,27 +1102,18 @@ RED.view.tools = (function() {
                    const paletteLabel = RED.utils.getPaletteLabel(n.type, nodeDef)
                    const defaultNodeNameRE = new RegExp('^'+paletteLabel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')+' (\\d+)$')
                    if (!typeIndex.hasOwnProperty(n.type)) {
-                        const existingNodes = RED.nodes.filterNodes({ type: n.type });
-                        const existingIds = existingNodes.reduce((ids, node) => {
-                            let match = defaultNodeNameRE.exec(node.name);
+                        const existingNodes = RED.nodes.filterNodes({type: n.type})
+                        let maxNameNumber = 0;
+                        existingNodes.forEach(n => {
+                            let match = defaultNodeNameRE.exec(n.name)
                            if (match) {
-                                const nodeNumber = parseInt(match[1], 10);
-                                if (!ids.includes(nodeNumber)) {
-                                    ids.push(nodeNumber);
+                                let nodeNumber = parseInt(match[1])
+                                if (nodeNumber > maxNameNumber) {
+                                    maxNameNumber = nodeNumber
                                }
                            }
-                            return ids;
-                        }, []).sort((a, b) => a - b);
-
-                        let availableNameNumber = 1;
-                        for (let i = 0; i < existingIds.length; i++) {
-                            if (existingIds[i] !== availableNameNumber) {
-                                break;
-                            }
-                            availableNameNumber++;
-                        }
-
-                        typeIndex[n.type] = availableNameNumber;
+                        })
+                        typeIndex[n.type] = maxNameNumber + 1
                    }
                    if ((options.renameBlank && n.name === '') || (options.renameClash && defaultNodeNameRE.test(n.name))) {
                        if (generateHistory) {
@ -1154,11 +1145,11 @@ RED.view.tools = (function() {
        }
    }

-    function addJunctionsToWires(options = {}) {
+    function addJunctionsToWires(wires) {
        if (RED.workspaces.isLocked()) {
            return
        }
-        let wiresToSplit = options.wires || (RED.view.selection().links && RED.view.selection().links.filter(e => !e.link));
+        let wiresToSplit = wires || (RED.view.selection().links && RED.view.selection().links.filter(e => !e.link));
        if (!wiresToSplit) {
            return
        }
@ -1206,26 +1197,21 @@ RED.view.tools = (function() {
            if (links.length === 0) {
                return
            }
-            if (addedJunctions.length === 0 && Object.hasOwn(options, 'x') && Object.hasOwn(options, 'y')) {
-                junction.x = options.x
-                junction.y = options.y
-            } else {
-                let pointCount = 0
-                links.forEach(function(l) {
-                    if (l._sliceLocation) {
-                        junction.x += l._sliceLocation.x
-                        junction.y += l._sliceLocation.y
-                        delete l._sliceLocation
-                        pointCount++
-                    } else {
-                        junction.x += l.source.x + l.source.w/2 + l.target.x - l.target.w/2
-                        junction.y += l.source.y + l.target.y
-                        pointCount += 2
-                    }
-                })
-                junction.x = Math.round(junction.x/pointCount)
-                junction.y = Math.round(junction.y/pointCount)
-            }
+            let pointCount = 0
+            links.forEach(function(l) {
+                if (l._sliceLocation) {
+                    junction.x += l._sliceLocation.x
+                    junction.y += l._sliceLocation.y
+                    delete l._sliceLocation
+                    pointCount++
+                } else {
+                    junction.x += l.source.x + l.source.w/2 + l.target.x - l.target.w/2
+                    junction.y += l.source.y + l.target.y
+                    pointCount += 2
+                }
+            })
+            junction.x = Math.round(junction.x/pointCount)
+            junction.y = Math.round(junction.y/pointCount)
            if (RED.view.snapGrid) {
                let gridSize = RED.view.gridSize()
                junction.x = (gridSize*Math.round(junction.x/gridSize));
@ -1415,7 +1401,7 @@ RED.view.tools = (function() {
            RED.actions.add("core:wire-multiple-to-node", function() { wireMultipleToNode() })

            RED.actions.add("core:split-wire-with-link-nodes", function () { splitWiresWithLinkNodes() });
-            RED.actions.add("core:split-wires-with-junctions", function (options) { addJunctionsToWires(options) });
+            RED.actions.add("core:split-wires-with-junctions", function () { addJunctionsToWires() });

            RED.actions.add("core:generate-node-names", generateNodeNames )

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@ -288,7 +288,7 @@ RED.view = (function() {
                }
                selectedLinks.clearUnselected()
            },
-            length: () => groups.size,
+            length: () => groups.length,
            forEach: (func) => { groups.forEach(func) },
            toArray: () => [...groups],
            clear: function () {
@ -321,8 +321,8 @@ RED.view = (function() {
            evt.stopPropagation()
            RED.contextMenu.show({
                type: 'workspace',
-                x: evt.clientX,
-                y: evt.clientY
+                x:evt.clientX-5,
+                y:evt.clientY-5
            })
            return false
        })
@ -1209,10 +1209,7 @@ RED.view = (function() {
            lasso = null;
        }
        if (d3.event.touches || d3.event.button === 0) {
-            if (
-                (mouse_mode === 0 && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) ||
-                mouse_mode === RED.state.QUICK_JOINING
-            ) {
+            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) {
                // Trigger quick add dialog
                d3.event.stopPropagation();
                clearSelection();
@ -1265,6 +1262,11 @@ RED.view = (function() {
        var targetGroup = options.group;
        var touchTrigger = options.touchTrigger;

+        if (targetGroup) {
+            selectedGroups.add(targetGroup,false);
+            RED.view.redraw();
+        }
+
        // `point` is the place in the workspace the mouse has clicked.
        //  This takes into account scrolling and scaling of the workspace.
        var ox = point[0];
@ -1283,6 +1285,7 @@ RED.view = (function() {
        }

        var mainPos = $("#red-ui-main-container").position();
+
        if (mouse_mode !== RED.state.QUICK_JOINING) {
            mouse_mode = RED.state.QUICK_JOINING;
            $(window).on('keyup',disableQuickJoinEventHandler);
@ -1586,6 +1589,9 @@ RED.view = (function() {
                // auto select dropped node - so info shows (if visible)
                clearSelection();
                nn.selected = true;
+                if (targetGroup) {
+                    selectedGroups.add(targetGroup,false);
+                }
                movingSet.add(nn);
                updateActiveNodes();
                updateSelection();
@ -2170,24 +2176,19 @@ RED.view = (function() {
                        n.n.moved = true;
                    }
                }
-                // If a node has moved and ends up being spliced into a link, keep
-                // track of which historyEvent to add the splice info to
-                let targetSpliceEvent = null
+
+                // Check to see if we need to splice a link
                if (moveEvent.nodes.length > 0) {
                    historyEvent.events.push(moveEvent)
-                    targetSpliceEvent = moveEvent
+                    if (activeSpliceLink) {
+                        var linkToSplice = d3.select(activeSpliceLink).data()[0];
+                        spliceLink(linkToSplice, movingSet.get(0).n, moveEvent)
+                    }
                }
                if (moveAndChangedGroupEvent.nodes.length > 0) {
                    historyEvent.events.push(moveAndChangedGroupEvent)
-                    targetSpliceEvent = moveAndChangedGroupEvent
                }
-                // activeSpliceLink will only be set if the movingSet has a single
-                // node that is able to splice.
-                if (targetSpliceEvent && activeSpliceLink) {
-                    var linkToSplice = d3.select(activeSpliceLink).data()[0];
-                    spliceLink(linkToSplice, movingSet.get(0).n, targetSpliceEvent)
-                }
-
+                
                // Only continue if something has moved
                if (historyEvent.events.length > 0) {
                    RED.nodes.dirty(true);
@ -2686,21 +2687,22 @@ RED.view = (function() {
                addToRemovedLinks(reconnectResult.removedLinks)
            }

-            const startDirty = RED.nodes.dirty();
-            let movingSelectedGroups = [];
+            var startDirty = RED.nodes.dirty();
+            var startChanged = false;
+            var selectedGroups = [];
            if (movingSet.length() > 0) {

                for (var i=0;i<movingSet.length();i++) {
                    node = movingSet.get(i).n;
                    if (node.type === "group") {
-                        movingSelectedGroups.push(node);
+                        selectedGroups.push(node);
                    }
                }
                // Make sure we have identified all groups about to be deleted
-                for (i=0;i<movingSelectedGroups.length;i++) {
-                    movingSelectedGroups[i].nodes.forEach(function(n) {
-                        if (n.type === "group" && movingSelectedGroups.indexOf(n) === -1) {
-                            movingSelectedGroups.push(n);
+                for (i=0;i<selectedGroups.length;i++) {
+                    selectedGroups[i].nodes.forEach(function(n) {
+                        if (n.type === "group" && selectedGroups.indexOf(n) === -1) {
+                            selectedGroups.push(n);
                        }
                    })
                }
@ -2717,7 +2719,7 @@ RED.view = (function() {
                        addToRemovedLinks(removedEntities.links);
                        if (node.g) {
                            var group = RED.nodes.group(node.g);
-                            if (movingSelectedGroups.indexOf(group) === -1) {
+                            if (selectedGroups.indexOf(group) === -1) {
                                // Don't use RED.group.removeFromGroup as that emits
                                // a change event on the node - but we're deleting it
                                var index = group.nodes.indexOf(node);
@ -2731,7 +2733,7 @@ RED.view = (function() {
                        removedLinks = removedLinks.concat(result.links);
                        if (node.g) {
                            var group = RED.nodes.group(node.g);
-                            if (movingSelectedGroups.indexOf(group) === -1) {
+                            if (selectedGroups.indexOf(group) === -1) {
                                // Don't use RED.group.removeFromGroup as that emits
                                // a change event on the node - but we're deleting it
                                var index = group.nodes.indexOf(node);
@ -2753,8 +2755,8 @@ RED.view = (function() {

                // Groups must be removed in the right order - from inner-most
                // to outermost.
-                for (i = movingSelectedGroups.length-1; i>=0; i--) {
-                    var g = movingSelectedGroups[i];
+                for (i = selectedGroups.length-1; i>=0; i--) {
+                    var g = selectedGroups[i];
                    removedGroups.push(g);
                    RED.nodes.removeGroup(g);
                }
@ -3055,8 +3057,8 @@ RED.view = (function() {
    }

    function disableQuickJoinEventHandler(evt) {
-        // Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari), or Escape
-        if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91 || evt.keyCode === 27) {
+        // Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari)
+        if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91) {
            resetMouseVars();
            hideDragLines();
            redraw();
@ -3187,59 +3189,27 @@ RED.view = (function() {

            for (i=0;i<drag_lines.length;i++) {
                if (portType != drag_lines[i].portType && mouseup_node !== drag_lines[i].node) {
-                    let drag_line = drag_lines[i];
-                    let src,dst,src_port;
-                    let oldDst;
-                    let oldSrc;
+                    var drag_line = drag_lines[i];
+                    var src,dst,src_port;
                    if (drag_line.portType === PORT_TYPE_OUTPUT) {
                        src = drag_line.node;
                        src_port = drag_line.port;
                        dst = mouseup_node;
-                        oldSrc = src;
-                        if (drag_line.link) {
-                            oldDst = drag_line.link.target;
-                        }
                    } else if (drag_line.portType === PORT_TYPE_INPUT) {
                        src = mouseup_node;
                        dst = drag_line.node;
                        src_port = portIndex || 0;
-                        oldSrc = dst;
-                        if (drag_line.link) {
-                            oldDst = drag_line.link.source
-                        }
                    }
                    var link = {source: src, sourcePort:src_port, target: dst};
                    if (drag_line.virtualLink) {
                        if (/^link (in|out)$/.test(src.type) && /^link (in|out)$/.test(dst.type) && src.type !== dst.type) {
                            if (src.links.indexOf(dst.id) === -1 && dst.links.indexOf(src.id) === -1) {
-                                var oldSrcLinks = [...src.links]
-                                var oldDstLinks = [...dst.links]
-
+                                var oldSrcLinks = $.extend(true,{},{v:src.links}).v
+                                var oldDstLinks = $.extend(true,{},{v:dst.links}).v
                                src.links.push(dst.id);
                                dst.links.push(src.id);
-
-                                if (oldDst) {
-                                    src.links = src.links.filter(id => id !== oldDst.id)
-                                    dst.links = dst.links.filter(id => id !== oldDst.id)
-                                    var oldOldDstLinks = [...oldDst.links]
-                                    oldDst.links = oldDst.links.filter(id => id !== oldSrc.id)
-                                    oldDst.dirty = true;
-                                    modifiedNodes.push(oldDst);
-                                    linkEditEvents.push({
-                                        t:'edit',
-                                        node: oldDst,
-                                        dirty: RED.nodes.dirty(),
-                                        changed: oldDst.changed,
-                                        changes: {
-                                            links:oldOldDstLinks
-                                        }
-                                    });
-                                    oldDst.changed = true;
-                                }
-
                                src.dirty = true;
                                dst.dirty = true;
-
                                modifiedNodes.push(src);
                                modifiedNodes.push(dst);

@ -3267,7 +3237,6 @@ RED.view = (function() {
                                        links:oldDstLinks
                                    }
                                });
-                               
                                src.changed = true;
                                dst.changed = true;
                            }
@ -5171,8 +5140,8 @@ RED.view = (function() {
                                var delta = Infinity;
                                for (var i = 0; i < lineLength; i++) {
                                    var linePos = pathLine.getPointAtLength(i);
-                                    var posDeltaX = Math.abs(linePos.x-(d3.event.offsetX / scaleFactor))
-                                    var posDeltaY = Math.abs(linePos.y-(d3.event.offsetY / scaleFactor))
+                                    var posDeltaX = Math.abs(linePos.x-d3.event.offsetX)
+                                    var posDeltaY = Math.abs(linePos.y-d3.event.offsetY)
                                    var posDelta = posDeltaX*posDeltaX + posDeltaY*posDeltaY
                                    if (posDelta < delta) {
                                        pos = linePos
@ -6297,10 +6266,6 @@ RED.view = (function() {
                            }
                        })
                    }
-                    if (selection.links) {
-                        selectedLinks.clear();
-                        selection.links.forEach(selectedLinks.add);
-                    }
                }
            }
            updateSelection();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@ -183,29 +183,25 @@ RED.workspaces = (function() {
            },
            null)
        }
-        if (RED.settings.theme("menu.menu-item-workspace-add", true)) {
+        menuItems.push(
+            {
+                id:"red-ui-tabs-menu-option-add-flow",
+                label: RED._("workspace.addFlow"),
+                onselect: "core:add-flow"
+            }
+        )
+        if (isMenuButton || !!tab) {
            menuItems.push(
                {
-                    id:"red-ui-tabs-menu-option-add-flow",
-                    label: RED._("workspace.addFlow"),
-                    onselect: "core:add-flow"
-                }
+                    id:"red-ui-tabs-menu-option-add-flow-right",
+                    label: RED._("workspace.addFlowToRight"),
+                    shortcut: RED.keyboard.getShortcut("core:add-flow-to-right"),
+                    onselect: function() {
+                        RED.actions.invoke("core:add-flow-to-right", tab)
+                    }
+                },
+                null
            )
-        }
-        if (isMenuButton || !!tab) {
-            if (RED.settings.theme("menu.menu-item-workspace-add", true)) {
-                menuItems.push(
-                    {
-                        id:"red-ui-tabs-menu-option-add-flow-right",
-                        label: RED._("workspace.addFlowToRight"),
-                        shortcut: RED.keyboard.getShortcut("core:add-flow-to-right"),
-                        onselect: function() {
-                            RED.actions.invoke("core:add-flow-to-right", tab)
-                        }
-                    },
-                    null
-                )
-            }
            if (activeWorkspace && activeWorkspace.type === 'tab') {
                menuItems.push(
                    isFlowDisabled ? {
@ -259,9 +255,7 @@ RED.workspaces = (function() {
                }
            )
        }
-        if (menuItems.length > 0) {
-            menuItems.push(null)
-        }
+        menuItems.push(null)
        if (isMenuButton || !!tab) {
            menuItems.push(
                {
@ -305,24 +299,19 @@ RED.workspaces = (function() {
            }
        )
        if (tab) {
-            menuItems.push(null)
-
-            if (RED.settings.theme("menu.menu-item-workspace-delete", true)) {
-                menuItems.push(
-                    {
-                        label: RED._("common.label.delete"),
-                        onselect: function() {
-                            if (tab.type === 'tab') {
-                                RED.workspaces.delete(tab)
-                            } else if (tab.type === 'subflow') {
-                                RED.subflow.delete(tab.id)
-                            }
-                        },
-                        disabled: isCurrentLocked || (workspaceTabCount === 1)
-                    }
-                )
-            }
            menuItems.push(
+                null,
+                {
+                    label: RED._("common.label.delete"),
+                    onselect: function() {
+                        if (tab.type === 'tab') {
+                            RED.workspaces.delete(tab)
+                        } else if (tab.type === 'subflow') {
+                            RED.subflow.delete(tab.id)
+                        }
+                    },
+                    disabled: isCurrentLocked || (workspaceTabCount === 1)
+                },
                {
                    label: RED._("menu.label.export"),
                    shortcut: RED.keyboard.getShortcut("core:show-export-dialog"),
@ -370,17 +359,11 @@ RED.workspaces = (function() {
                RED.sidebar.config.refresh();
                RED.view.focus();
            },
-            onclick: function(tab, evt) {
-                if(evt.which === 2) {
-                    evt.preventDefault();
-                    evt.stopPropagation();
-                    RED.actions.invoke("core:hide-flow", tab)
-                } else {
-                    if (tab.id !== activeWorkspace) {
-                        addToViewStack(activeWorkspace);
-                    }
-                    RED.view.focus();
+            onclick: function(tab) {
+                if (tab.id !== activeWorkspace) {
+                    addToViewStack(activeWorkspace);
                }
+                RED.view.focus();
            },
            ondblclick: function(tab) {
                if (tab.type != "subflow") {
@ -418,7 +401,6 @@ RED.workspaces = (function() {
                if (tab.type === "tab") {
                    workspaceTabCount--;
                } else {
-                    RED.events.emit("workspace:close",{workspace: tab.id})
                    hideStack.push(tab.id);
                }
                RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
@ -479,7 +461,7 @@ RED.workspaces = (function() {
            },
            minimumActiveTabWidth: 150,
            scrollable: true,
-            addButton: RED.settings.theme("menu.menu-item-workspace-add", true) ? "core:add-flow" : undefined,
+            addButton: "core:add-flow",
            addButtonCaption: RED._("workspace.addFlow"),
            menu: function() { return getMenuItems(true) },
            contextmenu: function(tab) { return getMenuItems(false, tab) }
@ -536,24 +518,19 @@ RED.workspaces = (function() {
        $(window).on("resize", function() {
            workspace_tabs.resize();
        });
-        if (RED.settings.theme("menu.menu-item-workspace-add", true)) {
-            RED.actions.add("core:add-flow",function(opts) { addWorkspace(undefined,undefined,opts?opts.index:undefined)});
-            RED.actions.add("core:add-flow-to-right",function(workspace) {
-                let index
-                if (workspace) {
-                    index = workspace_tabs.getTabIndex(workspace.id)+1
-                } else {
-                    index = workspace_tabs.activeIndex()+1
-                }
-                addWorkspace(undefined,undefined,index)
-            });
-        }
-        if (RED.settings.theme("menu.menu-item-workspace-edit", true)) {
-            RED.actions.add("core:edit-flow",editWorkspace);
-        }
-        if (RED.settings.theme("menu.menu-item-workspace-delete", true)) {
-            RED.actions.add("core:remove-flow",removeWorkspace);
-        }
+
+        RED.actions.add("core:add-flow",function(opts) { addWorkspace(undefined,undefined,opts?opts.index:undefined)});
+        RED.actions.add("core:add-flow-to-right",function(workspace) {
+            let index
+            if (workspace) {
+                index = workspace_tabs.getTabIndex(workspace.id)+1
+            } else {
+                index = workspace_tabs.activeIndex()+1
+            }
+            addWorkspace(undefined,undefined,index)
+        });
+        RED.actions.add("core:edit-flow",editWorkspace);
+        RED.actions.add("core:remove-flow",removeWorkspace);
        RED.actions.add("core:enable-flow",enableWorkspace);
        RED.actions.add("core:disable-flow",disableWorkspace);
        RED.actions.add("core:lock-flow",lockWorkspace);
@ -920,17 +897,6 @@ RED.workspaces = (function() {
            }
        },
        refresh: function() {
-            var workspace = RED.nodes.workspace(RED.workspaces.active());
-            if (workspace) {
-                document.title = `${documentTitle} : ${workspace.label}`;
-            } else {
-                var subflow = RED.nodes.subflow(RED.workspaces.active());
-                if (subflow) {
-                    document.title = `${documentTitle} : ${subflow.name}`;
-                } else {
-                    document.title = documentTitle
-                }
-            }
            RED.nodes.eachWorkspace(function(ws) {
                workspace_tabs.renameTab(ws.id,ws.label);
                $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
--- a/packages/node_modules/@node-red/editor-client/src/js/user.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/user.js
@ -168,37 +168,6 @@ RED.user = (function() {
                    }


-                } else {
-                    if (data.prompts) {
-                        if (data.loginMessage) {
-                            const sessionMessages = $("<div/>",{class:"form-row",style:"text-align: center"}).appendTo("#node-dialog-login-fields");
-                            $('<div>').text(data.loginMessage).appendTo(sessionMessages);
-                        }
-
-                        i = 0;
-                        for (;i<data.prompts.length;i++) {
-                            var field = data.prompts[i];
-                            var row = $("<div/>",{class:"form-row",style:"text-align: center"}).appendTo("#node-dialog-login-fields");
-                            var loginButton = $('<a href="#" class="red-ui-button"></a>',{style: "padding: 10px"}).appendTo(row).on("click", function() {
-                                document.location = field.url;
-                            });
-                            if (field.image) {
-                                $("<img>",{src:field.image}).appendTo(loginButton);
-                            } else if (field.label) {
-                                var label = $('<span></span>').text(field.label);
-                                if (field.icon) {
-                                    $('<i></i>',{class: "fa fa-2x "+field.icon, style:"vertical-align: middle"}).appendTo(loginButton);
-                                    label.css({
-                                        "verticalAlign":"middle",
-                                        "marginLeft":"8px"
-                                    });
-
-                                }
-                                label.appendTo(loginButton);
-                            }
-                            loginButton.button();
-                        }
-                    }
                }
                if (opts.cancelable) {
                    $("#node-dialog-login-cancel").button().on("click", function( event ) {
@ -218,7 +187,6 @@ RED.user = (function() {
    }

    function logout() {
-        RED.events.emit('logout')
        var tokens = RED.settings.get("auth-tokens");
        var token = tokens?tokens.access_token:"";
        $.ajax({
@ -243,8 +211,6 @@ RED.user = (function() {

    function updateUserMenu() {
        $("#red-ui-header-button-user-submenu li").remove();
-        const userMenu = $("#red-ui-header-button-user")
-        userMenu.empty()
        if (RED.settings.user.anonymous) {
            RED.menu.addItem("red-ui-header-button-user",{
                id:"usermenu-item-login",
@ -272,8 +238,7 @@ RED.user = (function() {
                }
            });
        }
-        const userIcon = generateUserIcon(RED.settings.user)
-        userIcon.appendTo(userMenu);
+
    }

    function init() {
@ -282,6 +247,14 @@ RED.user = (function() {

                var userMenu = $('<li><a id="red-ui-header-button-user" class="button hide" href="#"></a></li>')
                    .prependTo(".red-ui-header-toolbar");
+                if (RED.settings.user.image) {
+                    $('<span class="user-profile"></span>').css({
+                        backgroundImage: "url("+RED.settings.user.image+")",
+                    }).appendTo(userMenu.find("a"));
+                } else {
+                    $('<i class="fa fa-user"></i>').appendTo(userMenu.find("a"));
+                }
+
                RED.menu.init({id:"red-ui-header-button-user",
                    options: []
                });
@ -344,30 +317,12 @@ RED.user = (function() {
        return false;
    }

-    function generateUserIcon(user) {
-        const userIcon = $('<span class="red-ui-user-profile"></span>')
-        if (user.image) {
-            userIcon.addClass('has_profile_image')
-            userIcon.css({
-                backgroundImage: "url("+user.image+")",
-            })
-        } else if (user.anonymous || (!user.username && !user.email)) {
-            $('<i class="fa fa-user"></i>').appendTo(userIcon);
-        } else {
-            $('<span>').text((user.username || user.email).substring(0,2)).appendTo(userIcon);
-        }
-        if (user.profileColor !== undefined) {
-            userIcon.addClass('red-ui-user-profile-color-' + user.profileColor)
-        }
-        return userIcon
-    }

    return {
        init: init,
        login: login,
        logout: logout,
-        hasPermission: hasPermission,
-        generateUserIcon
+        hasPermission: hasPermission
    }

 })();
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@ -38,7 +38,7 @@ body {
 }
 #red-ui-main-container {
    position: absolute;
-    top: var(--red-ui-header-height); left:0; bottom: 0; right:0;
+    top:40px; left:0; bottom: 0; right:0;
    overflow:hidden;
 }

--- a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
@ -259,8 +259,7 @@ $deploy-button-background-disabled-hover: #555;

 $header-background: #000;
 $header-button-background-active: #121212;
-$header-accent: #C02020;
-$header-menu-color: #eee;
+$header-menu-color: #C7C7C7;
 $header-menu-color-disabled: #666;
 $header-menu-heading-color: #fff;
 $header-menu-sublabel-color: #aeaeae;
@ -314,16 +313,6 @@ $spinner-color: #999;

 $tab-icon-color: #dedede;

-// Anonymous User Colors
-
-$user-profile-colors: (
-    1: #822e81,
-    2: #955e42,
-    3: #9c914f,
-    4: #748e54,
-    5: #06bcc1
-);
-
 // Deprecated
 $text-color-green: $text-color-success;
 $info-text-code-color: $text-color-code;
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@ -23,20 +23,16 @@
    top: 0;
    left: 0;
    width: 100%;
-    height: var(--red-ui-header-height);
+    height: 40px;
    background: var(--red-ui-header-background);
    box-sizing: border-box;
    padding: 0px 0px 0px 20px;
    color: var(--red-ui-header-menu-color);
    font-size: 14px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 2px solid var(--red-ui-header-accent);
-    padding-top: 2px;

    span.red-ui-header-logo {
        float: left;
+        margin-top: 5px;
        font-size: 30px;
        line-height: 30px;
        text-decoration: none;
@ -46,7 +42,7 @@
            vertical-align: middle;
            font-size: 16px !important;
            &:not(:first-child) {
-                margin-left: 8px;
+                margin-left: 5px;
            }
        }
        img {
@ -63,29 +59,25 @@
    }

    .red-ui-header-toolbar {
-        display: flex;
-        align-items: stretch;
        padding: 0;
        margin: 0;
        list-style: none;
        float: right;

        > li {
-            display: inline-flex;
-            align-items: stretch;
+            display: inline-block;
            padding: 0;
            margin: 0;
            position: relative;
+
        }
    }

    .button {
-        height: 100%;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
        min-width: 20px;
        text-align: center;
+        line-height: 40px;
+        display: inline-block;
        font-size: 20px;
        padding: 0px 12px;
        text-decoration: none;
@ -186,20 +178,6 @@
        }
    }

-    .red-ui-deploy-button-group.readOnly {
-        .fa-caret-down { display: none; }
-        .fa-lock { display: inline-block; }
-    }
-    .red-ui-deploy-button-group:not(.readOnly) {
-        .fa-caret-down { display: inline-block; }
-        .fa-lock { display: none; }
-    }
-    .red-ui-deploy-button-group.readOnly {
-        a {
-            pointer-events: none;
-        }
-    }
-
    li.open .button {
        background: var(--red-ui-header-button-background-active);
        border-color: var(--red-ui-header-button-background-active);
@ -288,44 +266,18 @@
    #usermenu-item-username > .red-ui-menu-label {
        color: var(--red-ui-header-menu-heading-color);
    }
-}

-
-.red-ui-user-profile {
-    background-color: var(--red-ui-header-background);
-    border: 2px solid var(--red-ui-header-menu-color);
-    border-radius: 30px;
-    overflow: hidden;
-
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: contain;
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    vertical-align: middle;
-    width: 30px;
-    height: 30px;
-    font-size: 20px;
-
-    &.red-ui-user-profile-color-1 {
-        background-color: var(--red-ui-user-profile-colors-1);
-    }
-    &.red-ui-user-profile-color-2 {
-        background-color: var(--red-ui-user-profile-colors-2);
-    }
-    &.red-ui-user-profile-color-3 {
-        background-color: var(--red-ui-user-profile-colors-3);
-    }
-    &.red-ui-user-profile-color-4 {
-        background-color: var(--red-ui-user-profile-colors-4);
-    }
-    &.red-ui-user-profile-color-5 {
-        background-color: var(--red-ui-user-profile-colors-5);
+    #red-ui-header-button-user .user-profile {
+        background-position: center center;
+        background-repeat: no-repeat;
+        background-size: contain;
+        display: inline-block;
+        width: 40px;
+        height: 35px;
+        vertical-align: middle;
    }
 }

-
@media only screen and (max-width: 450px) {
    span.red-ui-header-logo > span {
        display: none;
--- a/packages/node_modules/@node-red/editor-client/src/sass/multiplayer.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/multiplayer.scss
@ -1,116 +0,0 @@
-#red-ui-multiplayer-user-list {
-    display: inline-flex;
-    align-items: center;
-    margin: 0 5px;
-    li {
-        display: inline-flex;
-        align-items: center;
-        margin: 0 2px;
-    }
-
-}
-
-.red-ui-multiplayer-user-icon {
-    background: none;
-    border: none;
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    box-sizing: border-box;
-    text-decoration: none;
-    color: var(--red-ui-header-menu-color);
-    padding: 0px;
-    margin: 0px;
-    vertical-align: middle;
-
-    &:focus {
-        outline: none;
-    }
-
-    .red-ui-multiplayer-user.inactive & {
-        opacity: 0.5;
-    }
-    .red-ui-user-profile {
-        width: 20px;
-        border-radius: 20px;
-        height: 20px;
-        font-size: 12px
-    }
-}
-.red-ui-multiplayer-users-tray {
-    position: absolute;
-    top: 5px;
-    right: 20px;
-    line-height: normal;
-    cursor: pointer;
-    // &:hover {
-    //     .red-ui-multiplayer-user-location {
-    //         margin-left: 1px;
-    //     }
-    // }
-}
-$multiplayer-user-icon-background: var(--red-ui-primary-background);
-$multiplayer-user-icon-border: var(--red-ui-view-background);
-$multiplayer-user-icon-text-color: var(--red-ui-header-menu-color);
-$multiplayer-user-icon-count-text-color: var(--red-ui-primary-color);
-$multiplayer-user-icon-shadow: 0px 0px 4px var(--red-ui-shadow);
-.red-ui-multiplayer-user-location {
-    display: inline-block;
-    margin-left: -6px;
-    transition: margin-left 0.2s;
-    .red-ui-user-profile {
-        border: 1px solid $multiplayer-user-icon-border;
-        color: $multiplayer-user-icon-text-color;
-        width: 18px;
-        height: 18px;
-        border-radius: 18px;
-        font-size: 10px;
-        font-weight: normal;
-        box-shadow: $multiplayer-user-icon-shadow;
-        &.red-ui-multiplayer-user-count {
-            color: $multiplayer-user-icon-count-text-color;
-            background-color: $multiplayer-user-icon-background;
-        }
-    }
-}
-
-.red-ui-multiplayer-annotation {
-    .red-ui-multiplayer-annotation-background {
-        filter: drop-shadow($multiplayer-user-icon-shadow);
-        fill: $multiplayer-user-icon-background;
-        &.red-ui-user-profile-color-1 {
-            fill: var(--red-ui-user-profile-colors-1);
-        }
-        &.red-ui-user-profile-color-2 {
-            fill: var(--red-ui-user-profile-colors-2);
-        }
-        &.red-ui-user-profile-color-3 {
-            fill: var(--red-ui-user-profile-colors-3);
-        }
-        &.red-ui-user-profile-color-4 {
-            fill: var(--red-ui-user-profile-colors-4);
-        }
-        &.red-ui-user-profile-color-5 {
-            fill: var(--red-ui-user-profile-colors-5);
-        }
-    }
-    .red-ui-multiplayer-annotation-border {
-        stroke: $multiplayer-user-icon-border;
-        stroke-width: 1px;
-        fill: none;
-    }
-    .red-ui-multiplayer-annotation-anon-label {
-        fill: $multiplayer-user-icon-text-color;
-        stroke: none;
-    }
-    text {
-        user-select: none;
-        fill: $multiplayer-user-icon-text-color;
-        stroke: none;
-        font-size: 10px;   
-        &.red-ui-multiplayer-user-count {
-            fill: $multiplayer-user-icon-count-text-color;
-        }     
-    }
-}
--- a/packages/node_modules/@node-red/editor-client/src/sass/sizes.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/sizes.scss
@ -1,17 +0,0 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
- $header-height: 48px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/style-custom-theme.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/style-custom-theme.scss
@ -15,5 +15,4 @@
 **/

@import "colors";
-@import "sizes";
@import "variables";
--- a/packages/node_modules/@node-red/editor-client/src/sass/style.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/style.scss
@ -15,7 +15,6 @@
 **/

@import "colors";
-@import "sizes";
@import "variables";
@import "mixins";

@ -73,5 +72,3 @@
@import "radialMenu";

@import "tourGuide";
-
-@import "multiplayer";
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
@ -84,11 +84,6 @@ ul.red-ui-sidebar-node-config-list {
    background: var(--red-ui-node-config-background);
    color: var(--red-ui-primary-text-color);
    cursor: pointer;
-    &.red-ui-palette-node-config-invalid.red-ui-palette-node-config-changed {
-        .red-ui-palette-node-annotations.red-ui-flow-node-error {
-            left: calc(100% - 28px);
-        }
-    }
 }
 ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
    color: var(--red-ui-secondary-text-color);
@ -120,15 +115,6 @@ ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
 .red-ui-palette-node-config-invalid {
    border-color: var(--red-ui-form-input-border-error-color)
 }
-.red-ui-sidebar-config-tray-header.red-ui-palette-header:not(.red-ui-sidebar-config-changed) .red-ui-flow-node-changed {
-    display: none;
-}
-.red-ui-sidebar-config-tray-header.red-ui-palette-header.red-ui-sidebar-config-changed .red-ui-flow-node-changed {
-    display: inline-block;
-    position: absolute;
-    top: 1px;
-    right: 1px;
-}
 .red-ui-palette-node-annotations {
    position: absolute;
    left: calc(100% - 15px);
--- a/packages/node_modules/@node-red/editor-client/src/sass/tabs.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tabs.scss
@ -151,9 +151,8 @@
    &.red-ui-tabs-add {
        padding-right: 29px;
    }
-    &.red-ui-tabs-add.red-ui-tabs-scrollable,
-    &.red-ui-tabs-menu.red-ui-tabs-scrollable {
-            padding-right: 53px;
+    &.red-ui-tabs-add.red-ui-tabs-scrollable {
+        padding-right: 53px;
    }
    &.red-ui-tabs-add.red-ui-tabs-menu.red-ui-tabs-scrollable,
    &.red-ui-tabs-add.red-ui-tabs-search.red-ui-tabs-scrollable {
@ -311,9 +310,8 @@
    }

 }
-.red-ui-tabs.red-ui-tabs-add .red-ui-tab-scroll-right,
-.red-ui-tabs.red-ui-tabs-menu .red-ui-tab-scroll-right {
-        right: 32px;
+.red-ui-tabs.red-ui-tabs-add .red-ui-tab-scroll-right {
+    right: 32px;
 }

 .red-ui-tabs.red-ui-tabs-add.red-ui-tabs-menu .red-ui-tab-scroll-right,
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/autoComplete.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/autoComplete.scss
@ -2,15 +2,4 @@
    &.red-ui-popover-panel {
        border-top: none;
    }
-
-
-}
-.red-ui-autoComplete-completion {
-    font-family: var(--red-ui-monospace-font);
-    white-space: nowrap;
-    overflow: hidden;
-    flex-grow: 1;
-    text-overflow: ellipsis;
-    direction: rtl;
-    text-align: left;
 }
--- a/packages/node_modules/@node-red/editor-client/src/sass/variables.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/variables.scss
@ -16,9 +16,6 @@

    --red-ui-shadow: #{$shadow};

-    // Header Height
-    --red-ui-header-height: #{$header-height};
-
 // Main body text
    --red-ui-primary-text-color: #{$primary-text-color};
 // UI control label text
@ -243,7 +240,6 @@


    --red-ui-header-background: #{$header-background};
-    --red-ui-header-accent: #{$header-accent};
    --red-ui-header-button-background-active: #{$header-button-background-active};
    --red-ui-header-menu-color: #{$header-menu-color};
    --red-ui-header-menu-color-disabled: #{$header-menu-color-disabled};
@ -299,7 +295,4 @@

    --red-ui-tab-icon-color: #{$tab-icon-color};

-    @each $current-color in 1 2 3 4 5 {
-        --red-ui-user-profile-colors-#{"" + $current-color}: #{map-get($user-profile-colors, $current-color)};
-    }
 }
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/welcome.js
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/welcome.js
@ -1,231 +0,0 @@
-export default {
-    version: "3.1.0",
-    steps: [
-        {
-            titleIcon: "fa fa-map-o",
-            title: {
-                "en-US": "Welcome to Node-RED 3.1!",
-                "ja": "Node-RED 3.1へようこそ!",
-                "fr": "Bienvenue dans Node-RED 3.1!"
-            },
-            description: {
-                "en-US": "<p>Let's take a moment to discover the new features in this release.</p>",
-                "ja": "<p>本リリースの新機能を見つけてみましょう。</p>",
-                "fr": "<p>Prenons un moment pour découvrir les nouvelles fonctionnalités de cette version.</p>"
-            }
-        },
-        {
-            title: {
-                "en-US": "New ways to work with groups",
-                "ja": "グループの新たな操作方法",
-                "fr": "De nouvelles façons de travailler avec les groupes"
-            },
-            description: {
-                "en-US": `<p>We have changed how you interact with groups in the editor.</p>
-                <ul>
-                    <li>They don't get in the way when clicking on a node</li>
-                    <li>They can be reordered using the Moving Forwards and Move Backwards actions</li>
-                    <li>Multiple nodes can be dragged into a group in one go</li>
-                    <li>Holding <code>Alt</code> when dragging a node will *remove* it from its group</li>
-                </ul>`,
-                "ja": `<p>エディタ上のグループの操作が変更されました。</p>
-                <ul>
-                    <li>グループ内のノードをクリックする時に、グループが邪魔をすることが無くなりました。</li>
-                    <li>「前面へ移動」と「背面へ移動」の動作を用いて、複数のグループの表示順序を変えることができます。</li>
-                    <li>グループ内へ一度に複数のノードをドラッグできるようになりました。</li>
-                    <li><code>Alt</code> を押したまま、グループ内のノードをドラッグすると、そのグループから *除く* ことができます。</li>
-                </ul>`,
-                "fr": `<p>Nous avons modifié la façon dont vous interagissez avec les groupes dans l'éditeur.</p>
-                <ul>
-                    <li>Ils ne gênent plus lorsque vous cliquez sur un noeud</li>
-                    <li>Ils peuvent être réorganisés à l'aide des actions Avancer et Reculer</li>
-                    <li>Plusieurs noeuds peuvent être glissés dans un groupe en une seule fois</li>
-                    <li>Maintenir <code>Alt</code> lors du déplacement d'un noeud le *supprimera* de son groupe</li>
-                </ul>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Change notification on tabs",
-                "ja": "タブ上の変更通知",
-                "fr": "Notification de changement sur les onglets"
-            },
-            image: '3.1/images/tab-changes.png',
-            description: {
-                "en-US": `<p>When a tab contains undeployed changes it now shows the
-                    same style of change icon used by nodes.</p>
-                    <p>This will make it much easier to track down changes when you're
-                    working across multiple flows.</p>`,
-                "ja": `<p>タブ内にデプロイされていない変更が存在する時は、ノードと同じスタイルで変更の印が表示されるようになりました。</p>
-                       <p>これによって複数のフローを編集している時に、変更を見つけるのが簡単になりました。</p>`,
-                "fr": `<p>Lorsqu'un onglet contient des modifications non déployées, il affiche désormais le
-                    même style d'icône de changement utilisé par les noeuds.</p>
-                    <p>Cela facilitera grandement le suivi des modifications lorsque vous
-                    travaillez sur plusieurs flux.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "A bigger canvas to work with",
-                "ja": "より広くなった作業キャンバス",
-                "fr": "Un canevas plus grand pour travailler"
-            },
-            description: {
-                "en-US": `<p>The default canvas size has been increased so you can fit more
-                into one flow.</p>
-                <p>We still recommend using tools such as subflows and Link Nodes to help
-                   keep things organised, but now you have more room to work in.</p>`,
-                "ja": `<p>標準のキャンバスが広くなったため、1つのフローに沢山のものを含めることができるようになりました。</p>
-                       <p>引き続き、サブフローやリンクノードなどの方法を用いて整理することをお勧めしますが、作業できる場所が増えました。</p>`,
-                "fr": `<p>La taille par défaut du canevas a été augmentée pour que vous puissiez en mettre plus
-                sur un seul flux.</p>
-                <p>Nous recommandons toujours d'utiliser des outils tels que les sous-flux et les noeuds de lien pour vous aider
-                   à garder les choses organisées, mais vous avez maintenant plus d'espace pour travailler.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Finding help",
-                "ja": "ヘルプを見つける",
-                "fr": "Trouver de l'aide"
-            },
-            image: '3.1/images/node-help.png',
-            description: {
-                "en-US": `<p>All node edit dialogs now include a link to that node's help
-                in the footer.</p>
-                <p>Clicking it will open up the Help sidebar showing the help for that node.</p>`,
-                "ja": `<p>全てのノードの編集ダイアログの下に、ノードのヘルプへのリンクが追加されました。</p>
-                       <p>これをクリックすると、ノードのヘルプサイドバーが表示されます。</p>`,
-                "fr": `<p>Toutes les boîtes de dialogue d'édition de noeud incluent désormais un lien vers l'aide de ce noeud
-                dans le pied de page.</p>
-                <p>Cliquer dessus ouvrira la barre latérale d'aide affichant l'aide pour ce noeud.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Improved Context Menu",
-                "ja": "コンテキストメニューの改善",
-                "fr": "Menu contextuel amélioré"
-            },
-            image: '3.1/images/context-menu.png',
-            description: {
-                "en-US": `<p>The editor's context menu has been expanded to make lots more of
-                        the built-in actions available.</p>
-                        <p>Adding nodes, working with groups and plenty
-                        of other useful tools are now just a click away.</p>
-                        <p>The flow tab bar also has its own context menu to make working
-                        with your flows much easier.</p>`,
-                "ja": `<p>より多くの組み込み動作を利用できるように、エディタのコンテキストメニューが拡張されました。</p>
-                       <p>ノードの追加、グループの操作、その他の便利なツールをクリックするだけで実行できるようになりました。</p>
-                       <p>フローのタブバーには、フローの操作をより簡単にする独自のコンテキストメニューもあります。</p>`,
-                "fr": `<p>Le menu contextuel de l'éditeur a été étendu pour faire beaucoup plus d'actions intégrées disponibles.</p>
-                <p>Ajouter des noeuds, travailler avec des groupes et beaucoup d'autres outils utiles sont désormais à portée de clic.</p>
-                <p>La barre d'onglets de flux possède également son propre menu contextuel pour faciliter l'utilisation de vos flux.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Hiding Flows",
-                "ja": "フローを非表示",
-                "fr": "Masquage de flux"
-            },
-            image: '3.1/images/hiding-flows.png',
-            description: {
-                "en-US": `<p>Hiding flows is now done through the flow context menu.</p>
-                          <p>The 'hide' button in previous releases has been removed from the tabs
-                             as they were being clicked accidentally too often.</p>`,
-                "ja": `<p>フローを非表示にする機能は、フローのコンテキストメニューから実行するようになりました。</p>
-                       <p>これまでのリリースでタブに存在していた「非表示」ボタンは、よく誤ってクリックされていたため、削除されました。</p>`,
-                "fr": `<p>Le masquage des flux s'effectue désormais via le menu contextuel du flux.</p>
-                <p>Le bouton "Masquer" des versions précédentes a été supprimé des onglets
-                   car il était cliqué accidentellement trop souvent.</p>`
-            },
-        },
-        {
-            title: {
-                "en-US": "Locking Flows",
-                "ja": "フローを固定",
-                "fr": "Verrouillage de flux"
-            },
-            image: '3.1/images/locking-flows.png',
-            description: {
-                "en-US": `<p>Flows can now be locked to prevent accidental changes being made.</p>
-                          <p>When locked you cannot modify the nodes in any way.</p>
-                          <p>The flow context menu provides the options to lock and unlock flows,
-                             as well as in the Info sidebar explorer.</p>`,
-                "ja": `<p>誤ってフローに変更が加えられてしまうのを防ぐために、フローを固定できるようになりました。</p>
-                       <p>固定されている時は、ノードを修正することはできません。</p>
-                       <p>フローのコンテキストメニューと、情報サイドバーのエクスプローラには、フローの固定や解除をするためのオプションが用意されています。</p>`,
-                "fr": `<p>Les flux peuvent désormais être verrouillés pour éviter toute modification accidentelle.</p>
-                <p>Lorsqu'il est verrouillé, vous ne pouvez en aucun cas modifier les noeuds.</p>
-                <p>Le menu contextuel du flux fournit les options pour verrouiller et déverrouiller les flux,
-                   ainsi que dans l'explorateur de la barre latérale d'informations.</p>`
-            },
-        },
-        {
-            title: {
-                "en-US": "Adding Images to node/flow descriptions",
-                "ja": "ノードやフローの説明へ画像を追加",
-                "fr": "Ajout d'images aux descriptions de noeud/flux"
-            },
-            // image: 'images/debug-path-tooltip.png',
-            description: {
-                "en-US": `<p>You can now add images to a node's or flows's description.</p>
-                          <p>Simply drag the image into the text editor and it will get added inline.</p>
-                          <p>When the description is shown in the Info sidebar, the image will be displayed.</p>`,
-                "ja": `<p>ノードまたはフローの説明に、画像を追加できるようになりました。</p>
-                       <p>画像をテキストエディタにドラッグするだけで、行内に埋め込まれます。</p>
-                       <p>情報サイドバーの説明を開くと、その画像が表示されます。</p>`,
-                "fr": `<p>Vous pouvez désormais ajouter des images à la description d'un noeud ou d'un flux.</p>
-                <p>Faites simplement glisser l'image dans l'éditeur de texte et elle sera ajoutée en ligne.</p>
-                <p>Lorsque la description s'affiche dans la barre latérale d'informations, l'image s'affiche.</p>`
-            },
-        },
-        {
-            title: {
-                "en-US": "Adding Mermaid Diagrams",
-                "ja": "Mermaid図を追加",
-                "fr": "Ajout de diagrammes Mermaid"
-            },
-            image: '3.1/images/mermaid.png',
-            description: {
-                "en-US": `<p>You can also add <a href="https://github.com/mermaid-js/mermaid">Mermaid</a> diagrams directly into your node or flow descriptions.</p>
-                          <p>This gives you much richer options for documenting your flows.</p>`,
-                "ja": `<p>ノードやフローの説明に、<a href="https://github.com/mermaid-js/mermaid">Mermaid</a>図を直接追加することもできます。</p>
-                       <p>これによって、フローを説明する文書作成の選択肢がより多くなります。</p>`,
-                "fr": `<p>Vous pouvez également ajouter des diagrammes <a href="https://github.com/mermaid-js/mermaid">Mermaid</a> directement dans vos descriptions de noeud ou de flux.</p>
-                <p>Cela vous offre des options beaucoup plus riches pour documenter vos flux.</p>`
-            },
-        },
-        {
-            title: {
-                "en-US": "Managing Global Environment Variables",
-                "ja": "グローバル環境変数の管理",
-                "fr": "Gestion des variables d'environnement globales"
-            },
-            image: '3.1/images/global-env-vars.png',
-            description: {
-                "en-US": `<p>You can set environment variables that apply to all nodes and flows in the new
-                          'Global Environment Variables' section of User Settings.</p>`,
-                "ja": `<p>ユーザ設定に新しく追加された「グローバル環境変数」のセクションで、全てのノードとフローに適用される環境変数を登録できます。</p>`,
-                "fr": `<p>Vous pouvez définir des variables d'environnement qui s'appliquent à tous les noeuds et flux dans la nouvelle
-                section "Global Environment Variables" des paramètres utilisateur.</p>`
-            },
-        },
-        {
-            title: {
-                "en-US": "Node Updates",
-                "ja": "ノードの更新",
-                "fr": "Mises à jour des noeuds"
-            },
-            // image: "images/",
-            description: {
-                "en-US": `<p>The core nodes have received lots of minor fixes, documentation updates and
-                          small enhancements. Check the full changelog in the Help sidebar for a full list.</p>`,
-                "ja": `<p>コアノードにマイナーな修正、ドキュメント更新、小規模な拡張が数多く追加されています。全ての一覧は、ヘルプサイドバーの全ての更新履歴を確認してください。</p>`,
-                "fr": `<p>Les noeuds principaux ont reçu de nombreux correctifs mineurs, mises à jour de la documentation et
-                petites améliorations. Consulter le journal des modifications complet dans la barre latérale d'aide.</p>`
-            }
-        }
-    ]
-}
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/context-menu.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/context-menu.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/global-env-vars.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/global-env-vars.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/hiding-flows.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/hiding-flows.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/locking-flows.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/locking-flows.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/mermaid.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/mermaid.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/node-help.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/node-help.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-auto-complete.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-auto-complete.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-background-deploy.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-background-deploy.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-config-select.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-config-select.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-diff-update.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-diff-update.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-multiplayer-location.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-multiplayer-location.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-multiplayer.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-multiplayer.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-plugins.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-plugins.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-sf-config.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-sf-config.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-timestamp-formatting.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/nr4-timestamp-formatting.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/tab-changes.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/3.1/images/tab-changes.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
+++ b/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
@ -1,12 +1,12 @@
 export default {
-    version: "4.0.0",
+    version: "3.1.0",
    steps: [
        {
            titleIcon: "fa fa-map-o",
            title: {
-                "en-US": "Welcome to Node-RED 4.0!",
-                "ja": "Node-RED 4.0 へようこそ!",
-                "fr": "Bienvenue dans Node-RED 4.0!"
+                "en-US": "Welcome to Node-RED 3.1!",
+                "ja": "Node-RED 3.1へようこそ!",
+                "fr": "Bienvenue dans Node-RED 3.1!"
            },
            description: {
                "en-US": "<p>Let's take a moment to discover the new features in this release.</p>",
@ -16,184 +16,202 @@ export default {
        },
        {
            title: {
-                "en-US": "Multiplayer Mode",
-                "ja": "複数ユーザ同時利用モード",
-                "fr": "Mode Multi-utilisateur"
+                "en-US": "New ways to work with groups",
+                "ja": "グループの新たな操作方法",
+                "fr": "De nouvelles façons de travailler avec les groupes"
            },
-            image: 'images/nr4-multiplayer-location.png',
            description: {
-                "en-US": `<p>This release includes the first small steps towards making Node-RED easier
-                to work with when you have multiple people editing flows at the same time.</p>
-                <p>When this feature is enabled, you will now see who else has the editor open and some
-                basic information on where they are in the editor.</p>
-                <p>Check the release post for details on how to enable this feature in your settings file.</p>`,
-                "ja": `<p>本リリースには、複数ユーザが同時にフローを編集する時に、Node-REDをより使いやすくするのための最初の微修正が入っています。</p>
-                <p>本機能を有効にすると、誰がエディタを開いているか、その人がエディタ上のどこにいるかの基本的な情報が表示されます。</p>
-                <p>設定ファイルで本機能を有効化する方法の詳細は、リリースの投稿を確認してください。</p>`,
-                "fr": `<p>Cette version inclut les premières étapes visant à rendre Node-RED plus facile à utiliser
-                lorsque plusieurs personnes modifient des flux en même temps.</p>
-                <p>Lorsque cette fonctionnalité est activée, vous pourrez désormais voir si d’autres utilisateurs ont
-                ouvert l'éditeur. Vous pourrez également savoir où ces utilisateurs se trouvent dans l'éditeur.</p>
-                <p>Consultez la note de publication pour plus de détails sur la façon d'activer cette fonctionnalité
-                dans votre fichier de paramètres.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Better background deploy handling",
-                "ja": "バックグラウンドのデプロイ処理の改善",
-                "fr": "Meilleure gestion du déploiement en arrière-plan"
-            },
-            image: 'images/nr4-background-deploy.png',
-            description: {
-                "en-US": `<p>If another user deploys changes whilst you are editing, we now use a more discrete notification
-                that doesn't stop you continuing your work - especially if they are being very productive and deploying lots
-                of changes.</p>`,
-                "ja": `他のユーザが変更をデプロイした時に、特に変更が多い生産的な編集作業を妨げないように通知するようになりました。`,
-                "fr": `<p>Si un autre utilisateur déploie des modifications pendant que vous êtes en train de modifier, vous recevrez
-                une notification plus discrète qu'auparavant qui ne vous empêche pas de continuer votre travail.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Improved flow diffs",
-                "ja": "フローの差分表示の改善",
-                "fr": "Amélioration des différences de flux"
-            },
-            image: 'images/nr4-diff-update.png',
-            description: {
-                "en-US": `<p>When viewing changes made to a flow, Node-RED now distinguishes between nodes that have had configuration
-                changes and those that have only been moved.<p>
-                <p>When faced with a long list of changes to look at, this makes it much easier to focus on more significant items.</p>`,
-                "ja": `<p>フローの変更内容を表示する時に、Node-REDは設定が変更されたノードと、移動されただけのノードを区別するようになりました。<p>
-                <p>これによって、多くの変更内容を確認する際に、重要な項目に焦点を当てることができます。</p>`,
-                "fr": `<p>Lors de l'affichage des modifications apportées à un flux, Node-RED fait désormais la distinction entre les
-                noeuds qui ont changé de configuration et ceux qui ont seulement été déplacés.<p>
-                <p>Face à une longue liste de changements à examiner, il est beaucoup plus facile de se concentrer sur les éléments les
-                plus importants.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Better Configuration Node UX",
-                "ja": "設定ノードのUXが向上",
-                "fr": "Meilleure expérience utilisateur du noeud de configuration"
-            },
-            image: 'images/nr4-config-select.png',
-            description: {
-                "en-US": `<p>The Configuration node selection UI has had a small update to have a dedicated 'add' button
-                next to the select box.</p>
-                <p>It's a small change, but should make it easier to work with your config nodes.</p>`,
-                "ja": `<p>設定ノードを選択するUIが修正され、選択ボックスの隣に専用の「追加」ボタンが追加されました。</p>
-                <p>微修正ですが設定ノードの操作が容易になります。</p>`,
-                "fr": `<p>L'interface utilisateur de la sélection du noeud de configuration a fait l'objet d'une petite
-                mise à jour afin de disposer d'un bouton « Ajouter » à côté de la zone de sélection.</p>
-                <p>C'est un petit changement, mais cela devrait faciliter le travail avec vos noeuds de configuration.</p>`
-            }
-        },
-        {
-            title: {
-                "en-US": "Timestamp formatting options",
-                "ja": "タイムスタンプの形式の項目",
-                "fr": "Options de formatage de l'horodatage"
-            },
-            image: 'images/nr4-timestamp-formatting.png',
-            description: {
-                "en-US": `<p>Nodes that let you set a timestamp now have options on what format that timestamp should be in.</p>
-                <p>We're keeping it simple to begin with by providing three options:<p>
+                "en-US": `<p>We have changed how you interact with groups in the editor.</p>
                <ul>
-                    <li>Milliseconds since epoch - this is existing behaviour of the timestamp option</li>
-                    <li>ISO 8601 - a common format used by many systems</li>
-                    <li>JavaScript Date Object</li>
+                    <li>They don't get in the way when clicking on a node</li>
+                    <li>They can be reordered using the Moving Forwards and Move Backwards actions</li>
+                    <li>Multiple nodes can be dragged into a group in one go</li>
+                    <li>Holding <code>Alt</code> when dragging a node will *remove* it from its group</li>
                </ul>`,
-                "ja": `<p>タイムスタンプを設定するノードに、タイムスタンプの形式を指定できる項目が追加されました。</p>
-                <p>次の3つの項目を追加したことで、簡単に選択できるようになりました:<p>
+                "ja": `<p>エディタ上のグループの操作が変更されました。</p>
                <ul>
-                    <li>エポックからのミリ秒 - 従来動作と同じになるタイムスタンプの項目</li>
-                    <li>ISO 8601 - 多くのシステムで使用されている共通の形式</li>
-                    <li>JavaScript日付オブジェクト</li>
+                    <li>グループ内のノードをクリックする時に、グループが邪魔をすることが無くなりました。</li>
+                    <li>「前面へ移動」と「背面へ移動」の動作を用いて、複数のグループの表示順序を変えることができます。</li>
+                    <li>グループ内へ一度に複数のノードをドラッグできるようになりました。</li>
+                    <li><code>Alt</code> を押したまま、グループ内のノードをドラッグすると、そのグループから *除く* ことができます。</li>
                </ul>`,
-                "fr": `<p>Les noeuds qui vous permettent de définir un horodatage disposent désormais d'options sur le format dans lequel cet horodatage peut être défini.</p>
-                <p>Nous gardons les choses simples en proposant trois options :<p>
+                "fr": `<p>Nous avons modifié la façon dont vous interagissez avec les groupes dans l'éditeur.</p>
                <ul>
-                    <li>Millisecondes depuis l'époque : il s'agit du comportement existant de l'option d'horodatage</li>
-                    <li>ISO 8601 : un format commun utilisé par de nombreux systèmes</li>
-                    <li>Objet Date JavaScript</li>
+                    <li>Ils ne gênent plus lorsque vous cliquez sur un noeud</li>
+                    <li>Ils peuvent être réorganisés à l'aide des actions Avancer et Reculer</li>
+                    <li>Plusieurs noeuds peuvent être glissés dans un groupe en une seule fois</li>
+                    <li>Maintenir <code>Alt</code> lors du déplacement d'un noeud le *supprimera* de son groupe</li>
                </ul>`
            }
        },
        {
            title: {
-                "en-US": "Auto-complete of flow/global and env types",
-                "ja": "フロー/グローバル、環境変数の型の自動補完",
-                "fr": "Saisie automatique des types de flux/global et env"
+                "en-US": "Change notification on tabs",
+                "ja": "タブ上の変更通知",
+                "fr": "Notification de changement sur les onglets"
            },
-            image: 'images/nr4-auto-complete.png',
+            image: 'images/tab-changes.png',
            description: {
-                "en-US": `<p>The <code>flow</code>/<code>global</code> context inputs and the <code>env</code> input
-                now all include auto-complete suggestions based on the live state of your flows.</p>
-                `,
-                "ja": `<p><code>flow</code>/<code>global</code>コンテキストや<code>env</code>の入力を、現在のフローの状態をもとに自動補完で提案するようになりました。</p>
-                `,
-                "fr": `<p>Les entrées contextuelles <code>flow</code>/<code>global</code> et l'entrée <code>env</code>
-                incluent désormais des suggestions de saisie semi-automatique basées sur l'état actuel de vos flux.</p>
-                `,
+                "en-US": `<p>When a tab contains undeployed changes it now shows the
+                    same style of change icon used by nodes.</p>
+                    <p>This will make it much easier to track down changes when you're
+                    working across multiple flows.</p>`,
+                "ja": `<p>タブ内にデプロイされていない変更が存在する時は、ノードと同じスタイルで変更の印が表示されるようになりました。</p>
+                       <p>これによって複数のフローを編集している時に、変更を見つけるのが簡単になりました。</p>`,
+                "fr": `<p>Lorsqu'un onglet contient des modifications non déployées, il affiche désormais le
+                    même style d'icône de changement utilisé par les noeuds.</p>
+                    <p>Cela facilitera grandement le suivi des modifications lorsque vous
+                    travaillez sur plusieurs flux.</p>`
            }
        },
        {
            title: {
-                "en-US": "Config node customisation in Subflows",
-                "ja": "サブフローでの設定ノードのカスタマイズ",
-                "fr": "Personnalisation du noeud de configuration dans les sous-flux"
+                "en-US": "A bigger canvas to work with",
+                "ja": "より広くなった作業キャンバス",
+                "fr": "Un canevas plus grand pour travailler"
            },
-            image: 'images/nr4-sf-config.png',
            description: {
-                "en-US": `<p>Subflows can now be customised to allow each instance to use a different
-                config node of a selected type.</p>
-                <p>For example, each instance of a subflow that connects to an MQTT Broker and does some post-processing
-                of the messages received can be pointed at a different broker.</p>
-                `,
-                "ja": `<p>サブフローをカスタマイズして、選択した型の異なる設定ノードを各インスタンスが使用できるようになりました。</p>
-                <p>例えば、MQTTブローカへ接続し、メッセージ受信と後処理を行うサブフローの各インスタンスに異なるブローカを指定することも可能です。</p>
-                `,
-                "fr": `<p>Les sous-flux peuvent désormais être personnalisés pour permettre à chaque instance d'utiliser un
-                noeud de configuration d'un type sélectionné.</p>
-                <p>Par exemple, chaque instance d'un sous-flux qui se connecte à un courtier MQTT et effectue un post-traitement
-                des messages reçus peut être pointée vers un autre courtier.</p>
-                `
+                "en-US": `<p>The default canvas size has been increased so you can fit more
+                into one flow.</p>
+                <p>We still recommend using tools such as subflows and Link Nodes to help
+                   keep things organised, but now you have more room to work in.</p>`,
+                "ja": `<p>標準のキャンバスが広くなったため、1つのフローに沢山のものを含めることができるようになりました。</p>
+                       <p>引き続き、サブフローやリンクノードなどの方法を用いて整理することをお勧めしますが、作業できる場所が増えました。</p>`,
+                "fr": `<p>La taille par défaut du canevas a été augmentée pour que vous puissiez en mettre plus
+                sur un seul flux.</p>
+                <p>Nous recommandons toujours d'utiliser des outils tels que les sous-flux et les noeuds de lien pour vous aider
+                   à garder les choses organisées, mais vous avez maintenant plus d'espace pour travailler.</p>`
            }
        },
        {
            title: {
-                "en-US": "Remembering palette state",
-                "ja": "パレットの状態を維持",
-                "fr": "Mémorisation de l'état de la palette"
+                "en-US": "Finding help",
+                "ja": "ヘルプを見つける",
+                "fr": "Trouver de l'aide"
            },
+            image: 'images/node-help.png',
            description: {
-                "en-US": `<p>The palette now remembers what categories you have hidden between reloads - as well as any
-                filter you have applied.</p>`,
-                "ja": `<p>パレット上で非表示にしたカテゴリや適用したフィルタが、リロードしても記憶されるようになりました。</p>`,
-                "fr": `<p>La palette se souvient désormais des catégories que vous avez masquées entre les rechargements,
-                ainsi que le filtre que vous avez appliqué.</p>`
+                "en-US": `<p>All node edit dialogs now include a link to that node's help
+                in the footer.</p>
+                <p>Clicking it will open up the Help sidebar showing the help for that node.</p>`,
+                "ja": `<p>全てのノードの編集ダイアログの下に、ノードのヘルプへのリンクが追加されました。</p>
+                       <p>これをクリックすると、ノードのヘルプサイドバーが表示されます。</p>`,
+                "fr": `<p>Toutes les boîtes de dialogue d'édition de noeud incluent désormais un lien vers l'aide de ce noeud
+                dans le pied de page.</p>
+                <p>Cliquer dessus ouvrira la barre latérale d'aide affichant l'aide pour ce noeud.</p>`
            }
        },
        {
            title: {
-                "en-US": "Plugins shown in the Palette Manager",
-                "ja": "パレット管理にプラグインを表示",
-                "fr": "Affichage des Plugins dans le gestionnaire de palettes"
+                "en-US": "Improved Context Menu",
+                "ja": "コンテキストメニューの改善",
+                "fr": "Menu contextuel amélioré"
            },
-            image: 'images/nr4-plugins.png',
+            image: 'images/context-menu.png',
            description: {
-                "en-US": `<p>The palette manager now shows any plugin modules you have installed, such as
-                <code>node-red-debugger</code>. Previously they would only be shown if the plugins include
-                nodes for the palette.</p>`,
-                "ja": `<p>パレットの管理に <code>node-red-debugger</code> の様なインストールしたプラグインが表示されます。以前はプラグインにパレット向けのノードが含まれている時のみ表示されていました。</p>`,
-                "fr": `<p>Le gestionnaire de palettes affiche désormais tous les plugins que vous avez installés,
-                tels que <code>node-red-debugger</code>. Auparavant, ils n'étaient affichés que s'ils contenaient
-                des noeuds pour la palette.</p>`
+                "en-US": `<p>The editor's context menu has been expanded to make lots more of
+                        the built-in actions available.</p>
+                        <p>Adding nodes, working with groups and plenty
+                        of other useful tools are now just a click away.</p>
+                        <p>The flow tab bar also has its own context menu to make working
+                        with your flows much easier.</p>`,
+                "ja": `<p>より多くの組み込み動作を利用できるように、エディタのコンテキストメニューが拡張されました。</p>
+                       <p>ノードの追加、グループの操作、その他の便利なツールをクリックするだけで実行できるようになりました。</p>
+                       <p>フローのタブバーには、フローの操作をより簡単にする独自のコンテキストメニューもあります。</p>`,
+                "fr": `<p>Le menu contextuel de l'éditeur a été étendu pour faire beaucoup plus d'actions intégrées disponibles.</p>
+                <p>Ajouter des noeuds, travailler avec des groupes et beaucoup d'autres outils utiles sont désormais à portée de clic.</p>
+                <p>La barre d'onglets de flux possède également son propre menu contextuel pour faciliter l'utilisation de vos flux.</p>`
            }
        },
+        {
+            title: {
+                "en-US": "Hiding Flows",
+                "ja": "フローを非表示",
+                "fr": "Masquage de flux"
+            },
+            image: 'images/hiding-flows.png',
+            description: {
+                "en-US": `<p>Hiding flows is now done through the flow context menu.</p>
+                          <p>The 'hide' button in previous releases has been removed from the tabs
+                             as they were being clicked accidentally too often.</p>`,
+                "ja": `<p>フローを非表示にする機能は、フローのコンテキストメニューから実行するようになりました。</p>
+                       <p>これまでのリリースでタブに存在していた「非表示」ボタンは、よく誤ってクリックされていたため、削除されました。</p>`,
+                "fr": `<p>Le masquage des flux s'effectue désormais via le menu contextuel du flux.</p>
+                <p>Le bouton "Masquer" des versions précédentes a été supprimé des onglets
+                   car il était cliqué accidentellement trop souvent.</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Locking Flows",
+                "ja": "フローを固定",
+                "fr": "Verrouillage de flux"
+            },
+            image: 'images/locking-flows.png',
+            description: {
+                "en-US": `<p>Flows can now be locked to prevent accidental changes being made.</p>
+                          <p>When locked you cannot modify the nodes in any way.</p>
+                          <p>The flow context menu provides the options to lock and unlock flows,
+                             as well as in the Info sidebar explorer.</p>`,
+                "ja": `<p>誤ってフローに変更が加えられてしまうのを防ぐために、フローを固定できるようになりました。</p>
+                       <p>固定されている時は、ノードを修正することはできません。</p>
+                       <p>フローのコンテキストメニューと、情報サイドバーのエクスプローラには、フローの固定や解除をするためのオプションが用意されています。</p>`,
+                "fr": `<p>Les flux peuvent désormais être verrouillés pour éviter toute modification accidentelle.</p>
+                <p>Lorsqu'il est verrouillé, vous ne pouvez en aucun cas modifier les noeuds.</p>
+                <p>Le menu contextuel du flux fournit les options pour verrouiller et déverrouiller les flux,
+                   ainsi que dans l'explorateur de la barre latérale d'informations.</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Adding Images to node/flow descriptions",
+                "ja": "ノードやフローの説明へ画像を追加",
+                "fr": "Ajout d'images aux descriptions de noeud/flux"
+            },
+            // image: 'images/debug-path-tooltip.png',
+            description: {
+                "en-US": `<p>You can now add images to a node's or flows's description.</p>
+                          <p>Simply drag the image into the text editor and it will get added inline.</p>
+                          <p>When the description is shown in the Info sidebar, the image will be displayed.</p>`,
+                "ja": `<p>ノードまたはフローの説明に、画像を追加できるようになりました。</p>
+                       <p>画像をテキストエディタにドラッグするだけで、行内に埋め込まれます。</p>
+                       <p>情報サイドバーの説明を開くと、その画像が表示されます。</p>`,
+                "fr": `<p>Vous pouvez désormais ajouter des images à la description d'un noeud ou d'un flux.</p>
+                <p>Faites simplement glisser l'image dans l'éditeur de texte et elle sera ajoutée en ligne.</p>
+                <p>Lorsque la description s'affiche dans la barre latérale d'informations, l'image s'affiche.</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Adding Mermaid Diagrams",
+                "ja": "Mermaid図を追加",
+                "fr": "Ajout de diagrammes Mermaid"
+            },
+            image: 'images/mermaid.png',
+            description: {
+                "en-US": `<p>You can also add <a href="https://github.com/mermaid-js/mermaid">Mermaid</a> diagrams directly into your node or flow descriptions.</p>
+                          <p>This gives you much richer options for documenting your flows.</p>`,
+                "ja": `<p>ノードやフローの説明に、<a href="https://github.com/mermaid-js/mermaid">Mermaid</a>図を直接追加することもできます。</p>
+                       <p>これによって、フローを説明する文書作成の選択肢がより多くなります。</p>`,
+                "fr": `<p>Vous pouvez également ajouter des diagrammes <a href="https://github.com/mermaid-js/mermaid">Mermaid</a> directement dans vos descriptions de noeud ou de flux.</p>
+                <p>Cela vous offre des options beaucoup plus riches pour documenter vos flux.</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Managing Global Environment Variables",
+                "ja": "グローバル環境変数の管理",
+                "fr": "Gestion des variables d'environnement globales"
+            },
+            image: 'images/global-env-vars.png',
+            description: {
+                "en-US": `<p>You can set environment variables that apply to all nodes and flows in the new
+                          'Global Environment Variables' section of User Settings.</p>`,
+                "ja": `<p>ユーザ設定に新しく追加された「大域環境変数」のセクションで、全てのノードとフローに適用される環境変数を登録できます。</p>`,
+                "fr": `<p>Vous pouvez définir des variables d'environnement qui s'appliquent à tous les noeuds et flux dans la nouvelle
+                section "Global Environment Variables" des paramètres utilisateur.</p>`
+            },
+        },
        {
            title: {
                "en-US": "Node Updates",
@ -203,28 +221,10 @@ export default {
            // image: "images/",
            description: {
                "en-US": `<p>The core nodes have received lots of minor fixes, documentation updates and
-                          small enhancements. Check the full changelog in the Help sidebar for a full list.</p>
-                          <ul>
-                            <li>A fully RFC4180 compliant CSV mode</li>
-                            <li>Customisable headers on the WebSocket node</li>
-                            <li>Split node now can operate on any message property</li>
-                            <li>and lots more...</li>
-                          </ul>`,
-                "ja": `<p>コアノードには沢山の軽微な修正、ドキュメント更新、小さな機能拡張が入っています。全リストはヘルプサイドバーにある変更履歴を参照してください。</p>
-                          <ul>
-                            <li>RFC4180に完全に準拠したCSVモード</li>
-                            <li>WebSocketノードのカスタマイズ可能なヘッダ</li>
-                            <li>Splitノードは、メッセージプロパティで操作できるようになりました</li>
-                            <li>他にも沢山あります...</li>
-                          </ul>`,
-                "fr": `<p>Les noeuds principaux ont reçu de nombreux correctifs mineurs ainsi que des améliorations. La documentation a été mise à jour.
-                          Consultez le journal des modifications dans la barre latérale d'aide pour une liste complète. Ci-dessous, les changements les plus importants :</p>
-                          <ul>
-                            <li>Un mode CSV entièrement conforme à la norme RFC4180</li>
-                            <li>En-têtes personnalisables pour le noeud WebSocket</li>
-                            <li>Le noeud Split peut désormais fonctionner sur n'importe quelle propriété de message</li>
-                            <li>Et bien plus encore...</li>
-                          </ul>`
+                          small enhancements. Check the full changelog in the Help sidebar for a full list.</p>`,
+                "ja": `<p>コアノードにマイナーな修正、ドキュメント更新、小規模な拡張が数多く追加されています。全ての一覧は、ヘルプサイドバーの全ての更新履歴を確認してください。</p>`,
+                "fr": `<p>Les noeuds principaux ont reçu de nombreux correctifs mineurs, mises à jour de la documentation et
+                petites améliorations. Consulter le journal des modifications complet dans la barre latérale d'aide.</p>`
            }
        }
    ]
--- a/packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts
@ -1,10 +1,10 @@

-/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/node-red/nr-monaco-build */
+/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/Steve-Mcl/monaco-editor-esm-i18n */

 interface NodeMessage {
    topic?: string;
    payload?: any;
-    /** `_msgid` is generated internally. It not something you typically need to set or modify. */ _msgid?: string;
+    _msgid?: string;
    [other: string]: any; //permit other properties
 }

@ -19,15 +19,15 @@ declare const promisify:typeof import('util').promisify
 /**
 * @typedef NodeStatus
 * @type {object}
- * @property {'red'|'green'|'yellow'|'blue'|'grey'|string} [fill] - The fill property can be: red, green, yellow, blue or grey.
- * @property {'ring'|'dot'|string} [shape] The shape property can be: ring or dot.
- * @property {string|boolean|number} [text] The text to display
+ * @property {string} [fill] The fill property can be: red, green, yellow, blue or grey.
+ * @property {string} [shape] The shape property can be: ring or dot.
+ * @property {string} [text] The text to display
 */
 interface NodeStatus {
    /** The fill property can be: red, green, yellow, blue or grey */
-    fill?: 'red'|'green'|'yellow'|'blue'|'grey'|string,
+    fill?: string,
    /** The shape property can be: ring or dot */
-    shape?: 'ring'|'dot'|string,
+    shape?: string,
    /** The text to display */
    text?: string|boolean|number
 }
@ -37,24 +37,25 @@ declare class node {
    * Send 1 or more messages asynchronously
    * @param {object | object[]} msg  The msg object
    * @param {Boolean} [clone=true]  Flag to indicate the `msg` should be cloned. Default = `true`
-    * @see Node-RED documentation [writing-functions: sending messages asynchronously](https://nodered.org/docs/user-guide/writing-functions#sending-messages-asynchronously)
+    * @see node-red documentation [writing-functions: sending messages asynchronously](https://nodered.org/docs/user-guide/writing-functions#sending-messages-asynchronously)
    */
-    static send(msg:NodeMessage|NodeMessage[], clone?:Boolean): void;
+    static send(msg:object|object[], clone?:Boolean): void;
    /** Inform runtime this instance has completed its operation */
    static done();
    /** Send an error to the console and debug side bar. Include `msg` in the 2nd parameter to trigger the catch node.  */
-    static error(err:string|Error, msg?:NodeMessage);
+    static error(err:string|Error, msg?:object);
    /** Log a warn message to the console and debug sidebar */
    static warn(warning:string|object);
    /** Log an info message to the console (not sent to sidebar)' */
    static log(info:string|object);
    /** Sets the status icon and text underneath the node.
    * @param {NodeStatus} status - The status object `{fill, shape, text}`
-    * @see Node-RED documentation [writing-functions: adding-status](https://nodered.org/docs/user-guide/writing-functions#adding-status)
+    * @see node-red documentation [writing-functions: adding-status](https://nodered.org/docs/user-guide/writing-functions#adding-status)
    */
    static status(status:NodeStatus);
    /** Sets the status text underneath the node.
-    * @see Node-RED documentation [writing-functions: adding-status](https://nodered.org/docs/user-guide/writing-functions#adding-status)
+    * @param {string} status - The status to display
+    * @see node-red documentation [writing-functions: adding-status](https://nodered.org/docs/user-guide/writing-functions#adding-status)
    */
    static status(status:string|boolean|number);
    /** the id of this node */
@ -263,12 +264,9 @@ declare class global {
    /** Get an array of the keys in the context store */
    static keys(store: string, callback: Function);
 }
-
-// (string & {}) is a workaround for offering string type completion without enforcing it. See https://github.com/microsoft/TypeScript/issues/29729#issuecomment-567871939
-type NR_ENV_NAME_STRING = 'NR_NODE_ID'|'NR_NODE_NAME'|'NR_NODE_PATH'|'NR_GROUP_ID'|'NR_GROUP_NAME'|'NR_FLOW_ID'|'NR_FLOW_NAME'|'NR_SUBFLOW_ID'|'NR_SUBFLOW_NAME'|'NR_SUBFLOW_PATH' | (string & {})
 declare class env {
    /** 
-     * Get an environment variable value defined in the OS, or in the global/flow/subflow/group environment variables.  
+     * Get an environment variable value  
     * 
     * Predefined node-red variables...  
     *   * `NR_NODE_ID` - the ID of the node
@ -278,16 +276,9 @@ declare class env {
     *   * `NR_GROUP_NAME` - the Name of the containing group
     *   * `NR_FLOW_ID` - the ID of the flow the node is on
     *   * `NR_FLOW_NAME` - the Name of the flow the node is on
-     *   * `NR_SUBFLOW_ID` - the ID of the subflow the node is in
-     *   * `NR_SUBFLOW_NAME` - the Name of the subflow the node is in
-     *   * `NR_SUBFLOW_PATH` - the Path of the subflow the node is in
-     * @param name - The name of the environment variable
+     * @param name Name of the environment variable to get
     * @example 
-     * ```const flowName = env.get("NR_FLOW_NAME") // get the name of the flow```
-     * @example 
-     * ```const systemHomeDir = env.get("HOME") // get the user's home directory```
-     * @example 
-     * ```const systemHomeDir = env.get("LABEL1") // get the value of a global/flow/subflow/group defined variable named "LABEL1"```
+     * ```const flowName = env.get("NR_FLOW_NAME");```
     */
-    static get(name:NR_ENV_NAME_STRING) :any;
+    static get(name:string) :any;
 }
--- a/packages/node_modules/@node-red/editor-client/src/types/node/assert.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node/assert.d.ts
@ -1,10 +1,10 @@

-/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/node-red/nr-monaco-build */
+/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/Steve-Mcl/monaco-editor-esm-i18n */

 /**
 * The `assert` module provides a set of assertion functions for verifying
 * invariants.
- * @see [source](https://github.com/nodejs/node/blob/v18.0.0/lib/assert.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/assert.js)
 */
 declare module 'assert' {
    /**
@ -290,8 +290,8 @@ declare module 'assert' {
         * > Stability: 3 - Legacy: Use {@link strictEqual} instead.
         *
         * Tests shallow, coercive equality between the `actual` and `expected` parameters
-         * using the [`==` operator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Equality). `NaN` is specially handled
-         * and treated as being identical if both sides are `NaN`.
+         * using the [Abstract Equality Comparison](https://tc39.github.io/ecma262/#sec-abstract-equality-comparison) ( `==` ). `NaN` is special handled
+         * and treated as being identical in case both sides are `NaN`.
         *
         * ```js
         * import assert from 'assert';
@ -323,8 +323,9 @@ declare module 'assert' {
         *
         * > Stability: 3 - Legacy: Use {@link notStrictEqual} instead.
         *
-         * Tests shallow, coercive inequality with the [`!=` operator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Inequality). `NaN` is
-         * specially handled and treated as being identical if both sides are `NaN`.
+         * Tests shallow, coercive inequality with the [Abstract Equality Comparison](https://tc39.github.io/ecma262/#sec-abstract-equality-comparison)(`!=` ). `NaN` is special handled and treated as
+         * being identical in case both
+         * sides are `NaN`.
         *
         * ```js
         * import assert from 'assert';
@ -414,7 +415,7 @@ declare module 'assert' {
        function notDeepEqual(actual: unknown, expected: unknown, message?: string | Error): void;
        /**
         * Tests strict equality between the `actual` and `expected` parameters as
-         * determined by [`Object.is()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is).
+         * determined by the [SameValue Comparison](https://tc39.github.io/ecma262/#sec-samevalue).
         *
         * ```js
         * import assert from 'assert/strict';
@ -452,7 +453,7 @@ declare module 'assert' {
        function strictEqual<T>(actual: unknown, expected: T, message?: string | Error): asserts actual is T;
        /**
         * Tests strict inequality between the `actual` and `expected` parameters as
-         * determined by [`Object.is()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is).
+         * determined by the [SameValue Comparison](https://tc39.github.io/ecma262/#sec-samevalue).
         *
         * ```js
         * import assert from 'assert/strict';
--- a/packages/node_modules/@node-red/editor-client/src/types/node/assert/strict.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node/assert/strict.d.ts
@ -1,5 +1,5 @@

-/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/node-red/nr-monaco-build */
+/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/Steve-Mcl/monaco-editor-esm-i18n */

 declare module 'assert/strict' {
    import { strict } from 'node:assert';
--- a/packages/node_modules/@node-red/editor-client/src/types/node/async_hooks.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node/async_hooks.d.ts
@ -1,5 +1,5 @@

-/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/node-red/nr-monaco-build */
+/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/Steve-Mcl/monaco-editor-esm-i18n */

 /**
 * The `async_hooks` module provides an API to track asynchronous resources. It
@ -9,7 +9,7 @@
 * import async_hooks from 'async_hooks';
 * ```
 * @experimental
- * @see [source](https://github.com/nodejs/node/blob/v18.0.0/lib/async_hooks.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/async_hooks.js)
 */
 declare module 'async_hooks' {
    /**
@ -367,7 +367,7 @@ declare module 'async_hooks' {
     *
     * Each instance of `AsyncLocalStorage` maintains an independent storage context.
     * Multiple instances can safely exist simultaneously without risk of interfering
-     * with each other's data.
+     * with each other data.
     * @since v13.10.0, v12.17.0
     */
    class AsyncLocalStorage<T> {
@ -398,9 +398,8 @@ declare module 'async_hooks' {
        getStore(): T | undefined;
        /**
         * Runs a function synchronously within a context and returns its
-         * return value. The store is not accessible outside of the callback function.
-         * The store is accessible to any asynchronous operations created within the
-         * callback.
+         * return value. The store is not accessible outside of the callback function or
+         * the asynchronous operations created within the callback.
         *
         * The optional `args` are passed to the callback function.
         *
@ -414,9 +413,6 @@ declare module 'async_hooks' {
         * try {
         *   asyncLocalStorage.run(store, () => {
         *     asyncLocalStorage.getStore(); // Returns the store object
-         *     setTimeout(() => {
-         *       asyncLocalStorage.getStore(); // Returns the store object
-         *     }, 200);
         *     throw new Error();
         *   });
         * } catch (e) {
--- a/packages/node_modules/@node-red/editor-client/src/types/node/buffer.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node/buffer.d.ts
@ -1,5 +1,5 @@

-/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/node-red/nr-monaco-build */
+/* NOTE: Do not edit directly! This file is generated using `npm run update-types` in https://github.com/Steve-Mcl/monaco-editor-esm-i18n */

 /**
 * `Buffer` objects are used to represent a fixed-length sequence of bytes. Many
@ -44,7 +44,7 @@
 * // Creates a Buffer containing the Latin-1 bytes [0x74, 0xe9, 0x73, 0x74].
 * const buf7 = Buffer.from('tést', 'latin1');
 * ```
- * @see [source](https://github.com/nodejs/node/blob/v18.0.0/lib/buffer.js)
+ * @see [source](https://github.com/nodejs/node/blob/v16.9.0/lib/buffer.js)
 */
 declare module 'buffer' {
    import { BinaryLike } from 'node:crypto';
@ -117,17 +117,18 @@ declare module 'buffer' {
    /**
     * A [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) encapsulates immutable, raw data that can be safely shared across
     * multiple worker threads.
-     * @since v15.7.0, v14.18.0
+     * @since v15.7.0
+     * @experimental
     */
    export class Blob {
        /**
         * The total size of the `Blob` in bytes.
-         * @since v15.7.0, v14.18.0
+         * @since v15.7.0
         */
        readonly size: number;
        /**
         * The content-type of the `Blob`.
-         * @since v15.7.0, v14.18.0
+         * @since v15.7.0
         */
        readonly type: string;
        /**
@ -142,13 +143,13 @@ declare module 'buffer' {
        /**
         * Returns a promise that fulfills with an [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer) containing a copy of
         * the `Blob` data.
-         * @since v15.7.0, v14.18.0
+         * @since v15.7.0
         */
        arrayBuffer(): Promise<ArrayBuffer>;
        /**
         * Creates and returns a new `Blob` containing a subset of this `Blob` objects
         * data. The original `Blob` is not altered.
-         * @since v15.7.0, v14.18.0
+         * @since v15.7.0
         * @param start The starting index.
         * @param end The ending index.
         * @param type The content-type for the new `Blob`
@ -157,7 +158,7 @@ declare module 'buffer' {
        /**
         * Returns a promise that fulfills with the contents of the `Blob` decoded as a
         * UTF-8 string.
-         * @since v15.7.0, v14.18.0
+         * @since v15.7.0
         */
        text(): Promise<string>;
        /**
@ -168,12 +169,6 @@ declare module 'buffer' {
    }
    export import atob = globalThis.atob;
    export import btoa = globalThis.btoa;
-
-    import { Blob as NodeBlob } from 'buffer';
-    // This conditional type will be the existing global Blob in a browser, or
-    // the copy below in a Node environment.
-    type __Blob = typeof globalThis extends { onmessage: any, Blob: infer T }
-        ? T : NodeBlob;
    global {
        // Buffer class
        type BufferEncoding = 'ascii' | 'utf8' | 'utf-8' | 'utf16le' | 'ucs2' | 'ucs-2' | 'base64' | 'base64url' | 'latin1' | 'binary' | 'hex';
@ -399,7 +394,7 @@ declare module 'buffer' {
             * @since v0.11.13
             * @return Either `-1`, `0`, or `1`, depending on the result of the comparison. See `compare` for details.
             */
-            compare(buf1: Uint8Array, buf2: Uint8Array): -1 | 0 | 1;
+            compare(buf1: Uint8Array, buf2: Uint8Array): number;
            /**
             * Allocates a new `Buffer` of `size` bytes. If `fill` is `undefined`, the`Buffer` will be zero-filled.
             *
@ -452,7 +447,7 @@ declare module 'buffer' {
             * Allocates a new `Buffer` of `size` bytes. If `size` is larger than {@link constants.MAX_LENGTH} or smaller than 0, `ERR_INVALID_ARG_VALUE` is thrown.
             *
             * The underlying memory for `Buffer` instances created in this way is _not_
-             * _initialized_. The contents of the newly created `Buffer` are unknown and _may contain sensitive data_. Use `Buffer.alloc()` instead to initialize`Buffer` instances with zeroes.
+             * _initialized_. The contents of the newly created `Buffer` are unknown and_may contain sensitive data_. Use `Buffer.alloc()` instead to initialize`Buffer` instances with zeroes.
             *
             * ```js
             * import { Buffer } from 'buffer';
@ -490,7 +485,7 @@ declare module 'buffer' {
             * if `size` is 0.
             *
             * The underlying memory for `Buffer` instances created in this way is _not_
-             * _initialized_. The contents of the newly created `Buffer` are unknown and _may contain sensitive data_. Use `buf.fill(0)` to initialize
+             * _initialized_. The contents of the newly created `Buffer` are unknown and_may contain sensitive data_. Use `buf.fill(0)` to initialize
             * such `Buffer` instances with zeroes.
             *
             * When using `Buffer.allocUnsafe()` to allocate new `Buffer` instances,
@ -713,7 +708,7 @@ declare module 'buffer' {
             * @param [sourceStart=0] The offset within `buf` at which to begin comparison.
             * @param [sourceEnd=buf.length] The offset within `buf` at which to end comparison (not inclusive).
             */
-            compare(target: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): -1 | 0 | 1;
+            compare(target: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
            /**
             * Copies data from a region of `buf` to a region in `target`, even if the `target`memory region overlaps with `buf`.
             *
@ -772,6 +767,8 @@ declare module 'buffer' {
             * Returns a new `Buffer` that references the same memory as the original, but
             * offset and cropped by the `start` and `end` indices.
             *
+             * This is the same behavior as `buf.subarray()`.
+             *
             * This method is not compatible with the `Uint8Array.prototype.slice()`,
             * which is a superclass of `Buffer`. To copy the slice, use`Uint8Array.prototype.slice()`.
             *
@ -787,17 +784,8 @@ declare module 'buffer' {
             *
             * console.log(buf.toString());
             * // Prints: buffer
-             *
-             * // With buf.slice(), the original buffer is modified.
-             * const notReallyCopiedBuf = buf.slice();
-             * notReallyCopiedBuf[0]++;
-             * console.log(notReallyCopiedBuf.toString());
-             * // Prints: cuffer
-             * console.log(buf.toString());
-             * // Also prints: cuffer (!)
             * ```
             * @since v0.3.0
-             * @deprecated Use `subarray` instead.
             * @param [start=0] Where the new `Buffer` will start.
             * @param [end=buf.length] Where the new `Buffer` will end (not inclusive).
             */
@ -1964,7 +1952,7 @@ declare module 'buffer' {
             *
             * * a string, `value` is interpreted according to the character encoding in`encoding`.
             * * a `Buffer` or [`Uint8Array`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array), `value` will be used in its entirety.
-             * To compare a partial `Buffer`, use `buf.subarray`.
+             * To compare a partial `Buffer`, use `buf.slice()`.
             * * a number, `value` will be interpreted as an unsigned 8-bit integer
             * value between `0` and `255`.
             *
@ -2220,7 +2208,7 @@ declare module 'buffer' {
         * **binary data and predate the introduction of typed arrays in JavaScript.**
         * **For code running using Node.js APIs, converting between base64-encoded strings**
         * **and binary data should be performed using `Buffer.from(str, 'base64')` and`buf.toString('base64')`.**
-         * @since v15.13.0, v14.17.0
+         * @since v15.13.0
         * @deprecated Use `Buffer.from(data, 'base64')` instead.
         * @param data The Base64-encoded input string.
         */
@ -2236,24 +2224,11 @@ declare module 'buffer' {
         * **binary data and predate the introduction of typed arrays in JavaScript.**
         * **For code running using Node.js APIs, converting between base64-encoded strings**
         * **and binary data should be performed using `Buffer.from(str, 'base64')` and`buf.toString('base64')`.**
-         * @since v15.13.0, v14.17.0
+         * @since v15.13.0
         * @deprecated Use `buf.toString('base64')` instead.
         * @param data An ASCII (Latin1) string.
         */
        function btoa(data: string): string;
-
-        interface Blob extends __Blob {}
-        /**
-         * `Blob` class is a global reference for `require('node:buffer').Blob`
-         * https://nodejs.org/api/buffer.html#class-blob
-         * @since v18.0.0
-         */
-        var Blob: typeof globalThis extends {
-            onmessage: any;
-            Blob: infer T;
-        }
-            ? T
-            : typeof NodeBlob;
    }
 }
 declare module 'node:buffer' {
--- a/Show More
+++ b/Show More