Initial update to FontAwesome 6

2025-03-01 10:36:34 +00:00 · 2022-03-23 11:34:27 +00:00
634 changed files with 35286 additions and 89257 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,9 +5,6 @@ on:
  release:
    types: [published]

-permissions:
-  contents: read
-
 jobs:
  generate:
    name: 'Update node-red-docker image'
@@ -29,7 +26,7 @@ jobs:
            path: 'node-red.github.io'
      - uses: actions/setup-node@v1
        with:
-            node-version: '16'
+            node-version: '12'
      - run: node ./node-red/.github/scripts/update-node-red-docker.js
      - name: Create Docker Pull Request
        uses: peter-evans/create-pull-request@v2
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,22 +6,16 @@ on:
  pull_request:
    branches: [ master, dev ]

-permissions:
-  contents: read
-
 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: [16, 18]
+        node-version: [12, 14, 16]
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v2
      with:
        node-version: ${{ matrix.node-version }}
    - name: Install Dependencies
@@ -29,8 +23,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 }}
+    - name: Publish to coveralls.io
+      if: ${{ matrix.node-version == 14 }}
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ github.token }}
--- a/.jshintrc
+++ b/.jshintrc
@@ -15,5 +15,5 @@
    "shadow": true,     // allow variable shadowing (re-use of names...)
    "sub": true,        // don't warn that foo['bar'] should be written as foo.bar
    "proto": true,      // allow setting of __proto__ in node < v0.12,
-    "esversion": 11      // allow es11(ES2020)
+    "esversion": 6      // allow es6
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,466 +1,523 @@
-#### 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
+#### 2.2.2: Maintenance Release

 Nodes

- - Allow Catch/Status nodes to be scoped to their group (#4185) @NetHans
- - MQTT: Option to disable MQTT topic unsubscribe on disconnect (#4078) @flying7eleven
+ - Fix "close timed out" error when performing full deploy or modifying broker node. (#3451) @Steve-Mcl


-#### 3.1.0-beta.2: Beta Release
+#### 2.2.1: Maintenance 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
- 
+ - Handle mixed-cased filter terms in keyboard shortcut dialog (#3444) @knolleary
+ - Prevent duplicate links being added between nodes (#3442) @knolleary
+ - Fix to hide tooltip after removing subflow tab (#3391) @HiroyasuNishiyama
+ - Fix node validation to be applied to config node (#3397) @HiroyasuNishiyama
+ - Fix: Dont add wires to undo buffer twice (#3437) @Steve-Mcl

 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
+ - Improve module location parsing (of stack info) when adding hook (#3447) @Steve-Mcl
+ - Fix substitution of NR_NODE_PATH (#3445) @HiroyasuNishiyama
+ - Remove console.log when ignoring disabled module (#3439) @knolleary
+ - Improve "Unexpected Node Error" logging (#3446) @Steve-Mcl

 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
+ - Debug: Fix no-prototype-builtins bug in debug node and utils (#3394) @Alkarex
+ - Delay: Fix Japanese message of delay node (#3434)
+ - Allow nbRateUnits to be undefined when validating (#3443) @knolleary
+ - Coding help for recently added node-red Predefined Environment Variables (#3440) @Steve-Mcl

-#### 3.1.0-beta.1: Beta Release
+
+#### 2.2.0: Milestone 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
+ - Add editorTheme.tours property to default settings file (#3375) @knolleary
+ - Remember Zoom level and Sidebar tab selection between sessions (#3361) @knolleary
+ - Fix timing issue when merging background changes fixes #3364 (#3373) @Steve-Mcl
+ - Use a nodes palette label in help tree (#3372) @Steve-Mcl
+ - Subflow: Add labels to OUTPUT nodes (#3352) @ralphwetzel
+ - Fix vertical align subflow port (#3370) @knolleary
+ - Make actions list i18n ready and Japanese translation (#3359) @HiroyasuNishiyama
+ - Update tour for 2.2.0 (#3378) @knolleary
+ - Include paletteLabel when building search index (#3380) @Steve-Mcl
+ - Fix opening/closing subflow template not to make subflow changed (#3382) @HiroyasuNishiyama
+ - Add Japanese translations for v2.2.0 (#3353, #3381) @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
+ - Add support for accessing node id & name as environment variable (#3356) @HiroyasuNishiyama
+ - Clear context contents when switching projects (#3243) @knolleary

 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
+ - MQTT: reject invalid topics (#3374) @Steve-Mcl
+ - Function: Expose node.path property (#3371) @knolleary
+ - Function: Update `node` declarations in func.d.ts (#3377) @Steve-Mcl

-#### 3.0.2: Maintenance Release
+#### 2.2.0-beta.1: Beta 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
+ - Add search history to main search box (#3262) @knolleary
+ - Check availability of type of config node on deploy (#3304) @k-toumura
+ - Add wire-slice mode to delete wires with Ctrl-RHClick-Drag (#3340) @knolleary
+ - Wiring keyboard shortcuts (#3288) @knolleary
+ - Snap nodes on grid using either edge as reference (#3289) @knolleary
+ - Detach node action (#3338) @knolleary
+ - Highlight links when selecting nodes (#3323) @knolleary
+ - Allow multiple links to be selected by ctrl-click (#3294) @knolleary
+
+Nodes
+
+ - JSON: Let JSON node attempt to parse buffer if it contains a valid string (#3296) @dceejay
+ - Remove use of verbose flag in core nodes - and use node.debug level instead (#3300) @dceejay
+ - TCP: Add TLS option to tcp client nodes (#3307) @dceejay
+ - WebSocket: Implemented support for Websocket Subprotocols in WS Client Node. (#3333) @tobiasoort
+
+#### 2.1.6: Maintenance Release
+
+Editor
+
+ - Revert copy-text change and apply alternative fix (#3363) @knolleary
+ - Update marked to latest (#3362) @knolleary
+ - fix to make start of property error tooltip messages aligned (#3358) @HiroyasuNishiyama
+
+Nodes
+
+ - Inject: fix JSON propety validation of inject node (#3349) @HiroyasuNishiyama
+ - Delay: fix unit value validation of delay node (#3351) @HiroyasuNishiyama
+
+#### 2.1.5: Maintenance Release

 Runtime

- - Register subflow module instance node with parent flow (#3818) @knolleary
+ - Handle reporting error location when stack is truncated (#3346) @knolleary
+ - Initialize passport when only adminAuth.tokens is set (#3343) @knolleary
+ - Add log logging (#3342) @knolleary
+
+Editor
+
+ - Fix copy buttons on the debug window (another method) (#3331) @kazuhitoyokoi
+ - Add Japanese translations for hidden flow (#3302) @kazuhitoyokoi
+ - Improve jsonata legacy mode detection regex (#3345) @knolleary
+ - Fix generating flow name with incrementing number (#3347) @knolleary
+ - resume focus after import/export dialog close (#3337) @HiroyasuNishiyama
+ - Fix findPreviousVisibleTab action (#3321) @knolleary
+ - Fix storing hidden tab state when not hidden via action (#3312) @knolleary
+ - Avoid adding empty env properties to tabs/groups (#3311) @knolleary
+ - Fix hide icon in tour guide (#3301) @kazuhitoyokoi

 Nodes

- - HTTP Request: Allow HTTP Headers not in spec (#3776) @hardillb
+ - File: Update file node examples according to node name change (#3335) @HiroyasuNishiyama
+ - Filter (RBE): Fix for filter node narrrowbandEq mode start condition failure (#3339) @dceejay
+ - Function: Prevent function scrollbar from obscuring expand button (#3348) @knolleary
+ - Function: load extralibs when expanding monaco. fixes #3319 (#3334) @Steve-Mcl
+ - Function: Update Function to use correct api to access env vars (#3310) @knolleary
+ - HTTP Request: Fix basic auth with empty username or password (#3325) @hardillb
+ - Inject: Fix incorrect clearing of blank payload property in Inject node (#3322) @knolleary
+ - Link Call: add link call example (#3336) @HiroyasuNishiyama
+ - WebSocket: Only setup ws client heartbeat once it is connected (#3344) @knolleary
+ - Update Japanese translations in node help (#3332) @kazuhitoyokoi

-#### 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
+#### 2.1.4: Maintenance Release

 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
+ - fix env var access using $parent for groups (#3278) @HiroyasuNishiyama
+ - Add proper error handling for 404 errors when serving debug files (#3277) @knolleary
+ - Add Japanese translations for Node-RED v2.1.0-beta.1 (#3179) @kazuhitoyokoi
+ - Include full user object on login audit events (#3269) @knolleary
+ - Remove styling from de locale files (#3237) @knolleary

 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
+ - Change tab hide button icon to an eye and add search option (#3282) @knolleary
+ - Fix i18n handling of namespaces with spaces in (#3281) @knolleary
+ - Trigger change event when autoComplete fills in input (#3280) @knolleary
+ - Apply CN i18n fix (#3279) @knolleary
+ - fix select menu label of config node to use paletteLabel (#3273) @HiroyasuNishiyama
+ - fix removed tab not to cause node conflict (#3275) @HiroyasuNishiyama
+ - Group diff fix (#3239) @knolleary
+ - Only toggle disabled workspace flag if on activeWorkspace (#3252) @knolleary
+ - Do not show status for disabled nodes (#3253) @knolleary
+ - Set dimension value for tour guide (#3265) @kazuhitoyokoi
+ - Avoid redundant initialisation of TypedInput type (#3263) @knolleary
+ - Don't let themes change flow port label color (#3270) @bonanitech
+ - Fix treeList gutter calculation to handle floating gutters (#3238) @knolleary
+
+Nodes
+
+- Debug: Handle RegExp types in Debug sidebar (#3251) @knolleary
+- Delay: fix 2nd output when in rate limit per topic modes (#3261) @dceejay
+- Link: fix to show link target when selected (#3267) @HiroyasuNishiyama
+- Inject: Do not modify inject node props in oneditprepare (#3242) @knolleary
+- HTTP Request: HTTP Basic Auth should always add : between username and password even if empty (#3236) @hardillb
+
+#### 2.1.3: Maintenance Release

 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
+ - Update gen-publish script to update 'next' tag for main releases
+ - Add environment variable to enable/disable tours (#3221) @hardillb
+ - Fix loading non-default language files leaving runtime in wrong locale (#3225) @knolleary

 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
+ - Refresh editor settings whenever a node is added or enabled (#3227) @knolleary
+ - Revert spinner css change that made it shrink in some cases (#3229) @knolleary
+ - Fix import notification message when importing config nodes (#3224) @knolleary
+ - Handle changing types of TypedInput repeatedly (#3223) @knolleary
+
+
+#### 2.1.2: Maintenance Release


 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
+ - node-red-pi: Remove bash dependency (#3216) @a16bitsysop

 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
+ - Improved regex for markdown renderer (#3213) @GerwinvBeek
+ - Fix TypedInput initialisation (#3220) @knolleary

 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.
+ - MQTT: fix datatype in node config not used. fixes #3215 (#3219) @Steve-Mcl

+#### 2.1.1: Maintenance Release

 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
+ - Ensure tourGuide popover doesn't fall offscreen (#3212) @knolleary
+ - Fix issue with old inject nodes that migrated topic to 'string' type (#3210) @knolleary
+ - Add cache-busting query params to index.mst (#3211) @knolleary
+ - Fix TypedInput validation of type without options (#3207) @knolleary

-Runtime
+#### 2.1.0: Milestone Release

- - 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
+Editor
+
+ - Position popover properly on a scrolled page
+ - Fixes from 2.1.0-beta.2 (#3202) @knolleary

 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
+- Link Out: Fix saving link out node links (#3201) @knolleary
+ - Switch: Refix #3170 - copy switch rule type when adding new rule
+ - TCP Request: Add string option to TCP request node output (#3204) @dceejay
+
+#### 2.1.0-beta.2: Beta Release
+
+Editor
+
+ - Fix switching projects (#3199) @knolleary
+ - Use locale setting when installing/enabling node (#3198) @knolleary
+ - Do not show projects-wecome dialog until welcome tour completes (#3197) @knolleary
+ - Fix converting selection to subflow (#3196) @knolleary
+ - Avoid conflicts with native browser cmd-ctrl type shortcuts (#3195) @knolleary
+ - Ensure message tools stay attached to top-level entry in Debug/Context (#3186) @knolleary
+ - Ensure tab state updates properly when toggling enable state (#3175) @knolleary
+ - Improve handling of long labels in TreeList (#3176) @knolleary
+ - Shift-click tab scroll arrows to jump to start/end (#3177) @knolleary
+
+Runtime
+
+ - Update package dependencies
+ - Update to latest node-red-admin
+
+Nodes
+
+ - Dynamic MQTT connections (#3189)
+ - Link: Filter out Link Out Return nodes in Link In edit dialog Fixes #3187
+ - Link: Fix link call label (#3200) @knolleary
+ - Debug: Redesign debug filter options and make them persistant (#3183) @knolleary
+ - Inject: Widen Inject interval box for >1 digit (#3184) @knolleary
+ - Switch: Fix rule focus when switch 'otherwise' rule is used (#3185) @knolleary
+
+#### 2.1.0-beta.1: Beta Release
+
+Editor
+
+ - Add Tour Guide component (#3136) @knolleary
+ - Allow tabs to be hidden (#3120) @knolleary
+ - Add align actions to editor (#3110) @knolleary
+ - Add support of environment variable for tab & group (#3112) @HiroyasuNishiyama
+ - Add autoComplete widget and add to TypedInput for msg. props (#3171) @knolleary
+ - Render node documentation to node-red style guide when written in markdown. (#3169) @Steve-Mcl
+ - Allow colouring of tab icon svg (#3140) @harmonic7
+ - Restore tab selection after merging conflicts (#3151) @GerwinvBeek
+ - Fix serving of theme files on Windows (#3154) @knolleary
+ - Ensure config-node select inherits width properly from input (#3155) @knolleary
+ - Do better remembering TypedInput values whilst switching types (#3159) @knolleary
+ - Update monaco to 0.28.1 (#3153) @knolleary
+ - Improve themeing of tourGuide (#3161) @knolleary
+ - Allow a node to specify a filter for the config nodes it can pick from (#3160) @knolleary
+ - Allow RED.notify.update to modify any notification setting (#3163) @knolleary
+ - Fix typo in ko editor.json Fixes #3119
+ - Improve RED.actions api to ensure actions cannot be overridden
+ - Ensure treeList row has suitable min-height when no content Fixes #3109
+ - Refactor edit dialogs to use separate edit panes
+ - Ensure type select button is not focussable when TypedInput only has one type
+ - Place close tab link in front of fade
+
+Runtime
+
+ - Improve error reporting with oauth login strategies (#3148) @knolleary
+ - Add allowUpdate feature to externalModules.palette (#3143) @knolleary
+ - Improve node install error reporting (#3158) @knolleary
+ - Improve unit test coverage (#3168) @knolleary
+ - Allow coreNodesDir to be set to false (#3149) @hardillb
+ - Update package dependencies
+ - uncaughtException debug improvements (#3146) @renatojuniorrs
+
+Nodes
+
+ - Change: Add option to deep-clone properties in Change node (#3156) @knolleary
+ - Delay: Add push to front of rate limit queue. (#3069) @dceejay
+ - File: Add paletteLabel to file nodes to make read/write more obvious (#3157) @knolleary
+ - HTTP Request: Extend HTTP request node to log detailed timing information (#3116) @k-toumura
+ - HTTP Response: Fix sizing of HTTP Response header fields (#3164) @knolleary
+ - Join: Support for msg.restartTimeout (#3121) @magma1447
+ - Link Call: Add Link Call node (#3152) @knolleary
+ - Switch: Copy previous rule type when adding rule to switch node (#3170) @knolleary
+ - Delay node: add option to send intermediate messages on separate output (#3166) @knolleary
+ - Typo in http request set method translation (#3173) @mailsvb
+
+#### 2.0.6: Maintenance Release
+
+Editor
+
+ - Fix typo in ko editor.json Fixes #3119
+ - Change fade color when hovering an inactive tab (#3106) @bonanitech
+ - Ensure treeList row has suitable min-height when no content Fixes #3109
+
+Runtime
+
+ - Update tar to latest (#3128) @aksswami
+ - Give passport verify callback the same arity as the original callback (#3117) @dschmidt
+ - Handle HTTPS Key and certificate as string or buffer (#3115) @bartbutenaers
+
+#### 2.0.5: Maintenance Release
+
+Editor
+
+ - Remove default ctrl-enter keybinding from monaco editor Fixes #3093
+
+Runtime
+
+ - Update tar dependency
+ - Add support for maintenance streams in generate-publish-script
+
+
+Nodes
+
+ - Fix regression in Join node when manual joining array with msg.parts present Fixes #3096
+
+#### 2.0.4: Maintenance Release
+
+Editor
+
+ - Fix tab fade CSS for when using themes (#3085) @bonanitech
+ - Handle just-copied-but-not-deployed node with credentials in editor Fixes #3090
+
+Nodes
+
+ - Filter: Fix RBE node handling of default topi property Fixes #3087
+ - HTTP Request: Handle partially encoded url query strings in request node
+ - HTTP Request: Fix support for supplied CA certs (#3089) @hardillb
+ - HTTP Request: Ensure TLS Cert is used (#3092) @hardillb
+ - Inject: Fix inject now button unable to send empty props
+ - Inject: Inject now button success notification should use label with updated props
+
+#### 2.0.3: Maintenance Release
+
+Nodes
+
+ - HTML: Fix HTML parsing when body is included in the select tag Fixes #3079
+ - HTTP Request: Preserve case of user-provided http headers in request node Fixes #3081
+ - HTTP Request: Set decompress to false for HTTP Request to keep 1.x compatibility Fixes #3083
+ - HTTP Request: Add unit tests for HTTP Request encodeURI and error response
+ - HTTP Request: Do not throw HTTP errors in request node Fixes #3082
+ - HTTP Request: Ensure uri is properly encoded before passing to got module Fixes #3080
+
+#### 2.0.2: Maintenance Release
+
+Runtime
+
+ - Use file:// url with dynamic import
+ - Detect if agent-base has patched https.request and undo it Fixes #3072
+
+Editor
+
+ - Fix tab fade css because Safari Fixes #3073
+ - Fix error closing library dialog with monaco
+ - Handle other error types in Manage Palette view
+
+
+Nodes
+
+ - HTTP Request node - ignore invalid cookies rather than fail request Fixes #3075
+ - Fix msg.reset handling in Delay node Fixes #3074
+
+#### 2.0.1: Maintenance Release
+
+Nodes
+
+ - Function: Ensure default module export is exposed in Function node
+
+#### 2.0.0: Milestone Release
+
+**Migration from 1.x**
+
+ - Node-RED now requires Node.js 12.x or later.
+
+ - The following nodes have had significant dependency updates. Unless stated,
+   they should be fully backward compatible.
+
+   - RBE:  Relabelled as 'filter' to make it more discoverable and made part of
+     the core palette, rather than as a separate module.
+   - Tail: This node has been removed from the default palette. You can reinstall it
+     from node-red-node-tail
+   - HTTP Request: Reimplemented with a different underlying module. We have
+     tried to maintain 100% functional compatibility, but it is possible
+     some edge cases remain.
+   - JSON: The schema validation option no longer supports JSON-Schema draft-04
+   - HTML: Its underlying module has had a major version update. Should be fully
+     backward compatible.
+
+ - `functionExternalModules` is now enabled by default for new installs.
+   If you have an existing settings file that contains this setting, you will
+   need to set it to `true` yourself.
+
+   The external modules will now get installed in your Node-RED user directory,
+   (`~/.node-red`) rather than in a subdirectory. This means all dependencies will
+   be listed in your top-level `package.json`. If you have existing external modules,
+   they will get reinstalled to the new location when you first run Node-RED 2.0.
+
+
+Runtime
+
+ - Fix missing dependencies (#3052, #2057) @kazuhitoyokoi
+ - Ensure node.types is defined if node html file missing
+ - Fix reporting of type_already_registered error
+ - Move install location of external modules (#3064) @knolleary
+
+Editor
+
+ - Update translations (#3063) @kazuhitoyokoi
+ - Add a slight fade to tab labels that overflow
+ - Show config node details when selected in outliner
+ - Fix layout of info outliner for subflow entries
+
+Nodes
+
+ - Delay: let `msg.flush` specify how many messages to flush from node (#3059) @dceejay
+ - Function: external modules is now enabled by default (#3065) @knolleary
+ - Function: external modules now supports both ES6 and CJS modules (#3065) @knolleary
+ - WebSocket: add option for client node to send automatic pings (#3056) @knolleary
+
+
+##### 2.0.0-beta.2: Beta Release
+
+Runtime
+
+ - Add `node-red admin init` (via `node-red-admin@2.1.0`)
+ - Move to GH Actions rather than Travis for build (#3042) @knolleary
+
+Editor
+
+ - Include hasUser=false config nodes when exporting whole flow (#3048)
+ - Emit nodes:change for any updated config node when node deleted/added
+ - Fix padding of compact notification Closes #3045
+ - Ensure any html in changelog is escaped before displaying
+ - Add support for Map/Set property types on Debug (#3040) @knolleary
+ - Add 'theme' to default settings file
+ - Add RED.view.annotations api (#3032) @knolleary
+ - Update monaco editor to V0.25.2 (#3031) @Steve-Mcl
+ - Lower tray zIndex when overlay tray being opened Fixes #3019
+ - Reduce z-Index of Function expand buttons to prevent overlap Part of #3019
+ - Ensure RED.clipboard.import displays the right library Fixes #3021
+ - Batch messages sent over comms to prevent flooding (#3025) @knolleary
+ - Allow RED.popover.panel to specify a closeButton to ignore click events on
+ - Use browser default language for initial page load
+ - Add css var for node font color
+ - Fix label padding of toggleButton
+ - Give sidebar open tab a bit more room for its label
+ - Various Monaco updates (#3015) @Steve-Mcl
+ - Log readOnly on startup (#3024) @sammachin
+ - Translation updates (#3020 #3022) @HiroyasuNishiyama @kazuhitoyokoi
+
+Nodes
+
+ - HTTP Request: Fix proxy handling (#3044) @hardillb
+ - HTTP Request: Handle basic auth with @ in username (#3017) @hardillb
+ - Add Japanese translation for file-in node (#3037 #3039) @kazuhitoyokoi
+ - File In: Add option for file-in node to include all properties (default off) (#3035) @dceejay
+ - Exec: add windowsHide option to hide windows under Windows (#3026) @natcl
+ - Support loading external module sub path Fixes #3023
+
+##### 2.0.0-beta.1: Beta Release
+
+
+
+Runtime
+
+ - [MAJOR] Set minimum node version to 12.
+ - [MAJOR] Fix flowfile name to flows.json in settings (#2951) @dceejay
+ - [MAJOR] Update to latest i18n in editor and runtime (#2940) @knolleary
+ - [MAJOR] Deprecate usage of httpRoot (#2953) @knolleary
+ - Add pre/postInstall hooks to npm install handling (#2936) @knolleary
+ - Add engine-strict flag to npm install args (#2965) @nileio
+ - Restructure default settings.js to be more organised (#3012) @knolleary
+ - Ensure httpServerOptions gets applied to ALL the express apps
+ - Allow RED.settings.set to replace string property with object property
+ - Update debug tests to handle compact comms format
+ - Updates to encode/decode message when passed over debug comms link
+ - Remove all input event listeners on a node once it is closed
+ - Move hooks to util package
+ - Rework hooks structure to be a linkedlist
+ - Update dependencies (#2922) @knolleary
+
+Editor
+
+ - [MAJOR] Change node id generation to give fixed length values without '.' (#2987) @knolleary
+ - [MAJOR] Add Monaco code editor (#2971) @Steve-Mcl
+ - Update to latest Monaco (#3007) @Steve-Mcl
+ - Update Node-RED Function typings in Monaco (#3008) @Steve-Mcl
+ - Add css named variables for certain key colours (#2994) @knolleary
+ - Improve contrast of export dialog JSON font color
+ - Switch editableList buttons from <a> to <button> elements
+ - Add option to RED.nodes.createCompleteNodeSet to include node dimensions
+ - Fix css of node help table of contents elements
+ - Improve red-ui-node-icon css and add red-ui-node-icon-small modifier class
+ - Add RED.hooks to editor
+ - Add viewAddPort viewRemovePort viewAddNode viewRemoveNode hooks to view
+ - Use paletteLabel if set in help sidebar
+ - Add missing args from JSONata $now signature
+
+Nodes
+
+ - [MAJOR] Relabel RBE node as 'filter' and move into core. Also remove tail (#2944) @dceejay
+ - [MAJOR] HTTP Request: migrate to 'got' module (#2952) @knolleary
+ - [MAJOR] Move Inject node to CronosJS module (#2959) @knolleary
+ - [MAJOR] JSON: Update ajv to 8.2.0 - drop support for JSON-Schema draft-04 (#2969) @knolleary
+ - [MAJOR] HTML node: cheerio update to 1.x (#3011) @knolleary
+ - Join: change default manual mode to object (#2931) @knolleary
+ - File node: Add fileWorkingDirectory (#2932) @knolleary
+ - Delay node enhancements (#2294) @kazuhitoyokoi (#2949) @dceejay
+ - Add Japanese translations for delay node enhancements (#2958) @kazuhitoyokoi
+ - Inject node: reorder TypedInput options (#2961) @dceejay
+ - HTTP Request: update to work with proxies (#2983) @hardillb (#3009) @hardillb
+ - HTTP Request: fix msg.responseUrl (#2986) @hardillb
+ - TLS: Add ALPN support to TLS node (#2988) @hardillb
+ - Inject: add "Inject now" button to edit dialog (#2990) @Steve-Mcl
+
+

 #### Older Releases

--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -142,7 +142,6 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/settings.js",
                    "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/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",
@@ -151,7 +150,6 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
                    "packages/node_modules/@node-red/editor-client/src/js/history.js",
                    "packages/node_modules/@node-red/editor-client/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",
@@ -167,10 +165,8 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/diagnostics.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
@@ -195,7 +191,6 @@ module.exports = function(grunt) {
                    "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
                    "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
@@ -226,7 +221,7 @@ module.exports = function(grunt) {
                        "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/src/vendor/ace/ext-language_tools.js",
                    ],
                    // "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
                    //     // TODO: resolve relative resource paths in
@@ -235,9 +230,6 @@ module.exports = function(grunt) {
                    "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"
                    ]
                }
            }
@@ -408,7 +400,7 @@ module.exports = function(grunt) {
                    {
                        cwd: 'packages/node_modules/@node-red/editor-client/src',
                        src: [
-                            'types/node/**/*.ts',
+                            'types/node/*.ts',
                            'types/node-red/*.ts',
                        ],
                        expand: true,
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@

 http://nodered.org

-[![Build Status](https://github.com/node-red/node-red/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/node-red/node-red/actions?query=branch%3Amaster)
+[![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
+[![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)

 Low-code programming for event-driven applications.

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "3.1.0-beta.4",
+    "version": "2.2.2",
    "description": "Low-code programming for event-driven applications",
    "homepage": "http://nodered.org",
    "license": "Apache-2.0",
@@ -26,77 +26,76 @@
        }
    ],
    "dependencies": {
-        "acorn": "8.8.2",
+        "acorn": "8.7.0",
        "acorn-walk": "8.2.0",
-        "ajv": "8.12.0",
-        "async-mutex": "0.4.0",
+        "ajv": "8.10.0",
+        "async-mutex": "0.3.2",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
-        "body-parser": "1.20.2",
+        "body-parser": "1.19.1",
        "cheerio": "1.0.0-rc.10",
        "clone": "2.1.2",
-        "content-type": "1.0.5",
-        "cookie": "0.5.0",
+        "content-type": "1.0.4",
+        "cookie": "0.4.2",
        "cookie-parser": "1.4.6",
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
-        "denque": "2.1.0",
-        "express": "4.18.2",
-        "express-session": "1.17.3",
+        "denque": "2.0.1",
+        "express": "4.17.2",
+        "express-session": "1.17.2",
        "form-data": "4.0.0",
-        "fs-extra": "11.1.1",
-        "got": "12.6.0",
+        "fs-extra": "10.0.0",
+        "fs.notify": "0.0.4",
+        "got": "11.8.3",
        "hash-sum": "2.0.0",
-        "hpagent": "1.2.0",
-        "https-proxy-agent": "5.0.1",
-        "i18next": "21.10.0",
+        "hpagent": "0.1.2",
+        "https-proxy-agent": "5.0.0",
+        "i18next": "21.6.11",
        "iconv-lite": "0.6.3",
        "is-utf8": "0.2.1",
-        "js-yaml": "4.1.0",
+        "js-yaml": "3.14.1",
        "json-stringify-safe": "5.0.1",
        "jsonata": "1.8.6",
        "lodash.clonedeep": "^4.5.0",
        "media-typer": "1.1.0",
        "memorystore": "1.6.7",
        "mime": "3.0.0",
-        "moment": "2.29.4",
-        "moment-timezone": "0.5.43",
-        "mqtt": "4.3.7",
-        "multer": "1.4.5-lts.1",
+        "moment-timezone": "0.5.34",
+        "mqtt": "4.3.5",
+        "multer": "1.4.4",
        "mustache": "4.2.0",
-        "node-red-admin": "^3.0.0",
-        "node-watch": "0.7.3",
+        "node-red-admin": "^2.2.3",
        "nopt": "5.0.0",
        "oauth2orize": "1.11.1",
        "on-headers": "1.0.2",
-        "passport": "0.6.0",
+        "passport": "0.5.2",
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.5.2",
-        "semver": "7.5.0",
-        "tar": "6.1.13",
-        "tough-cookie": "4.1.2",
-        "uglify-js": "3.17.4",
-        "uuid": "9.0.0",
+        "raw-body": "2.4.3",
+        "semver": "7.3.5",
+        "tar": "6.1.11",
+        "tough-cookie": "4.0.0",
+        "uglify-js": "3.15.1",
+        "uuid": "8.3.2",
        "ws": "7.5.6",
-        "xml2js": "0.6.0"
+        "xml2js": "0.4.23"
    },
    "optionalDependencies": {
-        "bcrypt": "5.1.0"
+        "bcrypt": "5.0.1"
    },
    "devDependencies": {
-        "dompurify": "2.4.1",
-        "grunt": "1.6.1",
+        "dompurify": "2.3.5",
+        "grunt": "1.4.1",
        "grunt-chmod": "~1.1.1",
        "grunt-cli": "~1.4.3",
        "grunt-concurrent": "3.0.0",
-        "grunt-contrib-clean": "2.0.1",
+        "grunt-contrib-clean": "~2.0.0",
        "grunt-contrib-compress": "2.0.0",
-        "grunt-contrib-concat": "2.1.0",
-        "grunt-contrib-copy": "1.0.0",
-        "grunt-contrib-jshint": "3.2.0",
-        "grunt-contrib-uglify": "5.2.2",
-        "grunt-contrib-watch": "1.1.0",
+        "grunt-contrib-concat": "~1.0.1",
+        "grunt-contrib-copy": "~1.0.0",
+        "grunt-contrib-jshint": "3.1.1",
+        "grunt-contrib-uglify": "5.0.1",
+        "grunt-contrib-watch": "~1.1.0",
        "grunt-jsdoc": "2.4.1",
        "grunt-jsdoc-to-markdown": "6.0.0",
        "grunt-jsonlint": "2.1.3",
@@ -105,23 +104,22 @@
        "grunt-sass": "~3.1.0",
        "grunt-simple-mocha": "~0.4.1",
        "grunt-simple-nyc": "^3.0.1",
-        "i18next-http-backend": "1.4.1",
+        "i18next-http-backend": "1.3.2",
        "jquery-i18next": "1.2.1",
        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "4.3.0",
-        "mermaid": "^9.4.3",
+        "marked": "4.0.12",
        "minami": "1.2.3",
-        "mocha": "9.2.2",
-        "node-red-node-test-helper": "^0.3.2",
-        "nodemon": "2.0.20",
+        "mocha": "9.2.0",
+        "node-red-node-test-helper": "^0.2.7",
+        "nodemon": "2.0.15",
        "proxy": "^1.0.2",
-        "sass": "1.62.1",
+        "sass": "1.49.7",
        "should": "13.2.3",
        "sinon": "11.1.2",
        "stoppable": "^1.1.0",
-        "supertest": "6.3.3"
+        "supertest": "6.2.2"
    },
    "engines": {
-        "node": ">=14"
+        "node": ">=12"
    }
 }
--- a/packages/node_modules/@node-red/editor-api/lib/admin/diagnostics.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/diagnostics.js
@@ -1,23 +0,0 @@
-let runtimeAPI;
-let settings;
-const apiUtil = require("../util");
-module.exports = {
-    init: function(_settings, _runtimeAPI) {
-        settings = _settings;
-        runtimeAPI = _runtimeAPI;
-    },
-    getReport: function(req, res) {
-        const diagnosticsOpts = settings.diagnostics || {};
-        const opts = {
-            user: req.user,
-            scope: diagnosticsOpts.level || "basic"
-        }
-        if(diagnosticsOpts.enabled === false || diagnosticsOpts.enabled === "false") {
-            apiUtil.rejectHandler(req, res, {message: "diagnostics are disabled", status: 403, code: "diagnostics.disabled" })
-        } else {
-            runtimeAPI.diagnostics.get(opts)
-            .then(function(result) { res.json(result); })
-            .catch(err => apiUtil.rejectHandler(req, res, err))
-        }
-    }
-}
--- a/packages/node_modules/@node-red/editor-api/lib/admin/flows.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/flows.js
@@ -68,28 +68,5 @@ module.exports = {
        }).catch(function(err) {
            apiUtils.rejectHandler(req,res,err);
        })
-    },
-    getState: function(req,res) {
-        const opts = {
-            user: req.user,
-            req: apiUtils.getRequestLogObject(req)
-        }
-        runtimeAPI.flows.getState(opts).then(function(result) {
-            res.json(result);
-        }).catch(function(err) {
-            apiUtils.rejectHandler(req,res,err);
-        })
-    },
-    postState: function(req,res) {
-        const opts = {
-            user: req.user,
-            state: req.body.state || "",
-            req: apiUtils.getRequestLogObject(req)
-        }
-        runtimeAPI.flows.setState(opts).then(function(result) {
-            res.json(result);
-        }).catch(function(err) {
-            apiUtils.rejectHandler(req,res,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
@@ -14,6 +14,8 @@
 * limitations under the License.
 **/

+var express = require("express");
+
 var nodes = require("./nodes");
 var flows = require("./flows");
 var flow = require("./flow");
@@ -21,7 +23,6 @@ var context = require("./context");
 var auth = require("../auth");
 var info = require("./settings");
 var plugins = require("./plugins");
-var diagnostics = require("./diagnostics");

 var apiUtil = require("../util");

@@ -33,22 +34,24 @@ module.exports = {
        context.init(runtimeAPI);
        info.init(settings,runtimeAPI);
        plugins.init(runtimeAPI);
-        diagnostics.init(settings, runtimeAPI);

-        const needsPermission = auth.needsPermission;
+        var needsPermission = auth.needsPermission;
+
+        var adminApp = express();
+
+        var defaultServerSettings = {
+            "x-powered-by": false
+        }
+        var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+        for (var eOption in serverSettings) {
+            adminApp.set(eOption, serverSettings[eOption]);
+        }

-        const adminApp = apiUtil.createExpressApp(settings)

        // Flows
        adminApp.get("/flows",needsPermission("flows.read"),flows.get,apiUtil.errorHandler);
        adminApp.post("/flows",needsPermission("flows.write"),flows.post,apiUtil.errorHandler);

-        // Flows/state
-        adminApp.get("/flows/state", needsPermission("flows.read"), flows.getState, apiUtil.errorHandler);
-        if (settings.runtimeState && settings.runtimeState.enabled === true) {
-            adminApp.post("/flows/state", needsPermission("flows.write"), flows.postState, apiUtil.errorHandler);
-        }
-
        // Flow
        adminApp.get("/flow/:id",needsPermission("flows.read"),flow.get,apiUtil.errorHandler);
        adminApp.post("/flow",needsPermission("flows.write"),flow.post,apiUtil.errorHandler);
@@ -92,8 +95,6 @@ module.exports = {
        adminApp.get("/plugins", needsPermission("plugins.read"), plugins.getAll, apiUtil.errorHandler);
        adminApp.get("/plugins/messages", needsPermission("plugins.read"), plugins.getCatalogs, apiUtil.errorHandler);

-        adminApp.get("/diagnostics", needsPermission("diagnostics.read"), diagnostics.getReport, apiUtil.errorHandler);
-
        return adminApp;
    }
 }
--- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
@@ -106,15 +106,9 @@ async function login(req,res) {
                urlPrefix += "/";
            }
            response = {
-                "type":"strategy"
+                "type":"strategy",
+                "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]
            }
-            if (mergedAdminAuth.strategy.autoLogin) {
-                response.autoLogin = true
-                response.loginRedirect = urlPrefix + "auth/strategy"
-            }
-            response.prompts = [
-                {type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}
-            ]
            if (mergedAdminAuth.strategy.icon) {
                response.prompts[0].icon = mergedAdminAuth.strategy.icon;
            }
@@ -191,7 +185,7 @@ function genericStrategy(adminApp,strategy) {
                }
            };

-            options.verify.apply(this,args);
+            options.verify.apply(null,args);
        } else {
            var profile = arguments[arguments.length - 2];
            return completeVerify(profile,originalDone);
--- a/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
@@ -92,16 +92,10 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                loginAttempts = loginAttempts.filter(function(logEntry) {
                    return logEntry.user !== username;
                });
-                // Check if the user contains a user defined token and use it
-                // instead of generating a new token
-                if(user.token){
-                    done(null,user.token,null,null);
-                } else {
-                    Tokens.create(username,client.id,scope).then(function(tokens) {
-                        log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
-                        done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
-                    });
-                }
+                Tokens.create(username,client.id,scope).then(function(tokens) {
+                    log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
+                    done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
+                });
            } else {
                log.audit({event: "auth.login.fail.permissions",username:username,client:client.id,scope:scope});
                done(null,false);
--- a/packages/node_modules/@node-red/editor-api/lib/editor/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
@@ -46,15 +46,14 @@ module.exports = {
        runtimeAPI = _runtimeAPI;
        needsPermission = auth.needsPermission;
        if (!settings.disableEditor) {
-            info.init(settings, runtimeAPI);
+            info.init(runtimeAPI);
            comms.init(server,settings,runtimeAPI);

            var ui = require("./ui");

            ui.init(runtimeAPI);

-            const editorApp = apiUtil.createExpressApp(settings)
-
+            var editorApp = express();
            if (settings.requireHttps === true) {
                editorApp.enable('trust proxy');
                editorApp.use(function (req, res, next) {
@@ -87,7 +86,7 @@ module.exports = {

            //Projects
            var projects = require("./projects");
-            projects.init(settings, runtimeAPI);
+            projects.init(runtimeAPI);
            editorApp.use("/projects",projects.app());

            // Locales
--- a/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
@@ -14,9 +14,9 @@
 * limitations under the License.
 **/

+var express = require("express");
 var apiUtils = require("../util");

-var settings;
 var runtimeAPI;
 var needsPermission = require("../auth").needsPermission;

@@ -77,12 +77,11 @@ function getProjectRemotes(req,res) {
    })
 }
 module.exports = {
-    init: function(_settings, _runtimeAPI) {
-        settings = _settings;
+    init: function(_runtimeAPI) {
        runtimeAPI = _runtimeAPI;
    },
    app: function() {
-        var app = apiUtils.createExpressApp(settings)
+        var app = express();

        app.use(function(req,res,next) {
            runtimeAPI.projects.available().then(function(available) {
--- a/packages/node_modules/@node-red/editor-api/lib/editor/settings.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/settings.js
@@ -18,9 +18,9 @@ var runtimeAPI;
 var sshkeys = require("./sshkeys");

 module.exports = {
-    init: function(settings, _runtimeAPI) {
+    init: function(_runtimeAPI) {
        runtimeAPI = _runtimeAPI;
-        sshkeys.init(settings, runtimeAPI);
+        sshkeys.init(runtimeAPI);
    },
    userSettings: function(req, res) {
        var opts = {
--- a/packages/node_modules/@node-red/editor-api/lib/editor/sshkeys.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/sshkeys.js
@@ -17,15 +17,13 @@
 var apiUtils = require("../util");
 var express = require("express");
 var runtimeAPI;
-var settings;

 module.exports = {
-    init: function(_settings, _runtimeAPI) {
+    init: function(_runtimeAPI) {
        runtimeAPI = _runtimeAPI;
-        settings = _settings;
    },
    app: function() {
-        const app = apiUtils.createExpressApp(settings);
+        var app = express();

        // List all SSH keys
        app.get("/", function(req,res) {
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -19,7 +19,6 @@ var util = require("util");
 var path = require("path");
 var fs = require("fs");
 var clone = require("clone");
-const apiUtil = require("../util")

 var defaultContext = {
    page: {
@@ -28,7 +27,8 @@ var defaultContext = {
        tabicon: {
            icon: "red/images/node-red-icon-black.svg",
            colour: "#8f0000"
-        }
+        },
+        version: require(path.join(__dirname,"../../package.json")).version
    },
    header: {
        title: "Node-RED",
@@ -40,7 +40,6 @@ var defaultContext = {
        vendorMonaco: ""
    }
 };
-var settings;

 var theme = null;
 var themeContext = clone(defaultContext);
@@ -93,8 +92,7 @@ function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
 }

 module.exports = {
-    init: function(_settings, _runtimeAPI) {
-        settings = _settings;
+    init: function(settings, _runtimeAPI) {
        runtimeAPI = _runtimeAPI;
        themeContext = clone(defaultContext);
        if (process.env.NODE_ENV == "development") {
@@ -103,10 +101,7 @@ module.exports = {
        }
        themeSettings = null;
        theme = settings.editorTheme || {};
-        themeContext.asset.vendorMonaco = "vendor/monaco/monaco-bootstrap.js"
-        if (theme.codeEditor && theme.codeEditor.lib === 'ace') {
-            themeContext.asset.vendorMonaco = ''
-        }
+        themeContext.asset.vendorMonaco = ((theme.codeEditor || {}).lib === "monaco") ? "vendor/monaco/monaco-bootstrap.js" : "";
        activeTheme = theme.theme;
    },

@@ -115,15 +110,7 @@ module.exports = {
        var url;
        themeSettings = {};

-        themeApp = apiUtil.createExpressApp(settings);
-        
-        const defaultServerSettings = {
-            "x-powered-by": false
-        }
-        const serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
-        for (const eOption in serverSettings) {
-            themeApp.set(eOption, serverSettings[eOption]);
-        }
+        themeApp = express();

        if (theme.page) {

@@ -276,69 +263,9 @@ module.exports = {
                    theme.page = theme.page || {_:{}}
                    theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                }
-                // check and load page settings from theme
-                if (themePlugin.page) {
-                    if (themePlugin.page.favicon  && !theme.page.favicon) {
-                        const result = serveFilesFromTheme(
-                            [themePlugin.page.favicon],
-                            themeApp,
-                            "/",
-                            themePlugin.path
-                        )
-                        if(result && result.length > 0) {
-                            // update themeContext page favicon
-                            themeContext.page.favicon = result[0]
-                            theme.page = theme.page || {_:{}}
-                            theme.page._.favicon = result[0]
-                        }
-                    }
-                    if (themePlugin.page.tabicon && themePlugin.page.tabicon.icon && !theme.page.tabicon) {
-                        const result = serveFilesFromTheme(
-                            [themePlugin.page.tabicon.icon],
-                            themeApp,
-                            "/page/",
-                            themePlugin.path
-                        )
-                        if(result && result.length > 0) {
-                            // update themeContext page tabicon
-                            themeContext.page.tabicon.icon = result[0]
-                            themeContext.page.tabicon.colour = themeContext.page.tabicon.colour || themeContext.page.tabicon.colour
-                            theme.page = theme.page || {_:{}}
-                            theme.page._.tabicon = theme.page._.tabicon || {}
-                            theme.page._.tabicon.icon = themeContext.page.tabicon.icon 
-                            theme.page._.tabicon.colour = themeContext.page.tabicon.colour
-                        }
-                    }
-                    // if the plugin has a title AND the users settings.js does NOT
-                    if (themePlugin.page.title && !theme.page.title) {
-                        themeContext.page.title = themePlugin.page.title || themeContext.page.title
-                    }
+                if(theme.codeEditor) {
+                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
                }
-                // check and load header settings from theme
-                if (themePlugin.header) {
-                    if (themePlugin.header.image && !theme.header.image) {
-                        const result = serveFilesFromTheme(
-                            [themePlugin.header.image],
-                            themeApp,
-                            "/header/",
-                            themePlugin.path
-                        )
-                        if(result && result.length > 0) {
-                            // update themeContext header image
-                            themeContext.header.image = result[0]
-                        }
-                    }
-                    // if the plugin has a title AND the users settings.js does NOT have a title
-                    if (themePlugin.header.title && !theme.header.title) {
-                        themeContext.header.title = themePlugin.header.title || themeContext.header.title
-                    }
-                    // if the plugin has a header url AND the users settings.js does NOT
-                    if (themePlugin.header.url && !theme.header.url) {
-                        themeContext.header.url = themePlugin.header.url || themeContext.header.url
-                    }
-                }
-                theme.codeEditor = theme.codeEditor || {}
-                theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
            }
            activeThemeInitialised = true;
        }
--- a/packages/node_modules/@node-red/editor-api/lib/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/index.js
@@ -37,6 +37,7 @@ var adminApp;
 var server;
 var editor;

+
 /**
 * Initialise the module.
 * @param  {Object}     settings   The runtime settings
@@ -48,7 +49,7 @@ var editor;
 function init(settings,_server,storage,runtimeAPI) {
    server = _server;
    if (settings.httpAdminRoot !== false) {
-        adminApp = apiUtil.createExpressApp(settings);
+        adminApp = express();

        var cors = require('cors');
        var corsHandler = cors({
@@ -63,6 +64,14 @@ function init(settings,_server,storage,runtimeAPI) {
            }
        }

+        var defaultServerSettings = {
+            "x-powered-by": false
+        }
+        var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+        for (var eOption in serverSettings) {
+            adminApp.set(eOption, serverSettings[eOption]);
+        }
+
        auth.init(settings,storage);

        var maxApiRequestSize = settings.apiMaxLength || '5mb';
@@ -127,11 +136,10 @@ async function stop() {
        editor.stop();
    }
 }
-
 module.exports = {
-    init,
-    start,
-    stop,
+    init: init,
+    start: start,
+    stop: stop,

    /**
    * @memberof @node-red/editor-api
--- a/packages/node_modules/@node-red/editor-api/lib/util.js
+++ b/packages/node_modules/@node-red/editor-api/lib/util.js
@@ -14,9 +14,10 @@
 * limitations under the License.
 **/

-const express = require("express");

-const { log, i18n } = require("@node-red/util");
+var log = require("@node-red/util").log; // TODO: separate module
+var i18n = require("@node-red/util").i18n; // TODO: separate module
+

 module.exports = {
    errorHandler: function(err,req,res,next) {
@@ -63,17 +64,5 @@ module.exports = {
            path: req.path,
            ip: (req.headers && req.headers['x-forwarded-for']) || (req.connection && req.connection.remoteAddress) || undefined
        }
-    },
-    createExpressApp: function(settings) {
-        const app = express();
-    
-        const defaultServerSettings = {
-            "x-powered-by": false
-        }
-        const serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
-        for (let eOption in serverSettings) {
-            app.set(eOption, serverSettings[eOption]);
-        }
-        return app
    }
 }
--- 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": "3.1.0-beta.4",
+    "version": "2.2.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,25 +16,25 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.0-beta.4",
-        "@node-red/editor-client": "3.1.0-beta.4",
+        "@node-red/util": "2.2.2",
+        "@node-red/editor-client": "2.2.2",
        "bcryptjs": "2.4.3",
-        "body-parser": "1.20.2",
+        "body-parser": "1.19.1",
        "clone": "2.1.2",
        "cors": "2.8.5",
-        "express-session": "1.17.3",
-        "express": "4.18.2",
+        "express-session": "1.17.2",
+        "express": "4.17.2",
        "memorystore": "1.6.7",
        "mime": "3.0.0",
-        "multer": "1.4.5-lts.1",
+        "multer": "1.4.4",
        "mustache": "4.2.0",
        "oauth2orize": "1.11.1",
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.6.0",
+        "passport": "0.5.2",
        "ws": "7.5.6"
    },
    "optionalDependencies": {
-        "bcrypt": "5.1.0"
+        "bcrypt": "5.0.1"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -44,8 +44,7 @@
        "loadNodes": "Lade Nodes __count__",
        "loadFlows": "Lade Flows",
        "importFlows": "Füge Flows dem Arbeitsbereich hinzu",
-        "importError": "<p>Fehler beim Laden von Flows.</p><p>__message__</p>",
-        "loadingProject": "Lade Projekt"
+        "importError": "<p>Fehler beim Laden von Flows.</p><p>__message__</p>"
    },
    "workspace": {
        "defaultName": "Flow __number__",
@@ -54,16 +53,7 @@
        "delete": "Sind Sie sicher, dass '__label__' gelöscht werden soll?",
        "dropFlowHere": "Hier kann der Flow eingefügt werden",
        "addFlow": "Flow hinzufügen",
-        "addFlowToRight": "Flow zum Arbeitsbereich rechts hinzufügen",
-        "hideFlow": "Flow ausblenden",
-        "hideOtherFlows": "Andere Flows ausblenden",
-        "showAllFlows": "Alle Flows anzeigen",
-        "hideAllFlows": "Alle Flows ausblenden",
-        "hiddenFlows": "Liste __count__ ausgeblendeten Flow auf",
-        "hiddenFlows_plural": "Liste __count__ ausgeblendete Flows auf",
-        "showLastHiddenFlow": "Letzten ausgeblendeten Flow anzeigen",
        "listFlows": "Flows auflisten",
-        "listSubflows": "Subflows auflisten",
        "status": "Status",
        "enabled": "Aktiviert",
        "disabled": "Deaktiviert",
@@ -75,8 +65,6 @@
            "view": {
                "view": "Ansicht",
                "grid": "Raster",
-                "storeZoom": "Zoomstufe beim Laden wiederherstellen",
-                "storePosition": "Scrollposition beim Laden wiederherstellen",
                "showGrid": "Raster anzeigen",
                "snapGrid": "Am Raster ausrichten",
                "gridSize": "Rastergröße",
@@ -94,7 +82,6 @@
            "palette": {
                "show": "Palette anzeigen"
            },
-            "edit": "Bearbeiten",
            "settings": "Einstellungen",
            "userSettings": "Einstellungen",
            "nodes": "Nodes",
@@ -105,7 +92,7 @@
            "search": "Flows durchsuchen",
            "searchInput": "Flows durchsuchen",
            "subflows": "Subflow",
-            "createSubflow": "Hinzufügen",
+            "createSubflow": "Erstellen",
            "selectionToSubflow": "Auswahl in Subflow umwandeln",
            "flows": "Flow",
            "add": "Hinzufügen",
@@ -117,43 +104,24 @@
            "editPalette": "Palette verwalten",
            "other": "Sonstige",
            "showTips": "Tipps anzeigen",
-            "showWelcomeTours": "Geführte Touren für neue Versionen anzeigen",
            "help": "Node-RED-Website",
-            "projects": "Projekte",
+            "projects": "Projekt",
            "projects-new": "Neu",
            "projects-open": "Öffnen",
            "projects-settings": "Einstellungen",
            "showNodeLabelDefault": "Zeige Namen von neu hinzugefügten Nodes",
-            "codeEditor": "Code-Editor",
-            "groups": "Gruppen",
+            "groups": "Gruppe",
            "groupSelection": "Auswahl gruppieren",
            "ungroupSelection": "Gruppe auflösen",
            "groupMergeSelection": "Auswahl der Gruppe hinzufügen",
-            "groupRemoveSelection": "Auswahl aus der Gruppe entfernen",
-            "arrange": "Anordnen",
-            "alignLeft": "Links ausrichten",
-            "alignCenter": "Zentrieren",
-            "alignRight": "Rechts ausrichten",
-            "alignTop": "Oben ausrichten",
-            "alignMiddle": "Mittig ausrichten",
-            "alignBottom": "Unten ausrichten",
-            "distributeHorizontally": "Horizontal verteilen",
-            "distributeVertically": "Vertikal verteilen",
-            "moveToBack": "Nach hinten verschieben",
-            "moveToFront": "Nach vorne verschieben",
-            "moveBackwards": "Rückwärts verschieben",
-            "moveForwards": "Vorwärts verschieben"
+            "groupRemoveSelection": "Auswahl aus der Gruppe entfernen"
        }
    },
    "actions": {
        "toggle-navigator": "Navigator ein-/ausblenden",
        "zoom-out": "Verkleinern",
        "zoom-reset": "Vergrößerung rücksetzen",
-        "zoom-in": "Vergrößern",
-        "search-flows": "Flows durchsuchen",
-        "search-prev": "Vorherige",
-        "search-next": "Nächste",
-        "search-counter": "\"__term__\" __result__ von __count__"
+        "zoom-in": "Vergrößern"
    },
    "user": {
        "loggedInAs": "Angemeldet als __name__",
@@ -163,52 +131,48 @@
        "loginFailed": "Anmeldung fehlgeschlagen",
        "notAuthorized": "Nicht berechtigt",
        "errors": {
-            "settings": "Sie müssen angemeldet sein, um auf die Einstellungen zugreifen zu können",
+            "settings": "Sie müssen angemeldet sein, um auf die Einstellungen zuzugreifen zu können",
            "deploy": "Sie müssen angemeldet sein, um Änderungen übernehmen (deploy) zu können",
            "notAuthorized": "Sie müssen angemeldet sein, um diese Aktion ausführen zu können"
        }
    },
    "notification": {
-        "state": {
-            "flowsStopped": "Flows gestoppt",
-            "flowsStarted": "Flows gestartet"
-        },
-        "warning": "<strong>Warnung</strong>: __message__",
+        "warning": "<strong>Warnung:</strong> __message__",
        "warnings": {
            "undeployedChanges": "Node hat nicht übernommene (deploy) Änderungen",
            "nodeActionDisabled": "Node-Aktionen deaktiviert",
-            "nodeActionDisabledSubflow": "Node-Aktionen innerhalb des Subflows deaktiviert",
+            "nodeActionDisabledSubflow": "Node-Aktionen deaktiviert im Subflow",
            "missing-types": "<p>Flows gestoppt aufgrund fehlender Node-Typen</p>",
            "missing-modules": "<p>Flows angehalten aufgrund fehlender Module</p>",
            "safe-mode": "<p>Flows sind im abgesicherten Modus gestoppt.</p><p>Flows können bearbeitet und übernommen (deploy) werden, um sie neu zu starten.</p>",
            "restartRequired": "Node-RED muss neu gestartet werden, damit die Module nach Upgrade aktiviert werden",
-            "credentials_load_failed": "<p>Flows gestoppt, da die Credentials nicht entschlüsselt werden konnten.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
-            "credentials_load_failed_reset": "<p>Die Credentials konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Credentials wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Credentials werden gelöscht.</p>",
+            "credentials_load_failed": "<p>Flows gestoppt, da die Berechtigungen nicht entschlüsselt werden konnten.</p><p>Die Datei mit dem Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
+            "credentials_load_failed_reset": "<p>Die Berechtigungen konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Berechtigungen wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Berechtigungen werden gelöscht.</p>",
            "missing_flow_file": "<p>Die Flow-Datei des Projekts wurde nicht gefunden.</p><p>Das Projekt ist nicht mit einer Flow-Datei konfiguriert.</p>",
            "missing_package_file": "<p>Die Paket-Datei des Projekts wurde nicht gefunden.</p><p>In dem Projekt fehlt die 'package.json'-Datei.</p>",
            "project_empty": "<p>Das Projekt ist leer.</p><p>Soll ein Standardsatz an Projektdateien erstellen werden?<br/>Andernfalls müssen die Dateien manuell außerhalb des Editors dem Projekt hinzugefügt werden.</p>",
            "project_not_found": "<p>Das Projekt '__project__' wurde nicht gefunden.</p>",
            "git_merge_conflict": "<p>Der automatische Merge der Änderungen ist fehlgeschlagen.</p><p>Die Merge-Konflikte müssen behoben und die Ergebnisse ins Repository übertragen werden (commit).</p>"
        },
-        "error": "<strong>Fehler</strong>: __message__",
+        "error": "<strong>Fehler:</strong> __message__",
        "errors": {
            "lostConnection": "Verbindung zum Server verloren. Verbindung wird erneut hergestellt ...",
-            "lostConnectionReconnect": "Verbindung zum Server verloren. Wiederherstellung der Verbindung in __time__s.",
-            "lostConnectionTry": "Jetzt versuchen",
+            "lostConnectionReconnect": "Verbindung zum Server verloren. Verbindung wird in __time__ s versucht wieder herzustellen.",
+            "lostConnectionTry": "Jetzt testen",
            "cannotAddSubflowToItself": "Subflow kann nicht zu sich selbst hinzugefügt werden",
            "cannotAddCircularReference": "Subflow kann nicht hinzugefügt werden, da ein zirkulärer Bezug erkannt wurde",
            "unsupportedVersion": "<p>Nicht unterstützte Version von Node.js erkannt.</p><p>Es muss ein Upgrade auf das neueste LTS-Release von Node.js durchgeführt werden.</p>",
            "failedToAppendNode": "<p>Fehler beim Laden von '__module__'.</p><p>__error__</p>"
        },
        "project": {
-            "change-branch": "Wechsel in den lokalen Branch '__project__'",
-            "merge-abort": "Git-Merge abgebrochen",
+            "change-branch": "Wechsel in den Branch '__project__'",
+            "merge-abort": "Merge abgebrochen",
            "loaded": "Projekt '__project__' geladen",
            "updated": "Projekt '__project__' aktualisiert",
            "pull": "Projekt '__project__' erneut geladen",
            "revert": "Änderungen im Projekt '__project__' rückgängig gemacht",
-            "merge-complete": "Git-Merge abgeschlossen",
-            "setupCredentials": "Credentials einrichten",
+            "merge-complete": "Merge abgeschlossen",
+            "setupCredentials": "Berechtigungen einrichten",
            "setupProjectFiles": "Projektdateien einrichten",
            "no": "Nein, Danke",
            "createDefault": "Standardprojektdateien erstellen",
@@ -216,13 +180,12 @@
        },
        "label": {
            "manage-project-dep": "Projektabhängigkeiten verwalten",
-            "setup-cred": "Credentials einrichten",
+            "setup-cred": "Berechtigungen einrichten",
            "setup-project": "Projektdateien einrichten",
            "create-default-package": "Standardpaketdatei erstellen",
            "no-thanks": "Nein, Danke",
            "create-default-project": "Standardprojektdateien erstellen",
-            "show-merge-conflicts": "Merge-Konflikte anzeigen",
-            "unknownNodesButton": "Nach unbekannten Nodes suchen"
+            "show-merge-conflicts": "Merge-Konflikte anzeigen"
        }
    },
    "clipboard": {
@@ -240,17 +203,17 @@
        "subflow_plural": "__count__ Subflows",
        "replacedNodes": "__count__ Node ersetzt",
        "replacedNodes_plural": "__count__ Nodes ersetzt",
-        "pasteNodes": "Flow-JSON einfügen oder",
+        "pasteNodes": "Flow-JSON hier einfügen oder",
        "selectFile": "Datei für Import auswählen",
        "importNodes": "Import",
        "exportNodes": "Export",
        "download": "Download",
-        "importUnrecognised": "Nicht erkannten Typ importiert:",
-        "importUnrecognised_plural": "Nicht erkannte Typen importiert:",
-        "importDuplicate": "Doppelten Node importiert:",
-        "importDuplicate_plural": "Doppelte Nodes importiert:",
-        "nodesExported": "Nodes in die Zwischenablage exportiert",
-        "nodesImported": "Importiert:",
+        "importUnrecognised": "Importierter Typ nicht erkannt:",
+        "importUnrecognised_plural": "Importierte Typen nicht erkannt:",
+        "importDuplicate": "Importiertes doppeltes Node:",
+        "importDuplicate_plural": "Importierte doppelte Nodes:",
+        "nodesExported": "Nodes in der Zwischenablage abgelegt",
+        "nodesImported": "Eingefügt:",
        "nodeCopied": "__count__ Node kopiert",
        "nodeCopied_plural": "__count__ Nodes kopiert",
        "groupCopied": "__count__ Gruppe kopiert",
@@ -266,11 +229,11 @@
            "all": "Alle Flows",
            "compact": "Kompakt",
            "formatted": "Formatiert",
-            "copy": "In Zwischenablage kopieren",
+            "copy": "In Zwischenablage exportieren",
            "export": "In Bibliothek exportieren",
            "exportAs": "Exportiere als",
            "overwrite": "Ersetzen",
-            "exists": "<p><b>\"__file__\"</b> existiert bereits.</p><p>Soll sie ersetzt werden?</p>"
+            "exists": "<p>'__file__' existiert bereits.</p><p>Soll sie ersetzt werden?</p>"
        },
        "import": {
            "import": "Importiere in",
@@ -300,19 +263,13 @@
        "modifiedFlowsDesc": "Übernimmt nur Flows, die geänderte Nodes enthalten",
        "modifiedNodes": "Geänderte Nodes",
        "modifiedNodesDesc": "Übernimmt nur Nodes, die sich geändert haben",
-        "startFlows": "Start",
-        "startFlowsDesc": "Flows starten",
-        "stopFlows": "Stop",
-        "stopFlowsDesc": "Flows stoppen",
        "restartFlows": "Flows neustarten",
        "restartFlowsDesc": "Startet die aktuell übernommenen Flows (ohne vorheriges Deploy)",
        "successfulDeploy": "Erfolgreich übernommen (deploy)",
        "successfulRestart": "Flows erfolgreich neugestartet",
        "deployFailed": "Übernahme (deploy) fehlgeschlagen: __message__",
        "unusedConfigNodes": "Einige Konfigurations-Nodes werden nicht verwendet.",
-        "unusedConfigNodesButton": "Suche nach unbenutzten Konfigurations-Nodes",
-        "unknownNodesButton": "Suche nach unbekannten Nodes",
-        "invalidNodesButton": "Suche nach ungültigen Nodes",
+        "unusedConfigNodesLink": "Hier klicken, um sie anzuschauen.",
        "errors": {
            "noResponse": "Keine Antwort vom Server"
        },
@@ -385,7 +342,7 @@
        "confirmDelete": "Sind Sie sicher mit dem Löschen dieses Subflows?",
        "info": "Beschreibung",
        "category": "Kategorie",
-        "module": "Modul",
+        "module": "Module",
        "license": "Lizenz",
        "licenseNone": "Keine",
        "licenseOther": "Andere",
@@ -395,10 +352,10 @@
        "keys": "Schlüsselwörter",
        "keysPlaceholder": "Komma-getrennte Schlüsselwörter",
        "author": "Author",
-        "authorPlaceholder": "Ihr Name <email@example.com>",
+        "authorPlaceholder": "Dein Name <email@beispiel.de>",
        "desc": "Beschreibung",
        "env": {
-            "restore": "Subflow-Standard wiederherstellen",
+            "restore": "Stelle auf Subflow-Standard zurück",
            "remove": "Entferne Umgebungsvariable"
        },
        "errors": {
@@ -407,9 +364,9 @@
        }
    },
    "group": {
-        "editGroup": "Bearbeite Gruppe: __name__",
+        "editGroup": "Editiere Gruppe: __name__",
        "errors": {
-            "cannotCreateDiffGroups": "Kann keine Gruppe mit Nodes von anderen Gruppen erstellen",
+            "cannotCreateDiffGroups": "Kann keine Gruppe erzeugen mit Nodes von verschiedenen Gruppen",
            "cannotAddSubflowPorts": "Kann keine Subflow-Anschlüsse zu einer Gruppe hinzufügen"
        }
    },
@@ -423,7 +380,7 @@
        "addNewConfig": "Neuen Konfigurations-Node '__type__' hinzufügen",
        "editNode": "Node '__type__' bearbeiten",
        "editConfig": "Konfigurations-Node '__type__' bearbeiten",
-        "addNewType": "Neuen Typ '__type__' hinzufügen ...",
+        "addNewType": "Neuen Typ '__type__' hinzufügen",
        "nodeProperties": "Node-Eigenschaften",
        "label": "Name",
        "color": "Farbe",
@@ -443,10 +400,10 @@
        "icon": "Icon",
        "inputType": "Eingangstyp",
        "selectType": "Wähle Typen ...",
-        "loadCredentials": "Lade Node-Credentials",
+        "loadCredentials": "Lade Node-Berechtigungen",
        "inputs": {
            "input": "Eingang",
-            "select": "Auswahl",
+            "select": "Wähle",
            "checkbox": "Checkbox",
            "spinner": "Spinner",
            "none": "Kein",
@@ -459,7 +416,7 @@
            "json": "JSON",
            "bin": "buffer",
            "env": "Umgebungsvariable",
-            "cred": "Credentials"
+            "cred": "Berechtigung"
        },
        "menu": {
            "input": "Eingang",
@@ -479,7 +436,7 @@
        "errors": {
            "scopeChange": "Wenn Sie den Geltungsbereich (scope) ändern, wird er für Nodes in anderen Flows nicht verfügbar sein",
            "invalidProperties": "Ungültige Eigenschaften:",
-            "credentialLoadFailed": "Laden der Node-Credentials fehlgeschlagen"
+            "credentialLoadFailed": "Laden der Node-Berechtigungen fehlgeschlagen"
        }
    },
    "keyboard": {
@@ -489,27 +446,23 @@
        "shortcut": "Tastenkürzel",
        "scope": "Geltungsbereich",
        "unassigned": "Nicht zugeordnet",
-        "global": "Global",
+        "global": "global",
        "workspace": "Arbeitsbereich",
-        "selectAll": "Alles auswählen",
-        "selectNone": "Alles abwählen",
+        "selectAll": "Alle Nodes auswählen",
        "selectAllConnected": "Alle verbundenen Nodes auswählen",
        "addRemoveNode": "Node aus Auswahl hinzufügen/entfernen",
        "editSelected": "Ausgewählten Node bearbeiten",
        "deleteSelected": "Ausgewählte Nodes oder Links löschen",
-        "importNode": "Nodes importieren",
-        "exportNode": "Nodes exportieren",
+        "importNode": "Node importieren",
+        "exportNode": "Node exportieren",
        "nudgeNode": "Ausgewählte Nodes verschieben (1px)",
        "moveNode": "Ausgewählte Nodes verschieben (20px)",
        "toggleSidebar": "Seitenleiste ein-/ausblenden",
        "togglePalette": "Palette ein-/ausblenden",
        "copyNode": "Ausgewählte Nodes kopieren",
        "cutNode": "Ausgewählte Nodes ausschneiden",
-        "pasteNode": "Nodes einfügen",
-        "copyGroupStyle": "Gruppenstil kopieren",
-        "pasteGroupStyle": "Gruppenstil einfügen",
+        "pasteNode": "Node einfügen",
        "undoChange": "Letzte Änderung rückgängig machen",
-        "redoChange": "Letzte Änderung wiederholen",
        "searchBox": "Suchfeld öffnen",
        "managePalette": "Palette verwalten",
        "actionList": "Aktionsliste"
@@ -535,7 +488,7 @@
    "palette": {
        "noInfo": "Keine Informationen verfügbar",
        "filter": "Nodes filtern",
-        "search": "Module durchsuchen",
+        "search": "Modules durchsuchen",
        "addCategory": "Neu hinzufügen ...",
        "label": {
            "subflows": "Subflows",
@@ -564,8 +517,7 @@
            "nodeEnabled_plural": "Nodes aktiviert:",
            "nodeDisabled": "Node deaktiviert:",
            "nodeDisabled_plural": "Nodes deaktiviert:",
-            "nodeUpgraded": "Upgrade von Node-Modul __module__ auf Version __version__ durchgeführt",
-            "unknownNodeRegistered": "Fehler beim Laden des Nodes: <ul><li>__type__<br>__error__</li></ul>"
+            "nodeUpgraded": "Upgrade von Node-Modul __module__ auf Version __version__ durchgeführt"
        },
        "editor": {
            "title": "Palette verwalten",
@@ -681,7 +633,7 @@
            "outline": "Entwurf",
            "empty": "leer",
            "globalConfig": "Globale Konfigurations-Nodes",
-            "triggerAction": "Aktion auslösen",
+            "triggerAction": "Auslösen",
            "find": "Suche im Arbeitsbereich"
        },
        "help": {
@@ -692,8 +644,7 @@
            "showHelp": "Hilfe zeigen",
            "showInOutline": "Zeige im Editor",
            "showTopics": "Zeige Hilfethemen",
-            "noHelp": "Kein Hilfethema ausgewählt",
-            "changeLog": "Änderungsprotokoll"
+            "noHelp": "Kein Hilfethema ausgewählt"
        },
        "config": {
            "name": "Konfigurations-Node",
@@ -747,7 +698,7 @@
                "addToProject": "Zu Projekt hinzufügen",
                "files": "Dateien",
                "flow": "Flow",
-                "credentials": "Credentials",
+                "credentials": "Berechtigungen",
                "package": "Paket",
                "packageCreate": "Datei wird erstellt beim Speichern der Änderungen",
                "fileNotExist": "Datei existiert nicht",
@@ -760,7 +711,7 @@
                "changeTheEncryptionKey": "Schlüssel ändern",
                "currentKey": "Aktueller Schlüssel",
                "newKey": "Neuer Schlüssel",
-                "credentialsAlert": "Dadurch werden alle vorhandenen Credentials gelöscht",
+                "credentialsAlert": "Dadurch werden alle vorhandenen Berechtigungen gelöscht",
                "versionControl": "Versionsverwaltung (Git)",
                "branches": "Branches",
                "noBranches": "Keine Branches",
@@ -785,7 +736,7 @@
                "userName": "Benutzername",
                "email": "E-Mail",
                "workflow": "Arbeitsablauf",
-                "workfowTip": "Wählen Sie Ihren bevorzugten Git-Arbeitsablauf (Workflow)",
+                "workfowTip": "Wähle deinen bevorzugten Git-Arbeitsablauf",
                "workflowManual": "Manuell",
                "workflowManualTip": "Alle Änderungen müssen manuell übertragen werden (commit) über die Seitenleiste 'Projekthistorie'",
                "workflowAuto": "Automatisch",
@@ -896,7 +847,7 @@
            "date": "timestamp",
            "jsonata": "JSONata",
            "env": "Umgebungsvariable",
-            "cred": "Credentials"
+            "cred": "Berechtigung"
        }
    },
    "editableList": {
@@ -904,8 +855,6 @@
        "addTitle": "Element hinzufügen"
    },
    "search": {
-        "history": "Suchhistorie",
-        "clear": "Leeren",
        "empty": "Keine Übereinstimmungen gefunden",
        "addNode": "Node hinzufügen ...",
        "options": {
@@ -913,10 +862,7 @@
            "unusedConfigNodes": "Unbenutzte Konfigurations-Nodes",
            "invalidNodes": "Ungültige Nodes",
            "uknownNodes": "Unbekannte Nodes",
-            "unusedSubflows": "Unbenutzte Subflows",
-            "hiddenFlows": "Versteckte Flows",
-            "modifiedNodes": "Geänderte Nodes",
-            "thisFlow": "Aktueller Flow"
+            "unusedSubflows": "Unbenutzte Subflows"
        }
    },
    "expressionEditor": {
@@ -938,9 +884,6 @@
            "eval": "Fehler beim Auswerten des Ausdrucks\n__message__"
        }
    },
-    "monaco": {
-        "setTheme": "Thema auswählen"
-    },
    "jsEditor": {
        "title": "JavaScript-Editor"
    },
@@ -950,10 +893,8 @@
    "jsonEditor": {
        "title": "JSON-Editor",
        "format": "JSON formatieren",
-        "rawMode": "Bearbeite JSON",
+        "rawMode": "JSON-Editor",
        "uiMode": "Visueller Editor",
-        "rawMode-readonly": "JSON",
-        "uiMode-readonly": "Visuell",
        "insertAbove": "Oberhalb einfügen",
        "insertBelow": "Unterhalb einfügen",
        "addItem": "Element hinzufügen",
@@ -1024,7 +965,7 @@
            "clone": "Projekt klonen",
            "desc0": "Wenn Sie bereits über ein Git-Repository verfügen, das ein Projekt enthält, können Sie es klonen, um damit zu arbeiten.",
            "already-exists": "Das Projekt ist bereits vorhanden",
-            "must-contain": "Darf nur A-Z 0-9 _ - enthalten",
+            "must-contain": "Darf nur A-Z 0-9 _ enthalten",
            "project-name": "Projektname",
            "no-info-in-url": "Geben Sie Benutzername & Passwort nicht innerhalb der URL vor",
            "git-url": "Git-Repository-URL",
@@ -1036,7 +977,7 @@
            "passphrase": "Passphrase",
            "ssh-key-desc": "Bevor Sie ein Repository über SSH lokal klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zugreifen zu können",
            "ssh-key-add": "SSH-Schlüssel hinzufügen",
-            "credential-key": "Schlüssel für Credentials",
+            "credential-key": "Schlüssel für Berechtigungen",
            "cant-get-ssh-key": "Fehler! Der ausgewählte SSH-Schlüsselpfad kann nicht abgerufen werden",
            "already-exists2": "bereits vorhanden",
            "git-error": "Git-Fehler",
@@ -1048,27 +989,27 @@
            "create": "Erstellen Sie Ihre Projektdateien",
            "desc0": "Ein Projekt enthält Ihre Flow-Dateien, eine README-Datei und die 'package.json'-Datei.",
            "desc1": "Es kann alle anderen Dateien enthalten, die im Git-Repository verwaltet werden sollen.",
-            "desc2": "Ihre vorhandenen Flow- und Credential-Dateien werden in das Projekt kopiert.",
+            "desc2": "Ihre vorhandenen Flow- und Berechtigungs-Dateien werden in das Projekt kopiert.",
            "flow-file": "Flow-Datei",
-            "credentials-file": "Datei mit Credentials"
+            "credentials-file": "Datei mit Berechtigungen"
        },
        "encryption-config": {
-            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Credentials",
-            "desc0": "Die Datei mit den Flow-Credentials kann verschlüsselt werden, um ihren Inhalt zu schützen.",
-            "desc1": "Wenn Sie diese Credentials in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
-            "desc2": "Die Datei mit den Flow-Credentials ist derzeit nicht verschlüsselt.",
+            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Berechtigungen",
+            "desc0": "Die Datei mit den Flow-Berechtigungen kann verschlüsselt werden, um ihren Inhalt zu schützen.",
+            "desc1": "Wenn Sie diese Berechtigungen in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
+            "desc2": "Die Datei mit den Flow-Berechtigungen ist derzeit nicht verschlüsselt.",
            "desc3": "D.h. ihr Inhalt (z.B. Passwörter und Zugriffs-Tokens) kann von jedem mit Zugriff auf die Datei gelesen werden.",
-            "desc4": "Wenn Sie diese Credentials in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
-            "desc5": "Ihre Datei mit den Flow-Credentials wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
-            "desc6": "Die Datei mit den Flow-Credentials wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
+            "desc4": "Wenn Sie diese Berechtigungen in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
+            "desc5": "Ihre Datei mit den Flow-Berechtigungen wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
+            "desc6": "Die Datei mit den Flow-Berechtigungen wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
            "desc7": "Der Schlüssel wird separat von den Projektdateien gespeichert. Sie müssen den Schlüssel angeben, damit dieses Projekt auch in einem anderen Node-RED-System verwendet werden kann.",
-            "credentials": "Credentials",
+            "credentials": "Berechtigung",
            "enable": "Verschlüsselung aktivieren",
            "disable": "Verschlüsselung deaktivieren",
            "disabled": "deaktiviert",
            "copy": "Vorhandenen Schlüssel ersetzen",
            "use-custom": "Eigenen Schlüssel verwenden",
-            "desc8": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
+            "desc8": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
            "create-project-files": "Projektdateien erstellen",
            "create-project": "Projekt erstellen",
            "already-exists": "bereits vorhanden",
@@ -1082,7 +1023,7 @@
            "desc2": "Im Tab 'Commit-Historie' in der Seitenleiste werden alle Dateien angezeigt, die sich in Ihrem Projekt geändert haben, und um sie ins lokale Repository zu übertragen (commit). Es zeigt Ihnen eine vollständige Historie Ihrer Commits an und ermöglicht es Ihnen, Ihre Commits in ein (remote) Server-Repository zu schieben (push)."
        },
        "create": {
-            "projects": "Projekte",
+            "projects": "Projekt",
            "already-exists": "Das Projekt ist bereits vorhanden",
            "must-contain": "Darf nur A-Z 0-9 _ enthalten",
            "no-info-in-url": "Geben Sie Benutzername & Passwort nicht innerhalb der URL vor",
@@ -1093,12 +1034,12 @@
            "desc": "Beschreibung",
            "opt": "Optional",
            "flow-file": "Flow-Datei",
-            "credentials": "Credentials",
+            "credentials": "Berechtigungen",
            "enable-encryption": "Verschlüsselung aktivieren",
            "disable-encryption": "Verschlüsselung deaktivieren",
            "encryption-key": "Schlüssel",
-            "desc0": "Eine Ausdruck, mit der Sie Ihre Credentials schützen",
-            "desc1": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
+            "desc0": "Eine Floskel, mit der Sie Ihre Berechtigungen schützen",
+            "desc1": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
            "git-url": "Git-Repository-URL",
            "protocols": "https://, ssh:// oder file://",
            "auth-failed": "Authentifizierung fehlgeschlagen",
@@ -1108,15 +1049,14 @@
            "passphrase": "Passphrase",
            "desc2": "Bevor Sie ein Repository über SSH klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zu zugreifen",
            "add-ssh-key": "Einen SSH-Schlüssel hinzufügen",
-            "credentials-encryption-key": "Schlüssel für Credentials",
+            "credentials-encryption-key": "Schlüssel für Berechtigungen",
            "already-exists-2": "bereits vorhanden",
            "git-error": "Git-Fehler",
            "con-failed": "Verbindung fehlgeschlagen",
            "not-git": "Kein Git-Repository",
            "no-resource": "Repository nicht gefunden",
            "cant-get-ssh-key-path": "Fehler! Der ausgewählte SSH-Schlüsselpfad kann nicht abgerufen werden.",
-            "unexpected_error": "unerwarteter_Fehler",
-            "clearContext": "Kontextdaten löschen beim Projektwechsel"
+            "unexpected_error": "unerwarteter_Fehler"
        },
        "delete": {
            "confirm": "Sind Sie sicher, dass dieses Projekt gelöscht werden soll?"
@@ -1163,46 +1103,13 @@
        "preview": "Vorschau",
        "defaultValue": "Standardwert"
    },
-    "tourGuide": {
-        "takeATour": "Tour starten",
-        "start": "Start",
-        "next": "Nächste",
-        "welcomeTours": "Welcome Tours"
-    },
-    "diagnostics": {
-        "title": "System-Informationen"
-    },
    "languages": {
-        "de": "Deutsch",
-        "en-US": "Englisch",
-        "fr": "Französisch",
-        "ja": "Japanisch",
-        "ko": "Koreanisch",
-        "pt-BR":"Portugiesisch",
-        "ru": "Russisch",
-        "zh-CN": "Chinesisch (Vereinfacht)",
-        "zh-TW": "Chinesisch (Traditionell)"
-    },
-    "validator": {
-        "errors": {
-            "invalid-json": "Ungültige JSON-Daten: __error__",
-            "invalid-json-prop": "__prop__: ungültige JSON-Daten: __error__",
-            "invalid-prop": "Ungültiger Eigenschaftsausdruck",
-            "invalid-prop-prop": "__prop__: ungültiger Eigenschaftsausdruck",
-            "invalid-num": "Ungültige Nummer",
-            "invalid-num-prop": "__prop__: ungültige Nummer",
-            "invalid-regexp": "Ungültiges Eingabemuster",
-            "invalid-regex-prop": "__prop__: ungültiges Eingabemuster",
-            "missing-required-prop": "__prop__: Eigenschaftswert fehlt",
-            "invalid-config": "__prop__: ungültige Konfigurations-Node",
-            "missing-config": "__prop__: Konfigurations-Node fehlt",
-            "validation-error": "__prop__: Validierungsfehler: __node__, __id__: __error__"
-        }
-    },
-    "contextMenu": {
-        "insert": "Einfügen",
-        "node": "Node",
-        "junction": "Kreuzung",
-        "linkNodes": "Verknüpfe Nodes"
+        "de": "German",
+        "en-US": "English",
+        "ja": "Japanese",
+        "ko": "Korean",
+        "ru": "Russian",
+        "zh-CN": "Chinese(Simplified)",
+        "zh-TW": "Chinese(Traditional)"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/de/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
--- 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
@@ -3,7 +3,7 @@
        "label": {
            "name": "Name",
            "ok": "Ok",
-            "done": "Done",
+            "done":"Done",
            "cancel": "Cancel",
            "delete": "Delete",
            "close": "Close",
@@ -23,11 +23,7 @@
            "position": "Position",
            "enable": "Enable",
            "disable": "Disable",
-            "upload": "Upload",
-            "lock": "Lock",
-            "unlock": "Unlock",
-            "locked": "Locked",
-            "unlocked": "Unlocked"
+            "upload": "Upload"
        },
        "type": {
            "string": "string",
@@ -57,30 +53,22 @@
        "confirmDelete": "Confirm delete",
        "delete": "Are you sure you want to delete '__label__'?",
        "dropFlowHere": "Drop the flow here",
-        "dropImageHere": "Drop the image here",
        "addFlow": "Add flow",
        "addFlowToRight": "Add flow to the right",
-        "closeFlow": "Close flow",
        "hideFlow": "Hide flow",
        "hideOtherFlows": "Hide other flows",
-        "showAllFlows": "Show all flows (__count__ hidden)",
+        "showAllFlows": "Show all flows",
        "hideAllFlows": "Hide all flows",
        "hiddenFlows": "List __count__ hidden flow",
        "hiddenFlows_plural": "List __count__ hidden flows",
-        "showLastHiddenFlow": "Reopen hidden flow",
+        "showLastHiddenFlow": "Show last hidden flow",
        "listFlows": "List flows",
        "listSubflows": "List subflows",
        "status": "Status",
        "enabled": "Enabled",
-        "disabled": "Disabled",
+        "disabled":"Disabled",
        "info": "Description",
-        "selectNodes": "Click nodes to select",
-        "enableFlow": "Enable flow",
-        "disableFlow": "Disable flow",
-        "lockFlow": "Lock flow",
-        "unlockFlow": "Unlock flow",
-        "moveToStart": "Move flow to start",
-        "moveToEnd": "Move flow to end"
+        "selectNodes": "Click nodes to select"
    },
    "menu": {
        "label": {
@@ -113,7 +101,6 @@
            "displayStatus": "Show node status",
            "displayConfig": "Configuration nodes",
            "import": "Import",
-            "importExample": "Import Example Flow",
            "export": "Export",
            "search": "Search flows",
            "searchInput": "search your flows",
@@ -127,7 +114,7 @@
            "keyboardShortcuts": "Keyboard shortcuts",
            "login": "Login",
            "logout": "Logout",
-            "editPalette": "Manage palette",
+            "editPalette":"Manage palette",
            "other": "Other",
            "showTips": "Show tips",
            "showWelcomeTours": "Show guided tours for new versions",
@@ -143,19 +130,19 @@
            "ungroupSelection": "Ungroup selection",
            "groupMergeSelection": "Merge selection",
            "groupRemoveSelection": "Remove from group",
-            "arrange": "Arrange",
-            "alignLeft": "Align to left",
-            "alignCenter": "Align to center",
-            "alignRight": "Align to right",
-            "alignTop": "Align to top",
-            "alignMiddle": "Align to middle",
-            "alignBottom": "Align to bottom",
-            "distributeHorizontally": "Distribute horizontally",
-            "distributeVertically": "Distribute vertically",
-            "moveToBack": "Move to back",
-            "moveToFront": "Move to front",
-            "moveBackwards": "Move backwards",
-            "moveForwards": "Move forwards"
+            "arrange":"Arrange",
+            "alignLeft":"Align to left",
+            "alignCenter":"Align to center",
+            "alignRight":"Align to right",
+            "alignTop":"Align to top",
+            "alignMiddle":"Align to middle",
+            "alignBottom":"Align to bottom",
+            "distributeHorizontally":"Distribute horizontally",
+            "distributeVertically":"Distribute vertically",
+            "moveToBack":"Move to back",
+            "moveToFront":"Move to front",
+            "moveBackwards":"Move backwards",
+            "moveForwards":"Move forwards"
        }
    },
    "actions": {
@@ -182,10 +169,6 @@
        }
    },
    "notification": {
-        "state": {
-            "flowsStopped": "Flows stopped",
-            "flowsStarted": "Flows started"
-        },
        "warning": "<strong>Warning</strong>: __message__",
        "warnings": {
            "undeployedChanges": "node has undeployed changes",
@@ -193,10 +176,10 @@
            "nodeActionDisabledSubflow": "node actions disabled within subflow",
            "missing-types": "<p>Flows stopped due to missing node types.</p>",
            "missing-modules": "<p>Flows stopped due to missing modules.</p>",
-            "safe-mode": "<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.</p>",
+            "safe-mode":"<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.</p>",
            "restartRequired": "Node-RED must be restarted to enable upgraded modules",
            "credentials_load_failed": "<p>Flows stopped as the credentials could not be decrypted.</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p>",
-            "credentials_load_failed_reset": "<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
+            "credentials_load_failed_reset":"<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
            "missing_flow_file": "<p>Project flow file not found.</p><p>The project is not configured with a flow file.</p>",
            "missing_package_file": "<p>Project package file not found.</p><p>The project is missing a package.json file.</p>",
            "project_empty": "<p>The project is empty.</p><p>Do you want to create a default set of project files?<br/>Otherwise, you will have to manually add files to the project outside of the editor.</p>",
@@ -234,8 +217,7 @@
            "create-default-package": "Create default package file",
            "no-thanks": "No thanks",
            "create-default-project": "Create default project files",
-            "show-merge-conflicts": "Show merge conflicts",
-            "unknownNodesButton": "Search for unknown nodes"
+            "show-merge-conflicts": "Show merge conflicts"
        }
    },
    "clipboard": {
@@ -274,11 +256,11 @@
        "recoveredNodesInfo": "The nodes on this flow were missing a valid flow id when they were imported. They have been added to this flow so you can either restore or delete them.",
        "recoveredNodesNotification": "<p>Imported nodes without a valid flow id</p><p>They have been added to a new flow called '__flowName__'.</p>",
        "export": {
-            "selected": "selected nodes",
-            "current": "current flow",
-            "all": "all flows",
-            "compact": "compact",
-            "formatted": "formatted",
+            "selected":"selected nodes",
+            "current":"current flow",
+            "all":"all flows",
+            "compact":"compact",
+            "formatted":"formatted",
            "copy": "Copy to clipboard",
            "export": "Export to library",
            "exportAs": "Export as",
@@ -313,19 +295,13 @@
        "modifiedFlowsDesc": "Only deploys flows that contain changed nodes",
        "modifiedNodes": "Modified Nodes",
        "modifiedNodesDesc": "Only deploys nodes that have changed",
-        "startFlows": "Start",
-        "startFlowsDesc": "Start Flows",
-        "stopFlows": "Stop",
-        "stopFlowsDesc": "Stop Flows",
        "restartFlows": "Restart Flows",
        "restartFlowsDesc": "Restarts the current deployed flows",
        "successfulDeploy": "Successfully deployed",
        "successfulRestart": "Successfully restarted flows",
        "deployFailed": "Deploy failed: __message__",
-        "unusedConfigNodes": "You have some unused configuration nodes.",
-        "unusedConfigNodesButton": "Search unused config nodes",
-        "unknownNodesButton": "Search for unknown nodes",
-        "invalidNodesButton": "Search for invalid nodes",
+        "unusedConfigNodes":"You have some unused configuration nodes.",
+        "unusedConfigNodesLink":"Click here to see them",
        "errors": {
            "noResponse": "no response from server"
        },
@@ -372,8 +348,8 @@
        },
        "nodeCount": "__count__ node",
        "nodeCount_plural": "__count__ nodes",
-        "local": "Local changes",
-        "remote": "Remote changes",
+        "local":"Local changes",
+        "remote":"Remote changes",
        "reviewChanges": "Review Changes",
        "noBinaryFileShowed": "Cannot show binary file contents",
        "viewCommitDiff": "View Commit Changes",
@@ -416,7 +392,6 @@
        },
        "errors": {
            "noNodesSelected": "<strong>Cannot create subflow</strong>: no nodes selected",
-            "acrossMultipleGroups": "Cannot create subflow across multiple groups",
            "multipleInputsToSelection": "<strong>Cannot create subflow</strong>: multiple inputs to selection"
        }
    },
@@ -458,7 +433,7 @@
        "inputType": "Input type",
        "selectType": "select types...",
        "loadCredentials": "Loading node credentials",
-        "inputs": {
+        "inputs" : {
            "input": "input",
            "select": "select",
            "checkbox": "checkbox",
@@ -505,14 +480,12 @@
        "unassigned": "Unassigned",
        "global": "global",
        "workspace": "workspace",
-        "editor": "edit dialog",
        "selectAll": "Select all",
        "selectNone": "Select none",
        "selectAllConnected": "Select connected",
        "addRemoveNode": "Add/remove node from selection",
        "editSelected": "Edit selected node",
        "deleteSelected": "Delete selected nodes or link",
-        "deleteReconnect": "Delete and Reconnect",
        "importNode": "Import nodes",
        "exportNode": "Export nodes",
        "nudgeNode": "Move selected nodes (1px)",
@@ -529,7 +502,7 @@
        "searchBox": "Open search box",
        "managePalette": "Manage palette",
        "actionList": "Action list",
-        "splitWireWithLinks": "Split selection with Link nodes"
+        "splitWiresWithLinks": "Split selection with Link nodes"
    },
    "library": {
        "library": "Library",
@@ -587,7 +560,6 @@
        "editor": {
            "title": "Manage palette",
            "palette": "Palette",
-            "allCatalogs": "All Catalogs",
            "times": {
                "seconds": "seconds ago",
                "minutes": "minutes ago",
@@ -642,19 +614,19 @@
            },
            "confirm": {
                "install": {
-                    "body": "<p>Installing '__module__'</p><p>Before installing, please read the node's documentation. Some nodes have dependencies that cannot be automatically resolved and can require a restart of Node-RED.</p>",
+                    "body":"<p>Installing '__module__'</p><p>Before installing, please read the node's documentation. Some nodes have dependencies that cannot be automatically resolved and can require a restart of Node-RED.</p>",
                    "title": "Install nodes"
                },
                "remove": {
-                    "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>",
+                    "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"
                },
                "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>",
+                    "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"
                },
                "cannotUpdate": {
-                    "body": "An update for this node is available, but it is not installed in a location that the palette manager can update.<br/><br/>Please refer to the documentation for how to update this node."
+                    "body":"An update for this node is available, but it is not installed in a location that the palette manager can update.<br/><br/>Please refer to the documentation for how to update this node."
                },
                "button": {
                    "review": "Open node information",
@@ -688,23 +660,19 @@
            "showMore": "show more",
            "showLess": "show less",
            "flow": "Flow",
-            "selection": "Selection",
-            "nodes": "__count__ nodes",
+            "selection":"Selection",
+            "nodes":"__count__ nodes",
            "flowDesc": "Flow Description",
            "subflowDesc": "Subflow Description",
            "nodeHelp": "Node Help",
-            "none": "None",
+            "none":"None",
            "arrayItems": "__count__ items",
-            "showTips": "You can open the tips from the settings panel",
+            "showTips":"You can open the tips from the settings panel",
            "outline": "Outline",
            "empty": "empty",
            "globalConfig": "Global Configuration Nodes",
            "triggerAction": "Trigger action",
-            "find": "Find in workspace",
-            "copyItemUrl": "Copy item url",
-	    "copyURL2Clipboard": "Copied url to clipboard",
-            "showFlow": "Show",
-            "hideFlow": "Hide"
+            "find": "Find in workspace"
        },
        "help": {
            "name": "Help",
@@ -714,8 +682,7 @@
            "showHelp": "Show help",
            "showInOutline": "Show in outline",
            "showTopics": "Show topics",
-            "noHelp": "No help topic selected",
-            "changeLog": "Change Log"
+            "noHelp": "No help topic selected"
        },
        "config": {
            "name": "Configuration nodes",
@@ -731,8 +698,8 @@
            "filtered": "__count__ hidden"
        },
        "context": {
-            "name": "Context Data",
-            "label": "context",
+            "name":"Context Data",
+            "label":"context",
            "none": "none selected",
            "refresh": "refresh to load",
            "empty": "empty",
@@ -770,9 +737,9 @@
                "files": "Files",
                "flow": "Flow",
                "credentials": "Credentials",
-                "package": "Package",
-                "packageCreate": "File will be created when changes are saved",
-                "fileNotExist": "File does not exist",
+                "package":"Package",
+                "packageCreate":"File will be created when changes are saved",
+                "fileNotExist":"File does not exist",
                "selectFile": "Select File",
                "invalidEncryptionKey": "Invalid encryption key",
                "encryptionEnabled": "Encryption enabled",
@@ -937,8 +904,7 @@
            "uknownNodes": "Unknown nodes",
            "unusedSubflows": "Unused subflows",
            "hiddenFlows": "Hidden flows",
-            "modifiedNodes": "Modified nodes and flows",
-            "thisFlow": "Current flow"
+            "modifiedNodes": "Modified nodes and flows"
        }
    },
    "expressionEditor": {
@@ -957,9 +923,6 @@
            "invalid-expr": "Invalid JSONata expression:\n  __message__",
            "invalid-msg": "Invalid example JSON message:\n  __message__",
            "context-unsupported": "Cannot test context functions\n $flowContext or $globalContext",
-            "env-unsupported": "Cannot test $env function",
-            "moment-unsupported": "Cannot test $moment function",
-            "clone-unsupported": "Cannot test $clone function",
            "eval": "Error evaluating expression:\n  __message__"
        }
    },
@@ -977,8 +940,6 @@
        "format": "format JSON",
        "rawMode": "Edit JSON",
        "uiMode": "Visual editor",
-        "rawMode-readonly": "JSON",
-        "uiMode-readonly": "Visual",
        "insertAbove": "Insert above",
        "insertBelow": "Insert below",
        "addItem": "Add item",
@@ -1005,16 +966,13 @@
        "quote": "Quote",
        "link": "Link",
        "horizontal-rule": "Horizontal rule",
-        "toggle-preview": "Toggle preview",
-        "mermaid": {
-            "summary": "Mermaid Diagram"
-        }
+        "toggle-preview": "Toggle preview"
    },
    "bufferEditor": {
        "title": "Buffer editor",
        "modeString": "Handle as UTF-8 String",
        "modeArray": "Handle as JSON array",
-        "modeDesc": "<h3>Buffer editor</h3><p>The Buffer type is stored as a JSON array of byte values. The editor will attempt to parse the entered value as a JSON array. If it is not valid JSON, it will be treated as a UTF-8 String and converted to an array of the individual character code points.</p><p>For example, a value of <code>Hello World</code> will be converted to the JSON array:<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+        "modeDesc":"<h3>Buffer editor</h3><p>The Buffer type is stored as a JSON array of byte values. The editor will attempt to parse the entered value as a JSON array. If it is not valid JSON, it will be treated as a UTF-8 String and converted to an array of the individual character code points.</p><p>For example, a value of <code>Hello World</code> will be converted to the JSON array:<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
    },
    "projects": {
        "config-git": "Configure Git client",
@@ -1176,7 +1134,7 @@
            "no-empty": "Cannot create default file set on a non-empty project",
            "git-error": "git error"
        },
-        "errors": {
+        "errors" : {
            "no-username-email": "Your Git client is not configured with a username/email.",
            "unexpected": "An unexpected error occurred",
            "code": "code"
@@ -1194,48 +1152,15 @@
    "tourGuide": {
        "takeATour": "Take a tour",
        "start": "Start",
-        "next": "Next",
-        "welcomeTours": "Welcome Tours"
+        "next": "Next"
    },
-    "diagnostics": {
-        "title": "System Info"
-    },
-    "languages": {
+    "languages" : {
        "de": "German",
        "en-US": "English",
-        "fr": "French",
        "ja": "Japanese",
        "ko": "Korean",
-        "pt-BR":"Portuguese",
        "ru": "Russian",
        "zh-CN": "Chinese(Simplified)",
        "zh-TW": "Chinese(Traditional)"
-    },
-    "validator": {
-        "errors": {
-            "invalid-json": "Invalid JSON data: __error__",
-            "invalid-json-prop": "__prop__: invalid JSON data: __error__",
-            "invalid-prop": "Invalid property expression",
-            "invalid-prop-prop": "__prop__: invalid property expression",
-            "invalid-num": "Invalid number",
-            "invalid-num-prop": "__prop__: invalid number",
-            "invalid-regexp": "Invalid input pattern",
-            "invalid-regex-prop": "__prop__: invalid input pattern",
-            "missing-required-prop": "__prop__: property value missing",
-            "invalid-config": "__prop__: invalid configuration node",
-            "missing-config": "__prop__: missing configuration node",
-            "validation-error": "__prop__: validation error: __node__, __id__: __error__"
-        }
-    },
-    "contextMenu": {
-        "insert": "Insert",
-        "node": "Node",
-        "junction": "Junction",
-        "linkNodes": "Link Nodes"
-    },
-    "env-var": {
-        "environment": "Environment",
-        "header": "Global Environment Variables",
-        "revert": "Revert"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
@@ -1,23 +1,23 @@
 {
    "info": {
-        "tip0": "You can remove the selected nodes or links with {{core:delete-selection}}",
-        "tip1": "Search for nodes using {{core:search}}",
-        "tip2": "{{core:toggle-sidebar}} will toggle the view of this sidebar",
-        "tip3": "You can manage your palette of nodes with {{core:manage-palette}}",
-        "tip4": "Your flow configuration nodes are listed in the sidebar panel. It can be accessed from the menu or with {{core:show-config-tab}}",
-        "tip5": "Enable or disable these tips from the option in the settings",
-        "tip6": "Move the selected nodes using the [left] [up] [down] and [right] keys. Hold [shift] to nudge them further",
-        "tip7": "Dragging a node onto a wire will splice it into the link",
-        "tip8": "Export the selected nodes, or the current tab with {{core:show-export-dialog}}",
-        "tip9": "Import a flow by dragging its JSON into the editor, or with {{core:show-import-dialog}}",
-        "tip10": "[shift] [click] and drag on a node port to move all of the attached wires or just the selected one",
-        "tip11": "Show the Info tab with {{core:show-info-tab}} or the Debug tab with {{core:show-debug-tab}}",
-        "tip12": "[ctrl] [click] in the workspace to open the quick-add dialog",
-        "tip13": "Hold down [ctrl] when you [click] on a node port to enable quick-wiring",
-        "tip14": "Hold down [shift] when you [click] on a node to also select all of its connected nodes",
-        "tip15": "Hold down [ctrl] when you [click] on a node to add or remove it from the current selection",
-        "tip16": "Switch flow tabs with {{core:show-previous-tab}} and {{core:show-next-tab}}",
-        "tip17": "You can confirm your changes in the node edit tray with {{core:confirm-edit-tray}} or cancel them with {{core:cancel-edit-tray}}",
-        "tip18": "Pressing {{core:edit-selected-node}} will edit the first node in the current selection"
+        "tip0" : "You can remove the selected nodes or links with {{core:delete-selection}}",
+        "tip1" : "Search for nodes using {{core:search}}",
+        "tip2" : "{{core:toggle-sidebar}} will toggle the view of this sidebar",
+        "tip3" : "You can manage your palette of nodes with {{core:manage-palette}}",
+        "tip4" : "Your flow configuration nodes are listed in the sidebar panel. It can be accessed from the menu or with {{core:show-config-tab}}",
+        "tip5" : "Enable or disable these tips from the option in the settings",
+        "tip6" : "Move the selected nodes using the [left] [up] [down] and [right] keys. Hold [shift] to nudge them further",
+        "tip7" : "Dragging a node onto a wire will splice it into the link",
+        "tip8" : "Export the selected nodes, or the current tab with {{core:show-export-dialog}}",
+        "tip9" : "Import a flow by dragging its JSON into the editor, or with {{core:show-import-dialog}}",
+        "tip10" : "[shift] [click] and drag on a node port to move all of the attached wires or just the selected one",
+        "tip11" : "Show the Info tab with {{core:show-info-tab}} or the Debug tab with {{core:show-debug-tab}}",
+        "tip12" : "[ctrl] [click] in the workspace to open the quick-add dialog",
+        "tip13" : "Hold down [ctrl] when you [click] on a node port to enable quick-wiring",
+        "tip14" : "Hold down [shift] when you [click] on a node to also select all of its connected nodes",
+        "tip15" : "Hold down [ctrl] when you [click] on a node to add or remove it from the current selection",
+        "tip16" : "Switch flow tabs with {{core:show-previous-tab}} and {{core:show-next-tab}}",
+        "tip17" : "You can confirm your changes in the node edit tray with {{core:confirm-edit-tray}} or cancel them with {{core:cancel-edit-tray}}",
+        "tip18" : "Pressing {{core:edit-selected-node}} will edit the first node in the current selection"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
@@ -52,52 +52,52 @@
        "desc": "Finds occurrences of `pattern` within `str` and replaces them with `replacement`.\n\nThe optional `limit` parameter is the maximum number of replacements."
    },
    "$now": {
-        "args": "$[picture [, timezone]]",
-        "desc": "Generates a timestamp in ISO 8601 compatible format and returns it as a string. If the optional picture and timezone parameters are supplied, then the current timestamp is formatted as described by the `$fromMillis()` function"
+        "args":"$[picture [, timezone]]",
+        "desc":"Generates a timestamp in ISO 8601 compatible format and returns it as a string. If the optional picture and timezone parameters are supplied, then the current timestamp is formatted as described by the `$fromMillis()` function"
    },
    "$base64encode": {
-        "args": "string",
-        "desc": "Converts an ASCII string to a base 64 representation. Each character in the string is treated as a byte of binary data. This requires that all characters in the string are in the 0x00 to 0xFF range, which includes all characters in URI encoded strings. Unicode characters outside of that range are not supported."
+        "args":"string",
+        "desc":"Converts an ASCII string to a base 64 representation. Each character in the string is treated as a byte of binary data. This requires that all characters in the string are in the 0x00 to 0xFF range, which includes all characters in URI encoded strings. Unicode characters outside of that range are not supported."
    },
    "$base64decode": {
-        "args": "string",
-        "desc": "Converts base 64 encoded bytes to a string, using a UTF-8 Unicode codepage."
+        "args":"string",
+        "desc":"Converts base 64 encoded bytes to a string, using a UTF-8 Unicode codepage."
    },
    "$number": {
        "args": "arg",
        "desc": "Casts the `arg` parameter to a number using the following casting rules:\n\n - Numbers are unchanged\n - Strings that contain a sequence of characters that represent a legal JSON number are converted to that number\n - All other values cause an error to be thrown."
    },
    "$abs": {
-        "args": "number",
-        "desc": "Returns the absolute value of the `number` parameter."
+        "args":"number",
+        "desc":"Returns the absolute value of the `number` parameter."
    },
    "$floor": {
-        "args": "number",
-        "desc": "Returns the value of `number` rounded down to the nearest integer that is smaller or equal to `number`."
+        "args":"number",
+        "desc":"Returns the value of `number` rounded down to the nearest integer that is smaller or equal to `number`."
    },
    "$ceil": {
-        "args": "number",
-        "desc": "Returns the value of `number` rounded up to the nearest integer that is greater than or equal to `number`."
+        "args":"number",
+        "desc":"Returns the value of `number` rounded up to the nearest integer that is greater than or equal to `number`."
    },
    "$round": {
-        "args": "number [, precision]",
-        "desc": "Returns the value of the `number` parameter rounded to the number of decimal places specified by the optional `precision` parameter."
+        "args":"number [, precision]",
+        "desc":"Returns the value of the `number` parameter rounded to the number of decimal places specified by the optional `precision` parameter."
    },
    "$power": {
-        "args": "base, exponent",
-        "desc": "Returns the value of `base` raised to the power of `exponent`."
+        "args":"base, exponent",
+        "desc":"Returns the value of `base` raised to the power of `exponent`."
    },
    "$sqrt": {
-        "args": "number",
-        "desc": "Returns the square root of the value of the `number` parameter."
+        "args":"number",
+        "desc":"Returns the square root of the value of the `number` parameter."
    },
    "$random": {
-        "args": "",
-        "desc": "Returns a pseudo random number greater than or equal to zero and less than one."
+        "args":"",
+        "desc":"Returns a pseudo random number greater than or equal to zero and less than one."
    },
    "$millis": {
-        "args": "",
-        "desc": "Returns the number of milliseconds since the Unix Epoch (1 January, 1970 UTC) as a number. All invocations of `$millis()` within an evaluation of an expression will all return the same value."
+        "args":"",
+        "desc":"Returns the number of milliseconds since the Unix Epoch (1 January, 1970 UTC) as a number. All invocations of `$millis()` within an evaluation of an expression will all return the same value."
    },
    "$sum": {
        "args": "array",
@@ -136,20 +136,20 @@
        "desc": "Appends two arrays"
    },
    "$sort": {
-        "args": "array [, function]",
-        "desc": "Returns an array containing all the values in the `array` parameter, but sorted into order.\n\nIf a comparator `function` is supplied, then it must be a function that takes two parameters:\n\n`function(left, right)`\n\nThis function gets invoked by the sorting algorithm to compare two values left and right. If the value of left should be placed after the value of right in the desired sort order, then the function must return Boolean `true` to indicate a swap. Otherwise it must return `false`."
+        "args":"array [, function]",
+        "desc":"Returns an array containing all the values in the `array` parameter, but sorted into order.\n\nIf a comparator `function` is supplied, then it must be a function that takes two parameters:\n\n`function(left, right)`\n\nThis function gets invoked by the sorting algorithm to compare two values left and right. If the value of left should be placed after the value of right in the desired sort order, then the function must return Boolean `true` to indicate a swap. Otherwise it must return `false`."
    },
    "$reverse": {
-        "args": "array",
-        "desc": "Returns an array containing all the values from the `array` parameter, but in reverse order."
+        "args":"array",
+        "desc":"Returns an array containing all the values from the `array` parameter, but in reverse order."
    },
    "$shuffle": {
-        "args": "array",
-        "desc": "Returns an array containing all the values from the `array` parameter, but shuffled into random order."
+        "args":"array",
+        "desc":"Returns an array containing all the values from the `array` parameter, but shuffled into random order."
    },
    "$zip": {
-        "args": "array, ...",
-        "desc": "Returns a convolved (zipped) array containing grouped arrays of values from the `array1` … `arrayN` arguments from index 0, 1, 2...."
+        "args":"array, ...",
+        "desc":"Returns a convolved (zipped) array containing grouped arrays of values from the `array1` … `arrayN` arguments from index 0, 1, 2...."
    },
    "$keys": {
        "args": "object",
@@ -168,24 +168,24 @@
        "desc": "Merges an array of `objects` into a single `object` containing all the key/value pairs from each of the objects in the input array. If any of the input objects contain the same key, then the returned `object` will contain the value of the last one in the array. It is an error if the input array contains an item that is not an object."
    },
    "$sift": {
-        "args": "object, function",
-        "desc": "Returns an object that contains only the key/value pairs from the `object` parameter that satisfy the predicate `function` passed in as the second parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, key [, object]])`"
+        "args":"object, function",
+        "desc":"Returns an object that contains only the key/value pairs from the `object` parameter that satisfy the predicate `function` passed in as the second parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, key [, object]])`"
    },
    "$each": {
-        "args": "object, function",
-        "desc": "Returns an array containing the values return by the `function` when applied to each key/value pair in the `object`."
+        "args":"object, function",
+        "desc":"Returns an array containing the values return by the `function` when applied to each key/value pair in the `object`."
    },
    "$map": {
-        "args": "array, function",
-        "desc": "Returns an array containing the results of applying the `function` parameter to each value in the `array` parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
+        "args":"array, function",
+        "desc":"Returns an array containing the results of applying the `function` parameter to each value in the `array` parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
    },
    "$filter": {
-        "args": "array, function",
-        "desc": "Returns an array containing only the values in the `array` parameter that satisfy the `function` predicate.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
+        "args":"array, function",
+        "desc":"Returns an array containing only the values in the `array` parameter that satisfy the `function` predicate.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
    },
    "$reduce": {
-        "args": "array, function [, init]",
-        "desc": "Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`. The signature of `function` must be of the form: `myfunc($accumulator, $value[, $index[, $array]])`\n\nThe optional `init` parameter is used as the initial value in the aggregation."
+        "args":"array, function [, init]",
+        "desc":"Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`. The signature of `function` must be of the form: `myfunc($accumulator, $value[, $index[, $array]])`\n\nThe optional `init` parameter is used as the initial value in the aggregation."
    },
    "$flowContext": {
        "args": "string[, string]",
--- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
--- a/packages/node_modules/@node-red/editor-client/locales/fr/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/infotips.json
@@ -1,23 +0,0 @@
-{
-  "info": {
-    "tip0": "Vous pouvez supprimer les noeuds ou les liens sélectionnés avec {{core:delete-selection}}",
-    "tip1": "Rechercher des noeuds à l'aide de {{core:search}}",
-    "tip2": "{{core:toggle-sidebar}} basculera l'affichage de cette barre latérale",
-    "tip3": "Vous pouvez gérer votre palette de noeuds avec {{core:manage-palette}}",
-    "tip4": "Vos noeuds de configuration de flux sont répertoriés dans le panneau de la barre latérale. Ils sont accessibles depuis le menu ou avec {{core:show-config-tab}}",
-    "tip5": "Activer ou désactiver ces conseils à partir de l'option dans les paramètres",
-    "tip6": "Déplacer les noeuds sélectionnés à l'aide des touches [gauche] [haut] [bas] et [droite]. Maintenir la touche [shift] enfoncée pour les pousser plus loin",
-    "tip7": "Faire glisser un noeud sur un fil le raccordera au lien",
-    "tip8": "Exporter les noeuds sélectionnés, ou l'onglet actuel avec {{core:show-export-dialog}}",
-    "tip9": "Importer un flux en faisant glisser son JSON dans l'éditeur, ou avec {{core:show-import-dialog}}",
-    "tip10": "[majuscule] [clic] et faites glisser sur un port de noeud pour déplacer tous les fils attachés ou seulement celui sélectionné",
-    "tip11": "Afficher l'onglet Infos avec {{core:show-info-tab}} ou l'onglet Débogage avec {{core:show-debug-tab}}",
-    "tip12": "[ctrl] [clic] dans l'espace de travail pour ouvrir la boîte de dialogue d'ajout rapide",
-    "tip13": "Maintenir la touche [ctrl] enfoncée lorsque vous [cliquez] sur un port de noeud pour activer le câblage rapide",
-    "tip14": "Maintenir la touche [shift] enfoncée lorsque vous [cliquez] sur un noeud pour sélectionner également tous ses noeuds connectés",
-    "tip15": "Maintenir la touche [ctrl] enfoncée lorsque vous [cliquez] sur un noeud pour l'ajouter ou le supprimer de la sélection actuelle",
-    "tip16": "Changer d'onglet de flux avec {{core:show-previous-tab}} et {{core:show-next-tab}}",
-    "tip17": "Vous pouvez confirmer vos modifications dans le panneau d'édition du noeud avec {{core:confirm-edit-tray}} ou les annuler avec {{core:cancel-edit-tray}}",
-    "tip18": "Appuyer sur {{core:edit-selected-node}} modifiera le premier noeud de la sélection actuelle"
-  }
-}
--- a/packages/node_modules/@node-red/editor-client/locales/fr/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/jsonata.json
@@ -1,274 +0,0 @@
-{
-    "$string": {
-        "args": "arg[, prettify]",
-        "desc": "Convertit le paramètre `arg` en une chaîne de caractères en utilisant les règles de typage suivantes :\n\n - Les chaînes de caractères sont inchangées\n - Les fonctions sont converties en une chaîne vide\n - L'infini numérique et NaN renvoient une erreur car ils ne peuvent pas être représentés comme un Numéro JSON\n - Toutes les autres valeurs sont converties en une chaîne JSON à l'aide de la fonction `JSON.stringify`. Si `prettify` est vrai, alors le JSON \"prettified\" est produit. c'est-à-dire une ligne par champ et les lignes seront en retrait en fonction de la profondeur du champ."
-    },
-    "$length": {
-        "args": "str",
-        "desc": "Renvoie le nombre de caractères dans la chaîne `str`. Une erreur est renvoyée si `str` n'est pas une chaîne de caractères."
-    },
-    "$substring": {
-        "args": "str, start[, length]",
-        "desc": "Renvoie une chaîne contenant les caractères du premier paramètre `str` commençant à la position `start` (pas de décalage). Si `length` est spécifié, alors la sous-chaîne contiendra un maximum de caractères `length`. Si `start` est négatif alors il indique le nombre de caractères à partir de la fin de `str`."
-    },
-    "$substringBefore": {
-        "args": "str, chars",
-        "desc": "Renvoie la sous-chaîne avant la première occurrence de la séquence de caractères `chars` dans `str`. Si `str` ne contient pas `chars`, alors il renvoie `str`."
-    },
-    "$substringAfter": {
-        "args": "str, chars",
-        "desc": "Renvoie la sous-chaîne après la première occurrence de la séquence de caractères `chars` dans `str`. Si `str` ne contient pas `chars`, alors il renvoie `str`."
-    },
-    "$uppercase": {
-        "args": "str",
-        "desc": "Renvoie une chaîne avec tous les caractères de `str` convertis en majuscules."
-    },
-    "$lowercase": {
-        "args": "str",
-        "desc": "Renvoie une chaîne avec tous les caractères de `str` convertis en minuscules."
-    },
-    "$trim": {
-        "args": "str",
-        "desc": "Normalise et supprime tous les caractères d'espacement dans `str` en appliquant les étapes suivantes :\n\n - Toutes les tabulations, retours à la ligne et sauts de ligne sont remplacés par des espaces.\n- Les séquences contiguës d'espaces sont réduites à un seul espace.\n- Les espaces de fin et de début sont supprimés.\n\n Si `str` n'est pas spécifié (c'est-à-dire que cette fonction est invoquée sans argument), alors la valeur de contexte est utilisée comme valeur de `str`. Une erreur est renvoyée si `str` n'est pas une chaîne."
-    },
-    "$contains": {
-        "args": "str, pattern",
-        "desc": "Renvoie `true` si `str` correspond à `pattern`, sinon il renvoie `false`. Si `str` n'est pas spécifié (c'est-à-dire que cette fonction est invoquée avec un argument), alors la valeur de contexte est utilisée comme valeur de `str`. Le paramètre `pattern` peut être une chaîne ou une expression régulière."
-    },
-    "$split": {
-        "args": "str[, separator][, limit]",
-        "desc": "Divise le paramètre `str` en un tableau de sous-chaînes. C'est une erreur si `str` n'est pas une chaîne. Le paramètre facultatif `separator` spécifie les caractères à l'intérieur de `str` à propos desquels il doit être divisé en chaîne ou en expression régulière. Si `separator` n'est pas spécifié, la chaîne vide est supposée et `str` sera divisé en un tableau de caractères uniques. C'est une erreur si `separator` n'est pas une chaîne. Le paramètre facultatif `limit` est un nombre qui spécifie le nombre maximum de sous-chaînes à inclure dans le tableau résultant. Toutes les sous-chaînes supplémentaires sont ignorées. Si `limit` n'est pas spécifié, alors `str` est entièrement divisé sans limite à la taille du tableau résultant. C'est une erreur si `limit` n'est pas un nombre non négatif."
-    },
-    "$join": {
-        "args": "array[, separator]",
-        "desc": "Joint un tableau de chaînes de composants en une seule chaîne concaténée, chaque chaîne de composants étant séparée par le paramètre facultatif `separator`. C'est une erreur si l'entrée `array` contient un élément qui n'est pas une chaîne. Si `séparateur` n'est pas spécifié, il est supposé être la chaîne vide, c'est-à-dire qu'il n'y a pas de `séparateur` entre les chaînes de composants. C'est une erreur si `separator` n'est pas une chaîne."
-    },
-    "$match": {
-        "args": "str, pattern [, limit]",
-        "desc": "Applique la chaîne `str` à l'expression régulière `pattern` et renvoie un tableau d'objets, chaque objet contenant des informations sur chaque occurrence d'une correspondance dans `str`."
-    },
-    "$replace": {
-        "args": "str, pattern, replacement [, limit]",
-        "desc": "Trouve les occurrences de `pattern` dans `str` et les remplace par `replacement`.\n\nLe paramètre facultatif `limit` est le nombre maximum de remplacements."
-    },
-    "$now": {
-        "args": "$[picture [, timezone]]",
-        "desc": "Génère un horodatage au format compatible ISO 8601 et le renvoie sous forme de chaîne. Si les paramètres optionnels d'image et de fuseau horaire sont fournis, alors l'horodatage actuel est formaté comme décrit par la fonction `$fromMillis()`"
-    },
-    "$base64encode": {
-        "args": "string",
-        "desc": "Convertit une chaîne ASCII en une représentation en base 64. Chaque caractère de la chaîne est traité comme un octet de données binaires. Cela nécessite que tous les caractères de la chaîne se trouvent dans la plage 0x00 à 0xFF, qui inclut tous les caractères des chaînes encodées en URI. Les caractères Unicode en dehors de cette plage ne sont pas pris en charge."
-    },
-    "$base64decode": {
-        "args": "string",
-        "desc": "Convertit les octets encodés en base 64 en une chaîne, à l'aide d'une page de codes Unicode UTF-8."
-    },
-    "$number": {
-        "args": "arg",
-        "desc": "Convertit le paramètre `arg` en un nombre en utilisant les règles de conversion suivantes :\n\n - Les nombres sont inchangés\n - Les chaînes qui contiennent une séquence de caractères représentant un nombre JSON légal sont converties en ce nombre\n - Toutes les autres valeurs provoquer l'envoi d'une erreur."
-    },
-    "$abs": {
-        "args": "number",
-        "desc": "Renvoie la valeur absolue du paramètre `nombre`."
-    },
-    "$floor": {
-        "args": "number",
-        "desc": "Renvoie la valeur de `number` arrondie à l'entier le plus proche inférieur ou égal à `number`."
-    },
-    "$ceil": {
-        "args": "number",
-        "desc": "Renvoie la valeur de `number` arrondie à l'entier le plus proche supérieur ou égal à `number`."
-    },
-    "$round": {
-        "args": "number [, precision]",
-        "desc": "Renvoie la valeur du paramètre `number` arrondie au nombre de décimales spécifié par le paramètre facultatif `precision`."
-    },
-    "$power": {
-        "args": "base, exponent",
-        "desc": "Renvoie la valeur de `base` élevée à la puissance de `exponent`."
-    },
-    "$sqrt": {
-        "args": "number",
-        "desc": "Renvoie la racine carrée de la valeur du paramètre `number`."
-    },
-    "$random": {
-        "args": "",
-        "desc": "Renvoie un nombre pseudo-aléatoire supérieur ou égal à zéro et inférieur à un."
-    },
-    "$millis": {
-        "args": "",
-        "desc": "Renvoie le nombre de millisecondes depuis l'époque Unix (1er janvier 1970 UTC) sous forme de nombre. Tous les appels de `$millis()` dans une évaluation d'une expression renverront toutes la même valeur."
-    },
-    "$sum": {
-        "args": "array",
-        "desc": "Renvoie la somme arithmétique d'un `tableau` de nombres. C'est une erreur si l'entrée `array` contient un élément qui n'est pas un nombre."
-    },
-    "$max": {
-        "args": "array",
-        "desc": "Renvoie le nombre maximal dans un `tableau` de nombres. C'est une erreur si l'entrée `array` contient un élément qui n'est pas un nombre."
-    },
-    "$min": {
-        "args": "array",
-        "desc": "Renvoie le nombre minimum dans un `tableau` de nombres. C'est une erreur si l'entrée `array` contient un élément qui n'est pas un nombre."
-    },
-    "$average": {
-        "args": "array",
-        "desc": "Renvoie la valeur moyenne d'un `tableau` de nombres. C'est une erreur si l'entrée `array` contient un élément qui n'est pas un nombre."
-    },
-    "$boolean": {
-        "args": "arg",
-        "desc": "Transforme l'argument en booléen en utilisant les règles suivantes :\n\n - `Boolean` : inchangé\n - `string` : vide : `false`\n - `string` : non vide : `true`\n - `number` : `0` : `false`\n - `number` : non nul : `true`\n - `null` : `false`\n - `array` : vide : `false`\n - `array` : contient un membre qui convertit en `true` : `true`\n - `array` : tous les membres sont transformés en `false` : `false`\n - `object` : vide : `false`\n - `object` : non vide : `true`\n - `function` : `false`"
-    },
-    "$not": {
-        "args": "arg",
-        "desc": "Renvoie un booléen résultat de la négation logique de l'argument"
-    },
-    "$exists": {
-        "args": "arg",
-        "desc": "Renvoie la valeur booléenne `true` si l'expression `arg` est évaluée à une valeur, ou `false` si l'expression ne correspond à rien (par exemple, un chemin vers une référence de champ inexistante)."
-    },
-    "$count": {
-        "args": "array",
-        "desc": "Renvoie le nombre d'éléments du tableau"
-    },
-    "$append": {
-        "args": "array, array",
-        "desc": "Combine deux tableaux"
-    },
-    "$sort": {
-        "args": "array [, function]",
-        "desc": "Renvoie un tableau contenant toutes les valeurs du paramètre `array`, mais triées dans l'ordre.\n\nSi un comparateur `function` est fourni, alors il doit s'agir d'une fonction qui prend deux paramètres :\n\n`function(left , droite)`\n\nCette fonction est invoquée par l'algorithme de tri pour comparer deux valeurs à gauche et à droite. Si la valeur de left doit être placée après la valeur de right dans l'ordre de tri souhaité, la fonction doit renvoyer un booléen `true` pour indiquer un échange. Sinon, il doit renvoyer `false`."
-    },
-    "$reverse": {
-        "args": "array",
-        "desc": "Renvoie un tableau contenant toutes les valeurs du paramètre `array`, mais dans l'ordre inverse."
-    },
-    "$shuffle": {
-        "args": "array",
-        "desc": "Renvoie un tableau contenant toutes les valeurs du paramètre `array`, mais mélangées dans un ordre aléatoire."
-    },
-    "$zip": {
-        "args": "array, ...",
-        "desc": "Renvoie un tableau convolué (zippé) contenant des tableaux groupés de valeurs des arguments `array1`...`arrayN` d'index 0, 1, 2...."
-    },
-    "$keys": {
-        "args": "object",
-        "desc": "Renvoie un tableau contenant les clés de l'objet. Si l'argument est un tableau d'objets, le tableau renvoyé contient une liste dédupliquée de toutes les clés de tous les objets."
-    },
-    "$lookup": {
-        "args": "object, key",
-        "desc": "Renvoie la valeur associée à la clé dans l'objet. Si le premier argument est un tableau d'objets, tous les objets du tableau sont recherchés et les valeurs associées à toutes les occurrences de key sont renvoyées."
-    },
-    "$spread": {
-        "args": "object",
-        "desc": "Divise un objet contenant des paires clé/valeur en un tableau d'objets, chacun ayant une seule paire clé/valeur de l'objet d'entrée. Si le paramètre est un tableau d'objets, alors le tableau résultant contient un objet pour chaque paire clé/valeur dans chaque objet du tableau fourni."
-    },
-    "$merge": {
-        "args": "array&lt;object&gt;",
-        "desc": "Fusionne un tableau d'`objets` en un seul `objet` contenant toutes les paires clé/valeur de chacun des objets du tableau d'entrée. Si l'un des objets d'entrée contient la même clé, alors l'`objet` renvoyé contiendra la valeur du dernier dans le tableau. C'est une erreur si le tableau d'entrée contient un élément qui n'est pas un objet."
-    },
-    "$sift": {
-        "args": "object, function",
-        "desc": "Renvoie un objet qui contient uniquement les paires clé/valeur du paramètre `object` qui satisfont le prédicat `function` transmis comme second paramètre.\n\nLa `function` qui est fournie comme second paramètre doit avoir la signature suivante :\n\n`fonction(valeur [, clé [, objet]])`"
-    },
-    "$each": {
-        "args": "object, function",
-        "desc": "Renvoie un tableau contenant les valeurs renvoyées par la `fonction` lorsqu'elle est appliquée à chaque paire clé/valeur dans l'`objet`."
-    },
-    "$map": {
-        "args": "array, function",
-        "desc": "Renvoie un tableau contenant les résultats de l'application du paramètre `function` à chaque valeur du paramètre `array`.\n\nLa `function` fournie comme second paramètre doit avoir la signature suivante :\n\n`function( valeur [, indice [, tableau]])`"
-    },
-    "$filter": {
-        "args": "array, function",
-        "desc": "Renvoie un tableau contenant uniquement les valeurs du paramètre `array` qui satisfont le prédicat `function`.\n\nLa `function` fournie comme second paramètre doit avoir la signature suivante :\n\n`function(value [ , indice [, tableau]])`"
-    },
-    "$reduce": {
-        "args": "array, function [, init]",
-        "desc": "Renvoie une valeur agrégée dérivée de l'application successive du paramètre `function` à chaque valeur de `array` en combinaison avec le résultat de l'application précédente de la fonction.\n\nLa fonction doit accepter deux arguments et se comporte comme un opérateur infixe entre chaque valeur dans le `tableau`. La signature de `function` doit être de la forme : `myfunc($accumulator, $value[, $index[, $array]])`\n\nLe paramètre facultatif `init` est utilisé comme valeur initiale dans l'agrégation ."
-    },
-    "$flowContext": {
-        "args": "string[, string]",
-        "desc": "Récupère une propriété de contexte de flux.\n\nCeci est une fonction définie par Node-RED."
-    },
-    "$globalContext": {
-        "args": "string[, string]",
-        "desc": "Récupère une propriété de contexte globale.\n\nCeci est une fonction définie par Node-RED."
-    },
-    "$pad": {
-        "args": "string, width [, char]",
-        "desc": "Renvoie une copie de la `chaîne` avec un rembourrage supplémentaire, si nécessaire, de sorte que son nombre total de caractères corresponde au moins à la valeur absolue du paramètre `width`.\n\nSi `width` est un nombre positif, alors la chaîne est rembourré à droite; s'il est négatif, il est rempli vers la gauche.\n\nL'argument optionnel `char` spécifie le(s) caractère(s) de remplissage à utiliser. S'il n'est pas spécifié, la valeur par défaut est le caractère espace."
-    },
-    "$fromMillis": {
-        "args": "number, [, picture [, timezone]]",
-        "desc": "Convertisser le « nombre » représentant les millisecondes depuis l'époque Unix (1er janvier 1970 UTC) en une représentation sous forme de chaîne formatée de l'horodatage tel que spécifié par la chaîne d'image.\n\nSi le paramètre facultatif « image » est omis, l'horodatage est formaté au format ISO 8601.\n\nSi la chaîne facultative `image` est fournie, l'horodatage est formaté selon la représentation spécifiée dans cette chaîne. Le comportement de cette fonction est cohérent avec la version à deux arguments de la fonction XPath/XQuery `format-dateTime` telle que définie dans la spécification XPath F&O 3.1. Le paramètre de chaîne d'image définit la façon dont l'horodatage est formaté et a la même syntaxe que `format-dateTime`.\n\nSi la chaîne facultative `timezone` est fournie, alors l'horodatage formaté sera dans ce fuseau horaire. La chaîne `timezone` doit être au format '±HHMM', où ± est le signe plus ou moins et HHMM est le décalage en heures et minutes par rapport à UTC. Décalage positif pour les fuseaux horaires à l'est de UTC, décalage négatif pour les fuseaux horaires à l'ouest de UTC."
-    },
-    "$formatNumber": {
-        "args": "number, picture [, options]",
-        "desc": "Convertit le `number` en une chaîne et le formate en une représentation décimale comme spécifié par la chaîne `picture`.\n\n Le comportement de cette fonction est cohérent avec la fonction XPath/XQuery fn:format-number telle que définie dans le Spécification XPath F&O 3.1. Le paramètre de chaîne d'image définit la façon dont le nombre est formaté et a la même syntaxe que fn:format-number.\n\nLe troisième argument facultatif `options` est utilisé pour remplacer les caractères de formatage spécifiques aux paramètres régionaux par défaut, tels que le séparateur décimal. S'il est fourni, cet argument doit être un objet contenant des paires nom/valeur spécifiées dans la section de format décimal de la spécification XPath F&O 3.1."
-    },
-    "$formatBase": {
-        "args": "number [, radix]",
-        "desc": "Convertit le `number` en une chaîne et le formate en un entier représenté dans la base numérique spécifiée par l'argument `radix`. Si `radix` n'est pas spécifié, la valeur par défaut est la base 10. `radix` peut être compris entre 2 et 36, sinon une erreur est renvoyée."
-    },
-    "$toMillis": {
-        "args": "timestamp",
-        "desc": "Convertit une chaîne `timestamp` au format ISO 8601 en nombre de millisecondes depuis l'époque Unix (1er janvier 1970 UTC) sous forme de nombre. Une erreur est renvoyée si la chaîne n'est pas au format correct."
-    },
-    "$env": {
-        "args": "arg",
-        "desc": "Renvoie la valeur d'une variable d'environnement.\n\nCeci est une fonction définie par Node-RED."
-    },
-    "$eval": {
-        "args": "expr [, context]",
-        "desc": "Analyse et évalue la chaîne `expr` qui contient un JSON littéral ou une expression JSONata en utilisant le contexte actuel comme contexte d'évaluation."
-    },
-    "$formatInteger": {
-        "args": "number, picture",
-        "desc": "Transforme le `nombre` en une chaîne et le formate en une représentation entière comme spécifié par la chaîne `image`. Le paramètre de chaîne d'image définit la façon dont le nombre est formaté et a la même syntaxe que `fn:format-integer` de la spécification XPath F&O 3.1."
-    },
-    "$parseInteger": {
-        "args": "string, picture",
-        "desc": "Analyse le contenu du paramètre `string` en un entier (comme un nombre JSON) en utilisant le format spécifié par la chaîne `picture`. Le paramètre de chaîne `picture` a le même format que `$formatInteger`."
-    },
-    "$error": {
-        "args": "[str]",
-        "desc": "Génère une erreur avec un message. Le `str` facultatif remplacera le message par défaut de la fonction `$error() évaluée`"
-    },
-    "$assert": {
-        "args": "arg, str",
-        "desc": "Si `arg` est vrai, la fonction renvoie undefined. Si `arg` est faux, une exception est lancée avec `str` comme message de l'exception."
-    },
-    "$single": {
-        "args": "array, function",
-        "desc": "Renvoie la seule et unique valeur du paramètre `array` qui satisfait le prédicat `function` (c'est-à-dire que la `function` renvoie la valeur booléenne `true` lorsqu'elle est transmise à la valeur). Lève une exception si le nombre de valeurs correspondantes n'est pas exactement un.\n\nLa fonction doit être fournie dans la signature suivante : `function(value [, index [, array]])` où value est chaque entrée du tableau, index est la position de cette valeur et le tableau entier est passé comme troisième argument"
-    },
-    "$encodeUrlComponent": {
-        "args": "str",
-        "desc": "Encode un composant URL (Uniform Resource Locator) en remplaçant chaque instance de certains caractères par une, deux, trois ou quatre séquences d'échappement représentant l'encodage UTF-8 du caractère.\n\nExemple : `$encodeUrlComponent(\"?x =test\")` => `\"%3Fx%3Dtest\"`"
-    },
-    "$encodeUrl": {
-        "args": "str",
-        "desc": "Encode une URL (Uniform Resource Locator) en remplaçant chaque instance de certains caractères par une, deux, trois ou quatre séquences d'échappement représentant l'encodage UTF-8 du caractère. \n\nExemple : `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0% B5%D0%BB%D0%BB%D1%8B\"`"
-    },
-    "$decodeUrlComponent": {
-        "args": "str",
-        "desc": "Décode un composant URL (Uniform Resource Locator) précédemment créé par encodeUrlComponent. \n\nExemple : `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
-    },
-    "$decodeUrl": {
-        "args": "str",
-        "desc": "Décode une URL (Uniform Resource Locator) précédemment créée par encodeUrl. \n\nExemple : `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
-    },
-    "$distinct": {
-        "args": "array",
-        "desc": "Renvoie un tableau avec les valeurs en double supprimées de `array`"
-    },
-    "$type": {
-        "args": "value",
-        "desc": "Renvoie le type de `value` sous forme de chaîne. Si `value` n'est pas défini, cela renverra `undefined`"
-    },
-    "$moment": {
-        "args": "[str]",
-        "desc": "Obtient un objet de date à l'aide de la bibliothèque Moment."
-    }
-}
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -23,11 +23,7 @@
            "position": "配置",
            "enable": "有効",
            "disable": "無効",
-            "upload": "アップロード",
-            "lock": "固定",
-            "unlock": "固定を解除",
-            "locked": "固定済み",
-            "unlocked": "固定なし"
+            "upload": "アップロード"
        },
        "type": {
            "string": "文字列",
@@ -57,10 +53,8 @@
        "confirmDelete": "削除の確認",
        "delete": "本当に '__label__' を削除しますか？",
        "dropFlowHere": "ここにフローをドロップしてください",
-        "dropImageHere": "ここに画像ファイルをドロップしてください",
        "addFlow": "フローの追加",
        "addFlowToRight": "右側にフローを追加",
-        "closeFlow": "フローを閉じる",
        "hideFlow": "フローを非表示",
        "hideOtherFlows": "他のフローを非表示",
        "showAllFlows": "全てのフローを表示",
@@ -74,13 +68,7 @@
        "enabled": "有効",
        "disabled": "無効",
        "info": "詳細",
-        "selectNodes": "ノードをクリックして選択",
-        "enableFlow": "フローを有効化",
-        "disableFlow": "フローを無効化",
-        "lockFlow": "フローを固定",
-        "unlockFlow": "フローの固定を解除",
-        "moveToStart": "フローを先頭へ移動",
-        "moveToEnd": "フローを最後へ移動"
+        "selectNodes": "ノードをクリックして選択"
    },
    "menu": {
        "label": {
@@ -113,7 +101,6 @@
            "displayStatus": "ノードのステータスを表示",
            "displayConfig": "設定ノード",
            "import": "読み込み",
-            "importExample": "フロー例を読み込み",
            "export": "書き出し",
            "search": "ノードを検索",
            "searchInput": "ノードを検索",
@@ -162,11 +149,7 @@
        "toggle-navigator": "ナビゲータの表示/非表示を切替",
        "zoom-out": "縮小",
        "zoom-reset": "拡大/縮小を初期化",
-        "zoom-in": "拡大",
-        "search-flows": "フローを検索",
-        "search-prev": "前へ",
-        "search-next": "次へ",
-        "search-counter": "\"__term__\" __count__ 件中の __result__ 件目"
+        "zoom-in": "拡大"
    },
    "user": {
        "loggedInAs": "__name__ としてログインしました",
@@ -182,10 +165,6 @@
        }
    },
    "notification": {
-        "state": {
-            "flowsStopped": "フローを停止しました",
-            "flowsStarted": "フローを開始しました"
-        },
        "warning": "<strong>警告</strong>: __message__",
        "warnings": {
            "undeployedChanges": "ノードの変更をデプロイしていません",
@@ -234,8 +213,7 @@
            "create-default-package": "デフォルトパッケージファイルの作成",
            "no-thanks": "不要",
            "create-default-project": "デフォルトプロジェクトファイルの作成",
-            "show-merge-conflicts": "マージ競合を表示",
-            "unknownNodesButton": "不明なノードを検索する"
+            "show-merge-conflicts": "マージ競合を表示"
        }
    },
    "clipboard": {
@@ -313,19 +291,13 @@
        "modifiedFlowsDesc": "変更したノードを含むフローのみデプロイ",
        "modifiedNodes": "変更したノード",
        "modifiedNodesDesc": "変更したノードのみデプロイ",
-        "startFlows": "開始",
-        "startFlowsDesc": "フローを開始",
-        "stopFlows": "停止",
-        "stopFlowsDesc": "フローを停止",
        "restartFlows": "フローを再起動",
        "restartFlowsDesc": "デプロイされた現在のフローを再起動",
        "successfulDeploy": "デプロイが成功しました",
        "successfulRestart": "フローの再起動が成功しました",
        "deployFailed": "デプロイが失敗しました: __message__",
        "unusedConfigNodes": "使われていない設定ノードがあります。",
-        "unusedConfigNodesButton": "未使用の構成ノードを検索",
-        "unknownNodesButton": "不明なノードを検索する",
-        "invalidNodesButton": "無効なノードを検索する",
+        "unusedConfigNodesLink": "設定を参照する",
        "errors": {
            "noResponse": "サーバの応答がありません"
        },
@@ -416,7 +388,6 @@
        },
        "errors": {
            "noNodesSelected": "<strong>サブフローを作成できません</strong>: ノードが選択されていません",
-            "acrossMultipleGroups": "複数のグループをまたがるサブフローは作成できません",
            "multipleInputsToSelection": "<strong>サブフローを作成できません</strong>: 複数の入力が選択されています"
        }
    },
@@ -505,14 +476,12 @@
        "unassigned": "未割当",
        "global": "グローバル",
        "workspace": "ワークスペース",
-        "editor": "編集ダイアログ",
        "selectAll": "全てのノードを選択",
        "selectNone": "選択を外す",
        "selectAllConnected": "接続されたノードを選択",
        "addRemoveNode": "ノードの選択、選択解除",
        "editSelected": "選択したノードを編集",
        "deleteSelected": "選択したノードや接続を削除",
-        "deleteReconnect": "削除と再接続",
        "importNode": "フローの読み込み",
        "exportNode": "フローの書き出し",
        "nudgeNode": "選択したノードを移動(移動量小)",
@@ -528,8 +497,7 @@
        "redoChange": "変更操作をやり直し",
        "searchBox": "ノードを検索",
        "managePalette": "パレットの管理",
-        "actionList": "動作一覧",
-        "splitWireWithLinks": "選択したワイヤーをlinkノードで分離"
+        "actionList": "動作一覧"
    },
    "library": {
        "library": "ライブラリ",
@@ -587,7 +555,6 @@
        "editor": {
            "title": "パレットの管理",
            "palette": "パレット",
-            "allCatalogs": "全カタログ",
            "times": {
                "seconds": "数秒前",
                "minutes": "数分前",
@@ -700,11 +667,7 @@
            "empty": "空",
            "globalConfig": "グローバル設定ノード",
            "triggerAction": "アクションを実行",
-            "find": "ワークスペース内を検索",
-            "copyItemUrl": "要素のURLをコピー",
-            "copyURL2Clipboard": "URLをクリップボードにコピーしました",
-            "showFlow": "表示",
-            "hideFlow": "非表示"
+            "find": "ワークスペース内を検索"
        },
        "help": {
            "name": "ヘルプ",
@@ -714,8 +677,7 @@
            "showHelp": "ヘルプを表示",
            "showInOutline": "アウトラインに表示",
            "showTopics": "トピックを表示",
-            "noHelp": "ヘルプのトピックが未選択",
-            "changeLog": "更新履歴"
+            "noHelp": "ヘルプのトピックが未選択"
        },
        "config": {
            "name": "設定ノードを表示",
@@ -875,7 +837,7 @@
                "pushFailed": "リモートに新しいコミットがあるため、プッシュに失敗しました。プルしてマージしてから、再度プッシュしてください。",
                "push": "プッシュ",
                "pull": "プル",
-                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更が上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
+                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更を上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
                "showUnstagedChanges": "ステージングされていない変更を表示",
                "connectionFailed": "リモートリポジトリに接続できません: ",
                "pullUnrelatedHistory": "<p>リモートに関連のないコミット履歴があります。</p><p>本当に変更をプルしてローカルリポジトリに反映しますか？</p>",
@@ -936,9 +898,7 @@
            "invalidNodes": "不正なノード",
            "uknownNodes": "未知のノード",
            "unusedSubflows": "未使用のサブフロー",
-            "hiddenFlows": "非表示のフロー",
-            "modifiedNodes": "修正したノードやフロー",
-            "thisFlow": "現在のフロー"
+            "hiddenFlows": "非表示のフロー"
        }
    },
    "expressionEditor": {
@@ -956,11 +916,8 @@
        "errors": {
            "invalid-expr": "不正なJSONata式:\n  __message__",
            "invalid-msg": "不正なJSONメッセージ例:\n  __message__",
-            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト関数をテストできません",
-            "env-unsupported": "$env関数はテストできません",
-            "moment-unsupported": "$moment関数はテストできません",
-            "clone-unsupported": "$clone関数はテストできません",
-            "eval": "式評価エラー:\n  __message__"
+            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト機能をテストできません",
+            "eval": "表現評価エラー:\n  __message__"
        }
    },
    "monaco": {
@@ -977,8 +934,6 @@
        "format": "JSONフォーマット",
        "rawMode": "JSONを編集",
        "uiMode": "ビジュアルエディタ",
-        "rawMode-readonly": "JSON",
-        "uiMode-readonly": "ビジュアル",
        "insertAbove": "上に挿入",
        "insertBelow": "下に挿入",
        "addItem": "要素を追加",
@@ -1005,10 +960,7 @@
        "quote": "引用",
        "link": "リンク",
        "horizontal-rule": "区切り線",
-        "toggle-preview": "プレビュー表示切替え",
-        "mermaid": {
-            "summary": "Mermaid図"
-        }
+        "toggle-preview": "プレビュー表示切替え"
    },
    "bufferEditor": {
        "title": "バッファエディタ",
@@ -1194,50 +1146,17 @@
    "tourGuide": {
        "takeATour": "ツアーを開始",
        "start": "開始",
-        "next": "次へ",
-        "welcomeTours": "ウェルカムツアー"
-    },
-    "diagnostics": {
-        "title": "システム情報"
+        "next": "次へ"
    },
    "languages": {
        "de": "ドイツ語",
        "en-US": "英語",
-        "fr": "フランス語",
        "ja": "日本語",
        "ko": "韓国語",
-        "pt-BR": "ポルトガル語",
        "ru": "ロシア語",
        "zh-CN": "中国語(簡体)",
        "zh-TW": "中国語(繁体)"
    },
-    "validator": {
-        "errors": {
-            "invalid-json": "JSONデータが不正: __error__",
-            "invalid-json-prop": "__prop__: JSONデータが不正: __error__",
-            "invalid-prop": "プロパティ式が不正",
-            "invalid-prop-prop": "__prop__: プロパティ式が不正",
-            "invalid-num": "数値が不正",
-            "invalid-num-prop": "__prop__: 数値が不正",
-            "invalid-regexp": "入力パターンが不正",
-            "invalid-regex-prop": "__prop__: 入力パターンが不正",
-            "missing-required-prop": "__prop__: プロパティが未設定",
-            "invalid-config": "__prop__: 設定ノードが不正",
-            "missing-config": "__prop__: 設定ノードが存在しません",
-            "validation-error": "__prop__: チェックエラー: __node__, __id__: __error__"
-        }
-    },
-    "contextMenu": {
-        "insert": "挿入",
-        "node": "ノード",
-        "junction": "分岐点",
-        "linkNodes": "Linkノード"
-    },
-    "env-var": {
-        "environment": "環境変数",
-        "header": "大域環境変数",
-        "revert": "破棄"
-    },
    "action-list": {
        "toggle-show-tips": "ヒント表示切替",
        "show-about": "Node-REDの説明を表示",
@@ -1255,7 +1174,6 @@
        "hide-all-flows": "全てのフローを非表示",
        "show-all-flows": "全てのフローを表示",
        "show-last-hidden-flow": "最後に非表示にしたフローを表示",
-        "list-modified-nodes": "修正したフローを表示",
        "list-hidden-flows": "非表示フローを表示",
        "list-flows": "フロー一覧",
        "list-subflows": "サブフロー一覧",
@@ -1322,9 +1240,6 @@
        "distribute-selection-vertically": "選択を上下に整列",
        "wire-series-of-nodes": "ノードを一続きに接続",
        "wire-node-to-multiple": "ノードを複数に接続",
-        "wire-multiple-to-node": "複数からノードへ接続",
-        "split-wire-with-link-nodes": "ワイヤーをlinkノードで分割",
-        "generate-node-names": "ノード名を生成",
        "show-user-settings": "ユーザ設定を表示",
        "show-help": "ヘルプを表示",
        "toggle-palette": "パレットの表示切替",
@@ -1351,9 +1266,7 @@
        "show-library-import-dialog": "ライブラリ読み込みダイアログを表示",
        "show-examples-import-dialog": "サンプル読み込みダイアログを表示",
        "search": "検索",
-        "search-previous": "前を検索",
-        "search-next": "次を検索",
-        "show-action-list": "動作一覧を表示",
+        "show-action-list": "アクション一覧を表示",
        "confirm-edit-tray": "編集を完了",
        "cancel-edit-tray": "編集をキャンセル",
        "show-remote-diff": "リモートとの変更差分を表示",
@@ -1363,8 +1276,8 @@
        "set-deploy-type-to-modified-flows": "デプロイを「変更したフロー」に設定",
        "set-deploy-type-to-modified-nodes": "デプロイを「変更したノード」に設定",
        "show-debug-tab": "デバッグタブを表示",
-        "clear-debug-messages": "デバッグメッセージを削除",
-        "clear-filtered-debug-messages": "フィルタしたデバッグメッセージを削除",
+        "clear-debug-messages": "デバッグメッセージをクリア",
+        "clear-filtered-debug-messages": "フィルタしたデバッグメッセージをクリア",
        "activate-selected-debug-nodes": "選択したデバッグノードを有効化",
        "activate-all-debug-nodes": "全てのデバッグノードを有効化",
        "activate-all-flow-debug-nodes": "フロー内の全デバッグノードを有効化",
@@ -1374,22 +1287,6 @@
        "zoom-in": "ズームイン",
        "zoom-out": "ズームアウト",
        "zoom-reset": "ズームリセット",
-        "toggle-navigator": "ナビゲータ表示切替",
-        "show-system-info": "システム情報",
-        "split-wires-with-junctions": "分岐点によりワイヤーを分割",
-        "new-project": "新しいプロジェクト",
-        "open-project": "プロジェクトを開く",
-        "show-project-settings": "プロジェクト設定を表示",
-        "show-version-control-tab": "バージョンコントロールタブを表示",
-        "start-flows": "フローを開始",
-        "stop-flows": "フローを停止",
-        "copy-item-url": "要素のURLをコピー",
-        "copy-item-edit-url": "要素の編集URLをコピー",
-        "move-flow-to-start": "フローを先頭に移動",
-        "move-flow-to-end": "フローを末尾に移動",
-        "show-global-env": "大域環境変数を表示",
-        "lock-flow": "フローを固定",
-        "unlock-flow": "フローの固定を解除",
-        "show-node-help": "ノードのヘルプを表示"
+        "toggle-navigator": "ナビゲータ表示切替"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/ja/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/infotips.json
@@ -17,7 +17,7 @@
        "tip14": "[shift] を押しながらノードを [click] すると、接続された全てのノードを選択できます。",
        "tip15": "[ctrl] を押しながらノードを [click] すると、選択/非選択を切り替えできます。",
        "tip16": "{{core:show-previous-tab}} や {{core:show-next-tab}} で、タブの切り替えができます。",
-        "tip17": "ノードのプロパティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
+        "tip17": "ノードのプロバティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
        "tip18": "ノードを選択し、 {{core:edit-selected-node}} を押すとプロパティ設定画面が表示されます。"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
@@ -24,29 +24,16 @@
    "delete": "정말로 '__label__' 을(를) 삭제하시겠습니까?",
    "dropFlowHere": "플로우를 이곳에 가져오세요",
    "addFlow": "플로우 추가",
-    "addFlowToRight": "오른쪽에 플로우 추가",
-    "hideFlow": "플로우 숨기기",
-    "hideOtherFlows": "다른 플로우 숨기기",
-    "showAllFlows": "모든 플로우 보기",
-    "hideAllFlows": "모든 플로우 숨기기",
-    "hiddenFlows": "__count__개의 숨겨진 플로우 보기",
-    "hiddenFlows_plural": "__count__개의 숨겨진 플로우 보기",
-    "showLastHiddenFlow": "마지막으로 숨겨진 플로우 보기",
-    "listFlows": "플로우 리스트",
-    "listSubflows": "서브 플로우 리스트",
    "status": "상태",
    "enabled": "사용가능",
    "disabled": "사용불가능",
-    "info": "상세내역",
-    "selectNodes": "선택할 노드 클릭"
+    "info": "상세내역"
  },
  "menu": {
    "label": {
      "view": {
        "view": "창",
        "grid": "눈금선",
-        "storeZoom": "불러오기 시 확대/축소 복원",
-        "storePosition": "불러오기 시 스크롤 위치 복원",
        "showGrid": "눈금선 보이기",
        "snapGrid": "노드 배치 보조 켜기",
        "gridSize": "눈금선 크기",
@@ -54,9 +41,7 @@
        "defaultDir": "기본",
        "ltr": "왼쪽 -> 오른쪽",
        "rtl": "오른쪽 -> 왼쪽",
-        "auto": "자동배분",
-        "language": "언어",
-        "browserDefault": "브라우저 기본값"
+        "auto": "자동배분"
      },
      "sidebar": {
        "show": "우측사이드바 보이기"
@@ -64,19 +49,18 @@
      "palette": {
        "show": "팔렛트 보이기"
      },
-      "edit": "수정",
      "settings": "설정",
      "userSettings": "사용자 설정",
      "nodes": "노드설정",
-      "displayStatus": "노드 상태 보이기",
-      "displayConfig": "설정 노드 보기",
+      "displayStatus": "노드상태 보이기",
+      "displayConfig": "설정노드 보기",
      "import": "가져오기",
      "export": "내보내기",
      "search": "플로우 검색",
      "searchInput": "플로우 검색",
-      "subflows": "서브 플로우",
-      "createSubflow": "서브 플로우 생성",
-      "selectionToSubflow": "서브 플로우 선택",
+      "subflows": "보조 플로우",
+      "createSubflow": "보조 플로우 생성",
+      "selectionToSubflow": "보조 플로우 선택",
      "flows": "플로우",
      "add": "추가",
      "rename": "이름변경",
@@ -87,43 +71,19 @@
      "editPalette": "팔렛트 관리",
      "other": "기타",
      "showTips": "Tip 보기",
-      "showWelcomeTours": "새 버전에 대한 가이드 보기 표시",
      "help": "Node-RED 웹사이트",
      "projects": "프로젝트",
      "projects-new": "신규",
      "projects-open": "열기",
      "projects-settings": "프로젝트 설정",
-      "showNodeLabelDefault": "새로 추가된 노드의 라벨 보이기",
-      "codeEditor": "Code Editor",
-      "groups": "그룹",
-      "groupSelection": "그룹 선택",
-      "ungroupSelection": "그룹 선택 해제",
-      "groupMergeSelection": "선택 항목 병합",
-      "groupRemoveSelection": "선택 그룹 제거",
-      "arrange": "배치",
-      "alignLeft": "왼쪽으로 정렬",
-      "alignCenter": "가운데 정렬",
-      "alignRight": "오른쪽으로 정렬",
-      "alignTop": "맨 위에 정렬",
-      "alignMiddle": "맨 위에 정렬",
-      "alignBottom": "맨 아래 정렬",
-      "distributeHorizontally": "수평으로 배치",
-      "distributeVertically": "수직으로 배치",
-      "moveToBack": "맨 뒤로 이동",
-      "moveToFront": "맨 앞으로 이동",
-      "moveBackwards": "뒤로 이동",
-      "moveForwards": "앞으로 이동"
+      "showNodeLabelDefault": "새로 추가된 노드의 라벨 보이기"
    }
  },
  "actions": {
    "toggle-navigator": "네비게이터 표시/비표시",
    "zoom-out": "축소하기",
    "zoom-reset": "확대/축소 초기화",
-    "zoom-in": "확대하기",
-    "search-flows": "플로우 찾기",
-    "search-prev": "이전",
-    "search-next": "다음",
-    "search-counter": "\"__term__\" __result__ of __count__"
+    "zoom-in": "확대하기"
  },
  "user": {
    "loggedInAs": "__name__ 에 로그인됨",
@@ -139,17 +99,12 @@
    }
  },
  "notification": {
-    "state": {
-        "flowsStopped": "플로우 중지됨",
-        "flowsStarted": "플로우 시작됨"
-    },
    "warning": "<strong>경고</strong>: __message__",
    "warnings": {
      "undeployedChanges": "변경사항 배포가 취소되었습니다",
      "nodeActionDisabled": "노드 실행이 비활성화 되었습니다",
      "nodeActionDisabledSubflow": "보조 플로우에서 노드 실행이 비활성화 되었습니다",
      "missing-types": "<p>타입이 없는 노드로인해 플로우가 중지되었습니다</p>",
-      "missing-modules": "<p>누락된 모듈로 인해 플로우가 중지되었습니다.</p>",
      "safe-mode": "<p>[안전모드] 플로우가 정지되었습니다.</p><p>플로우의 수정과 배포가 가능합니다. 다시 배포버튼을 누르세요.</p>",
      "restartRequired": "업그레이드한 모듈을 유효화하기 위해 Node-RED를 재시작 합니다 ",
      "credentials_load_failed": "<p>인증정보 복호화에 실패하여 플로우가 멈췄습니다. </p><p>인증정보는 암호화 되어있습니다. 프로젝트의 암호화 키가 깨졌거나 정상적이지 않습니다.</p>",
@@ -177,12 +132,7 @@
      "updated": "'__project__'가 변경 되었습니다",
      "pull": "'__project__'를 다시 가져왔습니다",
      "revert": "'__project__'를 취소했습니다",
-      "merge-complete": "Git 병합이 완료되었습니다",
-      "setupCredentials": "자격 증명 설정",
-      "setupProjectFiles": "프로젝트 파일 설정",
-      "no": "취소",
-      "createDefault": "기본 프로젝트 파일 만들기",
-      "mergeConflict": "병합 충돌 표시"
+      "merge-complete": "Git 병합이 완료되었습니다"
    },
    "label": {
      "manage-project-dep": "프로젝트 의존성 관리",
@@ -191,8 +141,7 @@
      "create-default-package": "기본 패키지 파일 생성",
      "no-thanks": "괜찮습니다",
      "create-default-project": "기본 프로젝트 파일 생성",
-      "show-merge-conflicts": "병합 충돌 보여주기",
-      "unknownNodesButton": "알 수 없는 노드 검색"
+      "show-merge-conflicts": "병합 충돌 보여주기"
    }
  },
  "clipboard": {
@@ -202,14 +151,10 @@
    "node_plural": "__count__ 개의 노드",
    "configNode": "__count__ 개의 설정 노드",
    "configNode_plural": "__count__ 개의 설정 노드",
-    "group": "__count__ 개의 그룹",
-    "group_plural": "__count__ 개의 그룹",
    "flow": "__count__ 개의 플로우",
    "flow_plural": "__count__ 개의 플로우",
    "subflow": "__count__ 개의 서브 플로우",
    "subflow_plural": "__count__ 개의 서브 플로우",
-    "replacedNodes": "__count__ 개의 교체된 노드",
-    "replacedNodes_plural": "__count__ 개의 교체된 노드",
    "pasteNodes": "여기에 노드를 붙여넣기 하세요",
    "selectFile": "불러올 파일을 선택하세요",
    "importNodes": "노드 불러오기",
@@ -217,46 +162,28 @@
    "download": "다운로드",
    "importUnrecognised": "알 수 없는 형식 :",
    "importUnrecognised_plural": "알 수 없는 형식 :",
-    "importDuplicate": "가져온 중복 노드:",
-    "importDuplicate_plural": "가져온 중복 노드:",
    "nodesExported": "클립보드에 노드 내보내기",
    "nodesImported": "불러오기 : ",
-    "nodeCopied": "__count__개의 노드가 복사되었습니다",
-    "nodeCopied_plural": "__count__개의 노드가 복사되었습니다",
-    "groupCopied": "__count__ 개의 그룹이 복사되었습니다",
-    "groupCopied_plural": "__count__ 개의 그룹이 복사되었습니다",
-    "groupStyleCopied": "그룹 스타일이 복사되었습니다",
+    "nodeCopied": "__count__개의 노드가 복사 되었습니다",
+    "nodeCopied_plural": "__count__개의 노드가 복사 되었습니다",
    "invalidFlow": "정상적지 않은 플로우 : __message__",
-    "recoveredNodes": "복구된 노드",
-    "recoveredNodesInfo": "이 플로우의 노드를 가져올 때 유효한 플로우 ID가 누락되었습니다. 해당 플로우에 추가되었으므로 복원하거나 삭제할 수 있습니다.",
-    "recoveredNodesNotification": "<p>유효하지 않은 플로우 ID를 가진 노드입니다.</p><p>'__flowName__' 라는 플로우에 추가되었습니다.</p>",
    "export": {
      "selected": "선택된 노드",
      "current": "현재 플로우",
      "all": "모든 플로우",
      "compact": "압축형식",
      "formatted": "서식유지",
-      "copy": "클립보드로 내보내기",
-      "export": "라이브러리로 내보내기",
-      "exportAs": "내보내기",
-      "overwrite": "확인",
-      "exists": "<p><b>\"__file__\"</b> 이미 존재합니다.</p><p>교체하시겠습니까?</p>"
+      "copy": "클립보드로 내보내기"
    },
    "import": {
      "import": "가져올 위치 : ",
-      "importSelected": "선택 항목 가져오기",
-      "importCopy": "사본 가져오기",
-      "viewNodes": "노드 보기...",
      "newFlow": "새로운 플로우",
-      "replace": "교체",
      "errors": {
        "notArray": "입력이 JSON 배열이 아닙니다",
        "itemNotObject": "입력이 올바른 플로우가 아닙니다 - __index__는 노드 오브젝트가 아닙니다",
        "missingId": "입력이 올바른 플로우가 아닙니다 - __index__의 'id' 속성이 없습니다",
        "missingType": "입력이 올바른 플로우가 아닙니다 - __index__의 'type' 속성이 없습니다"
-      },
-      "conflictNotification1": "가져오는 노드 중 일부가 이미 작업 공간에 있습니다..",
-      "conflictNotification2": "가져올 노드와 기존 노드를 바꿀지 아니면 복사본을 가져올지 선택합니다."
+      }
    },
    "copyMessagePath": "Path가 복사 되었습니다",
    "copyMessageValue": "Value가 복사 되었습니다",
@@ -270,19 +197,13 @@
    "modifiedFlowsDesc": "변경사항이 있는 플로우만 배포합니다",
    "modifiedNodes": "변경된 노드",
    "modifiedNodesDesc": "변경사항이 있는 노드만 배포합니다",
-    "startFlows": "시작",
-    "startFlowsDesc": "플로우를 시작합니다",
-    "stopFlows": "중지",
-    "stopFlowsDesc": "플로우를 중지합니다",
    "restartFlows": "플로우 재시작",
    "restartFlowsDesc": "현재 배포된 플로우를 재시작합니다",
    "successfulDeploy": "배포가 성공했습니다",
    "successfulRestart": "플로우 재시작을 성공했습니다",
    "deployFailed": "배포 실패 : __message__",
    "unusedConfigNodes": "사용되지 않는 설정노드가 있습니다",
-    "unusedConfigNodesButton":"사용하지 않는 구성 노드 검색",
-    "unknownNodesButton":"알 수 없는 노드 검색",
-    "invalidNodesButton":"잘못된 노드 검색",
+    "unusedConfigNodesLink": "여기를 클릭하면 볼 수 있습니다",
    "errors": {
      "noResponse": "서버의 응답이 없습니다"
    },
@@ -342,7 +263,6 @@
    "newVersionError": "New Version의 JSON 형식이 올바르지 않습니다 :"
  },
  "subflow": {
-    "editSubflowInstance": "서브 플로우 인스턴스 수정: __name__",
    "editSubflow": "플로우 템플릿 수정 : __name__",
    "edit": "플로우 템플릿 수정",
    "subflowInstances": "서브 플로우 템플릿에 __count__개의 인스턴스가 있습니다",
@@ -350,39 +270,14 @@
    "editSubflowProperties": "속성 수정",
    "input": "입력:",
    "output": "출력:",
-    "status": "상태 노드",
    "deleteSubflow": "서브 플로우 삭제",
-    "confirmDelete": "서브 플로우를 삭제하시겠습니까?",
    "info": "상세내역",
    "category": "카테고리",
-    "module": "모듈",
-    "license": "라이선스",
-    "licenseNone": "없음",
-    "licenseOther": "Other",
-    "type": "노드",
-    "version": "버전",
-    "versionPlaceholder": "x.y.z",
-    "keys": "키워드",
-    "keysPlaceholder": "키워드(쉼표로 구분)를 입력해주세요",
-    "author": "이름",
-    "authorPlaceholder": "이름 또는 이메일을 입력해주세요",
-    "desc": "설명",
-    "env": {
-        "restore": "서브 플로우 기본값으로 복원",
-        "remove": "환경 변수 제거"
-    },
    "errors": {
      "noNodesSelected": "<strong>서브 플로우를 생성할 수 없습니다</strong> : 노드가 선택되지 않았습니다",
      "multipleInputsToSelection": "<strong>서브 플로우를 생성할 수 없습니다</strong> : 복수의 입력이 선택되었습니다"
    }
  },
-  "group": {
-      "editGroup": "그룹 수정: __name__",
-      "errors": {
-          "cannotCreateDiffGroups": "다른 그룹의 노드를 사용하여 그룹을 생성할 수 없습니다",
-          "cannotAddSubflowPorts": "그룹에 서브 플로우 포트를 추가할 수 없습니다"
-      }
-  },
  "editor": {
    "configEdit": "수정",
    "configAdd": "추가",
@@ -396,20 +291,19 @@
    "addNewType": "__type__의 노드타입 추가 ...",
    "nodeProperties": "노드 속성",
    "label": "명칭",
-    "color": "Color",
    "portLabels": "포트 설정",
    "labelInputs": "입력",
    "labelOutputs": "출력",
    "settingIcon": "아이콘",
-    "default": "default",
    "noDefaultLabel": "없음",
    "defaultLabel": "기본 명칭",
    "searchIcons": "아이콘 조회",
    "useDefault": "기본설정 사용",
    "description": "상세 내역",
+    "show": "보이기",
+    "hide": "숨기기",
    "errors": {
-      "scopeChange": "범위를 변경하게 되면 다른 플로우의 노드가 사용이 불가능해 집니다.",
-      "invalidProperties": "유효하지 않은 속성:"
+      "scopeChange": "범위를 변경하게 되면 다른 플로우의 노드가 사용이 불가능해 집니다."
    }
  },
  "keyboard": {
@@ -422,11 +316,10 @@
    "global": "글로벌",
    "workspace": "작업공간",
    "selectAll": "모든 노드 선택",
-    "selectNone": "노드 선택 취소",
-    "selectAllConnected": "연결된 모든 노드 선택",
+    "selectAllConnected": "모든 연결된 노드 선택",
    "addRemoveNode": "노드 추가/삭제",
    "editSelected": "선택된 노드 수정",
-    "deleteSelected": "선택된 노드 또는 링크 삭제",
+    "deleteSelected": "선택된 노드나 링크를 삭제",
    "importNode": "노드 불러오기",
    "exportNode": "노드 내보내기",
    "nudgeNode": "선택된 노드 이동 (1px)",
@@ -436,14 +329,9 @@
    "copyNode": "선택된 노드 복사",
    "cutNode": "선택된 노드 잘라내기",
    "pasteNode": "노드 붙여넣기",
-    "copyGroupStyle": "그룹 스타일 복사하기",
-    "pasteGroupStyle": "그룹 스타일 붙여넣기",
    "undoChange": "마지막 변경 되돌리기",
-    "redoChange": "다시 실행하기",
    "searchBox": "검색창 열기",
-    "managePalette": "팔렛트 관리",
-    "actionList": "액션 목록",
-    "splitWireWithLinks": "링크 노드로 선택 항목 분할"
+    "managePalette": "팔렛트 관리"
  },
  "library": {
    "library": "라이브러리",
@@ -451,16 +339,13 @@
    "saveToLibrary": "라이브러리로 저장...",
    "typeLibrary": "__type__ 라이브러리",
    "unnamedType": "이름없는 __type__",
-    "exportedToLibrary": "노드를 라이브러리로 내보냈습니다.",
    "dialogSaveOverwrite": "__libraryType__이 __libraryName__으로 이미 등록되어있습니다. 덮어쓸까요?",
    "invalidFilename": "파일명이 올바르지 않습니다",
    "savedNodes": "저장된 노드",
    "savedType": "저장된 __type__",
    "saveFailed": "저장 실패 : __message__",
-    "newFolder": "새로운 폴더",
    "types": {
-      "local": "로컬",
-      "examples": "예시"
+        "examples": "예시"
    }
  },
  "palette": {
@@ -470,13 +355,9 @@
    "addCategory": "추가 ...",
    "label": {
      "subflows": "서브 플로우",
-      "network": "네트워크",
-      "common": "일반",
      "input": "입력",
      "output": "출력",
      "function": "기능",
-      "sequence": "sequence",
-      "parser": "parser",
      "social": "소셜",
      "storage": "저장",
      "analysis": "분석",
@@ -495,8 +376,7 @@
      "nodeEnabled_plural": "노드가 활성화 되었습니다:",
      "nodeDisabled": "노드가 비활성화 되었습니다:",
      "nodeDisabled_plural": "노드가 비활성화 되었습니다:",
-      "nodeUpgraded": "__module__ 노드모듈이 __version__으로 업그레이드 되었습니다",
-      "unknownNodeRegistered": "Error loading node: <ul><li>__type__<br>__error__</li></ul>"
+      "nodeUpgraded": "__module__ 노드모듈이 __version__으로 업그레이드 되었습니다"
    },
    "editor": {
      "title": "팔렛트 관리",
@@ -543,8 +423,6 @@
      "sortAZ": "a-z",
      "sortRecent": "최근",
      "more": "+ __count__ 개 더 보기",
-      "upload": "Upload module tgz file",
-      "refresh": "모듈 목록 새로 고침",
      "errors": {
        "catalogLoadFailed": "<p>노드 카탈로그를 설치하지 못했습니다.</p><p>브라우저 콘솔로그를 참고하세요.</p>",
        "installFailed": "<p>설치 실패 : __module__</p><p>__message__</p><p>브라우저 콘솔로그를 참고하세요.</p>",
@@ -585,7 +463,6 @@
      "label": "정보",
      "node": "노드",
      "type": "타입",
-      "group": "Group",
      "module": "모듈",
      "id": "ID",
      "status": "상태",
@@ -608,23 +485,7 @@
      "nodeHelp": "노드 도움말",
      "none": "없음",
      "arrayItems": "__count__ 개의 항목",
-      "showTips": "설정에서 도움말을 열 수 있습니다. ",
-      "outline": "개요",
-      "empty": "비우기",
-      "globalConfig": "전역 설정 노드",
-      "triggerAction": "트리거 작업",
-      "find": "작업 공간에서 찾기"
-    },
-    "help": {
-        "name": "도움말",
-        "label": "도움말",
-        "search": "도움말 검색",
-        "nodeHelp": "노드 도움말 보기",
-        "showHelp": "도움말 보기",
-        "showInOutline": "요약 보기",
-        "showTopics": "토픽 보기",
-        "noHelp": "선택한 도움말 항목이 없습니다",
-        "changeLog": "릴리즈 정보"
+      "showTips": "설정에서 도움말을 열 수 있습니다. "
    },
    "config": {
      "name": "노드 설정",
@@ -634,9 +495,7 @@
      "subflows": "보조 플로우",
      "flows": "플로우",
      "filterAll": "전체",
-      "showAllConfigNodes": "모든 설정 노드 보기",
      "filterUnused": "미사용",
-      "showAllUnusedConfigNodes": "사용하지 않는 모든 설정 노드 보기",
      "filtered": "__count__ 개 숨김"
    },
    "context": {
@@ -647,11 +506,8 @@
      "empty": "공백",
      "node": "노드",
      "flow": "플로우",
-      "global": "글로벌",
-      "deleteConfirm": "정말로 이 아이템을 지우시겠습니까?",
-      "autoRefresh": "선택 변경 시 새로 고침",
-      "refrsh": "새로고침",
-      "delete": "삭제"
+      "global": "Global",
+      "deleteConfirm": "정말로 이 아이템을 지우시겠습니까?"
    },
    "palette": {
      "name": "팔레트 관리",
@@ -666,7 +522,6 @@
      "noSummaryAvailable": "요약 없음",
      "editDescription": "프로젝트 상세내역 수정",
      "editDependencies": "프로젝트 의존성 수정",
-      "noDescriptionAvailable": "설명 없음",
      "editReadme": "README.md 수정",
      "showProjectSettings": "프로젝트 설정 보이기",
      "projectSettings": {
@@ -679,10 +534,6 @@
        "files": "파일",
        "flow": "플로우",
        "credentials": "인증정보",
-        "package": "Package",
-        "packageCreate": "변경 내용이 저장될 때 파일이 생성됩니다",
-        "fileNotExist": "파일이 존재하지 않습니다",
-        "selectFile": "파일 선택",
        "invalidEncryptionKey": "잘못된 암호화 키",
        "encryptionEnabled": "암호화 활성화",
        "encryptionDisabled": "암호화 비활성화",
@@ -820,29 +671,15 @@
      "bin": "buffer",
      "date": "timestamp",
      "jsonata": "expression",
-      "env": "env variable",
-      "cred": "credential"
+      "env": "env variable"
    }
  },
  "editableList": {
-    "add": "추가",
-    "addTitle": "add an item"
+    "add": "추가"
  },
  "search": {
-    "history": "Search history",
-    "clear": "clear all",
    "empty": "결과 없음",
-    "addNode": "노드 추가 ...",
-    "options": {
-        "configNodes": "설정 노드",
-        "unusedConfigNodes": "사용되지 않는 설정 노드",
-        "invalidNodes": "잘못된 노드",
-        "uknownNodes": "알 수 없는 노드",
-        "unusedSubflows": "사용되지 않는 서브 플로우",
-        "hiddenFlows": "숨겨진 플로우",
-        "modifiedNodes": "수정된 노드 및 플로우",
-        "thisFlow": "현재 플로우"
-    }
+    "addNode": "노드 추가 ..."
  },
  "expressionEditor": {
    "functions": "기능",
@@ -863,36 +700,15 @@
      "eval": "형식 오류 :\n  __message__"
    }
  },
-  "monaco": {
-      "setTheme": "테마 설정"
-  },
  "jsEditor": {
    "title": "자바스크립트 에디터"
  },
-  "textEditor": {
-      "title": "텍스트 에디터"
-  },
  "jsonEditor": {
    "title": "JSON 에디터",
-    "format": "JSON 형식",
-    "rawMode": "JSON 수정",
-    "uiMode": "비주얼 편집기",
-    "rawMode-readonly": "JSON",
-    "uiMode-readonly": "비주얼",
-    "insertAbove": "위로 삽입",
-    "insertBelow": "아래로 삽입",
-    "addItem": "속성 추가",
-    "copyPath": "속성의 키값 복사",
-    "expandItems": "속성 펼치기",
-    "collapseItems": "속성 접기",
-    "duplicate": "복사",
-    "error": {
-        "invalidJSON": "비유효한 JSON: "
-    }
+    "format": "JSON 형식"
  },
  "markdownEditor": {
    "title": "Markdown 에디터",
-    "expand": "Expand",
    "format": "Markdown 형식",
    "heading1": "제목 레벨1",
    "heading2": "제목 레벨2",
@@ -922,7 +738,6 @@
      "desc2": "이 기능을 건너뛰어도 상관없습니다. 언제든지 프로젝트 메뉴에서 첫번째 프로젝트를 만들 수 있습니다.",
      "create": "프로젝트 생성",
      "clone": "프로젝트 복제",
-      "openExistingProject": "기존 프로젝트 열기",
      "not-right-now": "나중에"
    },
    "git-config": {
@@ -1040,8 +855,7 @@
      "not-git": "git 저장소가 아닙니다",
      "no-resource": "저장소아 없습니다",
      "cant-get-ssh-key-path": "에러! 선택한 SSH키 경로를 가져올 수 없습니다.",
-      "unexpected_error": "예기치 않은 에러",
-      "clearContext": "프로젝트 전환 시 context 삭제"
+      "unexpected_error": "예기치 않은 에러"
    },
    "delete": {
      "confirm": "프로젝트를 정말 지우시겠습니까?"
@@ -1080,26 +894,7 @@
  },
  "editor-tab": {
    "properties": "속성",
-    "envProperties": "환경 변수",
-    "module": "모듈 속성",
    "description": "상세 내역",
-    "appearance": "모양",
-    "preview": "UI 프리뷰",
-    "defaultValue": "기본값"
-  },
-  "tourGuide": {
-      "takeATour": "둘러보기",
-      "start": "시작",
-      "next": "다음",
-      "welcomeTours": "버전 별 릴리즈 정보"
-  },
-  "diagnostics": {
-      "title": "시스템 정보"
-  },
-  "contextMenu": {
-      "insert": "삽입",
-      "node": "노드",
-      "junction": "접합",
-      "linkNodes": "링크 노드"
+    "appearance": "모양"
  }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/ko/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json
--- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
--- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/infotips.json
@@ -1,23 +0,0 @@
-{
-    "info": {
-        "tip0": "Você pode remover os nós ou links selecionados com {{core:delete-selection}}",
-        "tip1": "Procure por nós usando {{core:search}}",
-        "tip2": "{{core:toggle-sidebar}} irá alternar a visualização desta barra lateral",
-        "tip3": "Você pode gerenciar sua paleta de nós com {{core:manage-palette}}",
-        "tip4": "Seus nós de configuração de fluxo são listados no painel da barra lateral. Pode ser acessado a partir do menu ou com{{core:show-config-tab}}",
-        "tip5": "Habilite ou desabilite essas dicas na opção nas configurações",
-        "tip6": "Mova os nós selecionados usando o [left] [up] [down] e [right] chaves. Segure [shift] para empurrá-los ainda mais",
-        "tip7": "Arrastar um nó para um fio o unirá no link",
-        "tip8": "Exporte os nós selecionados ou a guia atual com {{core:show-export-dialog}}",
-        "tip9": "Importe um fluxo arrastando seu JSON para o editor ou com {{core:show-import-dialog}}",
-        "tip10": "[shift] [click] e arraste em uma porta de nó para mover todos os fios conectados ou apenas o selecionado",
-        "tip11": "Mostre a guia Informações com {{core:show-info-tab}} ou a guia Depurar com {{core:show-debug-tab}}",
-        "tip12": "[ctrl] [click] na área de trabalho para abrir a caixa de diálogo de adição rápida",
-        "tip13": "Mantenha pressionado [ctrl] enquanto você [click] em uma porta de nó para habilitar a ligação rápida",
-        "tip14": "Mantenha pressionado [shift] enquanto você [click] em um nó para também selecionar todos os seus nós conectados",
-        "tip15": "Mantenha pressionado [ctrl] enquanto você [click] em um nó para adicioná-lo ou removê-lo da seleção atual",
-        "tip16": "Alternar guias de fluxo com {{core:show-previous-tab}} e {{core:show-next-tab}}",
-        "tip17": "Você pode confirmar suas alterações na bandeja de edição do nó com {{core:confirm-edit-tray}} ou cancele-os com {{core:cancel-edit-tray}}",
-        "tip18": "Pressionando {{core:edit-selected-node}} irá editar o primeiro nó na seleção atual"
-    }
-}
--- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/jsonata.json
@@ -1,274 +0,0 @@
-{
-    "$string": {
-        "args": "arg[, prettify]",
-        "desc": "Converte o tipo do parâmetro `arg` em uma cadeia de caracteres usando as seguintes regras de conversão de tipo:\n\n - Cadeia de caracteres não são alteradas\n - As funções são convertidas para uma cadeia de caracteres  vazia\n - os tipos numérico infinito e NaN geram um erro porque não podem ser representados como um número JSON\n - Todos os outros valores são convertidos para uma cadeia de caracteres JSON usando a função `JSON.stringify`. Se `prettify` for verdadeira, então o JSON \"prettified\" é produzido. Isto é, uma linha por campo e as linhas serão indentadas com base na profundidade do campo."
-    },
-    "$length": {
-        "args": "str",
-        "desc": "Retorna o número de caracteres na cadeia de caracteres `str`. Um erro é gerado se `str` não for uma cadeia de caracteres."
-    },
-    "$substring": {
-        "args": "str, start[, length]",
-        "desc": "Retorna uma cadeia de caracteres contendo os caracteres no primeiro parâmetro `str` começando na posição `start` (deslocamento zero). Se` length` for especificado, então a sub cadeia de caracteres conterá o máximo `length` de caracteres. Se` start` for negativo isso indica o número de caracteres a partir do fim de `str`."
-    },
-    "$substringBefore": {
-        "args": "str, chars",
-        "desc": "Retorna a sub cadeia de caracteres antes da primeira ocorrência da sequência de caracteres `chars` em `string`. Se` string` não contiver `chars`, então retorna `str`. "
-    },
-    "$substringAfter": {
-        "args": "str, chars",
-        "desc": "Retorna a sub cadeia de caracteres após a primeira ocorrência da sequência de caracteres `chars` em `string`. Se `string` não contiver `chars`, então retorna `str`. "
-    },
-    "$uppercase": {
-        "args": "str",
-        "desc": "Retorna uma cadeia de caracteres com todos os caracteres de `string` convertidos em maiúsculas. "
-    },
-    "$lowercase": {
-        "args": "str",
-        "desc": "Retorna uma cadeia de caracteres com todos os caracteres de `string` convertidos em minúsculas. "
-    },
-    "$trim": {
-        "args": "str",
-        "desc": "Normaliza e retira todos os caracteres de espaço em branco em `str` aplicando as seguintes etapas:\n\n - Todas as tabulações, retornos de carro e avanços de linha são substituídos por espaços.\n- Sequências contíguas de espaços são reduzidas a um único espaço.\n- Espaços à direita e à esquerda são removidos.\n\n Se `str` não for especificado (isto é, esta função é chamada sem argumentos), então o valor do contexto é usado como o valor de `str`. Um erro é gerado se `str` não for uma cadeia de caracteres."
-    },
-    "$contains": {
-        "args": "str, pattern",
-        "desc": "Retorna `true` se `str` tiver correspondente em `pattern`, caso contrário, retorna `false`. Se `str` não for especificado (isto é, esta função é chamada com um argumento), então o valor do contexto é usado como o valor de `str`. O parâmetro `pattern` pode ser uma cadeia de caracteres ou uma expressão regular. "
-    },
-    "$split": {
-        "args": "str[, separator][, limit]",
-        "desc": "Divide o parâmetro `str` em uma matriz de sub cadeia de caracteres. É um erro se `str` não for uma cadeia de caracteres. O parâmetro opcional `separator` especifica os caracteres dentro de `str` sobre os quais devem ser divididos como uma cadeia de caracteres ou expressão regular. Se `separator` não for especificado, a cadeia de caracteres vazia será assumida e `str` será dividido em uma matriz de caracteres únicos. É um erro se `separador` não for uma cadeia de caracteres. O parâmetro opcional  `limit` é um número que especifica o número máximo de sub cadeia de caracteres a serem incluídas na matriz resultante. Quaisquer sub cadeia de caracteres adicionais são descartadas. Se `limit` não for especificado, então `str` será totalmente dividido sem limite para o tamanho da matriz resultante . É um erro se `limit` não for um número não negativo."
-    },
-    "$join": {
-        "args": "array[, separator]",
-        "desc": "Une uma matriz de cadeias de caracteres de componentes em uma única cadeia de caracteres concatenada com cada cadeia de caracteres de componente separada pelo parâmetro opcional `separator`. É um erro se a `matriz` de entrada contiver um item que não seja uma cadeia de caracteres. Se `separator` for não especificado, assume-se que é uma cadeia de caracteres vazia, ou seja, nenhum `separator` entre as cadeias de caracteres do componente. É um erro se `separator` não for uma cadeia de caracteres. "
-    },
-    "$match": {
-        "args": "str, pattern [, limit]",
-        "desc": "Aplica a cadeia de caracteres `str` à expressão regular `pattern` e retorna uma matriz de objetos, com cada objeto contendo informações sobre cada ocorrência de uma correspondência dentro de `str`. "
-    },
-    "$replace": {
-        "args": "str, pattern, replacement [, limit]",
-        "desc": "Encontra ocorrências de `pattern` dentro de `str` e as substitui por `replacement`.\n\nO parâmetro opcional `limit` é o número máximo de substituições."
-    },
-    "$now": {
-        "args":"$[picture [, timezone]]",
-        "desc":"Gera um carimbo de data/hora em formato compatível com ISO 8601 e o retorna como uma cadeia de caracteres. Se os parâmetros opcionais de imagem e fuso horário forem fornecidos, o carimbo de data/hora atual é formatado conforme descrito pela função `$ fromMillis ()`"
-    },
-    "$base64encode": {
-        "args":"string",
-        "desc":"Converte uma cadeia de caracteres ASCII em uma representação de base 64. Cada caractere na cadeia de caracteres é tratado como um byte de dados binários. Isso requer que todos os caracteres na cadeia de caracteres estejam no intervalo de 0x00 a 0xFF, o que inclui todos os caracteres em cadeias de caracteres codificadas em URI. Caracteres Unicode fora desse intervalo não são suportados."
-    },
-    "$base64decode": {
-        "args":"string",
-        "desc":"Converte bytes codificados de base 64 em uma cadeia de caracteres, usando uma página de código UTF-8 Unicode."
-    },
-    "$number": {
-        "args": "arg",
-        "desc": "Converte o parâmetro `arg` em um número usando as seguintes regras de conversão:\n\n - Os números permanecem inalterados\n - Cadeias de caracteres que contêm uma sequência de caracteres que representam um número JSON válido são convertidos para esse número\n - Todos os outros valores causam a geração de um erro."
-    },
-    "$abs": {
-        "args":"number",
-        "desc":"Retorna o valor absoluto do parâmetro `number`."
-    },
-    "$floor": {
-        "args":"number",
-        "desc":"Retorna o valor de `number` arredondado para baixo para o inteiro mais próximo que seja menor ou igual a `number`."
-    },
-    "$ceil": {
-        "args":"number",
-        "desc":"Retorna o valor de `number` arredondado para o número inteiro mais próximo que é maior ou igual a `number`."
-    },
-    "$round": {
-        "args":"number [, precision]",
-        "desc":"Retorna o valor do parâmetro `number` arredondado para o número de casas decimais especificado pelo parâmetro opcional `precision`."
-    },
-    "$power": {
-        "args":"base, exponent",
-        "desc":"Retorna o valor de `base` elevado à potência de `exponent`."
-    },
-    "$sqrt": {
-        "args":"number",
-        "desc":"Retorna a raiz quadrada do valor do parâmetro `number`."
-    },
-    "$random": {
-        "args":"",
-        "desc":"Retorna um número pseudoaleatório maior ou igual a zero e menor que um."
-    },
-    "$millis": {
-        "args":"",
-        "desc":"Retorna o número de milissegundos desde o Unix Epoch (1º de janeiro de 1970 UTC) como um número. Todas as invocações de `$ millis ()` dentro de uma avaliação de uma expressão retornarão todas o mesmo valor."
-    },
-    "$sum": {
-        "args": "array",
-        "desc": "Retorna a soma aritmética de uma `array` de números. É um erro se o `array` de entrada contiver um item que não seja um número."
-    },
-    "$max": {
-        "args": "array",
-        "desc": "Retorna o número máximo em uma `array` de números. É um erro se o `array` de entrada contiver um item que não seja um número."
-    },
-    "$min": {
-        "args": "array",
-        "desc": "Retorna o número mínimo em uma `array` de números. É um erro se o `array` de entrada contiver um item que não seja um número."
-    },
-    "$average": {
-        "args": "array",
-        "desc": "Retorna o valor médio de uma `array` de números. É um erro se o `array` de entrada contiver um item que não seja um número."
-    },
-    "$boolean": {
-        "args": "arg",
-        "desc": "Converte o argumento em um booliano usando as seguintes regras:\n\n - `Boolean` : inalterado\n - `string`: vazio : `false`\n - `string`: não-vazio : `true`\n - `number`: `0` : `false`\n - `number`: não-zero : `true`\n - `null` : `false`\n - `array`: vazio : `false`\n - `array`: contém um membro que converte de tipo para `true` : `true`\n - `array`: todos os membros convertidos de tipo para `false` : `false`\n - `object`: vazio : `false`\n - `object`: não-vazio : `true`\n - `function` : `false`"
-    },
-    "$not": {
-        "args": "arg",
-        "desc": "Retorna booliano NOT no argumento. `Arg` é convertido de tipo primeiro para um booliano "
-    },
-    "$exists": {
-        "args": "arg",
-        "desc": "Retorna booliano `true` se a expressão `arg` for avaliada como um valor, ou `false` se a expressão não corresponder a nada (por exemplo, um caminho para uma referência de campo inexistente)."
-    },
-    "$count": {
-        "args": "array",
-        "desc": "Retorna o número de itens na matriz"
-    },
-    "$append": {
-        "args": "array, array",
-        "desc": "Anexa duas matrizes"
-    },
-    "$sort": {
-        "args":"array [, function]",
-        "desc":"Retorna uma matriz contendo todos os valores no parâmetro `array`, mas classificados em ordem.\n\nSe um comparador `function` for fornecido, então deve ser uma função que leva dois parâmetros:\n\n`function(left, right)`\n\nEsta função é invocada pelo algoritmo de classificação para comparar dois valores à esquerda e à direita. Se o valor de esquerda deve ser colocado após o valor de direita na ordem de classificação desejada, a função deve retornar o booliano `true` para indicar uma troca. Caso contrário, deve retornar `false`."
-    },
-    "$reverse": {
-        "args":"array",
-        "desc":"Retorna uma matriz contendo todos os valores do parâmetro `array`, mas na ordem reversa. "
-    },
-    "$shuffle": {
-        "args":"array",
-        "desc":"Retorna uma matriz contendo todos os valores do parâmetro `array`, mas misturados em ordem aleatória. "
-    },
-    "$zip": {
-        "args":"array, ...",
-        "desc":"Retorna uma matriz convolucional (compactada) contendo matrizes agrupadas de valores dos argumentos `array1`… `arrayN` do índice 0, 1, 2 ...."
-    },
-    "$keys": {
-        "args": "object",
-        "desc": "Retorna uma matriz contendo as chaves do objeto. Se o argumento for uma matriz de objetos, então a matriz retornada contém uma lista não duplicada de todas as chaves em todos os objetos."
-    },
-    "$lookup": {
-        "args": "object, key",
-        "desc": "Retorna o valor associado à chave no objeto. Se o primeiro argumento for uma matriz de objetos, todos os objetos na matriz são pesquisados e os valores associados a todas as ocorrências da chave são retornados."
-    },
-    "$spread": {
-        "args": "object",
-        "desc": "Divide um objeto que contém pares de chave/valor em uma matriz de objetos, cada um com um único par de chave/valor do objeto de entrada. Se o parâmetro for uma matriz de objetos, a matriz resultante conterá um objeto para cada par de chave/valor em todo objeto na matriz fornecida. "
-    },
-    "$merge": {
-        "args": "array&lt;object&gt;",
-        "desc": "Mescla uma matriz de `objects` em um único `object` contendo todos os pares de chave/valor de cada um dos objetos na matriz de entrada. Se qualquer um dos objetos de entrada contiver a mesma chave, então o `object` retornado conterá o valor do último na matriz. É um erro se a matriz de entrada contiver um item que não seja um objeto."
-    },
-    "$sift": {
-        "args":"object, function",
-        "desc": "Retorna um objeto que contém apenas os pares de chave/valor do parâmetro `object` que satisfazem o predicado `function` passado como o segundo parâmetro.\n\nA `function` que é fornecida como o segundo parâmetro deve ter o seguinte assinatura:\n\n`function(value [, key [, object]])`"
-    },
-    "$each": {
-        "args":"object, function",
-        "desc":"Retorna uma matriz contendo os valores retornados por `function` quando aplicado a cada par chave/valor no `object`."
-    },
-    "$map": {
-        "args":"array, function",
-        "desc":"Retorna uma matriz contendo os resultados da aplicação do parâmetro `function` a cada valor no parâmetro `array`.\n\nA `function` que é fornecido como o segundo parâmetro deve ter a seguinte assinatura:\n\n`function(value [, index [, array]])`"
-    },
-    "$filter": {
-        "args":"array, function",
-        "desc":"Retorna uma matriz contendo apenas os valores no parâmetro `array` que satisfazem o predicado `function`.\n\nThe `function` que é fornecido como o segundo parâmetro deve ter a seguinte assinatura:\n\n`function(value [, index [, array]])`"
-    },
-    "$reduce": {
-        "args":"array, function [, init]",
-        "desc":"Retorna um valor agregado derivado da aplicação do parâmetro `function` sucessivamente a cada valor em `array` em combinação com o resultado da aplicação anterior da função.\n\nA função deve aceitar dois argumentos e se comportar como um operador inserido entre cada valor dentro de `array`. A assinatura da `function` deve estar no formato: `myfunc($accumulator, $value[, $index[, $array]])`\n\nO parâmetro opcional `init` é usado como o valor inicial na agregação."
-    },
-    "$flowContext": {
-        "args": "string[, string]",
-        "desc": "Recupera uma propriedade de contexto de fluxo.\n\nEsta é uma função definida pelo Node-RED. "
-    },
-    "$globalContext": {
-        "args": "string[, string]",
-        "desc": "Recupera uma propriedade de contexto global.\n\nEsta é uma função definida pelo Node-RED. "
-    },
-    "$pad": {
-        "args": "string, width [, char]",
-        "desc": "Retorna uma cópia da `string` com preenchimento extra, se necessário, de forma que seu número total de caracteres seja pelo menos o valor absoluto do parâmetro `width`.\n\nSe `width` for um número positivo, a cadeia de caracteres será preenchida à direita; se negativo, é preenchida à esquerda.\n\nO argumento opcional `char` especifica os caracteres de preenchimento a serem usados. Se não for especificado, o padrão é o caractere de espaço. "
-    },
-    "$fromMillis": {
-        "args": "number, [, picture [, timezone]]",
-        "desc": "Converta o `number` que representa os milissegundos desde a época do Unix (1 January, 1970 UTC) em uma representação de cadeia de caracteres formatada do carimbo de data/hora conforme especificado pela cadeia de caracteres de imagem.\n\nSe o parâmetro opcional `image` for omitido, o carimbo de data/hora será formatado no formato ISO 8601.\n\nSe a cadeia de caracteresopcional  `picture` for fornecida, o carimbo de data/hora é formatado de acordo com a representação especificada nessa cadeia de caracteres. O comportamento desta função é consistente com a versão de dois argumentos da função XPath/XQuery `format-dateTime` conforme definido na especificação XPath F&O 3.1. O parâmetro de cadeia de caracteres de imagem define como o carimbo de data/hora é formatado e tem a mesma sintaxe de `format-dateTime`.\n\nSe a cadeia de caracteres opcional `timezone` for fornecida, o carimbo de data/hora formatado estará nesse fuso horário. A cadeia de caracteres `timezone` deve estar no formato '± HHMM', onde ± é o sinal de mais ou menos e HHMM é o deslocamento em horas e minutos do UTC. Deslocamento positivo para fusos horários a leste do UTC, deslocamento negativo para fusos horários a oeste do UTC. "
-    },
-    "$formatNumber": {
-        "args": "number, picture [, options]",
-        "desc": "Converte o tipo de `number` em uma cadeia de caracteres e o formata em uma representação decimal conforme especificado pela cadeia de caracteres `picture`.\n\n O comportamento desta função é consistente com a função XPath/XQuery fn: format-number conforme definido na especificação XPath F&O 3.1. O parâmetro de cadeia de caracteres de imagem define como o número é formatado e tem a mesma sintaxe de fn: format-number.\n\nO terceiro argumento opcional `options` é usado para substituir os caracteres de formatação específicos da localidade padrão, como o separador decimal. Se fornecido, este argumento deve ser um objeto contendo pares de nome/valor especificados na seção de formato decimal da especificação XPath F&O 3.1."
-    },
-    "$formatBase": {
-        "args": "number [, radix]",
-        "desc": "Converte o `number` em uma cadeia de caracteres e o formata em um inteiro representado na base do número especificada pelo argumento `radix`. Se `radix` não for especificado, o padrão é a base 10. `radix` pode estar entre 2 e 36, caso contrário, um erro será gerado. "
-    },
-    "$toMillis": {
-        "args": "timestamp",
-        "desc": "Converta o tipo de uma cadeia de caracteres `timestamp` no formato ISO 8601 para o número de milissegundos desde a época do Unix (1 January, 1970 UTC)  como um número. Um erro é gerado se a cadeia de caracteres não estiver no formato correto. "
-    },
-    "$env": {
-        "args": "arg",
-        "desc": "Retorna o valor de uma variável de ambiente.\n\nEsta é uma função definida pelo Node-RED."
-    },
-    "$eval": {
-        "args": "expr [, context]",
-        "desc": "Analisa e avalia a cadeia de caracteres `expr` que contém um JSON literal ou uma expressão JSONata usando o contexto atual como o contexto para avaliação. "
-    },
-    "$formatInteger": {
-        "args": "number, picture",
-        "desc": "Converte o tipo de `number` em uma cadeia de caracteres e o formata em uma representação inteira conforme especificado pela cadeia de caracteres `picture`. O parâmetro da cadeia de caracteres de imagem define como o número é formatado e tem a mesma sintaxe de `fn: format-integer` do Especificação XPath F&O 3.1. "
-    },
-    "$parseInteger": {
-        "args": "string, picture",
-        "desc": "Examina e troca o conteúdo do parâmetro `string` para um inteiro (como um número JSON) usando o formato especificado pela cadeia de caracteres `picture`. O parâmetro da cadeia de caracteres `picture` tem o mesmo formato que `$ formatInteger`."
-    },
-    "$error": {
-        "args": "[str]",
-        "desc": "Gera um erro com uma mensagem. O (parâmetro) opcional `str` substituirá a mensagem padrão de `$error() function evaluated`"
-    },
-    "$assert": {
-        "args": "arg, str",
-        "desc": "Se `arg` for verdadeiro, a função retorna indefinido. Se `arg` for falso, uma exceção é gerada com `str` como a mensagem da exceção. "
-    },
-    "$single": {
-        "args": "array, function",
-        "desc": "Retorna o único valor no parâmetro `array` que satisfaz o predicado `function` (isto é, O (parâmetro) `function` retorna o booliano `true` quando passado o valor). Gera uma exceção se o número de valores correspondentes não for exatamente um .\n\nA função deve ser fornecida na seguinte assinatura: `function(value [, index [, array]])` onde 'value' é cada entrada da matriz, 'index' é a posição desse valor e toda a matriz é passada como o terceiro argumento"
-    },
-    "$encodeUrlComponent": {
-        "args": "str",
-        "desc": "Codifica um componente Localizador Uniforme de Recursos (URL) substituindo cada instância de certos caracteres por uma, duas, três ou quatro sequências de escape que representam a codificação UTF-8 do caractere.\n\nExemplo: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
-    },
-    "$encodeUrl": {
-        "args": "str",
-        "desc": "Codifica um Localizador Uniforme de Recursos (URL) substituindo cada instância de certos caracteres por uma, duas, três ou quatro sequências de escape que representam a codificação UTF-8 do caractere. \n\nExemplo: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
-    },
-    "$decodeUrlComponent": {
-        "args": "str",
-        "desc": "Decodifica um componente Localizador Uniforme de Recursos (URL) criado anteriormente por encodeUrlComponent. \n\nExemplo: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
-    },
-    "$decodeUrl": {
-        "args": "str",
-        "desc": "Decodifica um Localizador Uniforme de Recursos (URL) criado anteriormente por encodeUrl. \n\nExemplo: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
-    },
-    "$distinct": {
-        "args": "array",
-        "desc": "Retorna uma matriz com valores duplicados removidos da `array` "
-    },
-    "$type": {
-        "args": "value",
-        "desc": "Retorna o tipo de `value` como uma cadeia de caracteres. Se `value` for indefinido, retornará `undefined` "
-    },
-    "$moment": {
-        "args": "[str]",
-        "desc": "Obtém um objeto de dados usando a biblioteca 'Moment'."
-    }
-}
--- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
@@ -183,8 +183,7 @@
            "create-default-package": "Создать файл пакета по умолчанию",
            "no-thanks": "Нет, спасибо",
            "create-default-project": "Создать файлы проекта по умолчанию",
-            "show-merge-conflicts": "Показать конфликты слияния",
-            "unknownNodesButton": "Поиск неизвестных узлов"
+            "show-merge-conflicts": "Показать конфликты слияния"
        }
    },
    "clipboard": {
@@ -278,9 +277,7 @@
        "successfulRestart": "Потоки успешно перезапущены",
        "deployFailed": "Развертывание не удалось: __message__",
        "unusedConfigNodes":"У вас есть неиспользуемых узлы конфигурации.",
-        "unusedConfigNodesButton":"Поиск неиспользуемых узлов конфигурации",
-        "unknownNodesButton":"Поиск неизвестных узлов",
-        "invalidNodesButton":"Поиск недопустимых узлов",
+        "unusedConfigNodesLink":"Нажмите здесь, чтобы их увидеть",
        "errors": {
            "noResponse": "нет ответа от сервера"
        },
@@ -1133,10 +1130,8 @@
    "languages" : {
        "de": "Немецкий",
        "en-US": "Английский",
-        "fr": "Французский",
        "ja": "Японский",
        "ko": "Корейский",
-        "pt-BR":"португальский",
        "ru": "Русский",
        "zh-CN": "Китайский (упрощенный)",
        "zh-TW": "Китайский (традиционный)"
--- a/packages/node_modules/@node-red/editor-client/locales/ru/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
@@ -182,8 +182,7 @@
            "create-default-package": "創建默認的包文件",
            "no-thanks": "不了，謝謝",
            "create-default-project": "創建默認項目文件",
-            "show-merge-conflicts": "顯示合併衝突",
-            "unknownNodesButton": "搜索未知節點"
+            "show-merge-conflicts": "顯示合併衝突"
        }
    },
    "clipboard": {
@@ -265,9 +264,7 @@
        "successfulRestart": "成功重啟流程",
        "deployFailed": "部署失敗: __message__",
        "unusedConfigNodes": "您有一些未使用的配置節點",
-        "unusedConfigNodesButton":"搜索未使用的配置節點",
-        "unknownNodesButton":"搜索未知節點",
-        "invalidNodesButton":"搜索無效節點",
+        "unusedConfigNodesLink": "點擊此處查看它們",
        "errors": {
            "noResponse": "伺服器沒有回應"
        },
@@ -1088,11 +1085,8 @@
    "languages": {
        "de": "德語",
        "en-US": "英語",
-        "fr": "法語",
        "ja": "日語",
        "ko": "韓語",
-        "pt-BR":"葡萄牙语",
-        "ru":"俄語",
        "zh-CN": "簡體中文",
        "zh-TW": "繁體中文"
    }
--- 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": "3.1.0-beta.4",
+    "version": "2.2.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/ace/mode/nrjavascript_worker.js
+++ b/packages/node_modules/@node-red/editor-client/src/ace/mode/nrjavascript_worker.js
@@ -76,7 +76,7 @@ oop.inherits(NRJavaScriptWorker, Mirror);

 (function() {
    this.setOptions = function(options) {
-        o.options = {
+        this.options = {
            // undef: true,
            // unused: true,
            esversion: 9,
@@ -98,7 +98,7 @@ oop.inherits(NRJavaScriptWorker, Mirror);
        if (options) {
            for (var opt in options) {
                if (options.hasOwnProperty(opt)) {
-                    o.options[opt] = options[opt];
+                    this.options[opt] = options.opt;
                }
            }
        }
--- a/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png
+++ b/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png
--- a/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.svg
@@ -1 +0,0 @@
-<svg width="50" height="5" viewBox="0, 0, 50, 5" xmlns="http://www.w3.org/2000/svg"><path d="M0 1H50V4H0Z" fill="#CCC"/></svg>
--- a/packages/node_modules/@node-red/editor-client/src/images/grip.png
+++ b/packages/node_modules/@node-red/editor-client/src/images/grip.png
--- a/packages/node_modules/@node-red/editor-client/src/images/grip.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/grip.svg
@@ -1 +0,0 @@
-<svg width="5" height="50" viewBox="0, 0, 5, 50" xmlns="http://www.w3.org/2000/svg"><path d="M1 0H4V50H1Z" fill="#CCC"/></svg>
--- a/packages/node_modules/@node-red/editor-client/src/images/start.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/start.svg
@@ -1,4 +0,0 @@
-<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg">
-    <path color="#000" fill="#8c101c" d="M0 0h32v32H0z"></path>
-    <path style="fill:#ffffff;stroke:#000000;stroke-width:0" d="M 24,16 8,24 8,8 Z" fill="none" stroke="#000" stroke-width="1.5"></path>
-</svg>
--- a/packages/node_modules/@node-red/editor-client/src/images/stop.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/stop.svg
@@ -1,4 +0,0 @@
-<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg">
-    <path color="#000" fill="#8c101c" d="M0 0h32v32H0z"></path>
-    <rect style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;" width="15" height="15" x="8" y="8.5"></rect>
-</svg>
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -14,7 +14,7 @@
 * limitations under the License.
 **/

-/**
+/** 
 * An API for undo / redo history buffer
 * @namespace RED.history
 */
@@ -22,14 +22,6 @@ RED.history = (function() {
    var undoHistory = [];
    var redoHistory = [];

-    function nodeOrJunction(id) {
-        var node = RED.nodes.node(id);
-        if (node) {
-            return node;
-        }
-        return RED.nodes.junction(id);
-    }
-
    function undoEvent(ev) {
        var i;
        var len;
@@ -378,8 +370,7 @@ RED.history = (function() {
                if (ev.addToGroup) {
                    RED.group.removeFromGroup(ev.addToGroup,ev.nodes.map(function(n) { return n.n }),false);
                    inverseEv.removeFromGroup = ev.addToGroup;
-                }
-                if (ev.removeFromGroup) {
+                } else if (ev.removeFromGroup) {
                    RED.group.addToGroup(ev.removeFromGroup,ev.nodes.map(function(n) { return n.n }));
                    inverseEv.addToGroup = ev.removeFromGroup;
                }
@@ -422,9 +413,6 @@ RED.history = (function() {
                        ev.node[i] = ev.changes[i];
                    }
                }
-                ev.node.dirty = true;
-                ev.node.changed = ev.changed;
-
                var eventType;
                switch(ev.node.type) {
                    case 'tab': eventType = "flows"; break;
@@ -438,9 +426,7 @@ RED.history = (function() {

                if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('disabled')) {
                    $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!ev.node.disabled);
-                }
-                if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('locked')) {
-                    $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-locked',!!ev.node.locked);
+                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
                }
                if (ev.subflow) {
                    inverseEv.subflow = {};
@@ -515,6 +501,8 @@ RED.history = (function() {
                        inverseEv.links.push(ev.createdLinks[i]);
                    }
                }
+                ev.node.dirty = true;
+                ev.node.changed = ev.changed;
            } else if (ev.t == "createSubflow") {
                inverseEv = {
                    t: "deleteSubflow",
@@ -526,7 +514,6 @@ RED.history = (function() {
                    var z = ev.activeWorkspace;
                    var fullNodeList = RED.nodes.filterNodes({z:ev.subflow.subflow.id});
                    fullNodeList = fullNodeList.concat(RED.nodes.groups(ev.subflow.subflow.id))
-                    fullNodeList = fullNodeList.concat(RED.nodes.junctions(ev.subflow.subflow.id))
                    fullNodeList.forEach(function(n) {
                        n.x += ev.subflow.offsetX;
                        n.y += ev.subflow.offsetY;
@@ -536,7 +523,7 @@ RED.history = (function() {
                    });
                    inverseEv.subflows = [];
                    for (i=0;i<ev.nodes.length;i++) {
-                        inverseEv.subflows.push(nodeOrJunction(ev.nodes[i]));
+                        inverseEv.subflows.push(RED.nodes.node(ev.nodes[i]));
                        RED.nodes.remove(ev.nodes[i]);
                    }
                }
@@ -650,12 +637,6 @@ RED.history = (function() {
                        ev.groups[i].nodes = [];
                        RED.nodes.addGroup(ev.groups[i]);
                        RED.group.addToGroup(ev.groups[i],nodes);
-                        if (ev.groups[i].g) {
-                            const parentGroup = RED.nodes.group(ev.groups[i].g)
-                            if (parentGroup) {
-                                RED.group.addToGroup(parentGroup, ev.groups[i])
-                            }
-                        }
                    }
                }
            } else if (ev.t == "addToGroup") {
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -3,12 +3,16 @@
        "alt-shift-p":"core:manage-palette",
        "ctrl-f": "core:search",
        "ctrl-shift-f": "core:list-flows",
+        "ctrl-+": "core:zoom-in",
+        "ctrl--": "core:zoom-out",
+        "ctrl-0": "core:zoom-reset",
+        "ctrl-enter": "core:confirm-edit-tray",
+        "ctrl-escape": "core:cancel-edit-tray",
        "ctrl-d": "core:deploy-flows",
-        "ctrl-g c": "core:show-config-tab",
-        "ctrl-g d": "core:show-debug-tab",
-        "ctrl-g h": "core:show-help-tab",
        "ctrl-g i": "core:show-info-tab",
-        "ctrl-g v": "core:show-version-control-tab",
+        "ctrl-g h": "core:show-help-tab",
+        "ctrl-g d": "core:show-debug-tab",
+        "ctrl-g c": "core:show-config-tab",
        "ctrl-g x": "core:show-context-tab",
        "ctrl-e": "core:show-export-dialog",
        "ctrl-i": "core:show-import-dialog",
@@ -19,8 +23,11 @@
        "ctrl-alt-r": "core:show-remote-diff",
        "ctrl-alt-n": "core:new-project",
        "ctrl-alt-o": "core:open-project",
+        "ctrl-g v": "core:show-version-control-tab",
        "ctrl-shift-l": "core:show-event-log",
-        "ctrl-shift-p":"core:show-action-list"
+        "ctrl-shift-p":"core:show-action-list",
+        "alt-w": "core:hide-flow",
+        "alt-shift-w": "core:show-last-hidden-flow"
    },
    "red-ui-sidebar-node-config": {
        "backspace": "core:delete-config-selection",
@@ -86,16 +93,7 @@
        "alt-a v": "core:distribute-selection-vertically",
        "shift-f": "core:search-previous",
        "f": "core:search-next",
-        "alt-l l": "core:split-wire-with-link-nodes",
-        "alt-w": "core:hide-flow",
-        "alt-shift-w": "core:show-last-hidden-flow",
-        "ctrl-+": "core:zoom-in",
-        "ctrl--": "core:zoom-out",
-        "ctrl-0": "core:zoom-reset"
+        "alt-l l": "core:split-wire-with-link-nodes"

-     },
-     "red-ui-editor-stack": {
-        "ctrl-enter": "core:confirm-edit-tray",
-        "ctrl-escape": "core:cancel-edit-tray"
     }
 }
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -14,11 +14,12 @@
 * limitations under the License.
 **/

-/**
+/** 
 * An Interface to nodes and utility functions for creating/adding/deleting nodes and links
 * @namespace RED.nodes
 */
 RED.nodes = (function() {
+
    var PORT_TYPE_INPUT = 1;
    var PORT_TYPE_OUTPUT = 0;

@@ -46,9 +47,6 @@ RED.nodes = (function() {

    function setDirty(d) {
        dirty = d;
-        if (!d) {
-            allNodes.clearState()
-        }
        RED.events.emit("workspace:dirty",{dirty:dirty});
    }

@@ -65,12 +63,12 @@ RED.nodes = (function() {
            defaults: {
                label: {value:""},
                disabled: {value: false},
-                locked: {value: false},
                info: {value: ""},
                env: {value: []}
            }
        };

+
        var exports = {
            setModulePendingUpdated: function(module,version) {
                moduleList[module].pending_version = version;
@@ -240,72 +238,22 @@ RED.nodes = (function() {

    // allNodes holds information about the Flow nodes.
    var allNodes = (function() {
-        // Map node.id -> node
        var nodes = {};
-        // Map tab.id -> Array of nodes on that tab
        var tabMap = {};
-        // Map tab.id -> Set of dirty object ids on that tab
-        var tabDirtyMap = {};
-        // Map tab.id -> Set of object ids of things deleted from the tab that weren't otherwise dirty
-        var tabDeletedNodesMap = {};
-        // Set of object ids of things added to a tab after initial import
-        var addedDirtyObjects = new Set()
-
-        function changeCollectionDepth(tabNodes, toMove, direction, singleStep) {
-            const result = []
-            const moved = new Set();
-            const startIndex = direction ? tabNodes.length - 1 : 0
-            const endIndex = direction ? -1 : tabNodes.length
-            const step = direction ? -1 : 1
-            let target = startIndex // Only used for all-the-way moves
-            for (let i = startIndex; i != endIndex; i += step) {
-                if (toMove.size === 0) {
-                    break;
-                }
-                const n = tabNodes[i]
-                if (toMove.has(n)) {
-                    if (singleStep) {
-                        if (i !== startIndex && !moved.has(tabNodes[i - step])) {
-                            tabNodes.splice(i, 1)
-                            tabNodes.splice(i - step, 0, n)
-                            n._reordered = true
-                            result.push(n)
-                        }
-                    } else {
-                        if (i !== target) {
-                            tabNodes.splice(i, 1)
-                            tabNodes.splice(target, 0, n)
-                            n._reordered = true
-                            result.push(n)
-                        }
-                        target += step
-                    }
-                    toMove.delete(n);
-                    moved.add(n);
-                }
-            }
-            return result
-        }
-
        var api = {
            addTab: function(id) {
                tabMap[id] = [];
-                tabDirtyMap[id] = new Set();
-                tabDeletedNodesMap[id] = new Set();
            },
            hasTab: function(z) {
                return tabMap.hasOwnProperty(z)
            },
            removeTab: function(id) {
                delete tabMap[id];
-                delete tabDirtyMap[id];
-                delete tabDeletedNodesMap[id];
            },
            addNode: function(n) {
                nodes[n.id] = n;
                if (tabMap.hasOwnProperty(n.z)) {
                    tabMap[n.z].push(n);
-                    api.addObjectToWorkspace(n.z, n.id, n.changed || n.moved)
                } else {
                    console.warn("Node added to unknown tab/subflow:",n);
                    tabMap["_"] = tabMap["_"] || [];
@@ -319,37 +267,8 @@ RED.nodes = (function() {
                    if (i > -1) {
                        tabMap[n.z].splice(i,1);
                    }
-                    api.removeObjectFromWorkspace(n.z, n.id)
                }
            },
-            /**
-             * Add an object to our dirty/clean tracking state
-             * @param {String} z 
-             * @param {String} id 
-             * @param {Boolean} isDirty 
-             */
-            addObjectToWorkspace: function (z, id, isDirty) {
-                if (isDirty) {
-                    addedDirtyObjects.add(id)
-                }
-                if (tabDeletedNodesMap[z].has(id)) {
-                    tabDeletedNodesMap[z].delete(id)
-                }
-                api.markNodeDirty(z, id, isDirty)
-            },
-            /**
-             * Remove an object from our dirty/clean tracking state
-             * @param {String} z 
-             * @param {String} id 
-             */
-            removeObjectFromWorkspace: function (z, id) {
-                if (!addedDirtyObjects.has(id)) {
-                    tabDeletedNodesMap[z].add(id)
-                } else {
-                    addedDirtyObjects.delete(id)
-                }
-                api.markNodeDirty(z, id, false)
-            },
            hasNode: function(id) {
                return nodes.hasOwnProperty(id);
            },
@@ -361,54 +280,152 @@ RED.nodes = (function() {
                n.z = newZ;
                api.addNode(n)
            },
-            /**
-             * @param {array} nodes 
-             * @param {boolean} direction true:forwards false:back
-             * @param {boolean} singleStep true:single-step false:all-the-way
-             */
-            changeDepth: function(nodes, direction, singleStep) {
+            moveNodesForwards: function(nodes) {
+                var result = [];
                if (!Array.isArray(nodes)) {
                    nodes = [nodes]
                }
-                let result = []
-                const tabNodes = tabMap[nodes[0].z];
-                const toMove = new Set(nodes.filter(function(n) { return n.type !== "group" && n.type !== "subflow" }));
-                if (toMove.size > 0) {
-                    result = result.concat(changeCollectionDepth(tabNodes, toMove, direction, singleStep))
-                    if (result.length > 0) {
-                        RED.events.emit('nodes:reorder',{
-                            z: nodes[0].z,
-                            nodes: result
-                        });
+                // Can only do this for nodes on the same tab.
+                // Use nodes[0] to get the z
+                var tabNodes = tabMap[nodes[0].z];
+                var toMove = new Set(nodes.filter(function(n) { return n.type !== "group" && n.type !== "subflow" }));
+                var moved = new Set();
+                for (var i = tabNodes.length-1; i >= 0; i--) {
+                    if (toMove.size === 0) {
+                        break;
+                    }
+                    var n = tabNodes[i];
+                    if (toMove.has(n)) {
+                        // This is a node to move.
+                        if (i < tabNodes.length-1 && !moved.has(tabNodes[i+1])) {
+                            // Remove from current position
+                            tabNodes.splice(i,1);
+                            // Add it back one position higher
+                            tabNodes.splice(i+1,0,n);
+                            n._reordered = true;
+                            result.push(n);
+                        }
+                        toMove.delete(n);
+                        moved.add(n);
                    }
                }
-
-                const groupNodes = groupsByZ[nodes[0].z] || []
-                const groupsToMove = new Set(nodes.filter(function(n) { return n.type === 'group'}))
-                if (groupsToMove.size > 0) {
-                    const groupResult = changeCollectionDepth(groupNodes, groupsToMove, direction, singleStep)
-                    if (groupResult.length > 0) {
-                        result = result.concat(groupResult)
-                        RED.events.emit('groups:reorder',{
-                            z: nodes[0].z,
-                            nodes: groupResult
-                        });
-                    }
+                if (result.length > 0) {
+                    RED.events.emit('nodes:reorder',{
+                        z: nodes[0].z,
+                        nodes: result
+                    });
                }
-                RED.view.redraw(true)
-                return result
-            },
-            moveNodesForwards: function(nodes) {
-                return api.changeDepth(nodes, true, true)
+                return result;
            },
            moveNodesBackwards: function(nodes) {
-                return api.changeDepth(nodes, false, true)
+                var result = [];
+                if (!Array.isArray(nodes)) {
+                    nodes = [nodes]
+                }
+                // Can only do this for nodes on the same tab.
+                // Use nodes[0] to get the z
+                var tabNodes = tabMap[nodes[0].z];
+                var toMove = new Set(nodes.filter(function(n) { return n.type !== "group" && n.type !== "subflow" }));
+                var moved = new Set();
+                for (var i = 0; i < tabNodes.length; i++) {
+                    if (toMove.size === 0) {
+                        break;
+                    }
+                    var n = tabNodes[i];
+                    if (toMove.has(n)) {
+                        // This is a node to move.
+                        if (i > 0 && !moved.has(tabNodes[i-1])) {
+                            // Remove from current position
+                            tabNodes.splice(i,1);
+                            // Add it back one position lower
+                            tabNodes.splice(i-1,0,n);
+                            n._reordered = true;
+                            result.push(n);
+                        }
+                        toMove.delete(n);
+                        moved.add(n);
+                    }
+                }
+                if (result.length > 0) {
+                    RED.events.emit('nodes:reorder',{
+                        z: nodes[0].z,
+                        nodes: result
+                    });
+                }
+                return result;
            },
            moveNodesToFront: function(nodes) {
-                return api.changeDepth(nodes, true, false)
+                var result = [];
+                if (!Array.isArray(nodes)) {
+                    nodes = [nodes]
+                }
+                // Can only do this for nodes on the same tab.
+                // Use nodes[0] to get the z
+                var tabNodes = tabMap[nodes[0].z];
+                var toMove = new Set(nodes.filter(function(n) { return n.type !== "group" && n.type !== "subflow" }));
+                var target = tabNodes.length-1;
+                for (var i = tabNodes.length-1; i >= 0; i--) {
+                    if (toMove.size === 0) {
+                        break;
+                    }
+                    var n = tabNodes[i];
+                    if (toMove.has(n)) {
+                        // This is a node to move.
+                        if (i < target) {
+                            // Remove from current position
+                            tabNodes.splice(i,1);
+                            tabNodes.splice(target,0,n);
+                            n._reordered = true;
+                            result.push(n);
+                        }
+                        target--;
+                        toMove.delete(n);
+                    }
+                }
+                if (result.length > 0) {
+                    RED.events.emit('nodes:reorder',{
+                        z: nodes[0].z,
+                        nodes: result
+                    });
+                }
+                return result;
            },
            moveNodesToBack: function(nodes) {
-                return api.changeDepth(nodes, false, false)
+                var result = [];
+                if (!Array.isArray(nodes)) {
+                    nodes = [nodes]
+                }
+                // Can only do this for nodes on the same tab.
+                // Use nodes[0] to get the z
+                var tabNodes = tabMap[nodes[0].z];
+                var toMove = new Set(nodes.filter(function(n) { return n.type !== "group" && n.type !== "subflow" }));
+                var target = 0;
+                for (var i = 0; i < tabNodes.length; i++) {
+                    if (toMove.size === 0) {
+                        break;
+                    }
+                    var n = tabNodes[i];
+                    if (toMove.has(n)) {
+                        // This is a node to move.
+                        if (i > target) {
+                            // Remove from current position
+                            tabNodes.splice(i,1);
+                            // Add it back one position lower
+                            tabNodes.splice(target,0,n);
+                            n._reordered = true;
+                            result.push(n);
+                        }
+                        target++;
+                        toMove.delete(n);
+                    }
+                }
+                if (result.length > 0) {
+                    RED.events.emit('nodes:reorder',{
+                        z: nodes[0].z,
+                        nodes: result
+                    });
+                }
+                return result;
            },
            getNodes: function(z) {
                return tabMap[z];
@@ -416,33 +433,6 @@ RED.nodes = (function() {
            clear: function() {
                nodes = {};
                tabMap = {};
-                tabDirtyMap = {};
-                tabDeletedNodesMap = {};
-                addedDirtyObjects = new Set();
-            },
-            /**
-             * Clear all internal state on what is dirty.
-             */
-            clearState: function () {
-                // Called when a deploy happens, we can forget about added/remove
-                // items as they have now been deployed.
-                addedDirtyObjects = new Set()
-                const flowsToCheck = new Set()
-                for (const [z, set] of Object.entries(tabDeletedNodesMap)) {
-                    if (set.size > 0) {
-                        set.clear()
-                        flowsToCheck.add(z)
-                    }
-                }
-                for (const [z, set] of Object.entries(tabDirtyMap)) {
-                    if (set.size > 0) {
-                        set.clear()
-                        flowsToCheck.add(z)
-                    }
-                }
-                for (const z of flowsToCheck) {
-                    api.checkTabState(z)
-                }
            },
            eachNode: function(cb) {
                var nodeList,i,j;
@@ -508,7 +498,7 @@ RED.nodes = (function() {
                return result;
            },
            getNodeOrder: function(z) {
-                return (groupsByZ[z] || []).concat(tabMap[z]).map(n => n.id)
+                return tabMap[z].map(function(n) { return n.id })
            },
            setNodeOrder: function(z, order) {
                var orderMap = {};
@@ -520,41 +510,6 @@ RED.nodes = (function() {
                    B._reordered = true;
                    return orderMap[A.id] - orderMap[B.id];
                })
-                if (groupsByZ[z]) {
-                    groupsByZ[z].sort(function(A,B) {
-                        return orderMap[A.id] - orderMap[B.id];
-                    })
-                }
-            },
-            /**
-             * Update our records if an object is dirty or not
-             * @param {String} z tab id
-             * @param {String} id object id
-             * @param {Boolean} dirty whether the object is dirty or not
-             */
-            markNodeDirty: function(z, id, dirty) {
-                if (tabDirtyMap[z]) {
-                    if (dirty) {
-                        tabDirtyMap[z].add(id)
-                    } else {
-                        tabDirtyMap[z].delete(id)
-                    }
-                    api.checkTabState(z)
-                }
-            },
-            /**
-             * Check if a tab should update its contentsChange flag
-             * @param {String} z tab id
-             */
-            checkTabState: function (z) {
-                const ws = workspaces[z]
-                if (ws) {
-                    const contentsChanged = tabDirtyMap[z].size > 0 || tabDeletedNodesMap[z].size > 0
-                    if (Boolean(ws.contentsChanged) !== contentsChanged) {
-                        ws.contentsChanged = contentsChanged
-                        RED.events.emit("flows:change", ws);
-                    }
-                }
            }
        }
        return api;
@@ -620,53 +575,15 @@ RED.nodes = (function() {
        }
    }

-    const nodeProxyHandler = {
-        get(node, prop) {
-            if (prop === '__isProxy__') {
-                return true
-            } else if (prop == '__node__') {
-                return node
-            }
-            return node[prop]
-        },
-        set(node, prop, value) {
-            if (node.z && (RED.nodes.workspace(node.z)?.locked || RED.nodes.subflow(node.z)?.locked)) {
-                if (
-                    node._def.defaults[prop] ||
-                    prop === 'z' ||
-                    prop === 'l' ||
-                    prop === 'd' ||
-                    (prop === 'changed' && (!!node.changed) !== (!!value)) || // jshint ignore:line
-                    ((prop === 'x' || prop === 'y') && !node.resize && node.type !== 'group')
-                ) {
-                    throw new Error(`Cannot modified property '${prop}' of locked object '${node.type}:${node.id}'`)
-                }
-            }
-            if (node.z && (prop === 'changed' || prop === 'moved')) {
-                setTimeout(() => {
-                    allNodes.markNodeDirty(node.z, node.id, node.changed || node.moved)
-                }, 0)
-            }
-            node[prop] = value;
-            return true
-        }
-    }

    function addNode(n) {
-        let newNode
-        if (!n.__isProxy__) {
-            newNode = new Proxy(n, nodeProxyHandler)
-        } else {
-            newNode = n
-        }
-
        if (n.type.indexOf("subflow") !== 0) {
            n["_"] = n._def._;
        } else {
            var subflowId = n.type.substring(8);
            var sf = RED.nodes.subflow(subflowId);
            if (sf) {
-                sf.instances.push(newNode);
+                sf.instances.push(sf);
            }
            n["_"] = RED._;
        }
@@ -683,13 +600,12 @@ RED.nodes = (function() {
                });
                n.i = nextId+1;
            }
-            allNodes.addNode(newNode);
+            allNodes.addNode(n);
            if (!nodeLinks[n.id]) {
                nodeLinks[n.id] = {in:[],out:[]};
            }
        }
-        RED.events.emit('nodes:add',newNode);
-        return newNode
+        RED.events.emit('nodes:add',n);
    }
    function addLink(l) {
        if (nodeLinks[l.source.id]) {
@@ -716,16 +632,10 @@ RED.nodes = (function() {
        }
        if (l.source.z === l.target.z && linkTabMap[l.source.z]) {
            linkTabMap[l.source.z].push(l);
-            allNodes.addObjectToWorkspace(l.source.z, getLinkId(l), true)
        }
        RED.events.emit("links:add",l);
    }

-    function getLinkId(link) {
-        return link.source.id + ':' + link.sourcePort + ':' + link.target.id
-    }
-
-
    function getNode(id) {
        if (id in configNodes) {
            return configNodes[id];
@@ -828,10 +738,6 @@ RED.nodes = (function() {
            moveGroupToTab(node,z);
            return;
        }
-        if (node.type === "junction") {
-            moveJunctionToTab(node,z);
-            return;
-        }
        var oldZ = node.z;
        allNodes.moveNode(node,z);
        var nl = nodeLinks[node.id];
@@ -866,39 +772,6 @@ RED.nodes = (function() {
        RED.events.emit("groups:change",group);
    }

-    function moveJunctionToTab(junction, z) {
-        var index = junctionsByZ[junction.z].indexOf(junction);
-        junctionsByZ[junction.z].splice(index,1);
-        junctionsByZ[z] = junctionsByZ[z] || [];
-        junctionsByZ[z].push(junction);
-
-        var oldZ = junction.z;
-        junction.z = z;
-
-        var nl = nodeLinks[junction.id];
-        if (nl) {
-            nl.in.forEach(function(l) {
-                var idx = linkTabMap[oldZ].indexOf(l);
-                if (idx != -1) {
-                    linkTabMap[oldZ].splice(idx, 1);
-                }
-                if ((l.source.z === z) && linkTabMap[z]) {
-                    linkTabMap[z].push(l);
-                }
-            });
-            nl.out.forEach(function(l) {
-                var idx = linkTabMap[oldZ].indexOf(l);
-                if (idx != -1) {
-                    linkTabMap[oldZ].splice(idx, 1);
-                }
-                if ((l.target.z === z) && linkTabMap[z]) {
-                    linkTabMap[z].push(l);
-                }
-            });
-        }
-        RED.events.emit("junctions:change",junction);
-    }
-
    function removeLink(l) {
        var index = links.indexOf(l);
        if (index != -1) {
@@ -920,7 +793,6 @@ RED.nodes = (function() {
                if (index !== -1) {
                    linkTabMap[l.source.z].splice(index,1)
                }
-                allNodes.removeObjectFromWorkspace(l.source.z, getLinkId(l))
            }
        }
        RED.events.emit("links:remove",l);
@@ -959,7 +831,14 @@ RED.nodes = (function() {
            var node;

            if (allNodes.hasTab(id)) {
-                removedNodes = allNodes.getNodes(id).slice()
+                removedNodes = allNodes.getNodes(id).filter(n => {
+                    if (n.type === 'junction') {
+                        removedJunctions.push(n)
+                        return false
+                    } else {
+                        return true
+                    }
+                })
            }
            for (i in configNodes) {
                if (configNodes.hasOwnProperty(i)) {
@@ -969,7 +848,6 @@ RED.nodes = (function() {
                    }
                }
            }
-            removedJunctions = RED.nodes.junctions(id)

            for (i=0;i<removedNodes.length;i++) {
                var result = removeNode(removedNodes[i].id);
@@ -1090,11 +968,6 @@ RED.nodes = (function() {
        return false;
    }

-    function getDownstreamNodes(node) {
-        const downstreamLinks = nodeLinks[node.id].out
-        const downstreamNodes = new Set(downstreamLinks.map(l => l.target))
-        return Array.from(downstreamNodes)
-    }
    function getAllDownstreamNodes(node) {
        return getAllFlowNodes(node,'down').filter(function(n) { return n !== node });
    }
@@ -1142,9 +1015,6 @@ RED.nodes = (function() {
        node.type = n.type;
        for (var d in n._def.defaults) {
            if (n._def.defaults.hasOwnProperty(d)) {
-                if (d === 'locked' && !n.locked) {
-                    continue
-                }
                node[d] = n[d];
            }
        }
@@ -1424,6 +1294,7 @@ RED.nodes = (function() {
        } else {
            nodeSet = [sf];
        }
+        console.log(nodeSet);
        return createExportableNodeSet(nodeSet);
    }
    /**
@@ -1459,16 +1330,12 @@ RED.nodes = (function() {
                            exportedConfigNodes[n.id] = true;
                        }
                    });
-
-                    subflowSet = subflowSet.concat(RED.nodes.junctions(subflowId))
-                    subflowSet = subflowSet.concat(RED.nodes.groups(subflowId))
-
                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                    nns = exportableSubflow.concat(nns);
                }
            }
            if (node.type !== "subflow") {
-                var convertedNode = RED.nodes.convertNode(node, { credentials: false });
+                var convertedNode = RED.nodes.convertNode(node);
                for (var d in node._def.defaults) {
                    if (node._def.defaults[d].type) {
                        var nodeList = node[d];
@@ -1501,7 +1368,7 @@ RED.nodes = (function() {
                    nns = nns.concat(createExportableNodeSet(node.nodes, exportedIds, exportedSubflows, exportedConfigNodes));
                }
            } else {
-                var convertedSubflow = convertSubflow(node, { credentials: false });
+                var convertedSubflow = convertSubflow(node);
                nns.push(convertedSubflow);
            }
        }
@@ -1750,21 +1617,21 @@ RED.nodes = (function() {
     * Options:
     *  - generateIds - whether to replace all node ids
     *  - addFlow - whether to import nodes to a new tab
-     *  - markChanged - whether to set changed=true on all newly imported objects
-     *  - reimport - if node has a .z property, dont overwrite it
-     *               Only applicible when `generateIds` is false
+     *  - importToCurrent
     *  - importMap - how to resolve any conflicts.
     *       - id:import - import as-is
     *       - id:copy - import with new id
     *       - id:replace - import over the top of existing
     */
    function importNodes(newNodesObj,options) { // createNewIds,createMissingWorkspace) {
-        const defOpts = { generateIds: false, addFlow: false, markChanged: false, reimport: false, importMap: {} }
-        options = Object.assign({}, defOpts, options)
-        options.importMap = options.importMap || {}
-        const createNewIds = options.generateIds;
-        const reimport = (!createNewIds && !!options.reimport)
-        const createMissingWorkspace = options.addFlow;
+        options = options || {
+            generateIds: false,
+            addFlow: false,
+        }
+        options.importMap = options.importMap || {};
+
+        var createNewIds = options.generateIds;
+        var createMissingWorkspace = options.addFlow;
        var i;
        var n;
        var newNodes;
@@ -1785,7 +1652,7 @@ RED.nodes = (function() {
            newNodes = newNodesObj;
        }

-        if (!Array.isArray(newNodes)) {
+        if (!$.isArray(newNodes)) {
            newNodes = [newNodes];
        }

@@ -2065,8 +1932,7 @@ RED.nodes = (function() {
                        }
                    }
                } else {
-                    const keepNodesCurrentZ = reimport && n.z && (RED.workspaces.contains(n.z) || RED.nodes.subflow(n.z))
-                    if (!keepNodesCurrentZ && n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
+                    if (n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                        n.z = activeWorkspace;
                    }
                }
@@ -2083,9 +1949,6 @@ RED.nodes = (function() {
                    if (!n.z) {
                        delete configNode.z;
                    }
-                    if (options.markChanged) {
-                        configNode.changed = true
-                    }
                    if (n.hasOwnProperty('d')) {
                        configNode.d = n.d;
                    }
@@ -2148,9 +2011,6 @@ RED.nodes = (function() {
                    if (n.hasOwnProperty('g')) {
                        node.g = n.g;
                    }
-                    if (options.markChanged) {
-                        node.changed = true
-                    }
                    if (createNewIds || options.importMap[n.id] === "copy") {
                        if (subflow_denylist[n.z]) {
                            continue;
@@ -2173,8 +2033,7 @@ RED.nodes = (function() {
                        node.id = getID();
                    } else {
                        node.id = n.id;
-                        const keepNodesCurrentZ = reimport && node.z && (RED.workspaces.contains(node.z) || RED.nodes.subflow(node.z))
-                        if (!keepNodesCurrentZ && (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z]))) {
+                        if (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z])) {
                            if (createMissingWorkspace) {
                                if (missingWorkspace === null) {
                                    missingWorkspace = RED.workspaces.add(null,true);
@@ -2201,27 +2060,16 @@ RED.nodes = (function() {
                    } else if (n.type.substring(0,7) === "subflow") {
                        var parentId = n.type.split(":")[1];
                        var subflow = subflow_denylist[parentId]||subflow_map[parentId]||getSubflow(parentId);
-                        if (!subflow){
-                            node._def = {
-                                color:"#fee",
-                                defaults: {},
-                                label: "unknown: "+n.type,
-                                labelStyle: "red-ui-flow-node-label-italic",
-                                outputs: n.outputs|| (n.wires && n.wires.length) || 0,
-                                set: registry.getNodeSet("node-red/unknown")
-                            }
-                        } else {
-                            if (createNewIds || options.importMap[n.id] === "copy") {
-                                parentId = subflow.id;
-                                node.type = "subflow:"+parentId;
-                                node._def = registry.getNodeType(node.type);
-                                delete node.i;
-                            }
-                            node.name = n.name;
-                            node.outputs = subflow.out.length;
-                            node.inputs = subflow.in.length;
-                            node.env = n.env;
+                        if (createNewIds || options.importMap[n.id] === "copy") {
+                            parentId = subflow.id;
+                            node.type = "subflow:"+parentId;
+                            node._def = registry.getNodeType(node.type);
+                            delete node.i;
                        }
+                        node.name = n.name;
+                        node.outputs = subflow.out.length;
+                        node.inputs = subflow.in.length;
+                        node.env = n.env;
                    } else if (n.type === 'junction') {
                         node._def = {defaults:{}}
                         node._config.x = node.x
@@ -2335,7 +2183,7 @@ RED.nodes = (function() {
            }
            if (n.wires) {
                for (var w1=0;w1<n.wires.length;w1++) {
-                    var wires = (Array.isArray(n.wires[w1]))?n.wires[w1]:[n.wires[w1]];
+                    var wires = (n.wires[w1] instanceof Array)?n.wires[w1]:[n.wires[w1]];
                    for (var w2=0;w2<wires.length;w2++) {
                        if (node_map.hasOwnProperty(wires[w2])) {
                            if (n.z === node_map[wires[w2]].z) {
@@ -2382,7 +2230,7 @@ RED.nodes = (function() {
            // 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);
+                    var otherNode = RED.nodes.node(id);
                    return (otherNode && otherNode.z === activeWorkspace)
                });
            }
@@ -2432,6 +2280,19 @@ RED.nodes = (function() {
            if (n.g && !new_group_set.has(n.g)) {
                delete n.g;
            }
+            n.nodes = n.nodes.map(function(id) {
+                return node_map[id];
+            })
+            // Just in case the group references a node that doesn't exist for some reason
+            n.nodes = n.nodes.filter(function(v) {
+                if (v) {
+                    // Repair any nodes that have forgotten they are in this group
+                    if (v.g !== n.id) {
+                        v.g = n.id;
+                    }
+                }
+                return !!v
+            });
            if (!n.g) {
                groupDepthMap[n.id] = 0;
            }
@@ -2454,22 +2315,21 @@ RED.nodes = (function() {
            return groupDepthMap[A.id] - groupDepthMap[B.id];
        });
        for (i=0;i<new_groups.length;i++) {
-            new_groups[i] = addGroup(new_groups[i]);
-            node_map[new_groups[i].id] = new_groups[i]
+            n = new_groups[i];
+            addGroup(n);
        }

        for (i=0;i<new_junctions.length;i++) {
-            new_junctions[i] = addJunction(new_junctions[i]);
-            node_map[new_junctions[i].id] = new_junctions[i]
+            var junction = new_junctions[i];
+            addJunction(junction);
        }


        // Now the nodes have been fully updated, add them.
        for (i=0;i<new_nodes.length;i++) {
-            new_nodes[i] = addNode(new_nodes[i])
-            node_map[new_nodes[i].id] = new_nodes[i]
+            var node = new_nodes[i];
+            addNode(node);
        }
-
        // Finally validate them all.
        // This has to be done after everything is added so that any checks for
        // dependent config nodes will pass
@@ -2477,39 +2337,6 @@ RED.nodes = (function() {
            var node = new_nodes[i];
            RED.editor.validateNode(node);
        }
-        const lookupNode = (id) => {
-            const mappedNode = node_map[id]
-            if (!mappedNode) {
-                return null
-            }
-            if (mappedNode.__isProxy__) {
-                return mappedNode
-            } else {
-                return node_map[mappedNode.id]
-            }
-        }
-        // Update groups to reference proxy node objects
-        for (i=0;i<new_groups.length;i++) {
-            n = new_groups[i];
-            // bypass the proxy in case the flow is locked
-            n.__node__.nodes = n.nodes.map(lookupNode)
-            // Just in case the group references a node that doesn't exist for some reason
-            n.__node__.nodes = n.nodes.filter(function(v) {
-                if (v) {
-                    // Repair any nodes that have forgotten they are in this group
-                    if (v.g !== n.id) {
-                        v.g = n.id;
-                    }
-                }
-                return !!v
-            });
-        }
-
-        // Update links to use proxy node objects
-        for (i=0;i<new_links.length;i++) {
-            new_links[i].source = lookupNode(new_links[i].source.id) || new_links[i].source
-            new_links[i].target = lookupNode(new_links[i].target.id) || new_links[i].target
-        }

        RED.workspaces.refresh();

@@ -2635,20 +2462,12 @@ RED.nodes = (function() {
        workspacesOrder = [];
        groups = {};
        groupsByZ = {};
-        junctions = {};
-        junctionsByZ = {};
-
-        var workspaceIds = Object.keys(workspaces);
-        // Ensure all workspaces are unlocked so we don't get any edit-protection
-        // preventing removal
-        workspaceIds.forEach(function(id) {
-            workspaces[id].locked = false
-        });

        var subflowIds = Object.keys(subflows);
        subflowIds.forEach(function(id) {
            RED.subflow.removeSubflow(id)
        });
+        var workspaceIds = Object.keys(workspaces);
        workspaceIds.forEach(function(id) {
            RED.workspaces.remove(workspaces[id]);
        });
@@ -2669,15 +2488,10 @@ RED.nodes = (function() {
    }

    function addGroup(group) {
-        if (!group.__isProxy__) {
-            group = new Proxy(group, nodeProxyHandler)
-        }
        groupsByZ[group.z] = groupsByZ[group.z] || [];
        groupsByZ[group.z].push(group);
        groups[group.id] = group;
-        allNodes.addObjectToWorkspace(group.z, group.id, group.changed || group.moved)
        RED.events.emit("groups:add",group);
-        return group
    }
    function removeGroup(group) {
        var i = groupsByZ[group.z].indexOf(group);
@@ -2692,28 +2506,19 @@ RED.nodes = (function() {
            }
        }
        RED.group.markDirty(group);
-        allNodes.removeObjectFromWorkspace(group.z, group.id)
+
        delete groups[group.id];
        RED.events.emit("groups:remove",group);
    }
-    function getGroupOrder(z) {
-        const groups = groupsByZ[z]
-        return groups.map(g => g.id)
-    }

    function addJunction(junction) {
-        if (!junction.__isProxy__) {
-            junction = new Proxy(junction, nodeProxyHandler)
-        }
        junctionsByZ[junction.z] = junctionsByZ[junction.z] || []
        junctionsByZ[junction.z].push(junction)
        junctions[junction.id] = junction;
        if (!nodeLinks[junction.id]) {
            nodeLinks[junction.id] = {in:[],out:[]};
        }
-        allNodes.addObjectToWorkspace(junction.z, junction.id, junction.changed || junction.moved)
        RED.events.emit("junctions:add", junction)
-        return junction
    }
    function removeJunction(junction) {
        var i = junctionsByZ[junction.z].indexOf(junction)
@@ -2723,7 +2528,6 @@ RED.nodes = (function() {
        }
        delete junctions[junction.id]
        delete nodeLinks[junction.id];
-        allNodes.removeObjectFromWorkspace(junction.z, junction.id)
        RED.events.emit("junctions:remove", junction)

        var removedLinks = links.filter(function(l) { return (l.source === junction) || (l.target === junction); });
@@ -2899,7 +2703,6 @@ RED.nodes = (function() {
                    }
                });

-                const nodeGroupMap = {}
                var replaceNodeIds = Object.keys(replaceNodes);
                if (replaceNodeIds.length > 0) {
                    var reimportList = [];
@@ -2910,12 +2713,6 @@ RED.nodes = (function() {
                        } else {
                            allNodes.removeNode(n);
                        }
-                        if (n.g) {
-                            // reimporting a node *without* including its group object
-                            // will cause the g property to be cleared. Cache it
-                            // here so we can restore it
-                            nodeGroupMap[n.id] = n.g
-                        }
                        reimportList.push(convertNode(n));
                        RED.events.emit('nodes:remove',n);
                    });
@@ -2933,22 +2730,10 @@ RED.nodes = (function() {
                    // Force the redraw to be synchronous so the view updates
                    // *now* and removes the unknown node
                    RED.view.redraw(true, true);
-                    var result = importNodes(reimportList,{generateIds:false, reimport: true});
+                    var result = importNodes(reimportList,{generateIds:false});
                    var newNodeMap = {};
                    result.nodes.forEach(function(n) {
                        newNodeMap[n.id] = n;
-                        if (nodeGroupMap[n.id]) {
-                            // This node is in a group - need to substitute the
-                            // node reference inside the group
-                            n.g = nodeGroupMap[n.id]
-                            const group = RED.nodes.group(n.g)
-                            if (group) {
-                                var index = group.nodes.findIndex(gn => gn.id === n.id)
-                                if (index > -1) {
-                                    group.nodes[index] = n
-                                }
-                            }
-                        }
                    });
                    RED.nodes.eachLink(function(l) {
                        if (newNodeMap.hasOwnProperty(l.source.id)) {
@@ -2961,9 +2746,6 @@ RED.nodes = (function() {
                    RED.view.redraw(true);
                }
            });
-            RED.events.on('deploy', function () {
-                allNodes.clearState()
-            })
        },
        registry:registry,
        setNodeList: registry.setNodeList,
@@ -3012,7 +2794,7 @@ RED.nodes = (function() {
        },
        addWorkspace: addWorkspace,
        removeWorkspace: removeWorkspace,
-        getWorkspaceOrder: function() { return [...workspacesOrder] },
+        getWorkspaceOrder: function() { return workspacesOrder },
        setWorkspaceOrder: function(order) { workspacesOrder = order; },
        workspace: getWorkspace,

@@ -3066,20 +2848,6 @@ RED.nodes = (function() {
                }
            }
        },
-        eachGroup: function(cb) {
-            for (var group of Object.values(groups)) {
-                if (cb(group) === false) {
-                    break
-                }
-            }
-        },
-        eachJunction: function(cb) {
-            for (var junction of Object.values(junctions)) {
-                if (cb(junction) === false) {
-                    break
-                }
-            }
-        },

        node: getNode,

@@ -3102,7 +2870,6 @@ RED.nodes = (function() {
        getAllFlowNodes: getAllFlowNodes,
        getAllUpstreamNodes: getAllUpstreamNodes,
        getAllDownstreamNodes: getAllDownstreamNodes,
-        getDownstreamNodes: getDownstreamNodes,
        getNodeIslands: getNodeIslands,
        createExportableNodeSet: createExportableNodeSet,
        createCompleteNodeSet: createCompleteNodeSet,
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -249,53 +249,11 @@ var RED = (function() {
                        RED.nodes.import(nodes.flows);
                        RED.nodes.dirty(false);
                        RED.view.redraw(true);
-                        if (/^#(flow|node|group)\/.+$/.test(currentHash)) {
-                            const hashParts = currentHash.split('/')
-                            const showEditDialog = hashParts.length > 2 && hashParts[2] === 'edit'
-                            if (hashParts[0] === '#flow') {
-                                RED.workspaces.show(hashParts[1], true);
-                                if (showEditDialog) {
-                                    RED.workspaces.edit()
-                                }
-                            } else if (hashParts[0] === '#node') {
-                                const nodeToShow = RED.nodes.node(hashParts[1])
-                                if (nodeToShow) {
-                                    setTimeout(() => {
-                                        RED.view.reveal(nodeToShow.id)
-                                        window.location.hash = currentHash
-                                        RED.view.select(nodeToShow.id)
-                                        if (showEditDialog) {
-                                            RED.editor.edit(nodeToShow)
-                                        }
-                                    }, 50)
-                                }
-                            } else if (hashParts[0] === '#group') {
-                                const nodeToShow = RED.nodes.group(hashParts[1])
-                                if (nodeToShow) {
-                                    RED.view.reveal(nodeToShow.id)
-                                    window.location.hash = currentHash
-                                    RED.view.select(nodeToShow.id)
-                                    if (showEditDialog) {
-                                        RED.editor.editGroup(nodeToShow)
-                                    }
-                                }
-                            }
+                        if (/^#flow\/.+$/.test(currentHash)) {
+                            RED.workspaces.show(currentHash.substring(6),true);
                        }
-                        if (RED.workspaces.count() > 0) {
-                            const hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-                            const workspaces = RED.nodes.getWorkspaceOrder();
-                            if (RED.workspaces.active() === 0) {
-                                for (let index = 0; index < workspaces.length; index++) {
-                                    const ws = workspaces[index];
-                                    if (!hiddenTabs[ws]) {
-                                        RED.workspaces.show(ws);
-                                        break;
-                                    }
-                                }
-                            }
-                            if (RED.workspaces.active() === 0) {
-                                RED.workspaces.show(workspaces[0]);
-                            }
+                        if (RED.workspaces.active() === 0 && RED.workspaces.count() > 0) {
+                            RED.workspaces.show(RED.nodes.getWorkspaceOrder()[0])
                        }
                    } catch(err) {
                        console.warn(err);
@@ -326,10 +284,6 @@ var RED = (function() {
                // handled below
                return;
            }
-            if (notificationId === "flows-run-state") {
-                // handled in editor-client/src/js/runtime.js
-                return;
-            }
            if (notificationId === "project-update") {
                loader.start(RED._("event.loadingProject"), 0);
                RED.nodes.clear();
@@ -350,8 +304,6 @@ var RED = (function() {
                        loader.end()
                        RED.notify($("<p>").text(message));
                        RED.sidebar.info.refresh()
-                        RED.menu.setDisabled('menu-item-projects-open',false);
-                        RED.menu.setDisabled('menu-item-projects-settings',false);
                    });
                });
                return;
@@ -367,6 +319,7 @@ var RED = (function() {
                    id: notificationId
                }
                if (notificationId === "runtime-state") {
+                    RED.events.emit("runtime-state",msg);
                    if (msg.error === "safe-mode") {
                        options.buttons = [
                            {
@@ -392,14 +345,6 @@ var RED = (function() {
                        } else {
                            options.buttons = [
                                {
-                                    text: RED._("notification.label.unknownNodesButton"),
-                                    class: "pull-left",
-                                    click: function() {
-                                        RED.actions.invoke("core:search", "type:unknown ");
-                                    }
-                                },
-                                {
-                                    class: "primary",
                                    text: RED._("common.label.close"),
                                    click: function() {
                                        persistentNotifications[notificationId].hideNotification();
@@ -507,16 +452,16 @@ var RED = (function() {
            } else if (persistentNotifications.hasOwnProperty(notificationId)) {
                persistentNotifications[notificationId].close();
                delete persistentNotifications[notificationId];
-            }
-            if (notificationId === 'runtime-state') {
-                RED.events.emit("runtime-state",msg);
+                if (notificationId === 'runtime-state') {
+                    RED.events.emit("runtime-state",msg);
+                }
            }
        });
        RED.comms.subscribe("status/#",function(topic,msg) {
            var parts = topic.split("/");
            var node = RED.nodes.node(parts[1]);
            if (node) {
-                if (msg.hasOwnProperty("text") && msg.text !== null && /^[@a-zA-Z]/.test(msg.text)) {
+                if (msg.hasOwnProperty("text") && msg.text !== null && /^[a-zA-Z]/.test(msg.text)) {
                    msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
                }
                node.status = msg;
@@ -672,6 +617,11 @@ var RED = (function() {
        ]});

        menuOptions.push({id:"menu-item-arrange-menu", label:RED._("menu.label.arrange"), options: [
+            {id: "menu-item-view-tools-move-to-back", label:RED._("menu.label.moveToBack"), disabled: true, onselect: "core:move-selection-to-back"},
+            {id: "menu-item-view-tools-move-to-front", label:RED._("menu.label.moveToFront"), disabled: true, onselect: "core:move-selection-to-front"},
+            {id: "menu-item-view-tools-move-backwards", label:RED._("menu.label.moveBackwards"), disabled: true, onselect: "core:move-selection-backwards"},
+            {id: "menu-item-view-tools-move-forwards", label:RED._("menu.label.moveForwards"), disabled: true, onselect: "core:move-selection-forwards"},
+            null,
            {id: "menu-item-view-tools-align-left", label:RED._("menu.label.alignLeft"), disabled: true, onselect: "core:align-selection-to-left"},
            {id: "menu-item-view-tools-align-center", label:RED._("menu.label.alignCenter"), disabled: true, onselect: "core:align-selection-to-center"},
            {id: "menu-item-view-tools-align-right", label:RED._("menu.label.alignRight"), disabled: true, onselect: "core:align-selection-to-right"},
@@ -681,12 +631,7 @@ var RED = (function() {
            {id: "menu-item-view-tools-align-bottom", label:RED._("menu.label.alignBottom"), disabled: true, onselect: "core:align-selection-to-bottom"},
            null,
            {id: "menu-item-view-tools-distribute-horizontally", label:RED._("menu.label.distributeHorizontally"), disabled: true, onselect: "core:distribute-selection-horizontally"},
-            {id: "menu-item-view-tools-distribute-veritcally", label:RED._("menu.label.distributeVertically"), disabled: true, onselect: "core:distribute-selection-vertically"},
-            null,
-            {id: "menu-item-view-tools-move-to-back", label:RED._("menu.label.moveToBack"), disabled: true, onselect: "core:move-selection-to-back"},
-            {id: "menu-item-view-tools-move-to-front", label:RED._("menu.label.moveToFront"), disabled: true, onselect: "core:move-selection-to-front"},
-            {id: "menu-item-view-tools-move-backwards", label:RED._("menu.label.moveBackwards"), disabled: true, onselect: "core:move-selection-backwards"},
-            {id: "menu-item-view-tools-move-forwards", label:RED._("menu.label.moveForwards"), disabled: true, onselect: "core:move-selection-forwards"}
+            {id: "menu-item-view-tools-distribute-veritcally", label:RED._("menu.label.distributeVertically"), disabled: true, onselect: "core:distribute-selection-vertically"}
        ]});

        menuOptions.push(null);
@@ -772,17 +717,14 @@ var RED = (function() {
        RED.search.init();
        RED.actionList.init();
        RED.editor.init();
-        RED.diagnostics.init();
        RED.diff.init();


        RED.deploy.init(RED.settings.theme("deployButton",null));

        RED.keyboard.init(buildMainMenu);
-        RED.envVar.init();

        RED.nodes.init();
-        RED.runtime.init()
        RED.comms.connect();

        $("#red-ui-main-container").show();
@@ -798,7 +740,7 @@ var RED = (function() {
        $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
        $('<div id="red-ui-main-container" class="red-ui-sidebar-closed hide">'+
            '<div id="red-ui-workspace"></div>'+
-            '<div id="red-ui-editor-stack" tabindex="-1"></div>'+
+            '<div id="red-ui-editor-stack"></div>'+
            '<div id="red-ui-palette"></div>'+
            '<div id="red-ui-sidebar"></div>'+
            '<div id="red-ui-sidebar-separator"></div>'+
--- a/packages/node_modules/@node-red/editor-client/src/js/runtime.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/runtime.js
@@ -1,36 +0,0 @@
-RED.runtime = (function() {
-    let state = ""
-    let settings = { ui: false, enabled: false };
-    const STOPPED = "stop"
-    const STARTED = "start"
-    const SAFE = "safe"
-
-    return {
-        init: function() {
-            // refresh the current runtime status from server
-            settings = Object.assign({}, settings, RED.settings.runtimeState);
-            RED.events.on("runtime-state", function(msg) {
-                if (msg.state) {
-                    const currentState = state
-                    state = msg.state
-                    $(".red-ui-flow-node-button").toggleClass("red-ui-flow-node-button-stopped", state !== STARTED)
-                    if(settings.enabled === true && settings.ui === true) {
-                        RED.menu.setVisible("deploymenu-item-runtime-stop", state === STARTED)
-                        RED.menu.setVisible("deploymenu-item-runtime-start", state !== STARTED)
-                    }
-                    // Do not notify the user about this event if:
-                    // - This is the very first event we've received after loading the editor (currentState = '')
-                    // - The state matches what we already thought was the case (state === currentState)
-                    // - The event was triggered by a deploy (msg.deploy === true)
-                    // - The event is a safe mode event - that gets notified separately
-                    if (currentState !== '' && state !== currentState && !msg.deploy && state !== SAFE) {
-                        RED.notify(RED._("notification.state.flows"+(state === STOPPED?'Stopped':'Started'), msg), "success")
-                    }
-                }
-            });
-        },
-        get started() {
-            return state === STARTED
-        }
-    }
-})()
--- a/packages/node_modules/@node-red/editor-client/src/js/settings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js
@@ -33,8 +33,8 @@ RED.settings = (function () {
        if (!hasLocalStorage()) {
            return;
        }
-        if (key.startsWith("auth-tokens")) {
-            localStorage.setItem(key+this.authTokensSuffix, JSON.stringify(value));
+        if (key === "auth-tokens") {
+            localStorage.setItem(key, JSON.stringify(value));
        } else {
            RED.utils.setMessageProperty(userSettings,key,value);
            saveUserSettings();
@@ -52,8 +52,8 @@ RED.settings = (function () {
        if (!hasLocalStorage()) {
            return undefined;
        }
-        if (key.startsWith("auth-tokens")) {
-            return JSON.parse(localStorage.getItem(key+this.authTokensSuffix));
+        if (key === "auth-tokens") {
+            return JSON.parse(localStorage.getItem(key));
        } else {
            var v;
            try { v = RED.utils.getMessageProperty(userSettings,key); } catch(err) {}
@@ -71,8 +71,8 @@ RED.settings = (function () {
        if (!hasLocalStorage()) {
            return;
        }
-        if (key.startsWith("auth-tokens")) {
-            localStorage.removeItem(key+this.authTokensSuffix);
+        if (key === "auth-tokens") {
+            localStorage.removeItem(key);
        } else {
            delete userSettings[key];
            saveUserSettings();
@@ -99,8 +99,6 @@ RED.settings = (function () {

    var init = function (options, done) {
        var accessTokenMatch = /[?&]access_token=(.*?)(?:$|&)/.exec(window.location.search);
-        var path=window.location.pathname.slice(0,-1);
-        RED.settings.authTokensSuffix=path.replace(/\//g, '-');
        if (accessTokenMatch) {
            var accessToken = accessTokenMatch[1];
            RED.settings.set("auth-tokens",{access_token: accessToken});
--- 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
@@ -47,7 +47,7 @@ RED.actionList = (function() {
        var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
        searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
            change: function() {
-                filterTerm = $(this).val().trim().toLowerCase();
+                filterTerm = $(this).val().trim();
                filterTerms = filterTerm.split(" ");
                searchResults.editableList('filter');
                searchResults.find("li.selected").removeClass("selected");
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
@@ -21,34 +21,6 @@ RED.actions = (function() {
    function getAction(name) {
        return actions[name].handler;
    }
-    function getActionLabel(name) {
-        let def = actions[name]
-        if (!def) {
-            return ''
-        }
-        if (!def.label) {
-            var options = def.options;
-            var key = options ? options.label : undefined;
-            if (!key) {
-                key = "action-list." +name.replace(/^.*:/,"");
-            }
-            var label = RED._(key);
-            if (label === key) {
-                // no translation. convert `name` to description
-                label = name.replace(/(^.+:([a-z]))|(-([a-z]))/g, function() {
-                    if (arguments[5] === 0) {
-                        return arguments[2].toUpperCase();
-                    } else {
-                        return " "+arguments[4].toUpperCase();
-                    }
-                });
-            }
-            def.label = label;
-        }
-        return def.label
-    }
-
-
    function invokeAction() {
        var args = Array.prototype.slice.call(arguments);
        var name = args.shift();
@@ -59,7 +31,7 @@ RED.actions = (function() {
    }
    function listActions() {
        var result = [];
-
+        var missing = [];
        Object.keys(actions).forEach(function(action) {
            var def = actions[action];
            var shortcut = RED.keyboard.getShortcut(action);
@@ -70,8 +42,28 @@ RED.actions = (function() {
                isUser = !!RED.keyboard.getUserShortcut(action);
            }
            if (!def.label) {
-                def.label = getActionLabel(action)
+                var name = action;
+                var options = def.options;
+                var key = options ? options.label : undefined;
+                if (!key) {
+                    key = "action-list." +name.replace(/^.*:/,"");
+                }
+                var label = RED._(key);
+                if (label === key) {
+                    // no translation. convert `name` to description 
+                    label = name.replace(/(^.+:([a-z]))|(-([a-z]))/g, function() {
+                        if (arguments[5] === 0) {
+                            return arguments[2].toUpperCase();
+                        } else {
+                            return " "+arguments[4].toUpperCase();
+                        }
+                    });
+                    missing.push(key);
+                }
+                def.label = label;
            }
+            //console.log("; missing:", missing);
+
            result.push({
                id:action,
                scope:shortcut?shortcut.scope:undefined,
@@ -87,7 +79,6 @@ RED.actions = (function() {
        add: addAction,
        remove: removeAction,
        get: getAction,
-        getLabel: getActionLabel,
        invoke: invokeAction,
        list: listActions
    }
--- 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
@@ -37,13 +37,13 @@ RED.clipboard = (function() {
            // IE11 workaround
            // IE does not support data uri scheme for downloading data
            var blob = new Blob([data], {
-                type: "data:application/json;charset=utf-8"
+                type: "data:text/plain;charset=utf-8"
            });
            navigator.msSaveBlob(blob, file);
        }
        else {
            var element = document.createElement('a');
-            element.setAttribute('href', 'data:application/json;charset=utf-8,' + encodeURIComponent(data));
+            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data));
            element.setAttribute('download', file);
            element.style.display = 'none';
            document.body.appendChild(element);
@@ -423,10 +423,11 @@ RED.clipboard = (function() {
        }
    }

-    function showImportNodes(library = 'clipboard') {
+    function showImportNodes(mode) {
        if (disabled) {
            return;
        }
+        mode = mode || "clipboard";

        dialogContainer.empty();
        dialogContainer.append($(importNodesDialog));
@@ -503,7 +504,7 @@ RED.clipboard = (function() {
        $("#red-ui-clipboard-dialog-import-text").on("keyup", validateImport);
        $("#red-ui-clipboard-dialog-import-text").on('paste',function() { setTimeout(validateImport,10)});

-        if (RED.workspaces.active() === 0 || RED.workspaces.isLocked()) {
+        if (RED.workspaces.active() === 0) {
            $("#red-ui-clipboard-dialog-import-opt-current").addClass('disabled').removeClass("selected");
            $("#red-ui-clipboard-dialog-import-opt-new").addClass("selected");
        } else {
@@ -532,8 +533,8 @@ RED.clipboard = (function() {
            $("#red-ui-clipboard-dialog-import-file-upload").trigger("click");
        })

-        tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+library);
-        if (library === 'clipboard') {
+        tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
+        if (mode === 'clipboard') {
            setTimeout(function() {
                $("#red-ui-clipboard-dialog-import-text").trigger("focus");
            },100)
@@ -557,16 +558,13 @@ RED.clipboard = (function() {
        });
    }

-    /**
-     * Show the export dialog
-     * @params library which export destination to show
-     * @params mode whether to default to 'auto' (default) or 'flow'
-     **/
-    function showExportNodes(library = 'clipboard', mode = 'auto' ) {
+    function showExportNodes(mode) {
        if (disabled) {
            return;
        }

+        mode = mode || "clipboard";
+
        dialogContainer.empty();
        dialogContainer.append($(exportNodesDialog));

@@ -656,12 +654,7 @@ RED.clipboard = (function() {
        $("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();

        dialogContainer.i18n();
-        
        var format = RED.settings.flowFilePretty ? "red-ui-clipboard-dialog-export-fmt-full" : "red-ui-clipboard-dialog-export-fmt-mini";
-        const userFormat = RED.settings.get("editor.dialog.export.pretty")
-        if (userFormat === false || userFormat === true) {
-            format = userFormat ? "red-ui-clipboard-dialog-export-fmt-full" : "red-ui-clipboard-dialog-export-fmt-mini";
-        }

        $("#red-ui-clipboard-dialog-export-fmt-group > a").on("click", function(evt) {
            evt.preventDefault();
@@ -677,8 +670,7 @@ RED.clipboard = (function() {
                var nodes = JSON.parse(flow);

                format = $(this).attr('id');
-                const pretty = format === "red-ui-clipboard-dialog-export-fmt-full";
-                if (pretty) {
+                if (format === 'red-ui-clipboard-dialog-export-fmt-full') {
                    flow = JSON.stringify(nodes,null,4);
                } else {
                    flow = JSON.stringify(nodes);
@@ -687,7 +679,6 @@ RED.clipboard = (function() {
                setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);

                $("#red-ui-clipboard-dialog-export-text").trigger("focus");
-                RED.settings.set("editor.dialog.export.pretty", pretty)
            }
        });

@@ -718,7 +709,6 @@ RED.clipboard = (function() {
            } else if (type === 'flow') {
                var activeWorkspace = RED.workspaces.active();
                nodes = RED.nodes.groups(activeWorkspace);
-                nodes = nodes.concat(RED.nodes.junctions(activeWorkspace));
                nodes = nodes.concat(RED.nodes.filterNodes({z:activeWorkspace}));
                RED.nodes.eachConfig(function(n) {
                    if (n.z === RED.workspaces.active() && n._def.hasUsers === false) {
@@ -731,7 +721,7 @@ RED.clipboard = (function() {
                nodes.unshift(parentNode);
                nodes = RED.nodes.createExportableNodeSet(nodes);
            } else if (type === 'full') {
-                nodes = RED.nodes.createCompleteNodeSet({ credentials: false });
+                nodes = RED.nodes.createCompleteNodeSet(false);
            }
            if (nodes !== null) {
                if (format === "red-ui-clipboard-dialog-export-fmt-full") {
@@ -775,15 +765,12 @@ RED.clipboard = (function() {
                }
            }
        }
-        if (mode === 'flow' && !$("#red-ui-clipboard-dialog-export-rng-flow").hasClass('disabled')) {
-            $("#red-ui-clipboard-dialog-export-rng-flow").trigger("click");
-        }
        if (format === "red-ui-clipboard-dialog-export-fmt-full") {
            $("#red-ui-clipboard-dialog-export-fmt-full").trigger("click");
        } else {
            $("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
        }
-        tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+library);
+        tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);

        var dialogHeight = 400;
        var winHeight = $(window).height();
@@ -1278,17 +1265,15 @@ RED.clipboard = (function() {
            RED.keyboard.add("#red-ui-drop-target", "escape" ,hideDropTarget);

            $('#red-ui-workspace-chart').on("dragenter",function(event) {
-                if (!RED.workspaces.isLocked() && (
-                    $.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
-                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1)) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
                    $("#red-ui-drop-target").css({display:'table'}).focus();
                }
            });

            $('#red-ui-drop-target').on("dragover",function(event) {
                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
-                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1 ||
-                        RED.workspaces.isLocked()) {
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
                    event.preventDefault();
                }
            })
@@ -1296,29 +1281,27 @@ RED.clipboard = (function() {
                hideDropTarget();
            })
            .on("drop",function(event) {
-                if (!RED.workspaces.isLocked()) {
-                    try {
-                        if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
-                            var data = event.originalEvent.dataTransfer.getData("text/plain");
-                            data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
-                            importNodes(data);
-                        } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
-                            var files = event.originalEvent.dataTransfer.files;
-                            if (files.length === 1) {
-                                var file = files[0];
-                                var reader = new FileReader();
-                                reader.onload = (function(theFile) {
-                                    return function(e) {
-                                        importNodes(e.target.result);
-                                    };
-                                })(file);
-                                reader.readAsText(file);
-                            }
+                try {
+                    if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                        var data = event.originalEvent.dataTransfer.getData("text/plain");
+                        data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                        importNodes(data);
+                    } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                        var files = event.originalEvent.dataTransfer.files;
+                        if (files.length === 1) {
+                            var file = files[0];
+                            var reader = new FileReader();
+                            reader.onload = (function(theFile) {
+                                return function(e) {
+                                    importNodes(e.target.result);
+                                };
+                            })(file);
+                            reader.readAsText(file);
                        }
-                    } catch(err) {
-                        // Ensure any errors throw above doesn't stop the drop target from
-                        // being hidden.
                    }
+                } catch(err) {
+                    // Ensure any errors throw above doesn't stop the drop target from
+                    // being hidden.
                }
                hideDropTarget();
                event.preventDefault();
--- 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
@@ -9,14 +9,12 @@
 *
 * options:
 *
- *  search:    function(value, [done])
- *             A function that is passed the current contents of the input whenever
- *             it changes.
- *             The function must either return auto-complete options, or pass them
- *             to the optional 'done' parameter.
- *             If the function signature includes 'done', it must be used
- *  minLength: number
- *             If `minLength` is 0, pressing down arrow will show the list
+ *  search : function(value, [done])
+ *           A function that is passed the current contents of the input whenever
+ *           it changes.
+ *           The function must either return auto-complete options, or pass them
+ *           to the optional 'done' parameter.
+ *           If the function signature includes 'done', it must be used
 *
 * The auto-complete options should be an array of objects in the form:
 *  {
@@ -28,11 +26,10 @@

    $.widget( "nodered.autoComplete", {
        _create: function() {
-            const that = this;
+            var that = this;
            this.completionMenuShown = false;
-            this.options.minLength = parseInteger(this.options.minLength, 1, 0);
-            this.options.search = this.options.search || function() { return [] };
-            this.element.addClass("red-ui-autoComplete");
+            this.options.search = this.options.search || function() { return [] }
+            this.element.addClass("red-ui-autoComplete")
            this.element.on("keydown.red-ui-autoComplete", function(evt) {
                if ((evt.keyCode === 13 || evt.keyCode === 9) && that.completionMenuShown) {
                    var opts = that.menu.options();
@@ -74,8 +71,8 @@
            this.completionMenuShown = true;
        },
        _updateCompletions: function(val) {
-            const that = this;
-            if (val.trim().length < this.options.minLength) {
+            var that = this;
+            if (val.trim() === "") {
                if (this.completionMenuShown) {
                    this.menu.hide();
                }
@@ -99,7 +96,7 @@
                }
            }
            if (this.options.search.length === 2) {
-                const requestId = 1+Math.floor(Math.random()*10000);
+                var requestId = 1+Math.floor(Math.random()*10000);
                this.pendingRequest = requestId;
                this.options.search(val,function(completions) { displayResults(completions,requestId);})
            } else {
@@ -115,12 +112,4 @@
            }
        }
    });
-    function parseInteger(input, def, min, max) {
-        if(input == null) { return (def || 0); }
-        min = min == null ? Number.NEGATIVE_INFINITY : min; 
-        max = max == null ? Number.POSITIVE_INFINITY : max; 
-        let n = parseInt(input);
-        if(isNaN(n) || n < min || n > max) { n = def || 0; }
-        return n;
-    }
 })(jQuery);
--- 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
@@ -160,7 +160,7 @@
                this.element.css("maxHeight",null);
            }
            if (this.options.height !== 'auto') {
-                this.uiContainer.css("overflow-y","auto");
+                this.uiContainer.css("overflow-y","scroll");
                if (!isNaN(this.options.height)) {
                    this.uiHeight = this.options.height;
                }
@@ -417,9 +417,6 @@
            } else {
                return null;
            }
-        },
-        cancel: function() {
-            this.element.sortable("cancel");
        }
    });
 })(jQuery);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
@@ -16,7 +16,6 @@
 RED.menu = (function() {

    var menuItems = {};
-    let menuItemCount = 0

    function createMenuItem(opt) {
        var item;
@@ -60,16 +59,15 @@ RED.menu = (function() {
            item = $('<li class="red-ui-menu-divider"></li>');
        } else {
            item = $('<li></li>');
-            if (!opt.id) {
-                opt.id = 'red-ui-menu-item-'+(menuItemCount++)
-            }
+
            if (opt.group) {
                item.addClass("red-ui-menu-group-"+opt.group);
+
            }
            var linkContent = '<a '+(opt.id?'id="'+opt.id+'" ':'')+'tabindex="-1" href="#">';
            if (opt.toggle) {
-                linkContent += '<i class="fa fa-square'+(opt.direction!=='right'?" pull-left":"")+'"></i>';
-                linkContent += '<i class="fa fa-check-square'+(opt.direction!=='right'?" pull-left":"")+'"></i>';
+                linkContent += '<i class="fa fa-square pull-left"></i>';
+                linkContent += '<i class="fa fa-check-square pull-left"></i>';

            }
            if (opt.icon !== undefined) {
@@ -79,23 +77,20 @@ RED.menu = (function() {
                    linkContent += '<i class="'+(opt.icon?opt.icon:'" style="display: inline-block;"')+'"></i> ';
                }
            }
-            let label = opt.label
-            if (!opt.label && typeof opt.onselect === 'string') {
-                label = RED.actions.getLabel(opt.onselect)
-            }
+
            if (opt.sublabel) {
-                linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+label+'</span>'+
+                linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+opt.label+'</span>'+
                               '<span class="red-ui-menu-sublabel">'+opt.sublabel+'</span></span>'
            } else {
-                linkContent += '<span class="red-ui-menu-label"><span>'+label+'</span></span>'
+                linkContent += '<span class="red-ui-menu-label"><span>'+opt.label+'</span></span>'
            }

            linkContent += '</a>';

            var link = $(linkContent).appendTo(item);
            opt.link = link;
-            if (typeof opt.onselect === 'string' || opt.shortcut) {
-                var shortcut = opt.shortcut || RED.keyboard.getShortcut(opt.onselect);
+            if (typeof opt.onselect === 'string') {
+                var shortcut = RED.keyboard.getShortcut(opt.onselect);
                if (shortcut && shortcut.key) {
                    opt.shortcutSpan = $('<span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span>').appendTo(link.find(".red-ui-menu-label"));
                }
@@ -131,45 +126,19 @@ RED.menu = (function() {
                });
            }
            if (opt.options) {
-                item.addClass("red-ui-menu-dropdown-submenu"+(opt.direction!=='right'?" pull-left":""));
+                item.addClass("red-ui-menu-dropdown-submenu pull-left");
                var submenu = $('<ul id="'+opt.id+'-submenu" class="red-ui-menu-dropdown"></ul>').appendTo(item);
-                var hasIcons = false
-                var hasSubmenus = false

                for (var i=0;i<opt.options.length;i++) {
-
-                    if (opt.options[i]) {
-                        if (opt.onpreselect && opt.options[i].onpreselect === undefined) {
-                            opt.options[i].onpreselect = opt.onpreselect
-                        }
-                        if (opt.onpostselect && opt.options[i].onpostselect === undefined) {
-                            opt.options[i].onpostselect = opt.onpostselect
-                        }
-                        opt.options[i].direction = opt.direction
-                        hasIcons = hasIcons || (opt.options[i].icon);
-                        hasSubmenus = hasSubmenus || (opt.options[i].options);
-                    }
-
                    var li = createMenuItem(opt.options[i]);
                    if (li) {
                        li.appendTo(submenu);
                    }
                }
-                if (!hasIcons) {
-                    submenu.addClass("red-ui-menu-dropdown-noicons")
-                }
-                if (hasSubmenus) {
-                    submenu.addClass("red-ui-menu-dropdown-submenus")
-                }
-
-
            }
            if (opt.disabled) {
                item.addClass("disabled");
            }
-            if (opt.visible === false) {
-                item.addClass("hide");
-            }
        }


@@ -178,9 +147,7 @@ RED.menu = (function() {
    }
    function createMenu(options) {
        var topMenu = $("<ul/>",{class:"red-ui-menu red-ui-menu-dropdown pull-right"});
-        if (options.direction) {
-            topMenu.addClass("red-ui-menu-dropdown-direction-"+options.direction)
-        }
+
        if (options.id) {
            topMenu.attr({id:options.id+"-submenu"});
            var menuParent = $("#"+options.id);
@@ -206,22 +173,9 @@ RED.menu = (function() {
        }

        var lastAddedSeparator = false;
-        var hasSubmenus = false;
-        var hasIcons = false;
        for (var i=0;i<options.options.length;i++) {
            var opt = options.options[i];
-            if (opt) {
-                if (options.onpreselect && opt.onpreselect === undefined) {
-                    opt.onpreselect = options.onpreselect
-                }
-                if (options.onpostselect && opt.onpostselect === undefined) {
-                    opt.onpostselect = options.onpostselect
-                }
-                opt.direction = options.direction || 'left'
-            }
            if (opt !== null || !lastAddedSeparator) {
-                hasIcons = hasIcons || (opt && opt.icon);
-                hasSubmenus = hasSubmenus || (opt && opt.options);
                var li = createMenuItem(opt);
                if (li) {
                    li.appendTo(topMenu);
@@ -229,21 +183,13 @@ RED.menu = (function() {
                }
            }
        }
-        if (!hasIcons) {
-            topMenu.addClass("red-ui-menu-dropdown-noicons")
-        }
-        if (hasSubmenus) {
-            topMenu.addClass("red-ui-menu-dropdown-submenus")
-        }
+
        return topMenu;
    }

    function triggerAction(id, args) {
        var opt = menuItems[id];
        var callback = opt.onselect;
-        if (opt.onpreselect) {
-            opt.onpreselect.call(opt,args)
-        }
        if (typeof opt.onselect === 'string') {
            callback = RED.actions.get(opt.onselect);
        }
@@ -252,9 +198,6 @@ RED.menu = (function() {
        } else {
            console.log("No callback for",id,opt.onselect);
        }
-        if (opt.onpostselect) {
-            opt.onpostselect.call(opt,args)
-        }
    }

    function isSelected(id) {
@@ -306,14 +249,6 @@ RED.menu = (function() {
        }
    }

-    function setVisible(id,state) {
-        if (!state) {
-            $("#"+id).parent().addClass("hide");
-        } else {
-            $("#"+id).parent().removeClass("hide");
-        }
-    }
-
    function addItem(id,opt) {
        var item = createMenuItem(opt);
        if (opt !== null && opt.group) {
@@ -370,7 +305,6 @@ RED.menu = (function() {
        isSelected: isSelected,
        toggleSelected: toggleSelected,
        setDisabled: setDisabled,
-        setVisible: setVisible,
        addItem: addItem,
        removeItem: removeItem,
        setAction: setAction,
--- 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
@@ -359,7 +359,6 @@ RED.popover = (function() {
                setTimeout(closePopup,delay.hide);
            }
        });
-
        if (trigger === 'hover') {
            target.on('mouseenter',function(e) {
                clearTimeout(timer);
@@ -471,11 +470,6 @@ RED.popover = (function() {
            popover.setAction = function(newAction) {
                action = newAction;
            }
-            popover.delete = function() {
-                popover.close(true)
-                target.off("mouseenter");
-                target.off("mouseleave");
-            };
            return popover;

        },
@@ -610,13 +604,10 @@ RED.popover = (function() {
                var target = options.target;
                var align = options.align || "right";
                var offset = options.offset || [0,0];
-                var xPos = options.x;
-                var yPos = options.y;
-                var isAbsolutePosition = (xPos !== undefined && yPos !== undefined)

-                var pos = isAbsolutePosition?{left:xPos, top: yPos}:target.offset();
-                var targetWidth = isAbsolutePosition?0:target.width();
-                var targetHeight = isAbsolutePosition?0:target.outerHeight();
+                var pos = target.offset();
+                var targetWidth = target.width();
+                var targetHeight = target.outerHeight();
                var panelHeight = panel.height();
                var panelWidth = panel.width();

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
@@ -105,8 +105,8 @@
                    }
                });
                this.element.on("keydown",function(e) {
-                    if (!menuShown && e.keyCode === 40 && $(this).val() === '') {
-                        //DOWN (only show menu if search field is emty)
+                    if (!menuShown && e.keyCode === 40) {
+                        //DOWN
                        showMenu();
                    }
                });
--- 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
@@ -141,29 +141,7 @@ RED.tabs = (function() {
            })
        }

-        if (options.contextmenu) {
-            wrapper.on('contextmenu', function(evt) {
-                let clickedTab
-                let target = evt.target
-                while(target.nodeName !== 'A' && target.nodeName !== 'UL' && target.nodeName !== 'BODY') {
-                    target = target.parentNode
-                }
-                if (target.nodeName === 'A') {
-                    const href = target.getAttribute('href')
-                    if (href) {
-                        clickedTab = tabs[href.slice(1)]
-                    }
-                }
-                evt.preventDefault()
-                evt.stopPropagation()
-                RED.contextMenu.show({
-                    x:evt.clientX-5,
-                    y:evt.clientY-5,
-                    options: options.contextmenu(clickedTab)
-                })
-                return false
-            })
-        }
+

        var scrollLeft;
        var scrollRight;
@@ -183,7 +161,7 @@ RED.tabs = (function() {
                    // Assume this is wheel event which might not trigger
                    // the scroll event, so do things manually
                    var sl = scrollContainer.scrollLeft();
-                    sl += evt.originalEvent.deltaY;
+                    sl -= evt.originalEvent.deltaY;
                    scrollContainer.scrollLeft(sl);
                }
            })
@@ -692,7 +670,7 @@ RED.tabs = (function() {
                }
                var link = $("<a/>",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
                if (tab.icon) {
-                    $('<i>',{class:"red-ui-tab-icon", style:"mask-image: url("+tab.icon+"); -webkit-mask-image: url("+tab.icon+");"}).appendTo(link);
+                    $('<img src="'+tab.icon+'" class="red-ui-tab-icon"/>').appendTo(link);
                } else if (tab.iconClass) {
                    $('<i>',{class:"red-ui-tab-icon "+tab.iconClass}).appendTo(link);
                }
@@ -829,27 +807,28 @@ RED.tabs = (function() {
                        event.preventDefault();
                        removeTab(tab.id);
                    });
-                    RED.popover.tooltip(closeLink,RED._("workspace.closeFlow"));
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
+                }
+                if (tab.hideable) {
+                    li.addClass("red-ui-tabs-closeable")
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
+                    closeLink.on("click",function(event) {
+                        event.preventDefault();
+                        hideTab(tab.id);
+                    });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                }
-                // if (tab.hideable) {
-                //     li.addClass("red-ui-tabs-closeable")
-                //     var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
-                //     closeLink.append('<i class="fa fa-eye" />');
-                //     closeLink.append('<i class="fa fa-eye-slash" />');
-                //     closeLink.on("click",function(event) {
-                //         event.preventDefault();
-                //         hideTab(tab.id);
-                //     });
-                //     RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
-                // }

                var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
                if (options.onselect) {
+                    $('<i class="red-ui-tabs-badge-changed fa fa-circle"></i>').appendTo(badges);
                    $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
                }

                // link.attr("title",tab.label);
-                RED.popover.tooltip(link,function() { return RED.utils.sanitize(tab.label); });
+                RED.popover.tooltip(link,function() { return tab.label})

                if (options.onadd) {
                    options.onadd(tab);
@@ -959,9 +938,6 @@ RED.tabs = (function() {
            activeIndex: function() {
                return ul.find("li.active").index()
            },
-            getTabIndex: function (id) {
-                return ul.find("a[href='#"+id+"']").parent().index()
-            },
            contains: function(id) {
                return ul.find("a[href='#"+id+"']").length > 0;
            },
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -21,7 +21,6 @@
 *   - multi : boolean - if true, .selected will return an array of results
 *                       otherwise, returns the first selected item
 *   - sortable: boolean/string - TODO: see editableList
- *   - selectable: boolean - default true - whether individual items can be selected
 *   - rootSortable: boolean - if 'sortable' is set, then setting this to
 *                             false, prevents items being sorted to the
 *                             top level of the tree
@@ -119,7 +118,6 @@
                switch(evt.keyCode) {
                    case 32: // SPACE
                    case 13: // ENTER
-                        if (!that.options.selectable) { return }
                        if (evt.altKey || evt.ctrlKey || evt.metaKey || evt.shiftKey) {
                            return
                        }
--- 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
@@ -55,46 +55,34 @@
    }

    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;
-        }
        return function(val) {
            var matches = [];
            options.forEach(opt => {
-                const optVal = opt.value;
-                const optSrc = (opt.source||[]).join(",");
-                const valMatch = getMatch(optVal, val);
-                const srcMatch = getMatch(optSrc, val);
-                if (valMatch.found || srcMatch.found) {
-                    const element = $('<div>',{style: "display: flex"});
-                    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) {
-                        const optEl = $('<div>').css({ "font-size": "0.8em" });
-                        optEl.append(generateSpans(srcMatch));
-                        optEl.appendTo(element);
+                let v = opt.value;
+                var i = v.toLowerCase().indexOf(val.toLowerCase());
+                if (i > -1) {
+                    var pre = v.substring(0,i);
+                    var matchedVal = v.substring(i,i+val.length);
+                    var post = v.substring(i+val.length)
+
+                    var el = $('<div/>',{style:"white-space:nowrap; overflow: hidden; flex-grow:1"});
+                    $('<span/>').text(pre).appendTo(el);
+                    $('<span/>',{style:"font-weight: bold"}).text(matchedVal).appendTo(el);
+                    $('<span/>').text(post).appendTo(el);
+
+                    var element = $('<div>',{style: "display: flex"});
+                    el.appendTo(element);
+                    if (opt.source) {
+                        $('<div>').css({
+                            "font-size": "0.8em"
+                        }).text(opt.source.join(",")).appendTo(element);
                    }
+
                    matches.push({
-                        value: optVal,
+                        value: v,
                        label: element,
-                        i: (valMatch.found ? valMatch.index : srcMatch.index)
-                    });
+                        i:i
+                    })
                }
            })
            matches.sort(function(A,B){return A.i-B.i})
@@ -105,36 +93,6 @@
    // This is a hand-generated list of completions for the core nodes (based on the node help html).
    var msgCompletions = [
        { value: "payload" },
-        { value: "topic", source: ["mqtt","inject","rbe"] },
-        { value: "action", source: ["mqtt"] },
-        { value: "complete", source: ["join"] },
-        { value: "contentType", source: ["mqtt"] },
-        { value: "cookies", source: ["http request","http response"] },
-        { value: "correlationData", source: ["mqtt"] },
-        { value: "delay", source: ["delay","trigger"] },
-        { value: "encoding", source: ["file"] },
-        { value: "error", source: ["catch"] },
-        { value: "error.message", source: ["catch"] },
-        { value: "error.source", source: ["catch"] },
-        { value: "error.source.id", source: ["catch"] },
-        { value: "error.source.type", source: ["catch"] },
-        { value: "error.source.name", source: ["catch"] },
-        { value: "filename", source: ["file","file in"] },
-        { value: "flush", source: ["delay"] },
-        { value: "followRedirects", source: ["http request"] },
-        { value: "headers", source: ["http response","http request"] },
-        { value: "host", source: ["tcp request","http request"] },
-        { value: "ip", source: ["udp out"] },
-        { value: "kill", source: ["exec"] },
-        { value: "messageExpiryInterval", source: ["mqtt"] },
-        { value: "method", source: ["http request"] },
-        { value: "options", source: ["xml"] },
-        { value: "parts", source: ["split","join","batch","sort"] },
-        { value: "pid", source: ["exec"] },
-        { value: "port", source: ["tcp request"," udp out"] },
-        { value: "qos", source: ["mqtt"] },
-        { value: "rate", source: ["delay"] },
-        { value: "rejectUnauthorized", source: ["http request"] },
        { value: "req", source: ["http in"]},
        { value: "req.body", source: ["http in"]},
        { value: "req.headers", source: ["http in"]},
@@ -142,28 +100,38 @@
        { value: "req.params", source: ["http in"]},
        { value: "req.cookies", source: ["http in"]},
        { value: "req.files", source: ["http in"]},
+        { value: "complete", source: ["join"] },
+        { value: "contentType", source: ["mqtt"] },
+        { value: "cookies", source: ["http in","http request"] },
+        { value: "correlationData", source: ["mqtt"] },
+        { value: "delay", source: ["delay","trigger"] },
+        { value: "encoding", source: ["file"] },
+        { value: "error", source: ["catch"] },
+        { value: "filename", source: ["file","file in"] },
+        { value: "flush", source: ["delay"] },
+        { value: "followRedirects", source: ["http request"] },
+        { value: "headers", source: ["http in"," http request"] },
+        { value: "kill", source: ["exec"] },
+        { value: "messageExpiryInterval", source: ["mqtt"] },
+        { value: "method", source: ["http-request"] },
+        { value: "options", source: ["xml"] },
+        { value: "parts", source: ["split","join"] },
+        { value: "pid", source: ["exec"] },
+        { value: "qos", source: ["mqtt"] },
+        { value: "rate", source: ["delay"] },
+        { value: "rejectUnauthorized", source: ["http request"] },
        { value: "requestTimeout", source: ["http request"] },
        { value: "reset", source: ["delay","trigger","join","rbe"] },
-        { value: "responseCookies", source: ["http request"] },
        { value: "responseTopic", source: ["mqtt"] },
-        { value: "responseUrl", source: ["http request"] },
        { value: "restartTimeout", source: ["join"] },
        { value: "retain", source: ["mqtt"] },
-        { value: "schema", source: ["json"] },
        { value: "select", source: ["html"] },
-        { value: "statusCode", source: ["http response","http request"] },
-        { value: "status", source: ["status"] },
-        { value: "status.text", source: ["status"] },
-        { value: "status.source", source: ["status"] },
-        { value: "status.source.type", source: ["status"] },
-        { value: "status.source.id", source: ["status"] },
-        { value: "status.source.name", source: ["status"] },
-        { value: "target", source: ["link call"] },
+        { value: "statusCode", source: ["http in"] },
        { value: "template", source: ["template"] },
        { value: "toFront", source: ["delay"] },
+        { value: "topic", source: ["inject","mqtt","rbe"] },
        { value: "url", source: ["http request"] },
-        { value: "userProperties", source: ["mqtt"] },
-        { value: "_session", source: ["websocket out","tcp out"] },
+        { value: "userProperties", source: ["mqtt"] }
    ]
    var allOptions = {
        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
@@ -198,8 +166,6 @@
                }
                RED.editor.editJSON({
                    value: value,
-                    stateId: RED.editor.generateViewStateId("typedInput", that, "json"),
-                    focus: true,
                    complete: function(v) {
                        var value = v;
                        try {
@@ -222,8 +188,6 @@
                var that = this;
                RED.editor.editExpression({
                    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"));
                    }
@@ -238,8 +202,6 @@
                var that = this;
                RED.editor.editBuffer({
                    value: this.value(),
-                    stateId: RED.editor.generateViewStateId("typedInput", that, "bin"),
-                    focus: true,
                    complete: function(v) {
                        that.value(v);
                    }
@@ -501,7 +463,7 @@
                this.options.types = this.options.types||Object.keys(allOptions);
            }

-            this.selectTrigger = $('<button type="button" class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
+            this.selectTrigger = $('<button class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
            $('<i class="red-ui-typedInput-icon fa fa-caret-down"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);

            this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
@@ -570,7 +532,7 @@
            })

            // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
-            this.optionSelectTrigger = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
+            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
            this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
            // RED.popover.tooltip(this.optionSelectLabel,function() {
            //     return that.optionValue;
@@ -591,7 +553,7 @@
                that.uiSelect.addClass('red-ui-typedInput-focus');
            });

-            this.optionExpandButton = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
+            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
            this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);

            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
@@ -675,7 +637,7 @@
                    if (opt.icon.indexOf("<") === 0) {
                        $(opt.icon).prependTo(op);
                    } else if (opt.icon.indexOf("/") !== -1) {
-                        $('<i>',{class:"red-ui-typedInput-icon", style:"mask-image: url("+opt.icon+"); -webkit-mask-image: url("+opt.icon+");"}).prependTo(op);
+                        $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op);
                    } else {
                        $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
                    }
@@ -1026,7 +988,10 @@
                            $(opt.icon).prependTo(this.selectLabel);
                        }
                        else if (opt.icon.indexOf("/") !== -1) {
-                            $('<i>',{class:"red-ui-typedInput-icon", style:"mask-image: url("+opt.icon+"); -webkit-mask-image: url("+opt.icon+"); margin-right: 4px;height: 18px;width:13px"}).prependTo(this.selectLabel);
+                            image = new Image();
+                            image.name = opt.icon;
+                            image.src = mapDeprecatedIcon(opt.icon);
+                            $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
                        }
                        else {
                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon,style:"min-width: 13px; margin-right: 4px;"}).prependTo(this.selectLabel);
@@ -1182,8 +1147,7 @@
                            this.elementDiv.show();
                            if (opt.autoComplete) {
                                this.input.autoComplete({
-                                    search: opt.autoComplete,
-                                    minLength: 0
+                                    search: opt.autoComplete
                                })
                            }
                        }
--- 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
@@ -1,246 +0,0 @@
-RED.contextMenu = (function () {
-
-    let menu;
-
-    function disposeMenu() {
-        $(document).off("mousedown.red-ui-workspace-context-menu");
-        if (menu) {
-            menu.remove();
-        }
-        menu = null;
-    }
-    function show(options) {
-        if (menu) {
-            menu.remove()
-        }
-        let menuItems = []
-        if (options.options) {
-            menuItems = options.options
-        } else if (options.type === 'workspace') {
-            const selection = RED.view.selection()
-            const noSelection = !selection || Object.keys(selection).length === 0
-            const hasSelection = (selection.nodes && selection.nodes.length > 0);
-            const hasMultipleSelection = hasSelection && selection.nodes.length > 1;
-            const virtulLinks = (selection.links && selection.links.filter(e => !!e.link)) || [];
-            const wireLinks = (selection.links && selection.links.filter(e => !e.link)) || [];
-            const hasLinks = wireLinks.length > 0;
-            const isSingleLink = !hasSelection && hasLinks && wireLinks.length === 1
-            const isMultipleLinks = !hasSelection && hasLinks && wireLinks.length > 1
-            const canDelete = hasSelection || hasLinks
-            const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
-            const canEdit = !RED.workspaces.isLocked()
-            const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
-            const isAllGroups = hasSelection && selection.nodes.filter(n => n.type !== 'group').length === 0
-            const hasGroup = hasSelection && selection.nodes.filter(n => n.type === 'group' ).length > 0
-            const offset = $("#red-ui-workspace-chart").offset()
-
-            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.floor(addX / gridSize)
-                addY = gridSize * Math.floor(addY / gridSize)
-            }
-
-            menuItems.push(
-                { onselect: 'core:show-action-list', onpostselect: function () { } }
-            )
-
-            const insertOptions = []
-            menuItems.push({ label: RED._("contextMenu.insert"), options: insertOptions })
-            insertOptions.push(
-                {
-                    label: RED._("contextMenu.node"),
-                    onselect: function () {
-                        RED.view.showQuickAddDialog({
-                            position: [addX, addY],
-                            touchTrigger: true,
-                            splice: isSingleLink ? selection.links[0] : undefined,
-                            // spliceMultiple: isMultipleLinks
-                        })
-                    },
-                    disabled: !canEdit
-                },
-                (hasLinks) ? { // has least 1 wire selected
-                    label: RED._("contextMenu.junction"),
-                    onselect: 'core:split-wires-with-junctions',
-                    disabled: !canEdit || !hasLinks
-                } : {
-                    label: RED._("contextMenu.junction"),
-                    onselect: function () {
-                        const nn = {
-                            _def: { defaults: {} },
-                            type: 'junction',
-                            z: RED.workspaces.active(),
-                            id: RED.nodes.id(),
-                            x: addX,
-                            y: addY,
-                            w: 0, h: 0,
-                            outputs: 1,
-                            inputs: 1,
-                            dirty: true,
-                            moved: true
-                        }
-                        const junction = RED.nodes.addJunction(nn);
-                        const historyEvent = {
-                            dirty: RED.nodes.dirty(),
-                            t: 'add',
-                            junctions: [junction]
-                        }
-                        RED.history.push(historyEvent);
-                        RED.nodes.dirty(true);
-                        RED.view.select({nodes: [junction] });
-                        RED.view.redraw(true)
-                    },
-                    disabled: !canEdit
-                },
-                {
-                    label: RED._("contextMenu.linkNodes"),
-                    onselect: 'core:split-wire-with-link-nodes',
-                    disabled: !canEdit || !hasLinks
-                },
-                null,
-                { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
-                { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
-            )
-            if (hasSelection && canEdit) {
-                const nodeOptions = []
-                if (!hasMultipleSelection && !isGroup) {
-                    nodeOptions.push(
-                        { onselect: 'core:show-node-help' },
-                        null
-                    )
-                }
-                nodeOptions.push(
-                    { onselect: 'core:enable-selected-nodes' },
-                    { onselect: 'core:disable-selected-nodes' },
-                    null,
-                    { onselect: 'core:show-selected-node-labels' },
-                    { onselect: 'core:hide-selected-node-labels' }
-                )
-                menuItems.push({
-                    label: RED._('sidebar.info.node'),
-                    options: nodeOptions
-                })
-                menuItems.push({
-                    label: RED._('sidebar.info.group'),
-                    options: [
-                        { onselect: 'core:group-selection' },
-                        { onselect: 'core:ungroup-selection', disabled: !hasGroup },
-                    ]
-                })
-                if (hasGroup) {
-                    menuItems[menuItems.length - 1].options.push(
-                        { onselect: 'core:merge-selection-to-group', label: RED._("menu.label.groupMergeSelection") }
-                    )
-
-                }
-                if (canRemoveFromGroup) {
-                    menuItems[menuItems.length - 1].options.push(
-                        { onselect: 'core:remove-selection-from-group', label: RED._("menu.label.groupRemoveSelection") }
-                    )
-                }
-                menuItems[menuItems.length - 1].options.push(
-                    null,
-                    { onselect: 'core:copy-group-style', disabled: !hasGroup },
-                    { onselect: 'core:paste-group-style', disabled: !hasGroup}
-                )
-            }
-            if (canEdit && hasMultipleSelection) {
-                menuItems.push({
-                    label: RED._('menu.label.arrange'),
-                    options: [
-                        { label:RED._("menu.label.alignLeft"), onselect: "core:align-selection-to-left"},
-                        { label:RED._("menu.label.alignCenter"), onselect: "core:align-selection-to-center"},
-                        { label:RED._("menu.label.alignRight"), onselect: "core:align-selection-to-right"},
-                        null,
-                        { label:RED._("menu.label.alignTop"), onselect: "core:align-selection-to-top"},
-                        { label:RED._("menu.label.alignMiddle"), onselect: "core:align-selection-to-middle"},
-                        { label:RED._("menu.label.alignBottom"), onselect: "core:align-selection-to-bottom"},
-                        null,
-                        { label:RED._("menu.label.distributeHorizontally"), onselect: "core:distribute-selection-horizontally"},
-                        { label:RED._("menu.label.distributeVertically"), onselect: "core:distribute-selection-vertically"}
-                    ]
-                })
-            }
-
-
-            menuItems.push(
-                null,
-                { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
-                { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
-                null,
-                { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !canEdit || !hasSelection },
-                { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
-                { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !canEdit || !RED.view.clipboard() },
-                { onselect: 'core:delete-selection', disabled: !canEdit || !canDelete },
-                { onselect: 'core:delete-selection-and-reconnect', label: RED._('keyboard.deleteReconnect'), disabled: !canEdit || !canDelete },
-                { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
-                { onselect: 'core:select-all-nodes' },
-            )
-        }
-
-        var direction = "right";
-        var MENU_WIDTH = 500; // can not use menu width here
-        if ((options.x -$(document).scrollLeft()) >
-            ($(window).width() -MENU_WIDTH)) {
-            direction = "left";
-        }
-
-        menu = RED.menu.init({
-            direction: direction,
-            onpreselect: function() {
-                disposeMenu()
-            },
-            onpostselect: function () {
-                RED.view.focus()
-            },
-            options: menuItems
-        });
-
-        menu.attr("id", "red-ui-workspace-context-menu");
-        menu.css({
-            position: "absolute"
-        })
-        menu.appendTo("body");
-
-        // TODO: prevent the menu from overflowing the window.
-
-        var top = options.y
-        var left = options.x
-
-        if (top + menu.height() - $(document).scrollTop() > $(window).height()) {
-            top -= (top + menu.height()) - $(window).height() + 22;
-        }
-        if (left + menu.width() - $(document).scrollLeft() > $(window).width()) {
-            left -= (left + menu.width()) - $(window).width() + 18;
-        }
-        menu.css({
-            top: top + "px",
-            left: left + "px"
-        })
-        $(".red-ui-menu.red-ui-menu-dropdown").hide();
-        $(document).on("mousedown.red-ui-workspace-context-menu", function (evt) {
-            if (menu && menu[0].contains(evt.target)) {
-                return
-            }
-            disposeMenu()
-        });
-        menu.show();
-        // set focus to first item so that pressing escape key closes the menu
-        $("#red-ui-workspace-context-menu :first(ul) > a").trigger("focus")
-
-    }
-    // Allow escape key hook and other editor events to close context menu
-    RED.keyboard.add("red-ui-workspace-context-menu", "escape", function () { RED.contextMenu.hide() })
-    RED.events.on("editor:open", function () { RED.contextMenu.hide() });
-    RED.events.on("search:open", function () { RED.contextMenu.hide() });
-    RED.events.on("type-search:open", function () { RED.contextMenu.hide() });
-    RED.events.on("actionList:open", function () { RED.contextMenu.hide() });
-    RED.events.on("view:selection-changed", function () { RED.contextMenu.hide() });
-    return {
-        show: show,
-        hide: disposeMenu
-    }
-})()
--- 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
@@ -63,18 +63,16 @@ RED.deploy = (function() {
              '</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")}}},
-                    {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
-                    {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
-                    null
-            ]
-            if (RED.settings.runtimeState && RED.settings.runtimeState.ui === true) {
-                mainMenuItems.push({id:"deploymenu-item-runtime-start", icon:"red/images/start.svg",label:RED._("deploy.startFlows"),sublabel:RED._("deploy.startFlowsDesc"),onselect:"core:start-flows", visible:false})
-                mainMenuItems.push({id:"deploymenu-item-runtime-stop", icon:"red/images/stop.svg",label:RED._("deploy.stopFlows"),sublabel:RED._("deploy.stopFlowsDesc"),onselect:"core:stop-flows", visible:false})
-            }
-            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 });
+              RED.menu.init({id:"red-ui-header-button-deploy-options",
+                  options: [
+                      {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")}}},
+                      {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+                      null,
+                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
+
+                  ]
+              });
        } else if (type == "simple") {
            var label = options.label || RED._("deploy.deploy");
            var icon = 'red/images/deploy-full-o.svg';
@@ -102,10 +100,6 @@ RED.deploy = (function() {

        RED.actions.add("core:deploy-flows",save);
        if (type === "default") {
-            if (RED.settings.runtimeState && RED.settings.runtimeState.ui === true) {
-                RED.actions.add("core:stop-flows",function() { stopStartFlows("stop") });
-                RED.actions.add("core:start-flows",function() { stopStartFlows("start") });
-            }
            RED.actions.add("core:restart-flows",restart);
            RED.actions.add("core:set-deploy-type-to-full",function() { RED.menu.setSelected("deploymenu-item-full",true);});
            RED.actions.add("core:set-deploy-type-to-modified-flows",function() { RED.menu.setSelected("deploymenu-item-flow",true); });
@@ -276,73 +270,18 @@ RED.deploy = (function() {
    function sanitize(html) {
        return html.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")
    }
-
-    function shadeShow() {
+    function restart() {
+        var startTime = Date.now();
+        $(".red-ui-deploy-button-content").css('opacity',0);
+        $(".red-ui-deploy-button-spinner").show();
+        var deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled");
+        $("#red-ui-header-button-deploy").addClass("disabled");
+        deployInflight = true;
        $("#red-ui-header-shade").show();
        $("#red-ui-editor-shade").show();
        $("#red-ui-palette-shade").show();
        $("#red-ui-sidebar-shade").show();
-    }
-    function shadeHide() {
-        $("#red-ui-header-shade").hide();
-        $("#red-ui-editor-shade").hide();
-        $("#red-ui-palette-shade").hide();
-        $("#red-ui-sidebar-shade").hide();
-    }
-    function deployButtonSetBusy(){
-        $(".red-ui-deploy-button-content").css('opacity',0);
-        $(".red-ui-deploy-button-spinner").show();
-        $("#red-ui-header-button-deploy").addClass("disabled");
-    }
-    function deployButtonClearBusy(){
-        $(".red-ui-deploy-button-content").css('opacity',1);
-        $(".red-ui-deploy-button-spinner").hide();
-    }
-    function stopStartFlows(state) {
-        const startTime = Date.now()
-        const deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled")
-        deployInflight = true
-        deployButtonSetBusy()
-        shadeShow()
-        $.ajax({
-            url:"flows/state",
-            type: "POST",
-            data: {state: state}
-        }).done(function(data,textStatus,xhr) {
-            if (deployWasEnabled) {
-                $("#red-ui-header-button-deploy").removeClass("disabled")
-            }
-        }).fail(function(xhr,textStatus,err) {
-            if (deployWasEnabled) {
-                $("#red-ui-header-button-deploy").removeClass("disabled")
-            }
-            if (xhr.status === 401) {
-                RED.notify(RED._("notification.error", { message: RED._("user.notAuthorized") }), "error")
-            } else if (xhr.responseText) {
-                const errorDetail = { message: err ? (err + "") : "" }
-                try {
-                    errorDetail.message = JSON.parse(xhr.responseText).message
-                } finally {
-                    errorDetail.message = errorDetail.message || xhr.responseText
-                }
-                RED.notify(RED._("notification.error", errorDetail), "error")
-            } else {
-                RED.notify(RED._("notification.error", { message: RED._("deploy.errors.noResponse") }), "error")
-            }
-        }).always(function() {
-            const delta = Math.max(0, 300 - (Date.now() - startTime))
-            setTimeout(function () {
-                deployButtonClearBusy()
-                shadeHide()
-                deployInflight = false
-            }, delta);
-        });
-    }
-    function restart() {
-        var startTime = Date.now();
-        var deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled");
-        deployInflight = true;
-        deployButtonSetBusy();
+
        $.ajax({
            url:"flows",
            type: "POST",
@@ -368,287 +307,217 @@ RED.deploy = (function() {
                RED.notify(RED._("deploy.deployFailed",{message:RED._("deploy.errors.noResponse")}),"error");
            }
        }).always(function() {
+            deployInflight = false;
            var delta = Math.max(0,300-(Date.now()-startTime));
            setTimeout(function() {
-                deployButtonClearBusy();
-                deployInflight = false;
+                $(".red-ui-deploy-button-content").css('opacity',1);
+                $(".red-ui-deploy-button-spinner").hide();
+                $("#red-ui-header-shade").hide();
+                $("#red-ui-editor-shade").hide();
+                $("#red-ui-palette-shade").hide();
+                $("#red-ui-sidebar-shade").hide();
            },delta);
        });
    }
-    function save(skipValidation, force) {
-        if ($("#red-ui-header-button-deploy").hasClass("disabled")) {
-            return; //deploy is disabled
-        }
-        if ($("#red-ui-header-shade").is(":visible")) {
-            return; //deploy is shaded
-        }
-        if (!RED.user.hasPermission("flows.write")) {
-            RED.notify(RED._("user.errors.deploy"), "error");
-            return;
-        }
-        let hasUnusedConfig = false;
-        if (!skipValidation) {
-            let hasUnknown = false;
-            let hasInvalid = false;
-            const unknownNodes = [];
-            const invalidNodes = [];
-
-            RED.nodes.eachConfig(function (node) {
-                if (node.valid === undefined) {
-                    RED.editor.validateNode(node);
-                }
-                if (!node.valid && !node.d) {
-                    invalidNodes.push(getNodeInfo(node));
-                }
-                if (node.type === "unknown") {
-                    if (unknownNodes.indexOf(node.name) == -1) {
-                        unknownNodes.push(node.name);
-                    }
-                }
-            });
-            RED.nodes.eachNode(function (node) {
-                if (!node.valid && !node.d) {
-                    invalidNodes.push(getNodeInfo(node));
-                }
-                if (node.type === "unknown") {
-                    if (unknownNodes.indexOf(node.name) == -1) {
-                        unknownNodes.push(node.name);
-                    }
-                }
-            });
-            hasUnknown = unknownNodes.length > 0;
-            hasInvalid = invalidNodes.length > 0;
-
-            const unusedConfigNodes = [];
-            RED.nodes.eachConfig(function (node) {
-                if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
-                    unusedConfigNodes.push(getNodeInfo(node));
-                    hasUnusedConfig = true;
-                }
-            });
-
-            let showWarning = false;
-            let notificationMessage;
-            let notificationButtons = [];
-            let notification;
-            if (hasUnknown && !ignoreDeployWarnings.unknown) {
-                showWarning = true;
-                notificationMessage = "<p>" + RED._('deploy.confirm.unknown') + "</p>" +
-                    '<ul class="red-ui-deploy-dialog-confirm-list"><li>' + cropList(unknownNodes).map(function (n) { return sanitize(n) }).join("</li><li>") + "</li></ul><p>" +
-                    RED._('deploy.confirm.confirm') +
-                    "</p>";
-
-                notificationButtons = [
-                    {
-                        text: RED._("deploy.unknownNodesButton"),
-                        class: "pull-left",
-                        click: function() {
-                            notification.close();
-                            RED.actions.invoke("core:search","type:unknown ");
-                        }
-                    },
-                    {
-                        id: "red-ui-deploy-dialog-confirm-deploy-deploy",
-                        text: RED._("deploy.confirm.button.confirm"),
-                        class: "primary",
-                        click: function () {
-                            save(true);
-                            notification.close();
-                        }
-                    }
-                ];
-            } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
-                showWarning = true;
-                invalidNodes.sort(sortNodeInfo);
-
-                notificationMessage = "<p>" + RED._('deploy.confirm.improperlyConfigured') + "</p>" +
-                    '<ul class="red-ui-deploy-dialog-confirm-list"><li>' + cropList(invalidNodes.map(function (A) { return sanitize((A.tab ? "[" + A.tab + "] " : "") + A.label + " (" + A.type + ")") })).join("</li><li>") + "</li></ul><p>" +
-                    RED._('deploy.confirm.confirm') +
-                    "</p>";
-                notificationButtons = [
-                    {
-                        text: RED._("deploy.invalidNodesButton"),
-                        class: "pull-left",
-                        click: function() {
-                            notification.close();
-                            RED.actions.invoke("core:search","is:invalid ");
-                        }
-                    },
-                    {
-                        id: "red-ui-deploy-dialog-confirm-deploy-deploy",
-                        text: RED._("deploy.confirm.button.confirm"),
-                        class: "primary",
-                        click: function () {
-                            save(true);
-                            notification.close();
-                        }
-                    }
-                ];
-            }
-            if (showWarning) {
-                notificationButtons.unshift(
-                    {
-                        text: RED._("common.label.cancel"),
-                        click: function () {
-                            notification.close();
-                        }
-                    }
-                );
-                notification = RED.notify(notificationMessage, {
-                    modal: true,
-                    fixed: true,
-                    buttons: notificationButtons
-                });
+    function save(skipValidation,force) {
+        if (!$("#red-ui-header-button-deploy").hasClass("disabled")) {
+            if (!RED.user.hasPermission("flows.write")) {
+                RED.notify(RED._("user.errors.deploy"),"error");
                return;
            }
-        }
+            if (!skipValidation) {
+                var hasUnknown = false;
+                var hasInvalid = false;
+                var hasUnusedConfig = false;

-        const nns = RED.nodes.createCompleteNodeSet();
-        const startTime = Date.now();
+                var unknownNodes = [];
+                var invalidNodes = [];

-        deployButtonSetBusy();
-        const data = { flows: nns };
-        if (!force) {
-            data.rev = RED.nodes.version();
-        }
+                RED.nodes.eachConfig(function(node) {
+                    if (node.valid === undefined) {
+                        RED.editor.validateNode(node);
+                    }
+                    if (!node.valid && !node.d) {
+                        invalidNodes.push(getNodeInfo(node));
+                    }
+                    if (node.type === "unknown") {
+                        if (unknownNodes.indexOf(node.name) == -1) {
+                            unknownNodes.push(node.name);
+                        }
+                    }                    
+                });
+                RED.nodes.eachNode(function(node) {
+                    if (!node.valid && !node.d) {
+                        invalidNodes.push(getNodeInfo(node));
+                    }
+                    if (node.type === "unknown") {
+                        if (unknownNodes.indexOf(node.name) == -1) {
+                            unknownNodes.push(node.name);
+                        }
+                    }
+                });
+                hasUnknown = unknownNodes.length > 0;
+                hasInvalid = invalidNodes.length > 0;

-        deployInflight = true;
-        shadeShow();
-        $.ajax({
-            url: "flows",
-            type: "POST",
-            data: JSON.stringify(data),
-            contentType: "application/json; charset=utf-8",
-            headers: {
-                "Node-RED-Deployment-Type": deploymentType
-            }
-        }).done(function (data, textStatus, xhr) {
-            RED.nodes.dirty(false);
-            RED.nodes.version(data.rev);
-            RED.nodes.originalFlow(nns);
-            if (hasUnusedConfig) {
-                let notification;
-                const opts = {
-                    type: "success",
-                    fixed: false,
-                    timeout: 6000,
-                    buttons: [
+                var unusedConfigNodes = [];
+                RED.nodes.eachConfig(function(node) {
+                    if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
+                        unusedConfigNodes.push(getNodeInfo(node));
+                        hasUnusedConfig = true;
+                    }
+                });
+
+                var showWarning = false;
+                var notificationMessage;
+                var notificationButtons = [];
+                var notification;
+                if (hasUnknown && !ignoreDeployWarnings.unknown) {
+                    showWarning = true;
+                    notificationMessage = "<p>"+RED._('deploy.confirm.unknown')+"</p>"+
+                        '<ul class="red-ui-deploy-dialog-confirm-list"><li>'+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("</li><li>")+"</li></ul><p>"+
+                        RED._('deploy.confirm.confirm')+
+                        "</p>";
+
+                    notificationButtons= [
                        {
-                            text: RED._("deploy.unusedConfigNodesButton"),
-                            class: "pull-left",
-                            click: function() {
-                                notification.close();
-                                RED.actions.invoke("core:search","is:config is:unused ");
-                            }
-                        },
-                        {
-                            text: RED._("common.label.close"),
+                            id: "red-ui-deploy-dialog-confirm-deploy-deploy",
+                            text: RED._("deploy.confirm.button.confirm"),
                            class: "primary",
-                            click: function () {
+                            click: function() {
                                save(true);
                                notification.close();
                            }
                        }
-                    ]
+                    ];
+                } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
+                    showWarning = true;
+                    invalidNodes.sort(sortNodeInfo);
+
+                    notificationMessage = "<p>"+RED._('deploy.confirm.improperlyConfigured')+"</p>"+
+                        '<ul class="red-ui-deploy-dialog-confirm-list"><li>'+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("</li><li>")+"</li></ul><p>"+
+                        RED._('deploy.confirm.confirm')+
+                        "</p>";
+                    notificationButtons= [
+                        {
+                            id: "red-ui-deploy-dialog-confirm-deploy-deploy",
+                            text: RED._("deploy.confirm.button.confirm"),
+                            class: "primary",
+                            click: function() {
+                                save(true);
+                                notification.close();
+                            }
+                        }
+                    ];
                }
-                notification = RED.notify(
-                    '<p>' + RED._("deploy.successfulDeploy") + '</p>' +
-                    '<p>' + RED._("deploy.unusedConfigNodes") + '</p>', opts);
-            } else {
-                RED.notify('<p>' + RED._("deploy.successfulDeploy") + '</p>', "success");
-            }
-            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)
+                if (showWarning) {
+                    notificationButtons.unshift(
+                        {
+                            text: RED._("common.label.cancel"),
+                            click: function() {
+                                notification.close();
+                            }
+                        }
+                    );
+                    notification = RED.notify(notificationMessage,{
+                        modal: true,
+                        fixed: true,
+                        buttons:notificationButtons
+                    });
+                    return;
                }
            }
-            RED.nodes.eachNode(function (node) {
-                ensureUnlocked(node.z)
-                if (node.changed) {
-                    node.dirty = true;
-                    node.changed = false;
+
+            var nns = RED.nodes.createCompleteNodeSet();
+
+            var startTime = Date.now();
+            $(".red-ui-deploy-button-content").css('opacity',0);
+            $(".red-ui-deploy-button-spinner").show();
+            $("#red-ui-header-button-deploy").addClass("disabled");
+
+            var data = {flows:nns};
+
+            if (!force) {
+                data.rev = RED.nodes.version();
+            }
+
+            deployInflight = true;
+            $("#red-ui-header-shade").show();
+            $("#red-ui-editor-shade").show();
+            $("#red-ui-palette-shade").show();
+            $("#red-ui-sidebar-shade").show();
+            $.ajax({
+                url:"flows",
+                type: "POST",
+                data: JSON.stringify(data),
+                contentType: "application/json; charset=utf-8",
+                headers: {
+                    "Node-RED-Deployment-Type":deploymentType
                }
-                if (node.moved) {
-                    node.dirty = true;
-                    node.moved = false;
+            }).done(function(data,textStatus,xhr) {
+                RED.nodes.dirty(false);
+                RED.nodes.version(data.rev);
+                RED.nodes.originalFlow(nns);
+                if (hasUnusedConfig) {
+                    RED.notify(
+                    '<p>'+RED._("deploy.successfulDeploy")+'</p>'+
+                    '<p>'+RED._("deploy.unusedConfigNodes")+' <a href="#" onclick="RED.sidebar.config.show(true); return false;">'+RED._("deploy.unusedConfigNodesLink")+'</a></p>',"success",false,6000);
+                } else {
+                    RED.notify('<p>'+RED._("deploy.successfulDeploy")+'</p>',"success");
                }
-                if (node.credentials) {
-                    delete node.credentials;
-                }
-            });
-            RED.nodes.eachGroup(function (node) {
-                ensureUnlocked(node.z)
-                if (node.changed) {
-                    node.dirty = true;
-                    node.changed = false;
-                }
-                if (node.moved) {
-                    node.dirty = true;
-                    node.moved = false;
-                }
-            })
-            RED.nodes.eachJunction(function (node) {
-                ensureUnlocked(node.z)
-                if (node.changed) {
-                    node.dirty = true;
-                    node.changed = false;
-                }
-                if (node.moved) {
-                    node.dirty = true;
-                    node.moved = false;
-                }
-            })
-            RED.nodes.eachConfig(function (confNode) {
-                if (confNode.z) {
-                    ensureUnlocked(confNode.z)
-                }
-                confNode.changed = false;
-                if (confNode.credentials) {
-                    delete confNode.credentials;
-                }
-            });
-            RED.nodes.eachSubflow(function (subflow) {
-                subflow.changed = false;
-            });
-            RED.nodes.eachWorkspace(function (ws) {
-                if (ws.changed || ws.added) {
-                    ensureUnlocked(ws.z)
+                RED.nodes.eachNode(function(node) {
+                    if (node.changed) {
+                        node.dirty = true;
+                        node.changed = false;
+                    }
+                    if (node.moved) {
+                        node.dirty = true;
+                        node.moved = false;
+                    }
+                    if(node.credentials) {
+                        delete node.credentials;
+                    }
+                });
+                RED.nodes.eachConfig(function (confNode) {
+                    confNode.changed = false;
+                    if (confNode.credentials) {
+                        delete confNode.credentials;
+                    }
+                });
+                RED.nodes.eachSubflow(function(subflow) {
+                    subflow.changed = false;
+                });
+                RED.nodes.eachWorkspace(function(ws) {
                    ws.changed = false;
-                    delete ws.added
-                    RED.events.emit("flows:change", ws)
+                });
+                // Once deployed, cannot undo back to a clean state
+                RED.history.markAllDirty();
+                RED.view.redraw();
+                RED.events.emit("deploy");
+            }).fail(function(xhr,textStatus,err) {
+                RED.nodes.dirty(true);
+                $("#red-ui-header-button-deploy").removeClass("disabled");
+                if (xhr.status === 401) {
+                    RED.notify(RED._("deploy.deployFailed",{message:RED._("user.notAuthorized")}),"error");
+                } else if (xhr.status === 409) {
+                    resolveConflict(nns, true);
+                } else if (xhr.responseText) {
+                    RED.notify(RED._("deploy.deployFailed",{message:xhr.responseText}),"error");
+                } else {
+                    RED.notify(RED._("deploy.deployFailed",{message:RED._("deploy.errors.noResponse")}),"error");
                }
-            });
-            flowsToLock.forEach(flow => {
-                flow.locked = true
-            })
-            // Once deployed, cannot undo back to a clean state
-            RED.history.markAllDirty();
-            RED.view.redraw();
-            RED.events.emit("deploy");
-        }).fail(function (xhr, textStatus, err) {
-            RED.nodes.dirty(true);
-            $("#red-ui-header-button-deploy").removeClass("disabled");
-            if (xhr.status === 401) {
-                RED.notify(RED._("deploy.deployFailed", { message: RED._("user.notAuthorized") }), "error");
-            } else if (xhr.status === 409) {
-                resolveConflict(nns, true);
-            } else if (xhr.responseText) {
-                RED.notify(RED._("deploy.deployFailed", { message: xhr.responseText }), "error");
-            } else {
-                RED.notify(RED._("deploy.deployFailed", { message: RED._("deploy.errors.noResponse") }), "error");
-            }
-        }).always(function () {
-            const delta = Math.max(0, 300 - (Date.now() - startTime));
-            setTimeout(function () {
+            }).always(function() {
                deployInflight = false;
-                deployButtonClearBusy()
-                shadeHide()
-            }, delta);
-        });
+                var delta = Math.max(0,300-(Date.now()-startTime));
+                setTimeout(function() {
+                    $(".red-ui-deploy-button-content").css('opacity',1);
+                    $(".red-ui-deploy-button-spinner").hide();
+                    $("#red-ui-header-shade").hide();
+                    $("#red-ui-editor-shade").hide();
+                    $("#red-ui-palette-shade").hide();
+                    $("#red-ui-sidebar-shade").hide();
+                },delta);
+            });
+        }
    }
    return {
        init: init,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diagnostics.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diagnostics.js
@@ -1,61 +0,0 @@
-
-RED.diagnostics = (function () {
-
-    function init() {
-        if (RED.settings.get('diagnostics.ui', true) === false) {
-            return;
-        }
-        RED.actions.add("core:show-system-info", function () { show(); });
-    }
-
-    function show() {
-        $.ajax({
-            headers: {
-                "Accept": "application/json"
-            },
-            cache: false,
-            url: 'diagnostics',
-            success: function (data) {
-                var json = JSON.stringify(data || {}, "", 4);
-                if (json === "{}") {
-                    json = "{\n\n}";
-                }
-                RED.editor.editJSON({
-                    title: RED._('diagnostics.title'),
-                    value: json,
-                    requireValid: true,
-                    readOnly: true,
-                    toolbarButtons: [
-                        {
-                            text: RED._('clipboard.export.copy'),
-                            icon: 'fa fa-copy',
-                            click: function () {
-                                RED.clipboard.copyText(json, $(this), RED._('clipboard.copyMessageValue'))
-                            }
-                        },
-                        {
-                            text: RED._('clipboard.download'),
-                            icon: 'fa fa-download',
-                            click: function () {
-                                var element = document.createElement('a');
-                                element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(json));
-                                element.setAttribute('download', "system-info.json");
-                                element.style.display = 'none';
-                                document.body.appendChild(element);
-                                element.click();
-                                document.body.removeChild(element);
-                            }
-                        },
-                    ]
-                });
-            },
-            error: function (jqXHR, textStatus, errorThrown) {
-                console.log("Unexpected error loading system info:", jqXHR.status, textStatus, errorThrown);
-            }
-        });
-    }
-
-    return {
-        init: init,
-    };
-})();
--- 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
@@ -45,13 +45,11 @@ RED.editor = (function() {
        var hasChanged;
        if (node.type.indexOf("subflow:")===0) {
            subflow = RED.nodes.subflow(node.type.substring(8));
-            if (subflow){
-                isValid = subflow.valid;
+            isValid = subflow.valid;
+            hasChanged = subflow.changed;
+            if (isValid === undefined) {
+                isValid = validateNode(subflow);
                hasChanged = subflow.changed;
-                if (isValid === undefined) {
-                    isValid = validateNode(subflow);
-                    hasChanged = subflow.changed;
-                }
            }
            validationErrors = validateNodeProperties(node, node._def.defaults, node);
            node.valid = isValid && validationErrors.length === 0;
@@ -112,11 +110,7 @@ RED.editor = (function() {
        var result = [];
        for (var prop in definition) {
            if (definition.hasOwnProperty(prop)) {
-                var valid = validateNodeProperty(node, definition, prop, properties[prop]);
-                if ((typeof valid) === "string") {
-                    result.push(valid);
-                }
-                else if(!valid) {
+                if (!validateNodeProperty(node, definition, prop, properties[prop])) {
                    result.push(prop);
                }
            }
@@ -130,7 +124,7 @@ RED.editor = (function() {
     * @param definition - the node property definitions (either def.defaults or def.creds)
     * @param property - the property name being validated
     * @param value - the property value being validated
-     * @returns {boolean|string} whether the node proprty is valid. `true`: valid `false|String`: invalid
+     * @returns {boolean} whether the node proprty is valid
     */
    function validateNodeProperty(node,definition,property,value) {
        var valid = true;
@@ -142,74 +136,22 @@ RED.editor = (function() {
        if (/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}$/.test(value)) {
            return true;
        }
-        var label = null;
-        if (("label" in definition[property]) &&
-            ((typeof definition[property].label) == "string")) {
-            label = definition[property].label;
-        }
        if ("required" in definition[property] && definition[property].required) {
            valid = value !== "";
-            if (!valid && label) {
-                return RED._("validator.errors.missing-required-prop", {
-                    prop: label
-                });
-            }
        }
        if (valid && "validate" in definition[property]) {
            try {
-                var opt = {};
-                if (label) {
-                    opt.label = label;
-                }
-                valid = definition[property].validate.call(node,value, opt);
-                // If the validator takes two arguments, it is a 3.x validator that
-                // can return a String to mean 'invalid' and provide a reason
-                if ((definition[property].validate.length === 2) &&
-                    ((typeof valid) === "string")) {
-                    return valid;
-                } else {
-                    // Otherwise, a 2.x returns a truth-like/false-like value that
-                    // we should cooerce to a boolean.
-                    valid = !!valid
-                }
+                valid = definition[property].validate.call(node,value);
            } catch(err) {
                console.log("Validation error:",node.type,node.id,"property: "+property,"value:",value,err);
-                return RED._("validator.errors.validation-error", {
-                    prop: property,
-                    node: node.type,
-                    id: node.id,
-                    error: err.message
-                });
            }
        }
        if (valid && definition[property].type && RED.nodes.getType(definition[property].type) && !("validate" in definition[property])) {
            if (!value || value == "_ADD_") {
                valid = definition[property].hasOwnProperty("required") && !definition[property].required;
-                if (!valid && label) {
-                    return RED._("validator.errors.missing-required-prop", {
-                        prop: label
-                    });
-                }
            } else {
                var configNode = RED.nodes.node(value);
-                if (configNode) {
-                    if ((configNode.valid == null) || configNode.valid) {
-                        return true;
-                    }
-                    if (label) {
-                        return RED._("validator.errors.invalid-config", {
-                            prop: label
-                        });
-                    }
-                }
-                else {
-                    if (label) {
-                        return RED._("validator.errors.missing-config", {
-                            prop: label
-                        });
-                    }
-                }
-                return false;
+                valid = (configNode && (configNode.valid == null || configNode.valid));
            }
        }
        return valid;
@@ -237,28 +179,10 @@ RED.editor = (function() {
            if (defaults[property].hasOwnProperty("format") && defaults[property].format !== "" && input[0].nodeName === "DIV") {
                value = input.text();
            }
-            var valid = validateNodeProperty(node, defaults, property,value);
-            if (((typeof valid) === "string") || !valid) {
+            if (!validateNodeProperty(node, defaults, property,value)) {
                input.addClass("input-error");
-                input.next(".red-ui-typedInput-container").addClass("input-error");
-                if ((typeof valid) === "string") {
-                    var tooltip = input.data("tooltip");
-                    if (tooltip) {
-                        tooltip.setContent(valid);
-                    }
-                    else {
-                        tooltip = RED.popover.tooltip(input, valid);
-                        input.data("tooltip", tooltip);
-                    }
-                }
            } else {
                input.removeClass("input-error");
-                input.next(".red-ui-typedInput-container").removeClass("input-error");
-                var tooltip = input.data("tooltip");
-                if (tooltip) {
-                    input.data("tooltip", null);
-                    tooltip.delete();
-                }
            }
        }
    }
@@ -425,11 +349,20 @@ RED.editor = (function() {
     * @param prefix - the prefix to use in the input element ids (node-input|node-config-input)
     */
    function attachPropertyChangeHandler(node,definition,property,prefix) {
-        $("#"+prefix+"-"+property).on("change keyup paste", function(event) {
-            if (!$(this).attr("skipValidation")) {
-                validateNodeEditor(node,prefix);
-            }
-        });
+        var input = $("#"+prefix+"-"+property);
+        if (definition !== undefined && "format" in definition[property] && definition[property].format !== "" && input[0].nodeName === "DIV") {
+            $("#"+prefix+"-"+property).on('change keyup', function(event) {
+                if (!$(this).attr("skipValidation")) {
+                    validateNodeEditor(node,prefix);
+                }
+            });
+        } else {
+            $("#"+prefix+"-"+property).on("change", function(event) {
+                if (!$(this).attr("skipValidation")) {
+                    validateNodeEditor(node,prefix);
+                }
+            });
+        }
    }

    /**
@@ -720,10 +653,7 @@ RED.editor = (function() {
                    if (typeof editing_node[d] === "string" || typeof editing_node[d] === "number") {
                        oldValues[d] = editing_node[d];
                    } else {
-                        // Dont clone the group node `nodes` array
-                        if (editing_node.type !== 'group' || d !== "nodes") {
-                            oldValues[d] = $.extend(true,{},{v:editing_node[d]}).v;
-                        }
+                        oldValues[d] = $.extend(true,{},{v:editing_node[d]}).v;
                    }
                }
            }
@@ -865,9 +795,7 @@ RED.editor = (function() {
    function showEditDialog(node, defaultTab) {
        if (buildingEditDialog) { return }
        buildingEditDialog = true;
-        if (node.z && RED.workspaces.isLocked(node.z)) { return }
        var editing_node = node;
-        var removeInfoEditorOnClose = false;
        var skipInfoRefreshOnClose = false;
        var activeEditPanes = [];

@@ -1051,13 +979,6 @@ RED.editor = (function() {

                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)

-                var helpButton = $('<button type="button" class="red-ui-button"><i class="fa fa-book"></button>').on("click", function(evt) {
-                    evt.preventDefault();
-                    evt.stopPropagation();
-                    RED.sidebar.help.show(editing_node.type);
-                }).appendTo(trayFooterLeft);
-                RED.popover.tooltip(helpButton, RED._("sidebar.help.showHelp"));
-
                $('<input id="node-input-node-disabled" type="checkbox">').prop("checked",!!node.d).appendTo(trayFooterLeft).toggleButton({
                    enabledIcon: "fa-circle-thin",
                    disabledIcon: "fa-ban",
@@ -1070,14 +991,6 @@ RED.editor = (function() {
                }
                if (!node._def.defaults || !node._def.defaults.hasOwnProperty('info'))  {
                    nodeEditPanes.push('editor-tab-description');
-                    removeInfoEditorOnClose = true;
-                    if(node.infoEditor) {
-                        //As 'editor-tab-description' adds `node.infoEditor` store original & set a
-                        //flag to NOT remove this property
-                        node.infoEditor__orig = node.infoEditor;
-                        delete node.infoEditor;
-                        removeInfoEditorOnClose = false;
-                    }
                }
                nodeEditPanes.push("editor-tab-appearance");

@@ -1093,17 +1006,8 @@ RED.editor = (function() {
                if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                    RED.view.state(RED.state.DEFAULT);
                }
-                if (editing_node) {
-                    if (editing_node.infoEditor__orig) {
-                        editing_node.infoEditor = editing_node.infoEditor__orig;
-                        delete editing_node.infoEditor__orig;
-                    }
-                    if (removeInfoEditorOnClose) {
-                        delete editing_node.infoEditor;
-                    }
-                    if (!skipInfoRefreshOnClose) {
-                        RED.sidebar.info.refresh(editing_node);
-                    }
+                if (editing_node && !skipInfoRefreshOnClose) {
+                    RED.sidebar.info.refresh(editing_node);
                }
                RED.workspaces.refresh();

@@ -1120,10 +1024,6 @@ RED.editor = (function() {
                if (editing_node) {
                    RED.sidebar.info.refresh(editing_node);
                    RED.sidebar.help.show(editing_node.type, false);
-                    //ensure focused element is NOT body (for keyboard scope to operate correctly)
-                    if (document.activeElement.tagName === 'BODY') {
-                        $('#red-ui-editor-stack').trigger('focus')
-                    }
                }
            }
        }
@@ -1161,8 +1061,6 @@ RED.editor = (function() {
        var editing_config_node = RED.nodes.node(id);
        var activeEditPanes = [];

-        if (editing_config_node && editing_config_node.z && RED.workspaces.isLocked(editing_config_node.z)) { return }
-
        var configNodeScope = ""; // default to global
        var activeSubflow = RED.nodes.subflow(RED.workspaces.active());
        if (activeSubflow) {
@@ -1205,13 +1103,6 @@ RED.editor = (function() {

                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)

-                var helpButton = $('<button type="button" class="red-ui-button"><i class="fa fa-book"></button>').on("click", function(evt) {
-                    evt.preventDefault();
-                    evt.stopPropagation();
-                    RED.sidebar.help.show(editing_config_node.type);
-                }).appendTo(trayFooterLeft);
-                RED.popover.tooltip(helpButton, RED._("sidebar.help.showHelp"));
-
                $('<input id="node-config-input-node-disabled" type="checkbox">').prop("checked",!!editing_config_node.d).appendTo(trayFooterLeft).toggleButton({
                    enabledIcon: "fa-circle-thin",
                    disabledIcon: "fa-ban",
@@ -1716,7 +1607,6 @@ RED.editor = (function() {
    function showEditGroupDialog(group, defaultTab) {
        if (buildingEditDialog) { return }
        buildingEditDialog = true;
-        if (group.z && RED.workspaces.isLocked(group.z)) { return }
        var editing_node = group;
        editStack.push(group);
        RED.view.state(RED.state.EDITING);
@@ -1876,15 +1766,11 @@ RED.editor = (function() {
                            workspace.disabled = disabled;

                            $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
+                            if (workspace.id === RED.workspaces.active()) {
+                                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
+                            }
                        }

-                        var locked = $("#node-input-locked").prop("checked");
-                        if (workspace.locked !== locked) {
-                            editState.changes.locked = workspace.locked;
-                            editState.changed = true;
-                            workspace.locked = locked;
-                            $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-locked',!!workspace.locked);
-                        }
                        if (editState.changed) {
                            var historyEvent = {
                                t: "edit",
@@ -1925,7 +1811,6 @@ RED.editor = (function() {
                var trayBody = tray.find('.red-ui-tray-body');
                trayBody.parent().css('overflow','hidden');
                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
-                var trayFooterRight = $('<div class="red-ui-tray-footer-right"></div>').appendTo(trayFooter)

                var nodeEditPanes = [
                    'editor-tab-flow-properties',
@@ -1940,18 +1825,6 @@ RED.editor = (function() {
                    disabledIcon: "fa-ban",
                    invertState: true
                })
-
-                if (!workspace.hasOwnProperty("locked")) {
-                    workspace.locked = false;
-                }
-                $('<input id="node-input-locked" type="checkbox">').prop("checked",workspace.locked).appendTo(trayFooterRight).toggleButton({
-                    enabledLabel: RED._("common.label.unlocked"),
-                    enabledIcon: "fa-unlock-alt",
-                    disabledLabel: RED._("common.label.locked"),
-                    disabledIcon: "fa-lock",
-                    invertState: true
-                })
-
                prepareEditDialog(trayBody, nodeEditPanes, workspace, {}, "node-input", defaultTab, function(_activeEditPanes) {
                    activeEditPanes = _activeEditPanes;
                    trayBody.i18n();
@@ -1994,48 +1867,6 @@ RED.editor = (function() {
        }
    }

-    /** Genrate a consistent but unique ID for saving and restoring the code editors view state */
-    function generateViewStateId(source, thing, suffix) {
-        try {
-            thing = thing || {};
-            const thingOptions = typeof thing.options === "object" ? thing.options : {};
-            let stateId;
-            if (thing.hasOwnProperty("stateId")) {
-                stateId = thing.stateId
-            } else if (thingOptions.hasOwnProperty("stateId")) {
-                stateId = thing.stateId
-            }
-            if (stateId === false) { return false; }
-            if (!stateId) {
-                let id;
-                const selection = RED.view.selection();
-                if (source === "node" && thing.id) {
-                    id = thing.id;
-                } else if (selection.nodes && selection.nodes.length) {
-                    id = selection.nodes[0].id;
-                } else {
-                    return false; //cant obtain Id.
-                }
-                //Use a string builder to build an ID
-                const sb = [id];
-                //get the index of the el - there may be more than one editor.
-                const el = $(thing.element || thingOptions.element);
-                if(el.length) {
-                    sb.push(el.closest(".form-row").index());
-                    sb.push(el.index());
-                }
-                if (source == "typedInput") {
-                    sb.push(el.closest("li").index());//for when embeded in editable list
-                    if (!suffix && thing.propertyType) { suffix = thing.propertyType }
-                }
-                stateId = sb.join("/");
-            }
-            if (stateId && suffix) { stateId += "/" + suffix; }
-            return stateId;
-        } catch (error) {
-            return false;
-        }
-    }
    return {
        init: function() {
            if(window.ace) { window.ace.config.set('basePath', 'vendor/ace'); }
@@ -2052,7 +1883,6 @@ RED.editor = (function() {
            });
            RED.editor.codeEditor.init();
        },
-        generateViewStateId: generateViewStateId,
        edit: showEditDialog,
        editConfig: showEditConfigNodeDialog,
        editFlow: showEditFlowDialog,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
@@ -47,7 +47,6 @@
    var definition = {
        show: function(options) {
            var value = options.value;
-            var onCancel = options.cancel;
            var onComplete = options.complete;
            var type = "_buffer"
            if ($("script[data-template-name='"+type+"']").length === 0) {
@@ -61,14 +60,12 @@

            var trayOptions = {
                title: options.title,
-                focusElement: options.focusElement,
                width: "inherit",
                buttons: [
                    {
                        id: "node-dialog-cancel",
                        text: RED._("common.label.cancel"),
                        click: function() {
-                            if (onCancel) { onCancel(); }
                            RED.tray.close();
                        }
                    },
@@ -77,8 +74,7 @@
                        text: RED._("common.label.done"),
                        class: "primary",
                        click: function() {
-                            bufferStringEditor.saveView();
-                            if (onComplete) { onComplete(JSON.stringify(bufferBinValue),null,bufferStringEditor); }
+                            onComplete(JSON.stringify(bufferBinValue));
                            RED.tray.close();
                        }
                    }
@@ -90,20 +86,19 @@
                    }
                },
                open: function(tray) {
+                    var trayBody = tray.find('.red-ui-tray-body');
                    var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
+
                    bufferStringEditor = RED.editor.createEditor({
                        id: 'red-ui-editor-type-buffer-str',
-                        value: value||"",
-                        stateId: RED.editor.generateViewStateId("buffer", options, ""),
-                        focus: true,
+                        value: "",
                        mode:"ace/mode/text"
                    });
+                    bufferStringEditor.getSession().setValue(value||"",-1);

                    bufferBinEditor = RED.editor.createEditor({
                        id: 'red-ui-editor-type-buffer-bin',
                        value: "",
-                        stateId: false,
-                        focus: false,
                        mode:"ace/mode/text",
                        readOnly: true
                    });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editor.js
@@ -21,7 +21,7 @@

    const MONACO = "monaco";
    const ACE = "ace";
-    const defaultEditor = MONACO;
+    const defaultEditor = ACE;
    const DEFAULT_SETTINGS = { lib: defaultEditor, options: {} };
    var selectedCodeEditor = null;
    var initialised = false;
@@ -45,18 +45,15 @@
            selectedCodeEditor = RED.editor.codeEditor[defaultEditor];
            initialised = selectedCodeEditor.init();
        }
-
-        $('<div id="red-ui-image-drop-target"><div data-i18n="[append]workspace.dropImageHere"><i class="fa fa-download"></i><br></div></div>').appendTo('#red-ui-editor');
-        $("#red-ui-image-drop-target").hide();
    }

    function create(options) {
-        //TODO: (quandry - for consideration)
+        //TODO: (quandry - for consideration) 
        // Below, I had to create a hidden element if options.id || options.element is not in the DOM
-        // I have seen 1 node calling  `this.editor = RED.editor.createEditor()` with an
+        // I have seen 1 node calling  `this.editor = RED.editor.createEditor()` with an 
        // invalid (non existing html element selector) (e.g. node-red-contrib-components does this)
-        // This causes monaco to throw an error when attempting to hook up its events to the dom  & the rest of the 'oneditperapre'
-        // code is thus skipped.
+        // This causes monaco to throw an error when attempting to hook up its events to the dom  & the rest of the 'oneditperapre' 
+        // code is thus skipped. 
        // In ACE mode, creating an ACE editor (with an invalid ID) allows the editor to be created (but obviously there is no UI)
        // Because one (or more) contrib nodes have left this bad code in place, how would we handle this?
        // For compatibility, I have decided to create a hidden element so that at least an editor is created & errors do not occur.
@@ -67,7 +64,6 @@
            options = {};
        }

-        var editor = null;
        if (this.editor.type === MONACO) {
            // compatibility (see above note)
            if (!options.element && !options.id) {
@@ -78,16 +74,12 @@
                console.warn("createEditor() options.element or options.id is not valid", options);
                $("#dialog-form").append('<div id="' + options.id + '" style="display: none;" />');
            }
-            editor = this.editor.create(options);
+            return this.editor.create(options);
        } else {
-            editor = this.editor.create(options);//fallback to ACE
+            return this.editor.create(options);//fallback to ACE
        }
-        if (options.mode === "ace/mode/markdown") {
-            RED.editor.customEditTypes['_markdown'].postInit(editor, options);
-        }
-        return editor;
    }
-
+ 
    return {
        init: init,
        /**
@@ -99,7 +91,7 @@
        },
        /**
         * Get user selected code editor
-         * @return {string} Returns
+         * @return {string} Returns 
         * @memberof RED.editor.codeEditor
         */
        get editor() {
@@ -112,4 +104,4 @@
         */
        create: create
    }
-})();
+})();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/ace.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/ace.js
@@ -80,9 +80,6 @@ RED.editor.codeEditor.ace = (function() {
                }
            },100);
        }
-        if (!options.stateId && options.stateId !== false) {
-            options.stateId = RED.editor.generateViewStateId("ace", options, (options.mode || options.title).split("/").pop());
-        }
        if (options.mode === 'ace/mode/markdown') {
            $(el).addClass("red-ui-editor-text-container-toolbar");
            editor.toolbar = RED.editor.customEditTypes['_markdown'].buildToolbar(toolbarRow,editor);
@@ -95,15 +92,11 @@ RED.editor.codeEditor.ace = (function() {
                    RED.editor.editMarkdown({
                        value: value,
                        width: "Infinity",
-                        stateId: options.stateId,
-                        focus: true,
-                        cancel: function () {
-                            editor.focus();
-                        },
+                        cursor: editor.getCursorPosition(),
                        complete: function(v,cursor) {
                            editor.setValue(v, -1);
+                            editor.gotoLine(cursor.row+1,cursor.column,false);
                            setTimeout(function() {
-                                editor.restoreView();
                                editor.focus();
                            },300);
                        }
@@ -124,56 +117,11 @@ RED.editor.codeEditor.ace = (function() {
        editor._destroy = editor.destroy;
        editor.destroy = function() {
            try {
-                editor.saveView();
-                editor._initState = null;
                this._destroy();
            } catch (e) { }
            $(el).remove();
            $(toolbarRow).remove();
        }
-        editor.on("blur", function () {
-            editor.focusMemory = false;
-            editor.saveView();
-        })
-        editor.on("focus", function () {
-            if (editor._initState) {
-                editor.restoreView(editor._initState);
-                editor._initState = null;
-            }
-        })
-        editor.getView = function () {
-            var session = editor.getSession();
-            return {
-                selection: session.selection.toJSON(),
-                scrollTop: session.getScrollTop(),
-                scrollLeft: session.getScrollLeft(),
-                options: session.getOptions()
-            }
-        }
-        editor.saveView = function () {
-            if (!options.stateId) { return; } //only possible if created with a unique stateId
-            window._editorStateAce = window._editorStateAce || {};
-            var state = editor.getView();
-            window._editorStateAce[options.stateId] = state;
-            return state;
-        }
-        editor.restoreView = function (state) {
-            if (!options.stateId) { return; } //only possible if created with a unique stateId
-            window._editorStateAce = window._editorStateAce || {};
-            var _state = state || window._editorStateAce[options.stateId];
-            if (!_state) { return; } //no view state available
-            try {
-                var session = editor.getSession();
-                session.setOptions(_state.options);
-                session.selection.fromJSON(_state.selection);
-                session.setScrollTop(_state.scrollTop);
-                session.setScrollLeft(_state.scrollLeft);
-                editor._initState = _state;
-            } catch (error) {
-                delete window._editorStateMonaco[options.stateId];
-            }
-        };
-        editor.restoreView();
        editor.type = type;
        return editor;
    }
--- 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
@@ -59,21 +59,18 @@ RED.editor.codeEditor.monaco = (function() {
    //TODO: get from externalModules.js  For now this is enough for feature parity with ACE (and then some).
    const knownModules = {
        "assert": {package: "node", module: "assert", path: "node/assert.d.ts" },
-        "assert/strict": {package: "node", module: "assert/strict", path: "node/assert/strict.d.ts" },
        "async_hooks": {package: "node", module: "async_hooks", path: "node/async_hooks.d.ts" },
        "buffer": {package: "node", module: "buffer", path: "node/buffer.d.ts" },
        "child_process": {package: "node", module: "child_process", path: "node/child_process.d.ts" },
        "cluster": {package: "node", module: "cluster", path: "node/cluster.d.ts" },
        "console": {package: "node", module: "console", path: "node/console.d.ts" },
+        "constants": {package: "node", module: "constants", path: "node/constants.d.ts" },
        "crypto": {package: "node", module: "crypto", path: "node/crypto.d.ts" },
        "dgram": {package: "node", module: "dgram", path: "node/dgram.d.ts" },
-        "diagnostics_channel.d": {package: "node", module: "diagnostics_channel", path: "node/diagnostics_channel.d.ts" },
        "dns": {package: "node", module: "dns", path: "node/dns.d.ts" },
-        "dns/promises": {package: "node", module: "dns/promises", path: "node/dns/promises.d.ts" },
        "domain": {package: "node", module: "domain", path: "node/domain.d.ts" },
        "events": {package: "node", module: "events", path: "node/events.d.ts" },
        "fs": {package: "node", module: "fs", path: "node/fs.d.ts" },
-        "fs/promises": {package: "node", module: "fs/promises", path: "node/fs/promises.d.ts" },
        "globals": {package: "node", module: "globals", path: "node/globals.d.ts" },
        "http": {package: "node", module: "http", path: "node/http.d.ts" },
        "http2": {package: "node", module: "http2", path: "node/http2.d.ts" },
@@ -87,13 +84,8 @@ RED.editor.codeEditor.monaco = (function() {
        "querystring": {package: "node", module: "querystring", path: "node/querystring.d.ts" },
        "readline": {package: "node", module: "readline", path: "node/readline.d.ts" },
        "stream": {package: "node", module: "stream", path: "node/stream.d.ts" },
-        "stream/consumers": {package: "node", module: "stream/consumers", path: "node/stream/consumers.d.ts" },
-        "stream/promises": {package: "node", module: "stream/promises", path: "node/stream/promises.d.ts" },
-        "stream/web": {package: "node", module: "stream/web", path: "node/stream/web.d.ts" },
        "string_decoder": {package: "node", module: "string_decoder", path: "node/string_decoder.d.ts" },
-        "test": {package: "node", module: "test", path: "node/test.d.ts" },
        "timers": {package: "node", module: "timers", path: "node/timers.d.ts" },
-        "timers/promises": {package: "node", module: "timers/promises", path: "node/timers/promises.d.ts" },
        "tls": {package: "node", module: "tls", path: "node/tls.d.ts" },
        "trace_events": {package: "node", module: "trace_events", path: "node/trace_events.d.ts" },
        "tty": {package: "node", module: "tty", path: "node/tty.d.ts" },
@@ -108,7 +100,7 @@ RED.editor.codeEditor.monaco = (function() {
        "node-red-util": {package: "node-red", module: "util", path: "node-red/util.d.ts" },
        "node-red-func": {package: "node-red", module: "func", path: "node-red/func.d.ts" },
    }
-    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"], knownModules["timers"] , knownModules["util"] ];
+    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] ];

    const modulesCache = {};

@@ -179,7 +171,7 @@ RED.editor.codeEditor.monaco = (function() {

        options = options || {};
        window.MonacoEnvironment = window.MonacoEnvironment || {};
-        window.MonacoEnvironment.getWorkerUrl = window.MonacoEnvironment.getWorkerUrl || function (moduleId, label) {
+        window.MonacoEnvironment.getWorkerUrl = function (moduleId, label) {
            if (label === 'json') { return './vendor/monaco/dist/json.worker.js'; }
            if (label === 'css' || label === 'scss') { return './vendor/monaco/dist/css.worker.js'; }
            if (label === 'html' || label === 'handlebars') { return './vendor/monaco/dist/html.worker.js'; }
@@ -755,25 +747,13 @@ RED.editor.codeEditor.monaco = (function() {
                    mode = "html";
                    break;
                case "appcache":
-                case "sh":
-                case "bash":
                    mode = "shell";
                    break;
-                case "batchfile":
-                    mode = "bat";
-                    break;
-                case "protobuf":
-                    mode = "proto";
-                    break;
                //TODO: add other compatability types.
            }
            return mode;
        }

-        
-        if(!options.stateId && options.stateId !== false) {
-            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title || "").split("/").pop());
-        }
        var el = options.element || $("#"+options.id)[0];
        var toolbarRow = $("<div>").appendTo(el);
        el = $("<div>").appendTo(el).addClass("red-ui-editor-text-container")[0];
@@ -1118,7 +1098,6 @@ RED.editor.codeEditor.monaco = (function() {
            try {
                var m = this.getModel();
                if(m && !m.isDisposed()) {
-                    ed._initState = null;
                    m.dispose();
                }
                this.setModel(null);
@@ -1168,19 +1147,19 @@ RED.editor.codeEditor.monaco = (function() {
        // Warning: 4
        // Error: 8
        ed.getAnnotations = function getAnnotations() {
-            let aceCompatibleMarkers;
+            var aceCompatibleMarkers = [];
            try {
-                const _model = ed.getModel();
+                var _model = ed.getModel();
                if (_model !== null) {
-                    const id = _model.getLanguageId(); // e.g.  javascript
-                    const ra = _model.uri.authority; //   e.g.  model
-                    const rp = _model.uri.path; //        e.g.  /18
-                    const rs = _model.uri.scheme; //      e.g.  inmemory
-                    const modelMarkers = monaco.editor.getModelMarkers(_model) || [];
-                    const thisEditorsMarkers = modelMarkers.filter(function (marker) {
-                        const _ra = marker.resource.authority; // e.g.  model
-                        const _rp = marker.resource.path; //      e.g.  /18
-                        const _rs = marker.resource.scheme; //    e.g.  inmemory
+                    var id = _model.getModeId(); // e.g. javascript
+                    var ra = _model._associatedResource.authority;  //e.g.  model
+                    var rp = _model._associatedResource.path;   //e.g.      /18
+                    var rs = _model._associatedResource.scheme; //e.g.      inmemory
+                    var modelMarkers = monaco.editor.getModelMarkers(_model) || [];
+                    var thisEditorsMarkers = modelMarkers.filter(function (marker) {
+                        var _ra = marker.resource.authority;  //e.g.  model
+                        var _rp = marker.resource.path;   //e.g.      /18
+                        var _rs = marker.resource.scheme; //e.g.      inmemory
                        return marker.owner == id && _ra === ra && _rp === rp && _rs === rs;
                    })
                    aceCompatibleMarkers = thisEditorsMarkers.map(function (marker) {
@@ -1264,7 +1243,14 @@ RED.editor.codeEditor.monaco = (function() {
        //#endregion "ACE compatability"

        //final setup
-        ed.focusMemory = options.focus;
+        if (options.cursor) {
+            var row = options.cursor.row || options.cursor.lineNumber;
+            var col = options.cursor.column || options.cursor.col;
+            ed.gotoLine(row, col);
+        }
+        if (options.focus) {
+            ed.focus();
+        }
        ed._mode = editorOptions.language;

        //as models are signleton, consts and let are avialable to other javascript instances
@@ -1276,12 +1262,11 @@ RED.editor.codeEditor.monaco = (function() {
        }

        ed.onDidBlurEditorWidget(function() {
-            ed.focusMemory = false;
-            ed.saveView();
            if(isVisible(el) == false) {
                onVisibilityChange(false, 0, el);
            }
        });
+
        ed.onDidFocusEditorWidget(function() {
            onVisibilityChange(true, 10, el);
        });
@@ -1315,33 +1300,17 @@ RED.editor.codeEditor.monaco = (function() {
        }

        function onVisibilityChange(visible, delay, element) {
-            delay = delay || 50;
-            if (visible) {
-                if (ed.focusMemory) {
-                    setTimeout(function () {
-                        if (element.parentElement) { //ensure el is still in DOM
-                            ed.focus();
-                        }
-                    }, 300)
-                }
-                if (ed._initState) {
-                    setTimeout(function () {
-                        if (element.parentElement) { //ensure el is still in DOM
-                            ed.restoreViewState(ed._initState);
-                            ed._initState = null;
-                        }
-                    }, delay);
-                }
-                if (ed._mode == "javascript" && ed._tempMode == "text") {
+            if(visible) {
+                if(ed._mode == "javascript" && ed._tempMode == "text") {
                    ed._tempMode = "";
-                    setTimeout(function () {
-                        if (element.parentElement) { //ensure el is still in DOM
+                    setTimeout(function() {
+                        if(element.parentElement) { //ensure el is still in DOM
                            ed.setMode('javascript', undefined, false);
                        }
-                    }, delay);
+                    }, delay || 50);
                }
-            } else if (ed._mode == "javascript" && ed._tempMode != "text") {
-                if (element.parentElement) { //ensure el is still in DOM
+            } else if(ed._mode == "javascript" && ed._tempMode != "text") {
+                if(element.parentElement) { //ensure el is still in DOM
                    ed.setMode('text', undefined, false);
                    ed._tempMode = "text";
                }
@@ -1360,19 +1329,15 @@ RED.editor.codeEditor.monaco = (function() {
                expandButton.on("click", function (e) {
                    e.preventDefault();
                    var value = ed.getValue();
-                    ed.saveView();
                    RED.editor.editMarkdown({
                        value: value,
                        width: "Infinity",
-                        stateId: options.stateId,
-                        cancel: function () {
-                            ed.focus();
-                        },
+                        cursor: ed.getCursorPosition(),
                        complete: function (v, cursor) {
                            ed.setValue(v, -1);
+                            ed.gotoLine(cursor.row + 1, cursor.column, false);
                            setTimeout(function () {
                                ed.focus();
-                                ed.restoreView();
                            }, 300);
                        }
                    })
@@ -1388,37 +1353,7 @@ RED.editor.codeEditor.monaco = (function() {
                autoClose: 50
            });
        }
-        ed.getView = function () {
-            return ed.saveViewState();
-        }
-        ed.saveView = function (debuginfo) {
-            if (!options.stateId) { return; } //only possible if created with a unique stateId
-            window._editorStateMonaco = window._editorStateMonaco || {};
-            var state = ed.getView();
-            window._editorStateMonaco[options.stateId] = state;
-            return state;
-        }
-        ed.restoreView = function (state) {
-            if (!options.stateId) { return; } //only possible if created with a unique stateId
-            window._editorStateMonaco = window._editorStateMonaco || {};
-            var _state = state || window._editorStateMonaco[options.stateId];
-            if (!_state) { return; } //no view state available
-            try {
-                if (ed.type) { //is editor already initialised?
-                    ed.restoreViewState(_state);
-                } else {
-                    ed._initState = _state;
-                }
-            } catch (error) {
-                delete window._editorStateMonaco[options.stateId];
-            }
-        };
-        ed.restoreView();
-        if (options.cursor && !ed._initState) {
-            var row = options.cursor.row || options.cursor.lineNumber;
-            var col = options.cursor.column || options.cursor.col;
-            ed.gotoLine(row, col);
-        }
+
        ed.type = type;
        return ed;
    }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js
@@ -76,9 +76,6 @@ RED.editor.colorPicker = RED.colorPicker = (function() {
            var focusTarget = colorInput;
            colorInput.on("change", function (e) {
                var color = colorInput.val();
-                if (options.defaultValue && !color.match(/^([a-z]+|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})$/)) {
-                    color = options.defaultValue;
-                }
                colorHiddenInput.val(color).trigger('change');
                refreshDisplay(color);
            });
--- 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
@@ -2,7 +2,7 @@ RED.editor.envVarList = (function() {

    var currentLocale = 'en-US';
    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'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];

    /**
     * Create env var edit interface
@@ -41,12 +41,8 @@ RED.editor.envVarList = (function() {
                        style: "width:100%",
                        class: "node-input-env-value",
                        type: "text",
-                    }).attr("autocomplete","disable").appendTo(envRow);
-                    var types = (opt.ui && opt.ui.opts && opt.ui.opts.types);
-                    if (!types) {
-                        types = isTemplateNode ? DEFAULT_ENV_TYPE_LIST : DEFAULT_ENV_TYPE_LIST_INC_CRED;
-                    }
-                    valueField.typedInput({default:'str',types:types});
+                    }).attr("autocomplete","disable").appendTo(envRow)
+                    valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED});
                    valueField.typedInput('type', opt.type);
                    if (opt.type === "cred") {
                        if (opt.value) {
@@ -98,11 +94,6 @@ RED.editor.envVarList = (function() {
                        }
                        opt.ui.label = opt.ui.label || {};
                        opt.ui.type = opt.ui.type || "input";
-                        if ((opt.ui.type === "cred") &&
-                            opt.ui.opts &&
-                            opt.ui.opts.types) {
-                            opt.ui.type = "input";
-                        }

                        var uiRow = $('<div/>').appendTo(container).hide();
                        // save current info for reverting on cancel
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -50,7 +50,6 @@
        show: function(options) {
            var expressionTestCacheId = options.parent||"_";
            var value = options.value;
-            var onCancel = options.cancel;
            var onComplete = options.complete;
            var type = "_expression"
            if ($("script[data-template-name='"+type+"']").length === 0) {
@@ -64,14 +63,12 @@

            var trayOptions = {
                title: options.title,
-                focusElement: options.focusElement,
                width: "inherit",
                buttons: [
                    {
                        id: "node-dialog-cancel",
                        text: RED._("common.label.cancel"),
                        click: function() {
-                            if(onCancel) { onCancel(); }
                            RED.tray.close();
                        }
                    },
@@ -81,8 +78,7 @@
                        class: "primary",
                        click: function() {
                            $("#red-ui-editor-type-expression-help").text("");
-                            expressionEditor.saveView();
-                            if (onComplete) { onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition(),expressionEditor); }
+                            onComplete(expressionEditor.getValue());
                            RED.tray.close();
                        }
                    }
@@ -114,8 +110,6 @@
                        id: 'red-ui-editor-type-expression',
                        value: "",
                        mode:"ace/mode/jsonata",
-                        stateId: options.stateId,
-                        focus: true,
                        options: {
                            enableBasicAutocompletion:true,
                            enableSnippets:true,
@@ -239,8 +233,6 @@
                    testDataEditor = RED.editor.createEditor({
                        id: 'red-ui-editor-type-expression-test-data',
                        value: expressionTestCache[expressionTestCacheId] || '{\n    "payload": "hello world"\n}',
-                        stateId: false,
-                        focus: false,
                        mode:"ace/mode/json",
                        lineNumbers: false
                    });
@@ -255,9 +247,6 @@
                        var currentExpression = expressionEditor.getValue();
                        var expr;
                        var usesContext = false;
-                        var usesEnv = false;
-                        var usesMoment = false;
-                        var usesClone = false;
                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                        $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                        try {
@@ -270,18 +259,6 @@
                                usesContext = true;
                                return null;
                            });
-                            expr.assign("env", function(name) {
-                                usesEnv = true;
-                                return null;
-                            });
-                            expr.assign("moment", function(name) {
-                                usesMoment = true;
-                                return null;
-                            });
-                            expr.assign("clone", function(name) {
-                                usesClone = true;
-                                return null;
-                            });
                        } catch(err) {
                            testResultEditor.setValue(RED._("expressionEditor.errors.invalid-expr",{message:err.message}),-1);
                            return;
@@ -294,37 +271,20 @@
                        }

                        try {
-                            expr.evaluate(legacyMode?{msg:parsedData}:parsedData, null, (err, result) => {
-                                if (err) {
-                                    testResultEditor.setValue(RED._("expressionEditor.errors.eval",{message:err.message}),-1);
-                                } else {
-                                    if (usesContext) {
-                                        testResultEditor.setValue(RED._("expressionEditor.errors.context-unsupported"),-1);
-                                        return;
-                                    }
-                                    if (usesEnv) {
-                                        testResultEditor.setValue(RED._("expressionEditor.errors.env-unsupported"),-1);
-                                        return;
-                                    }
-                                    if (usesMoment) {
-                                        testResultEditor.setValue(RED._("expressionEditor.errors.moment-unsupported"),-1);
-                                        return;
-                                    }
-                                    if (usesClone) {
-                                        testResultEditor.setValue(RED._("expressionEditor.errors.clone-unsupported"),-1);
-                                        return;
-                                    }
-        
-                                    var formattedResult;
-                                    if (result !== undefined) {
-                                        formattedResult = JSON.stringify(result,null,4);
-                                    } else {
-                                        formattedResult = RED._("expressionEditor.noMatch");
-                                    }
-                                    testResultEditor.setValue(formattedResult,-1);
-                                }
-                            });
-                        } catch(err) {                            
+                            var result = expr.evaluate(legacyMode?{msg:parsedData}:parsedData);
+                            if (usesContext) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.context-unsupported"),-1);
+                                return;
+                            }
+
+                            var formattedResult;
+                            if (result !== undefined) {
+                                formattedResult = JSON.stringify(result,null,4);
+                            } else {
+                                formattedResult = RED._("expressionEditor.noMatch");
+                            }
+                            testResultEditor.setValue(formattedResult,-1);
+                        } catch(err) {
                            testResultEditor.setValue(RED._("expressionEditor.errors.eval",{message:err.message}),-1);
                        }
                    }
@@ -342,8 +302,6 @@
                    testResultEditor = RED.editor.createEditor({
                        id: 'red-ui-editor-type-expression-test-result',
                        value: "",
-                        stateId: false,
-                        focus: false,
                        mode:"ace/mode/json",
                        lineNumbers: false,
                        readOnly: true
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
@@ -21,7 +21,6 @@
    var definition = {
        show: function(options) {
            var value = options.value;
-            var onCancel = options.cancel;
            var onComplete = options.complete;
            var type = "_js"
            if ($("script[data-template-name='"+type+"']").length === 0) {
@@ -29,16 +28,16 @@
            }
            RED.view.state(RED.state.EDITING);
            var expressionEditor;
+            var changeTimer;
+
            var trayOptions = {
                title: options.title,
-                focusElement: options.focusElement,
                width: options.width||"inherit",
                buttons: [
                    {
                        id: "node-dialog-cancel",
                        text: RED._("common.label.cancel"),
                        click: function() {
-                            if (onCancel) { onCancel(); }
                            RED.tray.close();
                        }
                    },
@@ -47,8 +46,7 @@
                        text: RED._("common.label.done"),
                        class: "primary",
                        click: function() {
-                            expressionEditor.saveView();
-                            if (onComplete) { onComplete(expressionEditor.getValue(), expressionEditor.getCursorPosition(), expressionEditor); }
+                            onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition());
                            RED.tray.close();
                        }
                    }
@@ -64,12 +62,11 @@
                    expressionEditor.resize();
                },
                open: function(tray) {
+                    var trayBody = tray.find('.red-ui-tray-body');
                    var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
                    expressionEditor = RED.editor.createEditor({
                        id: 'node-input-js',
                        mode: options.mode || 'ace/mode/javascript',
-                        stateId: options.stateId,
-                        focus: true,
                        value: value,
                        globals: {
                            msg:true,
@@ -87,16 +84,19 @@
                        },
                        extraLibs: options.extraLibs
                    });
-                    if (options.cursor && !expressionEditor._initState) {
+                    if (options.cursor) {
                        expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
                    }
                    dialogForm.i18n();
+                    setTimeout(function() {
+                        expressionEditor.focus();
+                    },300);
                },
                close: function() {
+                    expressionEditor.destroy();
                    if (options.onclose) {
                        options.onclose();
                    }
-                    expressionEditor.destroy();
                },
                show: function() {}
            }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -21,9 +21,7 @@
        '<ul id="red-ui-editor-type-json-tabs"></ul>'+
        '<div id="red-ui-editor-type-json-tab-raw" class="red-ui-editor-type-json-tab-content hide">'+
            '<div class="form-row" style="margin-bottom: 3px; text-align: right;">'+
-                '<span class="button-group">'+
-                    '<button id="node-input-json-reformat" class="red-ui-button red-ui-button-small"><span data-i18n="jsonEditor.format"></span></button>'+
-                '<span class="button-group">'+
+                '<button id="node-input-json-reformat" class="red-ui-button red-ui-button-small"><span data-i18n="jsonEditor.format"></span></button>'+
            '</div>'+
            '<div class="form-row node-text-editor-row">'+
                '<div style="height: 200px;min-height: 150px;" class="node-text-editor" id="node-input-json"></div>'+
@@ -36,7 +34,7 @@

    var activeTab;

-    function insertNewItem(parent,index,copyIndex,readOnly) {
+    function insertNewItem(parent,index,copyIndex) {
        var newValue = "";

        if (parent.children.length > 0) {
@@ -62,26 +60,26 @@
                newKey = keyRoot+"-"+(keySuffix++);
            }
        }
-        var newItem = handleItem(newKey,newValue,parent.depth+1,parent,readOnly);
+        var newItem = handleItem(newKey,newValue,parent.depth+1,parent);
        parent.treeList.insertChildAt(newItem, index, true);
        parent.treeList.expand();
    }
-    function showObjectMenu(button,item,readOnly) {
+    function showObjectMenu(button,item) {
        var elementPos = button.offset();
        var options = [];
        if (item.parent) {
            options.push({id:"red-ui-editor-type-json-menu-insert-above", icon:"fa fa-toggle-up", label:RED._('jsonEditor.insertAbove'),onselect:function(){
                var index = item.parent.children.indexOf(item);
-                insertNewItem(item.parent,index,index,readOnly);
+                insertNewItem(item.parent,index,index);
            }});
            options.push({id:"red-ui-editor-type-json-menu-insert-below", icon:"fa fa-toggle-down", label:RED._('jsonEditor.insertBelow'),onselect:function(){
                var index = item.parent.children.indexOf(item)+1;
-                insertNewItem(item.parent,index,index-1,readOnly);
+                insertNewItem(item.parent,index,index-1);
            }});
        }
        if (item.type === 'array' || item.type === 'object') {
            options.push({id:"red-ui-editor-type-json-menu-add-child", icon:"fa fa-plus", label:RED._('jsonEditor.addItem'),onselect:function(){
-                insertNewItem(item,item.children.length,item.children.length-1,readOnly);
+                insertNewItem(item,item.children.length,item.children.length-1);
            }});
        }
        if (item.parent) {
@@ -123,7 +121,7 @@
                        newKey = keyRoot+"-"+(keySuffix++);
                    }
                }
-                var newItem = handleItem(newKey,convertToObject(item),item.parent.depth+1,item.parent,readOnly);
+                var newItem = handleItem(newKey,convertToObject(item),item.parent.depth+1,item.parent);
                var index = item.parent.children.indexOf(item)+1;

                item.parent.treeList.insertChildAt(newItem, index, true);
@@ -173,24 +171,24 @@
        menuOptionMenu.show();
    }

-    function parseObject(obj,depth,parent,readOnly) {
+    function parseObject(obj,depth,parent) {
        var result = [];
        for (var prop in obj) {
            if (obj.hasOwnProperty(prop)) {
-                result.push(handleItem(prop,obj[prop],depth,parent,readOnly));
+                result.push(handleItem(prop,obj[prop],depth,parent));
            }
        }
        return result;
    }
-    function parseArray(obj,depth,parent,readOnly) {
+    function parseArray(obj,depth,parent) {
        var result = [];
        var l = obj.length;
        for (var i=0;i<l;i++) {
-            result.push(handleItem(i,obj[i],depth,parent,readOnly));
+            result.push(handleItem(i,obj[i],depth,parent));
        }
        return result;
    }
-    function handleItem(key,val,depth,parent,readOnly) {
+    function handleItem(key,val,depth,parent) {
        var item = {depth:depth, type: typeof val};
        var container = $('<span class="red-ui-editor-type-json-editor-label">');
        if (key != null) {
@@ -206,14 +204,11 @@
            if (parent && parent.type === "array") {
                keyLabel.addClass("red-ui-editor-type-json-editor-label-array-key")
            }
-            if(readOnly) {
-                keyLabel.addClass("readonly")
-            }
+
            keyLabel.on("click", function(evt) {
                if (item.parent.type === 'array') {
                    return;
                }
-                if (readOnly) { return; }
                evt.preventDefault();
                evt.stopPropagation();
                var w = Math.max(150,keyLabel.width());
@@ -258,10 +253,10 @@
            item.expanded = depth < 2;
            item.type = "array";
            item.deferBuild = depth >= 2;
-            item.children = parseArray(val,depth+1,item,readOnly);
+            item.children = parseArray(val,depth+1,item);
        } else if (val !== null && item.type === "object") {
            item.expanded = depth < 2;
-            item.children = parseObject(val,depth+1,item,readOnly);
+            item.children = parseObject(val,depth+1,item);
            item.deferBuild = depth >= 2;
        } else {
            item.value = val;
@@ -292,11 +287,7 @@
        //
        var orphanedChildren;
        var valueLabel = $('<span class="red-ui-editor-type-json-editor-label-value">').addClass(valClass).text(valValue).appendTo(container);
-        if (readOnly) {
-            valueLabel.addClass("readonly")
-        }
        valueLabel.on("click", function(evt) {
-            if (readOnly) { return; }
            evt.preventDefault();
            evt.stopPropagation();
            if (valType === 'str') {
@@ -311,8 +302,8 @@
                types:[
                    'str','num','bool',
                    {value:"null",label:RED._("common.type.null"),hasValue:false},
-                    {value:"array",label:RED._("common.type.array"),hasValue:false,icon:"red/images/typedInput/json.svg"},
-                    {value:"object",label:RED._("common.type.object"),hasValue:false,icon:"red/images/typedInput/json.svg"}
+                    {value:"array",label:RED._("common.type.array"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                    {value:"object",label:RED._("common.type.object"),hasValue:false,icon:"red/images/typedInput/json.png"}
                ],
                default: valType
            });
@@ -404,19 +395,17 @@
            valueLabel.hide();
        })
        item.gutter = $('<span class="red-ui-editor-type-json-editor-item-gutter"></span>');
-        if(!readOnly) {
-            if (parent) {
-                $('<span class="red-ui-editor-type-json-editor-item-handle"><i class="fa fa-bars"></span>').appendTo(item.gutter);
-            } else {
-                $('<span></span>').appendTo(item.gutter);
-            }
-            $('<button type="button" class="editor-button editor-button-small"><i class="fa fa-caret-down"></button>').appendTo(item.gutter).on("click", function(evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                showObjectMenu($(this), item, readOnly);
-            });
-        }

+        if (parent) {//red-ui-editor-type-json-editor-item-handle
+            $('<span class="red-ui-editor-type-json-editor-item-handle"><i class="fa fa-bars"></span>').appendTo(item.gutter);
+        } else {
+            $('<span></span>').appendTo(item.gutter);
+        }
+        $('<button type="button" class="editor-button editor-button-small"><i class="fa fa-caret-down"></button>').appendTo(item.gutter).on("click", function(evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            showObjectMenu($(this), item);
+        });
        item.element = container;
        return item;
    }
@@ -445,7 +434,6 @@
    var definition = {
        show: function(options) {
            var value = options.value;
-            var onCancel = options.cancel;
            var onComplete = options.complete;
            var type = "_json"
            if ($("script[data-template-name='"+type+"']").length === 0) {
@@ -467,16 +455,15 @@
                }
            }
            var rootNode;
+
            var trayOptions = {
                title: options.title,
-                focusElement: options.focusElement,
                width: options.width||700,
                buttons: [
                    {
                        id: "node-dialog-cancel",
                        text: RED._("common.label.cancel"),
                        click: function() {
-                            if (onCancel) { onCancel(); }
                            RED.tray.close();
                        }
                    },
@@ -498,8 +485,7 @@
                            } else if (activeTab === "json-raw") {
                                result = expressionEditor.getValue();
                            }
-                            expressionEditor.saveView();
-                            if (onComplete) { onComplete(result,null,expressionEditor) }
+                            if (onComplete) { onComplete(result) }
                            RED.tray.close();
                        }
                    }
@@ -512,29 +498,10 @@
                open: function(tray) {
                    var trayBody = tray.find('.red-ui-tray-body');
                    var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
-                    var toolbarButtons = options.toolbarButtons || [];
-                    if (toolbarButtons.length) {
-                        toolbarButtons.forEach(function (button) {
-                            var element = $('<button type="button" class="red-ui-button red-ui-button-small"> </button>')
-                                .insertBefore("#node-input-json-reformat")
-                                .on("click", function (evt) {
-                                    evt.preventDefault();
-                                    if (button.click !== undefined) {
-                                        button.click.call(element, evt);
-                                    }
-                                });
-                            if (button.id) { element.attr("id", button.id); }
-                            if (button.title) { element.attr("title", button.title); }
-                            if (button.icon) { element.append($("<i></i>").attr("class", button.icon)); }
-                            if (button.label || button.text) {
-                                element.append($("<span></span>").text(" " + (button.label || button.text)));
-                            }
-                        });
-                    }
+
                    var container = $("#red-ui-editor-type-json-tab-ui-container").css({"height":"100%"});
                    var filterDepth = Infinity;
                    var list = $('<div class="red-ui-debug-msg-payload red-ui-editor-type-json-editor">').appendTo(container).treeList({
-                        selectable: false,
                        rootSortable: false,
                        sortable: ".red-ui-editor-type-json-editor-item-handle",
                    }).on("treelistchangeparent", function(event, evt) {
@@ -561,15 +528,13 @@
                        })
                    });

+
                    expressionEditor = RED.editor.createEditor({
                        id: 'node-input-json',
-                        value: value||"",
-                        mode:"ace/mode/json",
-                        readOnly: !!options.readOnly,
-                        stateId: options.stateId,
-                        focus: true
+                        value: "",
+                        mode:"ace/mode/json"
                    });
-
+                    expressionEditor.getSession().setValue(value||"",-1);
                    if (options.requireValid) {
                        expressionEditor.getSession().on('change', function() {
                            clearTimeout(changeTimer);
@@ -606,7 +571,7 @@
                                    var raw = expressionEditor.getValue().trim() ||"{}";
                                    try {
                                        var parsed = JSON.parse(raw);
-                                        rootNode = handleItem(null,parsed,0,null,options.readOnly);
+                                        rootNode = handleItem(null,parsed,0,null);
                                        rootNode.class = "red-ui-editor-type-json-root-node"
                                        list.treeList('data',[rootNode]);
                                    } catch(err) {
@@ -624,15 +589,17 @@

                    tabs.addTab({
                        id: 'json-raw',
-                        label: options.readOnly ? RED._('jsonEditor.rawMode-readonly') : RED._('jsonEditor.rawMode'),
+                        label: RED._('jsonEditor.rawMode'),
                        content: $("#red-ui-editor-type-json-tab-raw")
                    });
                    tabs.addTab({
                        id: 'json-ui',
-                        label: options.readOnly ? RED._('jsonEditor.uiMode-readonly') : RED._('jsonEditor.uiMode'),
+                        label: RED._('jsonEditor.uiMode'),
                        content: $("#red-ui-editor-type-json-tab-ui")
                    });
                    finishedBuild = true;
+
+
                },
                close: function() {
                    if (options.onclose) {
--- 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
@@ -14,61 +14,6 @@
 * limitations under the License.
 **/
 (function() {
-    /**
-     * Converts dropped image file to date URL
-     */
-    function file2base64Image(file, cb) {
-        var reader = new FileReader();
-        reader.onload = (function (fd) {
-            return function (e) {
-                cb(e.target.result);
-            };
-        })(file);
-        reader.readAsDataURL(file);
-    }
-
-    var initialized = false;
-    var currentEditor = null;
-    /**
-     * Initialize handler for image file drag events
-     */
-    function initImageDrag(elem, editor) {
-        $(elem).on("dragenter", function (ev) {
-            ev.preventDefault();
-            $("#red-ui-image-drop-target").css({display:'table'}).focus();
-            currentEditor = editor;
-        });
-
-        if (!initialized) {
-            initialized = true;
-            $("#red-ui-image-drop-target").on("dragover", function (ev) {
-                ev.preventDefault();
-            }).on("dragleave", function (ev) {
-                $("#red-ui-image-drop-target").hide();
-            }).on("drop", function (ev) {
-                ev.preventDefault();
-                if ($.inArray("Files",ev.originalEvent.dataTransfer.types) != -1) {
-                    var files = ev.originalEvent.dataTransfer.files;
-                    if (files.length === 1) {
-                        var file = files[0];
-                        var name = file.name.toLowerCase();
-
-                        if (name.match(/\.(apng|avif|gif|jpeg|png|svg|webp)$/)) {
-                            file2base64Image(file, function (image) {
-                                var session = currentEditor.getSession();
-                                var img = `<img src="${image}"/>\n`;
-                                var pos = session.getCursorPosition();
-                                session.insert(pos, img);
-                                $("#red-ui-image-drop-target").hide();
-                            });
-                            return;
-                        }
-                    }
-                }
-                $("#red-ui-image-drop-target").hide();
-            });
-        }
-    }

    var toolbarTemplate = '<div style="margin-bottom: 5px">'+
        '<span class="button-group">'+
@@ -109,26 +54,24 @@
    var definition = {
        show: function(options) {
            var value = options.value;
-            var onCancel = options.cancel;
            var onComplete = options.complete;
            var type = "_markdown"
            if ($("script[data-template-name='"+type+"']").length === 0) {
                $(template).appendTo("#red-ui-editor-node-configs");
            }

+
            RED.view.state(RED.state.EDITING);
            var expressionEditor;

            var trayOptions = {
                title: options.title,
-                focusElement: options.focusElement,
                width: options.width||Infinity,
                buttons: [
                    {
                        id: "node-dialog-cancel",
                        text: RED._("common.label.cancel"),
                        click: function() {
-                            if (onCancel) { onCancel(); }
                            RED.tray.close();
                        }
                    },
@@ -137,8 +80,7 @@
                        text: RED._("common.label.done"),
                        class: "primary",
                        click: function() {
-                            expressionEditor.saveView();
-                            if (onComplete) { onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition(), expressionEditor); }
+                            onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition());
                            RED.tray.close();
                        }
                    }
@@ -157,8 +99,6 @@
                    expressionEditor = RED.editor.createEditor({
                        id: 'red-ui-editor-type-markdown',
                        value: value,
-                        stateId: options.stateId,
-                        focus: true,
                        mode:"ace/mode/markdown",
                        expandable: false
                    });
@@ -169,7 +109,6 @@
                            var currentScrollTop = $(".red-ui-editor-type-markdown-panel-preview").scrollTop();
                            $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
                            $(".red-ui-editor-type-markdown-panel-preview").scrollTop(currentScrollTop);
-                            mermaid.init();
                        },200);
                    })
                    if (options.header) {
@@ -178,7 +117,6 @@

                    if (value) {
                        $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
-                        mermaid.init();
                    }
                    panels = RED.panels.create({
                        id:"red-ui-editor-type-markdown-panels",
@@ -205,21 +143,17 @@
                    });
                    RED.popover.tooltip($("#node-btn-markdown-preview"), RED._("markdownEditor.toggle-preview"));

-                    if(!expressionEditor._initState) {
-                        if (options.cursor) {
-                            expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
-                        }
-                        else {
-                            expressionEditor.gotoLine(0, 0, false);
-                        }
-                    }                        
+                    if (options.cursor) {
+                        expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
+                    }
+
                    dialogForm.i18n();
                },
                close: function() {
+                    expressionEditor.destroy();
                    if (options.onclose) {
                        options.onclose();
                    }
-                    expressionEditor.destroy();
                },
                show: function() {}
            }
@@ -234,7 +168,7 @@
                'b': { before:"**", after: "**", tooltip: RED._("markdownEditor.bold")},
                'i': { before:"_", after: "_", tooltip: RED._("markdownEditor.italic")},
                'code': { before:"`", after: "`", tooltip: RED._("markdownEditor.code")},
-                'ol': { before:" 1. ", newline: true, tooltip: RED._("markdownEditor.ordered-list")},
+                'ol': { before:" * ", newline: true, tooltip: RED._("markdownEditor.ordered-list")},
                'ul': { before:" - ", newline: true, tooltip: RED._("markdownEditor.unordered-list")},
                'bq': { before:"> ", newline: true, tooltip: RED._("markdownEditor.quote")},
                'link': { before:"[", after: "]()", tooltip: RED._("markdownEditor.link")},
@@ -276,11 +210,7 @@
                }
            })
            return toolbar;
-        },
-        postInit: function (editor, options) {
-            var elem = $("#"+options.id);
-            initImageDrag(elem, editor);
-         }
+        }
    }
    RED.editor.registerTypeEditor("_markdown", definition);
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
@@ -37,7 +37,8 @@
                if (!node._def.defaults || !node._def.defaults.hasOwnProperty("icon")) {
                    var icon = $("#red-ui-editor-node-icon").val()||"";
                    if (!this.isDefaultIcon) {
-                        if ((node.icon && icon !== node.icon) || (!node.icon && icon !== "")) {
+                        if ((icon !== node.icon) &&
+                            (icon !== "")) {
                            editState.changes.icon = node.icon;
                            node.icon = icon;
                            editState.changed = true;
@@ -235,7 +236,6 @@
            RED.editor.colorPicker.create({
                id: "red-ui-editor-node-color",
                value: color,
-                defaultValue: "#DDAA99",
                palette: recommendedColors,
                sortPalette: function (a, b) {return a.l - b.l;}
            }).appendTo(colorRow);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/description.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/description.js
@@ -8,6 +8,7 @@

            create: function(container) {
                this.editor = buildDescriptionForm(container,node);
+                RED.e = this.editor;
            },
            resize: function(size) {
                this.editor.resize();
@@ -57,9 +58,11 @@
        var nodeInfoEditor = RED.editor.createEditor({
            id: editorId,
            mode: 'ace/mode/markdown',
-            stateId: RED.editor.generateViewStateId("node", node, "nodeinfo"),
-            value: node.info || ""
+            value: ""
        });
+        if (node.info) {
+            nodeInfoEditor.getSession().setValue(node.info, -1);
+        }
        node.infoEditor = nodeInfoEditor;
        return nodeInfoEditor;
    }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/flowProperties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/flowProperties.js
@@ -52,6 +52,8 @@
                    node.info = info;
                }
                $("#red-ui-tab-"+(node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!node.disabled);
+                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!node.disabled);
+
            }
        }
    });
--- 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
@@ -107,7 +107,7 @@
                                        newValue = "";
                                    }
                                }
-                                if (!isEqual(node[d], newValue)) {
+                                if (node[d] != newValue) {
                                    if (node._def.defaults[d].type) {
                                        // Change to a related config node
                                        var configNode = RED.nodes.node(node[d]);
@@ -139,23 +139,6 @@
        }
    });

-    /**
-     * Compares `newValue` with `originalValue` for equality.  
-     * @param {*} originalValue Original value
-     * @param {*} newValue New value
-     * @returns {boolean} true if originalValue equals newValue, otherwise false
-     */
-     function isEqual(originalValue, newValue) {
-        try {
-            if(originalValue == newValue) {
-                return true; 
-            }
-            return JSON.stringify(originalValue) === JSON.stringify(newValue);
-        } catch (err) {
-            return false;
-        }
-    }
-
    /**
     * Update the node credentials from the edit form
     * @param node - the node containing the credentials
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/text.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/text.js
@@ -21,7 +21,6 @@
    var definition = {
        show: function(options) {
            var value = options.value;
-            var onCancel = options.cancel;
            var onComplete = options.complete;
            var type = "_text"
            if ($("script[data-template-name='"+type+"']").length === 0) {
@@ -29,16 +28,16 @@
            }
            RED.view.state(RED.state.EDITING);
            var expressionEditor;
+            var changeTimer;
+
            var trayOptions = {
                title: options.title,
-                focusElement: options.focusElement,
                width: options.width||"inherit",
                buttons: [
                    {
                        id: "node-dialog-cancel",
                        text: RED._("common.label.cancel"),
                        click: function() {
-                            if(onCancel) { onCancel(); }
                            RED.tray.close();
                        }
                    },
@@ -47,8 +46,7 @@
                        text: RED._("common.label.done"),
                        class: "primary",
                        click: function() {
-                            expressionEditor.saveView();
-                            if (onComplete) { onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition(),expressionEditor);}
+                            onComplete(expressionEditor.getValue(),expressionEditor.getCursorPosition());
                            RED.tray.close();
                        }
                    }
@@ -57,27 +55,31 @@
                    var rows = $("#dialog-form>div:not(.node-text-editor-row)");
                    var editorRow = $("#dialog-form>div.node-text-editor-row");
                    var height = $("#dialog-form").height();
+                    // for (var i=0;i<rows.size();i++) {
+                    //     height -= $(rows[i]).outerHeight(true);
+                    // }
+                    // height -= (parseInt($("#dialog-form").css("marginTop"))+parseInt($("#dialog-form").css("marginBottom")));
                    $(".node-text-editor").css("height",height+"px");
                    expressionEditor.resize();
                },
                open: function(tray) {
+                    var trayBody = tray.find('.red-ui-tray-body');
                    var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
                    expressionEditor = RED.editor.createEditor({
                        id: 'node-input-text',
-                        value: value||"",
-                        stateId: options.stateId,
-                        mode:"ace/mode/"+(options.mode||"text"),
-                        focus: true,
+                        value: "",
+                        mode:"ace/mode/"+(options.mode||"text")
                    });
-                    if (options.cursor && !expressionEditor._initState) {
+                    expressionEditor.getSession().setValue(value||"",-1);
+                    if (options.cursor) {
                        expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
                    }
                },
                close: function() {
+                    expressionEditor.destroy();
                    if (options.onclose) {
                        options.onclose();
                    }
-                    expressionEditor.destroy();
                },
                show: function() {}
            }
--- 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
@@ -1,189 +0,0 @@
-RED.envVar = (function() {
-    function saveEnvList(list) {
-        const items = list.editableList("items")
-        const new_env = [];
-        items.each(function (i,el) {
-            var data = el.data('data');
-            var item;
-            if (data.nameField && data.valueField) {
-                item = {
-                    name: data.nameField.val(),
-                    value: data.valueField.typedInput("value"),
-                    type: data.valueField.typedInput("type")
-                };
-                new_env.push(item);
-            }
-        });
-        return new_env;
-    }
-
-    function getGlobalConf(create) {
-        var gconf = null;
-        RED.nodes.eachConfig(function (conf) {
-            if (conf.type === "global-config") {
-                gconf = conf;
-            }
-        });
-        if ((gconf === null) && create) {
-            var cred = {
-                _ : {},
-                map: {}
-            };
-            gconf = {
-                id: RED.nodes.id(),
-                type: "global-config",
-                env: [],
-                name: "global-config",
-                label: "",
-                hasUsers: false,
-                users: [],
-                credentials: cred,
-                _def: RED.nodes.getType("global-config"),
-            };
-            RED.nodes.add(gconf);
-        }
-        return gconf;
-    }
-
-    function applyChanges(list) {
-        var gconf = getGlobalConf(false);
-        var new_env = [];
-        var items = list.editableList('items');
-        var credentials = gconf ? gconf.credentials : null;
-        if (!gconf && list.editableList('length') === 0) {
-            // No existing global-config node and nothing in the list,
-            // so no need to do anything more
-            return
-        }
-        if (!credentials) {
-            credentials = {
-                _ : {},
-                map: {}
-            };
-        }
-        items.each(function (i,el) {
-            var data = el.data('data');
-            if (data.nameField && data.valueField) {
-                var item = {
-                    name: data.nameField.val(),
-                    value: data.valueField.typedInput("value"),
-                    type: data.valueField.typedInput("type")
-                };
-                if (item.name.trim() !== "") {
-                    new_env.push(item);
-                    if ((item.type === "cred") && (item.value !== "__PWRD__")) {
-                        credentials.map[item.name] = item.value;
-                        credentials.map["has_"+item.name] = (item.value !== "");
-                        item.value = "__PWRD__";
-                    }
-                }
-            }
-        });
-        if (gconf === null) {
-            gconf = getGlobalConf(true);
-        }
-        if (!gconf.credentials) {
-            gconf.credentials = {
-                _ : {},
-                map: {}
-            };
-        }
-        if ((JSON.stringify(new_env) !== JSON.stringify(gconf.env)) ||
-            (JSON.stringify(credentials) !== JSON.stringify(gconf.credentials))) {
-            gconf.env = new_env;
-            gconf.credentials = credentials;
-            RED.nodes.dirty(true);
-        }
-    }
-
-    function getSettingsPane() {
-        var gconf = getGlobalConf(false);
-        var env = gconf ? gconf.env : [];
-        var cred = gconf ? gconf.credentials : null;
-        if (!cred) {
-            cred = {
-                _ : {},
-                map: {}
-            };
-        }
-
-        var pane = $("<div/>", {
-            id: "red-ui-settings-tab-envvar",
-            class: "form-horizontal"
-        });
-        var content = $("<div/>", {
-            class: "form-row node-input-env-container-row"
-        }).css({
-            "margin": "10px"
-        }).appendTo(pane);
-
-        var label = $("<label></label>").css({
-            width: "100%"
-        }).appendTo(content);
-        $("<i/>", {
-            class: "fa fa-list"
-        }).appendTo(label);
-        $("<span/>").text(" "+RED._("env-var.header")).appendTo(label);
-
-        var list = $("<ol/>", {
-            id: "node-input-env-container"
-        }).appendTo(content);
-        var node = {
-            type: "",
-            env: env,
-            credentials: cred.map,
-        };
-        RED.editor.envVarList.create(list, node);
-
-        var buttons = $("<div/>").css({
-            "text-align": "right",
-        }).appendTo(content);
-        var revertButton = $("<button/>", {
-            class: "red-ui-button"
-        }).css({
-        }).text(RED._("env-var.revert")).appendTo(buttons);
-
-        var items = saveEnvList(list);
-        revertButton.on("click", function (ev) {
-            list.editableList("empty");
-            list.editableList("addItems", items);
-        });
-
-        return pane;
-    }
-
-    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"),
-            get: getSettingsPane,
-            focus: function() {
-                var height = $("#red-ui-settings-tab-envvar").parent().height();
-                $("#node-input-env-container").editableList("height", (height -100));
-            },
-            close: function() {
-                var list = $("#node-input-env-container");
-                try {
-                    applyChanges(list);
-                }
-                catch (e) {
-                    console.log(e);
-                    console.log(e.stack);
-                }
-            }
-        });
-
-        RED.actions.add("core:show-global-env", function() {
-            RED.userSettings.show('envvar');
-        });
-    }
-
-    return {
-        init: init,
-    };
-
-})();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/group.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/group.js
@@ -101,7 +101,6 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-stroke",
                value: style.stroke || defaultGroupStyle.stroke || "#a4a4a4",
-                defaultValue: "#a4a4a4",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -113,7 +112,6 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-fill",
                value: style.fill || defaultGroupStyle.fill ||"none",
-                defaultValue: "none",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -131,7 +129,6 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-color",
                value: style.color || defaultGroupStyle.color ||"#a4a4a4",
-                defaultValue: "#a4a4a4",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -188,8 +185,6 @@ RED.group = (function() {
            var activateMerge = false;
            var activateRemove = false;
            var singleGroupSelected = false;
-            var locked = RED.workspaces.isLocked()
-
            if (activateGroup) {
                singleGroupSelected = selection.nodes.length === 1 && selection.nodes[0].type === 'group';
                selection.nodes.forEach(function (n) {
@@ -204,12 +199,12 @@ RED.group = (function() {
                    activateMerge = (selection.nodes.length > 1);
                }
            }
-            RED.menu.setDisabled("menu-item-group-group", locked || !activateGroup);
-            RED.menu.setDisabled("menu-item-group-ungroup", locked || !activateUngroup);
-            RED.menu.setDisabled("menu-item-group-merge", locked || !activateMerge);
-            RED.menu.setDisabled("menu-item-group-remove", locked || !activateRemove);
+            RED.menu.setDisabled("menu-item-group-group", !activateGroup);
+            RED.menu.setDisabled("menu-item-group-ungroup", !activateUngroup);
+            RED.menu.setDisabled("menu-item-group-merge", !activateMerge);
+            RED.menu.setDisabled("menu-item-group-remove", !activateRemove);
            RED.menu.setDisabled("menu-item-edit-copy-group-style", !singleGroupSelected);
-            RED.menu.setDisabled("menu-item-edit-paste-group-style", locked || !activateUngroup);
+            RED.menu.setDisabled("menu-item-edit-paste-group-style", !activateUngroup);
        });

        RED.actions.add("core:group-selection", function() { groupSelection() })
@@ -266,7 +261,6 @@ RED.group = (function() {
        }
    }
    function pasteGroupStyle() {
-        if (RED.workspaces.isLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        if (groupStyleClipboard) {
            var selection = RED.view.selection();
@@ -301,7 +295,6 @@ RED.group = (function() {
    }

    function groupSelection() {
-        if (RED.workspaces.isLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -315,23 +308,24 @@ RED.group = (function() {
                RED.history.push(historyEvent);
                RED.view.select({nodes:[group]});
                RED.nodes.dirty(true);
-                RED.view.focus();
            }
        }
    }
    function ungroupSelection() {
-        if (RED.workspaces.isLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
            var newSelection = [];
-            let groups = selection.nodes.filter(function(n) { return n.type === "group" });
+            groups = selection.nodes.filter(function(n) { return n.type === "group" });

            var historyEvent = {
                t:"ungroup",
                groups: [ ],
                dirty: RED.nodes.dirty()
            }
+            RED.history.push(historyEvent);
+
+
            groups.forEach(function(g) {
                newSelection = newSelection.concat(ungroup(g))
                historyEvent.groups.push(g);
@@ -339,12 +333,10 @@ RED.group = (function() {
            RED.history.push(historyEvent);
            RED.view.select({nodes:newSelection})
            RED.nodes.dirty(true);
-            RED.view.focus();
        }
    }

    function ungroup(g) {
-        if (RED.workspaces.isLocked()) { return }
        var nodes = [];
        var parentGroup = RED.nodes.group(g.g);
        g.nodes.forEach(function(n) {
@@ -371,7 +363,6 @@ RED.group = (function() {
    }

    function mergeSelection() {
-        if (RED.workspaces.isLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -401,7 +392,7 @@ RED.group = (function() {
                }
            }
            var existingGroup;
-            var mergedEnv = {}
+
            // Second pass, ungroup any groups in the selection and add their contents
            // to the selection
            for (var i=0; i<selection.nodes.length; i++) {
@@ -410,11 +401,6 @@ RED.group = (function() {
                    if (!existingGroup) {
                        existingGroup = n;
                    }
-                    if (n.env && n.env.length > 0) {
-                        n.env.forEach(env => {
-                            mergedEnv[env.name] = env
-                        })
-                    }
                    ungroupHistoryEvent.groups.push(n);
                    nodes = nodes.concat(ungroup(n));
                } else {
@@ -432,7 +418,6 @@ RED.group = (function() {
                    group.style = existingGroup.style;
                    group.name = existingGroup.name;
                }
-                group.env = Object.values(mergedEnv)
                RED.view.select({nodes:[group]})
            }
            historyEvent.events.push({
@@ -442,12 +427,10 @@ RED.group = (function() {
            });
            RED.history.push(historyEvent);
            RED.nodes.dirty(true);
-            RED.view.focus();
        }
    }

    function removeSelection() {
-        if (RED.workspaces.isLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -471,25 +454,15 @@ RED.group = (function() {
                }
            }
            RED.view.select({nodes:selection.nodes})
-            RED.view.focus();
        }
    }
    function createGroup(nodes) {
-        if (RED.workspaces.isLocked()) { return }
        if (nodes.length === 0) {
            return;
        }
-        const existingGroup = nodes[0].g
-        for (let i = 0; i < nodes.length; i++) {
-            const n = nodes[i]
-            if (n.type === 'subflow') {
-                RED.notify(RED._("group.errors.cannotAddSubflowPorts"),"error");
-                return;
-            }
-            if (n.g !== existingGroup) {
-                console.warn("Cannot add nooes with different z properties")
-                return
-            }
+        if (nodes.filter(function(n) { return n.type === "subflow" }).length > 0) {
+            RED.notify(RED._("group.errors.cannotAddSubflowPorts"),"error");
+            return;
        }
        // nodes is an array
        // each node must be on the same tab (z)
@@ -502,16 +475,11 @@ RED.group = (function() {
            y: Number.POSITIVE_INFINITY,
            w: 0,
            h: 0,
-            _def: RED.group.def,
-            changed: true
+            _def: RED.group.def
        }

        group.z = nodes[0].z;
-        group = RED.nodes.addGroup(group);
-
-        if (existingGroup) {
-            addToGroup(RED.nodes.group(existingGroup), group)
-        }
+        RED.nodes.addGroup(group);

        try {
            addToGroup(group,nodes);
@@ -536,7 +504,7 @@ RED.group = (function() {
            if (!z) {
                z = n.z;
            } else if (z !== n.z) {
-                throw new Error("Cannot add nodes with different z properties")
+                throw new Error("Cannot add nooes with different z properties")
            }
            if (n.g) {
                // This is already in a group.
@@ -553,10 +521,14 @@ RED.group = (function() {
                throw new Error(RED._("group.errors.cannotCreateDiffGroups"))
            }
        }
-        // The nodes are already in a group - so we need to remove them first
+        // The nodes are already in a group. The assumption is they should be
+        // wrapped in the newly provided group, and that group added to in their
+        // place to the existing containing group.
        if (g) {
            g = RED.nodes.group(g);
+            g.nodes.push(group);
            g.dirty = true;
+            group.g = g.id;
        }
        // Second pass - add them to the group
        for (i=0;i<nodes.length;i++) {
@@ -590,7 +562,6 @@ RED.group = (function() {
        markDirty(group);
    }
    function removeFromGroup(group, nodes, reparent) {
-        if (RED.workspaces.isLocked()) { return }
        if (!Array.isArray(nodes)) {
            nodes = [nodes];
        }
@@ -608,7 +579,7 @@ RED.group = (function() {
            n.dirty = true;
            var index = group.nodes.indexOf(n);
            group.nodes.splice(index,1);
-            if (reparent && parentGroup) {
+            if (reparent && group.g) {
                n.g = group.g
                parentGroup.nodes.push(n);
            } else {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
@@ -249,10 +249,7 @@ RED.keyboard = (function() {
        // One exception is shortcuts that include both Cmd and Ctrl. We don't
        // support them - but we need to make sure we don't block browser-specific
        // shortcuts (such as Cmd-Ctrl-F for fullscreen).
-        if (evt.ctrlKey && evt.metaKey) {
-            return null; // dont handle both cmd+ctrl - let browser handle this
-        }
-        if (evt.ctrlKey || evt.metaKey) {
+        if ((evt.ctrlKey || evt.metaKey) && (evt.ctrlKey !== evt.metaKey)) {
            slot = slot.ctrl;
        }
        if (slot && evt.shiftKey) {
@@ -268,18 +265,13 @@ RED.keyboard = (function() {
                if (partialState) {
                    partialState = null;
                    return resolveKeyEvent(evt);
+                } else if (Object.keys(handler).length > 0) {
+                    partialState = handler;
+                    evt.preventDefault();
+                    return null;
+                } else {
+                    return null;
                }
-                if (Object.keys(handler).length > 0) {
-                    // check if there's a potential combined handler initiated by this keyCode 
-                    for (let h in handler) {
-                        if (matchHandlerToEvent(evt,handler[h]) > -1) {
-                            partialState = handler;
-                            evt.preventDefault();
-                            break;
-                        }
-                    }
-                }
-                return null;
            } else {
                var depth = Infinity;
                var matchedHandler;
@@ -494,11 +486,7 @@ RED.keyboard = (function() {
                okButton.attr("disabled",!valid);
            });

-            var scopeSelect = $('<select>'+
-                '<option value="*" data-i18n="keyboard.global"></option>'+
-                '<option value="red-ui-workspace" data-i18n="keyboard.workspace"></option>'+
-                '<option value="red-ui-editor-stack" data-i18n="keyboard.editor"></option>'+
-                '</select>').appendTo(scope);
+            var scopeSelect = $('<select><option value="*" data-i18n="keyboard.global"></option><option value="red-ui-workspace" data-i18n="keyboard.workspace"></option></select>').appendTo(scope);
            scopeSelect.i18n();
            if (object.scope === "workspace") {
                object.scope = "red-ui-workspace";
--- 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
@@ -363,112 +363,106 @@ RED.library = (function() {
                    options.onconfirm(item);
                }
            });
-        var itemTools = null;
+        var itemTools = $("<div>").css({position: "absolute",bottom:"6px",right:"8px"});
+        var menuButton = $('<button class="red-ui-button red-ui-button-small" type="button"><i class="fa fa-ellipsis-h"></i></button>')
+            .on("click", function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                var elementPos = menuButton.offset();
+
+                var menuOptionMenu = RED.menu.init({id:"red-ui-library-browser-menu",
+                    options: [
+                        {id:"red-ui-library-browser-menu-addFolder",label:RED._("library.newFolder"), onselect: function() {
+                            var defaultFolderName = "new-folder";
+                            var defaultFolderNameMatches = {};
+
+                            var selected = dirList.treeList('selected');
+                            if (!selected.children) {
+                                selected = selected.parent;
+                            }
+                            var complete = function() {
+                                selected.children.forEach(function(c) {
+                                    if (/^new-folder/.test(c.label)) {
+                                        defaultFolderNameMatches[c.label] = true
+                                    }
+                                });
+                                var folderIndex = 2;
+                                while(defaultFolderNameMatches[defaultFolderName]) {
+                                    defaultFolderName = "new-folder-"+(folderIndex++)
+                                }
+
+                                selected.treeList.expand();
+                                var input = $('<input type="text" class="red-ui-treeList-input">').val(defaultFolderName);
+                                var newItem = {
+                                    icon: "fa fa-folder-o",
+                                    children:[],
+                                    path: selected.path,
+                                    element: input
+                                }
+                                var confirmAdd = function() {
+                                    var val = input.val().trim();
+                                    if (val === "") {
+                                        cancelAdd();
+                                        return;
+                                    } else {
+                                        for (var i=0;i<selected.children.length;i++) {
+                                            if (selected.children[i].label === val) {
+                                                cancelAdd();
+                                                return;
+                                            }
+                                        }
+                                    }
+                                    newItem.treeList.remove();
+                                    var finalItem = {
+                                        library: selected.library,
+                                        type: selected.type,
+                                        icon: "fa fa-folder",
+                                        children:[],
+                                        label: val,
+                                        path: newItem.path+val+"/"
+                                    }
+                                    selected.treeList.addChild(finalItem,true);
+                                }
+                                var cancelAdd = function() {
+                                    newItem.treeList.remove();
+                                }
+                                input.on('keydown', function(evt) {
+                                    evt.stopPropagation();
+                                    if (evt.keyCode === 13) {
+                                        confirmAdd();
+                                    } else if (evt.keyCode === 27) {
+                                        cancelAdd();
+                                    }
+                                })
+                                input.on("blur", function() {
+                                    confirmAdd();
+                                })
+                                selected.treeList.addChild(newItem);
+                                setTimeout(function() {
+                                    input.trigger("focus");
+                                    input.select();
+                                },400);
+                            }
+                            selected.treeList.expand(complete);
+
+                        } },
+                        // null,
+                        // {id:"red-ui-library-browser-menu-rename",label:"Rename", onselect: function() {} },
+                        // {id:"red-ui-library-browser-menu-delete",label:"Delete", onselect: function() {} }
+                    ]
+                }).on('mouseleave', function(){ $(this).remove(); dirList.focus() })
+                  .on('mouseup', function() { var self = $(this);self.hide(); dirList.focus(); setTimeout(function() { self.remove() },100)})
+                  .appendTo("body");
+                menuOptionMenu.css({
+                    position: "absolute",
+                    top: elementPos.top+"px",
+                    left: (elementPos.left - menuOptionMenu.width() + 20)+"px"
+                }).show();
+
+            }).appendTo(itemTools);
        if (options.folderTools) {
            dirList.on('treelistselect', function(event, item) {
                if (item.writable !== false && item.treeList) {
-                    if (itemTools) {
-                        itemTools.remove();
-                    }
-                    itemTools = $("<div>").css({position: "absolute",bottom:"6px",right:"8px"});
-                    var menuButton = $('<button class="red-ui-button red-ui-button-small" type="button"><i class="fa fa-ellipsis-h"></i></button>')
-                        .on("click", function(evt) {
-                            evt.preventDefault();
-                            evt.stopPropagation();
-                            var elementPos = menuButton.offset();
-
-                            var menuOptionMenu
-                                = RED.menu.init({id:"red-ui-library-browser-menu",
-                                      options: [
-                                          {id:"red-ui-library-browser-menu-addFolder",label:RED._("library.newFolder"), onselect: function() {
-                                              var defaultFolderName = "new-folder";
-                                              var defaultFolderNameMatches = {};
-
-                                              var selected = dirList.treeList('selected');
-                                              if (!selected.children) {
-                                                  selected = selected.parent;
-                                              }
-                                              var complete = function() {
-                                                  selected.children.forEach(function(c) {
-                                                      if (/^new-folder/.test(c.label)) {
-                                                          defaultFolderNameMatches[c.label] = true
-                                                      }
-                                                  });
-                                                  var folderIndex = 2;
-                                                  while(defaultFolderNameMatches[defaultFolderName]) {
-                                                      defaultFolderName = "new-folder-"+(folderIndex++)
-                                                  }
-
-                                                  selected.treeList.expand();
-                                                  var input = $('<input type="text" class="red-ui-treeList-input">').val(defaultFolderName);
-                                                  var newItem = {
-                                                      icon: "fa fa-folder-o",
-                                                      children:[],
-                                                      path: selected.path,
-                                                      element: input
-                                                  }
-                                                  var confirmAdd = function() {
-                                                      var val = input.val().trim();
-                                                      if (val === "") {
-                                                          cancelAdd();
-                                                          return;
-                                                      } else {
-                                                          for (var i=0;i<selected.children.length;i++) {
-                                                              if (selected.children[i].label === val) {
-                                                                  cancelAdd();
-                                                                  return;
-                                                              }
-                                                          }
-                                                      }
-                                                      newItem.treeList.remove();
-                                                      var finalItem = {
-                                                          library: selected.library,
-                                                          type: selected.type,
-                                                          icon: "fa fa-folder",
-                                                          children:[],
-                                                          label: val,
-                                                          path: newItem.path+val+"/"
-                                                      }
-                                                      selected.treeList.addChild(finalItem,true);
-                                                  }
-                                                  var cancelAdd = function() {
-                                                      newItem.treeList.remove();
-                                                  }
-                                                  input.on('keydown', function(evt) {
-                                                      evt.stopPropagation();
-                                                      if (evt.keyCode === 13) {
-                                                          confirmAdd();
-                                                      } else if (evt.keyCode === 27) {
-                                                          cancelAdd();
-                                                      }
-                                                  })
-                                                  input.on("blur", function() {
-                                                      confirmAdd();
-                                                  })
-                                                  selected.treeList.addChild(newItem);
-                                                  setTimeout(function() {
-                                                      input.trigger("focus");
-                                                      input.select();
-                                                  },400);
-                                              }
-                                              selected.treeList.expand(complete);
-
-                                          } },
-                                          // null,
-                                          // {id:"red-ui-library-browser-menu-rename",label:"Rename", onselect: function() {} },
-                                          // {id:"red-ui-library-browser-menu-delete",label:"Delete", onselect: function() {} }
-                                      ]
-                                                }).on('mouseleave', function(){ $(this).remove(); dirList.focus() })
-                                .on('mouseup', function() { var self = $(this);self.hide(); dirList.focus(); setTimeout(function() { self.remove() },100)})
-                                .appendTo("body");
-                            menuOptionMenu.css({
-                                position: "absolute",
-                                top: elementPos.top+"px",
-                                left: (elementPos.left - menuOptionMenu.width() + 20)+"px"
-                            }).show();
-
-                        }).appendTo(itemTools);
-                    
                    itemTools.appendTo(item.treeList.label);
                }
            });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js
@@ -1,46 +0,0 @@
-// Mermaid diagram stub library for on-demand dynamic loading
-// Will be overwritten after script loading by $.getScript
-var mermaid = (function () {
-    var enabled /* = undefined */;
-    
-    var initializing = false;
-    var initCalled = false;
-
-    function initialize(opt) {
-        if (enabled === undefined) {
-            if (RED.settings.markdownEditor &&
-                RED.settings.markdownEditor.mermaid) {
-                enabled = RED.settings.markdownEditor.mermaid.enabled;
-            }
-            else {
-                enabled = true;
-            }
-        }
-        if (enabled) {
-            initializing = true;
-            $.getScript("vendor/mermaid/mermaid.min.js",
-                        function (data, stat, jqxhr) {
-                            $(".mermaid").show();
-                            // invoke loaded mermaid API
-                            initializing = false; 
-                            mermaid.initialize(opt);
-                            if (initCalled) {
-                                mermaid.init();
-                                initCalled = false;
-                            }
-                        });
-        }
-    }
-
-    function init() {
-        if (initializing) {
-            $(".mermaid").hide();
-            initCalled = true;
-        }
-    }
-    
-    return {
-        initialize: initialize,
-        init: init,
-    };
-})();
--- 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
@@ -16,17 +16,15 @@
 RED.palette.editor = (function() {

    var disabled = false;
-    let catalogues = []
-    const loadedCatalogs = []
+
    var editorTabs;
-    let filterInput;
-    let searchInput;
-    let nodeList;
-    let packageList;
-    let fullList = []
-    let loadedList = [];
-    let filteredList = [];
-    let loadedIndex = {};
+    var filterInput;
+    var searchInput;
+    var nodeList;
+    var packageList;
+    var loadedList = [];
+    var filteredList = [];
+    var loadedIndex = {};

    var typesInUse = {};
    var nodeEntries = {};
@@ -164,6 +162,7 @@ RED.palette.editor = (function() {
        }
    }

+
    function getContrastingBorder(rgbColor){
        var parts = /^rgba?\(\s*(\d+),\s*(\d+),\s*(\d+)[,)]/.exec(rgbColor);
        if (parts) {
@@ -370,10 +369,10 @@ RED.palette.editor = (function() {
    var activeSort = sortModulesRelevance;

    function handleCatalogResponse(err,catalog,index,v) {
-        const url = catalog.url
        catalogueLoadStatus.push(err||v);
        if (!err) {
            if (v.modules) {
+                var a = false;
                v.modules = v.modules.filter(function(m) {
                    if (RED.utils.checkModuleAllowed(m.id,m.version,installAllowList,installDenyList)) {
                        loadedIndex[m.id] = m;
@@ -390,14 +389,13 @@ RED.palette.editor = (function() {
                            m.timestamp = 0;
                        }
                        m.index = m.index.join(",").toLowerCase();
-                        m.catalog = catalog;
-                        m.catalogIndex = index;
                        return true;
                    }
                    return false;
                })
                loadedList = loadedList.concat(v.modules);
            }
+            searchInput.searchBox('count',loadedList.length);
        } else {
            catalogueLoadErrors = true;
        }
@@ -406,7 +404,7 @@ RED.palette.editor = (function() {
        }
        if (catalogueLoadStatus.length === catalogueCount) {
            if (catalogueLoadErrors) {
-                RED.notify(RED._('palette.editor.errors.catalogLoadFailed',{url: url}),"error",false,8000);
+                RED.notify(RED._('palette.editor.errors.catalogLoadFailed',{url: catalog}),"error",false,8000);
            }
            var delta = 250-(Date.now() - catalogueLoadStart);
            setTimeout(function() {
@@ -418,13 +416,12 @@ RED.palette.editor = (function() {

    function initInstallTab() {
        if (loadedList.length === 0) {
-            fullList = [];
            loadedList = [];
            loadedIndex = {};
            packageList.editableList('empty');

            $(".red-ui-palette-module-shade-status").text(RED._('palette.editor.loading'));
-
+            var catalogues = RED.settings.theme('palette.catalogues')||['https://catalogue.nodered.org/catalogue.json'];
            catalogueLoadStatus = [];
            catalogueLoadErrors = false;
            catalogueCount = catalogues.length;
@@ -434,92 +431,23 @@ RED.palette.editor = (function() {
            $("#red-ui-palette-module-install-shade").show();
            catalogueLoadStart = Date.now();
            var handled = 0;
-            loadedCatalogs.length = 0; // clear the loadedCatalogs array
-            for (let index = 0; index < catalogues.length; index++) {
-                const url = catalogues[index];
-                $.getJSON(url, {_: new Date().getTime()},function(v) {
-                    loadedCatalogs.push({ index: index, url: url, name: v.name, updated_at: v.updated_at, modules_count: (v.modules || []).length })
-                    handleCatalogResponse(null,{ url: url, name: v.name},index,v);
+            catalogues.forEach(function(catalog,index) {
+                $.getJSON(catalog, {_: new Date().getTime()},function(v) {
+                    handleCatalogResponse(null,catalog,index,v);
                    refreshNodeModuleList();
                }).fail(function(jqxhr, textStatus, error) {
-                    console.warn("Error loading catalog",url,":",error);
-                    handleCatalogResponse(jqxhr,url,index);
+                    console.warn("Error loading catalog",catalog,":",error);
+                    handleCatalogResponse(jqxhr,catalog,index);
                }).always(function() {
                    handled++;
                    if (handled === catalogueCount) {
-                        //sort loadedCatalogs by e.index ascending
-                        loadedCatalogs.sort((a, b) => a.index - b.index)
-                        updateCatalogFilter(loadedCatalogs)
+                        searchInput.searchBox('change');
                    }
                })
-            }
+            });
        }
    }

-    /**
-     * Refreshes the catalog filter dropdown and updates local variables
-     * @param {[{url:String, name:String, updated_at:String, modules_count:Number}]} catalogEntries
-     */
-    function updateCatalogFilter(catalogEntries, maxRetry = 3) {
-        // clean up existing filters
-        const catalogSelection = $('#red-catalogue-filter-select')
-        if (catalogSelection.length === 0) {
-            // sidebar not yet loaded (red-catalogue-filter-select is not in dom)
-            if (maxRetry > 0) {
-               // console.log("updateCatalogFilter: sidebar not yet loaded, retrying in 100ms")
-                // try again in 100ms
-                setTimeout(() => {
-                    updateCatalogFilter(catalogEntries, maxRetry - 1)
-                }, 100);
-                return;
-            } 
-            return; // give up
-        }
-        catalogSelection.off("change") // remove any existing event handlers
-        catalogSelection.attr('disabled', 'disabled')
-        catalogSelection.empty()
-        catalogSelection.append($('<option>', { value: "loading", text: RED._('palette.editor.loading'), disabled: true, selected: true }));
-        
-        fullList = loadedList.slice()
-        catalogSelection.empty() // clear the select list
-
-        // loop through catalogTypes, and an option entry per catalog
-        for (let index = 0; index < catalogEntries.length; index++) {
-            const catalog = catalogEntries[index];
-            catalogSelection.append(`<option value="${catalog.name}">${catalog.name}</option>`)
-        }
-        // select the 1st option in the select list
-        catalogSelection.val(catalogSelection.find('option:first').val())
-        
-        // if there is only 1 catalog, hide the select
-        if (catalogEntries.length > 1) {
-            catalogSelection.prepend(`<option value="all">${RED._('palette.editor.allCatalogs')}</option>`)
-            catalogSelection.removeAttr('disabled') // permit the user to select a catalog
-        }
-        // refresh the searchInput counter and trigger a change
-        filterByCatalog(catalogSelection.val())
-        searchInput.searchBox('change');
-
-        // hook up the change event handler
-        catalogSelection.on("change", function() {
-            const selectedCatalog = $(this).val();
-            filterByCatalog(selectedCatalog);
-            searchInput.searchBox('change');
-        })
-    }
-
-    function filterByCatalog(selectedCatalog) {
-        if (loadedCatalogs.length <= 1 || selectedCatalog === "all") {
-            loadedList = fullList.slice();
-        } else {
-            loadedList = fullList.filter(function(m) {
-                return (m.catalog.name === selectedCatalog);
-            })
-        }
-        refreshFilteredItems();
-        searchInput.searchBox('count',filteredList.length+" / "+loadedList.length);
-    }
-
    function refreshFilteredItems() {
        packageList.editableList('empty');
        var currentFilter = searchInput.searchBox('value').trim();
@@ -534,6 +462,7 @@ RED.palette.editor = (function() {
        if (filteredList.length === 0) {
            packageList.editableList('addItem',{});
        }
+
        if (filteredList.length > 10) {
            packageList.editableList('addItem',{start:10,more:filteredList.length-10})
        }
@@ -563,7 +492,6 @@ RED.palette.editor = (function() {
    var updateDenyList = [];

    function init() {
-        catalogues = RED.settings.theme('palette.catalogues')||['https://catalogue.nodered.org/catalogue.json']
        if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
            return;
        }
@@ -741,8 +669,7 @@ RED.palette.editor = (function() {
            });


-        nodeList = $('<ol>',{id:"red-ui-palette-module-list"}).appendTo(modulesTab).editableList({
-            class: "scrollable",
+        nodeList = $('<ol>',{id:"red-ui-palette-module-list", style:"position: absolute;top: 35px;bottom: 0;left: 0;right: 0px;"}).appendTo(modulesTab).editableList({
            addButton: false,
            scrollOnAdd: false,
            sort: function(A,B) {
@@ -873,20 +800,21 @@ RED.palette.editor = (function() {
                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
                }
            }
-        })
+        });
    }

    function createInstallTab(content) {
-        const installTab = $('<div>',{class:"red-ui-palette-editor-tab", style: "display: none;"}).appendTo(content);
+        var installTab = $('<div>',{class:"red-ui-palette-editor-tab hide"}).appendTo(content);
+
        editorTabs.addTab({
            id: 'install',
            label: RED._('palette.editor.tab-install'),
            content: installTab
        })

-        const toolBar = $('<div>',{class:"red-ui-palette-editor-toolbar"}).appendTo(installTab);
-        
-        const searchDiv = $('<div>',{class:"red-ui-palette-search"}).appendTo(installTab);
+        var toolBar = $('<div>',{class:"red-ui-palette-editor-toolbar"}).appendTo(installTab);
+
+        var searchDiv = $('<div>',{class:"red-ui-palette-search"}).appendTo(installTab);
        searchInput = $('<input type="text" data-i18n="[placeholder]palette.search"></input>')
            .appendTo(searchDiv)
            .searchBox({
@@ -903,25 +831,19 @@ RED.palette.editor = (function() {
                        searchInput.searchBox('count',loadedList.length);
                        packageList.editableList('empty');
                        packageList.editableList('addItem',{count:loadedList.length});
+
                    }
                }
            });

-        const catalogSelection = $('<select id="red-catalogue-filter-select">').appendTo(toolBar);
-        catalogSelection.addClass('red-ui-palette-editor-catalogue-filter');
- 
-        const toolBarActions = $('<div>',{class:"red-ui-palette-editor-toolbar-actions"}).appendTo(toolBar);
-
-        $('<span>').text(RED._("palette.editor.sort")+' ').appendTo(toolBarActions);
-        const sortGroup = $('<span class="button-group"></span>').appendTo(toolBarActions);
-        const sortRelevance = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle selected"><i class="fa fa-sort-amount-desc"></i></a>').appendTo(sortGroup);
-        const sortAZ = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle"><i class="fa fa-sort-alpha-asc"></i></a>').appendTo(sortGroup);
-        const sortRecent = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle"><i class="fa fa-calendar"></i></a>').appendTo(sortGroup);
-        RED.popover.tooltip(sortAZ,RED._("palette.editor.sortAZ"));
-        RED.popover.tooltip(sortRecent,RED._("palette.editor.sortRecent"));
+        $('<span>').text(RED._("palette.editor.sort")+' ').appendTo(toolBar);
+        var sortGroup = $('<span class="button-group"></span>').appendTo(toolBar);
+        var sortRelevance = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle selected"><i class="fa fa-sort-amount-desc"></i></a>').appendTo(sortGroup);
+        var sortAZ = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle" data-i18n="palette.editor.sortAZ"></a>').appendTo(sortGroup);
+        var sortRecent = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle" data-i18n="palette.editor.sortRecent"></a>').appendTo(sortGroup);


-        const sortOpts = [
+        var sortOpts = [
            {button: sortRelevance, func: sortModulesRelevance},
            {button: sortAZ, func: sortModulesAZ},
            {button: sortRecent, func: sortModulesRecent}
@@ -939,7 +861,7 @@ RED.palette.editor = (function() {
            });
        });

-        var refreshSpan = $('<span>').appendTo(toolBarActions);
+        var refreshSpan = $('<span>').appendTo(toolBar);
        var refreshButton = $('<a href="#" class="red-ui-sidebar-header-button"><i class="fa fa-refresh"></i></a>').appendTo(refreshSpan);
        refreshButton.on("click", function(e) {
            e.preventDefault();
@@ -949,8 +871,7 @@ RED.palette.editor = (function() {
        })
        RED.popover.tooltip(refreshButton,RED._("palette.editor.refresh"));

-        packageList = $('<ol>').appendTo(installTab).editableList({
-            class: "scrollable",
+        packageList = $('<ol>',{style:"position: absolute;top: 79px;bottom: 0;left: 0;right: 0px;"}).appendTo(installTab).editableList({
            addButton: false,
            scrollOnAdd: false,
            addItem: function(container,i,object) {
@@ -985,9 +906,6 @@ RED.palette.editor = (function() {
                    var metaRow = $('<div class="red-ui-palette-module-meta"></div>').appendTo(headerRow);
                    $('<span class="red-ui-palette-module-version"><i class="fa fa-tag"></i> '+entry.version+'</span>').appendTo(metaRow);
                    $('<span class="red-ui-palette-module-updated"><i class="fa fa-calendar"></i> '+formatUpdatedAt(entry.updated_at)+'</span>').appendTo(metaRow);
-                    if (loadedCatalogs.length > 1) {
-                        $('<span class="red-ui-palette-module-updated"><i class="fa fa-cubes"></i>' + (entry.catalog.name || entry.catalog.url) + '</span>').appendTo(metaRow);
-                    }

                    var duplicateType = false;
                    if (entry.types && entry.types.length > 0) {
@@ -1034,10 +952,9 @@ RED.palette.editor = (function() {
                }
            }
        });
-        

        if (RED.settings.get('externalModules.palette.allowUpload', true) !== false) {
-            var uploadSpan = $('<span class="button-group">').prependTo(toolBarActions);
+            var uploadSpan = $('<span class="button-group">').prependTo(toolBar);
            var uploadButton = $('<button type="button" class="red-ui-sidebar-header-button red-ui-palette-editor-upload-button"><label><i class="fa fa-upload"></i><form id="red-ui-palette-editor-upload-form" enctype="multipart/form-data"><input name="tarball" type="file" accept=".tgz"></label></button>').appendTo(uploadSpan);

            var uploadInput = uploadButton.find('input[type="file"]');
--- 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
@@ -171,15 +171,13 @@ RED.palette = (function() {
                }
                metaData += type;

-                const safeType = type.replace(/'/g,"\\'");
-                const searchType = type.indexOf(' ') > -1 ? '&quot;' + type + '&quot;' : type
-
                if (/^subflow:/.test(type)) {
                    $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
                }

-                $('<button type="button" onclick="RED.search.show(\'type:'+searchType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
+                var safeType = type.replace(/'/g,"\\'");

+                $('<button type="button" onclick="RED.search.show(\'type:'+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
                $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)

                $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
@@ -210,7 +208,7 @@ RED.palette = (function() {
    }

    function escapeCategory(category) {
-        return category.replace(/[\x00-\x2c\x2e-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]/g,"_");
+        return category.replace(/[ /.]/g,"_");
    }
    function addNodeType(nt,def) {
        if (getPaletteNode(nt).length) {
@@ -284,7 +282,6 @@ RED.palette = (function() {
            var hoverGroup;
            var paletteWidth;
            var paletteTop;
-            var dropEnabled;
            $(d).draggable({
                helper: 'clone',
                appendTo: '#red-ui-editor',
@@ -292,7 +289,6 @@ RED.palette = (function() {
                revertDuration: 200,
                containment:'#red-ui-main-container',
                start: function() {
-                    dropEnabled = !(RED.nodes.workspace(RED.workspaces.active())?.locked);
                    paletteWidth = $("#red-ui-palette").width();
                    paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top;
                    hoverGroup = null;
@@ -303,100 +299,96 @@ RED.palette = (function() {
                    RED.view.focus();
                },
                stop: function() {
-                    if (dropEnabled) {
-                        d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
-                        if (hoverGroup) {
-                            document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
-                        }
-                        if (activeGroup) {
-                            document.getElementById("group_select_"+activeGroup.id).classList.remove("red-ui-flow-group-active-hovered");
-                        }
-                        if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null; }
-                        if (groupTimer) { clearTimeout(groupTimer); groupTimer = null; }
+                    d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                    if (hoverGroup) {
+                        document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
                    }
+                    if (activeGroup) {
+                        document.getElementById("group_select_"+activeGroup.id).classList.remove("red-ui-flow-group-active-hovered");
+                    }
+                    if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null; }
+                    if (groupTimer) { clearTimeout(groupTimer); groupTimer = null; }
                },
                drag: function(e,ui) {
                    var paletteNode = getPaletteNode(nt);
                    ui.originalPosition.left = paletteNode.offset().left;
-                    if (dropEnabled) {
-                        mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
-                        mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop() + 10;
-                        if (!groupTimer) {
-                            groupTimer = setTimeout(function() {
+                    mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
+                    mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop() + 10;
+                    if (!groupTimer) {
+                        groupTimer = setTimeout(function() {
+                            var mx = mouseX / RED.view.scale();
+                            var my = mouseY / RED.view.scale();
+                            var group = RED.view.getGroupAtPoint(mx,my);
+                            if (group !== hoverGroup) {
+                                if (hoverGroup) {
+                                    document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
+                                }
+                                if (group) {
+                                    document.getElementById("group_select_"+group.id).classList.add("red-ui-flow-group-hovered");
+                                }
+                                hoverGroup = group;
+                                if (hoverGroup) {
+                                    $(ui.helper).data('group',hoverGroup);
+                                } else {
+                                    $(ui.helper).removeData('group');
+                                }
+                            }
+                            groupTimer = null;
+
+                        },200)
+                    }
+                    if (def.inputs > 0 && def.outputs > 0) {
+                        if (!spliceTimer) {
+                            spliceTimer = setTimeout(function() {
+                                var nodes = [];
+                                var bestDistance = Infinity;
+                                var bestLink = null;
+                                if (chartSVG.getIntersectionList) {
+                                    var svgRect = chartSVG.createSVGRect();
+                                    svgRect.x = mouseX;
+                                    svgRect.y = mouseY;
+                                    svgRect.width = 1;
+                                    svgRect.height = 1;
+                                    nodes = chartSVG.getIntersectionList(svgRect,chartSVG);
+                                } else {
+                                    // Firefox doesn't do getIntersectionList and that
+                                    // makes us sad
+                                    nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
+                                }
                                var mx = mouseX / RED.view.scale();
                                var my = mouseY / RED.view.scale();
-                                var group = RED.view.getGroupAtPoint(mx,my);
-                                if (group !== hoverGroup) {
-                                    if (hoverGroup) {
-                                        document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
-                                    }
-                                    if (group) {
-                                        document.getElementById("group_select_"+group.id).classList.add("red-ui-flow-group-hovered");
-                                    }
-                                    hoverGroup = group;
-                                    if (hoverGroup) {
-                                        $(ui.helper).data('group',hoverGroup);
-                                    } else {
-                                        $(ui.helper).removeData('group');
-                                    }
-                                }
-                                groupTimer = null;
-
-                            },200)
-                        }
-                        if (def.inputs > 0 && def.outputs > 0) {
-                            if (!spliceTimer) {
-                                spliceTimer = setTimeout(function() {
-                                    var nodes = [];
-                                    var bestDistance = Infinity;
-                                    var bestLink = null;
-                                    if (chartSVG.getIntersectionList) {
-                                        var svgRect = chartSVG.createSVGRect();
-                                        svgRect.x = mouseX;
-                                        svgRect.y = mouseY;
-                                        svgRect.width = 1;
-                                        svgRect.height = 1;
-                                        nodes = chartSVG.getIntersectionList(svgRect,chartSVG);
-                                    } else {
-                                        // Firefox doesn't do getIntersectionList and that
-                                        // makes us sad
-                                        nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
-                                    }
-                                    var mx = mouseX / RED.view.scale();
-                                    var my = mouseY / RED.view.scale();
-                                    for (var i=0;i<nodes.length;i++) {
-                                        var node = d3.select(nodes[i]);
-                                        if (node.classed('red-ui-flow-link-background') && !node.classed('red-ui-flow-link-link')) {
-                                            var length = nodes[i].getTotalLength();
-                                            for (var j=0;j<length;j+=10) {
-                                                var p = nodes[i].getPointAtLength(j);
-                                                var d2 = ((p.x-mx)*(p.x-mx))+((p.y-my)*(p.y-my));
-                                                if (d2 < 200 && d2 < bestDistance) {
-                                                    bestDistance = d2;
-                                                    bestLink = nodes[i];
-                                                }
+                                for (var i=0;i<nodes.length;i++) {
+                                    var node = d3.select(nodes[i]);
+                                    if (node.classed('red-ui-flow-link-background') && !node.classed('red-ui-flow-link-link')) {
+                                        var length = nodes[i].getTotalLength();
+                                        for (var j=0;j<length;j+=10) {
+                                            var p = nodes[i].getPointAtLength(j);
+                                            var d2 = ((p.x-mx)*(p.x-mx))+((p.y-my)*(p.y-my));
+                                            if (d2 < 200 && d2 < bestDistance) {
+                                                bestDistance = d2;
+                                                bestLink = nodes[i];
                                            }
                                        }
                                    }
-                                    if (activeSpliceLink && activeSpliceLink !== bestLink) {
-                                        d3.select(activeSpliceLink.parentNode).classed('red-ui-flow-link-splice',false);
-                                    }
+                                }
+                                if (activeSpliceLink && activeSpliceLink !== bestLink) {
+                                    d3.select(activeSpliceLink.parentNode).classed('red-ui-flow-link-splice',false);
+                                }
+                                if (bestLink) {
+                                    d3.select(bestLink.parentNode).classed('red-ui-flow-link-splice',true)
+                                } else {
+                                    d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                                }
+                                if (activeSpliceLink !== bestLink) {
                                    if (bestLink) {
-                                        d3.select(bestLink.parentNode).classed('red-ui-flow-link-splice',true)
+                                        $(ui.helper).data('splice',d3.select(bestLink).data()[0]);
                                    } else {
-                                        d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                                        $(ui.helper).removeData('splice');
                                    }
-                                    if (activeSpliceLink !== bestLink) {
-                                        if (bestLink) {
-                                            $(ui.helper).data('splice',d3.select(bestLink).data()[0]);
-                                        } else {
-                                            $(ui.helper).removeData('splice');
-                                        }
-                                    }
-                                    activeSpliceLink = bestLink;
-                                    spliceTimer = null;
-                                },200);
-                            }
+                                }
+                                activeSpliceLink = bestLink;
+                                spliceTimer = null;
+                            },200);
                        }
                    }
                }
@@ -430,7 +422,6 @@ RED.palette = (function() {
                categoryNode.find(".red-ui-palette-content").slideToggle();
                categoryNode.find("i").toggleClass("expanded");
            }
-            categoryNode.hide();
        }
    }

@@ -509,7 +500,6 @@ RED.palette = (function() {
                    currentCategoryNode.find(".red-ui-palette-content").slideToggle();
                    currentCategoryNode.find("i").toggleClass("expanded");
                }
-                currentCategoryNode.hide();
            }
        }

--- 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
@@ -120,7 +120,6 @@ RED.projects.settings = (function() {
            title: RED._('sidebar.project.editDescription'),
            header: $('<span><i class="fa fa-book"></i> README.md</span>'),
            value: activeProject.description,
-            stateId: "sidebar.project.editDescription",
            complete: function(v) {
                container.empty();
                var spinner = utils.addSpinnerOverlay(container);
@@ -165,9 +164,6 @@ RED.projects.settings = (function() {
        }
        var description = addTargetToExternalLinks($('<span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(desc)+'">'+desc+'</span>')).appendTo(container);
        description.find(".red-ui-text-bidi-aware").contents().filter(function() { return this.nodeType === 3 && this.textContent.trim() !== "" }).wrap( "<span></span>" );
-        setTimeout(function () {
-            mermaid.init();
-        }, 200);
    }

    function editSummary(activeProject, summary, container, version, versionContainer) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -545,7 +545,7 @@ RED.projects = (function() {
                        var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.clone-project.ssh-key-desc")+'</div>').appendTo(sshwarningRow);
                        subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
                            e.preventDefault();
                            dialog.dialog( "close" );
                            RED.userSettings.show('gitconfig');
@@ -747,14 +747,14 @@ RED.projects = (function() {
                        var row = $('<div class="form-row"></div>').appendTo(body);
                        $('<label for="red-ui-projects-dialog-screen-create-project-file">'+RED._("projects.default-files.flow-file")+'</label>').appendTo(row);
                        var subrow = $('<div style="position:relative;"></div>').appendTo(row);
-                        var defaultFlowFile = (createProjectOptions.files &&createProjectOptions.files.flow) || (RED.settings.files && RED.settings.files.flow) || "flows.json";
+                        var defaultFlowFile = (createProjectOptions.files &&createProjectOptions.files.flow) || (RED.settings.files && RED.settings.files.flow)||"flow.json";
                        projectFlowFileInput = $('<input id="red-ui-projects-dialog-screen-create-project-file" type="text">').val(defaultFlowFile)
                            .on("change keyup paste",validateForm)
                            .appendTo(subrow);
                        $('<div class="red-ui-projects-dialog-screen-input-status"></div>').appendTo(subrow);
                        $('<label class="red-ui-projects-edit-form-sublabel"><small>*.json</small></label>').appendTo(row);

-                        var defaultCredentialsFile = (createProjectOptions.files &&createProjectOptions.files.credentials) || (RED.settings.files && RED.settings.files.credentials) || "flows_cred.json";
+                        var defaultCredentialsFile = (createProjectOptions.files &&createProjectOptions.files.credentials) || (RED.settings.files && RED.settings.files.credentials)||"flow_cred.json";
                        row = $('<div class="form-row"></div>').appendTo(body);
                        $('<label for="red-ui-projects-dialog-screen-create-project-credfile">'+RED._("projects.default-files.credentials-file")+'</label>').appendTo(row);
                        subrow = $('<div style="position:relative;"></div>').appendTo(row);
@@ -1171,11 +1171,11 @@ RED.projects = (function() {

                        row = $('<div class="form-row button-group"></div>').appendTo(container);

-                        var openProject = $('<button type="button" data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
-                        var createAsEmpty = $('<button type="button" data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
-                        // var createAsCopy = $('<button type="button" data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
-                        var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
-                        // var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
+                        var openProject = $('<button data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
+                        var createAsEmpty = $('<button data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
+                        // var createAsCopy = $('<button data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
+                        var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
+                        // var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
                        row.find(".red-ui-projects-dialog-screen-create-type").on("click", function(evt) {
                            evt.preventDefault();
                            container.find(".red-ui-projects-dialog-screen-create-type").removeClass('selected');
@@ -1257,7 +1257,7 @@ RED.projects = (function() {
                        row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-empty"></div>').appendTo(container);
                        $('<label for="red-ui-projects-dialog-screen-create-project-file">'+RED._("projects.create.flow-file")+'</label>').appendTo(row);
                        subrow = $('<div style="position:relative;"></div>').appendTo(row);
-                        projectFlowFileInput = $('<input id="red-ui-projects-dialog-screen-create-project-file" type="text">').val("flows.json")
+                        projectFlowFileInput = $('<input id="red-ui-projects-dialog-screen-create-project-file" type="text">').val("flow.json")
                            .on("change keyup paste",validateForm)
                            .appendTo(subrow);
                        $('<div class="red-ui-projects-dialog-screen-input-status"></div>').appendTo(subrow);
@@ -1271,7 +1271,7 @@ RED.projects = (function() {
                        var credentialsLeftBox = $('<div class="red-ui-projects-dialog-credentials-box-left">').appendTo(credentialsBox);

                        var credentialsEnabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-enabled"></div>').appendTo(credentialsLeftBox);
-                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled" checked> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
+                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled"> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
                        var credentialsDisabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-disabled disabled"></div>').appendTo(credentialsLeftBox);
                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="disabled"> <i class="fa fa-unlock"></i> <span>'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);

@@ -1397,7 +1397,7 @@ RED.projects = (function() {
                        var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.create.desc2")+'</div>').appendTo(sshwarningRow);
                        subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
                            e.preventDefault();
                            $('#red-ui-projects-dialog-cancel').trigger("click");
                            RED.userSettings.show('gitconfig');
@@ -1631,14 +1631,14 @@ RED.projects = (function() {
    function deleteProject(row,name,done) {
        var cover = $('<div class="red-ui-projects-dialog-project-list-entry-delete-confirm"></div>').on("click", function(evt) { evt.stopPropagation(); }).appendTo(row);
        $('<span>').text(RED._("projects.delete.confirm")).appendTo(cover);
-        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
+        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
            .appendTo(cover)
            .on("click", function(e) {
                e.stopPropagation();
                cover.remove();
                done(true);
            });
-        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
+        $('<button class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
            .appendTo(cover)
            .on("click", function(e) {
                e.stopPropagation();
@@ -1822,7 +1822,7 @@ RED.projects = (function() {
                header.addClass("selectable");

                var tools = $('<div class="red-ui-projects-dialog-project-list-entry-tools"></div>').appendTo(header);
-                $('<button type="button" class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
+                $('<button class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
                    .appendTo(tools)
                    .on("click", function(e) {
                        e.stopPropagation();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
@@ -106,62 +106,45 @@ RED.search = (function() {
        return val;
    }

-    function extractType(val, flags) {
-        // extracts:  type:XYZ  &  type:"X Y Z"
-        const regEx = /(?:type):\s*(?:"([^"]+)"|([^" ]+))/;
-        let m
-        while ((m = regEx.exec(val)) !== null) {
-            // avoid infinite loops with zero-width matches
-            if (m.index === regEx.lastIndex) {
-                regEx.lastIndex++;
-            }
-            val = val.replace(m[0]," ").trim()
-            const flag = m[2] || m[1] // quoted entries in capture group 1, unquoted in capture group 2
-            flags.type = flags.type || [];
-            flags.type.push(flag);
-        }
-        return val;
-    }
-
    function search(val) {
-        const results = [];
-        const flags = {};
+        var results = [];
+        var keys = [];
+        var typeFilter;
+        var m = /(?:^| )type:([^ ]+)/.exec(val);
+        if (m) {
+            val = val.replace(/(?:^| )type:[^ ]+/,"");
+            typeFilter = m[1];
+        }
+        var flags = {};
        val = extractFlag(val,"invalid",flags);
        val = extractFlag(val,"unused",flags);
        val = extractFlag(val,"config",flags);
        val = extractFlag(val,"subflow",flags);
        val = extractFlag(val,"hidden",flags);
        val = extractFlag(val,"modified",flags);
-        val = extractValue(val,"flow",flags);// flow:current or flow:<flow-id>
-        val = extractValue(val,"uses",flags);// uses:<node-id>
-        val = extractType(val,flags);// type:<node-type>
+        // uses:<node-id>
+        val = extractValue(val,"uses",flags);
+
+        var hasFlags = Object.keys(flags).length > 0;
+
        val = val.trim();
-        const hasFlags = Object.keys(flags).length > 0;
-        const hasTypeFilter = flags.type && flags.type.length > 0
-        if (flags.flow && flags.flow.indexOf("current") >= 0) {
-            let idx = flags.flow.indexOf("current");
-            flags.flow[idx] = RED.workspaces.active();//convert 'current' to active flow ID
-        }
-        if (flags.flow && flags.flow.length) {
-            flags.flow = [ ...new Set(flags.flow) ]; //deduplicate
-        }
-        if (val.length > 0 || hasFlags) {
+
+        if (val.length > 0 || typeFilter || hasFlags) {
            val = val.toLowerCase();
-            let i;
-            let j;
-            let list = [];
-            const nodes = {};
-            let keys = [];
+            var i;
+            var j;
+            var list = [];
+            var nodes = {};
            if (flags.uses) {
                keys = flags.uses;
            } else {
                keys = Object.keys(index);
            }
            for (i=0;i<keys.length;i++) {
-                const key = keys[i];
-                const kpos = val ? keys[i].indexOf(val) : -1;
-                if (kpos > -1 || (val === "" && hasFlags)) {
-                    const ids = Object.keys(index[key]||{});
+                var key = keys[i];
+                var kpos = keys[i].indexOf(val);
+                if (kpos > -1) {
+                    var ids = Object.keys(index[key]);
                    for (j=0;j<ids.length;j++) {
                        var node = index[key][ids[j]];
                        var isConfigNode = node.node._def.category === "config" && node.node.type !== 'group';
@@ -169,7 +152,7 @@ RED.search = (function() {
                            continue;
                        }
                        if (flags.hasOwnProperty("invalid")) {
-                            const nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
+                            var nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
                            if (flags.invalid === nodeIsValid) {
                                continue;
                            }
@@ -199,27 +182,18 @@ RED.search = (function() {
                            }
                        }
                        if (flags.hasOwnProperty("unused")) {
-                            const isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
-                                           (isConfigNode && node.node.users.length === 0 && node.node._def.hasUsers !== false)
+                            var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
+                                           (isConfigNode && node.node.users.length === 0)
                            if (flags.unused !== isUnused) {
                                continue;
                            }
                        }
-                        if (flags.hasOwnProperty("flow")) {
-                            if (flags.flow.indexOf(node.node.z || node.node.id) < 0) {
-                                continue;
-                            }
-                        }
-                        let typeIndex = -1
-                        if(hasTypeFilter) {
-                            typeIndex = flags.type.indexOf(node.node.type)
-                        }
-                        if (!hasTypeFilter || typeIndex > -1) {
-                            nodes[node.node.id] = nodes[node.node.id] || {
+                        if (!typeFilter || node.node.type === typeFilter) {
+                            nodes[node.node.id] = nodes[node.node.id] = {
                                node: node.node,
                                label: node.label
                            };
-                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index || Infinity, typeIndex > -1 ? typeIndex : kpos);
+                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index||Infinity,kpos);
                        }
                    }
                }
@@ -281,7 +255,7 @@ RED.search = (function() {
                }
                currentResults = search(value);
                if (currentResults.length > 0) {
-                    for (let i=0;i<Math.min(currentResults.length,25);i++) {
+                    for (i=0;i<Math.min(currentResults.length,25);i++) {
                        searchResults.editableList('addItem',currentResults[i])
                    }
                    if (currentResults.length > 25) {
@@ -555,7 +529,7 @@ RED.search = (function() {
                $(previousActiveElement).trigger("focus");
            }
            previousActiveElement = null;
-        }
+        } 
        if(!keepSearchToolbar) {
            clearActiveSearch();
        }
@@ -618,8 +592,8 @@ RED.search = (function() {
            {label:RED._("search.options.uknownNodes"), value: "type:unknown"},
            {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"},
            {label:RED._("search.options.hiddenFlows"), value:"is:hidden"},
-            {label:RED._("search.options.thisFlow"), value:"flow:current"},
        ]
+
    }

    function init() {
@@ -647,7 +621,7 @@ RED.search = (function() {
        $("#red-ui-sidebar-shade").on('mousedown',hide);

        $("#red-ui-view-searchtools-close").on("click", function close() {
-            clearActiveSearch();
+            clearActiveSearch();            
            updateSearchToolbar();
        });
        $("#red-ui-view-searchtools-close").trigger("click");
--- 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
@@ -46,9 +46,7 @@ RED.subflow = (function() {
        '</script>';

    function findAvailableSubflowIOPosition(subflow,isInput) {
-        const scrollPos = RED.view.scroll()
-        const scaleFactor = RED.view.scale()
-        var pos = { x: (scrollPos[0]/scaleFactor)+50, y: (scrollPos[1]/scaleFactor)+30 };
+        var pos = {x:50,y:30};
        if (!isInput) {
            pos.x += 110;
        }
@@ -275,11 +273,6 @@ RED.subflow = (function() {
        var subflowInstances = [];
        if (activeSubflow) {
            RED.nodes.filterNodes({type:"subflow:"+activeSubflow.id}).forEach(function(n) {
-                const parentFlow = RED.nodes.workspace(n.z)
-                const wasLocked = parentFlow && parentFlow.locked
-                if (wasLocked) {
-                    parentFlow.locked = false
-                }
                subflowInstances.push({
                    id: n.id,
                    changed: n.changed
@@ -292,9 +285,6 @@ RED.subflow = (function() {
                n.resize = true;
                n.dirty = true;
                RED.editor.updateNodeProperties(n);
-                if (wasLocked) {
-                    parentFlow.locked = true
-                }
            });
            RED.editor.validateNode(activeSubflow);
            return {
@@ -441,7 +431,44 @@ RED.subflow = (function() {

        $("#red-ui-subflow-delete").on("click", function(event) {
            event.preventDefault();
-            RED.subflow.delete(RED.workspaces.active())
+            var subflow = RED.nodes.subflow(RED.workspaces.active());
+            if (subflow.instances.length > 0) {
+                var msg = $('<div>')
+                $('<p>').text(RED._("subflow.subflowInstances",{count: subflow.instances.length})).appendTo(msg);
+                $('<p>').text(RED._("subflow.confirmDelete")).appendTo(msg);
+                var confirmDeleteNotification = RED.notify(msg, {
+                    modal: true,
+                    fixed: true,
+                    buttons: [
+                        {
+                            text: RED._('common.label.cancel'),
+                            click: function() {
+                                confirmDeleteNotification.close();
+                            }
+                        },
+                        {
+                            text: RED._('workspace.confirmDelete'),
+                            class: "primary",
+                            click: function() {
+                                confirmDeleteNotification.close();
+                                completeDelete();
+                            }
+                        }
+                    ]
+                });
+
+                return;
+            } else {
+                completeDelete();
+            }
+            function completeDelete() {
+                var startDirty = RED.nodes.dirty();
+                var historyEvent = removeSubflow(RED.workspaces.active());
+                historyEvent.t = 'delete';
+                historyEvent.dirty = startDirty;
+                RED.history.push(historyEvent);
+            }
+
        });

        refreshToolbar(activeSubflow);
@@ -454,51 +481,7 @@ RED.subflow = (function() {
        $("#red-ui-workspace-toolbar").hide().empty();
        $("#red-ui-workspace-chart").css({"margin-top": "0"});
    }
-    function deleteSubflow(id) {
-        const subflow = RED.nodes.subflow(id || RED.workspaces.active());
-        if (!subflow) {
-            return
-        }
-        if (subflow.instances.length > 0) {
-            if (subflow.instances.some(sf => { const ws = RED.nodes.workspace(sf.z); return ws?ws.locked:false })) {
-                return
-            }
-            const msg = $('<div>')
-            $('<p>').text(RED._("subflow.subflowInstances",{count: subflow.instances.length})).appendTo(msg);
-            $('<p>').text(RED._("subflow.confirmDelete")).appendTo(msg);
-            const confirmDeleteNotification = RED.notify(msg, {
-                modal: true,
-                fixed: true,
-                buttons: [
-                    {
-                        text: RED._('common.label.cancel'),
-                        click: function() {
-                            confirmDeleteNotification.close();
-                        }
-                    },
-                    {
-                        text: RED._('workspace.confirmDelete'),
-                        class: "primary",
-                        click: function() {
-                            confirmDeleteNotification.close();
-                            completeDelete();
-                        }
-                    }
-                ]
-            });

-            return;
-        } else {
-            completeDelete();
-        }
-        function completeDelete() {
-            const startDirty = RED.nodes.dirty();
-            const historyEvent = removeSubflow(subflow.id);
-            historyEvent.t = 'delete';
-            historyEvent.dirty = startDirty;
-            RED.history.push(historyEvent);
-        }
-    }
    function removeSubflow(id, keepInstanceNodes) {
        // TODO:  A lot of this logic is common with RED.nodes.removeWorkspace
        var removedNodes = [];
@@ -523,13 +506,6 @@ RED.subflow = (function() {
        RED.nodes.groups(id).forEach(function(n) {
            removedGroups.push(n);
        })
-
-        var removedJunctions = RED.nodes.junctions(id)
-        for (var i=0;i<removedJunctions.length;i++) {
-            var removedEntities = RED.nodes.removeJunction(removedJunctions[i])
-            removedLinks = removedLinks.concat(removedEntities.links)
-        }
-
        var removedConfigNodes = [];
        for (var i=0;i<removedNodes.length;i++) {
            var removedEntities = RED.nodes.remove(removedNodes[i].id);
@@ -560,7 +536,6 @@ RED.subflow = (function() {
            nodes:removedNodes,
            links:removedLinks,
            groups: removedGroups,
-            junctions: removedJunctions,
            subflows: [activeSubflow]
        }
    }
@@ -575,7 +550,7 @@ RED.subflow = (function() {
            }
        });
        RED.events.on("view:selection-changed",function(selection) {
-            if (!selection.nodes || RED.workspaces.isLocked()) {
+            if (!selection.nodes) {
                RED.menu.setDisabled("menu-item-subflow-convert",true);
            } else {
                RED.menu.setDisabled("menu-item-subflow-convert",false);
@@ -629,18 +604,7 @@ RED.subflow = (function() {
        return x;
    }

-    function nodeOrJunction(id) {
-        var node = RED.nodes.node(id);
-        if (node) {
-            return node;
-        }
-        return RED.nodes.junction(id);
-    }
-
    function convertToSubflow() {
-        if (RED.workspaces.isLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        if (!selection.nodes) {
            RED.notify(RED._("subflow.errors.noNodesSelected"),"error");
@@ -667,7 +631,7 @@ RED.subflow = (function() {
        for (i=0; i<nodeList.length;i++) {
            if (nodeList[i].g && !includedGroups.has(nodeList[i].g)) {
                if (containingGroup !== nodeList[i].g) {
-                    RED.notify(RED._("subflow.errors.acrossMultipleGroups"), "error");
+                    RED.notify("Cannot create subflow across multiple groups","error");
                    return;
                }
            }
@@ -683,23 +647,24 @@ RED.subflow = (function() {
        var candidateOutputs = [];
        var candidateInputNodes = {};

-        var boundingBox = [nodeList[0].x-(nodeList[0].w/2),
-            nodeList[0].y-(nodeList[0].h/2),
-            nodeList[0].x+(nodeList[0].w/2),
-            nodeList[0].y+(nodeList[0].h/2)];
+        var boundingBox = [nodeList[0].x,
+            nodeList[0].y,
+            nodeList[0].x,
+            nodeList[0].y];

        for (i=0;i<nodeList.length;i++) {
            n = nodeList[i];
            nodes[n.id] = {n:n,outputs:{}};
            boundingBox = [
-                Math.min(boundingBox[0],n.x-(n.w/2)),
-                Math.min(boundingBox[1],n.y-(n.h/2)),
-                Math.max(boundingBox[2],n.x+(n.w/2)),
-                Math.max(boundingBox[3],n.y+(n.h/2))
+                Math.min(boundingBox[0],n.x),
+                Math.min(boundingBox[1],n.y),
+                Math.max(boundingBox[2],n.x),
+                Math.max(boundingBox[3],n.y)
            ]
        }
-        var offsetX = snapToGrid(boundingBox[0] - 140);
-        var offsetY = snapToGrid(boundingBox[1] - 60);
+        var offsetX = snapToGrid(boundingBox[0] - 200);
+        var offsetY = snapToGrid(boundingBox[1] - 80);
+

        var center = [
            snapToGrid((boundingBox[2]+boundingBox[0]) / 2),
@@ -795,7 +760,7 @@ RED.subflow = (function() {
        }
        subflowInstance._def = RED.nodes.getType(subflowInstance.type);
        RED.editor.validateNode(subflowInstance);
-        subflowInstance = RED.nodes.add(subflowInstance);
+        RED.nodes.add(subflowInstance);

        if (containingGroup) {
            RED.group.addToGroup(containingGroup, subflowInstance);
@@ -827,15 +792,14 @@ RED.subflow = (function() {

        subflow.in.forEach(function(input) {
            input.wires.forEach(function(wire) {
-                var link = {source: input, sourcePort: 0, target: nodeOrJunction(wire.id) }
+                var link = {source: input, sourcePort: 0, target: RED.nodes.node(wire.id) }
                new_links.push(link);
                RED.nodes.addLink(link);
            });
        });
-
        subflow.out.forEach(function(output,i) {
            output.wires.forEach(function(wire) {
-                var link = {source: nodeOrJunction(wire.id), sourcePort: wire.port , target: output }
+                var link = {source: RED.nodes.node(wire.id), sourcePort: wire.port , target: output }
                new_links.push(link);
                RED.nodes.addLink(link);
            });
@@ -851,7 +815,7 @@ RED.subflow = (function() {
                n.links = n.links.filter(function(id) {
                    var isLocalLink = nodes.hasOwnProperty(id);
                    if (!isLocalLink) {
-                        var otherNode = nodeOrJunction(id);
+                        var otherNode = RED.nodes.node(id);
                        if (otherNode && otherNode.links) {
                            var i = otherNode.links.indexOf(n.id);
                            if (i > -1) {
@@ -867,6 +831,7 @@ RED.subflow = (function() {
            RED.nodes.moveNodeToTab(n, subflow.id);
        }

+
        var historyEvent = {
            t:'createSubflow',
            nodes:[subflowInstance.id],
@@ -904,7 +869,6 @@ RED.subflow = (function() {
        RED.nodes.dirty(true);
        RED.view.updateActive();
        RED.view.select(null);
-        RED.view.focus();
    }


@@ -1019,17 +983,6 @@ RED.subflow = (function() {
                        default: inputType
                    })
                    input.typedInput('value',val.value)
-                    if (inputType === 'cred') {
-                        if (node.credentials) {
-                            if (node.credentials[tenv.name]) {
-                                input.typedInput('value', node.credentials[tenv.name]);
-                            } else if (node.credentials['has_'+tenv.name]) {
-                                input.typedInput('value', "__PWRD__")
-                            } else {
-                                input.typedInput('value', "");
-                            }
-                        }
-                    }
                } else {
                    input.val(val.value)
                }
@@ -1349,10 +1302,7 @@ RED.subflow = (function() {
        init: init,
        createSubflow: createSubflow,
        convertToSubflow: convertToSubflow,
-        // removeSubflow: Internal function to remove subflow
        removeSubflow: removeSubflow,
-        // delete: Prompt user for confirmation
-        delete: deleteSubflow,
        refresh: refresh,
        removeInput: removeSubflowInput,
        removeOutput: removeSubflowOutput,
--- 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
@@ -43,15 +43,12 @@ RED.sidebar.config = (function() {

    var categories = {};

-    function getOrCreateCategory(name,parent,label,isLocked) {
+    function getOrCreateCategory(name,parent,label) {
        name = name.replace(/\./i,"-");
        if (!categories[name]) {
            var container = $('<div class="red-ui-palette-category red-ui-sidebar-config-category" id="red-ui-sidebar-config-category-'+name+'"></div>').appendTo(parent);
            var header = $('<div class="red-ui-sidebar-config-tray-header red-ui-palette-header"><i class="fa fa-angle-down expanded"></i></div>').appendTo(container);
-            let lockIcon
            if (label) {
-                lockIcon = $('<span style="margin-right: 5px"><i class="fa fa-lock"/></span>').appendTo(header)
-                lockIcon.toggle(!!isLocked)
                $('<span class="red-ui-palette-node-config-label"/>').text(label).appendTo(header);
            } else {
                $('<span class="red-ui-palette-node-config-label" data-i18n="sidebar.config.'+name+'">').appendTo(header);
@@ -65,7 +62,6 @@ RED.sidebar.config = (function() {
            var icon = header.find("i");
            var result = {
                label: label,
-                lockIcon,
                list: category,
                size: function() {
                    return result.list.find("li:not(.red-ui-palette-node-config-none)").length
@@ -104,9 +100,6 @@ RED.sidebar.config = (function() {
            });
            categories[name] = result;
        } else {
-            if (isLocked !== undefined && categories[name].lockIcon) {
-                categories[name].lockIcon.toggle(!!isLocked)
-            }
            if (categories[name].label !== label) {
                categories[name].list.parent().find('.red-ui-palette-node-config-label').text(label);
                categories[name].label = label;
@@ -145,19 +138,17 @@ RED.sidebar.config = (function() {
        } else {
            var currentType = "";
            nodes.forEach(function(node) {
-                var labelText = RED.utils.getNodeLabel(node,node.id);
+                var label = RED.utils.getNodeLabel(node,node.id);
                if (node.type != currentType) {
                    $('<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);
                nodeDiv.data('node',node.id);
-                var label = $('<div class="red-ui-palette-label"></div>').text(labelText).appendTo(nodeDiv);
+                var label = $('<div class="red-ui-palette-label"></div>').text(label).appendTo(nodeDiv);
                if (node.d) {
                    nodeDiv.addClass("red-ui-palette-node-config-disabled");
                    $('<i class="fa fa-ban"></i>').prependTo(label);
@@ -225,7 +216,7 @@ RED.sidebar.config = (function() {

        RED.nodes.eachWorkspace(function(ws) {
            validList[ws.id.replace(/\./g,"-")] = true;
-            getOrCreateCategory(ws.id,flowCategories,ws.label, ws.locked);
+            getOrCreateCategory(ws.id,flowCategories,ws.label);
        })
        RED.nodes.eachSubflow(function(sf) {
            validList[sf.id.replace(/\./g,"-")] = true;
@@ -283,15 +274,6 @@ RED.sidebar.config = (function() {
                    changes: {},
                    dirty: RED.nodes.dirty()
                }
-                for (let i = 0; i < selectedNodes.length; i++) {
-                    let node = RED.nodes.node(selectedNodes[i])
-                    if (node.z) {
-                        let ws = RED.nodes.workspace(node.z)
-                        if (ws && ws.locked) {
-                            return
-                        }
-                    }
-                }
                selectedNodes.forEach(function(id) {
                    var node = RED.nodes.node(id);
                    try {
@@ -367,7 +349,7 @@ RED.sidebar.config = (function() {
                refreshConfigNodeList();
            }
        });
-        RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'), RED._("sidebar.config.showAllConfigNodes"));
+        RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'), RED._("sidebar.config.showAllUnusedConfigNodes"));
        RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'), RED._("sidebar.config.showAllUnusedConfigNodes"));

    }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
@@ -20,8 +20,10 @@ RED.sidebar.help = (function() {
    var helpSection;
    var panels;
    var panelRatio;
+    var helpTopics = [];
    var treeList;
    var tocPanel;
+    var helpIndex = {};

    function resizeStack() {
        var h = $(content).parent().height() - toolbar.outerHeight();
@@ -50,7 +52,7 @@ RED.sidebar.help = (function() {

        tocPanel = $("<div>", {class: "red-ui-sidebar-help-toc"}).appendTo(stackContainer);
        var helpPanel = $("<div>").css({
-            "overflow-y": "auto"
+            "overflow-y": "scroll"
        }).appendTo(stackContainer);

        panels = RED.panels.create({
@@ -95,10 +97,7 @@ RED.sidebar.help = (function() {
        var pendingContentLoad;
        treeList.on('treelistselect', function(e,item) {
            pendingContentLoad = item;
-            if (item.tour) {
-                RED.tourGuide.run(item.tour);
-            }
-            else if (item.nodeType) {
+            if (item.nodeType) {
                showNodeTypeHelp(item.nodeType);
            } else if (item.content) {
                helpSection.empty();
@@ -141,8 +140,7 @@ RED.sidebar.help = (function() {
        RED.events.on('registry:node-type-removed', queueRefresh);
        RED.events.on('subflows:change', refreshSubflow);

-        RED.actions.add("core:show-help-tab", show);
-        RED.actions.add("core:show-node-help", showNodeHelp)
+        RED.actions.add("core:show-help-tab",show);

    }

@@ -191,6 +189,7 @@ RED.sidebar.help = (function() {
    }

    function refreshHelpIndex() {
+        helpTopics = [];
        var modules = RED.nodes.registry.getModuleList();
        var moduleNames = Object.keys(modules);
        moduleNames.sort();
@@ -199,32 +198,15 @@ RED.sidebar.help = (function() {
            label: RED._("sidebar.help.nodeHelp"),
            children: [],
            expanded: true
-        };
-        var tours = RED.tourGuide.list().map(function (item) {
-            return {
-                icon: "fa fa-play-circle-o",
-                label: item.label,
-                tour: item.path,
-            };
-        });
+        }
        var helpData = [
            {
-                label: "Node-RED",
-                children: [
-                    {
-                        id: 'changelog',
-                        label: RED._("sidebar.help.changeLog"),
-                        content: getChangelog
-                    },
-                    {
-                        label: RED._("tourGuide.welcomeTours"),
-                        children: tours
-                    }
-
-                ]
+                id: 'changelog',
+                label: "Node-RED v"+RED.settings.version,
+                content: getChangelog
            },
            nodeHelp
-        ];
+        ]
        var subflows = RED.nodes.registry.getNodeTypes().filter(function(t) {return /subflow/.test(t)});
        if (subflows.length > 0) {
            nodeHelp.children.push({
@@ -339,19 +321,6 @@ RED.sidebar.help = (function() {
        resizeStack();
    }

-    function showNodeHelp(node) {
-        if (!node) {
-            const selection = RED.view.selection()
-            if (selection.nodes && selection.nodes.length > 0) {
-                node = selection.nodes.find(n => n.type !== 'group' && n.type !== 'junction')
-            }
-        }
-        if (node) {
-            show(node.type, true)
-        }
-    }
-
-
    // TODO: DRY - projects.js
    function addTargetToExternalLinks(el) {
        $(el).find("a").each(function(el) {
--- 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
@@ -135,10 +135,6 @@ RED.sidebar.info.outliner = (function() {
                    RED.workspaces.show(n.id, null, true);
                }
            });
-            RED.popover.tooltip(toggleVisibleButton, function () {
-                var isHidden = !div.hasClass("red-ui-info-outline-item-hidden");
-                return RED._("sidebar.info." + (isHidden ? "hideFlow" : "showFlow"));
-            });
        }
        if (n.type !== 'subflow') {
            var toggleButton = $('<button type="button" class="red-ui-info-outline-item-control-disable red-ui-button red-ui-button-small"><i class="fa fa-circle-thin"></i><i class="fa fa-ban"></i></button>').appendTo(controls).on("click",function(evt) {
@@ -225,22 +221,6 @@ RED.sidebar.info.outliner = (function() {
        } else {
            $('<div class="red-ui-info-outline-item-control-spacer">').appendTo(controls)
        }
-        if (n.type === 'tab') {
-            var lockToggleButton = $('<button type="button" class="red-ui-info-outline-item-control-lock red-ui-button red-ui-button-small"><i class="fa fa-unlock-alt"></i><i class="fa fa-lock"></i></button>').appendTo(controls).on("click",function(evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                if (n.locked) {
-                    RED.workspaces.unlock(n.id)
-                } else {
-                    RED.workspaces.lock(n.id)
-                }
-            })
-            RED.popover.tooltip(lockToggleButton,function() {
-                return RED._("common.label."+(n.locked?"unlock":"lock"));
-            });
-        } else {
-            $('<div class="red-ui-info-outline-item-control-spacer">').appendTo(controls)
-        }
        controls.find("button").on("dblclick", function(evt) {
            evt.preventDefault();
            evt.stopPropagation();
@@ -384,8 +364,6 @@ RED.sidebar.info.outliner = (function() {
        flowList.treeList.addChild(objects[ws.id])
        objects[ws.id].element.toggleClass("red-ui-info-outline-item-disabled", !!ws.disabled)
        objects[ws.id].treeList.container.toggleClass("red-ui-info-outline-item-disabled", !!ws.disabled)
-        objects[ws.id].element.toggleClass("red-ui-info-outline-item-locked", !!ws.locked)
-        objects[ws.id].treeList.container.toggleClass("red-ui-info-outline-item-locked", !!ws.locked)
        updateSearch();

    }
@@ -400,8 +378,6 @@ RED.sidebar.info.outliner = (function() {
        existingObject.element.find(".red-ui-info-outline-item-label").text(label);
        existingObject.element.toggleClass("red-ui-info-outline-item-disabled", !!n.disabled)
        existingObject.treeList.container.toggleClass("red-ui-info-outline-item-disabled", !!n.disabled)
-        existingObject.element.toggleClass("red-ui-info-outline-item-locked", !!n.locked)
-        existingObject.treeList.container.toggleClass("red-ui-info-outline-item-locked", !!n.locked)
        updateSearch();
    }
    function onFlowsReorder(order) {
@@ -637,9 +613,6 @@ RED.sidebar.info.outliner = (function() {
                objects[n.id].children = missingParents[n.id];
                delete missingParents[n.id]
            }
-            if (objects[n.id].children.length === 0) {
-                objects[n.id].children.push(getEmptyItem(n.id));
-            }
        }
        var parent = n.g||n.z||"__global__";

--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg width="50" height="5" viewBox="0, 0, 50, 5" xmlns="http://www.w3.org/2000/svg"><path d="M0 1H50V4H0Z" fill="#CCC"/></svg>`
				`@@ -1 +0,0 @@`
				`<svg width="5" height="50" viewBox="0, 0, 5, 50" xmlns="http://www.w3.org/2000/svg"><path d="M1 0H4V50H1Z" fill="#CCC"/></svg>`